This commit was manufactured by cvs2svn to create tag 'v20050516'.
diff --git a/features/org.eclipse.jem-feature/.cvsignore b/features/org.eclipse.jem-feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jem-feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jem-feature/.project b/features/org.eclipse.jem-feature/.project
deleted file mode 100644
index 04e071f..0000000
--- a/features/org.eclipse.jem-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jem-feature/build.properties b/features/org.eclipse.jem-feature/build.properties
deleted file mode 100644
index 4ce7515..0000000
--- a/features/org.eclipse.jem-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
-
-
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/.classpath b/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/.classpath
deleted file mode 100644
index 059b9d1..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="lib" path="runtime/event.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/.project b/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/.project
deleted file mode 100644
index 8c8107f..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.etools.emf.event</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/about.html b/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/build.properties b/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/build.properties
deleted file mode 100644
index 0cb2fd1..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = runtime/event.jar,\
-               plugin.xml,\
-               about.html
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/plugin.xml b/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/plugin.xml
deleted file mode 100644
index 55ff069..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="com.ibm.etools.emf.event"
-   name="Event Model"
-   version="3.0.0.1">
-
-   <runtime>
-      <library name="runtime/event.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-<!-- build-level = "20030806_1713SL" *** With fix 10028 merged in. -->
-   <requires>
-      <import plugin="org.eclipse.emf.ecore" version="2.0.0" match="compatible"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="event.xmi"
-            class="com.ibm.etools.emf.event.impl.EventPackageImpl">
-      </package>
-   </extension>
-
-</plugin>
diff --git a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/runtime/event.jar b/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/runtime/event.jar
deleted file mode 100644
index b64130c..0000000
--- a/features/org.eclipse.jem-feature/com.ibm.etools.emf.event/runtime/event.jar
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/eclipse_update_120.jpg b/features/org.eclipse.jem-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/features/org.eclipse.jem-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/epl-v10.html b/features/org.eclipse.jem-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jem-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/feature.properties b/features/org.eclipse.jem-feature/feature.properties
deleted file mode 100644
index 0a70e2b..0000000
--- a/features/org.eclipse.jem-feature/feature.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/features/org.eclipse.jem-feature/Attic/feature.properties,v $
-# $Revision: 1.6 $  $Date: 2005/02/28 19:02:00 $
-#
-
-
-# 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=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=Java EMF Model, including BeanInfo, Java Model, Proxy support (with remote vm and IDE vm support).
-
-# "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\
-January 28, 2004\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 apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "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\
-   - Subdirectories 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 CPL 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
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jem-feature/feature.xml b/features/org.eclipse.jem-feature/feature.xml
deleted file mode 100644
index 06e0d6b..0000000
--- a/features/org.eclipse.jem-feature/feature.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jem"
-      label="%featureName"
-      version="1.1.0"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://update.eclipse.org/tools/ve/updates/1.0"/>
-   </url>
-
-   <requires>
-      <import feature="org.eclipse.jdt" version="3.0.0" match="compatible"/>
-      <import feature="org.eclipse.emf" version="2.0.1" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jem.beaninfo"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jem.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jem.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.ibm.etools.emf.event"
-         download-size="0"
-         install-size="0"
-         version="3.0.0.1"/>
-
-   <plugin
-         id="org.eclipse.jem.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-         
-   <plugin
-         id="org.eclipse.jem.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>.
-                  
-
-</feature>
diff --git a/features/org.eclipse.jem-feature/license.html b/features/org.eclipse.jem-feature/license.html
deleted file mode 100644
index 3259fb9..0000000
--- a/features/org.eclipse.jem-feature/license.html
+++ /dev/null
@@ -1,73 +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>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 &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>
-
-<p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. 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 a Feature.   Plug-ins and Fragments are located in directories
-   named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.</p>
-  
-<p>Features may also include other Features (&quot;Included Features&quot;). Files named &quot;feature.xml&quot; 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 &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>Subdirectories 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;.
-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>
-</body>
-</html>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/build.properties b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/build.properties
deleted file mode 100644
index ea394f9..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties,\
-               feature.xml,\
-               license.html
-generate.feature@org.eclipse.jem.source=org.eclipse.jem
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/eclipse_update_120.jpg b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/epl-v10.html b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.properties b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.properties
deleted file mode 100644
index 2154c2b..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/Attic/feature.properties,v $
-# $Revision: 1.6 $  $Date: 2005/02/28 19:02:00 $
-#
-
-
-# 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=Java EMF Model SDK
-
-# "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=Binaries and API documentation and source zips for the Visual Editor.
-
-# "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\
-January 28, 2004\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 apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "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\
-   - Subdirectories 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 CPL 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
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.xml b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.xml
deleted file mode 100644
index 12ae816..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jem.sdk"
-      label="%featureName"
-      version="1.1.0"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://update.eclipse.org/tools/ve/updates/1.0"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jem"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jem.source"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jem.sdk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/license.html b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/license.html
deleted file mode 100644
index 3259fb9..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/license.html
+++ /dev/null
@@ -1,73 +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>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 &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>
-
-<p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. 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 a Feature.   Plug-ins and Fragments are located in directories
-   named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.</p>
-  
-<p>Features may also include other Features (&quot;Included Features&quot;). Files named &quot;feature.xml&quot; 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 &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>Subdirectories 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;.
-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>
-</body>
-</html>
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.html b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.ini b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.ini
deleted file mode 100644
index a21a3ec..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/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.gif
-
-# 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/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.mappings b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/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/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.properties b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.properties
deleted file mode 100644
index 37842ee..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/about.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/Attic/about.properties,v $
-# $Revision: 1.4 $  $Date: 2005/02/15 23:13:16 $
-#
-
-
-# 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 SDK\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2000, 2004.  All rights reserved.\n\
-Visit http://www.eclipse.org/vep
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/build.properties b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/build.properties
deleted file mode 100644
index d13e94e..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.gif,\
-               plugin.xml,\
-               plugin.properties
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/eclipse32.gif b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/eclipse32.gif
deleted file mode 100644
index f71a8f6..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/plugin.properties b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/plugin.properties
deleted file mode 100644
index c83dcb5..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/Attic/plugin.properties,v $
-# $Revision: 1.4 $  $Date: 2005/02/15 23:13:16 $
-#
-
-
-pluginName=Java EMF Model SDK
-providerName = Eclipse.org
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/plugin.xml b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/plugin.xml
deleted file mode 100644
index 3f8e273..0000000
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="org.eclipse.jem.sdk"
-   name="%pluginName"
-   version="1.0.1"
-   provider-name="%providerName">
-
-   <runtime>
-   </runtime>
-
-</plugin>
diff --git a/features/org.eclipse.jem-feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jem-feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 4ce7515..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
-
-
diff --git a/features/org.eclipse.jem-feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jem-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jem-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jem-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 2d01395..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/features/org.eclipse.jem-feature/sourceTemplateFeature/Attic/feature.properties,v $
-# $Revision: 1.7 $  $Date: 2005/02/28 19:02:00 $
-#
-
-
-# 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=Java EMF Model Source
-
-# "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=API documentation and source zips for the Java EMF Model.
-
-# "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\
-January 28, 2004\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 apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "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\
-   - Subdirectories 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 CPL 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
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jem-feature/sourceTemplateFeature/license.html b/features/org.eclipse.jem-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index 3259fb9..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,73 +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>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 &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>
-
-<p>Content may be apportioned into plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;). A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. 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 a Feature.   Plug-ins and Fragments are located in directories
-   named &quot;plugins&quot; and Features are located in directories named &quot;features&quot;.</p>
-  
-<p>Features may also include other Features (&quot;Included Features&quot;). Files named &quot;feature.xml&quot; 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 &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>Subdirectories 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;.
-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>
-</body>
-</html>
diff --git a/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index dae413b..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index a21a3ec..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplatePlugin/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.gif
-
-# 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/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index bf7deb4..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/features/org.eclipse.jem-feature/sourceTemplatePlugin/Attic/about.properties,v $
-# $Revision: 1.5 $  $Date: 2005/02/15 23:13:16 $
-#
-
-# 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 SDK\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2000, 2004.  All rights reserved.\n\
-Visit http://www.eclipse.org/vep
diff --git a/features/org.eclipse.jem-feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jem-feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 5b2132e..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.gif,\
-               src/
-sourcePlugin = true
diff --git a/features/org.eclipse.jem-feature/sourceTemplatePlugin/eclipse32.gif b/features/org.eclipse.jem-feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index f71a8f6..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jem-feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jem-feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 569a6f6..0000000
--- a/features/org.eclipse.jem-feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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/features/org.eclipse.jem-feature/sourceTemplatePlugin/Attic/plugin.properties,v $
-# $Revision: 1.3 $  $Date: 2005/02/15 23:13:16 $
-#
-
-
-pluginName = Java EMF Model Source
-providerName = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/.project b/plugins/org.eclipse.jem.beaninfo.ui/.project
deleted file mode 100644
index 3898d56..0000000
--- a/plugins/org.eclipse.jem.beaninfo.ui/.project
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.beaninfo.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui b/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui
deleted file mode 100644
index e69de29..0000000
--- a/plugins/org.eclipse.jem.beaninfo.ui/OBSOLETE-moved to org.eclipse.jem.ui
+++ /dev/null
diff --git a/plugins/org.eclipse.jem.beaninfo/.classpath b/plugins/org.eclipse.jem.beaninfo/.classpath
deleted file mode 100644
index 3e7a2ef..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="beaninfo"/>
-	<classpathentry output="bin_beaninfocommon" kind="src" path="beaninfoCommon"/>
-	<classpathentry output="bin_vm_beaninfovm" kind="src" path="vm_beaninfovm"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo/.cvsignore b/plugins/org.eclipse.jem.beaninfo/.cvsignore
deleted file mode 100644
index 9b8171d..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-bin_beaninfocommon
-bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo/.options b/plugins/org.eclipse.jem.beaninfo/.options
deleted file mode 100644
index 5b24652..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.beaninfo/debug/logtrace=default
-org.eclipse.jem.beaninfo/debug/logtracefile=default
-org.eclipse.jem.beaninfo/debug/loglevel=default
diff --git a/plugins/org.eclipse.jem.beaninfo/.project b/plugins/org.eclipse.jem.beaninfo/.project
deleted file mode 100644
index 7938070..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.project
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.beaninfo</name>
-	<comment></comment>
-	<projects>
-		<project>com.ibm.etools.emf.event</project>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.compare</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.emf.ecore</project>
-		<project>org.eclipse.emf.ecore.xmi</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.jem</project>
-		<project>org.eclipse.jem.proxy</project>
-		<project>org.eclipse.jem.workbench</project>
-		<project>org.eclipse.osgi</project>
-	</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.beaninfo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9080e5..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,282 +0,0 @@
-#Wed May 11 18:32:12 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.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=ignore
-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.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_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_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_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_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_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_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
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4cff627..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed May 11 16:20:15 EDT 2005
-eclipse.preferences.version=1
-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.beaninfo/about.html b/plugins/org.eclipse.jem.beaninfo/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jem.beaninfo/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
deleted file mode 100644
index a7cd9f0..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
+++ /dev/null
@@ -1,432 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: BeanDecorator.java,v $
- *  $Revision: 1.9 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import java.net.URL;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to BeanDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator()
- * @model
- * @generated
- */
-
-
-public interface BeanDecorator extends FeatureDecorator{
-	
-	/**
-	 * Returns the value of the '<em><b>Merge Super Properties</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Properties</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the properties of super types be merged when asking for eAllAttributes/eAllReferences.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Properties</em>' attribute.
-	 * @see #isSetMergeSuperProperties()
-	 * @see #unsetMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperProperties()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperProperties();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Properties</em>' attribute.
-	 * @see #isSetMergeSuperProperties()
-	 * @see #unsetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 */
-	void setMergeSuperProperties(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperProperties();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Properties</em>' attribute is set.
-	 * @see #unsetMergeSuperProperties()
-	 * @see #isMergeSuperProperties()
-	 * @see #setMergeSuperProperties(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Super Methods</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Behaviors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the methods of super types be merged when asking for eAllBehaviors.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Methods</em>' attribute.
-	 * @see #isSetMergeSuperMethods()
-	 * @see #unsetMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperMethods()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Methods</em>' attribute.
-	 * @see #isSetMergeSuperMethods()
-	 * @see #unsetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 */
-	void setMergeSuperMethods(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperMethods();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Methods</em>' attribute is set.
-	 * @see #unsetMergeSuperMethods()
-	 * @see #isMergeSuperMethods()
-	 * @see #setMergeSuperMethods(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Super Events</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Super Events</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the events of super types be merged when asking for eAllEvents.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Super Events</em>' attribute.
-	 * @see #isSetMergeSuperEvents()
-	 * @see #unsetMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperEvents()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isMergeSuperEvents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Super Events</em>' attribute.
-	 * @see #isSetMergeSuperEvents()
-	 * @see #unsetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 */
-	void setMergeSuperEvents(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @generated
-	 */
-	void unsetMergeSuperEvents();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Merge Super Events</em>' attribute is set.
-	 * @see #unsetMergeSuperEvents()
-	 * @see #isMergeSuperEvents()
-	 * @see #setMergeSuperEvents(boolean)
-	 * @generated
-	 */
-	boolean isSetMergeSuperEvents();
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Properties</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Properties</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Properties</em>' attribute.
-	 * @see #setIntrospectProperties(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectProperties()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectProperties();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Properties</em>' attribute.
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 */
-	void setIntrospectProperties(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Methods</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Behaviors</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Methods</em>' attribute.
-	 * @see #setIntrospectMethods(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectMethods()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectMethods();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Methods</em>' attribute.
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 */
-	void setIntrospectMethods(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Introspect Events</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Introspect Events</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Introspect Events</em>' attribute.
-	 * @see #setIntrospectEvents(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectEvents()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isIntrospectEvents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Introspect Events</em>' attribute.
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 */
-	void setIntrospectEvents(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Customizer Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Customizer Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Customizer Class</em>' reference.
-	 * @see #setCustomizerClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_CustomizerClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getCustomizerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Customizer Class</em>' reference.
-	 * @see #getCustomizerClass()
-	 * @generated
-	 */
-	void setCustomizerClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Do Beaninfo</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Do Beaninfo</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Do Beaninfo</em>' attribute.
-	 * @see #setDoBeaninfo(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_DoBeaninfo()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isDoBeaninfo();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Do Beaninfo</em>' attribute.
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 */
-	void setDoBeaninfo(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Property Names</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 list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
-	 * <p>
-	 * This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
-	 * <p>
-	 * Note: This attribute is not meant to be changed by clients. It is an internal attribute.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Property Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedPropertyNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedPropertyNames();
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Method Names</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 list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
-	 * <p>
-	 * This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Method Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedMethodNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedMethodNames();
-
-	/**
-	 * Returns the value of the '<em><b>Not Inherited Event Names</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 list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
-	 * <p>
-	 * This list will be empty if all events are inherited or if the mergeSuperEvents flag is false.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Not Inherited Event Names</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedEventNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getNotInheritedEventNames();
-
-	/**
-	 * Return the URL of a 16x16 Color icon
-	 */
-	URL getIconURL();
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java
deleted file mode 100644
index fbd56cf..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.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.jem.internal.beaninfo;
-/*
- *  $RCSfile: BeanEvent.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-import org.eclipse.jem.java.JavaEvent;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Event from Introspection/Reflection.
- * <p>
- * The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanEvent()
- * @model
- * @generated
- */
-
-public interface BeanEvent extends JavaEvent{
-
-	
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
deleted file mode 100644
index 1d99aaa..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.eclipse.jem.internal.beaninfo;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: BeaninfoFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-
-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.jem.internal.beaninfo.BeaninfoPackage
- * @generated
- */
-
-
-public interface BeaninfoFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	BeaninfoFactory eINSTANCE = new org.eclipse.jem.internal.beaninfo.impl.BeaninfoFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Feature Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature Decorator</em>'.
-	 * @generated
-	 */
-	FeatureDecorator createFeatureDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Event Set Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Event Set Decorator</em>'.
-	 * @generated
-	 */
-	EventSetDecorator createEventSetDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Method Proxy</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Proxy</em>'.
-	 * @generated
-	 */
-	MethodProxy createMethodProxy();
-
-	/**
-	 * Returns a new object of class '<em>Property Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Property Decorator</em>'.
-	 * @generated
-	 */
-	PropertyDecorator createPropertyDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Indexed Property Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Indexed Property Decorator</em>'.
-	 * @generated
-	 */
-	IndexedPropertyDecorator createIndexedPropertyDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Bean Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Decorator</em>'.
-	 * @generated
-	 */
-	BeanDecorator createBeanDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Method Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Method Decorator</em>'.
-	 * @generated
-	 */
-	MethodDecorator createMethodDecorator();
-
-	/**
-	 * Returns a new object of class '<em>Parameter Decorator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Parameter Decorator</em>'.
-	 * @generated
-	 */
-	ParameterDecorator createParameterDecorator();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	BeaninfoPackage getBeaninfoPackage();
-
-	/**
-	 * Returns a new object of class '<em>Bean Event</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Event</em>'.
-	 * @generated
-	 */
-	BeanEvent createBeanEvent();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
deleted file mode 100644
index 736ad9d..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
+++ /dev/null
@@ -1,2691 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: BeaninfoPackage.java,v $
- *  $Revision: 1.8 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-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;
-
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * <!-- 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.jem.internal.beaninfo.BeaninfoFactory
- * @generated
- */
-
-public interface BeaninfoPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "beaninfo"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jem.internal.beaninfo.beaninfo"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	BeaninfoPackage eINSTANCE = org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl.init();
-
-	
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl <em>Feature Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureDecorator()
-	 * @generated
-	 */
-	int FEATURE_DECORATOR = 0;
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EANNOTATIONS = EcorePackage.EANNOTATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__SOURCE = EcorePackage.EANNOTATION__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__DETAILS = EcorePackage.EANNOTATION__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EMODEL_ELEMENT = EcorePackage.EANNOTATION__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__CONTENTS = EcorePackage.EANNOTATION__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__REFERENCES = EcorePackage.EANNOTATION__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__DISPLAY_NAME = EcorePackage.EANNOTATION_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__SHORT_DESCRIPTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__CATEGORY = EcorePackage.EANNOTATION_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__EXPERT = EcorePackage.EANNOTATION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__HIDDEN = EcorePackage.EANNOTATION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__PREFERRED = EcorePackage.EANNOTATION_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__MERGE_INTROSPECTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = EcorePackage.EANNOTATION_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__IMPLICITLY_SET_BITS = EcorePackage.EANNOTATION_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG = EcorePackage.EANNOTATION_FEATURE_COUNT + 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl <em>Event Set Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getEventSetDecorator()
-	 * @generated
-	 */
-	int EVENT_SET_DECORATOR = 2;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl <em>Method Proxy</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodProxy()
-	 * @generated
-	 */
-	int METHOD_PROXY = 7;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl <em>Property Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getPropertyDecorator()
-	 * @generated
-	 */
-	int PROPERTY_DECORATOR = 5;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl <em>Indexed Property Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	int INDEXED_PROPERTY_DECORATOR = 6;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl <em>Bean Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanDecorator()
-	 * @generated
-	 */
-	int BEAN_DECORATOR = 1;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl <em>Method Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodDecorator()
-	 * @generated
-	 */
-	int METHOD_DECORATOR = 3;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl <em>Parameter Decorator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getParameterDecorator()
-	 * @generated
-	 */
-	int PARAMETER_DECORATOR = 4;
-	/**
-	 * The meta object id for the '<em>Feature Attribute Value</em>' data type.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeValue()
-	 * @generated
-	 */
-	int FEATURE_ATTRIBUTE_VALUE = 11;
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR__ATTRIBUTES = EcorePackage.EANNOTATION_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the the '<em>Feature Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_DECORATOR_FEATURE_COUNT = EcorePackage.EANNOTATION_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 BEAN_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Merge Super Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Merge Super Methods</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Merge Super Events</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__MERGE_SUPER_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Introspect Properties</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Introspect Methods</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Introspect Events</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__INTROSPECT_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Do Beaninfo</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__DO_BEANINFO = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Not Inherited Property Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Not Inherited Method Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Not Inherited Event Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Customizer Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR__CUSTOMIZER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 10;
-	/**
-	 * The number of structural features of the the '<em>Bean Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_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 EVENT_SET_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>In Default Event Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Unicast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__UNICAST = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl <em>Bean Event</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanEvent()
-	 * @generated
-	 */
-	int BEAN_EVENT = 8;
-	/**
-	 * The feature id for the '<em><b>Add Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__ADD_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-	/**
-	 * The feature id for the '<em><b>Listener Methods</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Listener Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__LISTENER_TYPE = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-	/**
-	 * The feature id for the '<em><b>Remove Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Event Adapter Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Ser List Mthd</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR__SER_LIST_MTHD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
-	/**
-	 * The number of structural features of the the '<em>Event Set Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EVENT_SET_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Parms Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Parameter Descriptors</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__PARAMETER_DESCRIPTORS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Ser Parm Desc</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR__SER_PARM_DESC = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Method Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_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 PARAMETER_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__NAME = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR__PARAMETER = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the the '<em>Parameter Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_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 PROPERTY_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__BOUND = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__CONSTRAINED = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__DESIGN_TIME = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FILTER_FLAGS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FIELD_READ_ONLY = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 6;
-	/**
-	 * The feature id for the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__READ_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-	/**
-	 * The feature id for the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__WRITE_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-	/**
-	 * The feature id for the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR__FIELD = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
-	/**
-	 * The number of structural features of the the '<em>Property Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROPERTY_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EANNOTATIONS = PROPERTY_DECORATOR__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__SOURCE = PROPERTY_DECORATOR__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Details</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DETAILS = PROPERTY_DECORATOR__DETAILS;
-
-	/**
-	 * The feature id for the '<em><b>EModel Element</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT = PROPERTY_DECORATOR__EMODEL_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CONTENTS = PROPERTY_DECORATOR__CONTENTS;
-
-	/**
-	 * The feature id for the '<em><b>References</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__REFERENCES = PROPERTY_DECORATOR__REFERENCES;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME = PROPERTY_DECORATOR__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION = PROPERTY_DECORATOR__SHORT_DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CATEGORY = PROPERTY_DECORATOR__CATEGORY;
-	/**
-	 * The feature id for the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__EXPERT = PROPERTY_DECORATOR__EXPERT;
-
-	/**
-	 * The feature id for the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__HIDDEN = PROPERTY_DECORATOR__HIDDEN;
-
-	/**
-	 * The feature id for the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__PREFERRED = PROPERTY_DECORATOR__PREFERRED;
-
-	/**
-	 * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION = PROPERTY_DECORATOR__MERGE_INTROSPECTION;
-	/**
-	 * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
-	/**
-	 * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = PROPERTY_DECORATOR__IMPLICITLY_SET_BITS;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES = PROPERTY_DECORATOR__ATTRIBUTES;
-	/**
-	 * The feature id for the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__BOUND = PROPERTY_DECORATOR__BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__CONSTRAINED = PROPERTY_DECORATOR__CONSTRAINED;
-
-	/**
-	 * The feature id for the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__DESIGN_TIME = PROPERTY_DECORATOR__DESIGN_TIME;
-
-	/**
-	 * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE;
-
-	/**
-	 * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS = PROPERTY_DECORATOR__FILTER_FLAGS;
-	/**
-	 * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY = PROPERTY_DECORATOR__FIELD_READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS;
-	/**
-	 * The feature id for the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__READ_METHOD = PROPERTY_DECORATOR__READ_METHOD;
-	/**
-	 * The feature id for the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__WRITE_METHOD = PROPERTY_DECORATOR__WRITE_METHOD;
-	/**
-	 * The feature id for the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__FIELD = PROPERTY_DECORATOR__FIELD;
-
-	/**
-	 * The feature id for the '<em><b>Indexed Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Indexed Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the the '<em>Indexed Property Decorator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INDEXED_PROPERTY_DECORATOR_FEATURE_COUNT = PROPERTY_DECORATOR_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_PROXY__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__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_PROXY__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_PROXY__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_PROXY__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_PROXY__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_PROXY__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_PROXY__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_PROXY__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_PROXY__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_PROXY__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_PROXY__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY__METHOD = EcorePackage.EOPERATION_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Method Proxy</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PROXY_FEATURE_COUNT = EcorePackage.EOPERATION_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 BEAN_EVENT__EANNOTATIONS = JavaRefPackage.JAVA_EVENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__NAME = JavaRefPackage.JAVA_EVENT__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ORDERED = JavaRefPackage.JAVA_EVENT__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UNIQUE = JavaRefPackage.JAVA_EVENT__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__LOWER_BOUND = JavaRefPackage.JAVA_EVENT__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UPPER_BOUND = JavaRefPackage.JAVA_EVENT__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__MANY = JavaRefPackage.JAVA_EVENT__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__REQUIRED = JavaRefPackage.JAVA_EVENT__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ETYPE = JavaRefPackage.JAVA_EVENT__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__CHANGEABLE = JavaRefPackage.JAVA_EVENT__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__VOLATILE = JavaRefPackage.JAVA_EVENT__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__TRANSIENT = JavaRefPackage.JAVA_EVENT__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DEFAULT_VALUE_LITERAL = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DEFAULT_VALUE = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__UNSETTABLE = JavaRefPackage.JAVA_EVENT__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__DERIVED = JavaRefPackage.JAVA_EVENT__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT__ECONTAINING_CLASS = JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS;
-
-	/**
-	 * The number of structural features of the the '<em>Bean Event</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BEAN_EVENT_FEATURE_COUNT = JavaRefPackage.JAVA_EVENT_FEATURE_COUNT + 0;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl <em>Feature Attribute Map Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY = 9;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY__KEY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Feature Attribute Map Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_ATTRIBUTE_MAP_ENTRY_FEATURE_COUNT = 2;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getImplicitItem()
-	 * @generated
-	 */
-	int IMPLICIT_ITEM = 10;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator <em>Feature Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator
-	 * @generated
-	 */
-	EClass getFeatureDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#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.jem.internal.beaninfo.FeatureDecorator#getDisplayName()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_DisplayName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Short Description</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ShortDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Category</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Category();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Expert</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Expert();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hidden</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Hidden();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Preferred</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_Preferred();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Introspection</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_MergeIntrospection();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attributes Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_AttributesExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implicitly Set Bits</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ImplicitlySetBits();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implicit Decorator Flag</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EAttribute getFeatureDecorator_ImplicitDecoratorFlag();
-
-	/**
-	 * Returns the meta object for the map '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the map '<em>Attributes</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes()
-	 * @see #getFeatureDecorator()
-	 * @generated
-	 */
-	EReference getFeatureDecorator_Attributes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator <em>Event Set Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Event Set Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator
-	 * @generated
-	 */
-	EClass getEventSetDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>In Default Event Set</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_InDefaultEventSet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Unicast</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_Unicast();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Listener Methods Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Add Listener Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_AddListenerMethod();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Listener Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_ListenerMethods();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Listener Type</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_ListenerType();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Remove Listener Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_RemoveListenerMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Event Adapter Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_EventAdapterClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ser List Mthd</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd()
-	 * @see #getEventSetDecorator()
-	 * @generated
-	 */
-	EReference getEventSetDecorator_SerListMthd();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodProxy <em>Method Proxy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Proxy</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodProxy
-	 * @generated
-	 */
-	EClass getMethodProxy();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod()
-	 * @see #getMethodProxy()
-	 * @generated
-	 */
-	EReference getMethodProxy_Method();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator <em>Property Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Property Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator
-	 * @generated
-	 */
-	EClass getPropertyDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Bound</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_Bound();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Constrained</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_Constrained();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Design Time</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_DesignTime();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Always Incompatible</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_AlwaysIncompatible();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Filter Flags</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_FilterFlags();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Field Read Only</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EAttribute getPropertyDecorator_FieldReadOnly();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Property Editor Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_PropertyEditorClass();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Read Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_ReadMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Write Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_WriteMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Field</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField()
-	 * @see #getPropertyDecorator()
-	 * @generated
-	 */
-	EReference getPropertyDecorator_Field();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator <em>Indexed Property Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Indexed Property Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator
-	 * @generated
-	 */
-	EClass getIndexedPropertyDecorator();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Indexed Read Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod()
-	 * @see #getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	EReference getIndexedPropertyDecorator_IndexedReadMethod();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Indexed Write Method</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod()
-	 * @see #getIndexedPropertyDecorator()
-	 * @generated
-	 */
-	EReference getIndexedPropertyDecorator_IndexedWriteMethod();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator <em>Bean Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator
-	 * @generated
-	 */
-	EClass getBeanDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Properties</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Merge Super Events</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_MergeSuperEvents();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Properties</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectProperties();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Methods</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectMethods();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Introspect Events</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_IntrospectEvents();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Customizer Class</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EReference getBeanDecorator_CustomizerClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator <em>Method Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Method Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator
-	 * @generated
-	 */
-	EClass getMethodDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Parms Explicit Empty</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EAttribute getMethodDecorator_ParmsExplicitEmpty();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Parameter Descriptors</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EReference getMethodDecorator_ParameterDescriptors();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Ser Parm Desc</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc()
-	 * @see #getMethodDecorator()
-	 * @generated
-	 */
-	EReference getMethodDecorator_SerParmDesc();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator <em>Parameter Decorator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Parameter Decorator</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator
-	 * @generated
-	 */
-	EClass getParameterDecorator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#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.beaninfo.ParameterDecorator#getName()
-	 * @see #getParameterDecorator()
-	 * @generated
-	 */
-	EAttribute getParameterDecorator_Name();
-
-	/**
-	 * Returns the meta object for data type '{@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue <em>Feature Attribute Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for data type '<em>Feature Attribute Value</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
-	 * @model instanceClass="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-	 * @generated
-	 */
-	EDataType getFeatureAttributeValue();
-
-	/**
-	 * 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
-	 */
-	BeaninfoFactory getBeaninfoFactory();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Do Beaninfo</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_DoBeaninfo();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Property Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedPropertyNames();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Method Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedMethodNames();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Not Inherited Event Names</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames()
-	 * @see #getBeanDecorator()
-	 * @generated
-	 */
-	EAttribute getBeanDecorator_NotInheritedEventNames();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Parameter</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter()
-	 * @see #getParameterDecorator()
-	 * @generated
-	 */
-	EReference getParameterDecorator_Parameter();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanEvent <em>Bean Event</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Event</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.BeanEvent
-	 * @generated
-	 */
-	EClass getBeanEvent();
-
-	/**
-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Feature Attribute Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Attribute Map Entry</em>'.
-	 * @see java.util.Map.Entry
-	 * @model keyType="java.lang.String"
-	 *        valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue" valueDataType="org.eclipse.jem.internal.beaninfo.FeatureAttributeValue"
-	 * @generated
-	 */
-	EClass getFeatureAttributeMapEntry();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	EAttribute getFeatureAttributeMapEntry_Key();
-
-	/**
-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see java.util.Map.Entry
-	 * @see #getFeatureAttributeMapEntry()
-	 * @generated
-	 */
-	EAttribute getFeatureAttributeMapEntry_Value();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Implicit Item</em>'.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @generated
-	 */
-	EEnum getImplicitItem();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
deleted file mode 100644
index 1b982f8..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
+++ /dev/null
@@ -1,326 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: EventSetDecorator.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to EventSetDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator()
- * @model
- * @generated
- */
-
-
-public interface EventSetDecorator extends FeatureDecorator{
-	public static final String EVENTADAPTERCLASS = "eventAdapterClass"; //$NON-NLS-1$
-	/**
-	 * Returns the value of the '<em><b>In Default Event Set</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>In Default Event Set</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>In Default Event Set</em>' attribute.
-	 * @see #isSetInDefaultEventSet()
-	 * @see #unsetInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_InDefaultEventSet()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isInDefaultEventSet();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>In Default Event Set</em>' attribute.
-	 * @see #isSetInDefaultEventSet()
-	 * @see #unsetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 */
-	void setInDefaultEventSet(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @generated
-	 */
-	void unsetInDefaultEventSet();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>In Default Event Set</em>' attribute is set.
-	 * @see #unsetInDefaultEventSet()
-	 * @see #isInDefaultEventSet()
-	 * @see #setInDefaultEventSet(boolean)
-	 * @generated
-	 */
-	boolean isSetInDefaultEventSet();
-
-	/**
-	 * Returns the value of the '<em><b>Unicast</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unicast</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unicast</em>' attribute.
-	 * @see #isSetUnicast()
-	 * @see #unsetUnicast()
-	 * @see #setUnicast(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_Unicast()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isUnicast();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unicast</em>' attribute.
-	 * @see #isSetUnicast()
-	 * @see #unsetUnicast()
-	 * @see #isUnicast()
-	 * @generated
-	 */
-	void setUnicast(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUnicast()
-	 * @see #isUnicast()
-	 * @see #setUnicast(boolean)
-	 * @generated
-	 */
-	void unsetUnicast();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Unicast</em>' attribute is set.
-	 * @see #unsetUnicast()
-	 * @see #isUnicast()
-	 * @see #setUnicast(boolean)
-	 * @generated
-	 */
-	boolean isSetUnicast();
-
-	/**
-	 * Returns the value of the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Listener Methods Explicit Empty</em>' attribute.
-	 * @see #setListenerMethodsExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethodsExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isListenerMethodsExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listener Methods Explicit Empty</em>' attribute.
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 */
-	void setListenerMethodsExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Add Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Add Listener Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Add Listener Method</em>' reference.
-	 * @see #setAddListenerMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_AddListenerMethod()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getAddListenerMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Add Listener Method</em>' reference.
-	 * @see #getAddListenerMethod()
-	 * @generated
-	 */
-	void setAddListenerMethod(Method value);
-
-	/**
-	 * Returns the value of the '<em><b>Listener Methods</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listener Methods</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
-	 * <p>
-	 * ListenerMethods will be decorated with MethodDecorators.
-	 * <p>
-	 * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Listener Methods</em>' reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethods()
-	 * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" required="true" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	EList getListenerMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Listener Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Listener Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Listener Type</em>' reference.
-	 * @see #setListenerType(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerType()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getListenerType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Listener Type</em>' reference.
-	 * @see #getListenerType()
-	 * @generated
-	 */
-	void setListenerType(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Remove Listener Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Remove Listener Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Remove Listener Method</em>' reference.
-	 * @see #setRemoveListenerMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_RemoveListenerMethod()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getRemoveListenerMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Remove Listener Method</em>' reference.
-	 * @see #getRemoveListenerMethod()
-	 * @generated
-	 */
-	void setRemoveListenerMethod(Method value);
-
-	/**
-	 * Returns the value of the '<em><b>Event Adapter Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Event Adapter Class</em>' reference.
-	 * @see #setEventAdapterClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_EventAdapterClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getEventAdapterClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Event Adapter Class</em>' reference.
-	 * @see #getEventAdapterClass()
-	 * @generated
-	 */
-	void setEventAdapterClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Ser List Mthd</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is a private feature. It is used internally only. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ser List Mthd</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_SerListMthd()
-	 * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" containment="true" required="true"
-	 * @generated
-	 */
-	EList getSerListMthd();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
deleted file mode 100644
index 4b502c0..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
+++ /dev/null
@@ -1,491 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: FeatureDecorator.java,v $
- *  $Revision: 1.7 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to FeatureDescriptor in java.
- * <p>
- * Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
- * <p>
- * These comments about merging apply to all subclasses of this decorator too. 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator()
- * @model
- * @generated
- */
-
-
-public interface FeatureDecorator extends EAnnotation{
-		
-	/**
-	 * 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 #isSetDisplayName()
-	 * @see #unsetDisplayName()
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_DisplayName()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#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 #isSetDisplayName()
-	 * @see #unsetDisplayName()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDisplayName()
-	 * @see #getDisplayName()
-	 * @see #setDisplayName(String)
-	 * @generated
-	 */
-	void unsetDisplayName();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Display Name</em>' attribute is set.
-	 * @see #unsetDisplayName()
-	 * @see #getDisplayName()
-	 * @see #setDisplayName(String)
-	 * @generated
-	 */
-	boolean isSetDisplayName();
-
-	/**
-	 * Returns the value of the '<em><b>Short Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Short 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>Short Description</em>' attribute.
-	 * @see #isSetShortDescription()
-	 * @see #unsetShortDescription()
-	 * @see #setShortDescription(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ShortDescription()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getShortDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Short Description</em>' attribute.
-	 * @see #isSetShortDescription()
-	 * @see #unsetShortDescription()
-	 * @see #getShortDescription()
-	 * @generated
-	 */
-	void setShortDescription(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetShortDescription()
-	 * @see #getShortDescription()
-	 * @see #setShortDescription(String)
-	 * @generated
-	 */
-	void unsetShortDescription();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Short Description</em>' attribute is set.
-	 * @see #unsetShortDescription()
-	 * @see #getShortDescription()
-	 * @see #setShortDescription(String)
-	 * @generated
-	 */
-	boolean isSetShortDescription();
-
-	/**
-	 * Returns the value of the '<em><b>Category</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Category</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Category</em>' attribute.
-	 * @see #setCategory(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Category()
-	 * @model
-	 * @generated
-	 */
-	String getCategory();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Category</em>' attribute.
-	 * @see #getCategory()
-	 * @generated
-	 */
-	void setCategory(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Expert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Expert</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expert</em>' attribute.
-	 * @see #isSetExpert()
-	 * @see #unsetExpert()
-	 * @see #setExpert(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Expert()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isExpert();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expert</em>' attribute.
-	 * @see #isSetExpert()
-	 * @see #unsetExpert()
-	 * @see #isExpert()
-	 * @generated
-	 */
-	void setExpert(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetExpert()
-	 * @see #isExpert()
-	 * @see #setExpert(boolean)
-	 * @generated
-	 */
-	void unsetExpert();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Expert</em>' attribute is set.
-	 * @see #unsetExpert()
-	 * @see #isExpert()
-	 * @see #setExpert(boolean)
-	 * @generated
-	 */
-	boolean isSetExpert();
-
-	/**
-	 * Returns the value of the '<em><b>Hidden</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hidden</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Hidden</em>' attribute.
-	 * @see #isSetHidden()
-	 * @see #unsetHidden()
-	 * @see #setHidden(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Hidden()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isHidden();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hidden</em>' attribute.
-	 * @see #isSetHidden()
-	 * @see #unsetHidden()
-	 * @see #isHidden()
-	 * @generated
-	 */
-	void setHidden(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetHidden()
-	 * @see #isHidden()
-	 * @see #setHidden(boolean)
-	 * @generated
-	 */
-	void unsetHidden();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Hidden</em>' attribute is set.
-	 * @see #unsetHidden()
-	 * @see #isHidden()
-	 * @see #setHidden(boolean)
-	 * @generated
-	 */
-	boolean isSetHidden();
-
-	/**
-	 * Returns the value of the '<em><b>Preferred</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Preferred</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Preferred</em>' attribute.
-	 * @see #isSetPreferred()
-	 * @see #unsetPreferred()
-	 * @see #setPreferred(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Preferred()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isPreferred();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Preferred</em>' attribute.
-	 * @see #isSetPreferred()
-	 * @see #unsetPreferred()
-	 * @see #isPreferred()
-	 * @generated
-	 */
-	void setPreferred(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetPreferred()
-	 * @see #isPreferred()
-	 * @see #setPreferred(boolean)
-	 * @generated
-	 */
-	void unsetPreferred();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Preferred</em>' attribute is set.
-	 * @see #unsetPreferred()
-	 * @see #isPreferred()
-	 * @see #setPreferred(boolean)
-	 * @generated
-	 */
-	boolean isSetPreferred();
-
-	/**
-	 * Returns the value of the '<em><b>Merge Introspection</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Merge Introspection</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Merge Introspection</em>' attribute.
-	 * @see #setMergeIntrospection(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_MergeIntrospection()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isMergeIntrospection();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Merge Introspection</em>' attribute.
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 */
-	void setMergeIntrospection(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Attributes Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attributes Explicit Empty</em>' attribute.
-	 * @see #setAttributesExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_AttributesExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isAttributesExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attributes Explicit Empty</em>' attribute.
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 */
-	void setAttributesExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Implicitly Set Bits</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A bitflag for which attributes have been set by BeanInfo/Reflection.
-	 * <p>
-	 * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Implicitly Set Bits</em>' attribute.
-	 * @see #setImplicitlySetBits(long)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitlySetBits()
-	 * @model
-	 * @generated
-	 */
-	long getImplicitlySetBits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implicitly Set Bits</em>' attribute.
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 */
-	void setImplicitlySetBits(long value);
-
-	/**
-	 * Returns the value of the '<em><b>Implicit Decorator Flag</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jem.internal.beaninfo.ImplicitItem}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
-	 * <p>
-	 * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Implicit Decorator Flag</em>' attribute.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see #setImplicitDecoratorFlag(ImplicitItem)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitDecoratorFlag()
-	 * @model
-	 * @generated
-	 */
-	ImplicitItem getImplicitDecoratorFlag();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implicit Decorator Flag</em>' attribute.
-	 * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 */
-	void setImplicitDecoratorFlag(ImplicitItem value);
-
-	/**
-	 * Returns the value of the '<em><b>Attributes</b></em>' map.
-	 * The key is of type {@link java.lang.String},
-	 * and the value is of type {@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue},
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attributes</em>' map.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Attributes()
-	 * @model mapType="org.eclipse.jem.internal.beaninfo.FeatureAttributeMapEntry" keyType="java.lang.String" valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-	 * @generated
-	 */
-	EMap getAttributes();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model parameters=""
-	 * @generated
-	 */
-	String getName();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
deleted file mode 100644
index 197d462..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
+++ /dev/null
@@ -1,168 +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.jem.internal.beaninfo;
-
-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>Implicit Item</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This enum is an internal enum. It is used by BeanInfo for cache maintenance.
- * <p>
- * This enum is not meant to be used by clients.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getImplicitItem()
- * @model
- * @generated
- */
-public final class ImplicitItem extends AbstractEnumerator {
-	/**
-	 * The '<em><b>NOT IMPLICIT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Means this decorator is not implicit. That is it was created by customer.
-	 * <!-- end-model-doc -->
-	 * @see #NOT_IMPLICIT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_IMPLICIT = 0;
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means that the decorator is implicit. That is it was not created by the customer.
-	 * <!-- end-model-doc -->
-	 * @see #IMPLICIT_DECORATOR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLICIT_DECORATOR = 1;
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This means the decorator and the feature where implicit. That is they were not created by the customer.
-	 * <!-- end-model-doc -->
-	 * @see #IMPLICIT_DECORATOR_AND_FEATURE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLICIT_DECORATOR_AND_FEATURE = 2;
-
-	/**
-	 * The '<em><b>NOT IMPLICIT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_IMPLICIT
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem NOT_IMPLICIT_LITERAL = new ImplicitItem(NOT_IMPLICIT, "NOT_IMPLICIT");
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLICIT_DECORATOR
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem IMPLICIT_DECORATOR_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR, "IMPLICIT_DECORATOR");
-
-	/**
-	 * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLICIT_DECORATOR_AND_FEATURE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ImplicitItem IMPLICIT_DECORATOR_AND_FEATURE_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR_AND_FEATURE, "IMPLICIT_DECORATOR_AND_FEATURE");
-
-	/**
-	 * An array of all the '<em><b>Implicit Item</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ImplicitItem[] VALUES_ARRAY =
-		new ImplicitItem[] {
-			NOT_IMPLICIT_LITERAL,
-			IMPLICIT_DECORATOR_LITERAL,
-			IMPLICIT_DECORATOR_AND_FEATURE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Implicit Item</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>Implicit Item</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ImplicitItem get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ImplicitItem result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Implicit Item</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ImplicitItem get(int value) {
-		switch (value) {
-			case NOT_IMPLICIT: return NOT_IMPLICIT_LITERAL;
-			case IMPLICIT_DECORATOR: return IMPLICIT_DECORATOR_LITERAL;
-			case IMPLICIT_DECORATOR_AND_FEATURE: return IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ImplicitItem(int value, String name) {
-		super(value, name);
-	}
-
-} //ImplicitItem
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
deleted file mode 100644
index 9dd17c8..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
+++ /dev/null
@@ -1,149 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: IndexedPropertyDecorator.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to IndexedPropertyDecorator
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface IndexedPropertyDecorator extends PropertyDecorator{
-	/**
-	 * Returns the value of the '<em><b>Indexed Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Indexed Read Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Indexed Read Method</em>' reference.
-	 * @see #isSetIndexedReadMethod()
-	 * @see #unsetIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedReadMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getIndexedReadMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Indexed Read Method</em>' reference.
-	 * @see #isSetIndexedReadMethod()
-	 * @see #unsetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @generated
-	 */
-	void setIndexedReadMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @generated
-	 */
-	void unsetIndexedReadMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Indexed Read Method</em>' reference is set.
-	 * @see #unsetIndexedReadMethod()
-	 * @see #getIndexedReadMethod()
-	 * @see #setIndexedReadMethod(Method)
-	 * @generated
-	 */
-	boolean isSetIndexedReadMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Indexed Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Indexed Write Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Indexed Write Method</em>' reference.
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedWriteMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getIndexedWriteMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Indexed Write Method</em>' reference.
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @generated
-	 */
-	void setIndexedWriteMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @generated
-	 */
-	void unsetIndexedWriteMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Indexed Write Method</em>' reference is set.
-	 * @see #unsetIndexedWriteMethod()
-	 * @see #getIndexedWriteMethod()
-	 * @see #setIndexedWriteMethod(Method)
-	 * @generated
-	 */
-	boolean isSetIndexedWriteMethod();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java
deleted file mode 100644
index 33ee350..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.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.jem.internal.beaninfo;
-/*
- *  $RCSfile: MethodDecorator.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to MethodDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator()
- * @model
- * @generated
- */
-
-
-public interface MethodDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Parms Explicit Empty</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parms Explicit Empty</em>' attribute.
-	 * @see #setParmsExplicitEmpty(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParmsExplicitEmpty()
-	 * @model
-	 * @generated
-	 */
-	boolean isParmsExplicitEmpty();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parms Explicit Empty</em>' attribute.
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 */
-	void setParmsExplicitEmpty(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Parameter Descriptors</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter Descriptors</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is the parameter descriptors list.
-	 * <p>
-	 * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameter Descriptors</em>' reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParameterDescriptors()
-	 * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" transient="true" volatile="true" derived="true"
-	 * @generated
-	 */
-	EList getParameterDescriptors();
-
-	/**
-	 * Returns the value of the '<em><b>Ser Parm Desc</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ser Parm Desc</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This is a private feature. It is used internally only. 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Ser Parm Desc</em>' containment reference list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_SerParmDesc()
-	 * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" containment="true"
-	 * @generated
-	 */
-	EList getSerParmDesc();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
deleted file mode 100644
index d7a852a..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
+++ /dev/null
@@ -1,75 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: MethodProxy.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.emf.ecore.EOperation;
-
-import org.eclipse.jem.java.Method;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
- * <p>
- * MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
- * <p>
- * MethodProxies would also have MethodDecorators.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy()
- * @model
- * @generated
- */
-
-
-public interface MethodProxy extends EOperation{
-	/**
-	 * Returns the value of the '<em><b>Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method</em>' reference.
-	 * @see #setMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy_Method()
-	 * @model required="true"
-	 * @generated
-	 */
-	Method getMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method</em>' reference.
-	 * @see #getMethod()
-	 * @generated
-	 */
-	void setMethod(Method value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java
deleted file mode 100644
index 42ef547..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java
+++ /dev/null
@@ -1,97 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: ParameterDecorator.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator()
- * @model
- * @generated
- */
-
-
-public interface ParameterDecorator extends FeatureDecorator{
-	/**
-	 * 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 name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#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>Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parameter</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Parameter</em>' reference.
-	 * @see #setParameter(JavaParameter)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Parameter()
-	 * @model transient="true"
-	 * @generated
-	 */
-	JavaParameter getParameter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parameter</em>' reference.
-	 * @see #getParameter()
-	 * @generated
-	 */
-	void setParameter(JavaParameter value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
deleted file mode 100644
index 382a68b..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
+++ /dev/null
@@ -1,496 +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.jem.internal.beaninfo;
-/*
- *  $RCSfile: PropertyDecorator.java,v $
- *  $Revision: 1.8 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClassifier;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to PropertyDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface PropertyDecorator extends FeatureDecorator{
-	/**
-	 * Returns the value of the '<em><b>Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bound</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bound</em>' attribute.
-	 * @see #isSetBound()
-	 * @see #unsetBound()
-	 * @see #setBound(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Bound()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isBound();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bound</em>' attribute.
-	 * @see #isSetBound()
-	 * @see #unsetBound()
-	 * @see #isBound()
-	 * @generated
-	 */
-	void setBound(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBound()
-	 * @see #isBound()
-	 * @see #setBound(boolean)
-	 * @generated
-	 */
-	void unsetBound();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Bound</em>' attribute is set.
-	 * @see #unsetBound()
-	 * @see #isBound()
-	 * @see #setBound(boolean)
-	 * @generated
-	 */
-	boolean isSetBound();
-
-	/**
-	 * Returns the value of the '<em><b>Constrained</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constrained</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constrained</em>' attribute.
-	 * @see #isSetConstrained()
-	 * @see #unsetConstrained()
-	 * @see #setConstrained(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Constrained()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isConstrained();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constrained</em>' attribute.
-	 * @see #isSetConstrained()
-	 * @see #unsetConstrained()
-	 * @see #isConstrained()
-	 * @generated
-	 */
-	void setConstrained(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetConstrained()
-	 * @see #isConstrained()
-	 * @see #setConstrained(boolean)
-	 * @generated
-	 */
-	void unsetConstrained();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Constrained</em>' attribute is set.
-	 * @see #unsetConstrained()
-	 * @see #isConstrained()
-	 * @see #setConstrained(boolean)
-	 * @generated
-	 */
-	boolean isSetConstrained();
-
-	/**
-	 * Returns the value of the '<em><b>Design Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Design Time</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If not set, then normal default processing.
-	 * 
-	 * If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.
-	 * 
-	 * If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Design Time</em>' attribute.
-	 * @see #isSetDesignTime()
-	 * @see #unsetDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_DesignTime()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isDesignTime();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Design Time</em>' attribute.
-	 * @see #isSetDesignTime()
-	 * @see #unsetDesignTime()
-	 * @see #isDesignTime()
-	 * @generated
-	 */
-	void setDesignTime(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDesignTime()
-	 * @see #isDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @generated
-	 */
-	void unsetDesignTime();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Design Time</em>' attribute is set.
-	 * @see #unsetDesignTime()
-	 * @see #isDesignTime()
-	 * @see #setDesignTime(boolean)
-	 * @generated
-	 */
-	boolean isSetDesignTime();
-
-	/**
-	 * Returns the value of the '<em><b>Always Incompatible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Always Incompatible</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Always Incompatible</em>' attribute.
-	 * @see #setAlwaysIncompatible(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_AlwaysIncompatible()
-	 * @model
-	 * @generated
-	 */
-	boolean isAlwaysIncompatible();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Always Incompatible</em>' attribute.
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 */
-	void setAlwaysIncompatible(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Filter Flags</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Filter Flags</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>Filter Flags</em>' attribute list.
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FilterFlags()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getFilterFlags();
-
-	/**
-	 * Returns the value of the '<em><b>Field Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field Read Only</em>' attribute.
-	 * @see #setFieldReadOnly(boolean)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FieldReadOnly()
-	 * @model
-	 * @generated
-	 */
-	boolean isFieldReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field Read Only</em>' attribute.
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 */
-	void setFieldReadOnly(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Property Editor Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property Editor Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property Editor Class</em>' reference.
-	 * @see #setPropertyEditorClass(JavaClass)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_PropertyEditorClass()
-	 * @model
-	 * @generated
-	 */
-	JavaClass getPropertyEditorClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Property Editor Class</em>' reference.
-	 * @see #getPropertyEditorClass()
-	 * @generated
-	 */
-	void setPropertyEditorClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Read Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Read Method</em>' reference.
-	 * @see #isSetReadMethod()
-	 * @see #unsetReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_ReadMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getReadMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Method</em>' reference.
-	 * @see #isSetReadMethod()
-	 * @see #unsetReadMethod()
-	 * @see #getReadMethod()
-	 * @generated
-	 */
-	void setReadMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReadMethod()
-	 * @see #getReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @generated
-	 */
-	void unsetReadMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Read Method</em>' reference is set.
-	 * @see #unsetReadMethod()
-	 * @see #getReadMethod()
-	 * @see #setReadMethod(Method)
-	 * @generated
-	 */
-	boolean isSetReadMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Write Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Write Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Write Method</em>' reference.
-	 * @see #isSetWriteMethod()
-	 * @see #unsetWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_WriteMethod()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Method getWriteMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Write Method</em>' reference.
-	 * @see #isSetWriteMethod()
-	 * @see #unsetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @generated
-	 */
-	void setWriteMethod(Method value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @generated
-	 */
-	void unsetWriteMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Write Method</em>' reference is set.
-	 * @see #unsetWriteMethod()
-	 * @see #getWriteMethod()
-	 * @see #setWriteMethod(Method)
-	 * @generated
-	 */
-	boolean isSetWriteMethod();
-
-	/**
-	 * Returns the value of the '<em><b>Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Field</em>' reference.
-	 * @see #isSetField()
-	 * @see #unsetField()
-	 * @see #setField(Field)
-	 * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Field()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	Field getField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Field</em>' reference.
-	 * @see #isSetField()
-	 * @see #unsetField()
-	 * @see #getField()
-	 * @generated
-	 */
-	void setField(Field value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetField()
-	 * @see #getField()
-	 * @see #setField(Field)
-	 * @generated
-	 */
-	void unsetField();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Field</em>' reference is set.
-	 * @see #unsetField()
-	 * @see #getField()
-	 * @see #setField(Field)
-	 * @generated
-	 */
-	boolean isSetField();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model parameters=""
-	 * @generated
-	 */
-	EClassifier getPropertyType();
-
-	/**
-	 * @return boolean for whether this property is writeable or not
-	 * It could have a write method or it could have a field (e.g. java.awt.Insets.top)
-	 */
-	boolean isWriteable();
-
-	/**
-	 * @return boolean for whether this property is readable or not
-	 * It could have a read method or it could have a field (e.g. java.awt.Insets.top)
-	 */
-	boolean isReadable();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
deleted file mode 100644
index af686d7..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.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
- *******************************************************************************/
-/*
- *  $RCSfile: BeanInfoAdapterMessages.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $ 
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
- * 
- * 
- * @since 1.0.0
- */
-public class BeanInfoAdapterMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.adapters.messages";	//$NON-NLS-1$
-
-	// Keys for messages/strings within the resource bundle.
-	static public final String
-		INTROSPECTFAILED = "INTROSPECT_FAILED_EXC_"; //$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private BeanInfoAdapterMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
deleted file mode 100644
index fb18ccf..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
+++ /dev/null
@@ -1,1446 +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: BeanInfoDecoratorUtility.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/11 22:41:17 $ 
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-import org.eclipse.jem.internal.beaninfo.impl.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * This is a utility class for handling the BeanInfo decorators with respect to the overrides (explicit settings) vs. introspected/reflected (implicit
- * settings) It handles the transmission of data from the VM for introspection.
- * 
- * @since 1.1.0
- */
-public class BeanInfoDecoratorUtility {
-
-	/**
-	 * Clear out the implicit settings for FeatureDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(FeatureDecorator decor) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0)
-			decor.unsetDisplayName();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0)
-			decor.unsetShortDescription();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category());
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0)
-			decor.unsetExpert();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0)
-			decor.unsetHidden();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0)
-			decor.unsetPreferred();
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Attributes());
-		decor
-				.setImplicitlySetBits(implicitSettings
-						& ~(FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT | FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT
-								| FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT | FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT
-								| FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT | FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT | FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings for BeanDecorator
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(BeanDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass());
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0)
-			decor.unsetMergeSuperProperties();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0)
-			decor.unsetMergeSuperMethods();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0)
-			decor.unsetMergeSuperEvents();
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()); // Just clear them. This is our attribute. It should
-																							   // not be set overrides.
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()); // Just clear them. This is our attribute. It should
-																							   // not be set overrides.
-		if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()))
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()); // Just clear them. This is our attribute. It should not
-																							// be set overrides.
-
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT
-						| BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings of the PropertyDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(PropertyDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass());
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0)
-			decor.unsetReadMethod();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0)
-			decor.unsetWriteMethod();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
-			decor.unsetField();		
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field());
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0)
-			decor.unsetBound();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0)
-			decor.unsetConstrained();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0)
-			decor.unsetDesignTime();
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT | PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT
-						| PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT | PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT
-						| PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT | PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT));
-	}
-
-	/**
-	 * Clear out the implicit settings of the IndexedPropertyDecorator.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(IndexedPropertyDecorator decor) {
-		clear((PropertyDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0)
-			decor.unsetIndexedReadMethod();
-		if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0)
-			decor.unsetIndexedWriteMethod();
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT | IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT));
-	}
-
-	/**
-	 * Clear the method decorator of any implicit settings.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(MethodDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & (MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT)) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc());
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT));
-	}
-
-	/**
-	 * Clear the event set decorator of any implicit settings.
-	 * 
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void clear(EventSetDecorator decor) {
-		clear((FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		// For each setting, see if it was implicitly set, and if it was, then unset it.
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass());
-		if ((implicitSettings & (EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT)) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod());
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0)
-			decor.unsetInDefaultEventSet();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0)
-			decor.unsetUnicast();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0)
-			decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType());
-
-		decor.setImplicitlySetBits(implicitSettings
-				& ~(EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT
-						| EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT
-						| EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT
-						| EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT));
-
-	}
-
-	public static void introspect(IBeanProxy modelBeaninfoProxy, IntrospectCallBack callback) {
-		ProxyIntrospectCallBack cb = new ProxyIntrospectCallBack(callback);
-		modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().registerCallback(modelBeaninfoProxy, cb);
-		try {
-			BeaninfoProxyConstants.getConstants(modelBeaninfoProxy.getProxyFactoryRegistry()).getSendBeanInfoProxy()
-					.invokeCatchThrowableExceptions(modelBeaninfoProxy);
-		} finally {
-			modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().deregisterCallback(modelBeaninfoProxy);
-		}
-
-	}
-
-	/**
-	 * This call back is for each requested type of record. It allows the callee to process this record.
-	 * 
-	 * @since 1.1.0
-	 */
-	public interface IntrospectCallBack {
-
-		/**
-		 * Process the BeanDecoratorRecord. The callee can decide what needs to be done with this record. It would return the BeandDecorator that needs
-		 * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return BeanDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-		public BeanDecorator process(BeanRecord record);
-
-		/**
-		 * Process the PropertyRecord. The callee can decide what needs to be done with this record. It would return the PropertyDecorator that needs
-		 * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-		public PropertyDecorator process(PropertyRecord record);
-
-		/**
-		 * Process the IndexedPropertyRecord. The callee can decide what needs to be done with this record. It would return the
-		 * IndexedPropertyDecorator that needs to have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored. There is a possibility that a straight
-		 *         PropertyDecorator can be returned instead (in the case that it was explictly set by overrides as a property but beaninfo thinks it
-		 *         is an index. This can be handled by it will only set the PropertyRecord part. It normally should be an IndexedPropertyDecorator
-		 *         returned.
-		 * 
-		 * @since 1.1.0
-		 */
-		public PropertyDecorator process(IndexedPropertyRecord record);
-
-		/**
-		 * Process the MethodRecord. The callee can decide what needs to be done with this record. It would return the MethodDecorator that needs to
-		 * have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return MethodDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-
-		public MethodDecorator process(MethodRecord record);
-
-		/**
-		 * Process the EventRecord. The callee can decide what needs to be done with this record. It would return the EventSetDecorator that needs to
-		 * have the record applied to. If it returns <code>null</code> then the record will be ignored.
-		 * 
-		 * <p>
-		 * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
-		 * have them on a separate thread.
-		 * 
-		 * @param record
-		 * @return EventSetDecorator to be applied to, or <code>null</code> if record is to be ignored.
-		 * 
-		 * @since 1.1.0
-		 */
-
-		public EventSetDecorator process(EventSetRecord record);
-	}
-
-	private static class ProxyIntrospectCallBack implements ICallback {
-
-		private IntrospectCallBack introspectCallback;
-
-		public ProxyIntrospectCallBack(IntrospectCallBack introspectCallback) {
-			this.introspectCallback = introspectCallback;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, org.eclipse.jem.internal.proxy.core.IBeanProxy)
-		 */
-		public Object calledBack(int msgID, IBeanProxy parm) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object)
-		 */
-		public Object calledBack(int msgID, Object parm) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object[])
-		 */
-		public Object calledBack(int msgID, Object[] parms) {
-			return null; // Not used.
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, java.io.InputStream)
-		 */
-		public void calledBackStream(int msgID, InputStream is) {
-			ObjectInputStream ois;
-			try {
-				ois = new ObjectInputStream(is);
-				while (true) {
-					int cmdId = ois.readInt();
-					switch (cmdId) {
-						case IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT:
-							try {
-								BeanRecord br = (BeanRecord) ois.readObject();
-								BeanDecorator bd = introspectCallback.process(br);
-								if (bd != null) {
-									clear(bd);
-									applyRecord(bd, br);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-						case IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT:
-							try {
-								int propCount = ois.readInt();
-								for (int i = 0; i < propCount; i++) {
-									PropertyRecord pr = (PropertyRecord) ois.readObject();
-									if (pr.getClass() == IndexedPropertyRecord.class) {
-										IndexedPropertyRecord ipr = (IndexedPropertyRecord) pr;
-										PropertyDecorator ip = introspectCallback.process(ipr);
-										if (ip != null) {
-											// It actually could be either a property decorator or an indexed property decorator. This could happen
-											// because the overrides file has explicitly declared a PropertyDecorator, so we can't change it to an
-											// Indexed.
-											// So in that case we can only fill the property part.
-											if (ip.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR)
-												applyRecord((IndexedPropertyDecorator) ip, ipr);
-											else
-												applyRecord(ip, pr); // It was forced to be a property and not indexed.
-										}
-									} else {
-										PropertyDecorator p = introspectCallback.process(pr);
-										if (p != null) {
-											// It actually could be either a property decorator or an indexed property decorator. This could happen
-											// because the overrides file has explicitly declared an IndexedPropertyDecorator, so we can't change it
-											// to an
-											// Property.
-											// So in that case we can only fill the property part.
-											applyRecord(p, pr);
-										}
-									}
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} finally {
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT:
-							try {
-								int opCount = ois.readInt();
-								for (int i = 0; i < opCount; i++) {
-									MethodRecord mr = (MethodRecord) ois.readObject();
-									MethodDecorator m = introspectCallback.process(mr);
-									if (m != null)
-										applyRecord(m, mr);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT:
-							try {
-								int opCount = ois.readInt();
-								for (int i = 0; i < opCount; i++) {
-									EventSetRecord evr = (EventSetRecord) ois.readObject();
-									EventSetDecorator e = introspectCallback.process(evr);
-									if (e != null)
-										applyRecord(e, evr);
-								}
-							} catch (IOException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassNotFoundException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							} catch (ClassCastException e) {
-								// In case we got bad data sent in.
-								BeaninfoPlugin.getPlugin().getLogger().log(e);
-							}
-							break;
-
-						case IBeanInfoIntrospectionConstants.DONE:
-							return;	// Good. This is a good stop.
-							
-						default:
-							return;	// This is invalid. Should of gotton something.
-					}
-				}
-			} catch (IOException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-	}
-
-	/**
-	 * Apply the feature record to the feature decorator. This is protected because this is an abstract and should never be called by itself.
-	 * <p>
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void applyRecord(FeatureDecorator decor, FeatureRecord record) {
-		// Subclasses will clear their decor, which will automatically clear the FeatureDecor part for us.
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.displayName != null && !decor.isSetDisplayName()) {
-			decor.setDisplayName(record.displayName);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT;
-		}
-		if (record.shortDescription != null && !decor.isSetShortDescription()) {
-			decor.setShortDescription(record.shortDescription);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT;
-		}
-		if (record.category != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category())) {
-			decor.setCategory(record.category);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT;
-		}
-		if (!decor.isSetExpert()) {
-			if (decor.isExpert() != record.expert)
-				decor.setExpert(record.expert); // Don't want to explicitly set it if it is equal to default (this will put less out to the cache file
-												// and so will parse and apply faster).
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT;
-		}
-		if (!decor.isSetHidden()) {
-			if (decor.isHidden() != record.hidden)
-				decor.setHidden(record.hidden);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT;
-		}
-		if (!decor.isSetPreferred()) {
-			if (decor.isPreferred() != record.preferred)
-				decor.setPreferred(record.preferred);
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT;
-		}
-		if (record.attributeNames != null && !decor.isAttributesExplicitEmpty()
-				&& !decor.eIsSet(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Attributes())) {
-			// This is a list, so we need to read an fill in.
-			EMap attrs = decor.getAttributes();
-			for (int i = 0; i < record.attributeNames.length; i++) {
-				FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl) ((BeaninfoFactoryImpl) BeaninfoFactory.eINSTANCE)
-						.createFeatureAttributeMapEntry();
-				entry.setTypedKey(record.attributeNames[i]);
-				entry.setTypedValue(record.attributeValues[i]);
-				attrs.add(entry);
-			}
-			implicitSettings |= FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the bean record to the bean decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(BeanDecorator decor, BeanRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.customizerClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass())) {
-			decor.setCustomizerClass(createJavaClassProxy(record.customizerClassName));
-			implicitSettings |= BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperProperties()) {
-			if (decor.isMergeSuperProperties() != record.mergeInheritedProperties)
-				decor.setMergeSuperProperties(record.mergeInheritedProperties);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperMethods()) {
-			if (decor.isMergeSuperMethods() != record.mergeInheritedOperations)
-				decor.setMergeSuperMethods(record.mergeInheritedOperations);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT;
-		}
-		if (!decor.isSetMergeSuperEvents()) {
-			if (decor.isMergeSuperEvents() != record.mergeInheritedEvents)
-				decor.setMergeSuperEvents(record.mergeInheritedEvents);
-			implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT;
-		}
-		if (record.notInheritedPropertyNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedPropertyNames().addAll(Arrays.asList(record.notInheritedPropertyNames));
-		}
-		if (record.notInheritedOperationNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedMethodNames().addAll(Arrays.asList(record.notInheritedOperationNames));
-		}
-		if (record.notInheritedEventNames != null) {
-			// This is always applied. This isn't a client override so we can just slam it.
-			decor.getNotInheritedEventNames().addAll(Arrays.asList(record.notInheritedEventNames));
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the PropertyRecord to the PropertyDecorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(PropertyDecorator decor, PropertyRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		applyOnly(decor, record);
-	}
-
-	/*
-	 * Apply only to property decorator part. Allows IndexedProperty to apply just the Property part and not do duplicate work
-	 */
-	private static void applyOnly(PropertyDecorator decor, PropertyRecord record) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.propertyEditorClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass())) {
-			decor.setPropertyEditorClass(createJavaClassProxy(record.propertyEditorClassName));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT;
-		}
-		if (record.readMethod != null && !decor.isSetReadMethod()) {
-			decor.setReadMethod(createJavaMethodProxy(record.readMethod));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
-		}
-		if (record.writeMethod != null && !decor.isSetWriteMethod()) {
-			decor.setWriteMethod(createJavaMethodProxy(record.writeMethod));
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
-		}
-		if (record.field != null && !decor.isSetField()) {
-			decor.setField(createJavaFieldProxy(record.field));
-			if (decor.isFieldReadOnly() != record.field.readOnly)
-				decor.setFieldReadOnly(record.field.readOnly);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT;
-		}		
-		if (!decor.isSetBound()) {
-			if (decor.isBound() != record.bound)
-				decor.setBound(record.bound);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (!decor.isSetConstrained()) {
-			if (decor.isConstrained() != record.constrained)
-				decor.setConstrained(record.constrained);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
-		}
-		if (record.designTime != null && !decor.isSetDesignTime()) {
-			// Design time is slightly different than the other booleans because
-			// explicitly set to true/false is important versus not explicitly set at all (which is false).
-			decor.setDesignTime(record.designTime.booleanValue());
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-
-	}
-
-	public static void applyRecord(IndexedPropertyDecorator decor, IndexedPropertyRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-		applyOnly(decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.indexedReadMethod != null && !decor.isSetIndexedReadMethod()) {
-			decor.setIndexedReadMethod(createJavaMethodProxy(record.indexedReadMethod));
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
-		}
-		if (record.indexedWriteMethod != null && !decor.isSetIndexedWriteMethod()) {
-			decor.setIndexedWriteMethod(createJavaMethodProxy(record.indexedWriteMethod));
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
-		}
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the method record to the method decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(MethodDecorator decor, MethodRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.parameters != null && !decor.isParmsExplicitEmpty()
-				&& !decor.eIsSet(BeaninfoPackage.eINSTANCE.getMethodDecorator_ParameterDescriptors())) {
-			// This is a list, so we need to read an fill in.
-			List parms = decor.getSerParmDesc(); // So as not to have it implicitly fill it in, which it would if we called getParameterDescriptors.
-			for (int i = 0; i < record.parameters.length; i++) {
-				ParameterDecorator parm = BeaninfoFactory.eINSTANCE.createParameterDecorator();
-				applyRecord(parm, record.parameters[i]);
-				parms.add(parm);
-			}
-			implicitSettings |= MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT;
-			implicitSettings &= ~MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT; // Should of already been cleared, but be safe.
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	public static void applyRecord(ParameterDecorator decor, ParameterRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.name != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Name())) {
-			decor.setName(record.name);
-			implicitSettings |= ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT;
-		}
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Apply the event set record to the event set decorator.
-	 * 
-	 * @param decor
-	 * @param record
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void applyRecord(EventSetDecorator decor, EventSetRecord record) {
-		applyRecord((FeatureDecorator) decor, record);
-
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (record.addListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
-			decor.setAddListenerMethod(createJavaMethodProxy(record.addListenerMethod));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
-		}
-		if (record.eventAdapterClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass())) {
-			decor.setEventAdapterClass(createJavaClassProxy(record.eventAdapterClassName));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT;
-		}
-		if (record.listenerMethodDescriptors != null && !decor.isListenerMethodsExplicitEmpty()
-				&& !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerMethods())) {
-			List methods = decor.getSerListMthd(); // So as not to have it implicitly fill it in, which it would if we called getListenerMethods.
-			for (int i = 0; i < record.listenerMethodDescriptors.length; i++) {
-				BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
-				MethodRecord mr = record.listenerMethodDescriptors[i];
-				Method method = createJavaMethodProxy(mr.methodForDescriptor);
-				// We need a method proxy, and a method decorator.
-				MethodProxy mproxy = bfact.createMethodProxy();
-				mproxy.setMethod(method);
-				mproxy.setName(mr.name);
-				MethodDecorator md = bfact.createMethodDecorator();
-				applyRecord(md, mr);
-				mproxy.getEAnnotations().add(md);
-				methods.add(mproxy);
-			}
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT;
-			implicitSettings &= ~EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT; // Should of already been cleared, but be safe.
-		}
-		if (record.listenerTypeName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
-			decor.setListenerType(createJavaClassProxy(record.listenerTypeName));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
-		}
-		if (record.removeListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
-			decor.setRemoveListenerMethod(createJavaMethodProxy(record.removeListenerMethod));
-			implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
-		}
-		if (!decor.isSetInDefaultEventSet()) {
-			if (record.inDefaultEventSet != decor.isInDefaultEventSet())
-				decor.setInDefaultEventSet(record.inDefaultEventSet);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT;
-		}
-		if (!decor.isSetUnicast()) {
-			if (record.unicast != decor.isUnicast())
-				decor.setUnicast(record.unicast);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT;
-		}
-
-		decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Create a java class proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
-	 * until someone actually asks for it.
-	 * <p>
-	 * The jniName must refer to a JavaClass or errors could occur later on.
-	 * 
-	 * @param jniName
-	 *            classname in JNI format.
-	 * @return JavaClass proxy or <code>null</code> if not a java class (it may be a type).
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaClass createJavaClassProxy(String jniName) {
-		JavaHelpers jh = createJavaTypeProxy(jniName);
-		return jh instanceof JavaClass ? (JavaClass) jh : null;
-	}
-
-	/**
-	 * Create a JavaHelpers proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
-	 * until someone actually asks for it.
-	 * 
-	 * @param jniName
-	 *            typename in JNI format.
-	 * @return JavaHelper proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaHelpers createJavaTypeProxy(String jniName) {
-		String formalName = MapJNITypes.getFormalTypeName(jniName);
-
-		URI uri = Utilities.getJavaClassURI(formalName);
-		JavaHelpers jh = null;
-		if (MapJNITypes.isFormalTypePrimitive(formalName))
-			jh = JavaRefFactory.eINSTANCE.createJavaDataType();
-		else
-			jh = JavaRefFactory.eINSTANCE.createJavaClass();
-		((InternalEObject) jh).eSetProxyURI(uri);
-		return jh;
-	}
-
-	public static Method createJavaMethodProxy(ReflectMethodRecord method) {
-		String[] parmTypes = method.parameterTypeNames != null ? new String[method.parameterTypeNames.length] : null;
-		if (parmTypes != null)
-			for (int i = 0; i < method.parameterTypeNames.length; i++) {
-				parmTypes[i] = MapJNITypes.getFormalTypeName(method.parameterTypeNames[i]);
-			}
-		URI uri = Utilities.getMethodURI(MapJNITypes.getFormalTypeName(method.className), method.methodName, parmTypes);
-		Method methodEMF = JavaRefFactory.eINSTANCE.createMethod();
-		((InternalEObject) methodEMF).eSetProxyURI(uri);
-		return methodEMF;
-	}
-	
-	public static Field createJavaFieldProxy(ReflectFieldRecord field) {
-		URI uri = Utilities.getFieldURI(MapJNITypes.getFormalTypeName(field.className), field.fieldName);
-		Field fieldEMF = JavaRefFactory.eINSTANCE.createField();
-		((InternalEObject) fieldEMF).eSetProxyURI(uri);
-		return fieldEMF;
-	}	
-
-	/**
-	 * Set the properties on the PropertyDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
-	 * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
-	 * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
-	 * explicit settings.
-	 * 
-	 * @param prop
-	 * @param bound
-	 * @param constrained
-	 * @param getter
-	 * @param setter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(PropertyDecorator prop, boolean bound, boolean constrained, Method getter, Method setter) {
-		long implicitSettings = prop.getImplicitlySetBits();
-		if (getter != null && !prop.isSetReadMethod()) {
-			prop.setReadMethod(getter);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
-		}
-		if (setter != null && !prop.isSetWriteMethod()) {
-			prop.setWriteMethod(setter);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
-		}
-		if (!prop.isSetBound()) {
-			if (prop.isBound() != bound)
-				prop.setBound(bound);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (!prop.isSetConstrained()) {
-			if (prop.isConstrained() != constrained)
-				prop.setConstrained(constrained);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
-		}
-		prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Set the properties on the IndexedPropertyDecorator. These come from reflection. It is only the indexed portion. The base property portion
-	 * should have already been set. Since this is a private interface between BeaninfoClassAdapter and this class, not all possible settings need to
-	 * be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already been done so that there are no old implicit
-	 * settings. It will check if properties are set already before setting so that don't wipe out explicit settings.
-	 * 
-	 * @param prop
-	 * @param indexedGetter
-	 * @param indexedSetter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(IndexedPropertyDecorator prop, Method indexedGetter, Method indexedSetter) {
-		long implicitSettings = prop.getImplicitlySetBits();
-		if (indexedGetter != null && !prop.isSetIndexedReadMethod()) {
-			prop.setIndexedReadMethod(indexedGetter);
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
-		}
-		if (indexedSetter != null && !prop.isSetIndexedWriteMethod()) {
-			prop.setIndexedWriteMethod(indexedSetter);
-			implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
-		}
-		prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Set the properties on the EventSetDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
-	 * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
-	 * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
-	 * explicit settings.
-	 * 
-	 * @param event
-	 * @param bound
-	 * @param constrained
-	 * @param getter
-	 * @param setter
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setProperties(EventSetDecorator event, Method addListenerMethod, Method removeListenerMethod, boolean unicast,
-			JavaClass listenerType) {
-		long implicitSettings = event.getImplicitlySetBits();
-		if (addListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
-			event.setAddListenerMethod(addListenerMethod);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
-		}
-		if (removeListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
-			event.setRemoveListenerMethod(removeListenerMethod);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
-		}
-		if (!event.isSetUnicast()) {
-			if (event.isUnicast() != unicast)
-				event.setUnicast(unicast);
-			implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
-		}
-		if (listenerType != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
-			event.setListenerType(listenerType);
-			implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
-		}
-
-		event.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-	}
-
-	/**
-	 * Build the appropriate change record for the bean decorator. Either it is an add of a new bean decorator or it is the setting of the implicit
-	 * settings on an non-implicit bean decorator.
-	 * @param cd
-	 * @param bd
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, BeanDecorator bd) {
-		// Only do anything if merge introspection. If no merge introspection, then there is no change needed.
-		if (bd.isMergeIntrospection()) {
-			if (bd.getImplicitDecoratorFlag() != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-				// It is implicit, so do an add to end, new value.
-				doAddToEnd(cd, getFeatureChangeList(cd, bd.getEModelElement()), EcorePackage.eINSTANCE.getEModelElement_EAnnotations(), bd, true);
-			} else {
-				// Just do sets on implicit changed ones
-				buildNonImplicitChange(cd, getFeatureChangeList(cd, bd), bd);
-			}
-		}
-
-	}
-
-	/**
-	 * Build the appropriate change record for the property decorator. Either it is an add of a new property decorator or it is the setting of the implicit
-	 * settings on an non-implicit property decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param pd
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, PropertyDecorator pd) {
-		// Only do changes if merge introspection. If not merging, then there are no changes.
-		if (pd.isMergeIntrospection()) {
-			boolean indexed = pd.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR;
-			EStructuralFeature feature = (EStructuralFeature) pd.getEModelElement();
-			switch (pd.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, feature);
-					doAddToEnd(cd, fcs, pd.eContainingFeature(), pd, true);
-					buildNonImplicitChange(cd, fcs, feature, indexed);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, feature.eContainer()), feature.eContainingFeature(), feature, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, pd), pd, indexed);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, feature), feature, indexed);
-					break;
-			}
-		}
-	}
-	
-	/**
-	 * Build the appropriate change record for the event set decorator. Either it is an add of a new event set decorator or it is the setting of the implicit
-	 * settings on an non-implicit event set decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param ed
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, EventSetDecorator ed) {
-		// Only build changes if merge introspection. If not merge then there are no changes.
-		if (ed.isMergeIntrospection()) {
-			JavaEvent event = (JavaEvent) ed.getEModelElement();
-			switch (ed.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, event);
-					doAddToEnd(cd, fcs, ed.eContainingFeature(), ed, true);
-					buildNonImplicitChange(cd, fcs, event);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, event.eContainer()), event.eContainingFeature(), event, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, ed), ed);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, event), event);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Build the appropriate change record for the method decorator. Either it is an add of a new method decorator or it is the setting of the implicit
-	 * settings on an non-implicit method decorator. The same is true of the operation that it decorates. It may be new or it may be an existing one.
-	 * @param cd
-	 * @param md
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void buildChange(ChangeDescription cd, MethodDecorator md) {
-		// Only do any builds if merge introspection. If not merge introspection then nothing should be changed.
-		if (md.isMergeIntrospection()) {
-			EOperation oper = (EOperation) md.getEModelElement();
-			switch (md.getImplicitDecoratorFlag().getValue()) {
-				case ImplicitItem.IMPLICIT_DECORATOR:
-					// The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
-					List fcs = getFeatureChangeList(cd, oper);
-					doAddToEnd(cd, fcs, md.eContainingFeature(), md, true);
-					buildNonImplicitChange(cd, fcs, oper);
-					break;
-				case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
-					// The decorator AND feature are implicit. Just clone them and add to the class.
-					doAddToEnd(cd, getFeatureChangeList(cd, oper.eContainer()), oper.eContainingFeature(), oper, true);
-					break;
-				case ImplicitItem.NOT_IMPLICIT:
-					// Neither the feature nor the decorator are implicit. So need to do applies against them.
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, md), md);
-					buildNonImplicitChange(cd, getFeatureChangeList(cd, oper), oper);
-					break;
-			}
-		}
-	}
-	
-	private final static Integer ZERO = new Integer(0);
-	private final static Integer ONE = new Integer(1);
-	private final static Integer MINUS_ONE = new Integer(-1);
-	
-	/**
-	 * Build the non-implicit changes into the feature. This creates changes for the implicit settings
-	 * that always occur for a property decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param feature
-	 * @param indexed <code>true</code> if this is for an indexed feature.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EStructuralFeature feature, boolean indexed) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), feature.getName(), false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Transient(), Boolean.FALSE, false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Volatile(), Boolean.FALSE, false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Changeable(), Boolean.valueOf(feature.isChangeable()), false);
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_EType(), feature.getEType(), false);
-		if (!indexed) {
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), ONE, false);
-		} else {
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), MINUS_ONE, false);
-			doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_Unique(), Boolean.TRUE, false);
-		}
-	}
-
-	/**
-	 * Build the non-implicit changes into the event. This creates changes for the implicit settings
-	 * that always occur for an event set decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param event
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, JavaEvent event) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), event.getName(), false);
-	}
-
-	/**
-	 * Build the non-implicit changes into the operation. This creates changes for the implicit settings
-	 * that always occur for an method decorator.
-	 *  
-	 * @param cd
-	 * @param fcs FeatureChanges list for the feature.
-	 * @param oper
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EOperation oper) {
-		doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), oper.getName(), false);
-		try {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodProxy_Method(), ((MethodProxy) oper).getMethod(), false);	// This is a method that is not in this resource, so no clone.
-		} catch (ClassCastException e) {
-			// It will be a MethodProxy 99.9% of the time, so save by not doing instanceof.
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit feature decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, FeatureDecorator decor) {
-		long implicitSettings = decor.getImplicitlySetBits();
-		if (implicitSettings != 0)
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ImplicitlySetBits(), new Long(implicitSettings), false);
-		
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_DisplayName(), decor.getDisplayName(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ShortDescription(), decor.getShortDescription(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category(), decor.getCategory(), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0 && decor.isSetExpert()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Expert(), Boolean.valueOf(decor.isExpert()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0 && decor.isSetHidden()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Hidden(), Boolean.valueOf(decor.isHidden()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0 && decor.isSetPreferred()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Preferred(), Boolean.valueOf(decor.isPreferred()), false);
-		}
-		if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Attributes(), decor.getAttributes(), true);
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit bean decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, BeanDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass(), decor.getCustomizerClass(), false); // Customizer class is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0 && decor.isSetMergeSuperProperties()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperProperties(), Boolean.valueOf(decor.isMergeSuperProperties()), false);
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0 && decor.isSetMergeSuperMethods()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperMethods(), Boolean.valueOf(decor.isMergeSuperMethods()), false);
-		}
-		if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0 && decor.isSetMergeSuperEvents()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperEvents(), Boolean.valueOf(decor.isMergeSuperEvents()), false);
-		}
-		if (!decor.getNotInheritedPropertyNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames(), decor.getNotInheritedPropertyNames(), false);
-		}
-		if (!decor.getNotInheritedMethodNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames(), decor.getNotInheritedMethodNames(), false);
-		}
-		if (!decor.getNotInheritedEventNames().isEmpty()) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames(), decor.getNotInheritedEventNames(), false);
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit property decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * @param indexed <code>true</code> if this is an indexed property decorator.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, PropertyDecorator decor, boolean indexed) {
-		buildNonImplicitChange(cd, fcs, decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass(), decor.getPropertyEditorClass(), false); // Property Editor class is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_ReadMethod(), decor.getReadMethod(), false); 
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_WriteMethod(), decor.getWriteMethod(), false); 
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field(), decor.getField(), false); 
-			if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly()))
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly(), Boolean.valueOf(decor.isFieldReadOnly()), false);
-		}		
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0 && decor.isSetBound()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Bound(), Boolean.valueOf(decor.isBound()), false);
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0 && decor.isSetConstrained()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Constrained(), Boolean.valueOf(decor.isConstrained()), false);
-		}
-		if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_DesignTime(), Boolean.valueOf(decor.isDesignTime()), false);
-		}
-		
-		if (indexed) {
-			IndexedPropertyDecorator ipd = (IndexedPropertyDecorator) decor;
-			if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0) {
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedReadMethod(), ipd.getIndexedReadMethod(), false); 
-			}
-			if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0) {
-				doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedWriteMethod(), ipd.getIndexedWriteMethod(), false); 
-			}
-		}
-	}
-	
-	/**
-	 * Build up the changes for a non-implicit event set decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EventSetDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod(), decor.getAddListenerMethod(), false); // listener method is
-																															 // not in this resource,
-																															 // so we don't clone it.
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass(), decor.getEventAdapterClass(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT) != 0) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd(), decor.getSerListMthd(), true);	// These need to be cloned because they are contained here.
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType(), decor.getListenerType(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod(), decor.getRemoveListenerMethod(), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0 && decor.isSetInDefaultEventSet()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_InDefaultEventSet(), Boolean.valueOf(decor.isInDefaultEventSet()), false);
-		}
-		if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0 && decor.isSetUnicast()) {
-			doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_Unicast(), Boolean.valueOf(decor.isUnicast()), false);
-		}
-	}
-
-	/**
-	 * Build up the changes for a non-implicit method decorator. This means create changes for implicit set features.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            the FeatureChanges list for the given decorator.
-	 * @param decor
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, MethodDecorator decor) {
-		buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
-		long implicitSettings = decor.getImplicitlySetBits();
-		if ((implicitSettings & MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT) != 0) {
-			doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc(), decor.getSerParmDesc(), true); 
-		}
-	}
-
-
-	/**
-	 * Get the feature change list for an object. Create it one if necessary.
-	 * 
-	 * @param cd
-	 * @param object
-	 * @return feature change list.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static List getFeatureChangeList(ChangeDescription cd, EObject object) {
-		List fcs = (List) cd.getObjectChanges().get(object); // Get the feature changes if any.
-		if (fcs == null) {
-			Map.Entry entry = ChangeFactory.eINSTANCE.createEObjectToChangesMapEntry(object);
-			cd.getObjectChanges().add(entry);
-			fcs = (List) entry.getValue();
-		}
-		return fcs;
-	}
-
-	/**
-	 * Return the FeatureChange record for a feature wrt/object. Create one if necessary. If it creates it, it will mark it as "set". All of our
-	 * changes here are set kind of changes, not unset kind.
-	 * 
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 * @return feature change
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static FeatureChange getFeatureChange(List fcs, EStructuralFeature feature) {
-		if (!fcs.isEmpty()) {
-			for (int i = 0; i < fcs.size(); i++) {
-				FeatureChange fc = (FeatureChange) fcs.get(i);
-				if (fc.getFeature() == feature)
-					return fc;
-			}
-		}
-
-		// Either new object changes or no feature change found. Create one.
-		FeatureChange fc = ChangeFactory.eINSTANCE.createFeatureChange(feature, null, true);
-		fcs.add(fc);
-		return fc;
-	}
-
-	/**
-	 * Create a change for add to end of the given feature (must be isMany()). If newObject is true, then this means this is not a pointer to an
-	 * existing object and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
-	 * about.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being added to.
-	 * @param addedValue
-	 *            the value being added.
-	 * @param newValue
-	 *            <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
-	 *            EObject for cloning. Best if not true for non-eobjects.
-	 * @return the addedValue or the clone if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doAddToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Object addedValue, boolean newValue) {
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				addedValue = EcoreUtil.copy((EObject) addedValue);
-				cd.getObjectsToAttach().add(addedValue);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-		List lcs = fc.getListChanges();
-		// Find the one with add and -1, i.e. add to end. There should only be one.
-		ListChange lc = null;
-		for (int i = 0; i < lcs.size(); i++) {
-			ListChange lca = (ListChange) lcs.get(i);
-			if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
-				lc = lca;
-				break;
-			}
-		}
-		if (lc == null) {
-			lc = ChangeFactory.eINSTANCE.createListChange();
-			lcs.add(lc);
-		}
-
-		lc.getValues().add(addedValue);
-		return addedValue;
-	}
-
-	/**
-	 * Create a change for add all to end of the given feature (must be isMany()). If newValue is true, then this means this is not a pointer to
-	 * existing objects and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
-	 * about.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being added to.
-	 * @param addedValues
-	 *            the values being added.
-	 * @param newValue
-	 *            <code>true</code> if new objects in the resource, clones will be made. <code>false</code> if an existing object. Must be EObject
-	 *            for cloning. Best if not true for non-eobjects.
-	 * @return the addedValues or the clones if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doAddAllToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Collection addedValues, boolean newValue) {
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				addedValues = EcoreUtil.copyAll(addedValues);
-				cd.getObjectsToAttach().addAll(addedValues);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-		List lcs = fc.getListChanges();
-		// Find the one with add and -1, i.e. add to end. There should only be one.
-		ListChange lc = null;
-		for (int i = 0; i < lcs.size(); i++) {
-			ListChange lca = (ListChange) lcs.get(i);
-			if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
-				lc = lca;
-				break;
-			}
-		}
-		if (lc == null) {
-			lc = ChangeFactory.eINSTANCE.createListChange();
-			lcs.add(lc);
-		}
-
-		lc.getValues().addAll(addedValues);
-		return addedValues;
-	}
-
-	/**
-	 * Create a change for set a given feature (must be !isMany()). If newValue is true, then this means this is not a pointer to an existing object
-	 * and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known about.
-	 * <p>
-	 * Any further sets to this feature will result in the previous setting being lost.
-	 * 
-	 * @param cd
-	 * @param fcs
-	 *            feature change list from the ChangeDescripion.getObjectChanges for the given object.
-	 * @param feature
-	 *            the feature being set to.
-	 * @param setValue
-	 *            the value being set.
-	 * @param newValue
-	 *            <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
-	 *            EObject for cloning. Best if not true for non-eobjects.
-	 * @return the setValue or the clone if it was cloned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static Object doSet(ChangeDescription cd, List fcs, EStructuralFeature feature, Object setValue, boolean newValue) {
-
-		FeatureChange fc = getFeatureChange(fcs, feature);
-		if (newValue) {
-			try {
-				setValue = EcoreUtil.copy((EObject) setValue);
-				cd.getObjectsToAttach().add(setValue);
-			} catch (ClassCastException e) {
-				// Normally should not occur, but if it does, it means we can't clone, so don't clone.
-			}
-		}
-
-		if (setValue instanceof EObject)
-			fc.setReferenceValue((EObject) setValue);
-		else
-			fc.setDataValue(EcoreUtil.convertToString((EDataType) feature.getEType(), setValue));
-		return setValue;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
deleted file mode 100644
index 4f4e08a..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
+++ /dev/null
@@ -1,207 +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.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: BeaninfoAdapterFactory.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:44:20 $ 
- */
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-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.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.java.ArrayType;
-/**
- * BeaninfoAdapterFactory - the factory for 
- * beaninfo introspection to populate the Java Model.
- * Creation date: (11/1/2000 11:52:55 AM)
- * @author: Administrator
- */
-public class BeaninfoAdapterFactory extends AdapterFactoryImpl {
-	protected IBeaninfoSupplier fInfoSupplier;
-
-	// Maintain a mapping of the source objects to the adaptors which have
-	// introspected from them.  This allows a close operation to force those
-	// adapters to clear out the data. It also allows for marking an adapter as stale
-	// so that next time it introspects it will re-get the data.
-	// 
-	// This is a WeakReference so that we don't hold onto adapters that were
-	// explicitly removed in other ways.
-	private Map fIntrospected = new HashMap();	// NOTE: This is to be accessed only under sync(this)!
-	private ReferenceQueue fRefQ = new ReferenceQueue();
-	private static class WeakValue extends WeakReference {
-		private Object key;
-		public WeakValue(Object aKey, Object value, ReferenceQueue que) {
-			super(value, que);
-			key = aKey;
-		}
-
-		public Object getKey() {
-			return key;
-		}
-	};
-
-	public BeaninfoAdapterFactory(IBeaninfoSupplier supplier) {
-		fInfoSupplier = supplier;
-	}
-	
-	public Adapter createAdapter(Notifier target, Object type) {
-		if (type == IIntrospectionAdapter.ADAPTER_KEY) {
-			return !(target instanceof ArrayType) ? new BeaninfoClassAdapter(this) : null;	// Array types don't have beaninfo adapters.
-		} else
-			return new BeaninfoSuperAdapter();
-	}
-	
-	/**
-	 * @see org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object)
-	 */
-	public boolean isFactoryForType(Object type) {
-		return IIntrospectionAdapter.ADAPTER_KEY == type || BeaninfoSuperAdapter.ADAPTER_KEY == type;
-	}	
-
-	public ProxyFactoryRegistry getRegistry() {
-		return fInfoSupplier.getRegistry();
-	}
-	
-	public boolean isRegistryCreated() {
-		return fInfoSupplier.isRegistryCreated();
-	}
-
-	public ProxyFactoryRegistry recycleRegistry() {
-		markAllStale(); // At this point in time we need to mark them all stale because we are recycling. MarkAllStale also closes the registry.
-		return getRegistry();
-	}
-	
-	public IProject getProject() {
-		return fInfoSupplier.getProject();
-	}
-
-	/**
-	 * Close ALL adapters. Also remove the adapters so that they
-	 * are not being held onto. This means we are closing the project or removing the nature.
-	 */
-	public void closeAll(boolean clearResults) {
-		processQueue();
-		synchronized (this) {
-			// We are going to be removing all of them, so just set introspected to an empty one
-			// and use the real one. This way we won't get concurrent modifications as we remove
-			// it from the notifier removeAdapter.
-			Map intr = fIntrospected;
-			fIntrospected = Collections.EMPTY_MAP;	// Since we are closing we can keep the unmodifiable one here.
-			Iterator i = intr.values().iterator();
-			while (i.hasNext()) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
-				if (a != null) {
-					if (clearResults)
-						a.clearIntrospection();
-					Notifier notifier = a.getTarget();
-					if (notifier != null)
-						notifier.eAdapters().remove(a);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Mark ALL adapters as stale. This occurs because we've recycled the registry.
-	 */
-	public void markAllStale() {
-		ProxyFactoryRegistry fact = isRegistryCreated() ? getRegistry() : null;
-		processQueue();
-		synchronized (this) {
-			Iterator i = fIntrospected.values().iterator();
-			while (i.hasNext()) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
-				if (a != null)
-					a.markStaleFactory(fact);
-			}
-			fInfoSupplier.closeRegistry();	// Get rid of the registry now since it is not needed. This way we won't accidentily hold onto it when not needed.
-		}
-	}
-	/**
-	 * Mark the introspection as stale for a source object. Also clear results if told to.
-	 * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
-	 * @param clearResults clear out the results. If false, they will be reused if possible on recycle.
-	 */
-	public void markStaleIntrospection(String sourceName, boolean clearResults) {
-		processQueue();
-		synchronized (this) {
-			WeakValue ref = (WeakValue) fIntrospected.get(sourceName);
-			if (ref != null) {
-				BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();
-				if (a != null) {
-					if (clearResults)
-						a.clearIntrospection();
-					a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-				}
-			}
-		}
-	}
-	
-	public void markStaleIntrospectionPlusInner(String sourceName, boolean clearResults) {
-		processQueue();
-		String sourceNameForInner = sourceName + '$';
-		synchronized (this) {
-			Iterator itr = fIntrospected.entrySet().iterator();
-			while (itr.hasNext()) {
-				Map.Entry entry = (Map.Entry) itr.next();
-				String entryName = (String) entry.getKey();
-				if (entryName.equals(sourceName) || entryName.startsWith(sourceNameForInner)) {
-					// It is the item or one of its inner classes.
-					WeakValue ref = (WeakValue) entry.getValue();
-					BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();					
-					if (a != null) {
-						if (clearResults)
-							a.clearIntrospection();
-						a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
-					}
-				}
-			}
-		}
-	}	
-
-	/**
-	 * Register an adapter for introspection.
-	 * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
-	 * @param adapter The adapter to register
-	 */
-	public void registerIntrospection(String sourceName, BeaninfoClassAdapter adapter) {
-		// Create it as a weak reference so that it doesn't hold onto the adapter if it is ever removed
-		// and thrown away (or the MOF resource itself is thrown away).
-		processQueue();
-		synchronized (this) {
-			fIntrospected.put(sourceName, new WeakValue(sourceName, adapter, fRefQ));
-		}
-	}
-	
-	/**
-	 * Remove adapter. This happens in the case that adapter is being removed and
-	 * we want to remove it from our list. This is an internal API only for use by
-	 * the adapter itself.
-	 */
-	public synchronized void removeAdapter(BeaninfoClassAdapter a) {
-		fIntrospected.remove(a.getJavaClass().getQualifiedNameForReflection());
-	}
-
-	private synchronized void processQueue() {
-		WeakValue wv;
-		while ((wv = (WeakValue) fRefQ.poll()) != null) {
-			fIntrospected.remove(wv.getKey());
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
deleted file mode 100644
index d17eda4..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
+++ /dev/null
@@ -1,2464 +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.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: BeaninfoClassAdapter.java,v $
- *  $Revision: 1.33 $  $Date: 2005/05/11 22:41:17 $ 
- */
-
-import java.io.FileNotFoundException;
-import java.lang.ref.WeakReference;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.ChangeFactory;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-import com.ibm.etools.emf.event.EventFactory;
-import com.ibm.etools.emf.event.EventUtil;
-
-/**
- * Beaninfo adapter for doing introspection on a Java Model class.
- * <p>
- * The first time a introspect request is made, it will use the ClassEntry from the cache controller to determine if it should load from the
- * cache or do a complete introspection. After that it will always do a complete introspection when it is marked as needing introspection.
- * This is because the cache is useless to us then. At that point in time we already know that we or one of our superclasses or one of 
- * outer classes has changed, thereby requiring us to reintrospect, the cache is invalid at that point. Also once we did an introspection we
- * don't want to do a load from cache but instead do a merge because someone may of been holding onto the features and we don't want to
- * throw them away unnecessarily.
- * <p> 
- * TODO Need to re-look into this to see if we can do a merge with the cache file because if it was an external jar and it has now gone
- * valid, why waste time reintrospecting. But this needs to be carefully thought about. 
- * <p> 
- * The resource change listener
- * will automatically mark any subclasses (both the BeaninfoClassAdapter and the ClassEntry) as being stale for us. That way we don't need
- * to waste time checking the ce and superclasses everytime. We will keep the ClassEntry around simply to make the marking of it as stale easier for the
- * resource listener. Finding the ce everytime would be expensive.
- * <p> 
- * This is the process for determining if introspection required:
- * <ol>
- * <li>If needsIntrospection flag is false, then do nothing. Doesn't need introspection.
- * <li>If class is undefined, then just set up for an undefined class and return. (In this case the CE should be thrown away, it should of been deleted).
- * <li>If never introspected (not RETRIEVED_FULL_DOCUMENT), get the CE, get the modification stamp and call isStaleStamp. This determines if this
- * stamp or any super class stamp is stale wrt to current stamp. If it is not stale, then load from cache because the cache is good. 
- * <li>If no cache or cache is stale or has introspected once, then introspect and replace cache.
- * </ol>
- * 
- */
-
-public class BeaninfoClassAdapter extends AdapterImpl implements IIntrospectionAdapter {
-	
-	public static final String REFLECT_PROPERTIES = "Reflect properties";	// Reflect properties in IDE
-	public static final String APPLY_EXTENSIONS = "Apply Overrides";	// Apply override files
-	public static final String REMOTE_INTROSPECT = "Remote Introspect";	// Introspect on remote
-	public static final String INTROSPECT = "Introspect";	// Straight introspection, whether load from cache or introspect.
-	public static final String LOAD_FROM_CACHE = "Load from Cache";
-	
-	// TODO Put this back (if necessary, not sure since haven't done it yet) when we do override change recording too to handle overrides. 
-	// This will make it even faster because such
-	// overrides rarely change and so can be glombed together into one large change. So then we would have two change caches per
-	// class, one is the override record, which will be created once, the first time the class is referenced after a stale
-	// configuration, and then the other is the introspection/reflection results, which will be created each time there is
-	// a cache change. Both will be applied only once, the first time the class is referenced after a project has been opened.
-	// No need to load at any other time because any changes will simply be a merge of the changes (thru reflection/introspection) into
-	// the existing set and then a new change cache will be created containing the entire set of implicit changes, both the previous
-	// ones that are still valid, and any new ones.
-//	/**
-//	 * Pausable Change Recorder.
-//	 * 
-//	 * @since 1.1.0
-//	 */
-//	private static class PausableChangeRecorder extends ChangeRecorder {
-//		
-//		/**
-//		 * @param rootObject
-//		 * 
-//		 * @since 1.1.0
-//		 */
-//		public PausableChangeRecorder(EObject rootObject) {
-//			super(rootObject);
-//		}
-//		/**
-//		 * Pause recording
-//		 * 
-//		 * 
-//		 * @since 1.1.0
-//		 */
-//		public void pause() {
-//			recording = false;
-//		}
-//		
-//		/**
-//		 * Resume recording
-//		 * 
-//		 * 
-//		 * @since 1.1.0
-//		 */
-//		public void resume() {
-//			recording = true;
-//		}
-//	}
-	
-	public static BeaninfoClassAdapter getBeaninfoClassAdapter(EObject jc) {
-		return (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(jc, IIntrospectionAdapter.ADAPTER_KEY);
-	}
-	
-	/**
-	 * Clear out the introspection because introspection is being closed or removed from the project.
-	 * Don't want anything hanging around that we had done.
-	 */
-	public void clearIntrospection() {
-		// Clear out the beandecorator if implicitly created.
-		Iterator beanItr = getJavaClass().getEAnnotationsInternal().iterator();
-		while (beanItr.hasNext()) {
-			EAnnotation dec = (EAnnotation) beanItr.next();
-			if (dec instanceof BeanDecorator) {
-				BeanDecorator decor = (BeanDecorator) dec;
-				if (decor.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_LITERAL) {
-					beanItr.remove();
-					((InternalEObject) decor).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-				} else {
-					BeanInfoDecoratorUtility.clear((BeanDecorator) dec);
-				}
-				break;
-			}
-		}
-		// Clear out the features that we implicitly created.
-		Iterator propItr = getJavaClass().getEStructuralFeaturesInternal().iterator();
-		while (propItr.hasNext()) {
-			EStructuralFeature prop = (EStructuralFeature) propItr.next();
-			Iterator pdItr = prop.getEAnnotations().iterator();
-			while (pdItr.hasNext()) {
-				EAnnotation dec = (EAnnotation) pdItr.next();
-				if (dec instanceof PropertyDecorator) {
-					PropertyDecorator pd = (PropertyDecorator) dec;
-					if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-						BeanInfoDecoratorUtility.clear(pd);
-					else {
-						pdItr.remove(); // Remove it from the property.
-						((InternalEObject) pd).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					if (pd.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-						propItr.remove(); // Remove the feature itself
-						((InternalEObject) prop).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					break;
-				}
-			}
-		}
-		
-		// Clear out the operations that we implicitly created.
-		Iterator operItr = getJavaClass().getEOperationsInternal().iterator();
-		while (operItr.hasNext()) {
-			EOperation oper = (EOperation) operItr.next();
-			Iterator mdItr = oper.getEAnnotations().iterator();
-			while (mdItr.hasNext()) {
-				EAnnotation dec = (EAnnotation) mdItr.next();
-				if (dec instanceof MethodDecorator) {
-					MethodDecorator md = (MethodDecorator) dec;
-					if (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-						BeanInfoDecoratorUtility.clear(md);
-					else {
-						mdItr.remove(); // Remove it from the operation.
-						((InternalEObject) md).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					if (md.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-						operItr.remove(); // Remove the oepration itself
-						((InternalEObject) oper).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-					}
-					break;
-				}
-			}
-			
-			// Clear out the events that we implicitly created.
-			Iterator evtItr = getJavaClass().getEventsGen().iterator();
-			while (evtItr.hasNext()) {
-				JavaEvent evt = (JavaEvent) evtItr.next();
-				Iterator edItr = evt.getEAnnotations().iterator();
-				while (edItr.hasNext()) {
-					EAnnotation dec = (EAnnotation) edItr.next();
-					if (dec instanceof EventSetDecorator) {
-						EventSetDecorator ed = (EventSetDecorator) dec;
-						if (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
-							BeanInfoDecoratorUtility.clear(ed);
-						else {
-							edItr.remove(); // Remove it from the event.
-							((InternalEObject) ed).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-						}
-						if (ed.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							evtItr.remove(); // Remove the event itself
-							((InternalEObject) evt).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
-						}
-						break;
-					}
-				}
-			}				
-		}
-
-		synchronized(this) {
-			needsIntrospection = true;
-		}
-	}
-	
-	private void clearAll() {
-		clearIntrospection();	// First get rid of the ones we did so that they are marked as proxies.
-		
-		// Clear out the annotations.
-		getJavaClass().getEAnnotationsInternal().clear();
-		// Clear out the attributes.
-		getJavaClass().getEStructuralFeaturesInternal().clear();	
-		// Clear out the operations.
-		getJavaClass().getEOperationsInternal().clear();
-		// Clear out the events.
-		getJavaClass().getEventsGen().clear();
-		
-		retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;	// Since we cleared everything, go back to no doc applied.
-	}
-	
-
-	/**
-	 * @version 	1.0
-	 * @author
-	 */
-
-	// A URI that will never resolve. Used to mark an object as no longer valid.
-	protected static final URI BAD_URI = URI.createURI("baduri"); //$NON-NLS-1$
-
-	protected boolean needsIntrospection = true;
-	
-	protected BeanInfoCacheController.ClassEntry classEntry;
-	
-	protected boolean isIntrospecting;
-
-	protected boolean isDoingAllProperties;
-
-	protected boolean isDoingAllOperations;
-
-	protected boolean isDoingAllEvents;
-
-	protected final static int
-		NEVER_RETRIEVED_EXTENSION_DOCUMENT = 0,
-		RETRIEVED_ROOT_ONLY = 1,
-		RETRIEVED_FULL_DOCUMENT = 2;
-	protected int retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
-
-	protected BeaninfoAdapterFactory adapterFactory;
-
-	private WeakReference staleFactory; // When reference not null, then this factory is a stale factory and 
-	// a new one is needed when the factory returned == this one.
-	// It is a WeakRef so that if the factory goes away on its own
-	// that we don't hold onto it.
-
-	// A temporary hashset of the local properties. Used when creating a new
-	// property to use the old one. It is cleared out at the end of attribute introspection.
-	// It is only built once during attribute introspection so that we have the snapshot
-	// of before the introspection (i.e. the ones that were specifically added by users
-	// and not through introspection). The ones that we are adding do not need to be checked
-	// against each other because there will not be conflicts.
-	//
-	// Also at the end, we will go through the properties and see if it exists in the fPropertiesMap and
-	// it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
-	// was an implicit entry from the previous introspection and was not re-created in this introspection.
-	private HashMap propertiesMap;
-	private List featuresRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-	
-	// A temporary hashmap of the local operations. Used when creating a new
-	// operation to reuse the old one. It is cleared out at the end of operation introspection.
-	// It is only built once during operation introspection so that we have the snapshot
-	// of before the introspection.
-	private HashMap operationsMap;
-	private EList operationsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-	// A set of operations as we create them so that we which ones we added/kept and which are no longer in use and can be removed.	
-	// If they aren't in this set at the end, then we know it should be removed if it is one we had created in the past.
-	private HashSet newoperations; 
-
-	// A temporary hashset of the local events. Used when creating a new
-	// event to use the old one. It is cleared out at the end of event introspection.
-	// It is only built once during event introspection so that we have the snapshot
-	// of before the introspection (i.e. the ones that were specifically added by users
-	// and not through introspection). The ones that we are adding do not need to be checked
-	// against each other because there will not be conflicts.
-	//
-	// Also at the end, we will go through the events and see if it exists in the fEventsMap and
-	// it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
-	// was an implicit entry from the previous introspection and was not re-created in this introspection.
-	private HashMap eventsMap;
-	private EList eventsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-
-	private Boolean defaultBound;
-	// Whether this class is default bound or not (i.e. does this class implement add/remove property change listener. If null, then not yet queried.
-
-	public BeaninfoClassAdapter(BeaninfoAdapterFactory factory) {
-		super();
-		adapterFactory = factory;
-	}
-
-	/*
-	 * Answer whether this java class is still connected to a live resource. It happens during unloading
-	 * that we are no longer connected to a resource (because the javapackage has already been processed and
-	 * unloaded) or the resource is in the process of being unloaded, but the unloading process will still 
-	 * call accessors on this java class, which will come over here. In those cases we should treat as
-	 * introspection completed without doing anything.
-	 */
-	protected boolean isResourceConnected() {
-		Resource res = getJavaClass().eResource();
-		return res != null && res.isLoaded();
-	}
-
-	protected final ProxyFactoryRegistry getRegistry() {
-		ProxyFactoryRegistry factory = adapterFactory.getRegistry();
-		if (staleFactory != null && factory == staleFactory.get()) {
-			// We need to recycle the factory. The returned factory is the same factory when it went stale.
-			factory = adapterFactory.recycleRegistry();
-		}
-		staleFactory = null; // Whether we recycled or not, it is no longer stale.
-		return factory;
-	}
-
-	/**
-	 * Return whether this adapter has been marked as stale. Needed
-	 * by the users so that they can recycle if necessary.
-	 */
-	public boolean isStale() {
-		return staleFactory != null;
-	}
-
-	protected BeaninfoAdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	public boolean isAdapterForType(Object key) {
-		return IIntrospectionAdapter.ADAPTER_KEY.equals(key);
-	}
-
-	/**
-	 * This map is keyed by name. It is a snapshot of the properties at the
-	 * time the introspection/reflection of properties was started. It is used
-	 * for quick lookup.
-	 *
-	 * Once a property is used, the entry is replaced with a Boolean.FALSE. This
-	 * is so we know which have already been used and at the end, which need
-	 * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
-	 */
-	protected HashMap getPropertiesMap() {
-		if (propertiesMap == null) {
-			List localFeatures = getJavaClass().getEStructuralFeaturesInternal();
-			propertiesMap = new HashMap(localFeatures.size());
-			Iterator itr = localFeatures.iterator();
-			while (itr.hasNext()) {
-				EStructuralFeature feature = (EStructuralFeature) itr.next();
-				propertiesMap.put(feature.getName(), feature);
-			}
-		}
-		return propertiesMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected List getFeaturesList() {
-		if (featuresRealList == null)
-			featuresRealList = getJavaClass().getEStructuralFeaturesInternal();
-		return featuresRealList;
-	}
-
-	/**
-	 * The map is keyed by longName. If a Method is passed in, then the
-	 * id of the method is used (this is in reflection), if an IBeanProxy
-	 * is passed in, then an id is created and looked up (this is in introspection).
-	 * The map is used for a quick lookup of behaviors at the time introspection
-	 * of behaviors started.
-	 */
-	protected HashMap getOperationsMap() {
-		if (operationsMap == null) {
-			List locals = getJavaClass().getEOperationsInternal();
-			int l = locals.size();
-			operationsMap = new HashMap(l);
-			for (int i = 0; i < l; i++) {
-				EOperation op = (EOperation) locals.get(i);
-				operationsMap.put(formLongName(op), op);
-			}
-		}
-		return operationsMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected EList getOperationsList() {
-		if (operationsRealList == null)
-			operationsRealList = getJavaClass().getEOperationsInternal();
-		return operationsRealList;
-	}
-
-	/**
-	 * The map is keyed by name.
-	 * The map is used for a quick lookup of events at the time introspection
-	 * of events started.
-	 *
-	 * Once an event is used, the entry is replaced with a Boolean.FALSE. This
-	 * is so we know which have already been used and at the end, which need
-	 * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
-	 */
-	protected HashMap getEventsMap() {
-		if (eventsMap == null) {
-			List locals = getJavaClass().getEventsGen();
-			eventsMap = new HashMap(locals.size());
-			Iterator itr = locals.iterator();
-			while (itr.hasNext()) {
-				JavaEvent event = (JavaEvent) itr.next();
-				eventsMap.put(event.getName(), event);
-			}
-		}
-		return eventsMap;
-	}
-
-	/**
-	 * Get it once so that we don't need to keep getting it over and over.
-	 */
-	protected EList getEventsList() {
-		if (eventsRealList == null)
-			eventsRealList = getJavaClass().getEventsGen();
-		return eventsRealList;
-	}
-
-	public void introspectIfNecessary() {
-		introspectIfNecessary(false);
-	}
-	
-	protected void introspectIfNecessary(boolean doOperations) {
-		boolean doIntrospection = false;
-		synchronized (this) {
-			doIntrospection = needsIntrospection && !isIntrospecting; 
-			if (doIntrospection)
-				isIntrospecting = true;
-		}
-		if (doIntrospection) {
-			boolean didIntrospection = false;
-			try {				
-				introspect(doOperations);
-				didIntrospection = true;
-			} catch (Throwable e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(
-					new Status(
-						IStatus.WARNING,
-						BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(),
-						0,
-						MessageFormat.format(
-							BeanInfoAdapterMessages.getString(BeanInfoAdapterMessages.INTROSPECTFAILED),
-							new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-						e));
-			} finally {
-				synchronized (this) {
-					isIntrospecting = false;
-					needsIntrospection = !didIntrospection;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the class entry. 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public BeanInfoCacheController.ClassEntry getClassEntry() {
-		return classEntry;
-	}
-	
-	private boolean canUseCache() {
-		// We check our level, we assume not stale unless CE says stale.
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				long modStamp = classEntry.getModificationStamp();
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						modStamp = classEntry.getModificationStamp();
-				}
-				if (modStamp == IResource.NULL_STAMP || modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
-					return false;	// We are stale.
-			} else
-				return false;	// We don't have a cache entry to check against, which means are deleted, or never cached.
-		}
-		
-		// Now try the supers to see if we are out of date to them.
-		// Note: Only if this is an interface could there be more than one eSuperType.
-		List supers = getJavaClass().getESuperTypes();
-		if (!supers.isEmpty()) {
-			BeaninfoClassAdapter bca = getBeaninfoClassAdapter((EObject) supers.get(0));
-			if (bca.getClassEntry().getModificationStamp() != classEntry.getSuperModificationStamp())
-				return false; // Out-of-date wrt/super.
-			String[] iNames = classEntry.getInterfaceNames();
-			if (iNames != null) {
-				if (iNames.length != supers.size() - 1)
-					return false; // We have a different number of supers, so stale.
-				// Now the interfaces may not be in the same order, but there shouldn't be too many, so we'll use O(n2) lookup. We'll try starting at
-				// the same index just in case. That way if they are the same order it will be linear instead. Most likely will be same order.
-				long[] iStamp = classEntry.getInterfaceModificationStamps();
-				for (int i = 1; i <= iNames.length; i++) {
-					JavaClass javaClass = (JavaClass) supers.get(i);
-					String intName = (javaClass).getQualifiedNameForReflection();
-					// Find it in the names list.
-					int stop = i-1;
-					int indx = stop;	// Start at the stop, when we hit it again we will be done.
-					boolean found = false;
-					do {
-						if (iNames[indx].equals(intName)) {
-							found = true;
-							break;
-						}
-					} while ((++indx)%iNames.length != stop);
-					if (!found)
-						return false;	// Couldn't find it, so we are stale.
-					if (iStamp[indx] != getBeaninfoClassAdapter(javaClass).getClassEntry().getModificationStamp())
-						return false;	// We didn't match it, so we are stale.
-				}
-			}
-		}
-		return true;	// If we got here everything is ok.
-	}
-
-	private boolean canUseOverrideCache() {
-		// We check our config stamp.
-		// TODO in future can we listen for config changes and mark classes stale if the config changes?
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (classEntry.isDeleted()) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						if (classEntry.isDeleted())
-							return false;	// We have been deleted. Probably shouldn't of gotton here in this case.
-				}
-			} else
-				return false;	// We don't have a cache entry to check against, which means are deleted, or never cached.
-			return classEntry.getConfigurationModificationStamp() == Platform.getPlatformAdmin().getState(false).getTimeStamp();
-		}
-		
-	}
-
-	/**
-	 * Check if the cache for this entry is stale compared to the modification stamp, or if the modification stamp itself is stale, meaning
-	 * subclass was stale already.
-	 * 
-	 * @param requestStamp the timestamp to compare against. 
-	 * @return <code>true</code> if we can use the incoming cache stamp.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean canUseCache(long requestStamp) {
-		long modStamp;
-		// Now get the current mod stamp for this class so we can compare it.
-		synchronized (this) {
-			// We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
-			if (classEntry == null)
-				classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-			if (classEntry != null) {
-				// We have a cache to check.
-				modStamp = classEntry.getModificationStamp();
-				// A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
-				if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
-					classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
-					if (classEntry != null)
-						modStamp = classEntry.getModificationStamp();
-				}
-				if (modStamp == IResource.NULL_STAMP && modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
-					return false;	// Since we are stale, child asking question must also be stale and can't use the cache.
-			} else
-				return false;	// We don't have a cache entry to check against, so child must be stale too.
-		}
-		// If the requested stamp is not the same as ours, then it is out of date (it couldn't be newer but it could be older).
-		return requestStamp == modStamp;
-	}
-		
-	/*
-	 * This should only be called through introspectIfNecessary so that flags are set correctly.
-	 */
-	private void introspect(boolean doOperations) {
-		IBeanProxy beaninfo = null;
-		try {
-			if (isResourceConnected()) {
-				// See if are valid kind of class.
-				if (getJavaClass().getKind() == TypeKind.UNDEFINED_LITERAL) {
-					// Not valid, don't let any further introspection occur.
-					// Mark that we've done all introspections so as not to waste time until we get notified that it has been added
-					// back in.
-					synchronized(this) {
-						if (classEntry != null) {
-							classEntry.markDeleted();	// mark it deleted in case still sitting in cache (maybe because it was in an external jar, we can't know if deleted when jar changed).
-							classEntry = null;	// Get rid of it since now deleted.
-						}
-						needsIntrospection = false;
-					}
-					
-					if (retrievedExtensionDocument == RETRIEVED_FULL_DOCUMENT) {
-						// We've been defined at one point. Need to clear everything and step back
-						// to never retrieved so that we now get the root added in. If we had been
-						// previously defined, then we didn't have root. We will have to lose
-						// all other updates too. But they can come back when we're defined.
-						clearAll();
-						retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
-					}
-					if (retrievedExtensionDocument == NEVER_RETRIEVED_EXTENSION_DOCUMENT)
-						applyExtensionDocument(true);	// Add in Root stuff so that it will work correctly even though undefined.
-				} else {
-					// TODO For now cause recycle of vm if any super type is stale so that if registry is stale for the super type it will be
-					// recreated. This is needed because reflection requires superProperties, etc. and recreating the registry
-					// currently re-marks everyone as stale, including this subclass. This would mean that
-					// re-introspection would need to be done, even though we just did it. The stale registry business needs to be re-addressed so that it is
-					// a lot smarter. 
-					List supers = getJavaClass().getEAllSuperTypes();
-					for (int i = 0; i < supers.size(); i++) {
-						BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter((EObject) supers.get(i),
-								IIntrospectionAdapter.ADAPTER_KEY);
-						if (bca != null && bca.isStale())
-							bca.getRegistry();
-					}
-					// Now we need to force introspection, if needed, of all parents because we need them to be up-to-date for the
-					// class entry.
-					// TODO see if we can come up with a better way that we KNOW the CE is correct, even if any supers are stale.
-					supers = getJavaClass().getESuperTypes();
-					for (int i = 0; i < supers.size(); i++) {
-						BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getRegisteredAdapter((EObject) supers.get(i),
-								IIntrospectionAdapter.ADAPTER_KEY);
-						bca.introspectIfNecessary();
-					}
-
-					TimerTests.basicTest.startCumulativeStep(INTROSPECT);
-					if (retrievedExtensionDocument == RETRIEVED_ROOT_ONLY) {
-						// We need to clear out EVERYTHING because we are coming from an undefined to a defined.
-						// Nothing previous is now valid. (Particularly the root stuff).
-						clearAll();
-					}
-					boolean firstTime = false;
-					if (retrievedExtensionDocument != RETRIEVED_FULL_DOCUMENT) {
-						firstTime = true;	// If we need to apply the extension doc, then this is the first time.
-						applyExtensionDocument(false); // Apply the extension doc before we do anything.
-					}
-
-					// Now check to see if we can use the cache.
-					boolean doIntrospection = true;
-					if (firstTime) {
-						// Check if we can use the cache. Use Max value so that first level test (ourself) will always pass and go on to the supers.
-						if (canUseCache()) {
-							TimerTests.basicTest.startCumulativeStep(LOAD_FROM_CACHE);
-							// We can use the cache.
-							Resource cres = BeanInfoCacheController.INSTANCE.getCache(getJavaClass(), classEntry, true);
-							if (cres != null) {
-								try {
-									// Got a cache to use, now apply it.
-									for (Iterator cds = cres.getContents().iterator(); cds.hasNext();) {
-										ChangeDescription cacheCD = (ChangeDescription) cds.next();
-										cacheCD.apply();
-									}
-									// We need to walk through and create the appropriate ID's for events/actions/properties because by
-									// default from the change descriptions these don't get reflected back. And if some one doesn't
-									// use an ID to get them, they won't have an id set.
-									doIDs();
-									doIntrospection = false;
-								} catch (RuntimeException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the cres since it is now invalid. The applies cause them to be invalid.
-									cres.getResourceSet().getResources().remove(cres);
-									if (doIntrospection) {
-										// Apply had failed. We don't know how far it went. We need to wipe out and reget EVERYTHING.
-										clearAll();
-										applyExtensionDocument(false); // Re-apply the extension doc before we do anything else.
-									}
-								}
-							}
-							TimerTests.basicTest.stopCumulativeStep(LOAD_FROM_CACHE);
-						}
-					}
-					
-					if (doIntrospection) {
-						// Finally we can get to handling ourselves.
-						TimerTests.basicTest.startCumulativeStep(REMOTE_INTROSPECT);
-						BeanDecorator decor = Utilities.getBeanDecorator(getJavaClass());
-						if (decor == null) {
-							decor = BeaninfoFactory.eINSTANCE.createBeanDecorator();
-							decor.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
-							getJavaClass().getEAnnotations().add(decor);
-						} else
-							BeanInfoDecoratorUtility.clear(decor);	// Clear out previous results.
-						
-						boolean doReflection = true;
-						if (doOperations)
-							newoperations = new HashSet(50);
-						if (decor.isDoBeaninfo()) {
-							int doFlags = 0;
-							if (decor == null || decor.isMergeIntrospection())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_BEAN_DECOR;
-							if (decor == null || decor.isIntrospectEvents())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_EVENTS;
-							if (decor == null || decor.isIntrospectProperties())
-								doFlags |= IBeanInfoIntrospectionConstants.DO_PROPERTIES;
-							if (doOperations && (decor == null || decor.isIntrospectMethods()))
-								doFlags |= IBeanInfoIntrospectionConstants.DO_METHODS;
-							
-							if (doFlags != 0) {
-								// There was something remote to do.
-								IBeanTypeProxy targetType = null;
-								ProxyFactoryRegistry registry = getRegistry();
-								if (registry != null && registry.isValid())
-									targetType = registry.getBeanTypeProxyFactory().getBeanTypeProxy(getJavaClass().getQualifiedNameForReflection());
-								if (targetType != null) {
-									if (targetType.getInitializationError() == null) {
-										// If an exception is thrown, treat this as no proxy, however log it because we
-										// shouldn't have exceptions during introspection, but if we do it should be logged
-										// so it can be corrected.
-										try {
-											beaninfo = getProxyConstants().getIntrospectProxy().invoke(null,
-													new IBeanProxy[] { targetType, getRegistry().getBeanProxyFactory().createBeanProxyWith(false), getRegistry().getBeanProxyFactory().createBeanProxyWith(doFlags)});
-										} catch (ThrowableProxy e) {
-											BeaninfoPlugin.getPlugin().getLogger().log(
-													new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-															MessageFormat.format(BeanInfoAdapterMessages
-																	.getString(BeanInfoAdapterMessages.INTROSPECTFAILED), new Object[] {
-																	getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
-																	e));
-										}
-									} else {
-										// The class itself couldn't be initialized. Just log it, but treat as no proxy.
-										BeaninfoPlugin.getPlugin().getLogger()
-										.log(
-												new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-														MessageFormat.format(BeanInfoAdapterMessages
-																.getString(BeanInfoAdapterMessages.INTROSPECTFAILED), new Object[] {
-																getJavaClass().getJavaName(), targetType.getInitializationError()}), null));
-									}
-								} else {
-									// The class itself could not be found. Just log it, but treat as no proxy.
-									BeaninfoPlugin.getPlugin().getLogger().log(
-											new Status(IStatus.INFO, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0, MessageFormat.format(
-													BeanInfoAdapterMessages.getString(BeanInfoAdapterMessages.INTROSPECTFAILED), new Object[] {
-															getJavaClass().getJavaName(),
-															BeanInfoAdapterMessages.getString("BeaninfoClassAdapter.ClassNotFound")}), //$NON-NLS-1$
-															null));
-								}
-								
-								if (beaninfo != null) {
-									doReflection = false;	// We have a beaninfo, so we are doing introspection.
-									final BeanDecorator bdecor = decor;
-									// We have a beaninfo to process.
-									BeanInfoDecoratorUtility.introspect(beaninfo, new BeanInfoDecoratorUtility.IntrospectCallBack() {
-
-										/*; (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.BeanRecord)
-										 */
-										public BeanDecorator process(BeanRecord record) {
-											return bdecor;
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.PropertyRecord)
-										 */
-										public PropertyDecorator process(PropertyRecord record) {
-											return calculateProperty(record, false);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.IndexedPropertyRecord)
-										 */
-										public PropertyDecorator process(IndexedPropertyRecord record) {
-											return calculateProperty(record, true);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.MethodRecord)
-										 */
-										public MethodDecorator process(MethodRecord record) {
-											return calculateOperation(record);
-										}
-
-										/* (non-Javadoc)
-										 * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.EventSetRecord)
-										 */
-										public EventSetDecorator process(EventSetRecord record) {
-											return calculateEvent(record);
-										}
-									});
-								} 
-							}
-						}
-						
-						if (doReflection) {
-							// Need to do reflection stuff.
-							if (decor.isIntrospectProperties())
-								reflectProperties();
-							if (doOperations && decor.isIntrospectMethods())
-								reflectOperations();
-							if (decor.isIntrospectEvents())
-								reflectEvents();
-						}
-						ChangeDescription cd = ChangeFactory.eINSTANCE.createChangeDescription();						
-						BeanInfoDecoratorUtility.buildChange(cd, decor);
-						finalizeProperties(cd);
-						if (doOperations)
-							finalizeOperations(cd);
-						finalizeEvents(cd);
-
-						classEntry = BeanInfoCacheController.INSTANCE.newCache(getJavaClass(), cd, doOperations ? BeanInfoCacheController.REFLECTION_OPERATIONS_CACHE : BeanInfoCacheController.REFLECTION_CACHE);
-						TimerTests.basicTest.stopCumulativeStep(REMOTE_INTROSPECT); 
-					}
-					TimerTests.basicTest.stopCumulativeStep(INTROSPECT);
-				}
-				getAdapterFactory().registerIntrospection(getJavaClass().getQualifiedNameForReflection(), this);
-			}
-		} finally {
-			if (beaninfo != null) {
-				beaninfo.getProxyFactoryRegistry().releaseProxy(beaninfo); // Dispose of the beaninfo since we now have everything.
-			}
-			eventsMap = null; // Clear out the temp lists.
-			eventsRealList = null;
-			operationsMap = null; // Clear out the temp lists.
-			operationsRealList = null;
-			newoperations = null;
-			propertiesMap = null; // Get rid of accumulated map.
-			featuresRealList = null; // Release the real list.
-		}
-	}
-
-	private void doIDs() {
-		// Do properties.
-		if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EStructuralFeatures())) {
-			List features = getFeaturesList();
-			int len = features.size();
-			for (int i = 0; i < len; i++) {
-				EStructuralFeature f = (EStructuralFeature) features.get(i);
-				PropertyDecorator pd = Utilities.getPropertyDecorator(f);
-				if (pd == null || !pd.isMergeIntrospection())
-					continue; // Not a property for us to give an ID to.
-				setPropertyID(f.getName(), f);
-			}
-		}
-		
-		// Do events.
-		if (getJavaClass().eIsSet(JavaRefPackage.eINSTANCE.getJavaClass_Events())) {
-			List events = getEventsList();
-			int len = events.size();
-			for (int i = 0; i < len; i++) {
-				BeanEvent e = (BeanEvent) events.get(i);
-				EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-				if (ed == null || !ed.isMergeIntrospection())
-					continue; // Not an event for us to give an ID to.
-				setEventID(e.getName(), e);
-			}
-		}
-
-		// Do Operations.
-		if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EOperations())) {
-			List ops = getOperationsList();
-			int len = ops.size();
-			for (int i = 0; i < len; i++) {
-				EOperation o = (EOperation) ops.get(i);
-				MethodDecorator md = Utilities.getMethodDecorator(o);
-				if (md == null || !md.isMergeIntrospection())
-					continue; // Not an event for us to give an ID to.
-				setMethodID(o.getName(), o);
-			}
-		}
-	}
-
-	private static final String ROOT_OVERRIDE = BeaninfoPlugin.ROOT+BeaninfoPlugin.OVERRIDE_EXTENSION;	 //$NON-NLS-1$
-	
-	protected void applyExtensionDocument(boolean rootOnly) {
-		try {
-			TimerTests.basicTest.startCumulativeStep(APPLY_EXTENSIONS);
-			boolean canUseCache = !rootOnly && canUseOverrideCache();
-			boolean alreadyRetrievedRoot = retrievedExtensionDocument == RETRIEVED_ROOT_ONLY;
-			retrievedExtensionDocument = rootOnly ? RETRIEVED_ROOT_ONLY : RETRIEVED_FULL_DOCUMENT;
-			JavaClass jc = getJavaClass();
-			Resource mergeIntoResource = jc.eResource();
-			ResourceSet rset = mergeIntoResource.getResourceSet();
-			String className = jc.getName();
-			if (canUseCache) {
-				// We can use the cache, see if we actually have one.
-				if (getClassEntry().overrideCacheExists()) {
-					// Get the cache and apply it before anything else.
-					Resource cacheRes = BeanInfoCacheController.INSTANCE.getCache(jc, getClassEntry(), false);
-					if (cacheRes != null) {
-						try {
-							EventUtil util = EventFactory.eINSTANCE.createEventUtil(jc, rset);
-							util.doForwardEvents(cacheRes.getContents());
-						} catch (WrappedException e) {
-							BeaninfoPlugin.getPlugin().getLogger().log(
-									new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0,
-											"Error processing file\"" + cacheRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-						} finally {
-							cacheRes.getResourceSet().getResources().remove(cacheRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
-						}
-					} else
-						canUseCache = false; // Need to rebuild the cache.
-				}
-			}
-			List overrideCache = null;
-			if (!alreadyRetrievedRoot && (rootOnly || jc.getSupertype() == null)) {
-				// It is a root class. Need to merge in root stuff.
-				if (!canUseCache) {
-					overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), BeaninfoPlugin.ROOT, ROOT_OVERRIDE, rset, jc);
-				}
-				applyExtensionDocTo(rset, jc, ROOT_OVERRIDE, BeaninfoPlugin.ROOT, BeaninfoPlugin.ROOT);
-				if (rootOnly)
-					return;
-			}
-
-			String baseOverridefile = className + BeaninfoPlugin.OVERRIDE_EXTENSION; // getName() returns inner classes with "$" notation, which is good. //$NON-NLS-1$
-			String packageName = jc.getJavaPackage().getPackageName();
-			if (!canUseCache) {
-				overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), packageName, baseOverridefile, rset, jc);
-			}
-			applyExtensionDocTo(rset, jc, baseOverridefile, packageName, className);
-			
-			if (!canUseCache) {
-				// We have an override cache to store. If the cache is null, this will flag that there is no override cache for the current configuration. That way we won't bother trying again until config changes.
-				BeanInfoCacheController.INSTANCE.newCache(jc, overrideCache, BeanInfoCacheController.OVERRIDES_CACHE);
-			}
-			
-		} finally {
-			TimerTests.basicTest.stopCumulativeStep(APPLY_EXTENSIONS);	
-		}
-	}
-	
-	/*
-	 * Build up the fixed overrides into the cache, and apply as we gather them.
-	 * Return the cache or null if the cache is empty at the end.
-	 */
-	private List createOverrideCache(List cache, IProject project, String packageName, String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass) {
-		// Now get the overrides paths
-		String[] paths = BeaninfoPlugin.getPlugin().getOverridePaths(project, packageName);
-		if (paths.length == 0)
-			return cache;
-		
-		// Now apply the overrides.
-		if (cache == null)
-			cache = new ArrayList();
-		BeaninfoPlugin.IOverrideRunnable runnable = new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, cache);
-		for (int i = 0; i < paths.length; i++) {
-			runnable.run(paths[i]);
-		}
-		return !cache.isEmpty() ? cache : null;
-	}
-	
-	private class ExtensionDocApplies implements BeaninfoPlugin.IOverrideRunnable {
-		
-		private final String overrideFile;
-		private final ResourceSet rset;
-		private final JavaClass mergeIntoJavaClass;
-		private final List overridesCache;
-
-		public ExtensionDocApplies(String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass, List overridesCache) {
-			this.overrideFile = overrideFile;
-			this.rset = rset;
-			this.mergeIntoJavaClass = mergeIntoJavaClass;
-			this.overridesCache = overridesCache;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(java.lang.String)
-		 */
-		public void run(String overridePath) {
-			Resource overrideRes = null;
-			URI uri = URI.createURI(overridePath+overrideFile);
-			try {
-				overrideRes = rset.getResource(uri, true);
-				run(overrideRes);
-			} catch (WrappedException e) {
-				// FileNotFoundException is ok
-				if (!(e.exception() instanceof FileNotFoundException)) {
-					if (e.exception() instanceof CoreException
-						&& ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
-						// This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
-					} else {
-						BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + overridePath + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-					}
-				}
-				// In case it happened after creating resource but during load. Need to get rid of it in the finally.	
-				overrideRes = rset.getResource(uri, false);				
-			} catch (Exception e) {
-				// Couldn't load it for some reason.
-				BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + overridePath + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-				overrideRes = rset.getResource(uri, false); // In case it happened after creating resource but during load so that we can get rid of it.
-			} finally {
-				if (overrideRes != null)
-					rset.getResources().remove(overrideRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(org.eclipse.emf.ecore.resource.Resource)
-		 */
-		public void run(Resource overrideRes) {
-			try {
-				if (overridesCache != null)
-					overridesCache.addAll(EcoreUtil.copyAll(overrideRes.getContents()));	// Make a copy for the override cache to be used next time needed.
-				EventUtil util = EventFactory.eINSTANCE.createEventUtil(mergeIntoJavaClass, rset);
-				util.doForwardEvents(overrideRes.getContents());
-			} catch (WrappedException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error processing file\"" + overrideRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-			}
-		}
-	}
-	protected void applyExtensionDocTo(ResourceSet rset, JavaClass mergeIntoJavaClass, String overrideFile, String packageName, String className) {
-		BeaninfoPlugin.getPlugin().applyOverrides(getAdapterFactory().getProject(), packageName, className, mergeIntoJavaClass, rset, 
-			new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, null));
-	}
-
-	/**
-	 * Return the target as a JavaClass 
-	 */
-	protected JavaClassImpl getJavaClass() {
-		return (JavaClassImpl) getTarget();
-	}
-
-	/**
-	 * Answer the beaninfo constants record
-	 */
-	protected BeaninfoProxyConstants getProxyConstants() {
-		return BeaninfoProxyConstants.getConstants(getRegistry());
-	}
-
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEStructuralFeatures()
-	 */
-	public EList getEStructuralFeatures() {
-		introspectIfNecessary();
-		return getJavaClass().getEStructuralFeaturesInternal();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllProperties()
-	 */
-	public EList getAllProperties() {
-		return allProperties();
-	}	
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEOperations()
-	 */
-	public EList getEOperations() {
-		if (getClassEntry() != null && getClassEntry().isOperationsStored())
-			introspectIfNecessary();	// Already stored, just do if necessary.
-		else {
-			synchronized (this) {
-				needsIntrospection = true;	// Force reintrospection because we either aren't storing operations, or have never loaded.
-			}
-			introspectIfNecessary(true);	// But force the operations now.
-		}
-		return getJavaClass().getEOperationsInternal();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEAllOperations()
-	 */
-	public BasicEList getEAllOperations() {
-		return allOperations();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEvents()
-	 */
-	public EList getEvents() {
-		introspectIfNecessary();
-		return getJavaClass().getEventsGen();
-	}
-	
-	/**
-	 * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllEvents()
-	 */
-	public EList getAllEvents() {
-		return allEvents();
-	}					
-
-	private void finalizeProperties(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed, and set the etype for those that don't have it set.
-		Map oldLocals = getPropertiesMap();
-		Iterator itr = getFeaturesList().iterator();
-		while (itr.hasNext()) {
-			EStructuralFeature a = (EStructuralFeature) itr.next();
-			PropertyDecorator p = Utilities.getPropertyDecorator(a);
-			Object aOld = oldLocals.get(a.getName());
-			if (aOld != null && aOld != Boolean.FALSE) {
-				// A candidate for removal. It was in the old list and it was not processed.
-				if (p != null) {
-					ImplicitItem implicit = p.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						p.setEModelElement(null); // Remove from the feature;
-						((InternalEObject) p).eSetProxyURI(BAD_URI);
-						// Mark it as bad proxy so we know it is no longer any use.
-						p = null;
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // Remove it, this was implicitly created and not processed this time.
-							((InternalEObject) a).eSetProxyURI(BAD_URI);	// Mark it as bad proxy so we know it is no longer any use.
-							continue;
-						}
-						// Need to go on because we need to check the eType to make sure it is set. At this point we have no decorator but we still have a feature.
-					}
-				}
-			}
-			
-			// [79083] Also check for eType not set, and if it is, set it to EObject type. That way it will be valid, but not valid as 
-			// a bean setting.
-			if (a.getEType() == null) {
-				// Set it to EObject type. If it becomes valid later (through the class being changed), then the introspect/reflect
-				// will set it to the correct type.
-				a.setEType(EcorePackage.eINSTANCE.getEObject());
-				Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-				if (logger.isLoggingLevel(Level.WARNING))
-					logger.logWarning("Feature \""+getJavaClass().getQualifiedName()+"->"+a.getName()+"\" did not have a type set. Typically due to override file creating feature but property not found on introspection/reflection.");
-			}
-			
-			if (p != null && cd != null) {
-				// Now create the appropriate cache entry for this property.
-				BeanInfoDecoratorUtility.buildChange(cd, p);
-			}
-		}
-	}
-
-	/**
-	 * merge all  the Properties (i.e. supertypes) (properties)
-	 */
-	protected EList allProperties() {
-		
-		EList jcAllProperties = getJavaClass().getAllPropertiesGen();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllProperties != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllPropertiesCollectionModified())
-				return jcAllProperties;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-		
-		UniqueEList allProperties = new UniqueEList() {
-			protected Object[] newData(int capacity) {
-				return new EStructuralFeature[capacity];
-			}
-
-			protected boolean useEquals() {
-				return false;
-			}
-
-		};
-		boolean doAllProperties = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllProperties = !isDoingAllProperties && !isIntrospecting && isResourceConnected();
-			if (doAllProperties)
-				isDoingAllProperties = true;
-		}
-		if (doAllProperties) {
-			try {
-				EList localProperties = getJavaClass().getProperties();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllProperties = superTypes.size() == 1 ? (Collection) allProperties : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperProperties();
-					if (!mergeAll) {
-						// we don't to want to merge super properties, but we still need super non-properties or explict ones.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								EStructuralFeature p = (EStructuralFeature) supers.get(i1);
-								PropertyDecorator pd = Utilities.getPropertyDecorator(p);
-								if ( pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()))
-									workingAllProperties.add(p);
-							}
-						}
-					} else {
-						// We want to merge all.					
-						// BeanInfo could of given us the not merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedPropertyNames());
-							
-							// Now walk and add in non-bean properties (and bean properties that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo in the not inherited list.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									EStructuralFeature p = (EStructuralFeature) supers.get(i1);
-									PropertyDecorator pd = Utilities.getPropertyDecorator(p);
-									if (pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()) || !superSet.contains(pd.getName()))
-										workingAllProperties.add(p);
-								}
-							}
-						} else {
-							// BeanInfo (or reflection always does this) called out that all super properties are good
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllProperties.addAll(((JavaClass) superTypes.get(i)).getAllProperties());
-							}
-						}
-					}
-					if (workingAllProperties != allProperties)
-						allProperties.addAll(workingAllProperties);	// Now copy over the ordered super properties.
-				}
-				allProperties.addAll(localProperties);				
-				superAdapter.setAllPropertiesCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized(this) {
-					isDoingAllProperties = false;
-				}
-			}
-		}
-
-		if (!allProperties.isEmpty()) {
-			allProperties.shrink();
-			return new EcoreEList.UnmodifiableEList(
-				getJavaClass(),
-				null,
-				allProperties.size(),
-				allProperties.data());
-		} else
-			return ECollections.EMPTY_ELIST;
-	}
-
-	/*
-	 * Fill in the property using the prop record. If this one that should have merging done, then
-	 * return the PropertyDecorator so that it can have the PropertyRecord merged into it. Else
-	 * return null if no merging.
-	 */
-	protected PropertyDecorator calculateProperty(PropertyRecord pr, boolean indexed) {
-		// If this is an indexed property, then a few fields will not be set in here, but
-		// will instead be set by the calculateIndexedProperty, which will be called.
-		boolean changeable = pr.writeMethod != null || (pr.field != null && !pr.field.readOnly);
-		JavaHelpers type = pr.propertyTypeName != null ? Utilities.getJavaType(MapJNITypes.getFormalTypeName(pr.propertyTypeName), getJavaClass().eResource().getResourceSet()) : null;
-
-		if (indexed) {
-			// If no array write method found, then see if there is an indexed write method. If there is, then it is changable.
-			if (!changeable)
-				changeable = ((IndexedPropertyRecord) pr).indexedWriteMethod != null;
-			if (type == null) {
-				// If no array type from above, create one from the indexed type proxy. Add '[]' to turn it into an array.
-				type = Utilities.getJavaType(MapJNITypes.getFormalTypeName(((IndexedPropertyRecord) pr).indexedPropertyTypeName)+"[]", getJavaClass().eResource().getResourceSet());
-			}
-		}
-
-		if (type != null)
-			return createProperty(pr.name, indexed, changeable, type); // A valid property descriptor.
-		else
-			return null;
-	}
-
-	/**
-	 * Fill in the property and its decorator using the passed in information.
-	 */
-	protected PropertyDecorator createProperty(String name, boolean indexed, boolean changeable, EClassifier type) {
-		// First find if there is already a property of this name, and if there is, is the PropertyDecorator
-		// marked to not allow merging in of introspection results.		
-		HashMap existingLocals = getPropertiesMap();
-		EStructuralFeature prop = null;
-		PropertyDecorator pd = null;
-		Object p = existingLocals.get(name);
-		if (Boolean.FALSE == p)
-			return null; // We've already processed this name, can't process it again.
-		if (p != null) {
-			// We've found one of the same name. Whether we modify it or use it as is, we put in a
-			// special dummy in its place. That marks that we've already processed it and accepted it.
-			existingLocals.put(name, Boolean.FALSE);
-
-			// If the decorator for this entry says not to merge then return.
-			// If there is no PropertyDecorator, then we will merge. If they
-			// didn't want to merge then should of created of property decorator and said no merge.
-			pd = Utilities.getPropertyDecorator((EStructuralFeature) p);
-			if (pd != null && !pd.isMergeIntrospection())
-				return null;
-			prop = (EStructuralFeature) p;
-		}
-
-		// Need to test if this is an implicit decorator and it is not of the 
-		// same type (i.e. is indexed now but wasn't or visa-versa, then we need
-		// to get rid of the decorator and recreate it. If it is not implicit, then
-		// we have to use it as is because the user specified, so it won't become
-		// an indexed if the user did not created it as an index, and visa-versa.
-		// Also if it is implicit, then we need to unset certain features that may of
-		// been set by a previous reflection which has now become introspected.
-		// When reflected we set the actual fields instead of the letting proxy determine them.
-		if (pd != null) {
-			if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL) {
-				// We can't change the type for explicit.
-				indexed = pd instanceof IndexedPropertyDecorator;
-			} else {
-				if ((indexed && !(pd instanceof IndexedPropertyDecorator)) || (!indexed && pd instanceof IndexedPropertyDecorator)) {
-					// It is implicit and of a different type, so just get rid of it and let it be recreated correctly.
-					prop.getEAnnotations().remove(pd);
-					pd = null;
-				}
-			}
-			if (pd != null)
-				if (indexed)
-					BeanInfoDecoratorUtility.clear((IndexedPropertyDecorator) pd);
-				else
-					BeanInfoDecoratorUtility.clear(pd);
-		}
-
-		ImplicitItem implicit = pd == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : pd.getImplicitDecoratorFlag();
-		if (prop == null) {
-			// We will create a new property.
-			// We can't have an implicit feature, but an explicit decorator.
-			getFeaturesList().add(prop = EcoreFactory.eINSTANCE.createEReference());
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
-		}
-
-		setPropertyID(name, prop);
-		prop.setName(name);
-		prop.setTransient(false);
-		prop.setVolatile(false);
-		prop.setChangeable(changeable);
-
-		// Containment and Unsettable is tricky for EReferences. There is no way to know whether it has been explicitly set to false, or it defaulted to
-		// false because ECore has not made containment/unsettable an unsettable feature. So we need to instead use the algorithm of if we here 
-		// created the feature, then we will by default set it to containment/unsettable. If it was created through diff merge, then
-		// we will leave it alone. It is the responsibility of the merge file writer to set containment/unsettable correctly.
-		if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-			prop.setUnsettable(true);
-		}
-		prop.setEType(type);
-		if (!indexed) {
-			prop.setLowerBound(0);
-			prop.setUpperBound(1);
-		} else {
-			prop.setLowerBound(0);
-			prop.setUpperBound(-1);
-			prop.setUnique(true);
-		}
-
-		// Now create/fill in the property descriptor for it.
-		// If there already is one then we
-		// will use it. This allows merging with beanfinfo.		
-		if (pd == null) {
-			pd =
-				(!indexed)
-					? BeaninfoFactory.eINSTANCE.createPropertyDecorator()
-					: BeaninfoFactory.eINSTANCE.createIndexedPropertyDecorator();
-			pd.setImplicitDecoratorFlag(implicit);
-			prop.getEAnnotations().add(pd);
-		}
-		return pd;
-	}
-
-	/**
-	 * @param name
-	 * @param prop
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setPropertyID(String name, EStructuralFeature prop) {
-		// Now fill it in. Normal id for an attribute is "classname.attributename" but we can't use that
-		// for us because that format is used by Java Core for a field and there would be confusion.
-		// So we will use '/' instead.
-		((XMIResource) prop.eResource()).setID(prop, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.FEATURE + name);
-	}
-
-	/*
-	 * Reflect the properties. This requires going through local methods and matching them up to
-	 * see if they are properties.
-	 */
-	private void reflectProperties() {
-		// If we are set to mergeSuperTypeProperties, then we need to get the super properties.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates unless they are different types.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		TimerTests.basicTest.startCumulativeStep(REFLECT_PROPERTIES);		
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperProperties()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getAllProperties();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						EStructuralFeature sf = (EStructuralFeature) superAll.get(i1);
-						supers.add(sf.getName());
-					}
-				}
-			}
-		}
-
-		// If any of the classes in the hierarchy are bound, then all reflected properties are considered bound.
-		boolean isBound = isDefaultBound();
-		if (!isBound) {
-			List superTypes = getJavaClass().getEAllSuperTypes();
-			// Start from end because that will be first class above the this one.
-			for (int i=superTypes.size()-1; !isBound && i>=0; i--) {
-				JavaClass spr = (JavaClass) superTypes.get(i);
-				BeaninfoClassAdapter bi = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(spr, IIntrospectionAdapter.ADAPTER_KEY);
-				// They should all be reflected, but be on safe side, check if null.
-				if (bi != null)
-					isBound = bi.isDefaultBound();
-			}
-		}
-
-		HashMap props = new HashMap();
-
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate as properties
-			if (mthd.getName().startsWith("get")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had get(...) and not getXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setGetter(mthd, false))
-						props.put(name, propInfo);
-				} else
-					propInfo.setGetter(mthd, false);
-			} else if (mthd.getName().startsWith("is")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(2));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had is(...) and not isXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setGetter(mthd, true))
-						props.put(name, propInfo);
-				} else
-					propInfo.setGetter(mthd, true);
-			} else if (mthd.getName().startsWith("set")) { //$NON-NLS-1$
-				String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
-				if (name.length() == 0 || supers.contains(name))
-					continue;	// Had set(...) and not setXXX(...) so not a setter. Or this is the same name as a super, either way ignore it.				
-				PropertyInfo propInfo = (PropertyInfo) props.get(name);
-				if (propInfo == null) {
-					propInfo = new PropertyInfo();
-					if (propInfo.setSetter(mthd))
-						props.put(name, propInfo);
-				} else
-					propInfo.setSetter(mthd);
-			}
-		}
-
-		// Now go through the hash map and create the properties.
-		itr = props.entrySet().iterator();
-		while (itr.hasNext()) {
-			Map.Entry entry = (Map.Entry) itr.next();
-			((PropertyInfo) entry.getValue()).createProperty((String) entry.getKey(), isBound);
-		}
-		TimerTests.basicTest.stopCumulativeStep(REFLECT_PROPERTIES);		
-	}
-
-	private class PropertyInfo {
-		
-		public EClassifier type, indexedType;
-		public boolean constrained;
-		public Method getter, setter, indexedGetter, indexedSetter;
-
-		public boolean setGetter(Method get, boolean mustBeBoolean) {
-			List parms = get.getParameters();
-			if (parms.size() > 1)
-				return false; // Invalid - improper number of parms.
-			boolean indexed = parms.size() == 1;
-			if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
-				return false; // Invalid - a parm that is not an int is invalid for indexed.
-			EClassifier retType = get.getReturnType();
-			if (retType == null || retType.getName().equals("void")) //$NON-NLS-1$
-				return false; // Invalid - must have a return type
-			if (mustBeBoolean && !retType.getName().equals("boolean")) //$NON-NLS-1$
-				return false; // Invalid - it must be a boolean.
-			if (indexed) {
-				if (indexedType != null) {
-					if (indexedType != retType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == retType))
-					return false; // Invalid - indexed type doesn't match component type of base type.
-			} else {
-				if (type != null) {
-					if (type != retType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (indexedType != null && !(((JavaHelpers) retType).isArray() && ((ArrayType) retType).getComponentType() == indexedType))
-					if (type == null) {
-						// We had a potential indexed and had not yet found the regular type. We've now found
-						// the regular type, and it is not indexed. So it takes priority and will wipe out
-						// the indexed type.
-						indexedGetter = null;
-						indexedSetter = null;
-						indexedType = null;
-					} else
-						return false; // Invalid - indexed type doesn't match component type of base type we already have
-			}
-
-			if (indexed) {
-				if (indexedGetter != null)
-					return false; // Already have an indexed getter.
-				indexedGetter = get;
-				indexedType = retType;
-			} else {
-				if (getter != null)
-					return false; // Already have a getter
-				getter = get;
-				type = retType;
-			}
-			return true;
-		}
-
-		public boolean setSetter(Method set) {
-			List parms = set.getParameters();
-			if (parms.size() > 2 || parms.size() < 1)
-				return false; // Invalid - improper number of parms.
-			boolean indexed = parms.size() == 2;
-			if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
-				return false; // Invalid - a parm that is not an int is invalid for indexed.
-			EClassifier retType = set.getReturnType();
-			if (retType != null && !retType.getName().equals("void")) //$NON-NLS-1$
-				return false; // Invalid - must not have a return type
-			EClassifier propType = null;
-			if (indexed) {
-				propType = ((JavaParameter) parms.get(1)).getEType();
-				if (indexedType != null) {
-					if (indexedType != propType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == propType))
-					return false; // Invalid - indexed type doesn't match component type of base type, or base type not an array
-			} else {
-				propType = ((JavaParameter) parms.get(0)).getEType();
-				if (type != null) {
-					if (type != propType)
-						return false; // Invalid - type is different from previous info.
-				}
-				if (indexedType != null
-					&& !(((JavaHelpers) propType).isArray() && ((ArrayType) propType).getComponentType() == indexedType))
-					if (type == null) {
-						// We had a potential indexed and had not yet found the regular type. We've now found
-						// the regular type, and it is not indexed of the correct type. So it takes priority and will wipe out
-						// the indexed type.
-						indexedGetter = null;
-						indexedSetter = null;
-						indexedType = null;
-					} else
-						return false; // Invalid - indexed type doesn't match component type of base type from this setter.
-			}
-
-			if (indexed) {
-				if (indexedSetter != null)
-					return false; // Already have an indexed getter.
-				indexedSetter = set;
-				indexedType = propType;
-			} else {
-				if (setter != null)
-					return false; // Already have a getter
-				setter = set;
-				type = propType;
-			}
-
-			if (set.getJavaExceptions().contains(Utilities.getJavaClass("java.beans.PropertyVetoException", getJavaClass().eResource().getResourceSet()))) //$NON-NLS-1$
-				constrained = true;
-			return true;
-		}
-
-		public void createProperty(String name, boolean isBound) {
-			boolean indexed = indexedType != null;
-			if (indexed && type == null)
-				return; // A potential indexed, but never found the getter/setter of the regular type.
-
-			PropertyDecorator prop =
-				BeaninfoClassAdapter.this.createProperty(
-					name,
-					indexed,
-					(!indexed) ? (setter != null) : (setter != null || indexedSetter != null),
-					type);
-			if (prop == null)
-				return; // Reflection not wanted.
-
-			indexed = prop instanceof IndexedPropertyDecorator; // It could of been forced back to not indexed if explicitly set.
-
-			// At this point in time all implicit settings have been cleared. This is done back in createProperty() method above.
-			// So now apply reflected settings on the property decorator. 
-			BeanInfoDecoratorUtility.setProperties(prop, isBound, constrained, getter, setter);
-			if (indexed)
-				BeanInfoDecoratorUtility.setProperties((IndexedPropertyDecorator) prop, indexedGetter, indexedSetter);
-
-		}
-	};
-
-	/*
-	 * Should only be called from introspect so that flags are correct.
-	 */
-	private void finalizeOperations(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed.
-		Iterator itr = getOperationsList().iterator();
-		while (itr.hasNext()) {
-			EOperation a = (EOperation) itr.next();
-			MethodDecorator m = Utilities.getMethodDecorator(a);
-			if (!newoperations.contains(a)) {
-				// A candidate for removal. It is in the list but we didn't add it. Check to see if it one we had created in the past.
-				// If no methoddecorator, then keep it, not one ours.
-				if (m != null) {
-					ImplicitItem implicit = m.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						m.setEModelElement(null); // Remove it because it was implicit.
-						 ((InternalEObject) m).eSetProxyURI(BAD_URI);
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // The operation was implicit too.
-							 ((InternalEObject) a).eSetProxyURI(BAD_URI);
-						}
-						continue;	// At this point we no longer have a method decorator, so go to next.
-					}
-				}
-			}
-			
-			if (m != null && cd != null) {
-				// Now create the appropriate cache entry for this method.
-				BeanInfoDecoratorUtility.buildChange(cd, m);
-			}
-		}
-	}
-
-	/**
-	 * Fill in the behavior and its decorator using the mthdDesc.
-	 */
-	protected MethodDecorator calculateOperation(MethodRecord record) {
-		return createOperation(record.name, formLongName(record), null, record);
-	}
-
-	/**
-	 * Fill in the behavior and its decorator using the passed in information.
-	 */
-	protected MethodDecorator createOperation(String name, String longName, Method method, MethodRecord record) {
-		// First find if there is already a behavior of this name and method signature , and if there is, is the MethodDecorator
-		// marked to not allow merging in of introspection results.
-		HashMap existingLocals = getOperationsMap();
-		EOperation oper = null;
-		MethodDecorator md = null;
-		Object b = null;
-		if (name != null)
-			b = existingLocals.get(longName);
-		else
-			b = existingLocals.get(longName);
-			
-		if (b != null) {
-			// If the decorator for this entry says not to merge then return.
-			// If there is no decorator, then we will merge. If they didn't want to
-			// merge, then they should of created a decorator with no merge on it.
-			md = Utilities.getMethodDecorator((EOperation) b);
-			if (md != null && !md.isMergeIntrospection())
-				return null;
-			oper = (EOperation) b;
-		}
-
-		// Need to find the method and method id.
-		if (method == null) {
-			// No method sent, create a proxy to it from the record.
-			method = BeanInfoDecoratorUtility.createJavaMethodProxy(record.methodForDescriptor);
-		}
-
-		ImplicitItem implicit = md == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
-		if (oper == null) {
-			// We will create a new MethodProxy.
-			oper = BeaninfoFactory.eINSTANCE.createMethodProxy();
-			getOperationsList().add(oper);
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL; 
-		}		
-		if (name == null)
-			name = method.getName();		
-
-		// Now fill it in.
-		if (oper instanceof MethodProxy)
-			 ((MethodProxy) oper).setMethod(method);
-		setMethodID(name, oper);
-		oper.setName(name);
-		newoperations.add(oper);
-
-		// Now create/fill in the method decorator for it.
-		// If there already is one then we
-		// will use it. This allows merging with beaninfo.		
-		if (md == null) {
-			md = BeaninfoFactory.eINSTANCE.createMethodDecorator();
-			md.setImplicitDecoratorFlag(implicit);
-			oper.getEAnnotations().add(md);
-		} else
-			BeanInfoDecoratorUtility.clear(md);
-		return md;
-	}
-
-	/**
-	 * @param name
-	 * @param oper
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setMethodID(String name, EOperation oper) {
-		((XMIResource) oper.eResource()).setID(oper, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.BEHAVIOR + name);
-	}
-
-	private void reflectOperations() {
-		// If we are set to mergeSuperTypeBehaviors, then we need to get the super behaviors.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates unless they are different signatures. So all super operations
-		// will be allowed and we will not override them.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperMethods()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getEAllOperations();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						EOperation op = (EOperation) superAll.get(i1);
-						supers.add(formLongName(op));
-					}
-				}
-			}
-		}
-
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate as behaviors	
-			String longName = formLongName(mthd);
-			// Add if super not already contain it.
-			if (!supers.contains(longName))
-				createOperation(null, longName, mthd, null);	// Don't pass a name, try to create it by name, only use ID if there is more than one of the same name.
-		}
-	}
-
-	/*
-	 * merge all  the Behaviors(i.e. supertypes)
-	 */
-	protected BasicEList allOperations() {
-		BasicEList jcAllOperations = (BasicEList) getJavaClass().getEAllOperationsGen();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllOperations != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllOperationsCollectionModified())
-				return jcAllOperations;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-
-		UniqueEList allOperations = new UniqueEList() {
-			protected Object[] newData(int capacity) {
-				return new EOperation[capacity];
-			}
-
-			protected boolean useEquals() {
-				return false;
-			}
-		};
-		boolean doAllOperations = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all operatoins because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllOperations = !isDoingAllOperations && !isIntrospecting && isResourceConnected();
-			if (doAllOperations)
-				isDoingAllOperations = true;
-		}
-
-		if (doAllOperations) {
-			try {
-				EList localOperations = getJavaClass().getEOperations();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllOperations = superTypes.size() == 1 ? (Collection) allOperations : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperMethods();
-					if (!mergeAll) {
-						// we don't to want to merge super operations, but we still need super non-operations.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								EOperation o = (EOperation) supers.get(i1);
-								MethodDecorator md = Utilities.getMethodDecorator(o);
-								if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
-									workingAllOperations.add(o);
-							}
-						}
-					} else {
-						// We want to merge all.
-						// BeanInfo could of given us the don't merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedMethodNames());
-							
-							// Now walk and add in non-bean operations (and bean operations that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo not merge list.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									EOperation o = (EOperation) supers.get(i1);
-									MethodDecorator md = Utilities.getMethodDecorator(o);
-									if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
-										workingAllOperations.add(o);
-									else {
-										String longName = formLongName(o);
-										if (longName == null || !superSet.contains(longName))
-											workingAllOperations.add(o);
-									}
-								}
-							}
-						} else {
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllOperations.addAll(((JavaClass) superTypes.get(i)).getEAllOperations());
-							}
-						}
-					}
-					if (workingAllOperations != allOperations)
-						allOperations.addAll(workingAllOperations);	// Now copy over the ordered super operations.					
-				}
-				allOperations.addAll(localOperations);				
-				ESuperAdapter sa = getJavaClass().getESuperAdapter();
-				sa.setAllOperationsCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized(this) {
-					isDoingAllProperties = false;
-				}
-			}
-		}
-
-		allOperations.shrink();
-		return new EcoreEList.UnmodifiableEList(
-			getJavaClass(),
-			EcorePackage.eINSTANCE.getEClass_EAllOperations(),
-			allOperations.size(),
-			allOperations.data());
-
-	}
-
-	/*
-	 * Should only be called from introspect so that flags are correct.
-	 */
-	private void finalizeEvents(ChangeDescription cd) {
-		// Now go through the list and remove those that should be removed.
-		Map oldLocals = getEventsMap();
-		Iterator itr = getEventsList().iterator();
-		while (itr.hasNext()) {
-			JavaEvent a = (JavaEvent) itr.next();
-			EventSetDecorator e = Utilities.getEventSetDecorator(a);
-			Object aOld = oldLocals.get(a.getName());
-			if (aOld != null && aOld != Boolean.FALSE) {
-				// A candidate for removal. It was in the old list and it was not processed.
-				if (e != null) {
-					ImplicitItem implicit = e.getImplicitDecoratorFlag();
-					if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
-						e.setEModelElement(null); // Remove it because it was implicit.
-						((InternalEObject) e).eSetProxyURI(BAD_URI);
-						if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
-							itr.remove(); // The feature was implicit too.
-							((InternalEObject) a).eSetProxyURI(BAD_URI);
-						}
-						continue;	// At this point we don't have a decorator any more, so don't bother going on.
-					}
-				}
-			}
-			
-			if (e != null && cd != null) {
-				// Now create the appropriate cache entry for this event.
-				BeanInfoDecoratorUtility.buildChange(cd, e);
-			}
-		}
-	}
-
-	/**
-	 * Fill in the event and its decorator using the eventDesc.
-	 */
-	protected EventSetDecorator calculateEvent(EventSetRecord record) {
-		return createEvent(record.name);
-	}
-
-	/**
-	 * Fill in the event and its decorator using the passed in information.
-	 */
-	protected EventSetDecorator createEvent(String name) {
-		// First find if there is already an event of this name, and if there is, is the EventSetDecorator
-		// marked to not allow merging in of introspection results.
-		HashMap existingLocals = getEventsMap();
-		JavaEvent event = null;
-		EventSetDecorator ed = null;
-		Object b = existingLocals.get(name);
-		if (Boolean.FALSE == b)
-			return null; // We've already processed this event, can't process it again.			
-		if (b != null) {
-			// We've found one of the same event. Whether we modify it or use it as is, we put in a
-			// special dummy in its place. That marks that we've already processed it and accepted it.
-			existingLocals.put(name, Boolean.FALSE);
-
-			// If the decorator for this entry says not to merge then return.
-			// If there is no decorator, then we will merge. If they didn't want to
-			// merge, then they should of created a decorator with no merge on it.
-			ed = Utilities.getEventSetDecorator((JavaEvent) b);
-			if (ed != null && !ed.isMergeIntrospection())
-				return null;
-			event = (JavaEvent) b;
-		}
-		
-		ImplicitItem implicit = ed == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
-		if (event == null) {
-			// We will create a new Event.
-			event = BeaninfoFactory.eINSTANCE.createBeanEvent();
-			getEventsList().add(event);
-			implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL; // Can't have an implicit feature but explicit decorator.
-		}
-
-		setEventID(name, event);
-		event.setName(name);
-
-		// Now create in the event decorator for it.
-		// If there already is one then we
-		// will use it. This allows merging with beaninfo.		
-		if (ed == null) {
-			ed = BeaninfoFactory.eINSTANCE.createEventSetDecorator();
-			ed.setImplicitDecoratorFlag(implicit);
-			event.getEAnnotations().add(ed);
-		} else
-			BeanInfoDecoratorUtility.clear(ed);
-		return ed;
-	}
-
-	/**
-	 * @param name
-	 * @param event
-	 * 
-	 * @since 1.1.0
-	 */
-	private void setEventID(String name, JavaEvent event) {
-		// Now fill it in.
-		((XMIResource) event.eResource()).setID(event, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.EVENT + name);
-	}
-
-	/**
-	 * Reflect the events. This requires going through local public methods and creating an 
-	 * event for the discovered events.
-	 */
-	protected void reflectEvents() {
-		// If we are set to mergeSuperTypeEvents, then we need to get the super events.
-		// This is so that duplicate any from super that we find here. When reflecting we don't
-		// allow discovered duplicates.
-		//
-		// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-		// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-		// the truth is most people want these. So we will add them in. But since there could be more than one it
-		// gets confusing. We need to look for dups from the super types.
-		//
-		// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-		Set supers = new HashSet(50);
-		BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-		if (bd == null || bd.isMergeSuperEvents()) {
-			List superTypes = getJavaClass().getESuperTypes();
-			if (!superTypes.isEmpty()) {
-				int lenST = superTypes.size();
-				for (int i=0; i<lenST; i++) {
-					List superAll = ((JavaClass) superTypes.get(i)).getAllEvents();
-					int len = superAll.size();
-					for (int i1=0; i1<len; i1++) {
-						JavaEvent se = (JavaEvent) superAll.get(i1);
-						supers.add(se.getName());
-					}
-				}
-			}
-		}
-
-		HashMap events = new HashMap();
-		eventListenerClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventListener", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
-		tooManyExceptionClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.TooManyListenersException", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
-		Iterator itr = getJavaClass().getPublicMethods().iterator();
-		while (itr.hasNext()) {
-			Method mthd = (Method) itr.next();
-			if (mthd.isStatic() || mthd.isConstructor())
-				continue; // Statics/constructors don't participate in events.
-			String key = validEventAdder(mthd);
-			if (key != null) {
-				EventInfo eventInfo = (EventInfo) events.get(key);
-				if (eventInfo == null) {
-					eventInfo = new EventInfo();
-					eventInfo.setAdder(mthd);
-					events.put(key, eventInfo);
-				} else
-					eventInfo.setAdder(mthd);
-			} else {
-				key = validEventRemove(mthd);
-				if (key != null) {
-					EventInfo eventInfo = (EventInfo) events.get(key);
-					if (eventInfo == null) {
-						eventInfo = new EventInfo();
-						eventInfo.setRemover(mthd);
-						events.put(key, eventInfo);
-					} else
-						eventInfo.setRemover(mthd);
-				}
-			}
-		}
-
-		eventListenerClass = null; // No longer need it.
-
-		// Now actually create the events.
-		HashSet eventNames = new HashSet(events.size()); // Set of found event names, to prevent duplicates
-		Iterator evtItr = events.entrySet().iterator();
-		while (evtItr.hasNext()) {
-			Map.Entry eventMap = (Map.Entry) evtItr.next();
-			EventInfo ei = (EventInfo) eventMap.getValue();
-			if (ei.isValidInfo()) {
-				String eventName = getEventName((String) eventMap.getKey());
-				if (eventNames.contains(eventName))
-					continue;	// Aleady created it. (Note: Introspector actually takes last one over previous dups, but the order is totally undefined, so choosing first is just as good or bad.
-
-				if (supers.contains(eventName))
-					continue; // Don't override a super event.
-
-				if (ei.createEvent(eventName))
-					eventNames.add(eventName); // It was validly created.
-			}
-		}
-
-		tooManyExceptionClass = null; // No longer need it.
-	}
-
-	/**
-	 * merge all the Events (i.e. supertypes)
-	 */
-	protected EList allEvents() {
-
-		EList jcAllEvents = getJavaClass().getAllEventsGen();
-		BeaninfoSuperAdapter superAdapter =
-			(BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
-		if (jcAllEvents != null) {
-			// See if new one required.
-			if (superAdapter == null || !superAdapter.isAllEventsCollectionModified())
-				return jcAllEvents;
-			// Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.       		
-		}
-
-		UniqueEList allEvents = new UniqueEList() {
-			protected Object[] newData(int capacity) {
-				return new JavaEvent[capacity];
-			}
-
-			protected boolean useEquals() {
-				return false;
-			}
-		};
-		
-		boolean doAllEvents = false;
-		synchronized(this) {
-			// If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
-			doAllEvents = !isDoingAllEvents && !isIntrospecting && isResourceConnected();
-			if (doAllEvents)
-				isDoingAllEvents = true;
-		}
-
-		if (doAllEvents) {
-			try {
-				EList localEvents = getJavaClass().getEvents();
-				// Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
-				// Interfaces can have multiple extends, while the Introspector ignores these for reflection,
-				// the truth is most people want these. So we will add them in. But since there could be more than one it
-				// gets confusing. We need to look for dups from the super types and still keep order.
-				//
-				// Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
-				List superTypes = getJavaClass().getESuperTypes();
-				if (!superTypes.isEmpty()) {
-					// Now we need to merge in the supers.
-					BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
-					// If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
-					// we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
-					// because IB would contribute IC's too).
-					Collection workingAllEvents = superTypes.size() == 1 ? (Collection) allEvents : new LinkedHashSet(); 
-					// We will now merge as directed.
-					boolean mergeAll = bd == null || bd.isMergeSuperEvents();
-					if (!mergeAll) {
-						// we don't to want to merge super events, but we still need super non-events or explicit ones.
-						int lenST = superTypes.size();
-						for (int i=0; i<lenST; i++) {
-							List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
-							int len = supers.size();
-							for (int i1 = 0; i1 < len; i1++) {
-								JavaEvent e = (JavaEvent) supers.get(i1);
-								EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-								if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()))
-									workingAllEvents.add(e);
-							}
-						}
-					} else {
-						// We want to merge all.					
-						// BeanInfo has given us the not merge list. If the list is empty, then we accept all.
-						if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames())) {
-							// We were given a list of names.
-							// Get the names into a set to create a quick lookup.
-							HashSet superSet = new HashSet(bd.getNotInheritedEventNames());
-							
-							// Now walk and add in non-bean events (and bean events that were explicitly added and not mergeable (i.e. didn't come thru beaninfo)) 
-							// and add those not specifically called out by BeanInfo.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
-								int len = supers.size();
-								for (int i1 = 0; i1 < len; i1++) {
-									JavaEvent e = (JavaEvent) supers.get(i1);
-									EventSetDecorator ed = Utilities.getEventSetDecorator(e);
-									if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()) || !superSet.contains(ed.getName()))
-										workingAllEvents.add(e);
-								}
-							}
-						} else {
-							// BeanInfo called out that all super events should be added, or no beaninfo.
-							int lenST = superTypes.size();
-							for (int i=0; i<lenST; i++) {
-								workingAllEvents.addAll(((JavaClass) superTypes.get(i)).getAllEvents());
-							}
-						}
-					}
-					if (workingAllEvents != allEvents)
-						allEvents.addAll(workingAllEvents);	// Now copy over the ordered super events.
-				}
-				allEvents.addAll(localEvents);				
-				superAdapter.setAllEventsCollectionModified(false); // Now built, so reset to not changed.
-			} finally {
-				synchronized (this) {
-					isDoingAllEvents = false;
-				}
-			}
-		}
-
-		if (allEvents.isEmpty())
-			return ECollections.EMPTY_ELIST;
-		else {
-			allEvents.shrink();
-			return new EcoreEList.UnmodifiableEList(
-				getJavaClass(),
-				JavaRefPackage.eINSTANCE.getJavaClass_AllEvents(),
-				allEvents.size(),
-				allEvents.data());
-		}
-
-	}
-
-	private JavaClass eventListenerClass, // Event Listener class. Needed for validation.
-	tooManyExceptionClass; // Too many listeners exception.
-
-	/*
-	 * Pass in the key, it will be used to form the name.
-	 */
-	protected String getEventName(String key) {
-		return key.substring(0, key.indexOf(':'));
-	}
-
-	/*	
-	 * Answers event key if valid, null if not valid.
-	 */
-	protected String validEventAdder(Method method) {
-		String name = method.getName();
-		if (!name.startsWith("add") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
-			return null; // Not valid format for an add listener name.
-
-		List parms = method.getParameters();
-		if (parms.size() != 1)
-			return null; // Invalid - improper number of parms.
-
-		EClassifier returnType = method.getReturnType();
-		if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
-			return null; // Invalid - must be void return type.
-
-		EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
-		if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
-			return null; // Parm must be inherit from EventListener
-
-		// This is a unique containing event name and listener type
-		// This is so we can have a unique key for two events with the same
-		// name but different listener type. (This matches Introspector so that we aren't
-		// coming up with different results.
-		return java.beans.Introspector.decapitalize(name.substring(3, name.length() - 8))
-			+ ':'
-			+ ((JavaHelpers) parmType).getQualifiedName();
-	}
-
-	/*
-	 * Answers event key if valid, null if not valid.
-	 */
-	protected String validEventRemove(Method method) {
-		String name = method.getName();
-		if (!name.startsWith("remove") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
-			return null; // Not valid format for a remove listener name.
-
-		List parms = method.getParameters();
-		if (parms.size() != 1)
-			return null; // Invalid - improper number of parms.
-
-		EClassifier returnType = method.getReturnType();
-		if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
-			return null; // Invalid - must be void return type.
-
-		EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
-		if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
-			return null; // Parm must be inherit from EventListener
-
-		// This is a unique containing event name and listener type
-		// This is so we can have a unique key for two events with the same
-		// name but different listener type. (This matches Introspector so that we aren't
-		// coming up with different results).
-		return java.beans.Introspector.decapitalize(name.substring(6, name.length() - 8))
-			+ ':'
-			+ ((JavaHelpers) parmType).getQualifiedName();
-	}
-
-	public boolean isDefaultBound() {
-		if (defaultBound == null) {
-			// Haven't yet decided on it.
-			Iterator methods = getJavaClass().getPublicMethods().iterator();
-			boolean foundAdd = false, foundRemove = false;
-			while (methods.hasNext() && (!foundAdd || !foundRemove)) {
-				Method method = (Method) methods.next();
-				if ("addPropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
-					List parms = method.getParameters();
-					if (parms.size() == 1) {
-						JavaParameter parm = (JavaParameter) parms.get(0);
-						if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
-							foundAdd = true;
-							continue;
-						}
-					}
-				} else if ("removePropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
-					List parms = method.getParameters();
-					if (parms.size() == 1) {
-						JavaParameter parm = (JavaParameter) parms.get(0);
-						if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
-							foundRemove = true;
-							continue;
-						}
-					}
-				}
-			}
-
-			defaultBound = (foundAdd && foundRemove) ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return defaultBound.booleanValue();
-	}
-
-	private class EventInfo {
-		
-		public Method addListenerMethod;
-		public Method removeListenerMethod;
-
-		public void setAdder(Method addMethod) {
-			addListenerMethod = addMethod;
-		}
-
-		public void setRemover(Method removeMethod) {
-			removeListenerMethod = removeMethod;
-		}
-
-		// Answer whether this is a valid event info.
-		public boolean isValidInfo() {
-			return (addListenerMethod != null && removeListenerMethod != null);
-		}
-
-		public boolean createEvent(String name) {
-			EventSetDecorator ed = BeaninfoClassAdapter.this.createEvent(name);
-			if (ed == null)
-				return false; // Reflection not wanted.
-
-
-			// See if unicast.
-			boolean unicast = false;
-			List exceptions = addListenerMethod.getJavaExceptions();
-			int len = exceptions.size();
-			for(int i=0; i<len; i++) {
-				if (exceptions.get(i) == BeaninfoClassAdapter.this.tooManyExceptionClass) {
-					unicast = true;
-					break;
-				}
-			}
-			// We'll let listener methods get retrieved dynamically when needed.
-			BeanInfoDecoratorUtility.setProperties(ed, addListenerMethod, removeListenerMethod, unicast, (JavaClass) ((JavaParameter) addListenerMethod.getParameters().get(0)).getEType());
-			return true;
-		}
-
-	}
-
-	/**
-	 * Mark this factory as the stale factory.
-	 */
-	public void markStaleFactory(ProxyFactoryRegistry stale) {
-		if (staleFactory == null) {
-			// It's not stale so make it stale.
-			// So that next access will re-introspect
-			defaultBound = null; // So query on next request.
-			staleFactory = new WeakReference(stale);
-
-			// Need to mark the esuperadapter that things have changed so that any 
-			// subtype will know to reuse the parent for anything that requires knowing parent info.
-			Adapter a = EcoreUtil.getExistingAdapter(getTarget(), ESuperAdapter.class);
-			// Simulate that this objects super has changed. This will make all subclasses
-			// think about the super has changed and next retrieving anything that involves the
-			// super will cause a rebuild to occur.
-			Notification note =
-				new ENotificationImpl((InternalEObject) getTarget(), Notification.SET, EcorePackage.ECLASS__ESUPER_TYPES, null, null);
-			if (a != null)
-				a.notifyChanged(note);
-			// Do the same with BeaninfoSuperAdapter so that events also will be rebuilt.
-			a = EcoreUtil.getExistingAdapter(getTarget(), BeaninfoSuperAdapter.ADAPTER_KEY);
-			if (a != null)
-				a.notifyChanged(note);
-			synchronized (this) {
-				needsIntrospection = true;
-			}
-		}
-	}
-
-	/**
-	 * Form a longname for the addkey function.
-	 */
-	private String formLongName(EOperation feature) {
-		Method mthd = null;
-		if (feature instanceof Method)
-			mthd = (Method) feature;
-		else if (feature instanceof MethodProxy)
-			mthd = ((MethodProxy) feature).getMethod();
-		else
-			return null; // Don't know what it is.
-
-		StringBuffer longName = new StringBuffer(100);
-		longName.append(feature.getName()); // Feature Name
-		longName.append(':');
-		longName.append(mthd.getName()); // Method Name
-		longName.append('(');
-		List p = mthd.getParameters();
-		for (int i = 0; i < p.size(); i++) {
-			JavaParameter parm = (JavaParameter) p.get(i);
-			if (i>0)
-				longName.append(',');
-			longName.append(parm.getJavaType().getQualifiedName());
-		}
-
-		return longName.toString();
-	}
-	
-	/*
-	 * More than one operation can have the same name. To identify them uniquely, the long name is created,
-	 * which is formed from the name and the method signature.
-	 */
-	private String formLongName(MethodRecord record) {
-		StringBuffer longName = new StringBuffer(100);
-		longName.append(record.name); // Feature Name
-		longName.append(':');
-		longName.append(record.methodForDescriptor.methodName); // Method Name
-		longName.append('(');
-		String[] p = record.methodForDescriptor.parameterTypeNames;
-		if (p != null)
-			for (int i = 0; i < p.length; i++) {
-				if (i>0)
-					longName.append(',');
-				longName.append(MapJNITypes.getFormalTypeName(p[i]));
-			}
-
-		return longName.toString();
-	}
-	/**
-	 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		// In case of removing adapter, make sure we are first removed from the factory so it doesn't know about us anymore.
-		if (msg.getEventType() == Notification.REMOVING_ADAPTER)
-			getAdapterFactory().removeAdapter(this);
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString() + '(' + (getJavaClass() != null ? getJavaClass().getQualifiedName() : "?") + ')'; //$NON-NLS-1$
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
deleted file mode 100644
index 444fad2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
+++ /dev/null
@@ -1,133 +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.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: BeaninfoJavaReflectionKeyExtension.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.internal.java.adapters.IJavaReflectionKeyExtension;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionKey;
-
-/**
- * Java Reflection Key extension to retrieve keys for beaninfo creations.
- * 
- * Handles attributes and behaviors.
- * 
- * @version 	1.0
- * @author R. L. Kulp  
- */
-public class BeaninfoJavaReflectionKeyExtension implements IJavaReflectionKeyExtension {
-	
-	// The format of the keys are:
-	// behaviors:  "classname/behavior/behaviorname"
-	// structural features: "classname/featurename"
-	public static final String 
-		BEHAVIOR = "/operation/",	// Piece in key that indicates this is a behavior. //$NON-NLS-1$
-		EVENT = "/event/",		// Piece in key that indicates this is an event. //$NON-NLS-1$
-		FEATURE = "/";			// Piece in key that indicates this is an attribute. //$NON-NLS-1$
-	
-	/**
-	 * Get the object for this key.
-	 */
-	public Object getObject(String key, JavaReflectionKey reflectionKey) {
-		if (key != null) {
-			int ibehave = key.indexOf(BEHAVIOR);
-			if (ibehave > -1) {
-				// We have a possible behavior.
-				String classname = key.substring(0, ibehave);
-				int ibehaveName = ibehave+BEHAVIOR.length();
-				if (ibehaveName < key.length()) {
-					JavaClass javaclass = getJavaClass(reflectionKey, classname);
-					if (javaclass != null) {
-						javaclass.getEOperations();	// Get the list introspected and populated if not already.
-						return reflectionKey.primGet(key);	// It should now be there, 
-					}
-				}
-			} else {
-				int ievent = key.indexOf(EVENT);
-				if (ievent > -1) {
-					// We have a possible event.
-					String classname = key.substring(0, ievent);
-					int ieventName = ievent+EVENT.length();
-					if (ieventName < key.length()) {
-						JavaClass javaclass = getJavaClass(reflectionKey, classname);
-						if (javaclass != null) {
-							javaclass.getEvents();	// Get the list introspected and populated if not already.
-							return reflectionKey.primGet(key);	// It should now be there, 
-						}
-					}
-				} else {
-					int ifeature = key.indexOf(FEATURE);
-					if (ifeature > -1) {
-						// We have a possible feature.
-						String classname = key.substring(0, ifeature);
-						int ifeatureName = ifeature+FEATURE.length();
-						if (ifeatureName < key.length()) {
-							String feature = key.substring(ifeatureName);
-							JavaClass javaclass = getJavaClass(reflectionKey, classname);
-							if (javaclass != null) {
-								// This is just a hack until we can get ID situation straightened out.
-								// Need to cause introspection of the attributes and references.
-								javaclass.getEStructuralFeatures();
-								Object result = reflectionKey.primGet(key);	// See if it now got added as an id.
-								if (result == null) {
-									// Well, it could of been added by the diff merge, which as of now can't handle ids.
-									// So we will find it within the attributes/references.
-									result = findFeature(feature, javaclass.getEReferences());
-									if (result == null)
-										result = findFeature(feature, javaclass.getEAttributes());									
-									if (result instanceof EStructuralFeature) {
-										// Need to add it as an id so next time won't come through here.
-										((XMIResource) javaclass.eResource()).setID((EObject) result, key);	// So next time it will find it directly.
-									}
-								}
-								return result;
-							}
-						}
-					}
-				}
-			}
-		}
-						
-		return null;
-	}
-
-	private EStructuralFeature findFeature(String featureName, List featureList) {
-		Iterator itr = featureList.iterator();		
-		while (itr.hasNext()) {
-			EStructuralFeature feature = (EStructuralFeature) itr.next();
-			if (featureName.equals(feature.getName())) {
-				return feature;
-			}
-		}
-		return null;
-	}
-
-	protected JavaClass getJavaClass(JavaReflectionKey reflectionKey, String classname) {
-		Object eclass = reflectionKey.primGet(classname);
-		if (eclass == null) 
-			eclass = reflectionKey.getJavaType(classname);	// Let it create it.
-		if (eclass instanceof JavaClass)
-			return (JavaClass) eclass;
-		else
-			return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
deleted file mode 100644
index 7bcc977..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
+++ /dev/null
@@ -1,198 +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.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: BeaninfoModelSynchronizer.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaModelListener;
-/**
- * This class listens for changes to the java model and flushs the
- * appropriate class introspection.
- */
-
-public class BeaninfoModelSynchronizer extends JavaModelListener {
-	protected BeaninfoAdapterFactory fAdapterFactory;
-	protected IJavaProject fProject; // The project this listener is opened on.
-	private static final IPath BEANINFOCONFIG_PATH = new Path(BeaninfoNature.P_BEANINFO_SEARCH_PATH);	//$NON-NLS-1$	
-
-	public BeaninfoModelSynchronizer(BeaninfoAdapterFactory aFactory, IJavaProject aProject) {
-		super(ElementChangedEvent.POST_CHANGE);
-		fAdapterFactory = aFactory;
-		fProject = aProject;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#getJavaProject()
-	 */
-	protected IJavaProject getJavaProject() {
-		return fProject;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#isAlsoClasspathChange(org.eclipse.core.runtime.IPath)
-	 */
-	protected boolean isAlsoClasspathChange(IPath path) {
-		return path.equals(BEANINFOCONFIG_PATH);
-	}
-	
-	/**
-	 * Stop the synchronizer from listening to any more changes.
-	 */
-	public void stopSynchronizer(boolean clearResults) {
-		JavaCore.removeElementChangedListener(this);
-		getAdapterFactory().closeAll(clearResults);
-	}
-
-	public BeaninfoAdapterFactory getAdapterFactory() {
-		return fAdapterFactory;
-	}
-
-	protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
-		if (isInClasspath(element)) {
-			if (delta.getKind() == IJavaElementDelta.REMOVED || delta.getKind() == IJavaElementDelta.ADDED) {
-				// Don't need to do anything for delete/close/add/open of main project because there is much more that needs to
-				// be done by BeaninfoNature on project close/delete, so nature listens for this and does the appropriate cleanup.			
-				if (!element.equals(fProject)) {
-					// However, all other projects are required projects and if they are deleted/closed/added/opened when need to do
-					// a full flush because we don't know any of the state, whether they are still there or not.
-					getAdapterFactory().markAllStale();
-				}
-				return;
-			} else if (isClasspathResourceChange(delta)) {
-				getAdapterFactory().markAllStale(); // The .classpath file (or .beaninfoconfig) itself in SOME DEPENDENT PROJECT has changed. 
-				return;
-			}
-			processChildren(element, delta);
-		}
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * If a working copy, then ignore it because we don't care about changes until
-	 * they are committed. Else, if the CU has changed content then mark all of the
-	 * types in this CU (such as inner classes) as stale.
-	 * If it is not a content change then process the children.
-	 */
-	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) {
-					getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), false);	// Flush everything, including inner classes.
-				}						
-				
-				break;
-			case IJavaElementDelta.ADDED:
-			case IJavaElementDelta.REMOVED:
-				// Need to know for add because we optimize the beaninfo such that once found as undefined, it won't
-				// introspect again until we mark it stale. So we need to mark it stale to refresh it.
-				
-				// It doesn't matter if totally removed or just moved somewhere else, we will clear out
-				// adapter because there could be a rename which would be a different class.
-				// Currently the element is already deleted or added and there is no way to find the types in the unit to flush.
-				// So instead we ask factory to flush all it any that start with it plus for inner classes.				
-				getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true);	// Flush everything, including inner classes.
-				break;
-		}
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-		 */
-	protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			// 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.
-			getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true);
-			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]);
-		}
-	}
-
-	protected String getFullNameFromElement(IJavaElement element) {
-		String name = element.getElementName();		
-		if (!(element instanceof ICompilationUnit || element instanceof IClassFile))
-			return name;	// Shouldn't be here
-		
-		// remove extension.
-		int periodNdx = name.lastIndexOf('.');
-		if (periodNdx == -1)
-			return name;	// Shouldn't be here. There should be an extension
-					
-		String typeName = null;
-		String parentName = element.getParent().getElementName();
-		if (parentName == null || parentName.length() == 0)
-			typeName = name.substring(0, periodNdx); // In default package
-		else
-			typeName = parentName + "." + name.substring(0, periodNdx); //$NON-NLS-1$
-								
-		return typeName;
-	}
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * If the classpath has changed, mark all as stale because we don't know what
-	 * has changed. Things that were in the path may no longer be in the path, or
-	 * the order was changed, which could affect the introspection.
-	 */
-	protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
-		if (isClassPathChange(delta))
-			fAdapterFactory.markAllStale();
-		else
-			super.processJavaElementChanged(element, delta);
-	}
-	
-	protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
-		switch (delta.getKind()) {
-			case IJavaElementDelta.ADDED:
-				break;	// Don't need to do anything on a new package. If this was from a new fragroot, we would recycle already. Otherwise, it will find this package on the first use.
-			case IJavaElementDelta.REMOVED:
-				if (delta.getAffectedChildren().length == 0)
-					fAdapterFactory.markAllStale();
-				break;
-			default :
-				super.processJavaElementChanged(element, delta);
-		}
-	}
-	
-
-	/**
-	 * Handle the change for a single element, children will be handled separately.
-	 * Something about the type has changed. If it was removed (not a move), then close the
-	 * adapter too.
-	 */
-	protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
-		if (delta.getKind() == IJavaElementDelta.REMOVED) {
-			// Close it out. Doesn't matter if moved_to, that would be a rename which requires brand new class.
-			// We can't actually get rid of the beaninfo adapter because it may be asked for again
-			// just to see if not defined. It may also come back later and we want to know about
-			// it to recycle the vm.
-			getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), true);	
-		} else
-			getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), false); // Just mark it stale
-		processChildren(element, delta);
-	}
-
-	public String toString() {
-		return super.toString()+" "+fProject.getElementName(); //$NON-NLS-1$
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
deleted file mode 100644
index 866087c..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
+++ /dev/null
@@ -1,997 +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.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: BeaninfoNature.java,v $
- *  $Revision: 1.29 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import java.io.*;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-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.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.jdt.core.*;
-import org.osgi.framework.Bundle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.java.init.JavaInit;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-
-
-/**
- * The beaninfo nature. It is created for a project and holds the
- * necessary info for beaninfo to be performed on a project.
- */
-
-public class BeaninfoNature implements IProjectNature {
-
-	public static final String NATURE_ID = BeaninfoPlugin.PI_BEANINFO_PLUGINID + ".BeanInfoNature"; //$NON-NLS-1$
-	public static final String P_BEANINFO_SEARCH_PATH = ".beaninfoConfig"; //$NON-NLS-1$
-	
-	public static final QualifiedName CONFIG_INFO_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "CONFIG_INFO"); //$NON-NLS-1$
-	public static final QualifiedName BEANINFO_CONTRIBUTORS_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "BEANINFO_CONTRIBUTORS"); //$NON-NLS-1$
-
-	private ResourceTracker resourceTracker;
-	// This class listens for changes to the beaninfo paths file, and if changed it marks all stale
-	// so the next time anything is needed it will recycle the vm. It will also listen about to close or
-	// about to delete of the project so that it can cleanup.
-	private class ResourceTracker implements IResourceChangeListener{
-		public void resourceChanged(IResourceChangeEvent e) {
-			// About to close or delete the project and it is ours, so we need to cleanup.
-			// Performance: It has been noted that dres.equals(...) can be slow with the number
-			// of visits done. Checking just the last segment (getName()) first before checking
-			// the entire resource provides faster testing. If the last segment is not equal,
-			// then the entire resource could not be equal.
-			IResource eventResource = e.getResource();
-			if (eventResource.getName().equals(getProject().getName()) && eventResource.equals(getProject())) {
-				cleanup(false, true);	// No need to clean up resources (false parm) because in this case Java EMF Model will always be going away.
-				return;
-			}
-			// Note: the BeaninfoModelSynchronizer takes care of both .classpath and .beaninfoconfig changes
-			// in this project and any required projects.
-		}
-	}
-
-	private ProxyFactoryRegistry.IRegistryListener registryListener = new ProxyFactoryRegistry.IRegistryListener() {
-		/**
-		 * @see org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry.IRegistryListener#registryTerminated(ProxyFactoryRegistry)
-		 */
-		public void registryTerminated(ProxyFactoryRegistry registry) {
-			markAllStale();
-		};
-	};
-
-	/**
-	 * Get the runtime nature for the project, create it if necessary.
-	 */
-	public static BeaninfoNature getRuntime(IProject project) throws CoreException {
-		JavaEMFNature.createRuntime(project);	// Must force JAVAEMFNature creation first before we try to get ours. There is a chicken/egg problem if we let our nature try to get JavaEMFNature during setProject.
-		if (project.hasNature(NATURE_ID))
-			return (BeaninfoNature) project.getNature(NATURE_ID);
-		else
-			return createRuntime(project);
-	}
-	
-	/**
-	 * Return whether this project has a BeanInfo runtime turned on.
-	 * 
-	 * @param project
-	 * @return <code>true</code> if it has the a BeanInfo runtime.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static boolean hasRuntime(IProject project) throws CoreException {
-		return project.hasNature(NATURE_ID);
-	}
-
-	/**
-	 * Test if this is a valid project for a Beaninfo Nature. It must be
-	 * a JavaProject.
-	 */
-	public static boolean isValidProject(IProject project) {
-		try {
-			return project.hasNature(JavaCore.NATURE_ID);
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Create the runtime.
-	 */
-	private static BeaninfoNature createRuntime(IProject project) throws CoreException {
-		if (!isValidProject(project))
-			throw new CoreException(
-				new Status(
-					IStatus.ERROR,
-					BeaninfoPlugin.PI_BEANINFO_PLUGINID,
-					0,
-					MessageFormat.format(
-						BeanInfoAdapterMessages.getString(BeanInfoAdapterMessages.INTROSPECTFAILED),
-						new Object[] { project.getName(), BeanInfoAdapterMessages.getString("BeaninfoNature.InvalidProject")}), //$NON-NLS-1$
-					null));
-
-		addNatureToProject(project, NATURE_ID);
-		return (BeaninfoNature) project.getNature(NATURE_ID);
-	}
-
-	private static void addNatureToProject(IProject proj, String natureId) throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures = description.getNatureIds();
-		String[] newNatures = new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length] = natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, null);
-	}
-
-	private IProject fProject;
-	protected ProxyFactoryRegistry fRegistry;
-	protected ResourceSet javaRSet;
-	protected BeaninfoModelSynchronizer fSynchronizer;
-	protected static BeaninfoJavaReflectionKeyExtension fReflectionKeyExtension;
-
-	/** 
-	 * Configures the project with this nature.
-	 * This is called by <code>IProject.getNature</code> and should not
-	 * be called directly by clients.
-	 * The nature extension id is added to the list of natures on the project by
-	 * <code>IProject.getNature</code>, and need not be added here.
-	 *
-	 * @exception CoreException if this method fails.
-	 */
-	public void configure() throws CoreException {
-	}
-
-	/** 
-	 * Removes this nature from the project, performing any required deconfiguration.
-	 * This is called by <code>IProject.removeNature</code> and should not
-	 * be called directly by clients.
-	 * The nature id is removed from the list of natures on the project by
-	 * <code>IProject.removeNature</code>, and need not be removed here.
-	 *
-	 * @exception CoreException if this method fails. 
-	 */
-	public void deconfigure() throws CoreException {
-		removeSharedProperty(P_BEANINFO_SEARCH_PATH, null);
-		cleanup(true, true);
-	}
-	
-	/**
-	 * Shutdown the nature. Called by BeanInfoPlugin to tell the nature that the plugin is being shutdown.
-	 * It needs to cleanup.
-	 * TODO <package-protected> because only BeanInfoPlugin should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @since 1.0.0
-	 */
-	public void shutdown() {
-		cleanup(true, false);
-	}
-
-
-	/**
-	 * Return a new ResourceSet that is linked correctly to this Beaninfo Nature.
-	 * <p>
-	 * This links up a ResourceSet so that it will work correctly with this nature.
-	 * It makes sure that going through the ResourceSet that any "java:/..."
-	 * classes can be found and it makes sure that any new classes are placed into the
-	 * nature's resource set and not resource set doing the calling.
-	 * <p>
-	 * This should be used any time a resource set is needed that is not the
-	 * project wide resource set associated with beaninfos, but will reference
-	 * Java Model classes or instantiate.
-	 * <p>
-	 * An additional change is made too. The ResourceFactoryRegistry's extensionToResourceFactory map is modified
-	 * to have an "java"->XMIResourceFactory entry added to it if EMF Examples is loaded. EMF Examples add
-	 * the "java" extension and sets it to their own special JavaResourceFactory. 
-	 * If EMF Examples is not loaded, then it falls back to the default "*" mapping, which is to XMIResourceFactory.
-	 * This normally causes problems for many
-	 * customers. If users of this resource set really want the EMF examples entry instead, after they retrieve the
-	 * new resource set they can do this:
-	 * <p>
-	 * <pre><code>
-	 * 	rset = beaninfoNature.newResourceSet();
-	 * 	rset.getResourceFactoryRegistry().getExtensionToFactoryMap().remove("java");
-	 * </code></pre>
-	 * 
-	 * @return a ResourceSet that is specially connected to the JEM java model.
-	 * 
-	 * @since 1.0.0
-	 */
-	public ResourceSet newResourceSet() {
-		SpecialResourceSet rset = new SpecialResourceSet();
-		rset.add(new ResourceHandler() {
-			public EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand) {
-				return null; // We don't have any special things we can do in this case.
-			}
-
-			public Resource getResource(ResourceSet originatingResourceSet, URI uri) {
-				// Always try to get it out of the nature's resource set because it may of been loaded there either as 
-				// the "java:..." type or it could of been an override extra file (such as an override EMF package, for
-				// example jcf has a side package containing the definition of the new attribute type. That file
-				// will also be loaded into this resourceset. So to find it we need to go in here and try.
-				//
-				// However, if not found we won't go and try to load the resource. That could load in the wrong place.
-				// Kludge: Because of a bug (feature :-)) in XMLHandler.getPackageFromURI(), it doesn't use getResource(...,true) and it tries instead
-				// to use uri inputstream to load the package when not found. This bypasses our special create resource and so
-				// packages are not automatically created. So we need to do load on demand here instead if it is a java protocol.
-				// EMF will not be fixing this. It is working as designed.
-				return getResourceSet().getResource(uri, JavaXMIFactoryImpl.SCHEME.equals(uri.scheme()));
-			}
-
-			public Resource createResource(ResourceSet originatingResourceSet, URI uri) {
-				// This is the one. It has got here because it couldn't find a resource already loaded.
-				// If it is a "java:/..." protocol resource, then we want to make sure it is loaded at the BeaninfoNature context
-				// instead of the lower one.
-				if (JavaXMIFactoryImpl.SCHEME.equals(uri.scheme()))
-					return getResourceSet().getResource(uri, true);
-				else
-					return null;
-			}
-		});
-		// [71473] Restore "*.java" to be an XMIResource. If EMF Examples are loaded they overload this and load their special resource for "*.java" which we don't want.
-		// If some user really wants that, they grab the resource resource set and remove our override.
-		if (Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("java")) {
-			// Need to add an override to go to XMI instead.
-			rset.getResourceFactoryRegistry().getExtensionToFactoryMap().put("java", new XMIResourceFactoryImpl());
-		}
-		return rset;
-	}
-	/**
-	 * Clean up, this means either the project is being closed, deleted, or it means that
-	 * the nature is being removed from the project. Either way that means to
-	 * terminate the VM and remove what we added to the context if the flag says clear it.
-	 * <p>
-	 * This should be called ONLY when this instance of the nature is no longer needed. It
-	 * will be recreated for any new uses. That is because we will be removing ourselves
-	 * from the list of active natures in the BeanInfoPlugin.
-	 * 
-	 * @param clearResults clear the results such that any JEM model objects have no BeanInfo
-	 * adapters attached to them. This allows BeanInfo to be GC'd without being hung onto.
-	 *  
-	 * @param deregister Deregister from the BeanInfoPlugin. Normally this will always be true, but it
-	 * will be called with false when BeanInfoPlugin is calling back to shutdown.
-	 */
-	protected void cleanup(boolean clearResults, boolean deregister) {
-		if (deregister)
-			BeaninfoPlugin.getPlugin().removeBeanInfoNature(this);
-		getProject().getWorkspace().removeResourceChangeListener(resourceTracker);
-		resourceTracker = null;
-		fSynchronizer.stopSynchronizer(clearResults);
-		Init.cleanup(javaRSet, clearResults);
-		if (fRegistry != null)
-			fRegistry.terminateRegistry();
-
-		javaRSet = null;
-		fRegistry = null;
-		fProject = null;
-		fSynchronizer = null;
-	}
-
-	/** 
-	 * Returns the project to which this project nature applies.
-	 *
-	 * @return the project handle
-	 */
-	public IProject getProject() {
-		return fProject;
-	}
-
-	/**
-	 * Sets the project to which this nature applies.
-	 * Used when instantiating this project nature runtime.
-	 * This is called by <code>IProject.addNature</code>
-	 * and should not be called directly by clients.
-	 *
-	 * @param project the project to which this nature applies
-	 */
-	public void setProject(IProject project) {
-		fProject = project;
-		BeaninfoPlugin.getPlugin().addBeanInfoNature(this);
-
-		try {
-			// The nature has been started for this project, need to setup the introspection process now.
-			JavaEMFNature javaNature = JavaEMFNature.createRuntime(fProject);
-			JavaInit.init();
-			if (fReflectionKeyExtension == null) {
-				// Register the reflection key extension.
-				fReflectionKeyExtension = new BeaninfoJavaReflectionKeyExtension();
-				JavaXMIFactoryImpl.INSTANCE.registerReflectionKeyExtension(fReflectionKeyExtension);
-			}
-
-			javaRSet = javaNature.getResourceSet();
-			Init.initialize(javaRSet, new IBeaninfoSupplier() {
-				public ProxyFactoryRegistry getRegistry() {
-					return BeaninfoNature.this.getRegistry();
-				}
-
-				public boolean isRegistryCreated() {
-					return BeaninfoNature.this.isRegistryCreated();
-				}
-				
-				public void closeRegistry() {
-					BeaninfoNature.this.closeRegistry();
-				}
-				
-				public IProject getProject() {
-					return BeaninfoNature.this.getProject();
-				}
-			});
-			fSynchronizer =
-				new BeaninfoModelSynchronizer(
-					(BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(javaRSet.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY),
-					JavaCore.create(javaNature.getProject()));
-			resourceTracker = new ResourceTracker();
-			project.getWorkspace().addResourceChangeListener(resourceTracker, IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE);
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-	}
-
-	/**
-	 * Close the registry. It needs to be recycled because a class has changed
-	 * and now the new class needs to be accessed.
-	 */
-	protected void closeRegistry() {
-		ProxyFactoryRegistry reg = null;
-		synchronized (this) {
-			reg = fRegistry;
-			fRegistry = null;
-			try {
-				// Wipe out the Session properties so that they are recomputed.
-				getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, null);
-				getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, null);			
-			} catch (CoreException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-			}
-		}
-		if (reg != null) {
-			reg.removeRegistryListener(registryListener);
-			reg.terminateRegistry();
-		}
-	}
-
-	private static final String PI_CLASS = "class"; //$NON-NLS-1$
-	
-	/**
-	 * Using the given configuration info, compute the BeanInfo config info needed. This sets the
-	 * session properties BEANINFO_CONTRIBUTORS_SESSION_KEY and CONFIG_INFO_SESSION_KEY.
-	 * 
-	 * @param info
-	 * @throws CoreException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void computeBeanInfoConfigInfo(IConfigurationContributionInfo info) throws CoreException {
-		// First time for this nature, or first time after registry reset. Need to compute the info.
-		// It is possible for this to be called BEFORE the first usage of BeanInfo. The editor usually
-		// brings up the editor's registry before it gets anything from BeanInfo.
-		List contributorsList = new ArrayList(10);
-		if (!info.getContainerIds().isEmpty()) {
-			// Run through all of the visible container ids that are applicable and get BeanInfo contributors.
-			Iterator containerIdItr = info.getContainerIds().entrySet().iterator();
-			while (containerIdItr.hasNext()) {
-				Map.Entry entry = (Map.Entry) containerIdItr.next();
-				if (((Boolean) entry.getValue()).booleanValue()) {
-					IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getContainerIdContributors(
-							(String) entry.getKey());
-					if (contributors != null) {
-						for (int i = 0; i < contributors.length; i++) {
-							try {
-								Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
-								if (contributor instanceof IBeanInfoContributor)
-									contributorsList.add(contributor);
-							} catch (CoreException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-							}
-						}
-					}
-				}
-			}						
-		}
-		
-		if (!info.getPluginIds().isEmpty()) {
-			// Run through all of the visible plugin ids that are applicable and get BeanInfo contributors.
-				Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
-				while (pluginIdItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) pluginIdItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getPluginContributors(
-								(String) entry.getKey());
-						if (contributors != null) {
-							for (int i = 0; i < contributors.length; i++) {
-							try {
-								Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
-								if (contributor instanceof IBeanInfoContributor)
-									contributorsList.add(contributor);
-							} catch (CoreException e) {
-								BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-							}
-						}
-					}
-				}
-			}
-		}
-			
-			// Save it for all beaninfo processing (and configuration processing if they implement proxy configuration contributor).
-		IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) contributorsList.toArray(new IBeanInfoContributor[contributorsList.size()]);
-		info.getJavaProject().getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, explicitContributors);
-		// Save it for override processing. That happens over and over later after all config processing is done.
-		// Do it last so that if there is a race condition, since this property is a flag to indicate we have data,
-		// we need to make sure the Beaninfo data is already set at the point we set this.
-		// We could actually set it twice because of this, but it is the same data, so, so what.
-		info.getJavaProject().getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, info);
-	}
-
-	/**
-	 * Get registry, creating it if necessary.
-	 * @return the registry.
-	 * 
-	 * @since 1.0.0
-	 */
-	public ProxyFactoryRegistry getRegistry() {
-		synchronized (this) {
-			if (fRegistry != null)
-				return fRegistry;
-		}
-		// Now need to start the appropriate job. In another class so that it can handle dynamically checking if 
-		// UI is available to even do this (it maybe not in a UI mode, so then just do it.
-		CreateRegistryJobHandler.createRegistry(this);
-		return fRegistry;
-	}
-	
-	/*
-	 * This is <package-protected> so that only the appropriate create job in this
-	 * package can call it. This is because this must be controlled to only be
-	 * done when build not in progress and serial access.
-	 */
-	void createRegistry(IProgressMonitor pm) {
-		pm.beginTask(BeanInfoAdapterMessages.getString("UICreateRegistryJobHandler.StartBeaninfoRegistry"), 100); //$NON-NLS-1$		
-		if (isRegistryCreated()) {
-			pm.done();
-			return; // It had already been created. Could of been because threads were racing to do the creation, and one got there first.
-		}
-
-		try {
-			ConfigurationContributor configurationContributor = (ConfigurationContributor) getConfigurationContributor();
-			configurationContributor.setNature(this);
-			ProxyFactoryRegistry registry = ProxyLaunchSupport.startImplementation(fProject, "Beaninfo", //$NON-NLS-1$
-					new IConfigurationContributor[] { configurationContributor}, false, new SubProgressMonitor(pm, 100));
-			registry.addRegistryListener(registryListener);
-			synchronized(this) {
-				fRegistry = registry;
-			}
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		} finally {
-			pm.done();
-		}
-	}
-	
-	public synchronized boolean isRegistryCreated() {
-		return fRegistry != null;
-	}
-	
-	/**
-	 * Check to see if the nature is still valid. If the project has been
-	 * renamed, the nature is still around, but the project has been closed.
-	 * So the nature is now invalid.
-	 * 
-	 * @return Is this a valid nature. I.e. is the project still open.
-	 */
-	public boolean isValidNature() {
-		return fProject != null;
-	}
-
-	/**
-	 * Set the search path onto the registry.
-	 */
-	protected void setProxySearchPath(ProxyFactoryRegistry registry, List searchPaths) {
-		if (searchPaths != null) {
-			String[] stringSearchPath = (String[]) searchPaths.toArray(new String[searchPaths.size()]);
-			Utilities.setBeanInfoSearchPath(registry, stringSearchPath);
-		} else
-			Utilities.setBeanInfoSearchPath(registry, null);
-	}
-
-	private static final String ENCODING = "UTF-8"; //$NON-NLS-1$
-	static final String sBeaninfos = "beaninfos"; // Root element name //$NON-NLS-1$
-	/**
-	 * Get the persistent search path. It is copy.
-	 */
-	public BeaninfosDoc getSearchPath() {
-		BeaninfosDoc bdoc = null;
-		try {
-			InputStream property = getSharedProperty(P_BEANINFO_SEARCH_PATH);
-			if (property != null) {
-				try {
-					// Need to reconstruct from the XML format.
-					Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new InputStreamReader(property, ENCODING)));
-					Element root = doc.getDocumentElement();
-					if (root != null && root.getNodeName().equalsIgnoreCase(sBeaninfos)) {
-						bdoc = BeaninfosDoc.readEntry(new DOMReader(), root, getProject());
-					}
-				} finally {
-					try {
-						property.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		} catch (Exception e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "", e)); //$NON-NLS-1$
-		}
-		return bdoc;
-	}
-
-	/**
-	 * Set the persistent search path. No progress monitor.
-	 */
-	public void setSearchPath(BeaninfosDoc searchPath) throws CoreException {
-		setSearchPath(searchPath, null);
-	}
-
-	/**
-	 * Set the persistent search path with a progress monitor
-	 */
-	public void setSearchPath(BeaninfosDoc searchPath, IProgressMonitor monitor) throws CoreException {
-		String property = null;
-		if (searchPath != null && searchPath.getSearchpath().length > 0) {
-			try {
-				Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-				Element root = doc.createElement(sBeaninfos); // Create Root Element
-				IBeaninfosDocEntry[] entries = searchPath.getSearchpath();
-				for (int i = 0; i < entries.length; i++)
-					root.appendChild(entries[i].writeEntry(doc, getProject())); // Add to the search path
-				doc.appendChild(root); // Add Root to Document
-				StringWriter strWriter = new StringWriter();
-
-				Result result = new StreamResult(strWriter);
-				Source source = new DOMSource(doc);
-				Transformer transformer = TransformerFactory.newInstance().newTransformer();
-				transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-				transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-				transformer.transform(source, result);
-				property = strWriter.toString();
-			} catch (TransformerConfigurationException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (TransformerException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (ParserConfigurationException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			} catch (FactoryConfigurationError e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			}
-		}
-
-		if (property != null) {
-			// If it hasn't changed, don't write it back out. This is so that if the file hasn't
-			// been checked out and it is the same, we don't want to bother the user. This is because
-			// we don't know if the user had simply browsed the search path or had actually changed and
-			// set it back to what it was. In either of those cases it would be a bother to ask the
-			// user to checkout the file.
-			InputStream is = getSharedProperty(P_BEANINFO_SEARCH_PATH);
-			if (is != null) {
-				try {
-					try {
-						InputStreamReader reader = new InputStreamReader(is, ENCODING);
-						char[] chars = new char[1000];
-						StringBuffer oldProperty = new StringBuffer(1000);
-						int read = reader.read(chars);
-						while (read != -1) {
-							oldProperty.append(chars, 0, read);
-							read = reader.read(chars);
-						}
-						if (oldProperty.toString().equals(property))
-							return;
-					} catch (IOException e) {
-					} // Didn't change.
-				} finally {
-					try {
-						is.close();
-					} catch (IOException e) {
-					}
-				}
-			}
-			setSharedProperty(P_BEANINFO_SEARCH_PATH, property, monitor);
-		} else
-			removeSharedProperty(P_BEANINFO_SEARCH_PATH, monitor);
-	}
-
-	/**
-	 * Return the resource set for all java packages in this nature.
-	 */
-	public ResourceSet getResourceSet() {
-		return javaRSet;
-	}
-
-	protected void markAllStale() {
-		// Mark all stale so that the registry will be recycled.
-		if (fRegistry != null) {
-			// We have a registry running, we need to indicate recycle is needed.
-			fSynchronizer.getAdapterFactory().markAllStale();
-			// Mark all stale. Next time we need anything it will be recycled.
-		}
-	}
-
-	/**
-	 * Compute the file name to use for a given shared property
-	 */
-	protected String computeSharedPropertyFileName(QualifiedName qName) {
-		return qName.getLocalName();
-	}
-
-	/**
-	 * Retrieve a shared property on a project. If the property is not defined, answers null.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 *
-	 */
-	protected InputStream getSharedProperty(String propertyFileName) throws CoreException {
-		IFile rscFile = getProject().getFile(propertyFileName);
-		if (rscFile.exists())
-			return rscFile.getContents(true);
-		else
-			return null;
-	}
-
-	/**
-	 * Record a shared persistent property onto a project.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 * 
-	 * shared properties end up in resource files, and thus cannot be modified during
-	 * delta notifications (a CoreException would then be thrown).
-	 * 
-	 */
-	protected void setSharedProperty(String propertyName, String value, IProgressMonitor monitor) throws CoreException {
-
-		try {
-			IFile rscFile = getProject().getFile(propertyName);
-			InputStream input = new ByteArrayInputStream(value.getBytes(ENCODING));
-			// update the resource content
-			if (rscFile.exists()) {
-				rscFile.setContents(input, true, false, null);
-			} else {
-				rscFile.create(input, true, monitor);
-			}
-		} catch (UnsupportedEncodingException e) {
-		}
-	}
-
-	/**
-	 * Remove a shared persistent property onto a project.
-	 * Note that it is orthogonal to IResource persistent properties, and client code has to decide
-	 * which form of storage to use appropriately. Shared properties produce real resource files which
-	 * can be shared through a VCM onto a server. Persistent properties are not shareable.
-	 * 
-	 * shared properties end up in resource files, and thus cannot be modified during
-	 * delta notifications (a CoreException would then be thrown).
-	 * 
-	 */
-	protected void removeSharedProperty(String propertyName, IProgressMonitor monitor) throws CoreException {
-
-		IFile rscFile = getProject().getFile(propertyName);
-		rscFile.delete(true, true, monitor);
-	}
-
-	/**
-	 * Return a configuration contributor that sets up a vm to allow
-	 * introspection. This will make sure the appropriate paths
-	 * are in the classpath to allow access to the beaninfos, and
-	 * it will setup the beaninfo search path for this project.
-	 */
-	public IConfigurationContributor getConfigurationContributor() {
-		return new ConfigurationContributor(getSearchPath());
-	}
-
-	private static class ConfigurationContributor extends ConfigurationContributorAdapter {
-
-		private BeaninfosDoc doc;
-		List computedSearchPath;
-				
-		// The nature. If the nature is not set then this contributor is one
-		// used by some other later proxy registry to get the beaninfo classes into their paths. In that case
-		// we can expect the config info to be in the session variable for our use. Otherwise we will need to
-		// add it here. Also don't set searchpath stuff if not nature because only the beaninfo one will do introspection.
-		private BeaninfoNature nature;	
-		
-		private IConfigurationContributionInfo info;
-		private IBeanInfoContributor[] explicitContributors;
-
-		public ConfigurationContributor(BeaninfosDoc doc) {
-			this.doc = doc;
-		}
-
-		/*
-		 * Set that this is the nature contributor. Not null, means that this is the contributor being
-		 * used to setup the registry for the project's beaninfo nature. null (default) means that this
-		 * is one created to add to some editor's registry.
-		 * 
-		 * Note: This MUST be set before initialize is called or it will not work correctly. If not set, it 
-		 * will be considered not for BeanInfo nature directly.
-		 */
-		public void setNature(BeaninfoNature nature) {
-			this.nature = nature;
-			if (nature != null)
-				computedSearchPath = new ArrayList(3);	// We will be gathering this info.
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-		 */
-		public void initialize(IConfigurationContributionInfo info) {
-			this.info = info;
-			try {
-				if (info.getJavaProject().getProject().getSessionProperty(CONFIG_INFO_SESSION_KEY) == null) {
-					// TODO For now we will rebuild for each time we open a registry, but it actually is only needed if a classpath
-					// changes for some reason. At that point we can get it out of here.
-					
-					computeBeanInfoConfigInfo(info);					
-				} 
-				explicitContributors = (IBeanInfoContributor[]) info.getJavaProject().getProject().getSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY);
-			} catch (CoreException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-		
-		public void contributeClasspaths(final IConfigurationContributionController controller) throws CoreException {
-			// Contribute for this project
-			contributeClasspathsForProject(controller, info.getJavaProject().getProject(), doc, true);
-						
-			if (!info.getProjectPaths().isEmpty()) {
-				// Run through all of the visible projects and contribute the classpaths (which come from the BeanInfo docs, if they have any).
-				IWorkspaceRoot root = info.getJavaProject().getProject().getWorkspace().getRoot();
-				Iterator projIter = info.getProjectPaths().entrySet().iterator();
-				while (projIter.hasNext()) {
-					Map.Entry entry = (Map.Entry) projIter.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						IResource res = root.findMember((IPath) entry.getKey());
-						if (res instanceof IProject && ((IProject) res).isOpen() && BeaninfoNature.hasRuntime((IProject) res))
-							contributeClasspathsForProject(controller, (IProject) res, BeaninfoNature.getRuntime((IProject) res)
-									.getSearchPath(), false);
-					}
-				}
-			}			
-			
-			if (!info.getContainerIds().isEmpty()) {
-				// Run through all of the visible container ids that are applicable.
-				Iterator containerIdItr = info.getContainerIds().entrySet().iterator();
-				while (containerIdItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) containerIdItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						processBeaninfoEntries(BeaninfoPlugin.getPlugin().getContainerIdBeanInfos((String) entry.getKey()),
-								controller, info.getJavaProject());
-					}
-				}
-				
-			}
-			
-			if (!info.getPluginIds().isEmpty()) {
-				// Run through all of the visible plugin ids that are applicable.
-				Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
-				while (pluginIdItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) pluginIdItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						processBeaninfoEntries(BeaninfoPlugin.getPlugin().getPluginBeanInfos((String) entry.getKey()), controller, info.getJavaProject());
-					}
-				}
-				
-			}
-			
-			if (!info.getContainers().isEmpty()) {
-				// Run through all of the visible containers that implement IBeanInfoContributor and ask them for the contributions.
-				Iterator containerItr = info.getContainers().entrySet().iterator();
-				while (containerItr.hasNext()) {
-					Map.Entry entry = (Map.Entry) containerItr.next();
-					if (((Boolean) entry.getValue()).booleanValue()) {
-						if (entry.getKey() instanceof IBeanInfoContributor)
-							processBeaninfoEntries(((IBeanInfoContributor) entry.getKey()).getBeanInfoEntryContributions(info),
-									controller, info.getJavaProject());
-					}
-				}
-				
-			}			
-				
-			// And finally run through the explicit contributors.				
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final IBeanInfoContributor contributor = explicitContributors[i];
-				processBeaninfoEntries(contributor.getBeanInfoEntryContributions(info), controller, info.getJavaProject());
-				if (contributor instanceof IConfigurationContributor) {
-					Platform.run(new ISafeRunnable() {
-						public void handleException(Throwable exception) {
-							// do nothing. by default platform logs.
-						}
-
-						public void run() throws Exception {;
-							if (contributor instanceof IConfigurationContributor)
-								((IConfigurationContributor) contributor).contributeClasspaths(controller);
-						}
-					});
-				}
-			}
-			
-			// Add the common and beaninfovm.jar and any nls to the end of the classpath.
-			controller.contributeClasspath(BeaninfoPlugin.getPlugin().getBundle(), "beaninfocommon.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, true); //$NON-NLS-1$
-			
-			// Add the beaninfovm.jar and any nls to the end of the classpath.
-			controller.contributeClasspath(BeaninfoPlugin.getPlugin().getBundle(), "vm/beaninfovm.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, true); //$NON-NLS-1$
-		}
-
-		private IClasspathEntry get(IClasspathEntry[] array, SearchpathEntry se) {
-			for (int i = 0; i < array.length; i++) {
-				if (array[i].getEntryKind() == se.getKind() && array[i].getPath().equals(se.getPath()))
-					return array[i];
-			}
-			return null;
-		}
-
-		private static final IBeaninfosDocEntry[] EMPTY_ENTRIES = new IBeaninfosDocEntry[0];
-		
-		/*
-		 * Contribute classpaths for the specified project. If doc is passed in, then this is the top level and
-		 * all should be added. If no doc, then this is pre-req'd project, and then we will handle exported entries only.
-		 */
-		protected void contributeClasspathsForProject(
-			IConfigurationContributionController controller,
-			IProject project,
-			BeaninfosDoc doc,
-			boolean toplevelProject)
-			throws CoreException {
-			
-			IJavaProject jProject = JavaCore.create(project);
-			IClasspathEntry[] rawPath = jProject.getRawClasspath();
-
-			// Search path of this project
-			IBeaninfosDocEntry[] entries = (doc != null) ? doc.getSearchpath() : EMPTY_ENTRIES;
-
-			for (int i = 0; i < entries.length; i++) {
-				IBeaninfosDocEntry entry = entries[i];
-				if (entry instanceof BeaninfoEntry) {
-					BeaninfoEntry be = (BeaninfoEntry) entry;
-					if (toplevelProject || be.isExported()) {
-						// First project or this is an exported beaninfo, so we process it.
-						processBeaninfoEntry(be, controller, jProject);
-					}
-				} else if (nature != null){
-					// Just a search path entry. There is no beaninfo jar to pick up.
-					// We have a nature, so we process search path.
-					SearchpathEntry se = (SearchpathEntry) entry;
-					if (!toplevelProject) {
-						// We are in a nested project, find the raw classpath entry to see
-						// if this entry is exported. Only do it if exported. (Note: exported is only used on non-source. Source are always exported).
-						IClasspathEntry cpe = get(rawPath, se);
-						if (cpe == null || (cpe.getEntryKind() != IClasspathEntry.CPE_SOURCE && !cpe.isExported())) {
-							continue; // Not exist or not exported, so we don't want it here either.
-						}
-					}
-
-					String pkg = se.getPackage();
-					if (pkg != null) {
-						// Explicit search path
-						if (!computedSearchPath.contains(pkg))
-							computedSearchPath.add(pkg);
-					} else {
-						// We no longer allow this, but just to be on safe side we test for it.
-					}
-				}
-			}
-		}
-
-		protected void processBeaninfoEntries(
-			BeaninfoEntry[] entries,
-			IConfigurationContributionController controller,
-			IJavaProject javaProject)
-			throws CoreException {
-			if (entries != null) {
-				for (int i = 0; i < entries.length; i++)
-					processBeaninfoEntry(entries[i], controller, javaProject);
-			}
-		}
-
-		protected void processBeaninfoEntry(
-			BeaninfoEntry entry,
-			IConfigurationContributionController controller,
-			IJavaProject javaProject)
-			throws CoreException {
-			Object[] cps = entry.getClasspath(javaProject);
-			for (int j = 0; j < cps.length; j++) {
-				Object cp = cps[j];
-				if (cp instanceof IProject)
-					controller.contributeProject((IProject) cp);
-				else if (cp instanceof String)
-					controller.contributeClasspath(ProxyLaunchSupport.convertStringPathToURL((String) cp), IConfigurationContributionController.APPEND_USER_CLASSPATH);
-				else if (cp instanceof IPath) {
-					IPath path = (IPath) cp;
-					Bundle bundle = Platform.getBundle(path.segment(0));
-					if (bundle != null)
-						controller.contributeClasspath(bundle, path.removeFirstSegments(1), IConfigurationContributionController.APPEND_USER_CLASSPATH, true);
-				}
-			}
-
-			if (nature != null) {
-				// Now add in the package names.
-				SearchpathEntry[] sees = entry.getSearchPaths();
-				for (int j = 0; j < sees.length; j++) {
-					SearchpathEntry searchpathEntry = sees[j];
-					if (!computedSearchPath.contains(searchpathEntry.getPackage()))
-						computedSearchPath.add(searchpathEntry.getPackage());
-				}
-			}
-		}
-
-		public void contributeToConfiguration(final ILaunchConfigurationWorkingCopy config) {
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final int ii = i;
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// do nothing. by default platform logs.
-					}
-
-					public void run() throws Exception {
-						IBeanInfoContributor contributor = explicitContributors[ii];
-						if (contributor instanceof IConfigurationContributor)
-							((IConfigurationContributor) contributor).contributeToConfiguration(config);
-					}
-				});
-			}			
-		}
-
-		public void contributeToRegistry(final ProxyFactoryRegistry registry) {
-			if (nature != null)
-				nature.setProxySearchPath(registry, computedSearchPath);
-			for (int i = 0; i < explicitContributors.length; i++) {
-				final int ii = i;
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// do nothing. by default platform logs.
-					}
-
-					public void run() throws Exception {
-						IBeanInfoContributor contributor = explicitContributors[ii];
-						if (contributor instanceof IConfigurationContributor)
-							((IConfigurationContributor) contributor).contributeToRegistry(registry);
-					}
-				});
-			}			
-		}
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
deleted file mode 100644
index 5f86239..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: BeaninfoProxyConstants.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:28 $ 
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This holds the proxy constants for access in beaninfo. It is created on a per-registry basis and stored in the constants section of the registry so
- * that they can be accessed as needed.
- * <p>
- * To gain access to these constants, use the static accessor method "getConstants()" so that the instance is not created until actually needed.
- * 
- * @since 1.0.0
- */
-public final class BeaninfoProxyConstants {
-
-	private static final Object REGISTRY_KEY = new Object();
-
-	private final IMethodProxy introspectProxy;
-
-	private final IMethodProxy getBeanInfoSearchPathProxy;
-
-	private final IMethodProxy setBeanInfoSearchPathProxy;
-
-	private final IMethodProxy sendBeanInfoProxy;
-
-	/**
-	 * Get the constants instance for the specified registry.
-	 */
-	public static BeaninfoProxyConstants getConstants(ProxyFactoryRegistry registry) {
-		BeaninfoProxyConstants constants = (BeaninfoProxyConstants) registry.getConstants(REGISTRY_KEY);
-		if (constants == null)
-			registry.registerConstants(REGISTRY_KEY, constants = new BeaninfoProxyConstants(registry));
-		return constants;
-	}
-
-	private BeaninfoProxyConstants(ProxyFactoryRegistry registry) {
-
-		IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-
-		IBeanTypeProxy introspector = typeFactory.getBeanTypeProxy("java.beans.Introspector"); //$NON-NLS-1$
-		getBeanInfoSearchPathProxy = introspector.getMethodProxy("getBeanInfoSearchPath"); //$NON-NLS-1$
-		setBeanInfoSearchPathProxy = introspector.getMethodProxy("setBeanInfoSearchPath", "[Ljava.lang.String;"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		IBeanTypeProxy modelingBeaninfo = typeFactory.getBeanTypeProxy("org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo");//$NON-NLS-1$
-		introspectProxy = modelingBeaninfo.getMethodProxy("introspect", new String[] { "java.lang.Class", "boolean", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-		sendBeanInfoProxy = modelingBeaninfo.getMethodProxy("send"); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Get the sendBeanDecorator method proxy from ModelingBeanInfo.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getSendBeanInfoProxy() {
-		return sendBeanInfoProxy;
-	}
-	
-	/**
-	 * Get the getBeanInfoSearchPath method proxy from Introspector.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getGetBeanInfoSearchPathProxy() {
-		return getBeanInfoSearchPathProxy;
-	}
-
-	/**
-	 * Get the setBeanInfoSearchPath method proxy from Introspector.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getSetBeanInfoSearchPathProxy() {
-		return setBeanInfoSearchPathProxy;
-	}
-
-	/**
-	 * Get the introspect method proxy from ModelingBeanInfo.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getIntrospectProxy() {
-		return introspectProxy;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
deleted file mode 100644
index 0952b77..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: BeaninfoSuperAdapter.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-
-/**
- * Used to know when events or any of the super classes change so
- * that we can re-construct our all events list next time we need it.
- * @version 	1.0
- * @author
- */
-public class BeaninfoSuperAdapter extends AdapterImpl {
-
-	public static final Class ADAPTER_KEY = BeaninfoSuperAdapter.class;
-
-	private boolean allEventsCollectionModified = true;
-	private boolean allPropertiesCollectionModified = true;
-	private boolean allOperationsCollectionModified = true;
-
-	public BeaninfoSuperAdapter() {
-		super();
-	}
-
-	public void notifyChanged(Notification msg) {
-		if (msg.getEventType() != Notification.REMOVING_ADAPTER)
-			setFlags(msg.getFeatureID(JavaClass.class));
-	}
-
-	public boolean isAllEventsCollectionModified() {
-		return allEventsCollectionModified;
-	}
-
-	public void setAllEventsCollectionModified(boolean newEventsModified) {
-		allEventsCollectionModified = newEventsModified;
-	}
-
-	public boolean isAllOperationsCollectionModified() {
-		return allOperationsCollectionModified;
-	}
-
-	public void setAllOperationsCollectionModified(boolean newOperationsModified) {
-		allOperationsCollectionModified = newOperationsModified;
-	}
-	
-	public void setAllPropertiesCollectionModified(boolean allPropertiesCollectionModified) {
-		this.allPropertiesCollectionModified = allPropertiesCollectionModified;
-	}
-
-	public boolean isAllPropertiesCollectionModified() {
-		return allPropertiesCollectionModified;
-	}
-	
-	public Collection getSubclasses() {
-		// Get them from the ESuperAdapter. Easiest to do.
-		ESuperAdapter ea = ((JavaClassImpl) getTarget()).getESuperAdapter();
-		return ea.getSubclasses();
-	}
-
-	public boolean isAdapterForType(Object type) {
-		return ADAPTER_KEY.equals(type);
-	}
-
-	void setFlags(int featureId) {
-		switch (featureId) {
-			case JavaRefPackage.JAVA_CLASS__EVENTS :
-				setAllEventsCollectionModified(true);
-				break;
-				
-			case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
-				setAllOperationsCollectionModified(true);
-				break;
-
-			case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
-				setAllEventsCollectionModified(true);
-				setAllPropertiesCollectionModified(true);
-				break;				
-				
-			case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
-				setAllPropertiesCollectionModified(true);
-				break;
-				
-			default :
-				break;
-		}
-		Iterator i = getSubclasses().iterator();
-		while (i.hasNext()) {
-			Notifier n = (Notifier) i.next();
-			BeaninfoSuperAdapter a = (BeaninfoSuperAdapter) EcoreUtil.getExistingAdapter(n, ADAPTER_KEY);
-			if (a != null)
-				a.setFlags(featureId);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
deleted file mode 100644
index 6ae2173..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: CreateRegistryJobHandler.java,v $
- *  $Revision: 1.11 $  $Date: 2005/02/15 22:44:20 $ 
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
- 
-
-/**
- * This class is used by BeaninfoNature to handle the creation of the registry,
- * This class will be a singleton. It is needed to handle if UI active without
- * requiring UI plugin. (So headless will work too). The subclass <code>UICreateRegistryJobHandler</code>
- * will be instantiated in case of UI active.
- * @since 1.0.0
- */
-class CreateRegistryJobHandler {
-	private static CreateRegistryJobHandler jobHandler = null;
-	
-	public static void createRegistry(BeaninfoNature nature) {
-		synchronized (CreateRegistryJobHandler.class) {
-			if (jobHandler == null) {
-				if (Platform.getBundle("org.eclipse.ui") != null) {	//$NON-NLS-1$
-					try {
-						// There is a UI, it may not be active, but bring in UICreateRegistryJobHandler to do the
-						// actual work since it can reference the UI.
-						jobHandler = (CreateRegistryJobHandler) Class.forName("org.eclipse.jem.internal.beaninfo.adapters.UICreateRegistryJobHandler").newInstance(); //$NON-NLS-1$
-					} catch (InstantiationException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					} catch (IllegalAccessException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					} catch (ClassNotFoundException e) {
-						jobHandler = new CreateRegistryJobHandler();
-					}
-				}
-			}
-		}
-		
-		// See if Autobuild sleeping or waiting. This could be a race condition for us. We can't wait for it
-		// because we may already have the build rule locked by our thread. No way of testing this if beginRule was used.
-		// We can test if we are a build job (not an inline build), and if so, just go on.
-		// Maybe we can figure out in future if we find race condition happens significant amount of time.
-		IJobManager jobManager = Platform.getJobManager();
-		Job currentJob = jobManager.currentJob();
-		if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) {
-			// See if autojob is waiting or sleeping.
-			// Give it up to a second at .2 second intervals to try (i.e. 5 tries)
-			int tries = 5;
-			while (isAutoWaiting() && --tries>0) {
-				try {
-					Thread.sleep(200);	// Wait just .2 seconds to give build a chance to start. If it is still not started, then just go on.
-				} catch (InterruptedException e) {
-				}
-			}
-			if (tries==0) {
-				Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-				if (logger.isLoggingLevel(Level.WARNING))
-					logger.log("Build job waiting when trying to start beaninfo registry. Possible race.", Level.WARNING);	// $NON-NLS-1$
-			}
-		}
-		
-		jobHandler.processCreateRegistry(nature);
-	}
-
-	private static boolean isAutoWaiting() {
-		Job[] autojobs = Platform.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
-		for (int i = 0; i < autojobs.length; i++) {
-			int state = autojobs[i].getState();
-			if (state == Job.WAITING || state == Job.SLEEPING) 
-				return true;
-		}
-		return false;
-	}
-
-	
-	/**
-	 * Process the create of the registry. This should be overridden to
-	 * do what the UI needs. The UI implimentation should call doCreateRegistry at the
-	 * appropriate time.
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	protected void processCreateRegistry(final BeaninfoNature nature) {
-		IJobManager jobManager = Platform.getJobManager();
-		ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
-		boolean gotRuleLocally = true;
-		try {
-			try {
-				jobManager.beginRule(buildRule, new NullProgressMonitor());
-			} catch (IllegalArgumentException e) {
-				gotRuleLocally = false;	// This thread already had a rule, and it conflicted with the build rule, so we need to spawn off.
-			}
-			if (gotRuleLocally)
-				doCreateRegistry(nature, new NullProgressMonitor());
-		} finally {
-			jobManager.endRule(buildRule);	// Whether we got the rule or not, we must do endrule.
-		}
-		
-		if (!gotRuleLocally) {
-			// Spawn off to a job and wait for it. Hopefully we don't have a deadlock somewhere.
-			Job doCreateJob = new Job(BeanInfoAdapterMessages.getString("UICreateRegistryJobHandler.StartBeaninfoRegistry")) {
-
-				protected IStatus run(IProgressMonitor monitor) {
-					doCreateRegistry(nature, monitor);
-					return Status.OK_STATUS;
-				}
-			};
-			doCreateJob.schedule();
-			while (true) {
-				try {
-					doCreateJob.join();
-					break;
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-	}
-		
-	/*
-	 * Do the creation. It is expected that the build rule has already been given to this thread.
-	 * It is important that the build rule be given to this thread. This is so that a build won't
-	 * start trying to create the same registry (which has happened in the past) at the same time
-	 * a different thread was trying to start the registry. You would either have a deadlock, or 
-	 * a race and get two different registries started.
-	 * 
-	 * The build rule also means that all beaninfo registry creations will be serialized and have
-	 * a race condition. The unfortunate part is that two independent project's registries can't be
-	 * created at same time. But that is the result of the build rule. We can't allow the builds, so
-	 * we need to stop all parallel beaninfo registry creations.
-	 * 
-	 * @param nature
-	 * @param pm
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void doCreateRegistry(BeaninfoNature nature, IProgressMonitor pm) {
-		pm.beginTask("", 100);	//$NON-NLS-1$
-		try {
-			nature.createRegistry(new SubProgressMonitor(pm, 100));	
-		} finally {
-			pm.done();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
deleted file mode 100644
index 6a2b0fd..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: DOMReader.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-
-/**
- * The internal class for reading dom elements.
- * @version 	1.0
- * @author
- */
-class DOMReader implements IReader {
-	
-	/*
-	 * @see IReader#getChildren(Object)
-	 */
-	public Object getChildren(Object node) {
-		return (node instanceof Node) ? ((Node) node).getChildNodes() : null;
-	}
-	
-	
-	/*
-	 * @see IReader#getLength(Object)
-	 */
-	public int getLength(Object nodeList) {
-		return (nodeList instanceof NodeList) ? ((NodeList) nodeList).getLength() : 0;
-	}
-
-	/*
-	 * @see IReader#getItem(Object, int)
-	 */
-	public Object getItem(Object nodeList, int index) {
-		return (nodeList instanceof NodeList) ? ((NodeList) nodeList).item(index) : null;
-	}
-
-	/*
-	 * @see IReader#isNodeTypeElement(Object)
-	 */
-	public boolean isNodeTypeElement(Object node) {
-		return (node instanceof Node) ? ((Node) node).getNodeType() == Node.ELEMENT_NODE : false;
-	}
-
-	/*
-	 * @see IReader#getNodeName(Object)
-	 */
-	public String getNodeName(Object node) {
-		return (node instanceof Node) ? ((Node) node).getNodeName() : ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see IReader#getAttribute(Object, String)
-	 */
-	public String getAttribute(Object element, String attributeName) {
-		return (element instanceof Element) && ((Element) element).hasAttribute(attributeName) ? ((Element) element).getAttribute(attributeName) : null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
deleted file mode 100644
index 7521655..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: IReader.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:44:20 $ 
- */
-/**
- * This is internal interface for reading beaninfoConfig either through IConfigurationElements or
- * w3.dom.Nodes. This is because when reading the .beaninfoConfig we will be using Nodes, but
- * when reading configs from registered extensions they will be IConfigurationElements.
- * @version 	1.0
- * TODO Need to move to core when we make things API.
- */
-public interface IReader {
-	
-	public Object getChildren(Object node);
-	public int getLength(Object nodeList);
-	public Object getItem(Object nodeList, int index);
-	public boolean isNodeTypeElement(Object node);	// Is this an element type node
-	public String getNodeName(Object node);
-	public String getAttribute(Object element, String attributeName);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
deleted file mode 100644
index 6cb8933..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
+++ /dev/null
@@ -1,44 +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.jem.internal.beaninfo.adapters;
-/*
- *  $RCSfile: SpecialResourceSet.java,v $
- *  $Revision: 1.8 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * A Special resource set that is used to link together to the beaninfo
- * nature's resource set and makes sure that any request for a new "java:/..."
- * JavaClass is redirected to the beaninfo nature's resource set. Otherwise
- * the classes will be all over the place and not all gathered in one place.
- * 
- * *package* protected because no one should create one of these. They are
- * returned by the BeaninfoNature.newResourceSet() request.
- * 
- * @version 	1.0
- * @author
- */
-class SpecialResourceSet extends ProjectResourceSetImpl {
-
-	/**
-	 * Constructor for SpecialResourceSet.
-	 * @param aProject
-	 */
-	public SpecialResourceSet() {
-		super(null);
-		JEMUtilPlugin.getSharedCache().stopListening(this);	// We don't care about listening.
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
deleted file mode 100644
index 19a2fa2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: UICreateRegistryJobHandler.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:44:20 $ 
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
- 
-
-/**
- * This is the version which can actually reference and use the UI classes. It won't be
- * loaded except if ui plugin is available.
- * 
- * It will check to see if UI is running, and if it is not, then let super class handle.
- * If it is running, then if this is the UI thread, do special but run in ui, else if not then
- * let super handle it normally.
- * 
- * @since 1.0.0
- */
-class UICreateRegistryJobHandler extends CreateRegistryJobHandler {
-	
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.adapters.CreateRegistryJobHandler#processCreateRegistry(org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature)
-	 */
-	protected void processCreateRegistry(final BeaninfoNature nature) {
-		if (PlatformUI.isWorkbenchRunning()) {
-			if (Display.getCurrent() == null)
-				super.processCreateRegistry(nature);	// We are not in the UI thread. Do normal.
-			else {
-				// We are in the UI, so try to run in UI. Really don't want to do this, but we need to
-				// get the build rule, and no way to know if the UI thread already has the build rule.
-				// It would be nice to spawn off thread to do it, but if we had the build rule we couldn't
-				// get it for the spawned thread. So hopefully it won't be long.
-				IProgressService ps = PlatformUI.getWorkbench().getProgressService();				
-				final ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
-
-// TODO Note: For now, runInUI is just way too annoying. It always flashes up. It is supposed to only flash up
-// when it is blocked by the rule. I've opened 66683 to address this. I've also opened 66690 to be able
-// to test if the thread has the rule so that runInUI will only be used if UI thread had the rule.
-// For now take the risk that the UI thread won't ever have the rule. This is pretty likely to be true.
-//				final boolean[] gotRuleLocally = new boolean[] {false};				
-//				try {
-//					ps.runInUI(ps, new IRunnableWithProgress() {
-//
-//						public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-//							gotRuleLocally[0] = true;
-//							doCreateRegistry(nature, new NullProgressMonitor());
-//						}
-//					}, buildRule);
-//				} catch (InvocationTargetException e) {
-//					if (e.getCause() instanceof IllegalArgumentException && !gotRuleLocally[0]) { 
-//						// Error was because rule conflicted with currect rules for this thread. So do in separate thread, should be able to get rule there.
-						try {
-							ps.busyCursorWhile(new IRunnableWithProgress() {
-
-								public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-									IJobManager jm = Platform.getJobManager();
-									monitor.beginTask("", 200);
-									try {
-										jm.beginRule(buildRule, new SubProgressMonitor(monitor, 100));
-										doCreateRegistry(nature, new SubProgressMonitor(monitor, 100));
-									} finally {
-										jm.endRule(buildRule);
-										monitor.done();
-									}
-								}
-							});
-						} catch (InterruptedException e1) {
-						} catch (InvocationTargetException e2) {
-							BeaninfoPlugin.getPlugin().getLogger().log(e2.getCause(), Level.WARNING);
-						}
-//					} else
-//						BeaninfoPlugin.getPlugin().getLogger().log(e.getCause(), Level.WARNING);						
-//				} catch (InterruptedException e) {
-//				}
-			}
-		} else
-			super.processCreateRegistry(nature);	// Workbench not running, do default.
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
deleted file mode 100644
index 87e9d20..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties,v $
-# $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $
-#
-
-INTROSPECT_FAILED_EXC_                           = IWAV0155E Introspection failed on class "{0}." msg="{1}."
-BeaninfoClassAdapter.ClassNotFound               = Class not found
-BeaninfoNature.InvalidProject                    = Invalid project
-UICreateRegistryJobHandler.StartBeaninfoRegistry = Start Beaninfo registry
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
deleted file mode 100644
index 9abdb21..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
+++ /dev/null
@@ -1,1443 +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: BeanInfoCacheController.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/11 19:01:28 $ 
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.impl.EObjectToChangesMapEntryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoClassAdapter;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Controller of the BeanInfo cache. There is one per workspace (it is a static).
- * 
- * The cache is stored on a per IPackageFragmentRoot basis. Each package fragment root will be:
- * 
- * <pre>
- * 
- *  root{999}/classname.xmi
- *  
- * </pre>
- * 
- * "root{999}" will be a unigue name (root appended with a number}, one for each package fragment root. The "classname.xmi" will be the BeanInfo cache
- * for a class in the root. A root can't have more than one class with the same name, so there shouldn't be any collisions.
- * <p>
- * Now roots can either be in a project, or they can be an external jar (which can be shared between projects).
- * <p>
- * Now all roots for a project will be stored in the project's working location
- * {@link org.eclipse.core.resources.IProject#getWorkingLocation(java.lang.String)}under the ".cache" directory. It will be this format in each
- * project location (under the org.eclipse.jem.beaninfo directory):
- * 
- * <pre>
- * 
- *  .index
- *  root{999}/...
- *  
- * </pre>
- * 
- * The ".index" file will be stored/loaded through an ObjectStream. It will be a {@link BeanInfoCacheController.Index}. It is the index to all of the
- * root's in the directory.
- * <p>
- * All of the external jar roots will be stored in the org.eclipse.jem.beaninfo plugin's state location
- * {@link org.eclipse.core.runtime.Platform#getStateLocation(org.osgi.framework.Bundle)}under the ".cache" directory. The format of this directory
- * will be the same as for each project. And the roots will be for each unique shared external jar (such as the differnt jre's rt.jars).
- * <p>
- * Note: There are so many places where synchronization is needed, so it is decided to synchronize only on BeanInfoCacheController.INSTANCE. It would
- * be too easy to get a dead-lock because the order of synchronizations can't be easily controlled. Since each piece of sync control is very short
- * (except for save of the indices, but that is ok because we don't want them changing while saving) it shouldn't block a lot. There is one place we
- * violate this and that is we do a sync on ClassEntry instance when working with the pending. This is necessary because we don't want the cache write
- * job to hold up everything while writing, so we sync on the entry being written instead. There we must be very careful that we never to
- * BeanInfoCacheControler.INSTANCE sync and then a ClassEntry sync because we could deadlock. The CE access under the covers may do a CE sync and then
- * a BeanInfoCacheController.INSTANCE sync.
- * 
- * @since 1.1.0
- */
-public class BeanInfoCacheController {
-
-	/**
-	 * Singleton cache controller.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final BeanInfoCacheController INSTANCE = new BeanInfoCacheController();
-
-	private BeanInfoCacheController() {
-		// Start up save participent.
-		// TODO For now it only handles final save. It doesn't handle deltas and crashes.
-		// It should actually be a job that handles in the background, with a way of cache entries being accessed even when it isn't finished. Such
-		// as until finished when checking mod stamp it will check actual file and compare to cache entry to determine if stale.
-		saveParticipant = new SaveParticipant();
-		try {
-			ResourcesPlugin.getWorkspace().addSaveParticipant(BeaninfoPlugin.getPlugin(), saveParticipant);
-		} catch (CoreException e) {
-			BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-	}
-
-	protected SaveParticipant saveParticipant;
-
-	/**
-	 * An index structure for the Main and Project indexes. Access to the index contents and methods should synchronize on the index itself.
-	 * <p>
-	 * Getting to the index instance should only be through the <code>getMainIndex()</code> and <code>getProjectIndex(IProject)</code> accessors
-	 * so that synchronization and serialization is controlled.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class Index implements Serializable {
-
-		private static final long serialVersionUID = 1106864425465L;
-
-		/*
-		 * Is this a dirty index, i.e. it has been changed and needs to be saved.
-		 */
-		transient private boolean dirty;
-
-		/**
-		 * The highest root number used. It is incremented everytime one is needed. It doesn't ever decrease to recover removed roots.
-		 * 
-		 * @since 1.1.0
-		 */
-		public int highRootNumber;
-
-		/**
-		 * Map of root names to the root Index. The key is a {@link IPath}. The path will be relative to the workspace if a project root, or an
-		 * absolute local path to the archive if it is an external archive. It is the IPath to package fragment root (either a folder or a jar file).
-		 * <p>
-		 * The value will be a {@link BeanInfoCacheController.RootIndex}. This is the index for the contents of that root.
-		 * 
-		 * @since 1.1.0
-		 */
-		transient public Map rootToRootIndex;
-
-		/**
-		 * @param dirty
-		 *            The dirty to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		public void setDirty(boolean dirty) {
-			synchronized (BeanInfoCacheController.INSTANCE) {
-				this.dirty = dirty;
-			}
-		}
-
-		/**
-		 * @return Returns the dirty.
-		 * 
-		 * @since 1.1.0
-		 */
-		public boolean isDirty() {
-			synchronized (BeanInfoCacheController.INSTANCE) {
-				return dirty;
-			}
-		}
-
-		private void writeObject(ObjectOutputStream os) throws IOException {
-			os.defaultWriteObject();
-			// Now write out the root to root index map. We are not serializing the Map directly using normal Map serialization because
-			// the key of the map is an IPath (which is a Path under the covers) and Path is not serializable.
-			os.writeInt(rootToRootIndex.size());
-			for (Iterator mapItr = rootToRootIndex.entrySet().iterator(); mapItr.hasNext();) {
-				Map.Entry entry = (Map.Entry) mapItr.next();
-				os.writeUTF(((IPath) entry.getKey()).toString());
-				os.writeObject(entry.getValue());
-			}
-		}
-
-		private void readObject(ObjectInputStream is) throws IOException, ClassNotFoundException {
-			is.defaultReadObject();
-			int size = is.readInt();
-			rootToRootIndex = new HashMap(size < 100 ? 100 : size);
-			while (size-- > 0) {
-				rootToRootIndex.put(new Path(is.readUTF()), is.readObject());
-			}
-		}
-	}
-
-	/**
-	 * An index for a root. It has an entry for each class in this root. The class cache entry describes the cache, whether it is stale, what the
-	 * current mod stamp is, etc.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static abstract class RootIndex implements Serializable {
-
-		private static final long serialVersionUID = 1106868674823L;
-
-		transient private IPath cachePath; // Absolute local filesystem IPath to the root cache directory. Computed at runtime because it may change
-										   // if workspace relocated.
-
-		protected Map classNameToClassEntry; // Map of class names to class entries.
-
-		private String rootName; // Name of the root directory in the cache (e.g. "root1").
-
-		protected Index index; // Index containing this root index.
-
-		protected RootIndex() {
-		}
-
-		public RootIndex(String rootName, Index index) {
-			this.rootName = rootName;
-			classNameToClassEntry = new HashMap(100); // When created brand new, put in a map. Otherwise object stream will create the map.
-			this.index = index;
-		}
-
-		/**
-		 * Return the root directory name
-		 * 
-		 * @return rootname
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getRootName() {
-			return rootName;
-		}
-
-		/**
-		 * Set this RootIndex (and the containing Index) as being dirty and in need of saving.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		public void setDirty() {
-			index.setDirty(true);
-		}
-
-		/*
-		 * Setup for index. It will initialize the path. Once set it won't set it again. This will be called repeatedly by the cache controller
-		 * because there is no way to know if it was lazily created or was brought in from file. When brought in from file the path is not set because
-		 * it should be relocatable and we don't want absolute paths out on the disk caches, and we don't want to waste time creating the path at load
-		 * time because it may not be needed for a while. So it will be lazily created. <p> If the project is set, then the path will be relative to
-		 * the project's working location. If project is <code> null </code> then it will be relative to the BeanInfo plugin's state location. <p>
-		 * This is <package-protected> because only the creator (BeanInfoCacheController class) should set this up.
-		 * 
-		 * @param project
-		 * 
-		 * @since 1.1.0
-		 */
-		void setupIndex(IProject project) {
-			if (getCachePath() == null)
-				cachePath = getCacheDir(project).append(rootName);
-		}
-
-		/**
-		 * @return Returns the path of the cache directory for the root.
-		 * 
-		 * @since 1.1.0
-		 */
-		public IPath getCachePath() {
-			return cachePath;
-		}
-
-		/**
-		 * Return whether this is a root for a archive or a folder.
-		 * 
-		 * @return <code>true</code> if archive for a root. <code>false</code> if archive for a folder.
-		 * 
-		 * @since 1.1.0
-		 */
-		public abstract boolean isArchiveRoot();
-	}
-
-	/**
-	 * A root index that is for an archive, either internal or external. It contains the archive's modification stamp. Each class cache entry will
-	 * have this same modification stamp. If the archive is changed then all of the class cache entries will be removed because they are all possibly
-	 * stale. No way to know which may be stale and which not.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class ArchiveRootIndex extends RootIndex {
-
-		private static final long serialVersionUID = 110686867456L;
-
-		private long archiveModificationStamp;
-
-		/*
-		 * For serializer to call.
-		 */
-		protected ArchiveRootIndex() {
-		}
-
-		public ArchiveRootIndex(String rootName, long archiveModificationStamp, Index index) {
-			super(rootName, index);
-			this.archiveModificationStamp = archiveModificationStamp;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
-		 */
-		public boolean isArchiveRoot() {
-			return true;
-		}
-
-		/*
-		 * Set the modification stamp. <p> <package-protected> because only the cache controller should change it.
-		 * 
-		 * @param archiveModificationStamp The archiveModificationStamp to set.
-		 * 
-		 * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
-		 * @since 1.1.0
-		 */
-		void setArchiveModificationStamp(long archiveModificationStamp) {
-			this.archiveModificationStamp = archiveModificationStamp;
-			setDirty();
-		}
-
-		/**
-		 * Returns the modification stamp.
-		 * 
-		 * @return Returns the archiveModificationStamp.
-		 * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
-		 * @since 1.1.0
-		 */
-		public long getArchiveModificationStamp() {
-			return archiveModificationStamp;
-		}
-	}
-
-	/**
-	 * This is a root index for a folder (which will be in the workspace). Each class cache entry can have a different modification stamp with a
-	 * folder root index.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class FolderRootIndex extends RootIndex {
-
-		private static final long serialVersionUID = 1106868674842L;
-
-		/*
-		 * For serialization.
-		 */
-		protected FolderRootIndex() {
-		}
-
-		/**
-		 * @param rootName
-		 * 
-		 * @since 1.1.0
-		 */
-		public FolderRootIndex(String rootName, Index index) {
-			super(rootName, index);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
-		 */
-		public boolean isArchiveRoot() {
-			return false;
-		}
-	}
-
-	/**
-	 * An individual class entry from the cache. It has an entry for each class in the root. The class cache entry describes the cache, whether it is
-	 * stale, what the current mod stamp is, etc.
-	 * <p>
-	 * There is a method to call to see if deleted. This should only be called if entry is being held on to because
-	 * <code>getClassEntry(JavaClass)</code> will never return a deleted entry. There is a method to get the modification stamp of the current cache
-	 * entry. This is the time stamp of the cooresponding class resource (or archive file) that the cache file was created from. If the value is
-	 * <code>IResource.NULL_STAMP</code>, then the cache file is known to be stale. Otherwise if the value is less than a modification stamp of a
-	 * super class then the cache file is stale.
-	 * 
-	 * @see ClassEntry#isDeleted()
-	 * @see ClassEntry#getModificationStamp()
-	 * @see BeanInfoCacheController#getClassEntry(JavaClass)
-	 * @since 1.1.0
-	 */
-	public static class ClassEntry implements Serializable {
-
-		private static final long serialVersionUID = 1106868674666L;
-
-		public static final long DELETED_MODIFICATION_STAMP = Long.MIN_VALUE; // This flag won't be seen externally. It is used to indicate the entry
-																			  // has been deleted for those that have been holding a CE.
-
-		private long modificationStamp;
-		private long superModificationStamp;	// Stamp of superclass, if any, at time of cache creation.
-		private String[] interfaceNames;	// Interfaces names (null if no interfaces)
-		private long[] interfaceModicationStamps;	// Modification stamps of interfaces, if any. (null if no interfaces).
-		private transient Resource pendingResource;	// Resource is waiting to be saved, but the timestamps are for this pending resource so that we know what it will be ahead of time. At this point the class will be introspected. 
-
-		private RootIndex rootIndex; // The root index this class entry is in, so that any changes can mark the entry as dirty.
-
-		private String className; // The classname for this entry.
-		
-		private boolean saveOperations;	// Flag for saving operations. Once this is set, it will continue to save operations in the cache in addition to everything else.
-
-		private long configurationModificationStamp;	// Modification stamp of the Eclipse configuration. Used to determine if the cache of override files is out of date due to a config change.
-		private boolean overrideCacheExists;	// Flag that there is an override cache to load. This is orthogonal to the config mod stamp because it simply means that on the current configuration there is no override cache.
-		private transient Resource pendingOverrideResource;	// Override resource is waiting to be saved.
-		
-		protected ClassEntry() {
-		}
-
-		ClassEntry(RootIndex rootIndex, String className) {
-			this.setRootIndex(rootIndex);
-			this.className = className;
-			modificationStamp = IResource.NULL_STAMP;
-			rootIndex.classNameToClassEntry.put(className, this);
-		}
-
-		/**
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getClassName() {
-			return className;
-		}
-
-		/**
-		 * Return whether the entry has been deleted. This will never be seen in an entry that is still in an index. It is used for entries that have
-		 * been removed from the index. It is for classes (such as the BeanInfoClassAdapter) which are holding onto a copy of entry to let them know.
-		 * <p>
-		 * Holders of entries should call isDeleted if they don't need to further check the mod stamp. Else they should call getModificationStamp and
-		 * check of deleted, stale, or mod stamp. That would save extra synchronizations. If entry is deleted then it should throw the entry away.
-		 * 
-		 * @return <code>true</code> if the entry has been deleted, <code>false</code> if still valid.
-		 * 
-		 * @see ClassEntry#getModificationStamp()
-		 * @see ClassEntry#isStale()
-		 * @see ClassEntry#DELETED_MODIFICATION_STAMP
-		 * @since 1.1.0
-		 */
-		public boolean isDeleted() {
-			return getModificationStamp() == DELETED_MODIFICATION_STAMP;
-		}
-
-		/**
-		 * Mark the entry as deleted. It will also be removed from root index in that case.
-		 * <p>
-		 * Note: It is public only so that BeanInfoClassAdapter can access it. It should not be called by anyone else outside of BeanInfo.
-		 */
-		public synchronized void markDeleted() {
-			if (!isDeleted()) {
-				getRootIndex().classNameToClassEntry.remove(className);
-				setModificationStamp(DELETED_MODIFICATION_STAMP); // Also marks index as dirty.
-			}
-		}
-
-		/**
-		 * Return whether the entry is stale or not. This orthoganal to isDeleted. isDeleted will not be true if isStale and isStale will not be true
-		 * if isDeleted. Normally you should use getModificationStamp and check the value for IResource.NULL_STAMP and other values to bring it down
-		 * to only one synchronized call to CE, but if only needing to know if stale, you can use this.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 * @see IResource#NULL_STAMP
-		 * @see ClassEntry#getModificationStamp()
-		 * @see ClassEntry#isDeleted()
-		 */
-		public boolean isStale() {
-			return getModificationStamp() == IResource.NULL_STAMP;
-		}
-
-		/**
-		 * Return the modification stamp. For those holding onto an entry, and they need to know more than if just deleted, then they should just the
-		 * return value from getModificationStamp. Else they should use isDeleted or isStale.
-		 * 
-		 * @return modification stamp, or {@link IResource#NULL_STAMP}if stale or not yet created, or {@link ClassEntry#DELETED_MODIFICATION_STAMP}
-		 *         if deleted.
-		 * 
-		 * @see ClassEntry#isDeleted()
-		 * @see ClassEntry#isStale()
-		 * @since 1.1.0
-		 */
-		public synchronized long getModificationStamp() {
-			return modificationStamp;
-		}
-		
-		/**
-		 * Return the super modification stamp.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long getSuperModificationStamp() {
-			return superModificationStamp;
-		}
-		
-		/**
-		 * Return the interface names or <code>null</code> if no interface names.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized String[] getInterfaceNames() {
-			return interfaceNames;
-		}
-
-		/**
-		 * Return the interface modification stamps or <code>null</code> if no interfaces.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long[] getInterfaceModificationStamps() {
-			return interfaceModicationStamps;
-		}
-		
-		/*
-		 * Set the modification stamp. <p> <package-protected> because only the cache controller should set it. @param modificationStamp
-		 * 
-		 * @since 1.1.0
-		 */
-		void setModificationStamp(long modificationStamp) {
-			if (this.modificationStamp != modificationStamp) {
-				this.modificationStamp = modificationStamp;
-				getRootIndex().setDirty();
-			}
-		}
-
-		/**
-		 * Answer whether operations are also stored in the cache for this class. By default they are not. Once turned on they
-		 * will always be stored for this class until the class is deleted.
-		 * 
-		 * @return <code>true</code> if operations are cached, <code>false</code> if they are not cached.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized boolean isOperationsStored() {
-			return saveOperations;
-		}
-		
-		/*
-		 * Set the operations stored flag.
-		 * @param storeOperations
-		 * 
-		 * @see BeanInfoCacheController.ClassEntry#isOperationsStored()
-		 * @since 1.1.0
-		 */
-		void setOperationsStored(boolean storeOperations) {
-			saveOperations = storeOperations;
-		}
-		
-		/**
-		 * Get the configuration modification stamp of the last saved override cache.
-		 * 
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized long getConfigurationModificationStamp() {
-			return configurationModificationStamp;
-		}
-
-		/* 
-		 * Set the configuration modification stamp.
-		 * <p> <package-protected> because only the cache controller should access it.
-		 * 
-		 * @param configurationModificationStamp
-		 * 
-		 * @since 1.1.0
-		 */
-		void setConfigurationModificationStamp(long configurationModificationStamp) {
-			this.configurationModificationStamp = configurationModificationStamp;
-			getRootIndex().setDirty();
-		}
-		
-		/**
-		 * Answer whether there is an override cache available.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized boolean overrideCacheExists() {
-			return overrideCacheExists;
-		}
-		
-		/*
-		 * Set the override cache exists flag.
-		 * <p> <package-protected> because only the cache controller should access it.
-		 * @param overrideCacheExists
-		 * 
-		 * @since 1.1.0
-		 */
-		void setOverrideCacheExists(boolean overrideCacheExists) {
-			this.overrideCacheExists = overrideCacheExists;
-		}
-		
-		/**
-		 * Get the pending resource or <code>null</code> if not pending.
-		 * 
-		 * @return the pending resource or <code>null</code> if not pending.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized Resource getPendingResource() {
-			return pendingResource;
-		}
-		
-		/*
-		 * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry). 
-		 * <p> <package-protected> because only the cache controller should access it. 
-		 * @param cacheResource The cacheResource to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setPendingResource(Resource pendingResource) {
-			this.pendingResource = pendingResource;
-		}
-
-		/**
-		 * Get the pending override resource or <code>null</code> if not pending.
-		 * 
-		 * @return the pending override resource or <code>null</code> if not pending.
-		 * 
-		 * @since 1.1.0
-		 */
-		public synchronized Resource getPendingOverrideResource() {
-			return pendingOverrideResource;
-		}
-		
-		/*
-		 * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry). 
-		 * <p> <package-protected> because only the cache controller should access it. 
-		 * @param cacheResource The cacheResource to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setPendingOverrideResource(Resource pendingOverrideResource) {
-			this.pendingOverrideResource = pendingOverrideResource;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it. @param rootIndex The rootIndex to set.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setRootIndex(RootIndex rootIndex) {
-			this.rootIndex = rootIndex;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it. @return Returns the rootIndex.
-		 * 
-		 * @since 1.1.0
-		 */
-		RootIndex getRootIndex() {
-			return rootIndex;
-		}
-		
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setSuperModificationStamp(long superModificationStamp) {
-			this.superModificationStamp = superModificationStamp;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setInterfaceNames(String[] interfaceNames) {
-			this.interfaceNames = interfaceNames;
-		}
-
-		/*
-		 * <package-protected> because only the cache controller should access it.
-		 * 
-		 * @since 1.1.0
-		 */
-		void setInterfaceModificationStamps(long[] interfaceModificationStamps) {
-			this.interfaceModicationStamps = interfaceModificationStamps;
-		}
-		
-	}
-
-	/*
-	 * Main index for the external jars. This variable should not be referenced directly except through the getMainIndex() accessor. That controls
-	 * synchronization and restoration as needed.
-	 */
-	private static Index MAIN_INDEX;
-
-	/*
-	 * Map of project indexes. They are read in as needed. The key will be an IProject and the value will be an Index. This variable should not be
-	 * referenced directly except through the getProjectIndex(IProject) accessor. That controls synchronization and restoration as needed.
-	 */
-	private static Map PROJECT_INDEXES = new HashMap();
-
-	/*
-	 * Suffix for class cache files.
-	 */
-	private static final String CLASS_CACHE_SUFFIX = ".xmi";
-	/*
-	 * Suffic for class override cache files.
-	 */
-	private static final String OVERRIDE_CACHE_SUFFIX = ".override.xmi";
-
-	/**
-	 * Return the current class entry for the JavaClass, or <code>null</code> if no current entry.
-	 * 
-	 * @param jclass
-	 * @return class entry or <code>null</code> if no current entry.
-	 * 
-	 * @since 1.1.0
-	 */
-	public ClassEntry getClassEntry(JavaClass jclass) {
-		IType type = (IType) jclass.getReflectionType();
-		RootIndex rootIndex = getRootIndex(type);
-		String className = jclass.getQualifiedNameForReflection();
-		return getClassEntry(rootIndex, className, false);
-	}
-
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Reflection Cache with no operations in it.
-	 * @since 1.1.0
-	 */
-	public final static int REFLECTION_CACHE = 1;
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Reflection Cache with operations in it.
-	 * @since 1.1.0
-	 */
-	public final static int REFLECTION_OPERATIONS_CACHE = 2;
-	/**
-	 * Enumeration for newCache: Signals that this cache is the Overrides cache.
-	 * @since 1.1.0
-	 */
-	public final static int OVERRIDES_CACHE = 3;
-	/**
-	 * A new cache entry for the given class has been created. Need to write it out.
-	 * 
-	 * @param jclass
-	 *            the JavaClass the cache is for.
-	 * @param cache
-	 *            the ChangeDescription to put out if cacheType is Reflection types, a List if override cache type.
-	 * @param cacheType
-	 *            {@link BeanInfoCacheController.ClassEntry#REFLECTION_CACHE} for the enum values.
-	 * @return new class entry (or old one if same one). Should always replace one being held by this one. <code>null</code> if cache could not be
-	 *         updated for some reason.
-	 * @since 1.1.0
-	 */
-	public ClassEntry newCache(JavaClass jclass, Object cache, int cacheType) {
-		if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
-			Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-			String type = cacheType!=OVERRIDES_CACHE?"Class":"Overrides";
-			if (cacheType == OVERRIDES_CACHE && cache == null)
-				type+="  empty";
-			logger.log("Creating cache for class "+jclass.getQualifiedNameForReflection()+" cache type="+type, Level.FINER);
-		}
-		ChangeDescription cd = null;
-		if (cacheType != OVERRIDES_CACHE) {
-			// First go through the cd and remove any empty changes. This is because we created the feature change before we knew what went into
-			// it, and at times nothing goes into it.
-			cd = (ChangeDescription) cache;
-			for (Iterator iter = cd.getObjectChanges().iterator(); iter.hasNext();) {
-				EObjectToChangesMapEntryImpl fcEntry = (EObjectToChangesMapEntryImpl) iter.next();
-				if (((List) fcEntry.getValue()).isEmpty())
-					iter.remove(); // Empty changes, remove it.
-			}
-		}
-		IType type = (IType) jclass.getReflectionType();
-		RootIndex rootIndex = getRootIndex(type);
-		String className = jclass.getQualifiedNameForReflection();
-		ClassEntry ce = getClassEntry(rootIndex, className, true); // Create it if not existing.
-		// Sync on ce so that only can create a cache for a class at a time and so that writing (if occurring at the same time for the class) can be
-		// held up.
-		// this is a violation of the agreement to only sync on THIS, but it is necessary or else the write job would lock everything out while it is
-		// writing. This way it only locks out one class, if the class is at the same time.
-		// We shouldn't have deadlock because here we lock ce and then THIS (maybe). The write job will lock ce, and then lock THIS. Everywhere else
-		// we must
-		// also do lock ce then THIS. Mustn't do other way around or possibility of deadlock. Be careful that any synchronized methods in this class
-		// do
-		// not lock an existing ce.
-		ResourceSet cacheRset = null;
-		synchronized (ce) {
-			Resource cres;
-			if (cacheType != OVERRIDES_CACHE) {
-				cres = ce.getPendingResource();
-				if (cres != null) {
-					// We have a pending, so clear and reuse the resource.
-					cres.getContents().clear();
-				} else {
-					// Not currently writing or waiting to write, so create a new resource.
-					cres = jclass.eResource().getResourceSet().createResource(
-							URI.createFileURI(rootIndex.getCachePath().append(className + CLASS_CACHE_SUFFIX).toString()));
-				}
-				cacheRset = cres.getResourceSet();
-				ce.setOperationsStored(cacheType == REFLECTION_OPERATIONS_CACHE);
-				ce.setPendingResource(cres);
-				cres.getContents().add(cd);
-				// Archives use same mod as archive (retrieve from rootindex), while non-archive use the underlying resource's mod stamp.
-				if (rootIndex.isArchiveRoot())
-					ce.setModificationStamp(((ArchiveRootIndex) rootIndex).getArchiveModificationStamp());
-				else {
-					try {
-						ce.setModificationStamp(type.getUnderlyingResource().getModificationStamp());
-					} catch (JavaModelException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-						ce.markDeleted(); // Mark as deleted in case this was an existing that someone is holding.
-						return null; // Couldn't do it, throw cache entry away. This actually should never occur.
-					}
-				}
-				// Need to get the supers info. 
-				List supers = jclass.getESuperTypes();
-				if (!supers.isEmpty()) {
-					// We assume that they all have been introspected. This was done back in main introspection. If they are introspected they will have a class entry.
-					BeaninfoClassAdapter bca = BeaninfoClassAdapter.getBeaninfoClassAdapter((EObject) supers.get(0));
-					ce.setSuperModificationStamp(bca.getClassEntry().getModificationStamp());
-					if(supers.size() == 1) {
-						ce.setInterfaceNames(null);
-						ce.setInterfaceModificationStamps(null);
-					} else {
-						String[] interNames = new String[supers.size()-1];
-						long[] interMods = new long[interNames.length];
-						for (int i = 1, indx = 0; i < interNames.length; i++, indx++) {
-							JavaClass javaClass = (JavaClass) supers.get(i);
-							bca = BeaninfoClassAdapter.getBeaninfoClassAdapter(javaClass);
-							bca.introspectIfNecessary();	// Force introspection to get a valid super mod stamp.
-							interNames[indx] = javaClass.getQualifiedNameForReflection();
-							interMods[indx] = bca.getClassEntry().getModificationStamp();
-						}
-						ce.setInterfaceNames(interNames);
-						ce.setInterfaceModificationStamps(interMods);
-					}
-				} else {
-					ce.setSuperModificationStamp(IResource.NULL_STAMP);
-					ce.setInterfaceNames(null);
-					ce.setInterfaceModificationStamps(null);
-				}
-			} else {
-				// We are an override cache.
-				if (cache != null) { 
-					cres = ce.getPendingOverrideResource();
-					if (cres != null) {
-						// We have a pending, so clear and reuse the resource.
-						cres.getContents().clear();
-					} else {
-						// Not currently writing or waiting to write, so create a new resource.
-						cres = jclass.eResource().getResourceSet().createResource(
-								URI.createFileURI(rootIndex.getCachePath().append(className + OVERRIDE_CACHE_SUFFIX).toString()));
-					}
-					cacheRset = cres.getResourceSet();
-					cres.getContents().addAll((List) cache);
-					ce.setPendingOverrideResource(cres);
-					ce.setOverrideCacheExists(true);
-				} else {
-					ce.setPendingOverrideResource(null);
-					ce.setOverrideCacheExists(false);
-				}
-				ce.setConfigurationModificationStamp(Platform.getPlatformAdmin().getState(false).getTimeStamp());
-			}
-		}
-		queueClassEntry(ce, cacheRset); // Now queue it up.
-		return ce;
-	}
-
-	/**
-	 * Get the cache resource for the given java class.
-	 * <p>
-	 * NOTE: It is the responsibility of the caller to ALWAYS remove the Resource from its resource set when done with it.
-	 * 
-	 * @param jclass
-	 * @param ce the class entry for the jclass
-	 * @param reflectCache <code>true</code> if this the reflection/introspection cache or <code>false</code> if this is the override cache.
-	 * @return the loaded cache resource, or <code>null</code> if not there (for some reason) or an error trying to load it.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Resource getCache(JavaClass jclass, ClassEntry ce, boolean reflectCache) {
-		String className = jclass.getQualifiedNameForReflection();
-		if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
-			Logger logger = BeaninfoPlugin.getPlugin().getLogger();
-			String type = reflectCache?"Class":"Overrides";
-			logger.log("Loading cache for class "+className+" cache type="+type, Level.FINER);
-		}
-
-		if (reflectCache) {
-			boolean waitForJob = false;
-			synchronized (ce) {
-				if (ce.getPendingResource() != null) {
-					// We have one pending. So wait until write cache job is done, and then load it in.
-					// Note: Can't just copy the pending resource because it has references to JavaClasses
-					// and these could be in a different project (since this could be a workspace wide class).
-					// We would get the wrong java classes then when we apply it. 
-					waitForJob = true;
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Using pending class cache.", Level.FINER);
-				}
-			}
-			if (waitForJob)
-				waitForCacheSaveJob();	
-
-			try {
-				return jclass.eResource().getResourceSet().getResource(
-						URI.createFileURI(ce.getRootIndex().getCachePath().append(
-								className + CLASS_CACHE_SUFFIX).toString()), true);
-			} catch (Exception e) {
-				// Something happened and couldn't load it.
-				// TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-				return null;
-			}
-		} else {
-			boolean waitForJob = false;
-			synchronized (ce) {
-				if (ce.getPendingOverrideResource() != null) {
-					// We have one pending. So wait until write cache job is done, and then load it in.
-					// Note: Can't just copy the pending resource because it has references to JavaClasses
-					// and these could be in a different project (since this could be a workspace wide class).
-					// We would get the wrong java classes then when we apply it. 
-					waitForJob = true;
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Using pending override cache.", Level.FINER);
-				}
-			}
-			if (waitForJob)
-				waitForCacheSaveJob();	
-
-			try {
-				return jclass.eResource().getResourceSet().getResource(
-						URI.createFileURI(ce.getRootIndex().getCachePath().append(
-								className + OVERRIDE_CACHE_SUFFIX).toString()), true);
-			} catch (Exception e) {
-				// Something happened and couldn't load it.
-				// TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
-				BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
-				return null;
-			}
-		}
-	}
-
-	private synchronized ClassEntry getClassEntry(RootIndex rootIndex, String className, boolean createEntry) {
-		ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(className);
-		if (createEntry && ce == null) {
-			// Need to create one.
-			ce = new ClassEntry(rootIndex, className);
-			// Don't actually mark the rootIndex dirty until the cache for it is actually saved out.
-		}
-		return ce;
-	}
-
-	private static final String ROOT_PREFIX = "root";
-
-	/*
-	 * Get the root index for the appropriate cache for the given java class.
-	 */
-	private RootIndex getRootIndex(IType type) {
-		IPackageFragmentRoot root = (IPackageFragmentRoot) type.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
-		if (!root.isExternal()) {
-			// So it is in a project. Get the project index.
-			return getRootIndex(root, root.getJavaProject().getProject());
-		} else {
-			// It is an external jar (archive), so needs to come from main index, no project.
-			return getRootIndex(root, null);
-		}
-	}
-
-	/*
-	 * Get the root index for the given root. A Project index if project is not null.
-	 */
-	private synchronized RootIndex getRootIndex(IPackageFragmentRoot root, IProject project) {
-		Index index = project != null ? getProjectIndex(project) : getMainIndex();
-		IPath rootPath = root.getPath();
-		RootIndex rootIndex = (RootIndex) index.rootToRootIndex.get(rootPath);
-		if (rootIndex == null) {
-			// Need to do a new root path.
-			String rootName = ROOT_PREFIX + (++index.highRootNumber);
-			rootIndex = root.isArchive() ? createArchiveRootIndex(root, rootName, index) : new FolderRootIndex(rootName, index);
-			index.rootToRootIndex.put(rootPath, rootIndex);
-			// Don't set index dirty until we actually save a class cache file. Until then it only needs to be in memory.
-		}
-		rootIndex.setupIndex(project); // Set it up, or may already be set, so it will do nothing in that case.
-		return rootIndex;
-	}
-
-	/*
-	 * Create an archive root with the given root number and root.
-	 */
-	private RootIndex createArchiveRootIndex(IPackageFragmentRoot rootArchive, String rootName, Index index) {
-		long modStamp = IResource.NULL_STAMP;
-		if (rootArchive.isExternal()) {
-			modStamp = rootArchive.getPath().toFile().lastModified();
-		} else {
-			try {
-				modStamp = rootArchive.getUnderlyingResource().getModificationStamp();
-			} catch (JavaModelException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			}
-		}
-		return new ArchiveRootIndex(rootName, modStamp, index);
-	}
-
-	private static final String INDEXFILENAME = ".index";
-
-	private static final String CACHEDIR = ".cache"; // Cache directory (so as not to conflict with any future BeanInfo Plugin specific data files.
-
-	/*
-	 * Get the cache directory for the project (or if project is null, the main plugin cache directory).
-	 */
-	// TODO: make this one private
-	public static IPath getCacheDir(IProject project) {
-		if (project != null)
-			return project.getWorkingLocation(BeaninfoPlugin.getPlugin().getBundle().getSymbolicName()).append(CACHEDIR);
-		else
-			return BeaninfoPlugin.getPlugin().getStateLocation().append(CACHEDIR);
-	}
-
-	/*
-	 * Get the project index. Synchronized so that we can create it if necessary and not get race conditions.
-	 */
-	private synchronized Index getProjectIndex(IProject project) {
-		Index index = (Index) PROJECT_INDEXES.get(project);
-		if (index == null) {
-			// Read the index in.
-			File indexDirFile = getCacheDir(project).append(INDEXFILENAME).toFile();
-			if (indexDirFile.canRead()) {
-				ObjectInputStream ois = null;
-				try {
-					ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
-					index = (Index) ois.readObject();
-				} catch (IOException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} catch (ClassNotFoundException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} finally {
-					if (ois != null)
-						try {
-							ois.close();
-						} catch (IOException e) {
-							BeaninfoPlugin.getPlugin().getLogger().log(e);
-						}
-				}
-			}
-
-			if (index == null) {
-				// Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
-				// new).
-				index = new Index();
-				index.highRootNumber = 0;
-				index.rootToRootIndex = new HashMap();
-			}
-
-			PROJECT_INDEXES.put(project, index); // We either created a new one, or we were able to load it. Put it into the map of projects.
-		}
-		return index;
-	}
-
-	/*
-	 * Get the main index. Synchronized so that we can create it if necessary and not get race conditions.
-	 */
-	private synchronized Index getMainIndex() {
-		if (MAIN_INDEX == null) {
-			// Read the index in.
-			File indexDirFile = getCacheDir(null).append(INDEXFILENAME).toFile();
-			if (indexDirFile.canRead()) {
-				ObjectInputStream ois = null;
-				try {
-					ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
-					MAIN_INDEX = (Index) ois.readObject();
-				} catch (IOException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} catch (ClassNotFoundException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e);
-				} finally {
-					if (ois != null)
-						try {
-							ois.close();
-						} catch (IOException e) {
-							BeaninfoPlugin.getPlugin().getLogger().log(e);
-						}
-				}
-			}
-
-			if (MAIN_INDEX == null) {
-				// Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
-				// new).
-				MAIN_INDEX = new Index();
-				MAIN_INDEX.highRootNumber = 0;
-				MAIN_INDEX.rootToRootIndex = new HashMap();
-			}
-
-		}
-		return MAIN_INDEX;
-	}
-
-	// -------------- Save Participant code -----------------
-
-	protected class SaveParticipant implements ISaveParticipant {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void doneSaving(ISaveContext context) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void prepareToSave(ISaveContext context) throws CoreException {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void rollback(ISaveContext context) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext)
-		 */
-		public void saving(ISaveContext context) throws CoreException {
-			boolean fullsave = false;
-			switch (context.getKind()) {
-				case ISaveContext.PROJECT_SAVE:
-					IProject project = context.getProject();
-					synchronized (BeanInfoCacheController.INSTANCE) {
-						Index projectIndex = (Index) PROJECT_INDEXES.get(project);
-						if (projectIndex != null && projectIndex.isDirty())
-							if (cleanIndexDirectory(project, projectIndex))
-								writeIndex(project, projectIndex);
-							else {
-								// It was empty, just get rid of it the index.
-								PROJECT_INDEXES.remove(project);
-							}
-					}
-					break;
-				case ISaveContext.FULL_SAVE:
-					fullsave = true;
-					waitForCacheSaveJob();
-				// Now flow into the snapshot save to complete the fullsave.
-				case ISaveContext.SNAPSHOT:
-					// For a snapshot, just the dirty indexes, no clean up. If fullsave, cleanup the indexes, but only save the dirty.
-					synchronized (BeanInfoCacheController.INSTANCE) {
-						try {
-							if (MAIN_INDEX != null) {
-								if (fullsave) {
-									if (cleanIndexDirectory(null, MAIN_INDEX)) {
-										if (MAIN_INDEX.isDirty())
-											writeIndex(null, MAIN_INDEX);
-									} else {
-										// It was empty, just get rid of the index.
-										MAIN_INDEX = null;
-									}
-								} else if (MAIN_INDEX.isDirty())
-									writeIndex(null, MAIN_INDEX);
-							}
-							// Now do the project indexes.
-							for (Iterator projectIndexEntryItr = PROJECT_INDEXES.entrySet().iterator(); projectIndexEntryItr.hasNext();) {
-								Map.Entry entry = (Map.Entry) projectIndexEntryItr.next();
-								project = (IProject) entry.getKey();
-								Index index = (Index) entry.getValue();
-								if (fullsave) {
-									if (cleanIndexDirectory(project, index)) {
-										if (index.isDirty())
-											writeIndex(project, index);
-									} else {
-										// It was empty, just get rid of the index.
-										projectIndexEntryItr.remove();
-									}
-								} else if (index.isDirty())
-									writeIndex(project, index);
-							}
-						} catch (RuntimeException e) {
-							e.printStackTrace();
-							// TODO Need to fix the case whereas the cache has been removed
-							// by Project-->Clean but the memory cache still thinks it exists.
-							// This try/catch should be remove once that is fixed.
-						}
-					}
-			}
-		}
-
-		/*
-		 * Write an index. Project if not null indicates a project index.
-		 */
-		private void writeIndex(IProject project, Index index) {
-			ObjectOutputStream oos = null;
-			try {
-				File indexDirFile = getCacheDir(project).append(INDEXFILENAME).toFile();
-				oos = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(indexDirFile)));
-				oos.writeObject(index);
-				index.setDirty(false);
-			} catch (IOException e) {
-				BeaninfoPlugin.getPlugin().getLogger().log(e);
-			} finally {
-				if (oos != null)
-					try {
-						oos.close();
-					} catch (IOException e) {
-						BeaninfoPlugin.getPlugin().getLogger().log(e);
-					}
-			}
-		}
-
-		/*
-		 * Clean the index directory of unused root directories. If after cleaning the index is empty, then it will delete the index file too. @return
-		 * true if index not empty, false if index was empty and was erased too.
-		 */
-		private boolean cleanIndexDirectory(IProject project, Index index) {
-			// clean out unused rootIndexes
-			File indexDir = getCacheDir(project).toFile();
-			// Create a set of all root names for quick look up.
-			if (index.rootToRootIndex.isEmpty()) {
-				// It is empty, clear everything, including index file.
-				cleanDirectory(indexDir, false);
-				return false;
-			} else {
-				// Need a set of the valid rootnames for quick lookup of names in the directory list.
-				// And while accumulating this list, clean out the root indexes cache too (i.e. the class cache files).
-				final Set validFiles = new HashSet(index.rootToRootIndex.size());
-				validFiles.add(INDEXFILENAME);
-				for (Iterator itr = index.rootToRootIndex.values().iterator(); itr.hasNext();) {
-					RootIndex rootIndex = (RootIndex) itr.next();
-					if (cleanClassCacheDirectory(rootIndex, project)) {
-						// The class cache has been cleaned, and there are still some classes left, so keep the root index.
-						validFiles.add(rootIndex.getRootName());
-					} else {
-						itr.remove(); // The root index is empty, so get rid of it. Since not a valid name, it will be deleted in next step.
-						index.setDirty(true); // Also set it dirty in case it wasn't because we need to write out the container Index since it was
-											  // changed.
-					}
-				}
-				// Get list of files and delete those that are not a valid name (used root name, or index file)
-				String[] fileNames = indexDir.list();
-				for (int i = 0; i < fileNames.length; i++) {
-					if (!validFiles.contains(fileNames[i])) {
-						File file = new File(indexDir, fileNames[i]);
-						if (file.isDirectory())
-							cleanDirectory(file, true);
-						else
-							file.delete();
-					}
-				}
-				return true;
-			}
-		}
-
-		/*
-		 * Clean out the class cache directory for the root index. Return true if cleaned good but not empty. Return false if the class cache
-		 * directory is now empty. In this case we should actually get rid of the entire root index.
-		 */
-		private boolean cleanClassCacheDirectory(RootIndex rootIndex, IProject project) {
-			if (rootIndex.classNameToClassEntry.isEmpty())
-				return false; // There are no classes, so get rid the entire root index.
-			else {
-				final Set validFiles = rootIndex.classNameToClassEntry.keySet(); // The keys (classnames) are the filenames (without extension)
-																					// that
-				// should be kept.
-				File indexDir = getCacheDir(project).append(rootIndex.getRootName()).toFile();
-				// Get list of files that are not a valid name (used classname)
-				String[] fileNames = indexDir.list();
-				if (fileNames != null) {
-					for (int i = 0; i < fileNames.length; i++) {
-						String fileName = fileNames[i];
-						if (fileName.endsWith(OVERRIDE_CACHE_SUFFIX)) {
-							// Ends with out class cache extension, see if valid classname.
-							String classname = fileName.substring(0, fileName.length() - OVERRIDE_CACHE_SUFFIX.length());
-							ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(classname);
-							if (ce != null && ce.overrideCacheExists())
-								continue; // It is one of ours. Keep it.
-						} else if (fileName.endsWith(CLASS_CACHE_SUFFIX)) {
-							// Ends with out class cache extension, see if valid classname.
-							if (validFiles.contains(fileName.substring(0, fileName.length() - CLASS_CACHE_SUFFIX.length()))) // Strip down to just
-																																// class and see if
-																																// one of ours.
-								continue; // It is one of ours. Keep it.
-						}
-						// Not valid, get rid of it.
-						File file = new File(indexDir, fileName);
-						if (file.isDirectory())
-							cleanDirectory(file, true);
-						else
-							file.delete();
-
-					}
-				}
-				return true;
-			}
-		}
-
-		private void cleanDirectory(File dir, boolean eraseDir) {
-			File[] files = dir.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].isDirectory())
-					cleanDirectory(files[i], true);
-				else
-					files[i].delete();
-			}
-			if (eraseDir)
-				dir.delete();
-		}
-	}
-
-	//-------------- Save Class Cache Entry Job -------------------
-	// This is write queue for class caches. It is a FIFO queue. It is sychronized so that adds/removes are controlled.
-	// Entries are ClassEntry's. The class entry has the resource that needs to be written out. It will be set to null
-	// by the job when it is written. The job will have a ClassEntry locked while it is retrieving and resetting the resource
-	// field in the entry.
-	//
-	// The process is the new cache will lock, create resource, set resource into the CE and release lock. Then add the CE to the queue
-	// and schedule the job (in case job is not running).
-	//
-	// The job will lock the CE, get resource from the CE, write it out, set it back to null, release the CE). If the resource is null,
-	// then it was already processed (this could happen if the job didn't get a chance to save it before another entry was posted
-	// and this is the second request and it was actually processed by the first request).
-	// IE:
-	// 1) resource created, queue entry added
-	// 2) 2nd req, job not processed yet, resource recreated and put back into CE, new queue entry.
-	// 3) job pulls from queue, locks ce, grabs resource, writes out the resource, sets back to null, release ce.
-	// 4) job pulls from queue. This time the resoure is null so it skips it.
-	//
-	// Need to lock Ce during entire create and write because the resource set is not reentrant so can't be writing it while creating it.
-
-	private List cacheWriteQueue = null;
-
-	void waitForCacheSaveJob() {
-		// For a full save we want to get the class cache files written too, so we need to manipulate the job to get it to finish ASAP.
-		if (cacheWriteJob != null) {
-			if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-				BeaninfoPlugin.getPlugin().getLogger().log("Forcing a cache save job to start early.", Level.FINER);
-			switch (cacheWriteJob.getState()) {
-				case Job.SLEEPING:
-					// It could be waiting a long time, so we need to wake it up at a high priority to get it running ASAP.
-					cacheWriteJob.setPriority(Job.INTERACTIVE); // Need to get it going right away
-					cacheWriteJob.wakeUp();
-					// Now drop into the wait.
-				default:
-					// Now wait for it (if not running this will return right away).
-					try {
-						cacheWriteJob.join();
-					} catch (InterruptedException e) {
-					}
-			}
-		}
-	}
-
-	static final Map SAVE_CACHE_OPTIONS;
-	static {
-		SAVE_CACHE_OPTIONS = new HashMap(3);
-		SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
-		SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-        SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_ENCODING, "UTF-8");
-	}
-
-	protected Job cacheWriteJob = null;
-	protected Adapter projectReleaseAdapter = new AdapterImpl() {
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-		 */
-		public boolean isAdapterForType(Object type) {
-			return type == BeanInfoCacheController.this;	// We're making the BeanInfoCacheController.this be the adapter type.
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (msg.getEventType() == ProjectResourceSet.SPECIAL_NOTIFICATION_TYPE && msg.getFeatureID(BeanInfoCacheController.class) == ProjectResourceSet.PROJECTRESOURCESET_ABOUT_TO_RELEASE_ID) {
-				// This is an about to be closed. If we have an active write job, bring it up to top priority and wait for it to finish.
-				// This will make sure any resources in the project are written. There may not be any waiting, but this is doing a close
-				// project, which is slow already relatively speaking, that waiting for the cache write job to finish is not bad.
-				waitForCacheSaveJob();
-			}
-		}
-	};
-
-	private void queueClassEntry(ClassEntry ce, ResourceSet rset) {
-		if (cacheWriteQueue == null) {
-			cacheWriteQueue = Collections.synchronizedList(new LinkedList());
-			cacheWriteJob = new Job("Write BeanInfo cache files") {
-
-				protected IStatus run(IProgressMonitor monitor) {
-					monitor.beginTask("", cacheWriteQueue.size() + 10); // This is actually can change during the run, so we add 10 for the heck of it.
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Starting write BeanInfo Cache files.", Level.FINER);
-					while (!monitor.isCanceled() && !cacheWriteQueue.isEmpty()) {
-						ClassEntry ce = (ClassEntry) cacheWriteQueue.remove(0); // Get first one.
-						synchronized (ce) {
-							Resource cres = ce.getPendingResource();
-							if (cres != null) {
-								try {
-									cres.save(SAVE_CACHE_OPTIONS);
-								} catch (IOException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the resource from resource set, clear out the pending.
-									cres.getResourceSet().getResources().remove(cres);
-									ce.setPendingResource(null);
-								}
-							}
-							cres = ce.getPendingOverrideResource();
-							if (cres != null) {
-								try {
-									cres.save(SAVE_CACHE_OPTIONS);
-								} catch (IOException e) {
-									BeaninfoPlugin.getPlugin().getLogger().log(e);
-								} finally {
-									// Remove the resource from resource set, clear out the pending.
-									cres.getResourceSet().getResources().remove(cres);
-									ce.setPendingOverrideResource(null);
-								}
-							}
-							
-							monitor.worked(1);
-						}
-					}
-					monitor.done();
-					if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
-						BeaninfoPlugin.getPlugin().getLogger().log("Finished write BeanInfo Cache files.", Level.FINER);
-					return Status.OK_STATUS;
-				}
-			};
-			cacheWriteJob.setPriority(Job.SHORT);
-			cacheWriteJob.setSystem(true);
-		}
-		if (rset != null && EcoreUtil.getExistingAdapter(rset, this) == null) {
-			// If it is a project resource set, then add ourselves as listeners so we know when released.
-			if (rset instanceof ProjectResourceSet)
-				rset.eAdapters().add(projectReleaseAdapter);
-		}
-		cacheWriteQueue.add(ce);
-		cacheWriteJob.schedule(60 * 1000L); // Put off for 1 minute to let other stuff go on. Not important that it happens immediately.
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
deleted file mode 100644
index 4f5dfa1..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: BeanInfoContributorAdapter.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:44:20 $ 
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.*;
-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.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
- 
-/**
- * A default implementation of IBeanInfoContributor for users to subclass. Default does nothing.
- * <p>
- * But this does supply several very useful utility methods.
- * 
- * @since 1.0.0
- */
-public class BeanInfoContributorAdapter implements IBeanInfoContributor {
-	
-	/**
-	 * An empty array of BeaninfoEntry. Available for subclasses to return if they
-	 * decide there is nothing to return.
-	 */
-	public static final BeaninfoEntry[] EMPTY_BEANINFO_ENTRIES = new BeaninfoEntry[0];
-	
-	/**
-	 * Return true if the given fragment is part of the package. Used by subclasses to determine
-	 * if a override associated with a given fragment should be used for the package.
-	 * <p>
-	 * In other words, <code>org.eclipse</code> as a fragment and and <code>org.eclipse.core</code> as
-	 * a packagePath will answer true, but if you swapped them it will answer false.
-	 * 
-	 * @param fragment
-	 * @param packagePath
-	 * @return <code>true</code> if the given fragment is a leading part of the package.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected boolean isFragment(IPath fragment, IPath packagePath) {
-		return fragment.isPrefixOf(packagePath);
-	}
-	
-	/**
-	 * Return the unmatched portion of the package path from a fragment. Used by subclasses
-	 * to get the part of the package path that is after the fragment. This is then used to
-	 * append to the path from the override to get the full path to override files for this
-	 * package.
-	 * <p>
-	 * This will return the part of the packagePath that is not matched by the fragment. 
-	 * <p>
-	 * Note: It is important that the fragment and packagePath have first been tested through
-	 * isFragment. Otherwise an invalid result will be returned.
-	 * 
-	 * @param fragment
-	 * @param packagePath
-	 * @return the part of the package path not matched.
-	 * 
-	 * @see BeanInfoContributorAdapter#isFragment(IPath, IPath)
-	 * @since 1.0.0
-	 */
-	protected String getUnmatchedPath(IPath fragment, IPath packagePath) {
-		return fragment.removeFirstSegments(packagePath.segmentCount()).toString();
-	}
-	
-	/**
-	 * Subclasses can use this helper method to get the override resource from the given (plugin) bundle. 
-	 * 
-	 * @param bundle the bundle to use.
-	 * @param relativePath path of file relative to the plugin.
-	 * @param resource set to load into.
-	 * @param runnable the runnable that is being used for the override. It is used to determine if resource already used once.
-	 * @return the resource or <code>null</code> if couldn't be loaded or if it was already used once.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected Resource loadOverrideResource(Bundle bundle, String relativePath, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable) {
-		URI uri = URI.createURI(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+relativePath);
-		if (runnable.resourceContributed(uri))
-			return null;	// Already contributed once.
-		Resource result = null;
-		try {
-			result = rset.getResource(uri, true);
-		} catch (WrappedException e) {
-			// FileNotFoundException is ok
-			if (!(e.exception() instanceof FileNotFoundException)) {
-				if (e.exception() instanceof CoreException
-					&& ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
-					// This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
-				} else {
-					BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$						
-				}
-			}
-			// In case it happened after creating resource but during load. Need to get rid of it in the finally.
-			result = null;
-			Resource res = rset.getResource(uri, false);
-			if (res != null)
-				rset.getResources().remove(res);
-		} catch (Exception e) {
-			// Couldn't load it for some reason.
-			BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
-			// In case it happened after creating resource but during load. Need to get rid of it in the finally.
-			result = null;
-			Resource res = rset.getResource(uri, false);
-			if (res != null)
-				rset.getResources().remove(res);
-		};
-		return result;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#getBeanInfoEntryContributions(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-	 */
-	public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info) {
-		return EMPTY_BEANINFO_ENTRIES;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#runOverrides(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.jem.java.JavaClass, org.eclipse.emf.ecore.resource.ResourceSet, org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable)
-	 */
-	public void runOverrides(IPath packagePath, String className, JavaClass javaClass, ResourceSet rset, IContributorOverrideRunnable runnable) {
-		// Default is do nothing
-	}
-		
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
deleted file mode 100644
index 0dbd535..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
+++ /dev/null
@@ -1,375 +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.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: BeaninfoEntry.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-/**
- * Beaninfo entry. Location of the beaninfos. Much like a standard classpath entry.
- * The BeanInfos are either in a jar or another project. They can be supplied as
- * a local file in the project, or as an external jar, or as external jar through a
- * variable, or an external jar through a plugin.
- * <p>
- * An external jar through containers is not valid because container are attached to
- * projects. they aren't standalone.
- * 
- * @version 	1.0
- * @author
- */
-public class BeaninfoEntry implements IBeaninfosDocEntry {
-
-	final static String sBeaninfo = "beaninfo"; // Beaninfo entry, shared with BeaninfosDoc. //$NON-NLS-1$
-	
-	public static final int BIE_PLUGIN = 100;	// Beaninfo jar can be found in a plugin.
-
-	static int kindFromString(String kindStr) {
-		if (kindStr == null || kindStr.length() == 0)
-			return BIE_PLUGIN;	// Default to plugin. If coming from beaninfoconfig, there should always be kind. But if coming from plugin.xml there shouldn't be one.
-		if (kindStr.equalsIgnoreCase("con"))
-			return IClasspathEntry.CPE_CONTAINER;
-		if (kindStr.equalsIgnoreCase("var")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_VARIABLE;
-		if (kindStr.equalsIgnoreCase("src")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_SOURCE;
-		if (kindStr.equalsIgnoreCase("lib")) //$NON-NLS-1$
-			return IClasspathEntry.CPE_LIBRARY;
-		if (kindStr.equalsIgnoreCase("plugin")) //$NON-NLS-1$
-			return BIE_PLUGIN;
-		return -1;
-	}
-
-	static String kindToString(int kind) {
-
-		switch (kind) {
-			case IClasspathEntry.CPE_PROJECT :
-				return "src"; // backward compatibility //$NON-NLS-1$
-			case IClasspathEntry.CPE_SOURCE :
-				return "src"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_LIBRARY :
-				return "lib"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_VARIABLE :
-				return "var"; //$NON-NLS-1$
-			case IClasspathEntry.CPE_CONTAINER:
-				return "con";
-			case BIE_PLUGIN:
-				return "plugin";	//$NON-NLS-1$
-			default :
-				return "unknown"; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Return the appropriate kind of entry when we know it is a classpath entry.
-	 */
-	public static IClasspathEntry createEntry(int kind, IPath path, IProject project, boolean isExported) {
-		switch (kind) {
-
-			case IClasspathEntry.CPE_LIBRARY :
-				if (path.isAbsolute())
-					return JavaCore.newLibraryEntry(path, null, null, isExported);
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				if (path.isAbsolute()) {
-					// must be an entry in this project or specify another project
-					String projSegment = path.segment(0);
-					if (project != null && projSegment != null && projSegment.equals(project.getName())) {
-						// this project
-						return JavaCore.newSourceEntry(path);
-					} else {
-						// another project
-						return JavaCore.newProjectEntry(path, isExported);
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_VARIABLE :
-				return JavaCore.newVariableEntry(path, null, null, isExported);
-			
-			case IClasspathEntry.CPE_CONTAINER:
-				return JavaCore.newContainerEntry(path, isExported);
-
-		}
-
-		return null;
-	}
-	/**
-	 * Read the entry in from the element.
-	 */
-	public static BeaninfoEntry readEntry(IReader reader, Object element, IProject project) {
-		String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
-		String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
-		// ensure path is absolute
-		IPath path = new Path(pathStr);
-		int kind = kindFromString(elementKind);
-		if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && kind != BIE_PLUGIN && !path.isAbsolute()) {
-			path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
-		}
-
-		// exported flag
-		String exportedString = reader.getAttribute(element, BeaninfosDoc.sExported);
-		boolean isExported = "true".equalsIgnoreCase(exportedString); //$NON-NLS-1$
-		//$NON-NLS-1$
-
-		// recreate the entry
-		IClasspathEntry cpEntry = null;
-		IPath pluginPath = null;
-		if (kind != BIE_PLUGIN) {
-			cpEntry = createEntry(kind, path, project, isExported);
-		} else {
-			if (path.isAbsolute())
-				pluginPath = path;
-			else {
-				// Kludge This should only be a plugin type if from configuration element. So we will cast to that
-				// and get the plugin id to create an absolute plugin path.
-				if (element instanceof IConfigurationElement) {
-					pluginPath = new Path('/'+((IConfigurationElement) element).getDeclaringExtension().getNamespace()).append(path);
-				} else
-					return null;	// Not valid because can't have plugin from .beaninfoconfig file.
-			}
-		}
-
-		ArrayList searchpaths = new ArrayList();
-		Object children = reader.getChildren(element);
-		int childrenLength = reader.getLength(children);
-		for (int i = 0; i < childrenLength; i++) {
-			Object child = reader.getItem(children, i);
-			if (reader.isNodeTypeElement(child)) {
-				Object entry = null;
-				if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
-					entry = SearchpathEntry.readEntry(reader, child, project, true);
-				}
-				if (entry != null)
-					searchpaths.add(entry);
-			}
-		}
-
-		if (cpEntry != null)
-			return new BeaninfoEntry(
-				cpEntry,
-				(SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
-				isExported);
-		else return new BeaninfoEntry(
-				pluginPath,
-				(SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
-				isExported);
-	}
-
-	protected IClasspathEntry entry; // Store it as a classpath entry for convienence. It is the RAW classpath entry. This is only used when pointing to something other than a plugin.
-	protected IPath pluginPath;	// When stored in a plugin, this will be set instead.
-	protected boolean isExported;
-	protected SearchpathEntry[] searchpaths;
-	
-	/**
-	 * Used when the beaninfo jar is within a plugin. In that case, the first segment
-	 * of the path is the plugin descriptor, and the rest is the path from the plugin
-	 * directory to the jar.
-	 */
-	public BeaninfoEntry(IPath pluginPath, SearchpathEntry[] searchpaths, boolean isExported) {
-		this(searchpaths, isExported);
-		this.pluginPath = pluginPath;
-	}
-
-	/**
-	 * Used when the beaninfo jar/folder is either an external jar/folder or is somewhere else
-	 * in the workspace. In that case the entry is the RAW classpath entry to that code.
-	 */
-	public BeaninfoEntry(IClasspathEntry entry, SearchpathEntry[] searchpaths, boolean isExported) {
-		this(searchpaths, isExported);
-		this.entry = entry;
-	}
-	
-	protected BeaninfoEntry(SearchpathEntry[] searchpaths, boolean isExported) {
-		this.isExported = isExported;
-		this.searchpaths = searchpaths != null ? searchpaths : new SearchpathEntry[0];
-	}
-	
-	public SearchpathEntry[] getSearchPaths() {
-		return searchpaths;
-	}
-	
-	public void setSearchPaths(SearchpathEntry[] searchpaths) {
-		this.searchpaths = searchpaths;
-	}
-	
-	public boolean isExported() {
-		return isExported;
-	}
-	
-	public void setIsExported(boolean isExported) {
-		this.isExported = isExported;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-
-		Element element = doc.createElement(sBeaninfo);
-		IPath path = null;
-		if (entry != null) {
-			element.setAttribute(BeaninfosDoc.sKind, kindToString(entry.getEntryKind()));
-			path = entry.getPath();
-			if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE && entry.getEntryKind() != IClasspathEntry.CPE_CONTAINER) {
-				// translate to project relative from absolute (unless a device path)
-				if (path.isAbsolute()) {
-					if (path.segment(0).equals(project.getFullPath().segment(0))) {
-						path = path.removeFirstSegments(1);
-						path = path.makeRelative();
-					} else {
-						path = path.makeAbsolute();
-					}
-				}
-			}
-		} else {
-			element.setAttribute(BeaninfosDoc.sKind, kindToString(BIE_PLUGIN));
-			path = pluginPath;
-		}
-
-		element.setAttribute(BeaninfosDoc.sPath, path.toString()); //$NON-NLS-1$
-		if (isExported()) {
-			element.setAttribute(BeaninfosDoc.sExported, "true"); //$NON-NLS-1$
-		}
-
-		for (int i = 0; i < searchpaths.length; i++) {
-			SearchpathEntry spe = searchpaths[i];
-			element.appendChild(spe.writeEntry(doc, project));
-		}
-
-		return element;
-	}
-	
-	/**
-	 * If this is not a plugin info, then return the classpath entry.
-	 */
-	public IClasspathEntry getClasspathEntry() {
-		return entry;
-	}
-
-	/**
-	 * Return the resolved classpaths. Each entry in the array will be either:
-	 * 1) IProject - If it is a project type entry. Want the whole project
-	 * 2) String - an absolute external path to a jar
-	 * 3) IPath - a path to a plugin jar. The first segment is the plugin id, the rest is the path relative to that plugin.
-	 *            
-	 * 
-	 * @param javaProject
-	 * @return The array of paths, or <code>null</code> if no paths.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Object[] getClasspath(IJavaProject javaProject) {
-		if (entry != null) {
-			// It is a standard CPE Entry.
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			List paths = new ArrayList(1);
-			IClasspathEntry resolvedEntry = JavaCore.getResolvedClasspathEntry(entry);
-			resolveEntry(root, paths, resolvedEntry, javaProject);
-			return paths.toArray();
-		} else if (pluginPath != null) 
-			return new Object[] {pluginPath};
-		
-		return null;
-
-	}
-	
-	private void resolveEntry(IWorkspaceRoot root, List paths, IClasspathEntry entry, IJavaProject javaProject) {
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_PROJECT :
-				IProject reqProject = (IProject) root.findMember(entry.getPath().lastSegment());
-				// Project entries only have one segment.
-				if (reqProject != null && reqProject.isOpen())
-					paths.add(reqProject);
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				reqProject = (IProject) root.findMember(entry.getPath().segment(0));
-				// Find project from the first segment.
-				IJavaProject jProject = JavaCore.create(reqProject);
-				if (jProject != null) {
-					try {
-						IPath outputLocation = jProject.getOutputLocation();
-						IResource resource = root.findMember(outputLocation);
-						if (resource != null) {
-							paths.add(resource.getLocation().toString());
-						}
-					} catch(JavaModelException e) {
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_LIBRARY :
-				IResource library = root.findMember(entry.getPath());
-				// can be external or in workspace
-				paths.add((library != null) ? library.getLocation().toString() : entry.getPath().toString());
-				break;
-				
-			case IClasspathEntry.CPE_CONTAINER:
-				try {
-					IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject);
-					if (container != null) {
-						IClasspathEntry[] entries = container.getClasspathEntries();
-						for (int i = 0; i < entries.length; i++) {
-							resolveEntry(root, paths, entries[i], javaProject);
-						}
-					}
-				} catch (JavaModelException e) {
-					BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}			
-		}
-	}
-
-	public int getKind() {
-		return entry != null ? entry.getEntryKind() : BIE_PLUGIN;
-	}
-	
-	public IPath getPath() {
-		return entry != null ? entry.getPath() : pluginPath;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other)
-			return true;
-			
-		if (!(other instanceof BeaninfoEntry))
-			return false;
-
-		// Return equal if the classpath entry is the same classpath entry or plugin path entry.
-		// The search path doesn't have any affect on the semantic equality.
-		BeaninfoEntry otherEntry = (BeaninfoEntry) other;
-		if (isExported != otherEntry.isExported)
-			return false;	
-		if (entry != null)
-			return entry.equals(otherEntry.entry);
-		
-		return pluginPath.equals(otherEntry.pluginPath);
-	}
-	
-	public int hashCode() {
-		if (entry != null)
-			return entry.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		else
-			return pluginPath.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
deleted file mode 100644
index fedc2fd..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
+++ /dev/null
@@ -1,691 +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.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: BeaninfoPlugin.java,v $
- *  $Revision: 1.14 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.JavaCore;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin.ContributorExtensionPointInfo;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class BeaninfoPlugin extends Plugin {
-	public static final String PI_BEANINFO_PLUGINID = "org.eclipse.jem.beaninfo";	// Plugin ID, used for QualifiedName. //$NON-NLS-1$
-	public static final String PI_BEANINFO_OVERRIDES = "overrides";	// ID of the overrides extension point. //$NON-NLS-1$
-	
-	private static BeaninfoPlugin BEANINFO_PLUGIN = null;
-		
-	public BeaninfoPlugin() {	
-		BEANINFO_PLUGIN = this;
-	}
-	
-	/**
-	 * Accessor method to get the singleton plugin.
-	 */
-	public static BeaninfoPlugin getPlugin() {
-		return BEANINFO_PLUGIN;
-	}
-	
-	/**
-	 * Special Override file name used when need to apply an override to a class that is at the root.
-	 * A root is one that doesn't have a super type. These are <code>java.lang.Object</code>, interfaces, and any
-	 * undefined classes (i.e. classes that don't actually exist).
-	 */
-	public static final String ROOT = "..ROOT.."; //$NON-NLS-1$
-	
-	/**
-	 * The extension used on any override file when you pass in a path through the method that takes a string.
-	 */
-	public static final String OVERRIDE_EXTENSION = ".override";	//$NON-NLS-1$
-		
-	
-	/*
-	 * List of open natures. This list is needed because on shutdown of beaninfo plugin we need
-	 * to shutdown the natures. If we don't do that there is a slight possibility of an error
-	 * because proxy plugin will shutdown and this can cause a callback into beaninfo which has
-	 * already been shutdown. It calls back through the registry listener that BeaninfoNature
-	 * added to the registry to notify that the registry is being shutdown.
-	 */
-	private List openNatures;
-	
-	private Map containerIdsToBeaninfoEntryContributions;
-	private Map pluginToBeaninfoEntryContributions;
-	private Map containerIdsToContributors;
-	private Map pluginToContributors;
-	/*
-	 * Override contributions from extension point.
-	 * ocFragments: Array of fragments paths. When a match is found for a path, the index
-	 * 		is the index into the ocContainerIds and ocPluginIds array for the contributions.
-	 * ocContainerIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
-	 * 		The second dimension is the array of contributions for that fragment, one per container id.
-	 * ocPluginIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
-	 * 		The second dimension is the array of contributions for that fragment, one per plugin id.
-	 * 
-	 * If a particular fragment doesn't have any entries of container and/or plugin, then EMPTY_OC is used for that
-	 * entry so that we don't need to check for null.
-	 * 
-	 * How this is used is for a particular path requested, the ocFragments will be searched for the fragments that
-	 * are appropriate, then the index of the entry is used to walk through the OC[] array returned from the ocContainerIds
-	 * or ocPluginIds. Each contribution would be checked to see if the container id/plugin id is in the visible classpath (through 
-	 * the info data stored in the persistent property). If it is, then the overrides from that contribution will be used.
-	 */
-	private IPath ocFragments[];
-	private OverrideContribution[][] ocContainerIds;
-	private OverrideContribution[][] ocPluginIds;
-	
-	private static final OverrideContribution[] EMPTY_OC = new OverrideContribution[0];	// Used for an empty contribution list for a fragment.
-
-	public synchronized BeaninfoEntry[] getContainerIdBeanInfos(String containerID) {
-		if (containerIdsToBeaninfoEntryContributions == null)
-			processBeanInfoContributionExtensionPoint();
-		return (BeaninfoEntry[]) containerIdsToBeaninfoEntryContributions.get(containerID);
-	}
-	
-	public synchronized BeaninfoEntry[] getPluginBeanInfos(String pluginid) {
-		if (pluginToBeaninfoEntryContributions == null)
-			processBeanInfoContributionExtensionPoint();
-		return (BeaninfoEntry[]) pluginToBeaninfoEntryContributions.get(pluginid);
-	}
-	
-	public synchronized IConfigurationElement[] getPluginContributors(String pluginid) {
-		if (pluginToContributors == null)
-			processBeanInfoContributionExtensionPoint();
-		return (IConfigurationElement[]) pluginToContributors.get(pluginid);
-	}	
-	
-	public synchronized IConfigurationElement[] getContainerIdContributors(String containerID) {
-		if (containerIdsToContributors == null)
-			processBeanInfoContributionExtensionPoint();
-		return (IConfigurationElement[]) containerIdsToContributors.get(containerID);
-	}	
-	
-	public static final String PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT = PI_BEANINFO_PLUGINID+".registrations";
-	public static final String PI_REGISTRATION = "registration";
-	public static final String PI_BEANINFO = "beaninfo"; 
-	public static final String PI_OVERRIDE = "override";
-	public static final String PI_CONTRIBUTOR = "contributor";
-	public static final String PI_PACKAGE = "package";
-	public static final String PI_PATH = "path";
-	
-	protected synchronized void processBeanInfoContributionExtensionPoint() {
-		ContributorExtensionPointInfo info = ProxyPlugin.processContributionExtensionPoint(PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT);
-		ConfigurationElementReader reader = new ConfigurationElementReader();
-		// Process the container IDs first.
-		containerIdsToBeaninfoEntryContributions = new HashMap(info.containerToContributions.size());
-		Map fragmentsToIds = new HashMap(info.containerToContributions.size());
-		for (Iterator iter = info.containerToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry= (Map.Entry) iter.next();
-			String containerid = (String) entry.getKey();
-			IConfigurationElement[] configElements = (IConfigurationElement[]) entry.getValue();
-			for (int i = 0; i < configElements.length; i++) {
-				IConfigurationElement element = configElements[i];
-				if (PI_REGISTRATION.equals(element.getName())) {
-					IConfigurationElement[] children = element.getChildren();
-					for (int j = 0; j < children.length; j++) {
-						IConfigurationElement child = children[j];
-						if (PI_BEANINFO.equals(child.getName())) {
-							// This is a beaninfo entry
-							BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
-							if (be != null)
-								addEntry(containerIdsToBeaninfoEntryContributions, containerid, be);
-						} else if (PI_OVERRIDE.equals(child.getName())) {
-							addOverrideEntry(fragmentsToIds, true, containerid, child);
-						}
-					}
-				} else if (PI_CONTRIBUTOR.equals(element.getName())) {
-						if (containerIdsToContributors == null)
-							containerIdsToContributors = new HashMap(5);	// These are rare, don't create until necessary.
-						addEntry(containerIdsToContributors, containerid, element);
-					}
-				}
-			}
-			
-		// Now go through and turn all of the contribution lists into arrays.
-		for (Iterator iter = containerIdsToBeaninfoEntryContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			entry.setValue(((List) entry.getValue()).toArray(new BeaninfoEntry[((List) entry.getValue()).size()]));
-		}
-		
-		if (containerIdsToContributors == null)
-			containerIdsToContributors = Collections.EMPTY_MAP;	// Since we don't have any.
-		else {
-			for (Iterator iter = containerIdsToContributors.entrySet().iterator(); iter.hasNext();) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
-			}			
-		}
-				
-		// Now process the plugin IDs.
-		pluginToBeaninfoEntryContributions = new HashMap(info.pluginToContributions.size());		
-		for (Iterator iter = info.pluginToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry= (Map.Entry) iter.next();
-			String pluginId = (String) entry.getKey();
-			IConfigurationElement[] configElements = (IConfigurationElement[]) entry.getValue();
-			for (int i = 0; i < configElements.length; i++) {
-				IConfigurationElement element = configElements[i];
-				if (PI_REGISTRATION.equals(element.getName())) {
-					IConfigurationElement[] children = element.getChildren();
-					for (int j = 0; j < children.length; j++) {
-						IConfigurationElement child = children[j];
-						if (PI_BEANINFO.equals(child.getName())) {
-							// This is a beaninfo entry
-							BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
-							if (be != null)
-								addEntry(pluginToBeaninfoEntryContributions, pluginId, be);
-						} else if (PI_OVERRIDE.equals(child.getName())) {
-							addOverrideEntry(fragmentsToIds, false, pluginId, child);
-						}
-					}
-				} else if (PI_CONTRIBUTOR.equals(element.getName())) {
-						if (pluginToContributors == null)
-							pluginToContributors = new HashMap(5);	// These are rare, don't create until necessary.
-						addEntry(pluginToContributors, pluginId, element);
-					}
-				}
-			}
-			
-		// Now go through and turn all of the contribution lists into arrays.
-		for (Iterator iter = pluginToBeaninfoEntryContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			entry.setValue(((List) entry.getValue()).toArray(new BeaninfoEntry[((List) entry.getValue()).size()]));
-		}
-		
-		if (pluginToContributors == null)
-				pluginToContributors = Collections.EMPTY_MAP;	// Since we don't have any.
-		else {
-			for (Iterator iter = pluginToContributors.entrySet().iterator(); iter.hasNext();) {
-				Map.Entry entry = (Map.Entry) iter.next();
-				entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
-			}			
-		}
-		
-		// Now handle the entire list of fragments.
-		ocFragments = new IPath[fragmentsToIds.size()];
-		ocContainerIds = new OverrideContribution[ocFragments.length][];
-		ocPluginIds = new OverrideContribution[ocFragments.length][];
-		Iterator iter;
-		int fragIndex;
-		for (iter = fragmentsToIds.entrySet().iterator(), fragIndex=0; iter.hasNext(); fragIndex++) {
-			Map.Entry mapEntry = (Map.Entry) iter.next();
-			ocFragments[fragIndex] = (IPath) mapEntry.getKey();
-			Map[] mapValue = (Map[]) mapEntry.getValue();
-			if (mapValue[0] == null)
-				ocContainerIds[fragIndex] = EMPTY_OC;
-			else {
-				Map containers = mapValue[0];
-				OverrideContribution[] ocContribution = ocContainerIds[fragIndex] = new OverrideContribution[containers.size()];
-				int ocIndex;
-				Iterator ocIterator;
-				for (ocIterator = containers.entrySet().iterator(), ocIndex=0; ocIterator.hasNext(); ocIndex++) {
-					Map.Entry containerEntry = (Map.Entry) ocIterator.next();
-					OverrideContribution oc = ocContribution[ocIndex] = new OverrideContribution();
-					oc.id = (String) containerEntry.getKey();
-					List[] ocLists = (List[]) containerEntry.getValue();
-					oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
-					oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
-				}
-			}
-			if (mapValue[1] == null)
-				ocPluginIds[fragIndex] = EMPTY_OC;
-			else {
-				Map plugins = mapValue[1];
-				OverrideContribution[] ocContribution = ocPluginIds[fragIndex] = new OverrideContribution[plugins.size()];
-				int ocIndex;
-				Iterator ocIterator;
-				for (ocIterator = plugins.entrySet().iterator(), ocIndex=0; ocIterator.hasNext(); ocIndex++) {
-					Map.Entry pluginEntry = (Map.Entry) ocIterator.next();
-					OverrideContribution oc = ocContribution[ocIndex] = new OverrideContribution();
-					oc.id = (String) pluginEntry.getKey();
-					List[] ocLists = (List[]) pluginEntry.getValue();
-					oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
-					oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
-				}
-			}			
-		}
-	}
-	
-	/*
-	 * Add an entry to the map. If the key doesn't exist, create an entry as an array. Then add the entry to array.
-	 */
-	private void addEntry(Map map, Object key, Object entry) {
-		List mapEntry = (List) map.get(key);
-		if (mapEntry == null) {
-			mapEntry = new ArrayList(1);
-			map.put(key, mapEntry);
-		}
-		mapEntry.add(entry);
-	}
-	
-	/*
-	 * Add an entry to the map.
-	 * id is the container/plugin id.
-	 * 
-	 * The structure of the map is:
-	 * 	key: fragment name
-	 * 	value: Map[2], where [0] is for container ids, and [1] is for plugin ids.
-	 * 		Map[x]:
-	 * 			key: container/plugin id
-	 * 			value: List[2], where [0] is list of plugin ids for the override, and [1] is list of paths for the override files relative to that plugin id.
-	 * 
-	 * After all done these maps/list will be boiled down to the arrays that will be used for lookup.
-	 */
-	private void addOverrideEntry(Map map, boolean container, Object id, IConfigurationElement entry) {
-		
-		String packageName = entry.getAttributeAsIs(PI_PACKAGE);
-		String plugin = null;
-		String pathString = entry.getAttributeAsIs(PI_PATH);
-		IPath fragment = null; 
-		if (packageName != null && packageName.length() > 0 && pathString != null && pathString.length() > 0) { 
-			fragment = new Path(packageName.replace('.', '/'));
-			if (pathString.charAt(pathString.length()-1) != '/')
-				pathString += '/';
-			if (pathString.charAt(0) != '/')
-				plugin = entry.getDeclaringExtension().getNamespace();
-			else {
-				if (pathString.length() > 4) {
-					int pend = pathString.indexOf('/', 1);
-					if (pend == -1 || pend >= pathString.length()-1)
-						return;	// invalid
-					plugin = pathString.substring(1, pend);
-					pathString = pathString.substring(pend+1);
-				} else
-					return;	// invalid
-			}
-		}
-		if (pathString.length() < 2)
-			return;	// invalid
-
-		Map[] mapEntry = (Map[]) map.get(fragment);
-		if (mapEntry == null) {
-			mapEntry = new HashMap[2];
-			map.put(fragment, mapEntry);
-		}
-		
-		if (container) {
-			if (mapEntry[0] == null)
-				mapEntry[0] = new HashMap(2);
-		} else {
-			if (mapEntry[1] == null)
-				mapEntry[1] = new HashMap(2);			
-		}
-		
-		List[] idEntry = (List[]) mapEntry[container ? 0 : 1].get(id);
-		if (idEntry == null) {
-			idEntry = new List[] {new ArrayList(1), new ArrayList(1)};
-			mapEntry[container ? 0 : 1].put(id, idEntry);
-		}
-
-		idEntry[0].add(plugin);
-		idEntry[1].add(pathString);
-	}	
-			
-	/*
-	 * This is an list of overrides that are available as a contribution for a specific fragment.
-	 * <ul>
-	 * <li>The id of this contribution. Either container or plugin id depending on which list it was in..
-	 * <li>The plugins array lists the plugin ids for all of the paths in this contribution.
-	 * <li>The paths array lists the folder path under that corresponding plugin from "pluginIds".
-	 * </ul> 
-	 * <p>
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class OverrideContribution {
-		public String id;
-		public String[] pluginIds;
-		public String[] paths;
-	}
-	
-	/**
-	 * The runnable is to used to apply override. 
-	 * <p>
-	 * This will be called in sequence for each override path found. It is send in on the apply overrides call. This
-	 * interface implementation is private.
-	 * <p>
-	 * Clients (implementers of the IBeanInfoContributor) will be passed in the subinterface <code>IContributorOverrideRunnable</code> which
-	 * inherits from this interface.
-	 * <p>
-	 * This interface is not intended to be implemented by clients. 
-	 * 
-	 * @since 1.0.0
-	 * @see BeaninfoPlugin#applyOverrides(IProject, String, String, ResourceSet, IOverrideRunnable)
-	 */
-	public interface IOverrideRunnable {
-		/**
-		 * This will be called with the directory path to use. It will be called over and over for every
-		 * override path found for a package. The path will be complete, including trailing '/'.
-		 * It will be in a URI format for a directory. The overriderunnable implementation will then append the filename call (i.e. classbeingintrospected.override) to get a complete path.
-		 * <p>
-		 * Clients (IBeanInfoContributor implementers) can call this to apply a specific override file to the current
-		 * class being processed.
-		 * 
-		 * @param overridePath the path will be complete, including trailing '/'. It will be in a URI format for a directory. The override file name (classname.override) will be appended to this and retrieved and applied.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void run(String overridePath);
-		
-		/**
-		 * This will be called with the actual resource to use. This will be called by special contributors that want
-		 * a special explicit override resource to be used.
-		 * <p>
-		 * Contributors should use the ResourceSet that was passed into them. This is so that anything java class that
-		 * the override resource points to will be found.
-		 * <p>
-		 * This resource will be automatically removed by BeanInfo after being applied. It must not be left around because
-		 * in the process of being applied it will be modified, so it could not be reused. 
-		 *  
-		 * @param overrideResource the resource to apply to the current class. NOTE: This resource WILL be removed from
-		 * the resource set it is in automatically by this call. It won't be left around because the action of apply
-		 * will actually modify the resource.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void run(Resource overrideRes);
-	}
-	
-	/**
-	 * IBeanInfoContributor runnable to use to apply overrides.
-	 * <p>
-	 * An implementation of this will be passed in to IBeanInfoContributor's so that they can call back to apply the overrides. They
-	 * should call the appropriate run method once for each override to be applied. The run can be called more than once from each IBeanInfoContributor.
-	 * <p>
-	 * It inherits from <code>IOverrideRunnable</code>, so see that for more methods to call.
-	 * <p>
-	 * This interface is not intended to be implemented by clients.
-	 * 
-	 * @see BeaninfoPlugin.IOverrideRunnable for more methods that can be called.
-	 * @since 1.0.0
-	 */
-	public interface IContributorOverrideRunnable extends IOverrideRunnable {
-		
-		/**
-		 * Tests if path has already been contributed once for the current class.
-		 * <p>
-		 * This can be called by the IBeanInfoContributor for overrides to test if the path (same path as for the IOverrideRunnable.run(String) method)
-		 * has already been contributed once for this class. It can be used to save time. However it is not necessary because
-		 * BeanInfo will not permit it to be contributed more than once for a class.
-		 * 
-		 * @param path
-		 * @return <code>true</code> if used already.
-		 * 
-		 * @see IOverrideRunnable#run(String)
-		 * @since 1.0.0
-		 */
-		public boolean pathContributed(String path);
-		
-		/**
-		 * Tests if the URI has already been contributed once for the current class.
-		 * <p>
-		 * This can be called by an IBeanInfoContributor for overrides to see if the URI (same path as the URI from the IOverrideRunnable.run(Resource) method)
-		 * has already been contributed once for this class. It can be used to save time. However, not necessary because
-		 * BeanInfo will not permit the URI to be contributed more than once for a class.
-		 * 
-		 * @param resourceURI
-		 * @return <code>true</code> if used already.
-		 * 
-		 * @see IOverrideRunnable#run(Resource)
-		 * @since 1.0.0
-		 */
-		public boolean resourceContributed(URI resourceURI);
-	}
-	
-	private static final String[] NO_PATHS = new String[0];
-	
-	/**
-	 * Return just the contributed override paths (through the BeanInfo registrations). Does not include any paths that are contributed from
-	 * IBeanInfoContributor's. This is used by the BeanInfoClassAdapter to load the overrides files into one cache file so that it can
-	 * be done at one time the next time it is needed.
-	 * 
-	 * @param project
-	 * @param packageName
-	 * @return array of path strings to the override. The files may not exist, they is just possible overrides. 
-	 * 
-	 * @since 1.1.0
-	 */
-	public String[] getOverridePaths(IProject project, String packageName) {
-		final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
-		List overridePaths = new ArrayList();
-		try {
-			IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
-			if (info == null) {
-				// It hasn't been created yet, so we need to create our own internal version here.
-				info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));					
-				BeaninfoNature.computeBeanInfoConfigInfo(info);
-			}
-			synchronized (this) {
-				if (ocFragments == null)
-					processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
-			}
-			for (int fragmentIndex = 0; fragmentIndex < ocFragments.length; fragmentIndex++) {
-				if (ocFragments[fragmentIndex].isPrefixOf(packagePath)) {
-					String leftOver = null;	// The left over portion of the package. This will be set first time needed. 
-					OverrideContribution[] cntrContributions = ocContainerIds[fragmentIndex];
-					for (int ocindex = 0; ocindex < cntrContributions.length; ocindex++) {
-						OverrideContribution contribution = cntrContributions[ocindex];
-						Boolean visible = (Boolean) info.getContainerIds().get(contribution.id);
-						if (visible != null && visible.booleanValue()) {
-							for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
-								// Because of URIConverters and normalization in org.eclipse.jem.util stuff, we
-								// need to have plugin uri's in the form "platform:/plugin/pluginname".
-								// Bundle's don't return this format. They return bundle:/stuff
-								// So we will simple create it of the platform:/plugin format.
-								// To save time, we will first see if we have the bundle.
-								Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
-								if (bundle != null) {
-									if (leftOver == null)
-										leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
-									overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver);
-								}
-							}
-						}
-					}
-					
-					OverrideContribution[] pluginContributions = ocPluginIds[fragmentIndex];
-					for (int ocindex = 0; ocindex < pluginContributions.length; ocindex++) {
-						OverrideContribution contribution = pluginContributions[ocindex];
-						Boolean visible = (Boolean) info.getPluginIds().get(contribution.id);
-						if (visible != null && visible.booleanValue()) {
-							for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
-								Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
-								if (bundle != null) {
-									if (leftOver == null)
-										leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
-									overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver);
-								}
-							}
-						}
-					}
-				}
-			}
-		} catch (CoreException e) {
-			getLogger().log(e, Level.INFO);
-		}
-		return overridePaths.isEmpty() ? NO_PATHS : (String[]) overridePaths.toArray(new String[overridePaths.size()]);
-	}
-	
-	/**
-	 * Apply the runnable to all of the override paths that are applicable to the 
-	 * given package name. It will run through the explicit contributors and the IContainers that implement IBeanInfoContributor.
-	 * <p>
-	 * The package name uses '.' to delineate the fragments of the name,
-	 * i.e. use "<code>java.lang</code>" as a package name.
-	 * <p>
-	 * Note: This is not meant to be called by clients. It is public only because an internal class in another package needs to call it.
-	 * TODO This should be package-protected. Later the other class will be moved into this package.
-	 * 
-	 * @param project the project to run against.
-	 * @param packageName
-	 * @param className class name of the class that is being overridden.
-	 * @param javaClass the java class the overrides will be applied to.
-	 * @param resource set that contributors can use to temporarily load dynamic override files.
-	 * @param runnable use this runnable to actually apply overrides.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void applyOverrides(final IProject project, String packageName, final String className, final JavaClass javaClass, final ResourceSet rset, final IOverrideRunnable runnable) {
-		final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
-		try {
-			IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
-			if (info == null) {
-				// It hasn't been created yet, so we need to create our own internal version here.
-				info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));					
-				BeaninfoNature.computeBeanInfoConfigInfo(info);
-			}
-			final IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) project.getSessionProperty(BeaninfoNature.BEANINFO_CONTRIBUTORS_SESSION_KEY);
-			synchronized (this) {
-				if (ocFragments == null)
-					processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
-			}
-
-			final Set usedPaths = new HashSet(10);	// Set of used paths. So that the contributors don't supply a path already used. This could cause problems if they did.
-			final IContributorOverrideRunnable contribRunnable = new IContributorOverrideRunnable() {
-				public void run(String overridePath) {
-					if (!usedPaths.contains(overridePath)) {
-						usedPaths.add(overridePath);
-						runnable.run(overridePath);
-					}
-				}
-				
-				public void run(Resource overrideRes) {
-					if (!usedPaths.contains(overrideRes.getURI())) {
-						usedPaths.add(overrideRes.getURI());
-						try {
-							runnable.run(overrideRes);
-						} finally {
-							overrideRes.getResourceSet().getResources().remove(overrideRes);
-						}
-					}
-				}
-				
-				public boolean pathContributed(String path) {
-					return usedPaths.contains(path);
-				}
-				
-				public boolean resourceContributed(URI resourceURI) {
-					return usedPaths.contains(resourceURI);
-				}
-			};
-			
-			// Run through the containers that implement IBeanInfoContributor.
-			for (Iterator iter = info.getContainers().entrySet().iterator(); iter.hasNext();) {
-				Map.Entry mapEntry = (Map.Entry) iter.next();
-				final IClasspathContainer container = (IClasspathContainer) mapEntry.getKey();
-				if (container instanceof IBeanInfoContributor && ((Boolean) mapEntry.getValue()).booleanValue()) {
-					Platform.run(new ISafeRunnable() {
-						public void handleException(Throwable exception) {
-							// Standard run logs to .log
-						}
-						public void run() throws Exception {
-							((IBeanInfoContributor) container).runOverrides(packagePath, className, javaClass, rset, contribRunnable);						
-						}
-					});
-				}
-			}
-			
-			// Run through the explicit contributors.
-			for (int i=0; i<explicitContributors.length; i++) {
-				final int ii = i;
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Standard run logs to .log
-					}
-					public void run() throws Exception {
-						explicitContributors[ii].runOverrides(packagePath, className, javaClass, rset, contribRunnable);						
-					}
-				});
-			}			
-		} catch (CoreException e) {
-			getLogger().log(e, Level.INFO);
-		}
-	}
-	
-	private String getLeftOver(IPath fragment, IPath packagePath) {
-		return packagePath.removeFirstSegments(fragment.segmentCount()).toString();
-	}
-	
-	private Logger logger;
-	public Logger getLogger() {
-		if (logger == null)
-			logger = EclipseLogger.getEclipseLogger(this);
-		return logger;
-	}
-	
-	/**
-	 * Add that a BeanInfo nature is active. This is used to tell it to shutdown when beaninfo shuts down.
-	 * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	public void addBeanInfoNature(BeaninfoNature nature) {
-		if (openNatures == null)
-			openNatures = new ArrayList();
-		openNatures.add(nature);
-	}
-	
-	/**
-	 * Mark that a BeanInfo nature is not active. This is used to tell it to shutdown when beaninfo shuts down.
-	 * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
-	 * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
-	 * 
-	 * @param nature
-	 * 
-	 * @since 1.0.0
-	 */
-	public void removeBeanInfoNature(BeaninfoNature nature) {
-		if (openNatures != null)
-			openNatures.remove(nature);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		if (openNatures != null) {
-			for (int i = 0; i < openNatures.size(); i++) {
-				BeaninfoNature nature = (BeaninfoNature) openNatures.get(i);
-				nature.shutdown();
-			}
-		}
-			
-		super.stop(context);
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
deleted file mode 100644
index 1c62978..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
+++ /dev/null
@@ -1,79 +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.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: BeaninfoRegistration.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * This is the registration information for registered beaninfos in the BeaninfoPlugin.
- * @version 	1.0
- * @author
- */
-public class BeaninfoRegistration {
-	
-	protected BeaninfosDoc doc;
-	protected IConfigurationElement variableElement;	// This is used to get contributor element. If null, then no contributor.
-	
-	public BeaninfoRegistration() {
-	}
-	
-	/**
-	 * Construct with a BeaninfosDoc
-	 */
-	public BeaninfoRegistration(BeaninfosDoc doc) {
-		this.doc = doc;
-	}
-	
-	/**
-	 * Construct with a BeaninfosDoc and variable element.
-	 */
-	public BeaninfoRegistration(BeaninfosDoc doc, IConfigurationElement variableElement) {
-		this.doc = doc;
-		this.variableElement = variableElement;
-	}	
-
-	/**
-	 * Gets the doc.
-	 * @return Returns a BeaninfosDoc
-	 */
-	public BeaninfosDoc getDoc() {
-		return doc;
-	}
-
-	/**
-	 * Sets the doc.
-	 * @param doc The doc to set
-	 */
-	public void setDoc(BeaninfosDoc doc) {
-		this.doc = doc;
-	}
-
-	/**
-	 * Gets the variableElement.
-	 * @return Returns a IConfigurationElement
-	 */
-	public IConfigurationElement getVariableElement() {
-		return variableElement;
-	}
-
-	/**
-	 * Sets the variableElement.
-	 * @param variableElement The variableElement to set
-	 */
-	public void setVariableElement(IConfigurationElement variableElement) {
-		this.variableElement = variableElement;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
deleted file mode 100644
index 08c3028..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
+++ /dev/null
@@ -1,87 +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.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: BeaninfosDoc.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $ 
- */
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-/**
- * Beaninfos document in-memory format.
- */
-
-public class BeaninfosDoc implements IBeaninfosDocEntry {
-
-	protected IBeaninfosDocEntry[] searchpath;
-
-	static final String sExported = "exported"; //$NON-NLS-1$
-
-	static final String sKind = "kind"; //$NON-NLS-1$
-
-	static final String sPath = "path"; //$NON-NLS-1$
-
-	public BeaninfosDoc() {
-	}
-
-	public BeaninfosDoc(IBeaninfosDocEntry[] searchpath) {
-		this.searchpath = searchpath;
-	}
-
-	public int getKind() {
-		return -1;	// N.A.
-	}
-	
-	public IPath getPath() {
-		return null;	// N.A.
-	}
-	
-	public static BeaninfosDoc readEntry(IReader reader, Object root, IProject project) {
-		ArrayList paths = new ArrayList();
-		Object children = reader.getChildren(root);
-		int childrenLength = reader.getLength(children);
-		for (int i = 0; i < childrenLength; i++) {
-			Object child = reader.getItem(children, i);
-			if (reader.isNodeTypeElement(child)) {
-				Object entry = null;
-				if (reader.getNodeName(child).equalsIgnoreCase(BeaninfoEntry.sBeaninfo)) {
-					entry = BeaninfoEntry.readEntry(reader, child, project);
-				} else if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
-					entry = SearchpathEntry.readEntry(reader, child, project, false);
-				}
-				if (entry != null)
-					paths.add(entry);
-			}
-		}
-		return new BeaninfosDoc((IBeaninfosDocEntry[]) paths.toArray(new IBeaninfosDocEntry[paths.size()]));
-	}
-
-	public IBeaninfosDocEntry[] getSearchpath() {
-		return searchpath;
-	}
-
-	public void setSearchpath(IBeaninfosDocEntry[] searchpath) {
-		this.searchpath = searchpath;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-		Element root = doc.createElement(SearchpathEntry.sSearchpath); // Create Root Element
-		for (int i = 0; i < searchpath.length; i++) {
-			root.appendChild(searchpath[i].writeEntry(doc, project)); // Add to the document
-		}
-		return root;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
deleted file mode 100644
index c9ccb12..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: ConfigurationElementReader.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import java.lang.reflect.Array;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-
-/**
- * For reading from IConfigurationElements
- * @version 	1.0
- * @author
- */
-class ConfigurationElementReader implements IReader {
-
-	/*
-	 * @see IReader#getChildren(Object)
-	 */
-	public Object getChildren(Object node) {
-		return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getChildren() : new IConfigurationElement[0];
-	}
-
-	/*
-	 * @see IReader#getLength(Object)
-	 */
-	public int getLength(Object nodeList) {
-		return (nodeList instanceof IConfigurationElement[]) ? Array.getLength(nodeList) : 0;
-	}
-
-	/*
-	 * @see IReader#getItem(Object, int)
-	 */
-	public Object getItem(Object nodeList, int index) {
-		return (nodeList instanceof IConfigurationElement[]) ? Array.get(nodeList, index) : null;
-	}
-
-	/*
-	 * @see IReader#isNodeTypeElement(Object)
-	 */
-	public boolean isNodeTypeElement(Object node) {
-		return node instanceof IConfigurationElement;
-	}
-
-	/*
-	 * @see IReader#getNodeName(Object)
-	 */
-	public String getNodeName(Object node) {
-		return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getName() : ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * @see IReader#getAttribute(Object, String)
-	 */
-	public String getAttribute(Object element, String attributeName) {
-		return (element instanceof IConfigurationElement) ? ((IConfigurationElement) element).getAttributeAsIs(attributeName) : null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
deleted file mode 100644
index 838dfad..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IBeanInfoContributor.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:44:20 $ 
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
- 
-/**
- * Interface for BeanInfo contributors. Supplied either as additional interface on a IClasspathContainer, or as
- * an explicit contributor for BeanInfos from the manifest files.
- * <p>
- * Implementations of this interface allows a dynamic supply of BeanInfo contributions (beaninfo jars and search paths)
- * and override files. This is used when the default plugin extension mechanism is too static for the requirements. 
- * <p>
- * There is a very useful default implementation (<code>BeanInfoContributorAdapter</code>) that can be subclassed. The
- * default doesn't do anything on its own. But it does have a very useful utility method for loading resources.
- * 
- * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoContributorAdapter
- * @since 1.0.0
- */
-public interface IBeanInfoContributor {
-	
-	/**
-	 * Return the BeanInfoEntry contributions that are needed.
-	 * <p>
-	 * This will be called by BeanInfo when it determines that this contributor is applicable 
-	 * for the current project being processed. BeaninfoEntry's define the BeanInfo jars and search paths to use.
-	 * 
-	 * @param info
-	 * @return BeanInfo contributions or <code>null</code> if none to contribute.
-	 * 
-	 * @since 1.0.0
-	 */
-	public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info);
-	
-	/**
-	 * For the given package path run the override contributions through the runnable.
-	 * <p>
-	 * This will be called by BeanInfo when it determines that this
-	 * contributor is applicable for the current project being processed.
-	 * <p>
-	 * Implementations must call the runnable (the argument <code>runnable</code>) for each override file that is to be applied to the incoming class.
-	 * You can either call the run method that passes in a string pointing to a directory where your override file is
-	 * located (i.e. <code>overrideFileName.override</code> where "overrideFileName" is the name passed. Or you can call the run method that 
-	 * takes a Resource that is already loaded (and maybe modified or created locally).
-	 * 
-	 * @param packagePath
-	 * @param overrideFileName the overrideFileName that the overrides is for. This can be used in very special cases to provide 
-	 * exact override files instead of letting the path be searched. An example would be for providing a file that isn't the same name as the class.
-	 * A very special case is <code>ROOT</code>. This is used when asking to apply root overrides to classes that have no 
-	 * super type. 
-	 * @param javaClass the java class that the overrides will be applied to. Note: Do not call any property, features, events, or operations calls
-	 * or any property, events, or operations Utilities against this class. That is because this class is being introspected at this time
-	 * and those calls will return invalid values if called at this point since introspection is not yet complete. 
-	 * @param resource set that contributors can use to temporarily load dynamic override files.
-	 * @param runnable the runnable that you call to actually apply the override files.
-	 * 
-	 * @see BeaninfoPlugin#ROOT
-	 * @see BeaninfoPlugin#OVERRIDE_EXTENSION
-	 * @since 1.0.0
-	 */
-	public void runOverrides(IPath packagePath, String overrideFileName, JavaClass javaClass, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable);
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java
deleted file mode 100644
index 61225d7..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.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.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: IBeaninfoSupplier.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-
-import org.eclipse.core.resources.IProject;
-
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-/**
- * Interface to supply information for beaninfo to decouple
- * the introspection from the desktop.
- */
-
-public interface IBeaninfoSupplier {
-	
-	/**
-	 * @return Return the registry to use. Initialize it if not already initialized.
-	 */
-	public ProxyFactoryRegistry getRegistry();
-	
-	/**
-	 * Used to know if we currently have a registry created in the supplier.
-	 * 
-	 * @return true if there is a registry currently in the supplier.
-	 */
-	public boolean isRegistryCreated();
-	
-	/**
-	 * Close the registry. This tells the registry to close. This is necessary
-	 * at times because of changes to classes require the registry to be
-	 * reconstructed.
-	 */
-	public void closeRegistry();
-	
-	/**
-	 * Return the project that this supplier is for.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IProject getProject();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
deleted file mode 100644
index fa3af7f..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: IBeaninfosDocEntry.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Interface for DOM Doc writable entries.
- * 
- * @version 	1.0
- * @author
- */
-public interface IBeaninfosDocEntry {
-	public Node writeEntry(Document doc, IProject project);
-	
-	public int getKind();
-	public IPath getPath();
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
deleted file mode 100644
index 0659d1e..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: Init.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:44:20 $ 
- */
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-
-/**
- * Static initializer class to initialize the beaninfo stuff.
- * It is disconnected from the desktop and so doesn't require it.
- */
-
-public class Init {
-	
-	// So it can't be instantiated.
-	private Init() {
-	};
-
-	/**
-	 * Initialize the context with an IBeaninfoSupplier, used to set up the
-	 * introspection process. 
-	 *
-	 * The beaninfo supplier is responsible for setting up the bean info search path,
-	 * including removing the sun beaninfos, if desired.
-	 */
-	public static void initialize(ResourceSet rset, final IBeaninfoSupplier supplier) {
-		rset.getAdapterFactories().add(new BeaninfoAdapterFactory(supplier));
-	}
-
-	/**
-	 * Initialize the registry now that it is available.
-	 */
-	public static void initialize(ProxyFactoryRegistry registry) {
-		// Remove the "sun.beans.info" from the beaninfo search path because
-		// we completely override the sun bean infos.
-		Utilities.removeBeanInfoPath(registry, "sun.beans.infos"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Cleanup from the context because we are being removed.
-	 * If clearResults is true, then the factory should clear the results of introspection
-	 * from the everything because the context will still be around.
-	 */
-	public static void cleanup(ResourceSet rset, boolean clearResults) {
-		BeaninfoAdapterFactory factory =
-			(BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(rset.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY);
-		rset.getAdapterFactories().remove(factory);
-		if (factory != null)
-			factory.closeAll(clearResults);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
deleted file mode 100644
index f9494da..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
+++ /dev/null
@@ -1,189 +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.jem.internal.beaninfo.core;
-/*
- *  $RCSfile: SearchpathEntry.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.w3c.dom.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-/**
- * Searchpath entry. Beaninfo searchpath entry (i.e. package name). Can include
- * kind/path/exported if not a child of the BeaninfoEntry.
- * 
- * Note: if not a child of a BeanInfoEntry, then the path refers to a package
- * in the classpath, so container is supported here.
- * 
- * @version 	1.0
- * @author
- */
-public class SearchpathEntry implements IBeaninfosDocEntry {
-
-	final static String sSearchpath = "searchpath"; // Searchpath entry, shared with BeaninfosDoc. //$NON-NLS-1$
-	final static String sPackage = "package"; // Package name. //$NON-NLS-1$
-
-	/**
-	 * Read the entry in from the element.
-	 */
-	public static SearchpathEntry readEntry(IReader reader, Object element, IProject project, boolean beaninfoChild) {
-		String packageName = reader.getAttribute(element, sPackage);
-		if (beaninfoChild)
-			return new SearchpathEntry(packageName); // Kind/path aren't valid on beaninfo children.
-
-		String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
-		String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
-		int kind = BeaninfoEntry.kindFromString(elementKind);		
-		IPath path = null;
-		if (pathStr != null) {
-			// ensure path is absolute
-			path = new Path(pathStr);
-			if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && !path.isAbsolute()) {
-				path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
-			}
-		}
-
-		// create the appropriate entry
-		boolean valid = true;
-		switch (kind) {
-
-			case IClasspathEntry.CPE_LIBRARY :
-				valid = path != null && path.isAbsolute();
-				break;
-
-			case IClasspathEntry.CPE_SOURCE :
-				if (path == null)
-					valid = false;
-				else if (path.isAbsolute()) {
-					// must be an entry in this project or specify another project
-					String projSegment = path.segment(0);
-					if (project == null || projSegment == null || !projSegment.equals(project.getName())) {
-						// another project
-						kind = IClasspathEntry.CPE_PROJECT;
-					}
-				}
-				break;
-
-			case IClasspathEntry.CPE_VARIABLE :
-			case IClasspathEntry.CPE_CONTAINER:				
-				break;
-
-			default :
-				valid = false;
-				break;
-		}
-
-		if (valid)
-			return new SearchpathEntry(kind, path, packageName);
-		else
-			return null;
-
-	}
-
-	protected int kind = -1; // Under Beaninfo entry, these don't have kind/path's.
-	protected IPath path;	// Path can be null if under beaninfo entry
-	protected String packageName;	// Packagename can be null if kind/path refer to a project or registered variable.
-	protected boolean isExported;
-
-	public SearchpathEntry(int kind, IPath path, String packageName) {
-		this.kind = kind;
-		this.path = path;
-		this.packageName = packageName;
-	}
-
-	public SearchpathEntry(String packageName) {
-		this.packageName = packageName;
-	}
-
-	public int getKind() {
-		return kind;
-	}
-	
-	public IPath getPath() {
-		return path;
-	}
-
-	public String getPackage() {
-		return packageName;
-	}
-
-	public Node writeEntry(Document doc, IProject project) {
-
-		Element element = doc.createElement(sSearchpath);
-		if (kind != -1) {
-			// A non-beaninfo child
-			element.setAttribute(BeaninfosDoc.sKind, BeaninfoEntry.kindToString(kind));
-			IPath tPath = path;
-			if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER) {
-				// translate to project relative from absolute (unless a device path)
-				if (tPath.isAbsolute()) {
-					if (tPath.segment(0).equals(project.getFullPath().segment(0))) {
-						tPath = tPath.removeFirstSegments(1);
-						tPath = tPath.makeRelative();
-					} else {
-						tPath = tPath.makeAbsolute();
-					}
-				}
-			}
-
-			element.setAttribute(BeaninfosDoc.sPath, tPath.toString());
-		}
-		if (packageName != null)
-			element.setAttribute(sPackage, packageName);
-		return element;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other)
-			return true;
-			
-		if (!(other instanceof SearchpathEntry))
-			return false;
-	
-		SearchpathEntry otherEntry = (SearchpathEntry) other;
-		if (kind != otherEntry.kind)
-			return false;
-			
-		if (path == null)
-			if (otherEntry.path != null)
-				return false;
-			else
-				;
-		else if (!path.equals(otherEntry.path))
-			return false;
-			
-		if (packageName == null)
-			if (otherEntry.packageName != null)
-				return false;
-			else
-				;
-		else if (!packageName.equals(otherEntry.packageName))
-			return false;
-			
-		return true;
-	}
-	
-	public int hashCode() {
-		int hashCode = kind;
-		if (path != null)
-			hashCode ^= path.hashCode();
-		if (packageName != null)
-			hashCode ^= packageName.hashCode();
-		return hashCode;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
deleted file mode 100644
index dac64cb..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.beaninfo.core;
-/*
- *  $RCSfile: Utilities.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:44:20 $ 
- */
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoProxyConstants;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * Beaninfo (introspection) utilities methods
- */
-
-public final class Utilities {
-	
-	private Utilities() {
-	}
-
-	/**
-	 * Utility to return the class as a JavaClass. If it actually is a JavaType this will
-	 * fail with a ClassCastException.
-	 * @param className
-	 * @param rset
-	 * @return java class
-	 * 
-	 * @throws ClassCastException if not a java class, but instead a java primitive.
-	 * @since 1.1.0
-	 */
-	public static JavaClass getJavaClass(String className, ResourceSet rset) {
-		return (JavaClass) getJavaType(className, rset);
-	}
-	
-	/**
-	 * Utility to return the class as a JavaHelpers.
-	 * 
-	 * @param className
-	 * @param rset
-	 * @return java helpers.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static JavaHelpers getJavaType(String className, ResourceSet rset) {
-		return (JavaHelpers) rset.getEObject(getJavaClassURI(className), true);
-	}
-	
-	/**
-	 * Create a URI to the given classname.
-	 * <p>
-	 * Note: It must be in normal form, i.e. fully-qualified, if primitive spelled out (e.g. "int" not I), and if
-	 * arrays it must readable form (e.g. "new java.lang.String[]" and not "[Ljava.lang.String;").
-	 * 
-	 * @param className
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getJavaClassURI(String className) {
-		return URI.createURI((new JavaURL(className)).getFullString());
-	}
-
-	/** 
-	 * Utility to return the EClassifier from the given IBeanTypeProxy.
-	 */
-	public static EClassifier getJavaClass(IBeanTypeProxy type, ResourceSet rset) {
-		if (type != null) {
-			return getJavaType(type.getFormalTypeName(), rset);
-		} else
-			return null;
-	}
-
-	/**
-	 * Utility to return the Method from the given IMethodProxy.
-	 */
-	public static Method getMethod(IMethodProxy method, ResourceSet rset) {
-		return method != null ? (Method) rset.getEObject(URI.createURI(getMethodURL(method)), true) : null;
-	}
-
-	/**
-	 * Answer the URL String for Method from the given IMethodProxy
-	 */
-	public static String getMethodURL(IMethodProxy method) {
-		String className = method.getClassType().getTypeName();
-		IBeanTypeProxy[] parms = method.getParameterTypes();
-		String[] parmTypes = parms.length > 0 ? new String[parms.length] : null;
-		for (int i = 0; i < parms.length; i++) {
-			parmTypes[i] = parms[i].getFormalTypeName();
-		}
-		return computeMethodURL(className, method.getName(), parmTypes);
-	}
-	
-	protected static String computeMethodURL(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
-		int classStart = fullyQualifiedClassName.lastIndexOf('.');
-		StringBuffer url = new StringBuffer(50);
-		url.append("java:/"); //$NON-NLS-1$
-		if (classStart > -1)
-			url.append(fullyQualifiedClassName.substring(0, classStart));
-		url.append('#');
-		url.append(computeMethodID(fullyQualifiedClassName.substring(classStart + 1), methodName, parmTypes));
-		return url.toString();
-	}
-	
-	protected static String computeFieldURL(String fullyQualifiedClassName, String fieldName) {
-		int classStart = fullyQualifiedClassName.lastIndexOf('.');
-		StringBuffer url = new StringBuffer(50);
-		url.append("java:/"); //$NON-NLS-1$
-		if (classStart > -1)
-			url.append(fullyQualifiedClassName.substring(0, classStart));
-		url.append('#');
-		url.append(fullyQualifiedClassName.substring(classStart + 1));
-		url.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-		url.append(fieldName);
-		return url.toString();
-	}
-	
-	/**
-	 * Return the field uri for the given classname, fieldname.
-	 * @param fullyQualifiedClassName
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getFieldURI(String fullyQualifiedClassName, String fieldName) {
-		return URI.createURI(computeFieldURL(fullyQualifiedClassName, fieldName));
-	}
-	/**
-	 * Return the method uri for the given classname, methodname, parm types.
-	 * @param fullyQualifiedClassName
-	 * @param methodName
-	 * @param parmTypes <code>null</code> if there are no parms.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static URI getMethodURI(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
-		return URI.createURI(computeMethodURL(fullyQualifiedClassName, methodName, parmTypes));
-	}
-
-	/**
-	 * Turn it into an URI.
-	 */
-	public static URI getMethodURI(IMethodProxy method) {
-		return URI.createURI(getMethodURL(method));
-	}
-
-	/**
-	 * Utility to compute the Java Modeling METHODID from method declaring class name,
-	 * method name, and parameter class names.
-	 */
-	public static String computeMethodID(String className, String methodName, String[] parameterTypes) {
-		StringBuffer out = new StringBuffer(50);
-		out.append(className);
-		out.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
-		out.append(methodName);
-		out.append(ReflectionAdaptor.C_METHOD_PARM_DELIMITER);
-		if (parameterTypes != null)
-			for (int i = 0; i < parameterTypes.length; i++) {
-				out.append(parameterTypes[i]);
-				if (i < parameterTypes.length - 1)
-					out.append(ReflectionAdaptor.C_PARM_PARM_DELIMITER);
-			}
-		if (className.equals(methodName))
-			out.append(ReflectionAdaptor.S_CONSTRUCTOR_TOKEN); //It's a constructor
-		return out.toString();
-	}
-
-	/**
-	 * Utility to retrieve the BeanDecorator.
-	 */
-	public static BeanDecorator getBeanDecorator(EModelElement model) {
-		return (BeanDecorator) getDecorator(model, BeanDecorator.class);
-	}
-	/**
-	 * Utility to retrieve a decorator of the specified class.
-	 */
-	public static EAnnotation getDecorator(EModelElement model, Class decoratorClass) {
-		Iterator itr = model.getEAnnotations().iterator();
-		while (itr.hasNext()) {
-			EAnnotation decr = (EAnnotation) itr.next();
-			if (decoratorClass.isInstance(decr))
-				return decr;
-		}
-		return null;
-	}
-
-	/**
-	 * Utility to retrieve the EventSetDecorator.
-	 */
-	public static EventSetDecorator getEventSetDecorator(EModelElement model) {
-		return (EventSetDecorator) getDecorator(model, EventSetDecorator.class);
-	}
-
-	/**
-	 * Utility to retrieve the MethodDecorator.
-	 */
-	public static MethodDecorator getMethodDecorator(EModelElement model) {
-		return (MethodDecorator) getDecorator(model, MethodDecorator.class);
-	}
-
-	/**
-	 * Utility to retrieve the PropertyDecorator.
-	 */
-	public static PropertyDecorator getPropertyDecorator(EModelElement model) {
-		return (PropertyDecorator) getDecorator(model, PropertyDecorator.class);
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the property decorators
-	 * of only the properties in the EList passed in. If the property does not have a
-	 * property decorator, then it is not a beaninfo property.
-	 */
-	public static Iterator getPropertiesIterator(final EList properties) {
-		return new Iterator() {
-			private Iterator itr = properties.iterator();
-			private boolean hasNext = true;
-			private PropertyDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				PropertyDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getPropertyDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the EventSet decorators
-	 * of only the BeanEvents in the EList passed in.
-	 */
-	public static Iterator getEventSetsIterator(final EList events) {
-		return new Iterator() {
-			private Iterator itr = events.iterator();
-			private boolean hasNext = true;
-			private EventSetDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				EventSetDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getEventSetDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Utility to return an iterator on the list which will return the Method decorators
-	 * of only the Methods in the EList passed in.
-	 */
-	public static Iterator getMethodsIterator(final EList methods) {
-		return new Iterator() {
-			private Iterator itr = methods.iterator();
-			private boolean hasNext = true;
-			private MethodDecorator next;
-			{
-				findNext();
-			}
-			public boolean hasNext() {
-				return hasNext;
-			}
-
-			public Object next() {
-				MethodDecorator temp = next;
-				findNext();
-				return temp;
-			}
-
-			public void remove() {
-				throw new UnsupportedOperationException();
-			}
-
-			private void findNext() {
-				while (itr.hasNext()) {
-					EModelElement nextOne = (EModelElement) itr.next();
-					next = getMethodDecorator(nextOne);
-					if (next != null) {
-						return;
-					}
-				}
-				hasNext = false;
-			}
-		};
-	}
-
-	/**
-	 * Get the search path from the remote vm. 
-	 * 
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).
-	 */
-	public static IArrayBeanProxy getBeanInfoSearchPath(ProxyFactoryRegistry registry) {
-		return (IArrayBeanProxy) BeaninfoProxyConstants
-			.getConstants(registry)
-			.getGetBeanInfoSearchPathProxy()
-			.invokeCatchThrowableExceptions(
-			null);
-	}
-
-	/**
-	 * Set the search path to the array of strings passed in on the remote vm.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 
-	 */
-	public static void setBeanInfoSearchPath(ProxyFactoryRegistry registry, String[] paths) {
-
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			JavaStandardBeanProxyConstants jConstants = JavaStandardBeanProxyConstants.getConstants(registry);
-			IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
-			IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(jConstants.getStringType(), paths != null ? paths.length : 0);
-			if (paths != null)
-				for (int i = 0; i < paths.length; i++)
-					newPath.set(proxyFactory.createBeanProxyWith(paths[i]), i);
-			biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-		} catch (ThrowableProxy e) {
-		}
-	}
-
-	/**
-	 * From the Beaninfo Nature, insert a path to the beaninfo path at the given index, -1 means at the end.
-	 * If index is larger than the current path, it will also add at the end.
-	 */
-	public static void insertBeanInfoSearchPath(BeaninfoNature nature, IBeaninfosDocEntry path, int index) throws CoreException {
-		BeaninfosDoc infoPath = nature.getSearchPath();
-		IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
-		IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length + 1];
-
-		if (index == -1 || index >= oldPath.length) {
-			// At the end or past end
-			System.arraycopy(oldPath, 0, newPath, 0, oldPath.length);
-			newPath[oldPath.length] = path;
-		} else {
-			// In the middle
-			System.arraycopy(oldPath, 0, newPath, 0, index);
-			newPath[index] = path;
-			System.arraycopy(oldPath, index, newPath, index + 1, oldPath.length - index);
-		}
-
-		infoPath.setSearchpath(newPath);
-		nature.setSearchPath(infoPath);
-	}
-
-	/**
-	 * Insert a path to the beaninfo path at the given index, -1 means at the end.
-	 * If index is larger than the current path, it will also add at the end.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 
-	 */
-	public static void insertBeanInfoSearchPath(ProxyFactoryRegistry registry, String path, int index) {
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
-			int pathLength = infoPath.getLength();
-
-			IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
-
-			IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(infoPath.getTypeProxy(), pathLength + 1);
-			IBeanProxy stringProxy = proxyFactory.createBeanProxyWith(path);
-
-			JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
-			if (index == -1 || index >= pathLength) {
-				// At the end or past end
-				constants.arraycopy(infoPath, 0, newPath, 0, infoPath.getLength());
-				newPath.set(stringProxy, pathLength);
-			} else {
-				// In the middle
-				constants.arraycopy(infoPath, 0, newPath, 0, index);
-				newPath.set(stringProxy, index);
-				constants.arraycopy(infoPath, index, newPath, index + 1, pathLength - index);
-			}
-
-			biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-		} catch (ThrowableProxy e) {
-		}
-	}
-
-	/**
-	 * From the Beaninfo Nature, remove the specified path from the beaninfo search path.
-	 * Not an error if not found.
-	 */
-	public static void removeBeanInfoPath(BeaninfoNature nature, IBeaninfosDocEntry path) throws CoreException {
-		BeaninfosDoc infoPath = nature.getSearchPath();
-		IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
-		for (int i = 0; i < oldPath.length; i++) {
-			if (path.equals(oldPath[i])) {
-				// We found it, so remove it.
-				IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length - 1];
-				System.arraycopy(oldPath, 0, newPath, 0, i);
-				if (i < oldPath.length - 1)
-					System.arraycopy(oldPath, i + 1, newPath, i, oldPath.length - i - 1);
-				infoPath.setSearchpath(newPath);
-				nature.setSearchPath(infoPath);
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Remove the specified path from the beaninfo search path.
-	 * Not an error if not found.
-	 *
-	 * Note: This shouldn't be used when working with a BeaninfoNature. Use the
-	 * accessors taking the nature  instead. Otherwise there will be inconsistencies since the search path won't be
-	 * saved across invocations of the workspace if it is not updated through the nature).	 	 
-	 */
-	public static void removeBeanInfoPath(ProxyFactoryRegistry registry, String path) {
-		try {
-			BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
-			IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
-			int pathLength = infoPath.getLength();
-
-			for (int i = 0; i < pathLength; i++) {
-				IStringBeanProxy aPath = (IStringBeanProxy) infoPath.get(i);
-				if (path.equals(aPath.stringValue())) {
-					// We found it, so remove it.
-					IArrayBeanProxy newPath = registry.getBeanProxyFactory().createBeanProxyWith(infoPath.getTypeProxy(), pathLength - 1);
-					JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
-					constants.arraycopy(infoPath, 0, newPath, 0, i);
-					if (i < pathLength - 1)
-						constants.arraycopy(infoPath, i + 1, newPath, i, pathLength - i - 1);
-					biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
-					return;
-				}
-			}
-		} catch (ThrowableProxy e) {
-		}
-	};
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
deleted file mode 100644
index 9f7cb87..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
+++ /dev/null
@@ -1,1057 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: BeanDecoratorImpl.java,v $
- *  $Revision: 1.15 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.logging.Level;
-
-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.EModelElement;
-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.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeanDecorator;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectProperties <em>Introspect Properties</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectMethods <em>Introspect Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectEvents <em>Introspect Events</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class BeanDecoratorImpl extends FeatureDecoratorImpl implements BeanDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long BEAN_CUSTOMIZER_IMPLICIT = 0x1L;
-	public static final long BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT = 0x2L;
-	public static final long BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT = 0x4L;
-	public static final long BEAN_MERGE_INHERITED_EVENTS_IMPLICIT = 0x8L;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_PROPERTIES_EDEFAULT = true;
-	
-	/**
-	 * The cached value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean mergeSuperProperties = MERGE_SUPER_PROPERTIES_EDEFAULT;
-	/**
-	 * This is true if the Merge Super Properties attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean mergeSuperPropertiesESet = false;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_METHODS_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean mergeSuperMethods = MERGE_SUPER_METHODS_EDEFAULT;
-	/**
-	 * This is true if the Merge Super Methods attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean mergeSuperMethodsESet = false;
-
-	/**
-	 * The default value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_SUPER_EVENTS_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeSuperEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean mergeSuperEvents = MERGE_SUPER_EVENTS_EDEFAULT;
-	/**
-	 * This is true if the Merge Super Events attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean mergeSuperEventsESet = false;
-
-	/**
-	 * The default value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_PROPERTIES_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean introspectProperties = INTROSPECT_PROPERTIES_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_METHODS_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean introspectMethods = INTROSPECT_METHODS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean INTROSPECT_EVENTS_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIntrospectEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean introspectEvents = INTROSPECT_EVENTS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DO_BEANINFO_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDoBeaninfo()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean doBeaninfo = DO_BEANINFO_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getNotInheritedPropertyNames() <em>Not Inherited Property Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedPropertyNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedPropertyNames = null;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedMethodNames() <em>Not Inherited Method Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedMethodNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedMethodNames = null;
-
-	/**
-	 * The cached value of the '{@link #getNotInheritedEventNames() <em>Not Inherited Event Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNotInheritedEventNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList notInheritedEventNames = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomizerClass() <em>Customizer Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomizerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass customizerClass = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected BeanDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getBeanDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperProperties() {
-		return mergeSuperProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperProperties(boolean newMergeSuperProperties) {
-		boolean oldMergeSuperProperties = mergeSuperProperties;
-		mergeSuperProperties = newMergeSuperProperties;
-		boolean oldMergeSuperPropertiesESet = mergeSuperPropertiesESet;
-		mergeSuperPropertiesESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, mergeSuperProperties, !oldMergeSuperPropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperProperties() {
-		boolean oldMergeSuperProperties = mergeSuperProperties;
-		boolean oldMergeSuperPropertiesESet = mergeSuperPropertiesESet;
-		mergeSuperProperties = MERGE_SUPER_PROPERTIES_EDEFAULT;
-		mergeSuperPropertiesESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, MERGE_SUPER_PROPERTIES_EDEFAULT, oldMergeSuperPropertiesESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperProperties() {
-		return mergeSuperPropertiesESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperMethods() {
-		return mergeSuperMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperMethods(boolean newMergeSuperMethods) {
-		boolean oldMergeSuperMethods = mergeSuperMethods;
-		mergeSuperMethods = newMergeSuperMethods;
-		boolean oldMergeSuperMethodsESet = mergeSuperMethodsESet;
-		mergeSuperMethodsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, mergeSuperMethods, !oldMergeSuperMethodsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperMethods() {
-		boolean oldMergeSuperMethods = mergeSuperMethods;
-		boolean oldMergeSuperMethodsESet = mergeSuperMethodsESet;
-		mergeSuperMethods = MERGE_SUPER_METHODS_EDEFAULT;
-		mergeSuperMethodsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, MERGE_SUPER_METHODS_EDEFAULT, oldMergeSuperMethodsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperMethods() {
-		return mergeSuperMethodsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeSuperEvents() {
-		return mergeSuperEvents;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeSuperEvents(boolean newMergeSuperEvents) {
-		boolean oldMergeSuperEvents = mergeSuperEvents;
-		mergeSuperEvents = newMergeSuperEvents;
-		boolean oldMergeSuperEventsESet = mergeSuperEventsESet;
-		mergeSuperEventsESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, mergeSuperEvents, !oldMergeSuperEventsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMergeSuperEvents() {
-		boolean oldMergeSuperEvents = mergeSuperEvents;
-		boolean oldMergeSuperEventsESet = mergeSuperEventsESet;
-		mergeSuperEvents = MERGE_SUPER_EVENTS_EDEFAULT;
-		mergeSuperEventsESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, MERGE_SUPER_EVENTS_EDEFAULT, oldMergeSuperEventsESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMergeSuperEvents() {
-		return mergeSuperEventsESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectProperties() {
-		return introspectProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectProperties(boolean newIntrospectProperties) {
-		boolean oldIntrospectProperties = introspectProperties;
-		introspectProperties = newIntrospectProperties;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES, oldIntrospectProperties, introspectProperties));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectMethods() {
-		return introspectMethods;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectMethods(boolean newIntrospectMethods) {
-		boolean oldIntrospectMethods = introspectMethods;
-		introspectMethods = newIntrospectMethods;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS, oldIntrospectMethods, introspectMethods));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIntrospectEvents() {
-		return introspectEvents;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIntrospectEvents(boolean newIntrospectEvents) {
-		boolean oldIntrospectEvents = introspectEvents;
-		introspectEvents = newIntrospectEvents;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS, oldIntrospectEvents, introspectEvents));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomizerClass(JavaClass newCustomizerClass) {
-		JavaClass oldCustomizerClass = customizerClass;
-		customizerClass = newCustomizerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, 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 BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).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 BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.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 BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				return isMergeSuperProperties() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				return isMergeSuperMethods() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				return isMergeSuperEvents() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				return isIntrospectProperties() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				return isIntrospectMethods() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				return isIntrospectEvents() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				return isDoBeaninfo() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				return getNotInheritedPropertyNames();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				return getNotInheritedMethodNames();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				return getNotInheritedEventNames();
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				if (resolve) return getCustomizerClass();
-				return basicGetCustomizerClass();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				setMergeSuperProperties(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				setMergeSuperMethods(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				setMergeSuperEvents(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				setIntrospectProperties(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				setIntrospectMethods(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				setIntrospectEvents(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				setDoBeaninfo(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				getNotInheritedPropertyNames().clear();
-				getNotInheritedPropertyNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				getNotInheritedMethodNames().clear();
-				getNotInheritedMethodNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				getNotInheritedEventNames().clear();
-				getNotInheritedEventNames().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				setCustomizerClass((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				unsetMergeSuperProperties();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				unsetMergeSuperMethods();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				unsetMergeSuperEvents();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				setIntrospectProperties(INTROSPECT_PROPERTIES_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				setIntrospectMethods(INTROSPECT_METHODS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				setIntrospectEvents(INTROSPECT_EVENTS_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				setDoBeaninfo(DO_BEANINFO_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				getNotInheritedPropertyNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				getNotInheritedMethodNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				getNotInheritedEventNames().clear();
-				return;
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				setCustomizerClass((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
-				return mergeIntrospection != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return attributesExplicitEmpty != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
-				return isSetMergeSuperProperties();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
-				return isSetMergeSuperMethods();
-			case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
-				return isSetMergeSuperEvents();
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
-				return introspectProperties != INTROSPECT_PROPERTIES_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
-				return introspectMethods != INTROSPECT_METHODS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
-				return introspectEvents != INTROSPECT_EVENTS_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
-				return doBeaninfo != DO_BEANINFO_EDEFAULT;
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
-				return notInheritedPropertyNames != null && !notInheritedPropertyNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
-				return notInheritedMethodNames != null && !notInheritedMethodNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
-				return notInheritedEventNames != null && !notInheritedEventNames.isEmpty();
-			case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
-				return customizerClass != null;
-		}
-		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(" (mergeSuperProperties: ");
-		if (mergeSuperPropertiesESet) result.append(mergeSuperProperties); else result.append("<unset>");
-		result.append(", mergeSuperMethods: ");
-		if (mergeSuperMethodsESet) result.append(mergeSuperMethods); else result.append("<unset>");
-		result.append(", mergeSuperEvents: ");
-		if (mergeSuperEventsESet) result.append(mergeSuperEvents); else result.append("<unset>");
-		result.append(", introspectProperties: ");
-		result.append(introspectProperties);
-		result.append(", introspectMethods: ");
-		result.append(introspectMethods);
-		result.append(", introspectEvents: ");
-		result.append(introspectEvents);
-		result.append(", doBeaninfo: ");
-		result.append(doBeaninfo);
-		result.append(", notInheritedPropertyNames: ");
-		result.append(notInheritedPropertyNames);
-		result.append(", notInheritedMethodNames: ");
-		result.append(notInheritedMethodNames);
-		result.append(", notInheritedEventNames: ");
-		result.append(notInheritedEventNames);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetCustomizerClass() {
-		return customizerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDoBeaninfo() {
-		return doBeaninfo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDoBeaninfo(boolean newDoBeaninfo) {
-		boolean oldDoBeaninfo = doBeaninfo;
-		doBeaninfo = newDoBeaninfo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO, oldDoBeaninfo, doBeaninfo));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedPropertyNames() {
-		if (notInheritedPropertyNames == null) {
-			notInheritedPropertyNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
-		}
-		return notInheritedPropertyNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedMethodNames() {
-		if (notInheritedMethodNames == null) {
-			notInheritedMethodNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
-		}
-		return notInheritedMethodNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getNotInheritedEventNames() {
-		if (notInheritedEventNames == null) {
-			notInheritedEventNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
-		}
-		return notInheritedEventNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getCustomizerClass() {
-		if (customizerClass != null && customizerClass.eIsProxy()) {
-			JavaClass oldCustomizerClass = customizerClass;
-			customizerClass = (JavaClass)eResolveProxy((InternalEObject)customizerClass);
-			if (customizerClass != oldCustomizerClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
-			}
-		}
-		return customizerClass;
-	}
-
-	private URL iconURL;
-	private boolean hasQueriedIconURL;
-	
-	public URL getIconURL(){
-		if (!hasQueriedIconURL){
-			FeatureAttributeValue value = (FeatureAttributeValue) getAttributes().get("ICON_COLOR_16x16_URL");	//$NON-NLS-1$
-			if (value != null) { 
-				// Get the value
-				Object attr = value.getValue();
-				if (attr instanceof String) {
-					try {
-						hasQueriedIconURL = true;
-						iconURL = new URL((String) attr);
-					} catch ( MalformedURLException exc ) {
-						BeaninfoPlugin.getPlugin().getLogger().log(exc, Level.INFO);
-					}
-				}
-			}			
-		}
-		return iconURL;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
deleted file mode 100644
index 838cd39..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
+++ /dev/null
@@ -1,314 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: BeanEventImpl.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-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.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeanEvent;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.java.impl.JavaEventImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-
-public class BeanEventImpl extends JavaEventImpl implements BeanEvent{
-
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BeanEventImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getBeanEvent();
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.BEAN_EVENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_EVENT__ECONTAINING_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.BEAN_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 BeaninfoPackage.BEAN_EVENT__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.BEAN_EVENT__ECONTAINING_CLASS:
-					return eBasicSetContainer(null, BeaninfoPackage.BEAN_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 BeaninfoPackage.BEAN_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 BeaninfoPackage.BEAN_EVENT__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.BEAN_EVENT__NAME:
-				return getName();
-			case BeaninfoPackage.BEAN_EVENT__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case BeaninfoPackage.BEAN_EVENT__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case BeaninfoPackage.BEAN_EVENT__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case BeaninfoPackage.BEAN_EVENT__CHANGEABLE:
-				return isChangeable() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__VOLATILE:
-				return isVolatile() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__TRANSIENT:
-				return isTransient() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__DEFAULT_VALUE_LITERAL:
-				return getDefaultValueLiteral();
-			case BeaninfoPackage.BEAN_EVENT__DEFAULT_VALUE:
-				return getDefaultValue();
-			case BeaninfoPackage.BEAN_EVENT__UNSETTABLE:
-				return isUnsettable() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_EVENT__DERIVED:
-				return isDerived() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.BEAN_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 BeaninfoPackage.BEAN_EVENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__NAME:
-				setName((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_EVENT__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_EVENT__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case BeaninfoPackage.BEAN_EVENT__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case BeaninfoPackage.BEAN_EVENT__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__CHANGEABLE:
-				setChangeable(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_EVENT__VOLATILE:
-				setVolatile(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_EVENT__TRANSIENT:
-				setTransient(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_EVENT__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral((String)newValue);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__UNSETTABLE:
-				setUnsettable(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.BEAN_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 BeaninfoPackage.BEAN_EVENT__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.BEAN_EVENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__CHANGEABLE:
-				setChangeable(CHANGEABLE_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__VOLATILE:
-				setVolatile(VOLATILE_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__TRANSIENT:
-				setTransient(TRANSIENT_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral(DEFAULT_VALUE_LITERAL_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__UNSETTABLE:
-				setUnsettable(UNSETTABLE_EDEFAULT);
-				return;
-			case BeaninfoPackage.BEAN_EVENT__DERIVED:
-				setDerived(DERIVED_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.BEAN_EVENT__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.BEAN_EVENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BeaninfoPackage.BEAN_EVENT__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__MANY:
-				return isMany() != MANY_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__REQUIRED:
-				return isRequired() != REQUIRED_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__ETYPE:
-				return eType != null;
-			case BeaninfoPackage.BEAN_EVENT__CHANGEABLE:
-				return ((eFlags & CHANGEABLE_EFLAG) != 0) != CHANGEABLE_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__VOLATILE:
-				return ((eFlags & VOLATILE_EFLAG) != 0) != VOLATILE_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__TRANSIENT:
-				return ((eFlags & TRANSIENT_EFLAG) != 0) != TRANSIENT_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__DEFAULT_VALUE_LITERAL:
-				return DEFAULT_VALUE_LITERAL_EDEFAULT == null ? defaultValueLiteral != null : !DEFAULT_VALUE_LITERAL_EDEFAULT.equals(defaultValueLiteral);
-			case BeaninfoPackage.BEAN_EVENT__DEFAULT_VALUE:
-				return DEFAULT_VALUE_EDEFAULT == null ? getDefaultValue() != null : !DEFAULT_VALUE_EDEFAULT.equals(getDefaultValue());
-			case BeaninfoPackage.BEAN_EVENT__UNSETTABLE:
-				return ((eFlags & UNSETTABLE_EFLAG) != 0) != UNSETTABLE_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__DERIVED:
-				return ((eFlags & DERIVED_EFLAG) != 0) != DERIVED_EDEFAULT;
-			case BeaninfoPackage.BEAN_EVENT__ECONTAINING_CLASS:
-				return getEContainingClass() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
deleted file mode 100644
index 07d6748..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
+++ /dev/null
@@ -1,239 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: BeaninfoFactoryImpl.java,v $
- *  $Revision: 1.7 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-import java.util.Map;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-
-public class BeaninfoFactoryImpl extends EFactoryImpl implements BeaninfoFactory{
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	public BeaninfoFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case BeaninfoPackage.FEATURE_DECORATOR: return createFeatureDecorator();
-			case BeaninfoPackage.BEAN_DECORATOR: return createBeanDecorator();
-			case BeaninfoPackage.EVENT_SET_DECORATOR: return createEventSetDecorator();
-			case BeaninfoPackage.METHOD_DECORATOR: return createMethodDecorator();
-			case BeaninfoPackage.PARAMETER_DECORATOR: return createParameterDecorator();
-			case BeaninfoPackage.PROPERTY_DECORATOR: return createPropertyDecorator();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR: return createIndexedPropertyDecorator();
-			case BeaninfoPackage.METHOD_PROXY: return createMethodProxy();
-			case BeaninfoPackage.BEAN_EVENT: return createBeanEvent();
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY: return (EObject)createFeatureAttributeMapEntry();
-			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 BeaninfoPackage.IMPLICIT_ITEM: {
-				ImplicitItem result = ImplicitItem.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-				return result;
-			}
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
-				return createFeatureAttributeValueFromString(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 BeaninfoPackage.IMPLICIT_ITEM:
-				return instanceValue == null ? null : instanceValue.toString();
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
-				return convertFeatureAttributeValueToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureDecorator createFeatureDecorator() {
-		FeatureDecoratorImpl featureDecorator = new FeatureDecoratorImpl();
-		return featureDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EventSetDecorator createEventSetDecorator() {
-		EventSetDecoratorImpl eventSetDecorator = new EventSetDecoratorImpl();
-		return eventSetDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodProxy createMethodProxy() {
-		MethodProxyImpl methodProxy = new MethodProxyImpl();
-		return methodProxy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PropertyDecorator createPropertyDecorator() {
-		PropertyDecoratorImpl propertyDecorator = new PropertyDecoratorImpl();
-		return propertyDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IndexedPropertyDecorator createIndexedPropertyDecorator() {
-		IndexedPropertyDecoratorImpl indexedPropertyDecorator = new IndexedPropertyDecoratorImpl();
-		return indexedPropertyDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeanDecorator createBeanDecorator() {
-		BeanDecoratorImpl beanDecorator = new BeanDecoratorImpl();
-		return beanDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MethodDecorator createMethodDecorator() {
-		MethodDecoratorImpl methodDecorator = new MethodDecoratorImpl();
-		return methodDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParameterDecorator createParameterDecorator() {
-		ParameterDecoratorImpl parameterDecorator = new ParameterDecoratorImpl();
-		return parameterDecorator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeaninfoPackage getBeaninfoPackage() {
-		return (BeaninfoPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static BeaninfoPackage getPackage() {
-		return BeaninfoPackage.eINSTANCE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeanEvent createBeanEvent() {
-		BeanEventImpl beanEvent = new BeanEventImpl();
-		return beanEvent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Map.Entry createFeatureAttributeMapEntry() {
-		FeatureAttributeMapEntryImpl featureAttributeMapEntry = new FeatureAttributeMapEntryImpl();
-		return featureAttributeMapEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public FeatureAttributeValue createFeatureAttributeValueFromString(EDataType eDataType, String initialValue) {
-		return new FeatureAttributeValue(initialValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public String convertFeatureAttributeValueToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
deleted file mode 100644
index 6f01de0..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
+++ /dev/null
@@ -1,1008 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: BeaninfoPackageImpl.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-import java.util.Map;
-
-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;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeanDecorator;
-import org.eclipse.jem.internal.beaninfo.BeanEvent;
-import org.eclipse.jem.internal.beaninfo.BeaninfoFactory;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.EventSetDecorator;
-import org.eclipse.jem.internal.beaninfo.FeatureDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.MethodDecorator;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-public class BeaninfoPackageImpl extends EPackageImpl implements BeaninfoPackage{
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass beanDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass eventSetDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass parameterDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass propertyDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass indexedPropertyDecoratorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodProxyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass beanEventEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureAttributeMapEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum implicitItemEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EDataType featureAttributeValueEDataType = 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.beaninfo.BeaninfoPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private BeaninfoPackageImpl() {
-		super(eNS_URI, BeaninfoFactory.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 BeaninfoPackage init() {
-		if (isInited) return (BeaninfoPackage)EPackage.Registry.INSTANCE.getEPackage(BeaninfoPackage.eNS_URI);
-
-		// Obtain or create and register package
-		BeaninfoPackageImpl theBeaninfoPackage = (BeaninfoPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof BeaninfoPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new BeaninfoPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Create package meta-data objects
-		theBeaninfoPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theBeaninfoPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theBeaninfoPackage.freeze();
-
-		return theBeaninfoPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureDecorator() {
-		return featureDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_DisplayName() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ShortDescription() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Category() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Expert() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Hidden() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_Preferred() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_MergeIntrospection() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_AttributesExplicitEmpty() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ImplicitlySetBits() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureDecorator_ImplicitDecoratorFlag() {
-		return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureDecorator_Attributes() {
-		return (EReference)featureDecoratorEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEventSetDecorator() {
-		return eventSetDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_InDefaultEventSet() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_Unicast() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty() {
-		return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_AddListenerMethod() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_ListenerMethods() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_ListenerType() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_RemoveListenerMethod() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_EventAdapterClass() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEventSetDecorator_SerListMthd() {
-		return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodProxy() {
-		return methodProxyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodProxy_Method() {
-		return (EReference)methodProxyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPropertyDecorator() {
-		return propertyDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_Bound() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_Constrained() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_DesignTime() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_AlwaysIncompatible() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_FilterFlags() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPropertyDecorator_FieldReadOnly() {
-		return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_PropertyEditorClass() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_ReadMethod() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_WriteMethod() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPropertyDecorator_Field() {
-		return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIndexedPropertyDecorator() {
-		return indexedPropertyDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndexedPropertyDecorator_IndexedReadMethod() {
-		return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIndexedPropertyDecorator_IndexedWriteMethod() {
-		return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBeanDecorator() {
-		return beanDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperProperties() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperMethods() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_MergeSuperEvents() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectProperties() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectMethods() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_IntrospectEvents() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBeanDecorator_CustomizerClass() {
-		return (EReference)beanDecoratorEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMethodDecorator() {
-		return methodDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMethodDecorator_ParmsExplicitEmpty() {
-		return (EAttribute)methodDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodDecorator_ParameterDescriptors() {
-		return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodDecorator_SerParmDesc() {
-		return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getParameterDecorator() {
-		return parameterDecoratorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParameterDecorator_Name() {
-		return (EAttribute)parameterDecoratorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EDataType getFeatureAttributeValue() {
-		return featureAttributeValueEDataType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeaninfoFactory getBeaninfoFactory() {
-		return (BeaninfoFactory)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
-		featureDecoratorEClass = createEClass(FEATURE_DECORATOR);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__DISPLAY_NAME);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__SHORT_DESCRIPTION);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__CATEGORY);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__EXPERT);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__HIDDEN);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__PREFERRED);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__MERGE_INTROSPECTION);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICITLY_SET_BITS);
-		createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG);
-		createEReference(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES);
-
-		beanDecoratorEClass = createEClass(BEAN_DECORATOR);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_PROPERTIES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_METHODS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_EVENTS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_PROPERTIES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_METHODS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_EVENTS);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__DO_BEANINFO);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
-		createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
-		createEReference(beanDecoratorEClass, BEAN_DECORATOR__CUSTOMIZER_CLASS);
-
-		eventSetDecoratorEClass = createEClass(EVENT_SET_DECORATOR);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__UNICAST);
-		createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__ADD_LISTENER_METHOD);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_TYPE);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS);
-		createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__SER_LIST_MTHD);
-
-		methodDecoratorEClass = createEClass(METHOD_DECORATOR);
-		createEAttribute(methodDecoratorEClass, METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY);
-		createEReference(methodDecoratorEClass, METHOD_DECORATOR__PARAMETER_DESCRIPTORS);
-		createEReference(methodDecoratorEClass, METHOD_DECORATOR__SER_PARM_DESC);
-
-		parameterDecoratorEClass = createEClass(PARAMETER_DECORATOR);
-		createEAttribute(parameterDecoratorEClass, PARAMETER_DECORATOR__NAME);
-		createEReference(parameterDecoratorEClass, PARAMETER_DECORATOR__PARAMETER);
-
-		propertyDecoratorEClass = createEClass(PROPERTY_DECORATOR);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__BOUND);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__CONSTRAINED);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__DESIGN_TIME);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FILTER_FLAGS);
-		createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD_READ_ONLY);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__READ_METHOD);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__WRITE_METHOD);
-		createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD);
-
-		indexedPropertyDecoratorEClass = createEClass(INDEXED_PROPERTY_DECORATOR);
-		createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD);
-		createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD);
-
-		methodProxyEClass = createEClass(METHOD_PROXY);
-		createEReference(methodProxyEClass, METHOD_PROXY__METHOD);
-
-		beanEventEClass = createEClass(BEAN_EVENT);
-
-		featureAttributeMapEntryEClass = createEClass(FEATURE_ATTRIBUTE_MAP_ENTRY);
-		createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__KEY);
-		createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE);
-
-		// Create enums
-		implicitItemEEnum = createEEnum(IMPLICIT_ITEM);
-
-		// Create data types
-		featureAttributeValueEDataType = createEDataType(FEATURE_ATTRIBUTE_VALUE);
-	}
-
-	/**
-	 * <!-- 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);
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		featureDecoratorEClass.getESuperTypes().add(theEcorePackage.getEAnnotation());
-		beanDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		eventSetDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		methodDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		parameterDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		propertyDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
-		indexedPropertyDecoratorEClass.getESuperTypes().add(this.getPropertyDecorator());
-		methodProxyEClass.getESuperTypes().add(theEcorePackage.getEOperation());
-		beanEventEClass.getESuperTypes().add(theJavaRefPackage.getJavaEvent());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(featureDecoratorEClass, FeatureDecorator.class, "FeatureDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFeatureDecorator_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ShortDescription(), ecorePackage.getEString(), "shortDescription", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Category(), ecorePackage.getEString(), "category", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Expert(), ecorePackage.getEBoolean(), "expert", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Hidden(), ecorePackage.getEBoolean(), "hidden", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_Preferred(), ecorePackage.getEBoolean(), "preferred", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_MergeIntrospection(), ecorePackage.getEBoolean(), "mergeIntrospection", "true", 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_AttributesExplicitEmpty(), ecorePackage.getEBoolean(), "attributesExplicitEmpty", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ImplicitlySetBits(), ecorePackage.getELong(), "implicitlySetBits", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureDecorator_ImplicitDecoratorFlag(), this.getImplicitItem(), "implicitDecoratorFlag", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureDecorator_Attributes(), this.getFeatureAttributeMapEntry(), null, "attributes", null, 0, -1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(featureDecoratorEClass, ecorePackage.getEString(), "getName");
-
-		initEClass(beanDecoratorEClass, BeanDecorator.class, "BeanDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBeanDecorator_MergeSuperProperties(), ecorePackage.getEBoolean(), "mergeSuperProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_MergeSuperMethods(), ecorePackage.getEBoolean(), "mergeSuperMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_MergeSuperEvents(), ecorePackage.getEBoolean(), "mergeSuperEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectProperties(), ecorePackage.getEBoolean(), "introspectProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectMethods(), ecorePackage.getEBoolean(), "introspectMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_IntrospectEvents(), ecorePackage.getEBoolean(), "introspectEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_DoBeaninfo(), ecorePackage.getEBoolean(), "doBeaninfo", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedPropertyNames(), ecorePackage.getEString(), "notInheritedPropertyNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedMethodNames(), ecorePackage.getEString(), "notInheritedMethodNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBeanDecorator_NotInheritedEventNames(), ecorePackage.getEString(), "notInheritedEventNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBeanDecorator_CustomizerClass(), theJavaRefPackage.getJavaClass(), null, "customizerClass", null, 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(eventSetDecoratorEClass, EventSetDecorator.class, "EventSetDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEventSetDecorator_InDefaultEventSet(), ecorePackage.getEBoolean(), "inDefaultEventSet", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEventSetDecorator_Unicast(), ecorePackage.getEBoolean(), "unicast", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEventSetDecorator_ListenerMethodsExplicitEmpty(), ecorePackage.getEBoolean(), "listenerMethodsExplicitEmpty", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_AddListenerMethod(), theJavaRefPackage.getMethod(), null, "addListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_ListenerMethods(), this.getMethodProxy(), null, "listenerMethods", null, 1, -1, EventSetDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_ListenerType(), theJavaRefPackage.getJavaClass(), null, "listenerType", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_RemoveListenerMethod(), theJavaRefPackage.getMethod(), null, "removeListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_EventAdapterClass(), theJavaRefPackage.getJavaClass(), null, "eventAdapterClass", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getEventSetDecorator_SerListMthd(), this.getMethodProxy(), null, "serListMthd", null, 1, -1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodDecoratorEClass, MethodDecorator.class, "MethodDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMethodDecorator_ParmsExplicitEmpty(), ecorePackage.getEBoolean(), "parmsExplicitEmpty", null, 0, 1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodDecorator_ParameterDescriptors(), this.getParameterDecorator(), null, "parameterDescriptors", null, 0, -1, MethodDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getMethodDecorator_SerParmDesc(), this.getParameterDecorator(), null, "serParmDesc", null, 0, -1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(parameterDecoratorEClass, ParameterDecorator.class, "ParameterDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getParameterDecorator_Name(), ecorePackage.getEString(), "name", null, 0, 1, ParameterDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getParameterDecorator_Parameter(), theJavaRefPackage.getJavaParameter(), null, "parameter", null, 0, 1, ParameterDecorator.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(propertyDecoratorEClass, PropertyDecorator.class, "PropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPropertyDecorator_Bound(), ecorePackage.getEBoolean(), "bound", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_Constrained(), ecorePackage.getEBoolean(), "constrained", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_DesignTime(), ecorePackage.getEBoolean(), "designTime", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_AlwaysIncompatible(), ecorePackage.getEBoolean(), "alwaysIncompatible", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_FilterFlags(), ecorePackage.getEString(), "filterFlags", null, 0, -1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPropertyDecorator_FieldReadOnly(), ecorePackage.getEBoolean(), "fieldReadOnly", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_PropertyEditorClass(), theJavaRefPackage.getJavaClass(), null, "propertyEditorClass", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_ReadMethod(), theJavaRefPackage.getMethod(), null, "readMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_WriteMethod(), theJavaRefPackage.getMethod(), null, "writeMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyDecorator_Field(), theJavaRefPackage.getField(), null, "field", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(propertyDecoratorEClass, theEcorePackage.getEClassifier(), "getPropertyType");
-
-		initEClass(indexedPropertyDecoratorEClass, IndexedPropertyDecorator.class, "IndexedPropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getIndexedPropertyDecorator_IndexedReadMethod(), theJavaRefPackage.getMethod(), null, "indexedReadMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIndexedPropertyDecorator_IndexedWriteMethod(), theJavaRefPackage.getMethod(), null, "indexedWriteMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(methodProxyEClass, MethodProxy.class, "MethodProxy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMethodProxy_Method(), theJavaRefPackage.getMethod(), null, "method", null, 1, 1, MethodProxy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(beanEventEClass, BeanEvent.class, "BeanEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(featureAttributeMapEntryEClass, Map.Entry.class, "FeatureAttributeMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFeatureAttributeMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureAttributeMapEntry_Value(), this.getFeatureAttributeValue(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(implicitItemEEnum, ImplicitItem.class, "ImplicitItem");
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.NOT_IMPLICIT_LITERAL);
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
-		addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
-
-		// Initialize data types
-		initEDataType(featureAttributeValueEDataType, FeatureAttributeValue.class, "FeatureAttributeValue", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_DoBeaninfo() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedPropertyNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedMethodNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBeanDecorator_NotInheritedEventNames() {
-		return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getParameterDecorator_Parameter() {
-		return (EReference)parameterDecoratorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBeanEvent() {
-		return beanEventEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureAttributeMapEntry() {
-		return featureAttributeMapEntryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureAttributeMapEntry_Key() {
-		return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureAttributeMapEntry_Value() {
-		return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getImplicitItem() {
-		return implicitItemEEnum;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
deleted file mode 100644
index 520548b..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
+++ /dev/null
@@ -1,991 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: EventSetDecoratorImpl.java,v $
- *  $Revision: 1.10 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-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.EModelElement;
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.EventSetDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.java.*;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isUnicast <em>Unicast</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getAddListenerMethod <em>Add Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerMethods <em>Listener Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerType <em>Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class EventSetDecoratorImpl extends FeatureDecoratorImpl implements EventSetDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long EVENT_ADDLISTENERMETHOD_IMPLICIT = 0x1L;
-	public static final long EVENT_ADAPTERCLASS_IMPLICIT = 0x2L;
-	public static final long EVENT_LISTENERMETHODS_IMPLICIT = 0x4L;
-	public static final long EVENT_LISTENERTYPE_IMPLICIT = 0x8L;
-	public static final long EVENT_REMOVELISTENERMETHOD_IMPLICIT = 0x10L;
-	public static final long EVENT_DEFAULTEVENTSET_IMPLICIT = 0x20L;
-	public static final long EVENT_UNICAST_IMPLICIT = 0x40L;
-	public static final long EVENT_LISTENERMETHODS_DEFAULT = 0x80L;
-
-
-	/**
-	 * The default value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IN_DEFAULT_EVENT_SET_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isInDefaultEventSet()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean inDefaultEventSet = IN_DEFAULT_EVENT_SET_EDEFAULT;
-
-	/**
-	 * This is true if the In Default Event Set attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean inDefaultEventSetESet = false;
-
-	/**
-	 * The default value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnicast()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean UNICAST_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnicast()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean unicast = UNICAST_EDEFAULT;
-
-	/**
-	 * This is true if the Unicast attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean unicastESet = false;
-
-	/**
-	 * The default value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isListenerMethodsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean listenerMethodsExplicitEmpty = LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAddListenerMethod() <em>Add Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAddListenerMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method addListenerMethod = null;
-	
-	/**
-	 * The cached value of the '{@link #getListenerType() <em>Listener Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getListenerType()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass listenerType = null;
-	/**
-	 * The cached value of the '{@link #getRemoveListenerMethod() <em>Remove Listener Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemoveListenerMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method removeListenerMethod = null;
-	
-	/**
-	 * The cached value of the '{@link #getEventAdapterClass() <em>Event Adapter Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEventAdapterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass eventAdapterClass = null;
-
-	/**
-	 * The cached value of the '{@link #getSerListMthd() <em>Ser List Mthd</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSerListMthd()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serListMthd = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected EventSetDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getEventSetDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isInDefaultEventSet() {
-		return inDefaultEventSet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInDefaultEventSet(boolean newInDefaultEventSet) {
-		boolean oldInDefaultEventSet = inDefaultEventSet;
-		inDefaultEventSet = newInDefaultEventSet;
-		boolean oldInDefaultEventSetESet = inDefaultEventSetESet;
-		inDefaultEventSetESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, inDefaultEventSet, !oldInDefaultEventSetESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetInDefaultEventSet() {
-		boolean oldInDefaultEventSet = inDefaultEventSet;
-		boolean oldInDefaultEventSetESet = inDefaultEventSetESet;
-		inDefaultEventSet = IN_DEFAULT_EVENT_SET_EDEFAULT;
-		inDefaultEventSetESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, IN_DEFAULT_EVENT_SET_EDEFAULT, oldInDefaultEventSetESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetInDefaultEventSet() {
-		return inDefaultEventSetESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isUnicast() {
-		return unicast;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUnicast(boolean newUnicast) {
-		boolean oldUnicast = unicast;
-		unicast = newUnicast;
-		boolean oldUnicastESet = unicastESet;
-		unicastESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, unicast, !oldUnicastESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUnicast() {
-		boolean oldUnicast = unicast;
-		boolean oldUnicastESet = unicastESet;
-		unicast = UNICAST_EDEFAULT;
-		unicastESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, UNICAST_EDEFAULT, oldUnicastESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUnicast() {
-		return unicastESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isListenerMethodsExplicitEmpty() {
-		return listenerMethodsExplicitEmpty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenerMethodsExplicitEmpty(boolean newListenerMethodsExplicitEmpty) {
-		boolean oldListenerMethodsExplicitEmpty = listenerMethodsExplicitEmpty;
-		listenerMethodsExplicitEmpty = newListenerMethodsExplicitEmpty;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY, oldListenerMethodsExplicitEmpty, listenerMethodsExplicitEmpty));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getAddListenerMethod() {
-		if (addListenerMethod != null && addListenerMethod.eIsProxy()) {
-			Method oldAddListenerMethod = addListenerMethod;
-			addListenerMethod = (Method)eResolveProxy((InternalEObject)addListenerMethod);
-			if (addListenerMethod != oldAddListenerMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
-			}
-		}
-		return addListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetAddListenerMethod() {
-		return addListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAddListenerMethod(Method newAddListenerMethod) {
-		Method oldAddListenerMethod = addListenerMethod;
-		addListenerMethod = newAddListenerMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
-	}
-
-	public EList getListenerMethods() {
-		if (!isListenerMethodsExplicitEmpty() && getSerListMthd().isEmpty() && (getImplicitlySetBits()&(EVENT_LISTENERMETHODS_IMPLICIT | EVENT_LISTENERMETHODS_DEFAULT)) == 0) {
-			// Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
-			createDefaultListenerMethodsList();
-		}
-		return getSerListMthd();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getListenerMethodsGen() {
-		// TODO: implement this method to return the 'Listener Methods' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getListenerType() {
-		if (listenerType != null && listenerType.eIsProxy()) {
-			JavaClass oldListenerType = listenerType;
-			listenerType = (JavaClass)eResolveProxy((InternalEObject)listenerType);
-			if (listenerType != oldListenerType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
-			}
-		}
-		return listenerType;
-	}
-
-	/**
-	 * This is called if method listeners list not explicitly set and there is no feature proxy or
-	 * there is a feature proxy and the proxy has nothing defined.
-	 * <p>
-	 * This is an internal method used by BeanInfo classes. It is not to be used by clients.
-	 */
-	public EList createDefaultListenerMethodsList() {
-		if (!eIsSet(EcorePackage.eINSTANCE.getEAnnotation_EModelElement()))
-			return this.getSerListMthd();	// We are not attached, can't determine the list yet.
-		EList mthdsList = this.getSerListMthd();		
-			
-		JavaClass eventObjectClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventObject", getEModelElement().eResource().getResourceSet()); //$NON-NLS-1$
-		
-		mthdsList.clear();
-		
-		// This is a little tricky. Need to get the methods for the listener type, and
-		// then go through the methods and filter out the non-event ones.
-		JavaClass lt = getListenerType();
-		if (lt == null)
-			return mthdsList;	// Couldn't get the listener type for some reason, so leave as is.
-		setImplicitlySetBits(getImplicitlySetBits()|EVENT_LISTENERMETHODS_DEFAULT);	// Mark as we implicitly filled it in.
-		
-		BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
-		List ms = lt.getPublicMethodsExtended();
-		int msize = ms.size();
-		for (int i=0; i<msize; i++) {
-			Method method = (Method) ms.get(i);
-			List parms = method.getParameters();
-			if (parms.size() != 1)
-				continue;	// Must have only one parm.
-			if (!eventObjectClass.isAssignableFrom(((JavaParameter) parms.get(0)).getEType()))
-				continue;	// Parm does not inherit from java.util.EventObject
-				
-			// We need a method proxy, and a method decorator.
-			MethodProxy mproxy = bfact.createMethodProxy();
-			mproxy.setMethod(method);
-			mproxy.setName(method.getName());			
-			MethodDecorator md = bfact.createMethodDecorator();
-			md.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
-			md.setEModelElement(mproxy);			
-			mthdsList.add(mproxy);
-		}
-		return mthdsList;
-	}	
-	
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetListenerType() {
-		return listenerType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setListenerType(JavaClass newListenerType) {
-		JavaClass oldListenerType = listenerType;
-		listenerType = newListenerType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getRemoveListenerMethod() {
-		if (removeListenerMethod != null && removeListenerMethod.eIsProxy()) {
-			Method oldRemoveListenerMethod = removeListenerMethod;
-			removeListenerMethod = (Method)eResolveProxy((InternalEObject)removeListenerMethod);
-			if (removeListenerMethod != oldRemoveListenerMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
-			}
-		}
-		return removeListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetRemoveListenerMethod() {
-		return removeListenerMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRemoveListenerMethod(Method newRemoveListenerMethod) {
-		Method oldRemoveListenerMethod = removeListenerMethod;
-		removeListenerMethod = newRemoveListenerMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getEventAdapterClass() {
-		if (eventAdapterClass != null && eventAdapterClass.eIsProxy()) {
-			JavaClass oldEventAdapterClass = eventAdapterClass;
-			eventAdapterClass = (JavaClass)eResolveProxy((InternalEObject)eventAdapterClass);
-			if (eventAdapterClass != oldEventAdapterClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
-			}
-		}
-		return eventAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetEventAdapterClass() {
-		return eventAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEventAdapterClass(JavaClass newEventAdapterClass) {
-		JavaClass oldEventAdapterClass = eventAdapterClass;
-		eventAdapterClass = newEventAdapterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSerListMthd() {
-		if (serListMthd == null) {
-			serListMthd = new EObjectContainmentEList(MethodProxy.class, this, BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD);
-		}
-		return serListMthd;
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, 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 BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-					return ((InternalEList)getSerListMthd()).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 BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.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 BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				return isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				return isUnicast() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				return isListenerMethodsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				if (resolve) return getAddListenerMethod();
-				return basicGetAddListenerMethod();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return getListenerMethods();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				if (resolve) return getListenerType();
-				return basicGetListenerType();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				if (resolve) return getRemoveListenerMethod();
-				return basicGetRemoveListenerMethod();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				if (resolve) return getEventAdapterClass();
-				return basicGetEventAdapterClass();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				return getSerListMthd();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				setInDefaultEventSet(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				setUnicast(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				setListenerMethodsExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				setAddListenerMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				getListenerMethods().clear();
-				getListenerMethods().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				setListenerType((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				setRemoveListenerMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				setEventAdapterClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				getSerListMthd().clear();
-				getSerListMthd().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				unsetInDefaultEventSet();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				unsetUnicast();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				setListenerMethodsExplicitEmpty(LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				setAddListenerMethod((Method)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				getListenerMethods().clear();
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				setListenerType((JavaClass)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				setRemoveListenerMethod((Method)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				setEventAdapterClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				getSerListMthd().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/*
-	 * This is overridden so that we can do special is set tests:
-	 * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
-	 * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
-	 *    out the unneeded default parms. They can be reconstructed quickly when needed.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return eIsSetGen(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd());	// Let default serListMthd is set work.
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				if ((getImplicitlySetBits() & EVENT_LISTENERMETHODS_DEFAULT) != 0)
-					return false;	// Not considered set if initialized by default.
-				else
-					return eIsSetGen(eFeature);	// Not set by default, so check true setting.
-			default:
-				return eIsSetGen(eFeature);	// Everything else use the gen method.
-		}
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
-				return mergeIntrospection != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return attributesExplicitEmpty != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
-				return isSetInDefaultEventSet();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
-				return isSetUnicast();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
-				return listenerMethodsExplicitEmpty != LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
-				return addListenerMethod != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
-				return !getListenerMethods().isEmpty();
-			case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
-				return listenerType != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
-				return removeListenerMethod != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
-				return eventAdapterClass != null;
-			case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
-				return serListMthd != null && !serListMthd.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(" (inDefaultEventSet: ");
-		if (inDefaultEventSetESet) result.append(inDefaultEventSet); else result.append("<unset>");
-		result.append(", unicast: ");
-		if (unicastESet) result.append(unicast); else result.append("<unset>");
-		result.append(", listenerMethodsExplicitEmpty: ");
-		result.append(listenerMethodsExplicitEmpty);
-		result.append(')');
-		return result.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
deleted file mode 100644
index 8bd108d..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
+++ /dev/null
@@ -1,307 +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
- *******************************************************************************/
-/*
- *  $RCSfile: FeatureAttributeMapEntryImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:44:20 $ 
- */
-
-package org.eclipse.jem.internal.beaninfo.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Attribute Map Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureAttributeMapEntryImpl extends EObjectImpl implements BasicEMap.Entry {
-	/**
-	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String key = KEY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final FeatureAttributeValue VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected FeatureAttributeValue value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureAttributeMapEntryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTypedKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedKey(String newKey) {
-		String oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureAttributeValue getTypedValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedValue(FeatureAttributeValue newValue) {
-		FeatureAttributeValue oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				return getTypedKey();
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				return getTypedValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				setTypedKey((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				setTypedValue((FeatureAttributeValue)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				setTypedKey(KEY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				setTypedValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
-				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
-			case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		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(" (key: ");
-		result.append(key);
-		result.append(", value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected int hash = -1;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHash() {
-		if (hash == -1) {
-			Object theKey = getKey();
-			hash = (theKey == null ? 0 : theKey.hashCode());
-		}
-		return hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHash(int hash) {
-		this.hash = hash;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getKey() {
-		return getTypedKey();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(Object key) {
-		setTypedKey((String)key);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue() {
-		return getTypedValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object setValue(Object value) {
-		Object oldValue = getValue();
-		setTypedValue((FeatureAttributeValue)value);
-		return oldValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getEMap() {
-		EObject container = eContainer();
-		return container == null ? null : (EMap)container.eGet(eContainmentFeature());
-	}
-
-} //FeatureAttributeMapEntryImpl
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
deleted file mode 100644
index 9666f26..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
+++ /dev/null
@@ -1,1057 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: FeatureDecoratorImpl.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAnnotationImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.FeatureDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getShortDescription <em>Short Description</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getCategory <em>Category</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isExpert <em>Expert</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isHidden <em>Hidden</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isPreferred <em>Preferred</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isMergeIntrospection <em>Merge Introspection</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureDecoratorImpl extends EAnnotationImpl implements FeatureDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 * Note: To make it easier to make changes Feature goes from high bits down, while the
-	 * subclasses go from low-bits up. That way if a change is made to add something of
-	 * interest to Feature, all of the subclasses don't need to have their bits re-ordered.
-	 * Since these are bits, it doesn't matter which ones to use.
-	 */
-	public static final long FEATURE_DISPLAYNAME_IMPLICIT = 0x8000000000000000L;
-	public static final long FEATURE_SHORTDESC_IMPLICIT = 0x4000000000000000L;
-	public static final long FEATURE_CATEGORY_IMPLICIT = 0x2000000000000000L;
-	public static final long FEATURE_EXPERT_IMPLICIT = 0x1000000000000000L;
-	public static final long FEATURE_HIDDEN_IMPLICIT = 0x800000000000000L;
-	public static final long FEATURE_PREFERRED_IMPLICIT = 0x400000000000000L;
-	public static final long FEATURE_ATTRIBUTES_IMPLICIT = 0x200000000000000L; 
-	
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	 
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-	/**
-	 * This is true if the Display Name attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean displayNameESet = false;
-
-	/**
-	 * The default value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SHORT_DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String shortDescription = SHORT_DESCRIPTION_EDEFAULT;
-	/**
-	 * This is true if the Short Description attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean shortDescriptionESet = false;
-
-	/**
-	 * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CATEGORY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
-	protected String category = CATEGORY_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isExpert() <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExpert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXPERT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isExpert() <em>Expert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExpert()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean expert = EXPERT_EDEFAULT;
-
-	/**
-	 * This is true if the Expert attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean expertESet = false;
-
-	/**
-	 * The default value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHidden()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HIDDEN_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHidden()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hidden = HIDDEN_EDEFAULT;
-
-	/**
-	 * This is true if the Hidden attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hiddenESet = false;
-
-	/**
-	 * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPreferred()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PREFERRED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPreferred()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean preferred = PREFERRED_EDEFAULT;
-
-	/**
-	 * This is true if the Preferred attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean preferredESet = false;
-
-	/**
-	 * The default value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MERGE_INTROSPECTION_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMergeIntrospection()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean mergeIntrospection = MERGE_INTROSPECTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAttributesExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean attributesExplicitEmpty = ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final long IMPLICITLY_SET_BITS_EDEFAULT = 0L;
-
-	/**
-	 * The cached value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitlySetBits()
-	 * @generated
-	 * @ordered
-	 */
-	protected long implicitlySetBits = IMPLICITLY_SET_BITS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ImplicitItem IMPLICIT_DECORATOR_FLAG_EDEFAULT = ImplicitItem.NOT_IMPLICIT_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplicitDecoratorFlag()
-	 * @generated
-	 * @ordered
-	 */
-	protected ImplicitItem implicitDecoratorFlag = IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EMap attributes = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	protected FeatureDecoratorImpl() {
-		super();
-		setSource(this.getClass().getName());		
-	}
-	
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getFeatureDecorator();
-	}
-
-	public String getDisplayName() {
-		return isSetDisplayName() ? getDisplayNameGen() : getName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDisplayNameGen() {
-		return displayName;
-	}
-
-	public String getName() {
-		ENamedElement ne = (ENamedElement) getEModelElement();
-		if (ne != null)
-			return ne.getName();	// The name from the owner of the feature has to be the name of feature.
-		else
-			return "?";	// Don't know what it is. //$NON-NLS-1$
-	}
-	
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		boolean oldDisplayNameESet = displayNameESet;
-		displayNameESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, displayName, !oldDisplayNameESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDisplayName() {
-		String oldDisplayName = displayName;
-		boolean oldDisplayNameESet = displayNameESet;
-		displayName = DISPLAY_NAME_EDEFAULT;
-		displayNameESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, DISPLAY_NAME_EDEFAULT, oldDisplayNameESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDisplayName() {
-		return displayNameESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getShortDescription() {
-		return shortDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setShortDescription(String newShortDescription) {
-		String oldShortDescription = shortDescription;
-		shortDescription = newShortDescription;
-		boolean oldShortDescriptionESet = shortDescriptionESet;
-		shortDescriptionESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, shortDescription, !oldShortDescriptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetShortDescription() {
-		String oldShortDescription = shortDescription;
-		boolean oldShortDescriptionESet = shortDescriptionESet;
-		shortDescription = SHORT_DESCRIPTION_EDEFAULT;
-		shortDescriptionESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, SHORT_DESCRIPTION_EDEFAULT, oldShortDescriptionESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetShortDescription() {
-		return shortDescriptionESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCategory() {
-		return category;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCategory(String newCategory) {
-		String oldCategory = category;
-		category = newCategory;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__CATEGORY, oldCategory, category));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isExpert() {
-		return expert;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExpert(boolean newExpert) {
-		boolean oldExpert = expert;
-		expert = newExpert;
-		boolean oldExpertESet = expertESet;
-		expertESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, expert, !oldExpertESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetExpert() {
-		boolean oldExpert = expert;
-		boolean oldExpertESet = expertESet;
-		expert = EXPERT_EDEFAULT;
-		expertESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, EXPERT_EDEFAULT, oldExpertESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetExpert() {
-		return expertESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHidden() {
-		return hidden;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHidden(boolean newHidden) {
-		boolean oldHidden = hidden;
-		hidden = newHidden;
-		boolean oldHiddenESet = hiddenESet;
-		hiddenESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, hidden, !oldHiddenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetHidden() {
-		boolean oldHidden = hidden;
-		boolean oldHiddenESet = hiddenESet;
-		hidden = HIDDEN_EDEFAULT;
-		hiddenESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, HIDDEN_EDEFAULT, oldHiddenESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetHidden() {
-		return hiddenESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isPreferred() {
-		return preferred;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPreferred(boolean newPreferred) {
-		boolean oldPreferred = preferred;
-		preferred = newPreferred;
-		boolean oldPreferredESet = preferredESet;
-		preferredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, preferred, !oldPreferredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetPreferred() {
-		boolean oldPreferred = preferred;
-		boolean oldPreferredESet = preferredESet;
-		preferred = PREFERRED_EDEFAULT;
-		preferredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, PREFERRED_EDEFAULT, oldPreferredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetPreferred() {
-		return preferredESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMergeIntrospection() {
-		return mergeIntrospection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMergeIntrospection(boolean newMergeIntrospection) {
-		boolean oldMergeIntrospection = mergeIntrospection;
-		mergeIntrospection = newMergeIntrospection;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION, oldMergeIntrospection, mergeIntrospection));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAttributesExplicitEmpty() {
-		return attributesExplicitEmpty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttributesExplicitEmpty(boolean newAttributesExplicitEmpty) {
-		boolean oldAttributesExplicitEmpty = attributesExplicitEmpty;
-		attributesExplicitEmpty = newAttributesExplicitEmpty;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY, oldAttributesExplicitEmpty, attributesExplicitEmpty));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public long getImplicitlySetBits() {
-		return implicitlySetBits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicitlySetBits(long newImplicitlySetBits) {
-		long oldImplicitlySetBits = implicitlySetBits;
-		implicitlySetBits = newImplicitlySetBits;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS, oldImplicitlySetBits, implicitlySetBits));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImplicitItem getImplicitDecoratorFlag() {
-		return implicitDecoratorFlag;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplicitDecoratorFlag(ImplicitItem newImplicitDecoratorFlag) {
-		ImplicitItem oldImplicitDecoratorFlag = implicitDecoratorFlag;
-		implicitDecoratorFlag = newImplicitDecoratorFlag == null ? IMPLICIT_DECORATOR_FLAG_EDEFAULT : newImplicitDecoratorFlag;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG, oldImplicitDecoratorFlag, implicitDecoratorFlag));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EMap getAttributes() {
-		if (attributes == null) {
-			attributes = new EcoreEMap(BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry(), FeatureAttributeMapEntryImpl.class, this, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (displayName: ");
-		if (displayNameESet) result.append(displayName); else result.append("<unset>");
-		result.append(", shortDescription: ");
-		if (shortDescriptionESet) result.append(shortDescription); else result.append("<unset>");
-		result.append(", category: ");
-		result.append(category);
-		result.append(", expert: ");
-		if (expertESet) result.append(expert); else result.append("<unset>");
-		result.append(", hidden: ");
-		if (hiddenESet) result.append(hidden); else result.append("<unset>");
-		result.append(", preferred: ");
-		if (preferredESet) result.append(preferred); else result.append("<unset>");
-		result.append(", mergeIntrospection: ");
-		result.append(mergeIntrospection);
-		result.append(", attributesExplicitEmpty: ");
-		result.append(attributesExplicitEmpty);
-		result.append(", implicitlySetBits: ");
-		result.append(implicitlySetBits);
-		result.append(", implicitDecoratorFlag: ");
-		result.append(implicitDecoratorFlag);
-		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 BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, 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 BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).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 BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.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 BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * Called by overrides to eIsSet to test if source is set. This is because for the 
-	 * FeatureDecorator and subclasses, setting source to the classname is considered
-	 * to be not set since that is the new default for each class level. By doing this
-	 * when serializing it won't waste space and time adding a copy of the source string
-	 * to the serialized output and then creating a NEW copy on each decorator loaded
-	 * from an XMI file. 
-	 * 
-	 * @return <code>true</code> if source is not null and not equal to class name.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean isSourceSet() {
-		return source != null && !getClass().getName().equals(source);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
-				return mergeIntrospection != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return attributesExplicitEmpty != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
deleted file mode 100644
index f3dd05a..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
+++ /dev/null
@@ -1,664 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: IndexedPropertyDecoratorImpl.java,v $
- *  $Revision: 1.8 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-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.EModelElement;
-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.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class IndexedPropertyDecoratorImpl extends PropertyDecoratorImpl implements IndexedPropertyDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long INDEXED_READMETHOD_IMPLICIT = 0x100000L;	// Start kind of high so as to allow PropertyDecorator to increase without conflig.
-	public static final long INDEXED_WRITEMETHOD_IMPLICIT = 0x200000L;
-	
-	/**
-	 * The cached value of the '{@link #getIndexedReadMethod() <em>Indexed Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexedReadMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method indexedReadMethod = null;
-	/**
-	 * This is true if the Indexed Read Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean indexedReadMethodESet = false;
-
-	/**
-	 * The cached value of the '{@link #getIndexedWriteMethod() <em>Indexed Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIndexedWriteMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method indexedWriteMethod = null;
-	
-	/**
-	 * This is true if the Indexed Write Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean indexedWriteMethodESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected IndexedPropertyDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getIndexedReadMethod() {
-		if (indexedReadMethod != null && indexedReadMethod.eIsProxy()) {
-			Method oldIndexedReadMethod = indexedReadMethod;
-			indexedReadMethod = (Method)eResolveProxy((InternalEObject)indexedReadMethod);
-			if (indexedReadMethod != oldIndexedReadMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod));
-			}
-		}
-		return indexedReadMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndexedReadMethod(Method newIndexedReadMethod) {
-		Method oldIndexedReadMethod = indexedReadMethod;
-		indexedReadMethod = newIndexedReadMethod;
-		boolean oldIndexedReadMethodESet = indexedReadMethodESet;
-		indexedReadMethodESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod, !oldIndexedReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIndexedReadMethod() {
-		Method oldIndexedReadMethod = indexedReadMethod;
-		boolean oldIndexedReadMethodESet = indexedReadMethodESet;
-		indexedReadMethod = null;
-		indexedReadMethodESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, null, oldIndexedReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIndexedReadMethod() {
-		return indexedReadMethodESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getIndexedWriteMethod() {
-		if (indexedWriteMethod != null && indexedWriteMethod.eIsProxy()) {
-			Method oldIndexedWriteMethod = indexedWriteMethod;
-			indexedWriteMethod = (Method)eResolveProxy((InternalEObject)indexedWriteMethod);
-			if (indexedWriteMethod != oldIndexedWriteMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod));
-			}
-		}
-		return indexedWriteMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIndexedWriteMethod(Method newIndexedWriteMethod) {
-		Method oldIndexedWriteMethod = indexedWriteMethod;
-		indexedWriteMethod = newIndexedWriteMethod;
-		boolean oldIndexedWriteMethodESet = indexedWriteMethodESet;
-		indexedWriteMethodESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod, !oldIndexedWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIndexedWriteMethod() {
-		Method oldIndexedWriteMethod = indexedWriteMethod;
-		boolean oldIndexedWriteMethodESet = indexedWriteMethodESet;
-		indexedWriteMethod = null;
-		indexedWriteMethodESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, null, oldIndexedWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIndexedWriteMethod() {
-		return indexedWriteMethodESet;
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, 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 BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).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 BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.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 BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				return isBound() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				return isConstrained() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				return isDesignTime() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return isAlwaysIncompatible() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				return getFilterFlags();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return isFieldReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				if (resolve) return getPropertyEditorClass();
-				return basicGetPropertyEditorClass();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				if (resolve) return getReadMethod();
-				return basicGetReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				if (resolve) return getWriteMethod();
-				return basicGetWriteMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				if (resolve) return getField();
-				return basicGetField();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				if (resolve) return getIndexedReadMethod();
-				return basicGetIndexedReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				if (resolve) return getIndexedWriteMethod();
-				return basicGetIndexedWriteMethod();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				setBound(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				setConstrained(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				setDesignTime(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				getFilterFlags().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				setReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				setWriteMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				setField((Field)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				setIndexedReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				setIndexedWriteMethod((Method)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				unsetBound();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				unsetConstrained();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				unsetDesignTime();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(ALWAYS_INCOMPATIBLE_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(FIELD_READ_ONLY_EDEFAULT);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				unsetReadMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				unsetWriteMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				unsetField();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				unsetIndexedReadMethod();
-				return;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				unsetIndexedWriteMethod();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return mergeIntrospection != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return attributesExplicitEmpty != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
-				return isSetBound();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
-				return isSetConstrained();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
-				return isSetDesignTime();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return alwaysIncompatible != ALWAYS_INCOMPATIBLE_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
-				return filterFlags != null && !filterFlags.isEmpty();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return fieldReadOnly != FIELD_READ_ONLY_EDEFAULT;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				return propertyEditorClass != null;
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
-				return isSetReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
-				return isSetWriteMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
-				return isSetField();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
-				return isSetIndexedReadMethod();
-			case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
-				return isSetIndexedWriteMethod();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetIndexedReadMethod() {
-		return indexedReadMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetIndexedWriteMethod() {
-		return indexedWriteMethod;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
deleted file mode 100644
index 75582b2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
+++ /dev/null
@@ -1,592 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: MethodDecoratorImpl.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-import java.util.*;
-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.EModelElement;
-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.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoFactory;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodDecorator;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodDecoratorImpl extends FeatureDecoratorImpl implements MethodDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long METHOD_PARAMETERS_IMPLICIT = 0x1L;
-	public static final long METHOD_PARAMETERS_DEFAULT = 02L;	// Special, means were created by default and not by implicit (from beaninfo).
-
-	/**
-	 * The default value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PARMS_EXPLICIT_EMPTY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isParmsExplicitEmpty()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean parmsExplicitEmpty = PARMS_EXPLICIT_EMPTY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSerParmDesc() <em>Ser Parm Desc</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSerParmDesc()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serParmDesc = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected MethodDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getMethodDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isParmsExplicitEmpty() {
-		return parmsExplicitEmpty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParmsExplicitEmpty(boolean newParmsExplicitEmpty) {
-		boolean oldParmsExplicitEmpty = parmsExplicitEmpty;
-		parmsExplicitEmpty = newParmsExplicitEmpty;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY, oldParmsExplicitEmpty, parmsExplicitEmpty));
-	}
-
-	/*
-	 * This is called if parms list not explicitly set and it was empty from BeanInfo or
-	 * this is from reflection. This becomes the default list based upon the method
-	 * we are attached to.
-	 */
-	private EList createDefaultParmsList() {
-		EList parmsList = this.getSerParmDesc();
-		parmsList.clear();
-		
-		setImplicitlySetBits(getImplicitlySetBits()|METHOD_PARAMETERS_DEFAULT);	// Mark as we implicitly filled it in.
-		List p = getMethodParameters();
-		if (p == null)
-			return parmsList;	// Couldn't get the list for some reason, so leave as is.
-		int psize = p.size();
-		for (int i=0; i<psize; i++) {
-			ParameterDecorator pd = BeaninfoFactory.eINSTANCE.createParameterDecorator();
-			JavaParameter jp = (JavaParameter) p.get(i);
-			pd.setName(jp.getName());
-			pd.setImplicitlySetBits(ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT);
-			pd.setParameter(jp);
-			parmsList.add(pd);
-		}
-		return parmsList;
-	}
-	
-	/*
-	 * Initialize the ParameterDecorators to hook up the JavaParameter they are describing.
-	 * This is called from ParameterDecorator when it finds that its JavaParameter has not been set.
-	 * This means that it was explicitly added and we need to setup the parms.
-	 * <p>
-	 * Note this an internal method for BeanInfo. It is not meant to be called by clients.
-	 */
-	void initializeParameters() {
-		if (this.serParmDesc == null)
-			return;
-		List mp = getMethodParameters();
-		if (mp.isEmpty())
-			return;	// Nothing that can be described.
-		int psize = Math.min(this.serParmDesc.size(), mp.size());
-		for (int i=0; i < psize; i++)
-			((ParameterDecorator) this.serParmDesc.get(i)).setParameter((JavaParameter) mp.get(i));
-	}
-
-
-	/*
-	 * Get the jem parameters from the method (jem method)
-	 */
-	private List getMethodParameters() {
-		// Get the method
-		Method m = null;
-		Object d = getEModelElement();
-		if (d instanceof Method)
-			m = (Method) d;
-		else 
-			if (d instanceof MethodProxy)
-				m = ((MethodProxy) d).getMethod();
-			else
-				return Collections.EMPTY_LIST;	// Not decorating correct object.
-		if (m == null)
-			return Collections.EMPTY_LIST;	// Couldn't find the method.
-		List p = m.getParameters();
-		return p;
-	}
-			
-			
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (parmsExplicitEmpty: ");
-		result.append(parmsExplicitEmpty);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
-	 */
-	public EList getParameterDescriptors() {
-		if (!isParmsExplicitEmpty() && getSerParmDesc().isEmpty() && (getImplicitlySetBits()&(METHOD_PARAMETERS_IMPLICIT | METHOD_PARAMETERS_DEFAULT)) == 0) {
-			// Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
-			createDefaultParmsList();
-		}
-		return getSerParmDesc();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getParameterDescriptorsGen() {
-		// TODO: implement this method to return the 'Parameter Descriptors' reference list
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSerParmDesc() {
-		if (serParmDesc == null) {
-			serParmDesc = new EObjectContainmentEList(ParameterDecorator.class, this, BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC);
-		}
-		return serParmDesc;
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, 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 BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-					return ((InternalEList)getSerParmDesc()).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 BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.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 BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				return isParmsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return getParameterDescriptors();
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				return getSerParmDesc();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				setParmsExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				getParameterDescriptors().clear();
-				getParameterDescriptors().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				getSerParmDesc().clear();
-				getSerParmDesc().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				setParmsExplicitEmpty(PARMS_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				getParameterDescriptors().clear();
-				return;
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				getSerParmDesc().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/*
-	 * This is overridden so that we can do special is set tests:
-	 * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
-	 * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
-	 *    out the unneeded default parms. They can be reconstructed quickly when needed.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-					return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return eIsSetGen(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc());	// Let default serParmDesc is set work.
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				if ((getImplicitlySetBits() & METHOD_PARAMETERS_DEFAULT) != 0)
-					return false;	// Not considered set if initialized by default.
-				else
-					return eIsSetGen(eFeature);	// Not set by default, so check true setting.
-			default:
-				return eIsSetGen(eFeature);	// Everything else use the gen method.
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
-				return mergeIntrospection != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return attributesExplicitEmpty != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
-				return parmsExplicitEmpty != PARMS_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
-				return !getParameterDescriptors().isEmpty();
-			case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
-				return serParmDesc != null && !serParmDesc.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
deleted file mode 100644
index 6ce4dc9..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
+++ /dev/null
@@ -1,342 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: MethodProxyImpl.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-
-
-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.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.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.java.Method;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodProxyImpl extends EOperationImpl implements MethodProxy {
-	/**
-	 * The cached value of the '{@link #getMethod() <em>Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method method = null;
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected MethodProxyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getMethodProxy();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getMethod() {
-		if (method != null && method.eIsProxy()) {
-			Method oldMethod = method;
-			method = (Method)eResolveProxy((InternalEObject)method);
-			if (method != oldMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
-			}
-		}
-		return method;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetMethod() {
-		return method;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMethod(Method newMethod) {
-		Method oldMethod = method;
-		method = newMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.METHOD_PROXY__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_PROXY__ECONTAINING_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.METHOD_PROXY__ECONTAINING_CLASS, msgs);
-				case BeaninfoPackage.METHOD_PROXY__EPARAMETERS:
-					return ((InternalEList)getEParameters()).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 BeaninfoPackage.METHOD_PROXY__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.METHOD_PROXY__ECONTAINING_CLASS:
-					return eBasicSetContainer(null, BeaninfoPackage.METHOD_PROXY__ECONTAINING_CLASS, msgs);
-				case BeaninfoPackage.METHOD_PROXY__EPARAMETERS:
-					return ((InternalEList)getEParameters()).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 BeaninfoPackage.METHOD_PROXY__ECONTAINING_CLASS:
-					return eContainer.eInverseRemove(this, EcorePackage.ECLASS__EOPERATIONS, 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 BeaninfoPackage.METHOD_PROXY__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.METHOD_PROXY__NAME:
-				return getName();
-			case BeaninfoPackage.METHOD_PROXY__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_PROXY__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_PROXY__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case BeaninfoPackage.METHOD_PROXY__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case BeaninfoPackage.METHOD_PROXY__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_PROXY__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.METHOD_PROXY__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case BeaninfoPackage.METHOD_PROXY__ECONTAINING_CLASS:
-				return getEContainingClass();
-			case BeaninfoPackage.METHOD_PROXY__EPARAMETERS:
-				return getEParameters();
-			case BeaninfoPackage.METHOD_PROXY__EEXCEPTIONS:
-				return getEExceptions();
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				if (resolve) return getMethod();
-				return basicGetMethod();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_PROXY__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__NAME:
-				setName((String)newValue);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_PROXY__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.METHOD_PROXY__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case BeaninfoPackage.METHOD_PROXY__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case BeaninfoPackage.METHOD_PROXY__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__EPARAMETERS:
-				getEParameters().clear();
-				getEParameters().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__EEXCEPTIONS:
-				getEExceptions().clear();
-				getEExceptions().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				setMethod((Method)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_PROXY__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.METHOD_PROXY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case BeaninfoPackage.METHOD_PROXY__EPARAMETERS:
-				getEParameters().clear();
-				return;
-			case BeaninfoPackage.METHOD_PROXY__EEXCEPTIONS:
-				getEExceptions().clear();
-				return;
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				setMethod((Method)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.METHOD_PROXY__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.METHOD_PROXY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BeaninfoPackage.METHOD_PROXY__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case BeaninfoPackage.METHOD_PROXY__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case BeaninfoPackage.METHOD_PROXY__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case BeaninfoPackage.METHOD_PROXY__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case BeaninfoPackage.METHOD_PROXY__MANY:
-				return isMany() != MANY_EDEFAULT;
-			case BeaninfoPackage.METHOD_PROXY__REQUIRED:
-				return isRequired() != REQUIRED_EDEFAULT;
-			case BeaninfoPackage.METHOD_PROXY__ETYPE:
-				return eType != null;
-			case BeaninfoPackage.METHOD_PROXY__ECONTAINING_CLASS:
-				return getEContainingClass() != null;
-			case BeaninfoPackage.METHOD_PROXY__EPARAMETERS:
-				return eParameters != null && !eParameters.isEmpty();
-			case BeaninfoPackage.METHOD_PROXY__EEXCEPTIONS:
-				return eExceptions != null && !eExceptions.isEmpty();
-			case BeaninfoPackage.METHOD_PROXY__METHOD:
-				return method != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
deleted file mode 100644
index 1fb9397..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
+++ /dev/null
@@ -1,522 +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
- *******************************************************************************/
-/*
- *  $RCSfile: ParameterDecoratorImpl.java,v $
- *  $Revision: 1.6 $  $Date: 2005/04/14 19:05:36 $ 
- */
-package org.eclipse.jem.internal.beaninfo.impl;
-
-
-
-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.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-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.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-public class ParameterDecoratorImpl extends FeatureDecoratorImpl implements ParameterDecorator{
-	
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long PARAMETER_NAME_IMPLICIT = 0x1L;
-
-	/**
-	 * 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;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParameterDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getParameterDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * 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 #getParameter() <em>Parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameter()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaParameter parameter = null;
-	
-	/**
-	 * <!-- 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, BeaninfoPackage.PARAMETER_DECORATOR__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * Flag for if we tried to link up this parameter to java parm.
-	 */
-	private boolean triedOnce;
-	
-	/**
-	 * The JavaParameter that this ParameterDecorator is decorating.
-	 */
-	public JavaParameter getParameter() {
-		if (!eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Parameter()) && !triedOnce) {
-			// Need to try to fill in the parameter setting.
-			triedOnce = true;
-			EObject container = eContainer();	// See if we are in a MethodDecorator.
-			if (container instanceof MethodDecoratorImpl)
-				((MethodDecoratorImpl) container).initializeParameters();
-		}
-		
-		return getParameterGen();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaParameter getParameterGen() {
-		if (parameter != null && parameter.eIsProxy()) {
-			JavaParameter oldParameter = parameter;
-			parameter = (JavaParameter)eResolveProxy((InternalEObject)parameter);
-			if (parameter != oldParameter) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
-			}
-		}
-		return parameter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaParameter basicGetParameter() {
-		return parameter;
-	}
-
-	public void setParameter(JavaParameter newParameter) {
-		if (newParameter == null)
-			triedOnce = false;
-		setParameterGen(newParameter);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParameterGen(JavaParameter newParameter) {
-		JavaParameter oldParameter = parameter;
-		parameter = newParameter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, 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 BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).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 BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.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 BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				return getName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				if (resolve) return getParameter();
-				return basicGetParameter();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				setName((String)newValue);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				setParameter((JavaParameter)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				setParameter((JavaParameter)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
-				return mergeIntrospection != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return attributesExplicitEmpty != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
-				return parameter != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
deleted file mode 100644
index 57d46a8..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
+++ /dev/null
@@ -1,1162 +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.jem.internal.beaninfo.impl;
-/*
- *  $RCSfile: PropertyDecoratorImpl.java,v $
- *  $Revision: 1.12 $  $Date: 2005/05/11 19:01:28 $ 
- */
-
-
-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.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-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.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isBound <em>Bound</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isConstrained <em>Constrained</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isDesignTime <em>Design Time</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getFilterFlags <em>Filter Flags</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isFieldReadOnly <em>Field Read Only</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getReadMethod <em>Read Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getWriteMethod <em>Write Method</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class PropertyDecoratorImpl extends FeatureDecoratorImpl implements PropertyDecorator{
-
-	/**
-	 * Bits for implicitly set features. This is internal, not meant for clients.
-	 */
-	public static final long PROPERTY_EDITOR_CLASS_IMPLICIT = 0x1L;
-	public static final long PROPERTY_TYPE_IMPLICIT = 0x2L;
-	public static final long PROPERTY_READMETHOD_IMPLICIT = 0x4L;
-	public static final long PROPERTY_WRITEMETHOD_IMPLICIT = 0x8L;
-	public static final long PROPERTY_BOUND_IMPLICIT = 0x10L;
-	public static final long PROPERTY_CONSTRAINED_IMPLICIT = 0x20L;
-	public static final long PROPERTY_DESIGNTIME_IMPLICIT = 0x40L;
-	public static final long PROPERTY_FIELD_IMPLICIT = 0x80L;
-	
-	
-	/**
-	 * The default value of the '{@link #isBound() <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean BOUND_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isBound() <em>Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBound()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bound = BOUND_EDEFAULT;
-
-	/**
-	 * This is true if the Bound attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean boundESet = false;
-
-	/**
-	 * The default value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstrained()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CONSTRAINED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstrained()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean constrained = CONSTRAINED_EDEFAULT;
-
-	/**
-	 * This is true if the Constrained attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean constrainedESet = false;
-
-	/**
-	 * The default value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDesignTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DESIGN_TIME_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDesignTime()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean designTime = DESIGN_TIME_EDEFAULT;
-
-	/**
-	 * This is true if the Design Time attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean designTimeESet = false;
-
-	/**
-	 * The default value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ALWAYS_INCOMPATIBLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAlwaysIncompatible()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean alwaysIncompatible = ALWAYS_INCOMPATIBLE_EDEFAULT;
-		
-	/**
-	 * The cached value of the '{@link #getFilterFlags() <em>Filter Flags</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFilterFlags()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList filterFlags = null;
-	/**
-	 * The default value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FIELD_READ_ONLY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFieldReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fieldReadOnly = FIELD_READ_ONLY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPropertyEditorClass() <em>Property Editor Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPropertyEditorClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass propertyEditorClass = null;
-	/**
-	 * The cached value of the '{@link #getReadMethod() <em>Read Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReadMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method readMethod = null;
-	/**
-	 * This is true if the Read Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean readMethodESet = false;
-
-	/**
-	 * The cached value of the '{@link #getWriteMethod() <em>Write Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWriteMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected Method writeMethod = null;
-	
-	/**
-	 * This is true if the Write Method reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean writeMethodESet = false;
-
-	/**
-	 * The cached value of the '{@link #getField() <em>Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getField()
-	 * @generated
-	 * @ordered
-	 */
-	protected Field field = null;
-
-	/**
-	 * This is true if the Field reference has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fieldESet = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected PropertyDecoratorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return BeaninfoPackage.eINSTANCE.getPropertyDecorator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isBound() {
-		return bound;
-	}
-
-	public EClassifier getPropertyType() {
-		EStructuralFeature feature = (EStructuralFeature) getEModelElement();
-		return (feature != null) ? feature.getEType() : null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBound(boolean newBound) {
-		boolean oldBound = bound;
-		bound = newBound;
-		boolean oldBoundESet = boundESet;
-		boundESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, bound, !oldBoundESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBound() {
-		boolean oldBound = bound;
-		boolean oldBoundESet = boundESet;
-		bound = BOUND_EDEFAULT;
-		boundESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, BOUND_EDEFAULT, oldBoundESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBound() {
-		return boundESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isConstrained() {
-		return constrained;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConstrained(boolean newConstrained) {
-		boolean oldConstrained = constrained;
-		constrained = newConstrained;
-		boolean oldConstrainedESet = constrainedESet;
-		constrainedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED, oldConstrained, constrained, !oldConstrainedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetConstrained() {
-		boolean oldConstrained = constrained;
-		boolean oldConstrainedESet = constrainedESet;
-		constrained = CONSTRAINED_EDEFAULT;
-		constrainedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED, oldConstrained, CONSTRAINED_EDEFAULT, oldConstrainedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetConstrained() {
-		return constrainedESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDesignTime() {
-		return designTime;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDesignTime(boolean newDesignTime) {
-		boolean oldDesignTime = designTime;
-		designTime = newDesignTime;
-		boolean oldDesignTimeESet = designTimeESet;
-		designTimeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME, oldDesignTime, designTime, !oldDesignTimeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDesignTime() {
-		boolean oldDesignTime = designTime;
-		boolean oldDesignTimeESet = designTimeESet;
-		designTime = DESIGN_TIME_EDEFAULT;
-		designTimeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME, oldDesignTime, DESIGN_TIME_EDEFAULT, oldDesignTimeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDesignTime() {
-		return designTimeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isAlwaysIncompatible() {
-		return alwaysIncompatible;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlwaysIncompatible(boolean newAlwaysIncompatible) {
-		boolean oldAlwaysIncompatible = alwaysIncompatible;
-		alwaysIncompatible = newAlwaysIncompatible;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE, oldAlwaysIncompatible, alwaysIncompatible));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getFilterFlags() {
-		if (filterFlags == null) {
-			filterFlags = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS);
-		}
-		return filterFlags;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFieldReadOnly() {
-		return fieldReadOnly;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFieldReadOnly(boolean newFieldReadOnly) {
-		boolean oldFieldReadOnly = fieldReadOnly;
-		fieldReadOnly = newFieldReadOnly;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY, oldFieldReadOnly, fieldReadOnly));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getPropertyEditorClass() {
-		if (propertyEditorClass != null && propertyEditorClass.eIsProxy()) {
-			JavaClass oldPropertyEditorClass = propertyEditorClass;
-			propertyEditorClass = (JavaClass)eResolveProxy((InternalEObject)propertyEditorClass);
-			if (propertyEditorClass != oldPropertyEditorClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS, oldPropertyEditorClass, propertyEditorClass));
-			}
-		}
-		return propertyEditorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPropertyEditorClass(JavaClass newPropertyEditorClass) {
-		JavaClass oldPropertyEditorClass = propertyEditorClass;
-		propertyEditorClass = newPropertyEditorClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS, oldPropertyEditorClass, propertyEditorClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getReadMethod() {
-		if (readMethod != null && readMethod.eIsProxy()) {
-			Method oldReadMethod = readMethod;
-			readMethod = (Method)eResolveProxy((InternalEObject)readMethod);
-			if (readMethod != oldReadMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, readMethod));
-			}
-		}
-		return readMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReadMethod(Method newReadMethod) {
-		Method oldReadMethod = readMethod;
-		readMethod = newReadMethod;
-		boolean oldReadMethodESet = readMethodESet;
-		readMethodESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, readMethod, !oldReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReadMethod() {
-		Method oldReadMethod = readMethod;
-		boolean oldReadMethodESet = readMethodESet;
-		readMethod = null;
-		readMethodESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, null, oldReadMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReadMethod() {
-		return readMethodESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method getWriteMethod() {
-		if (writeMethod != null && writeMethod.eIsProxy()) {
-			Method oldWriteMethod = writeMethod;
-			writeMethod = (Method)eResolveProxy((InternalEObject)writeMethod);
-			if (writeMethod != oldWriteMethod) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, writeMethod));
-			}
-		}
-		return writeMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWriteMethod(Method newWriteMethod) {
-		Method oldWriteMethod = writeMethod;
-		writeMethod = newWriteMethod;
-		boolean oldWriteMethodESet = writeMethodESet;
-		writeMethodESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, writeMethod, !oldWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetWriteMethod() {
-		Method oldWriteMethod = writeMethod;
-		boolean oldWriteMethodESet = writeMethodESet;
-		writeMethod = null;
-		writeMethodESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, null, oldWriteMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetWriteMethod() {
-		return writeMethodESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Field getField() {
-		if (field != null && field.eIsProxy()) {
-			Field oldField = field;
-			field = (Field)eResolveProxy((InternalEObject)field);
-			if (field != oldField) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, field));
-			}
-		}
-		return field;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Field basicGetField() {
-		return field;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setField(Field newField) {
-		Field oldField = field;
-		field = newField;
-		boolean oldFieldESet = fieldESet;
-		fieldESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, field, !oldFieldESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetField() {
-		Field oldField = field;
-		boolean oldFieldESet = fieldESet;
-		field = null;
-		fieldESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, null, oldFieldESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetField() {
-		return fieldESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (bound: ");
-		if (boundESet) result.append(bound); else result.append("<unset>");
-		result.append(", constrained: ");
-		if (constrainedESet) result.append(constrained); else result.append("<unset>");
-		result.append(", designTime: ");
-		if (designTimeESet) result.append(designTime); else result.append("<unset>");
-		result.append(", alwaysIncompatible: ");
-		result.append(alwaysIncompatible);
-		result.append(", filterFlags: ");
-		result.append(filterFlags);
-		result.append(", fieldReadOnly: ");
-		result.append(fieldReadOnly);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetPropertyEditorClass() {
-		return propertyEditorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetReadMethod() {
-		return readMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Method basicGetWriteMethod() {
-		return writeMethod;
-	}
-
-	/**
-	 * <!-- 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 BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT, 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 BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-					return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eBasicSetContainer(null, BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-					return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
-				case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).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 BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-					return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.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 BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				return getEAnnotations();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				return getSource();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				return getDetails();
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				return getContents();
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				return getReferences();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				return getDisplayName();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return getShortDescription();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				return getCategory();
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				return isExpert() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				return isHidden() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return new Long(getImplicitlySetBits());
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return getImplicitDecoratorFlag();
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				return getAttributes();
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				return isBound() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				return isConstrained() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				return isDesignTime() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return isAlwaysIncompatible() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				return getFilterFlags();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return isFieldReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				if (resolve) return getPropertyEditorClass();
-				return basicGetPropertyEditorClass();
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				if (resolve) return getReadMethod();
-				return basicGetReadMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				if (resolve) return getWriteMethod();
-				return basicGetWriteMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				if (resolve) return getField();
-				return basicGetField();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				setSource((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				getDetails().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				getContents().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				getReferences().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				setShortDescription((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				setCategory((String)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				setExpert(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				setHidden(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				setPreferred(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(((Long)newValue).longValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag((ImplicitItem)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				setBound(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				setConstrained(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				setDesignTime(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				getFilterFlags().addAll((Collection)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(((Boolean)newValue).booleanValue());
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				setReadMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				setWriteMethod((Method)newValue);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				setField((Field)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				getDetails().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				setEModelElement((EModelElement)null);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				getContents().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				getReferences().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				unsetDisplayName();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				unsetShortDescription();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				setCategory(CATEGORY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				unsetExpert();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				unsetHidden();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				unsetPreferred();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				unsetBound();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				unsetConstrained();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				unsetDesignTime();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				setAlwaysIncompatible(ALWAYS_INCOMPATIBLE_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				getFilterFlags().clear();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				setFieldReadOnly(FIELD_READ_ONLY_EDEFAULT);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				setPropertyEditorClass((JavaClass)null);
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				unsetReadMethod();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				unsetWriteMethod();
-				return;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				unsetField();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				return isSourceSet();	// Override so that if set to the same as classname, then it is considered not set.
-			default:
-				return eIsSetGen(eFeature);
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSetGen(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
-				return details != null && !details.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
-				return getEModelElement() != null;
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
-				return contents != null && !contents.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
-				return references != null && !references.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
-				return isSetDisplayName();
-			case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
-				return isSetShortDescription();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
-				return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
-			case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
-				return isSetExpert();
-			case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
-				return isSetHidden();
-			case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
-				return isSetPreferred();
-			case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
-				return mergeIntrospection != MERGE_INTROSPECTION_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
-				return attributesExplicitEmpty != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
-				return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
-				return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
-				return isSetBound();
-			case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
-				return isSetConstrained();
-			case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
-				return isSetDesignTime();
-			case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
-				return alwaysIncompatible != ALWAYS_INCOMPATIBLE_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
-				return filterFlags != null && !filterFlags.isEmpty();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
-				return fieldReadOnly != FIELD_READ_ONLY_EDEFAULT;
-			case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
-				return propertyEditorClass != null;
-			case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
-				return isSetReadMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
-				return isSetWriteMethod();
-			case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
-				return isSetField();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isWriteable()
-	 */
-	public boolean isWriteable() {
-		return getWriteMethod() != null || (getField() != null && !isFieldReadOnly()); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isReadable()
-	 */
-	public boolean isReadable() {
-		return getReadMethod() != null || getField() != null;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
deleted file mode 100644
index d2eb5c2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: BeanRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the BeanDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the BeanDescriptor. 
- * @since 1.1.0
- */
-public class BeanRecord extends FeatureRecord {
-
-	private static final long serialVersionUID = 1105979920664L;
-	
-	public String customizerClassName;
-	public boolean mergeInheritedProperties;
-	public boolean mergeInheritedOperations;
-	public boolean mergeInheritedEvents;
-	/**
-	 * Names of properties that are to not be inherited in getAllProperties(). It is set only
-	 * if the list is not the full list of inherited properties.
-	 * If all inherited or mergeInheritedProperties is false, then the field will be <code>null</code>. Save space that way.
-	 */
-	public String[] notInheritedPropertyNames;
-	/**
-	 * Names of operations that are to not be inherited in getEAllOperations(). It is set only
-	 * if the list is not the full list of inherited operations. 
-	 * If all are inherited or if mergeInheritedOperations is false, then the field will be <code>null</code>. Save space that way.
-	 */
-	public String[] notInheritedOperationNames;
-	/**
-	 * Names of events that are to not be inherited in getAllEvents(). It is set only
-	 * if the list is not the full list of inherited events.
-	 * If all are inherited or if mergeInheritedEvents is false, then the field will be <code>null</code>. Save space that way.
-	 */
-	public String[] notInheritedEventNames;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
deleted file mode 100644
index e0f47e7..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: EventSetRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the EventSetDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the EventSetDescriptor. 
- * @since 1.1.0
- */
-public class EventSetRecord extends FeatureRecord {
-	
-	private static final long serialVersionUID = 1105980773420L;
-	
-	public ReflectMethodRecord addListenerMethod;
-	public String eventAdapterClassName;
-	public MethodRecord[] listenerMethodDescriptors;
-	public String listenerTypeName;
-	public ReflectMethodRecord removeListenerMethod;
-	public boolean inDefaultEventSet;
-	public boolean unicast;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
deleted file mode 100644
index b0522d2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
+++ /dev/null
@@ -1,719 +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: FeatureAttributeValue.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/12 13:59:17 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.*;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-
- 
-
-/**
- * This is the value for a FeatureAttribute. It wrappers the true java object.
- * Use the getObject method to get the java value.
- * <p>
- * We can only represent Strings, primitives, and arrays. (Primitives will converted
- * to their wrapper class (e.g. Long), and byte, short, and int will move up to Long,
- * and float will move up to Double).  And any kind of valid array on the java BeanInfo side
- * will be converted to an Object array on the IDE side. We don't have the capability to allow more complex objects 
- * because the IDE may not have the necessary classes available to it that 
- * the BeanInfo may of had available to it. Invalid objects will be represented
- * by the singleton instance of {@link org.eclipse.jem.internal.beaninfo.common.InvalidObject}.
- * <p>
- * <b>Note:</b>
- * Class objects that are values of Feature attributes on the java BeanInfo side will be
- * converted to simple strings containing the classname when moved to the client (IDE) side.
- * That is because the classes probably will not be available on the IDE side, but can be
- * used to reconstruct the class when used back on the java vm side. 
- * @since 1.1.0
- */
-public class FeatureAttributeValue implements Serializable {
-	
-	private transient Object value;
-	private transient Object internalValue;
-	private static final long serialVersionUID = 1105717634844L;
-	
-	/**
-	 * Create the value with the given init string.
-	 * <p>
-	 * This is not meant to be used by clients.
-	 * @param initString
-	 * 
-	 * @since 1.1.0
-	 */
-	public FeatureAttributeValue(String initString) {
-		// Use the init string to create the value. This is our
-		// own short-hand for this.
-		value = parseString(initString);
-	}
-	
-	/**
-	 * This is used when customer wants to fluff one up.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	public FeatureAttributeValue() {
-		
-	}
-
-	/**
-	 * @return Returns the value.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Object getValue() {
-		return value;
-	}
-	
-	/**
-	 * Set a value.
-	 * @param value The value to set.
-	 * @since 1.1.0
-	 */
-	public void setValue(Object value) {
-		this.value = value;
-		this.setInternalValue(null);
-	}
-		
-	/**
-	 * Set the internal value.
-	 * @param internalValue The internalValue to set.
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setInternalValue(Object internalValue) {
-		this.internalValue = internalValue;
-	}
-
-	/**
-	 * This is the internal value. It is the <code>value</code> massaged into an easier to use form
-	 * in the IDE. It will not be serialized out. It will not be reconstructed from an init string.
-	 * <p> 
-	 * It does not need to be used. It will be cleared if
-	 * a new value is set. For example, if the value is a complicated array (because you can't have
-	 * special classes in the attribute value on the BeanInfo side) the first usage of this value can
-	 * be translated into an easier form to use, such as a map.
-	 * 
-	 * @return Returns the internalValue.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Object getInternalValue() {
-		return internalValue;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (value == null)
-			return super.toString();
-		return makeString(value);
-	}
-	
-
-	/**
-	 * Helper method to take the object and turn it into the
-	 * string form that is required for EMF serialization.
-	 * <p>
-	 * This is used internally. It can be used for development 
-	 * purposes by clients, but they would not have any real
-	 * runtime need for this.
-	 * <p>
-	 * Output format would be (there won't be any newlines in the actual string)
-	 * <pre>
-	 *   String: "zxvzxv"
-	 *   Number: number
-	 *   Boolean: true or false
-	 *   Character: 'c'
-	 *   null: null
-	 * 
-	 *   Array: (all arrays will be turned into Object[])
-	 *     [dim]{e1, e2}
-	 *     [dim1][dim2]{[dim1a]{e1, e2}, [dim2a]{e3, e4}}
-	 *   where en are objects that follow the pattern for single output above.
-	 * 
-	 *   Any invalid object (i.e. not one of the ones we handle) will be:
-	 *     INV
-	 * 
-	 *   Arrays of invalid types (not Object, String, Number, Boolean, Character,
-	 *     or primitives) will be marked as INV.
-	 * </pre>
-	 * @param value
-	 * @return serialized form as a string.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String makeString(Object value) {
-		StringBuffer out = new StringBuffer(100);
-		makeString(value, out);
-		return out.toString();
-	}
-	
-	private static final Pattern QUOTE = Pattern.compile("\"");	// Pattern for searching for double-quote. Make it static so don't waste time compiling each time.
-	private static final String NULL = "null";	// Output string for null
-	private static final String INVALID = "INV";	// Invalid object flag.
-	
-	/*
-	 * Used for recursive building of the string.
-	 */
-	private static void makeString(Object value, StringBuffer out) {
-		if (value == null)
-			out.append(NULL);
-		else if (value instanceof String || value instanceof Class) {
-			// String: "string" or "string\"stringend" if str included a double-quote.
-			out.append('"');
-			// If class, turn value into the classname.
-			String str = value instanceof String ? (String) value : ((Class) value).getName();
-			if (str.indexOf('"') != -1) {
-				// Replace double-quote with escape double-quote so we can distinquish it from the terminating double-quote.
-				out.append(QUOTE.matcher(str).replaceAll("\\\\\""));	// Don't know why we need the back-slash to be doubled for replaceall, but it doesn't work otherwise.
-			} else
-				out.append(str);
-			out.append('\"');
-		} else if (value instanceof Number) {
-			// Will go out as either a integer number or a floating point number. 
-			// When read back in it will be either a Long or a Double.
-			out.append(value);
-		} else if (value instanceof Boolean) {
-			// It will go out as either true or false.
-			out.append(value);
-		} else if (value instanceof Character) {
-			// Character: 'c' or '\'' if char was a quote.
-			out.append('\'');
-			Character c = (Character) value;
-			if (c.charValue() != '\'')
-				out.append(c.charValue());
-			else
-				out.append("\\'");
-			out.append('\'');
-		} else if (value.getClass().isArray()) {
-			// Handle array format.
-			Class type = value.getClass();
-			// See if final type is a valid type.
-			Class ft = type.getComponentType();
-			int dims = 1;
-			while (ft.isArray()) {
-				dims++;
-				ft = ft.getComponentType();
-			}
-			if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || Number.class.isAssignableFrom(ft)) {
-				// [length][][] {....}
-				out.append('[');
-				int length = Array.getLength(value); 
-				out.append(length);
-				out.append(']');
-				while(--dims > 0) {
-					out.append("[]");
-				}
-				out.append('{');
-				for (int i=0; i < length; i++) {
-					if (i != 0)
-						out.append(',');
-					makeString(Array.get(value, i), out);
-				}
-				out.append('}');
-			} else
-				out.append(INVALID);	// Any other kind of array is invalid.
-		} else {
-			out.append(INVALID);
-		}
-	}
-	
-	
-	/**
-	 * Helper method to take the string input from EMF serialization and turn it
-	 * into an Object.
-	 * <p>
-	 * This is used internally. It can be used for development 
-	 * purposes by clients, but they would not have any real
-	 * runtime need for this.
-	 * <p>
-	 * The object will be an object, null, or an Object array. Any value
-	 * that is invalid will be set to the {@link InvalidObject#INSTANCE} static
-	 * instance.
-	 * 
-	 * @param input
-	 * @return object decoded from the input.
-	 * 
-	 * @see #makeString(Object)
-	 * @since 1.1.0
-	 */
-	public static Object parseString(String input) {
-		return parseString(new StringParser(input));
-	}
-	
-	private static class StringParser {
-		private int next=0;
-		private int length;
-		private String input;
-		
-		public StringParser(String input) {
-			this.input = input;
-			this.length = input.length();
-		}
-		
-		public void skipWhitespace() {
-			while(next < length) {
-				if (!Character.isWhitespace(input.charAt(next++))) {
-					next--;	// Put it back as not yet read since it is not whitespace.
-					break;
-				}
-			}
-		}
-		
-		/**
-		 * Return the next index
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public int nextIndex() {
-			return next;
-		}
-		
-		/**
-		 * Get the length of the input
-		 * @return input length
-		 * 
-		 * @since 1.1.0
-		 */
-		public int getLength() {
-			return length;
-		}
-		
-		
-		/**
-		 * Read the current character and go to next.
-		 * @return current character
-		 * 
-		 * @since 1.1.0
-		 */
-		public char read() {
-			return next<length ? input.charAt(next++) : 0;
-		}
-		
-		/**
-		 * Backup the parser one character.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		public void backup() {
-			if (--next < 0)
-				next = 0;
-		}
-		
-		/**
-		 * Peek at the char at the next index, but don't increment afterwards.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public char peek() {
-			return next<length ? input.charAt(next) : 0;
-		}
-		
-		/**
-		 * Have we read the last char.
-		 * @return <code>true</code> if read last char.
-		 * 
-		 * @since 1.1.0
-		 */
-		public boolean atEnd() {
-			return next>=length;
-		}
-		
-		/**
-		 * Reset to the given next index.
-		 * @param nextIndex the next index to do a read at.
-		 * 
-		 * @since 1.1.0
-		 */
-		public void reset(int nextIndex) {
-			if (nextIndex<=length)
-				next = nextIndex;
-			else
-				next = length;
-		}
-		
-		/**
-		 * Skip the next number of chars.
-		 * @param skip number of chars to skip.
-		 * 
-		 * @since 1.1.0
-		 */
-		public void skip(int skip) {
-			if ((next+=skip) > length)
-				next = length;
-		}
-		
-		/**
-		 * Return the string input.
-		 * @return the string input
-		 * 
-		 * @since 1.1.0
-		 */
-		public String getInput() {
-			return input;
-		}
-				
-	}
-	
-	/*
-	 * Starting a parse for an object at the given index.
-	 * Return the parsed object or InvalidObject if no
-	 * object or if there was an error parsing.
-	 */
-	private static Object parseString(StringParser parser) {
-		parser.skipWhitespace();
-		if (!parser.atEnd()) {
-			char c = parser.read();
-			switch (c) {
-				case '"':
-					// Start of a quoted string. Scan for closing quote, ignoring escaped quotes.
-					int start = parser.nextIndex();	// Index of first char after '"'
-					char[] dequoted = null;	// Used if there is an escaped quote. That is the only thing we support escape on, quotes.
-					int dequoteIndex = 0;
-					while (!parser.atEnd()) {
-						char cc = parser.read();
-						if (cc == '"') {
-							// If we didn't dequote, then just do substring.
-							if (dequoted == null)
-								return parser.getInput().substring(start, parser.nextIndex()-1);	// next is char after '"', so end of string index is index of '"'
-							else {
-								// We have a dequoted string. So turn into a string.
-								// Gather the last group
-								int endNdx = parser.nextIndex()-1;
-								parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex);
-								dequoteIndex+= (endNdx-start);
-								return new String(dequoted, 0, dequoteIndex);
-							}
-						} else if (cc == '\\') {
-							// We had an escape, see if next is a quote. If it is we need to strip out the '\'.
-							if (parser.peek() == '"') {
-								if (dequoted == null) {
-									dequoted = new char[parser.getLength()];
-								}
-								int endNdx = parser.nextIndex()-1;
-								parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex);	// Get up to, but not including '\'
-								dequoteIndex+= (endNdx-start);
-								// Now also add in the escaped quote.
-								dequoted[dequoteIndex++] = parser.read();
-								start = parser.nextIndex();	// Next group is from next index.
-							}
-						}
-					}
-					break;	// If we got here, it is invalid.
-					
-				case '-':
-				case '0':
-				case '1':
-				case '2':
-				case '3':
-				case '4':
-				case '5':
-				case '6':
-				case '7':
-				case '8':
-				case '9':
-					// Possible number.
-					// Scan to next non-digit, or not part of valid number.
-					boolean numberComplete = false;
-					boolean floatType = false;
-					boolean foundE = false;
-					boolean foundESign = false;
-					start = parser.nextIndex()-1;	// We want to include the sign or first digit in the number.
-					while (!parser.atEnd() && !numberComplete) {
-						char cc = parser.read();
-						switch (cc) {
-							case '0':
-							case '1':
-							case '2':
-							case '3':
-							case '4':
-							case '5':
-							case '6':
-							case '7':
-							case '8':
-							case '9':
-								break;	// This is good, go on.
-							case '.':
-								if (floatType)
-									return InvalidObject.INSTANCE;	// We already found a '.', two are invalid.
-								floatType = true;
-								break;
-							case 'e':
-							case 'E':
-								if (foundE)
-									return InvalidObject.INSTANCE;	// We already found a 'e', two are invalid.
-								foundE = true;
-								floatType = true;	// An 'e' makes it a float, if not already.
-								break;
-							case '+':
-							case '-':
-								if (!foundE || foundESign) 
-									return InvalidObject.INSTANCE;	// A +/- with no 'e' first is invalid. Or more than one sign.
-								foundESign = true;
-								break;
-							default:
-								// Anything else is end of number.
-								parser.backup();	// Back it up so that next parse will start with this char.
-								numberComplete = true;	// So we stop scanning
-								break;
-						}
-					}
-					try {
-						if (!floatType)
-							return Long.valueOf(parser.getInput().substring(start, parser.nextIndex()));
-						else
-							return Double.valueOf(parser.getInput().substring(start, parser.nextIndex()));
-					} catch (NumberFormatException e) {
-					}
-					break; // If we got here, it is invalid.
-					
-				case 't':
-				case 'T':
-				case 'f':
-				case 'F':
-					// Possible boolean.
-					if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "true", 0, 4)) {
-						parser.skip(3);	// Skip over rest of string.
-						return Boolean.TRUE;
-					} else if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "false", 0, 5)) {
-						parser.skip(4);	// Skip over rest of string.
-						return Boolean.FALSE;						
-					}
-					break; // If we got here, it is invalid.
-					
-				case '\'':
-					// Possible character
-					char cc = parser.read();
-					// We really only support '\\' and '\'' anything else will be treated as ignore '\' because we don't know handle full escapes.
-					if (cc == '\\')
-						cc = parser.read();	// Get what's after it.
-					else if (cc == '\'')
-						break;	// '' is invalid.
-					if (parser.peek() == '\'') {
-						// So next char after "character" is is a quote. This is good.
-						parser.read();	// Now consume the quote
-						return new Character(cc);
-					}
-					break; // If we got here, it is invalid.
-					
-				case 'n':
-					// Possible null.
-					if (parser.getInput().regionMatches(parser.nextIndex()-1, "null", 0, 4)) {
-						parser.skip(3);	// Skip over rest of string.
-						return null;
-					}
-					break; // If we got here, it is invalid.
-					
-				case 'I':
-					// Possible invalid value.
-					if (parser.getInput().regionMatches(parser.nextIndex()-1, INVALID, 0, INVALID.length())) {
-						parser.skip(INVALID.length()-1);	// Skip over rest of string.
-						return InvalidObject.INSTANCE;
-					}
-					break; // If we got here, it is invalid.
-					
-				case '[':
-					// Possible array.
-					// The next field should be a number, so we'll use parseString to get the number. 
-					Object size = parseString(parser);
-					if (size instanceof Long) {
-						parser.skipWhitespace();
-						cc = parser.read();	// Se if next is ']'
-						if (cc == ']') {
-							// Good, well-formed first dimension
-							int dim = 1;
-							boolean valid = true;
-							// See if there are more of just "[]". the number of them is the dim.
-							while (true) {
-								parser.skipWhitespace();
-								cc = parser.read();
-								if (cc == '[') {
-									parser.skipWhitespace();
-									cc = parser.read();
-									if (cc == ']')
-										dim++;
-									else {
-										// This is invalid.
-										valid = false;
-										parser.backup();
-										break;	// No more dims.
-									}
-								} else {
-									parser.backup();
-									break;	// No more dims.
-								}
-							}
-							if (valid) {
-								parser.skipWhitespace();
-								cc = parser.read();
-								if (cc == '{') {
-									// Good, we're at the start of the initialization code.
-									int[] dims = new int[dim];
-									int len = ((Long) size).intValue();
-									dims[0] = len;
-									Object array = Array.newInstance(Object.class, dims);
-									Arrays.fill((Object[]) array, null);	// Because newInstance used above fills the array created with empty arrays when a dim>1.
-									
-									// Now we start filling it in.
-									Object invSetting = null;	// What we will use for the invalid setting. If this is a multidim, this needs to be an array. Will not create it until needed.
-									Object entry = parseString(parser);	// Get the first entry
-									Class compType = array.getClass().getComponentType();
-									int i = -1;
-									while (true) {
-										if (++i < len) {
-											if (compType.isInstance(entry)) {
-												// Good, it can be assigned.
-												Array.set(array, i, entry);
-											} else {
-												// Bad. Need to set invalid.
-												if (invSetting == null) {
-													// We haven't created it yet.
-													if (dim == 1)
-														invSetting = InvalidObject.INSTANCE; // Great, one dimensional, we can use invalid directly
-													else {
-														// Multi-dim. Need to create a valid array that we can set.
-														int[] invDims = new int[dim - 1];
-														Arrays.fill(invDims, 1); // Length one all of the way so that the final component can be invalid object
-														invSetting = Array.newInstance(Object.class, invDims);
-														Object finalEntry = invSetting; // Final array (with component type of just Object). Start with the full array and work down.
-														for (int j = invDims.length - 1; j > 0; j--) {
-															finalEntry = Array.get(finalEntry, 0);
-														}
-														Array.set(finalEntry, 0, InvalidObject.INSTANCE);
-													}
-												}
-												Array.set(array, i, invSetting);
-											}
-										}
-										
-										parser.skipWhitespace();
-										cc = parser.read();
-										if (cc == ',') {
-											// Good, get next
-											entry = parseString(parser);
-										} else if (cc == '}') {
-											// Good, reached the end.
-											break;
-										} else {
-											parser.backup();
-											entry = parseString(parser);	// Technically this should be invalid, but we'll let a whitespace also denote next entry.
-										}
-									}
-									
-									return array;
-								}
-							}							
-						}
-					}
-					break; // If we got here, it is invalid.
-			}
-		}
-		return InvalidObject.INSTANCE;
-	}
-	
-	private void writeObject(ObjectOutputStream out) throws IOException {
-		// Write out any hidden stuff
-		out.defaultWriteObject();
-		writeObject(value, out);
-	}
-	
-	private void writeObject(Object value, ObjectOutputStream out) throws IOException {
-		if (value == null)
-			out.writeObject(value);
-		else {
-			if (value instanceof Class)
-				out.writeObject(((Class) value).getName());
-			else if (!value.getClass().isArray()) {
-				if (value instanceof String || value instanceof Number || value instanceof Boolean || value instanceof Character)
-					out.writeObject(value);
-				else
-					out.writeObject(InvalidObject.INSTANCE);
-			} else {
-				// Array is tricky. See if it is one we can handle, if not then invalid. 
-				// To indicate array, we will first write out the Class of the Component type of the array (it will
-				// be converted to be Object or Object[]...).
-				// This will be the clue that an array is coming. Class values will never
-				// be returned, so that is how we can tell it is an array.
-				// Note: The reason we are using the component type (converted to Object) is because to reconstruct on the other side we need
-				// to use the component type plus length of the array's first dimension.
-				// 
-				// We can not just serialize the array in the normal way because it may contain invalid values, and we need to 
-				// handle that. Also, if it wasn't an Object array, we need to turn it into an object array. We need consistency
-				// in that it should always be an Object array.
-				// So output format will be:
-				// Class(component type)
-				// int(size of first dimension)
-				// Object(value of first entry) - Actually use out writeObject() format to allow nesting of arrays.
-				// Object(value of second entry)
-				// ... up to size of dimension.
-				Class type = value.getClass();
-				// See if final type is a valid type.
-				Class ft = type.getComponentType();
-				int dims = 1;
-				while (ft.isArray()) {
-					dims++;
-					ft = ft.getComponentType();
-				}
-				if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || ft == Class.class || Number.class.isAssignableFrom(ft)) {
-					String jniType = dims == 1 ? "java.lang.Object" : MapTypes.getJNITypeName("java.lang.Object", dims-1);
-					try {
-						Class componentType = Class.forName(jniType);
-						out.writeObject(componentType);
-						int length = Array.getLength(value);
-						out.writeInt(length);
-						for (int i = 0; i < length; i++) {
-							writeObject(Array.get(value, i), out);
-						}
-					} catch (ClassNotFoundException e) {
-						// This should never happen. Object arrays are always available.
-					}
-				} else
-					out.writeObject(InvalidObject.INSTANCE);
-			}
-		}
-	}
-	
-	
-	private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-		// Read in any hidden stuff
-		in.defaultReadObject();
-		
-		value = readActualObject(in);
-	}
-	
-	private Object readActualObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-		Object val = in.readObject();
-		if (val instanceof Class) {
-			// It must be an array. Only Class objects that come in are Arrays of Object.
-			int length = in.readInt();
-			Object array = Array.newInstance((Class) val, length);
-			for (int i = 0; i < length; i++) {
-				Array.set(array, i, readActualObject(in));
-			}
-			return array;
-		} else
-			return val;	// It is the value itself.
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
deleted file mode 100644
index f973f29..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: FeatureRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
- 
-
-/**
- * This is the data structure for sending the FeatureDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the FeatureDescriptor. 
- * @since 1.1.0
- */
-public class FeatureRecord implements Serializable {
-
-	private static final long serialVersionUID = 1105979276648L;
-	
-	public String name;	// Some decorators use this and others don't. Each decorator type will decide whether this is of importance.
-	public String displayName;
-	public String shortDescription;
-	public String category;
-	public boolean expert;
-	public boolean hidden;
-	public boolean preferred;
-	public String[] attributeNames;
-	public FeatureAttributeValue[] attributeValues;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
deleted file mode 100644
index 209873e..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.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: IBeanInfoIntrospectionConstants.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * These are constants needed for transferring BeanInfo results from the BeanInfo VM.
- * @since 1.1.0
- */
-public interface IBeanInfoIntrospectionConstants {
-	
-	/**
-	 * Introspection bit flag indicating do the BeanDecorator. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_BEAN_DECOR = 0x1;
-	
-	/**
-	 * Introspection bit flag indicating do the Properties. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_PROPERTIES = 0x2;
-
-	/**
-	 * Introspection bit flag indicating do the Methods. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_METHODS = 0x4;
-
-	/**
-	 * Introspection bit flag indicating do the Events. Sent to ModelingBeanInfo.introspect method.
-	 * @since 1.1.0
-	 */
-	public static final int DO_EVENTS = 0x8;
-
-	/**
-	 * BeanDecorator was sent command id. 
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The data following the command id will be a BeanRecord from the ObjectInputStream.
-	 * 
-	 * @see BeanRecord
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @since 1.1.0
-	 */
-	public static final int BEAN_DECORATOR_SENT = 1;
-
-	/**
-	 * PropertyDecorators send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The first object will be  an int and will be the number of properties and each object after that
-	 * will be a PropertyRecord/IndexedPropertyRecord. 
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see PropertyRecord
-	 * @see IndexedPropertyRecord
-	 */
-	public static final int PROPERTY_DECORATORS_SENT = 2;
-
-	/**
-	 * MethodDecorators send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The InputStream will be Objects (use ObjectInputStream).
-	 * The first object will be  an int and will be the number of methods and each object after that
-	 * will be a MethodRecord. 
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see MethodRecord
-	 */
-	public static final int METHOD_DECORATORS_SENT = 3;
-	
-	/**
-	 * EventSetDecorators send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * The first object will be  an int and will be the number of events and each object after that
-	 * will be a EventSetRecord. 
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see MethodRecord
-	 */
-	public static final int EVENT_DECORATORS_SENT = 4;
-
-	/**
-	 * Done send command id.
-	 * <p>
-	 * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream). 
-	 * The stream will be broken into sections.
-	 * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
-	 * Following the command id will be the type of input specific data. 
-	 * <p>
-	 * This command id means there is no more data and it should return.
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
-	 * @see MethodRecord
-	 */
-	public static final int DONE = 5;
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
deleted file mode 100644
index 5da6399..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
+++ /dev/null
@@ -1,32 +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: IndexedPropertyRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the IndexedPropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the IndexedPropertyDescriptor. 
- * @since 1.1.0
- */
-public class IndexedPropertyRecord extends PropertyRecord {
-	private static final long serialVersionUID = 1105983227990L;
-	
-	public ReflectMethodRecord indexedReadMethod;
-	public ReflectMethodRecord indexedWriteMethod;
-	public String indexedPropertyTypeName;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
deleted file mode 100644
index 989c7ea..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InvalidObject.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
- 
-
-/**
- * An indicator object for invalid object type. This is used with feature attribute
- * values from the BeanInfo classes. We can only handle certain types when we
- * bring them over from the BeanInfo VM. That is because the classes instantiated
- * in the BeanInfo class may not be available in the IDE.  So any invalid value
- * will be replaced by this class instance.
- * <p>
- * This is a singleton class.
- * There will be one instance (InvalidObject.INSTANCE) in the system. That way
- * "==" can be used to test for it.
- * 
- * @since 1.1.0
- */
-public class InvalidObject implements Serializable {
-	
-	/**
-	 * Singleton instance of InvalidObject.
-	 * @since 1.1.0
-	 */
-	public static final InvalidObject INSTANCE = new InvalidObject();
-	
-	private static final long serialVersionUID = 1105643804370L;
-	
-	/*
-	 * Nobody else should create one of these.
-	 */
-	private InvalidObject() {
-	}
-
-	private Object readResolve() throws ObjectStreamException {
-		return INSTANCE;
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
deleted file mode 100644
index 375a69e..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: MethodRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the MethodDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the MethodDescriptor. 
- * @since 1.1.0
- */
-public class MethodRecord extends FeatureRecord {
-	
-	private static final long serialVersionUID = 1105982213110L;
-	
-	/**
-	 * Method signature for the method this record describes.
-	 */
-	public ReflectMethodRecord methodForDescriptor;
-	/**
-	 * Parameter records array. It may be <code>null</code> if there aren't any.
-	 */
-	public ParameterRecord[] parameters;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
deleted file mode 100644
index 4aac601..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
+++ /dev/null
@@ -1,32 +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: ParameterRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the ParameterDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the ParameterDescriptor.
- * <p>
- * The only field of importance is the name, and that comes from FeatureRecord. 
- * @since 1.1.0
- */
-public class ParameterRecord extends FeatureRecord {
-
-	private static final long serialVersionUID = 1105982438955L;
-	
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
deleted file mode 100644
index cb564dd..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PropertyRecord.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
- 
-
-/**
- * This is the data structure for sending the PropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the PropertyDescriptor. 
- * @since 1.1.0
- */
-public class PropertyRecord extends FeatureRecord {
-	private static final long serialVersionUID = 1105979276648L;
-	
-	public String propertyEditorClassName;
-	public String propertyTypeName;
-	public ReflectMethodRecord readMethod;
-	public ReflectMethodRecord writeMethod;
-	public ReflectFieldRecord field;
-	public boolean bound;
-	public boolean constrained;
-	public Boolean designTime;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
deleted file mode 100644
index a495709..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ReflectFieldRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
- 
-
-/**
- * This is the data structure for sending the java.lang.reflect.Field info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Field. 
- * @since 1.1.0
- */
-public class ReflectFieldRecord implements Serializable {
-	
-	private static final long serialVersionUID = 1105981512453L;
-	
-	public String className;
-	public String fieldName;
-	public boolean readOnly;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
deleted file mode 100644
index 01ff2be..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ReflectMethodRecord.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:44:52 $ 
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
- 
-
-/**
- * This is the data structure for sending the java.lang.reflect.Method info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Method. 
- * @since 1.1.0
- */
-public class ReflectMethodRecord implements Serializable {
-	
-	private static final long serialVersionUID = 1105981512773L;
-	
-	public String className;
-	public String methodName;
-	public String[] parameterTypeNames;	// Maybe null if no parameters.
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/build.properties b/plugins/org.eclipse.jem.beaninfo/build.properties
deleted file mode 100644
index f15d290..0000000
--- a/plugins/org.eclipse.jem.beaninfo/build.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               beaninfo.jar,\
-               vm/beaninfovm.jar,\
-               about.html,\
-               .options,\
-               beaninfocommon.jar
-jars.compile.order = beaninfocommon.jar,\
-                     vm/beaninfovm.jar,\
-                     beaninfo.jar
-src.includes = about.html,\
-               model/,\
-               rose/,\
-               proxy.jars,\
-               schema/
-source.beaninfo.jar = beaninfo/
-source.vm/beaninfovm.jar = vm_beaninfovm/
-source.beaninfocommon.jar = beaninfoCommon/
-output.vm/beaninfovm.jar = bin_vm_beaninfovm/
-output.beaninfocommon.jar = bin_beaninfocommon/
-
diff --git a/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore b/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore
deleted file mode 100644
index 049c3eb..0000000
--- a/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore
+++ /dev/null
@@ -1,280 +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="beaninfo"
-    nsURI="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore" nsPrefix="org.eclipse.jem.internal.beaninfo.beaninfo">
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureDecorator" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EAnnotation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to FeatureDescriptor in java.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form &quot;attibutueExplicitEmpty&quot; If this is true then the BeanInfo will not merge in and will leave it empty.&#xD;&#xA;&lt;p>&#xD;&#xA;These comments about merging apply to all subclasses of this decorator too. "/>
-    </eAnnotations>
-    <eOperations name="getName" 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"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expert" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hidden" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferred" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeIntrospection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributesExplicitEmpty"
-        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 attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicitlySetBits" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A bitflag for which attributes have been set by BeanInfo/Reflection.&#xD;&#xA;&lt;p>&#xD;&#xA;This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicitDecoratorFlag"
-        eType="#//ImplicitItem">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.&#xD;&#xA;&lt;p>&#xD;&#xA;This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
-        eType="#//FeatureAttributeMapEntry" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BeanDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to BeanDecorator in java."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperProperties" 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="Should the properties of super types be merged when asking for eAllAttributes/eAllReferences."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperMethods" 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="Should the methods of super types be merged when asking for eAllBehaviors."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperEvents" 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="Should the events of super types be merged when asking for eAllEvents."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectProperties" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectEvents" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="doBeaninfo" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedPropertyNames"
-        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="This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().&#xD;&#xA;&lt;p>&#xD;&#xA;This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: This attribute is not meant to be changed by clients. It is an internal attribute."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedMethodNames"
-        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="This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().&#xD;&#xA;&lt;p>&#xD;&#xA;This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedEventNames"
-        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="This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().&#xD;&#xA;&lt;p>&#xD;&#xA;This list will be empty if all events are inherited or if the mergeSuperEvents flag is false."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customizerClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventSetDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to EventSetDecorator in java."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="inDefaultEventSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unicast" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="listenerMethodsExplicitEmpty"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="addListenerMethod" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="listenerMethods" lowerBound="1"
-        upperBound="-1" eType="#//MethodProxy" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.&#xD;&#xA;&lt;p>&#xD;&#xA;ListenerMethods will be decorated with MethodDecorators.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on &quot;serListMthd&quot; notifications instead."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="listenerType" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="removeListenerMethod" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eventAdapterClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = &quot;eventAdapterClass&quot;."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serListMthd" lowerBound="1"
-        upperBound="-1" eType="#//MethodProxy" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is a private feature. It is used internally only. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to MethodDecorator in java."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="parmsExplicitEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameterDescriptors" upperBound="-1"
-        eType="#//ParameterDecorator" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is the parameter descriptors list.&#xD;&#xA;&lt;p>&#xD;&#xA;Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on &quot;serParmDesc&quot; notifications instead."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="serParmDesc" upperBound="-1"
-        eType="#//ParameterDecorator" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This is a private feature. It is used internally only. "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ParameterDecorator" eSuperTypes="#//FeatureDecorator">
-    <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 is explicit here because unlike the other feature decorators, the name does not come from the object being decorated."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaParameter"
-        transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PropertyDecorator" eSuperTypes="#//FeatureDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to PropertyDecorator in java."/>
-    </eAnnotations>
-    <eOperations name="getPropertyType" eType="ecore:EClass ../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EClassifier"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="constrained" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="designTime" 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="If not set, then normal default processing.&#xD;&#xA;&#xD;&#xA;If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.&#xD;&#xA;&#xD;&#xA;If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alwaysIncompatible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="filterFlags" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldReadOnly" 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 read-only (i.e. is a &quot;final&quot; field). This is only referenced if the field reference is set."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="propertyEditorClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="readMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="writeMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Field"
-        unsettable="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IndexedPropertyDecorator" eSuperTypes="#//PropertyDecorator">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Equivalent to IndexedPropertyDecorator"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="indexedReadMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="indexedWriteMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
-        unsettable="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MethodProxy" eSuperTypes="../../org.eclipse.emf.ecore/src/model/Ecore.ecore#//EOperation">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.&#xD;&#xA;&lt;p>&#xD;&#xA;MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.&#xD;&#xA;&lt;p>&#xD;&#xA;MethodProxies would also have MethodDecorators."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="method" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BeanEvent" eSuperTypes="../../org.eclipse.jem/model/java.ecore#//JavaEvent">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Event from Introspection/Reflection.&#xD;&#xA;&lt;p>&#xD;&#xA;The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureAttributeMapEntry" instanceClassName="java.util.Map$Entry">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//FeatureAttributeValue"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="FeatureAttributeValue" instanceClassName="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is the attribute value for feature attribute. It can only represent the following:&#xD;&#xA;&#xD;&#xA;- String&#xD;&#xA;- primitives&#xD;&#xA;- array (type Object) containing mixture of Strings and primitives (as the object types)&#xD;&#xA;- array (type String)&#xD;&#xA;- array (type primitive)&#xD;&#xA;&#xD;&#xA;Anything else cannot be represented."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ImplicitItem">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This enum is an internal enum. It is used by BeanInfo for cache maintenance.&#xD;&#xA;&lt;p>&#xD;&#xA;This enum is not meant to be used by clients."/>
-    </eAnnotations>
-    <eLiterals name="NOT_IMPLICIT">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Means this decorator is not implicit. That is it was created by customer."/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="IMPLICIT_DECORATOR" value="1">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This means that the decorator is implicit. That is it was not created by the customer."/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="IMPLICIT_DECORATOR_AND_FEATURE" value="2">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This means the decorator and the feature where implicit. That is they were not created by the customer."/>
-      </eAnnotations>
-    </eLiterals>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel b/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel
deleted file mode 100644
index 2566695..0000000
--- a/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel
+++ /dev/null
@@ -1,93 +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.beaninfo/beaninfo"
-    editDirectory="/org.eclipse.jem.beaninfo.edit/src" editorDirectory="/org.eclipse.jem.beaninfo.editor/src"
-    modelPluginID="" modelName="Beaninfo" editPluginClass="org.eclipse.jem.internal.beaninfo.provider.BeaninfoEditPlugin"
-    editorPluginClass="org.eclipse.jem.internal.beaninfo.presentation.BeaninfoEditorPlugin"
-    updateClasspath="false" usedGenPackages="../../org.eclipse.emf.ecore/src/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java">
-  <foreignModel>..\rose\introspect.mdl</foreignModel>
-  <foreignModel>WorkspaceRoot</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="Beaninfo" basePackage="org.eclipse.jem.internal" adapterFactory="false"
-      ecorePackage="beaninfo.ecore#/">
-    <genEnums ecoreEnum="beaninfo.ecore#//ImplicitItem">
-      <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/NOT_IMPLICIT"/>
-      <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/IMPLICIT_DECORATOR"/>
-      <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/IMPLICIT_DECORATOR_AND_FEATURE"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="beaninfo.ecore#//FeatureAttributeValue"/>
-    <genClasses ecoreClass="beaninfo.ecore#//FeatureDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/displayName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/shortDescription"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/category"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/expert"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/hidden"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/preferred"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/mergeIntrospection"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/attributesExplicitEmpty"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/implicitlySetBits"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/implicitDecoratorFlag"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//FeatureDecorator/attributes"/>
-      <genOperations ecoreOperation="beaninfo.ecore#//FeatureDecorator/getName"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//BeanDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperProperties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperMethods"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperEvents"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectProperties"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectMethods"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectEvents"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/doBeaninfo"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedPropertyNames"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedMethodNames"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedEventNames"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//BeanDecorator/customizerClass"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//EventSetDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/inDefaultEventSet"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/unicast"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/listenerMethodsExplicitEmpty"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/addListenerMethod"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/listenerMethods"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/listenerType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/removeListenerMethod"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/eventAdapterClass"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/serListMthd"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//MethodDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//MethodDecorator/parmsExplicitEmpty"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodDecorator/parameterDescriptors"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodDecorator/serParmDesc"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//ParameterDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//ParameterDecorator/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//ParameterDecorator/parameter"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//PropertyDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/bound"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/constrained"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/designTime"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/alwaysIncompatible"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/filterFlags"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/fieldReadOnly"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/propertyEditorClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/readMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/writeMethod"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/field"/>
-      <genOperations ecoreOperation="beaninfo.ecore#//PropertyDecorator/getPropertyType"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//IndexedPropertyDecorator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//IndexedPropertyDecorator/indexedReadMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//IndexedPropertyDecorator/indexedWriteMethod"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//MethodProxy">
-      <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodProxy/method"/>
-    </genClasses>
-    <genClasses ecoreClass="beaninfo.ecore#//BeanEvent"/>
-    <genClasses ecoreClass="beaninfo.ecore#//FeatureAttributeMapEntry">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureAttributeMapEntry/key"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureAttributeMapEntry/value"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.properties b/plugins/org.eclipse.jem.beaninfo/plugin.properties
deleted file mode 100644
index 23b00db..0000000
--- a/plugins/org.eclipse.jem.beaninfo/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/plugin.properties,v $
-# $Revision: 1.6 $  $Date: 2005/02/15 22:46:22 $
-#
-
-
-pluginName=Java EMF Model BeanInfo (Introspection) Support
-providerName = Eclipse.org
-beaninfoNatureName=Java Model BeanInfo Nature
-registrations.extensionpoint.name=BeanInfo extension registrations
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.xml b/plugins/org.eclipse.jem.beaninfo/plugin.xml
deleted file mode 100644
index 92d1c5b..0000000
--- a/plugins/org.eclipse.jem.beaninfo/plugin.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jem.beaninfo"
-   name="%pluginName"
-   version="1.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin">
-
-   <runtime>
-      <library name="beaninfo.jar">
-         <export name="*"/>
-      </library>
-      <library name="beaninfocommon.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.jem.proxy"/>
-      <import plugin="com.ibm.etools.emf.event"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.jem"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.ui" optional="true"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.emf.ecore.change"/>
-   </requires>
-
-
-   <extension-point id="registrations" name="%registrations.extensionpoint.name" schema="schema/registrations.exsd"/>
-
-   <extension
-         id="BeanInfoNature"
-         name="%beaninfoNatureName"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-               class="org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature">
-         </run>
-      </runtime>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http:///org/eclipse/jem/internal/beaninfo.ecore"
-            class="org.eclipse.jem.internal.beaninfo.BeaninfoPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.team.core.fileTypes">
-      <fileTypes
-            type="text"
-            extension="beaninfoConfig">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="override">
-      </fileTypes>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.beaninfo/proxy.jars b/plugins/org.eclipse.jem.beaninfo/proxy.jars
deleted file mode 100644
index 176820a..0000000
--- a/plugins/org.eclipse.jem.beaninfo/proxy.jars
+++ /dev/null
@@ -1,2 +0,0 @@
-vm/beaninfovm.jar=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm/
-beaninfocommon.jar=/org.eclipse.jem.beaninfo/bin_beaninfocommon/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore b/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore
deleted file mode 100644
index 1be3a37..0000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.md~
-*.ca~
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat b/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat
deleted file mode 100644
index d2e65c4..0000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat
+++ /dev/null
@@ -1,3289 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "beaninfo"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jem.internal.beaninfo")))
-    quid       	"3A799ABB0353"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "FeatureDecorator"
-	    quid       	"3A799B3E01E9"
-	    documentation 	
-|Equivalent to FeatureDescriptor in java.
-|<p>
-|Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
-|<p>
-|These comments about merging apply to all subclasses of this decorator too. 
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3DFA185900DC"
-		    supplier   	"Logical View::ecore::EAnnotation"
-		    quidu      	"3D98A1C701AB"))
-	    operations 	(list Operations
-		(object Operation "getName"
-		    quid       	"3B867D0D0184"
-		    result     	"String"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "displayName"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79CFCC0131"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "shortDescription"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79CFD501E8"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "category"
-		    attributes 	(list Attribute_Set)
-		    quid       	"3BA2797102DC"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "expert"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79CFE700FE"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "hidden"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D0050328"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "preferred"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D0240318"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "mergeIntrospection"
-		    quid       	"3A82C0A60389"
-		    documentation 	"Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "attributesExplicitEmpty"
-		    quid       	"3C9B49320265"
-		    documentation 	"The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. "
-		    type       	"boolean"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "implicitlySetBits"
-		    quid       	"41E5815D02B9"
-		    documentation 	
-|A bitflag for which attributes have been set by BeanInfo/Reflection.
-|<p>
-|This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-		    
-		    type       	"long")
-		(object ClassAttribute "implicitDecoratorFlag"
-		    quid       	"41E5A05D021A"
-		    documentation 	
-|Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
-|<p>
-|This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-		    
-		    type       	"ImplicitItem"
-		    quidu      	"41E59E5D0296")))
-	(object Class "BeanDecorator"
-	    quid       	"3A79D0DF02D1"
-	    documentation 	"Equivalent to BeanDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DE8E007F"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "mergeSuperProperties"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A82B73E0200"
-		    documentation 	"Should the properties of super types be merged when asking for eAllAttributes/eAllReferences."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "mergeSuperMethods"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A82B9940015"
-		    documentation 	"Should the methods of super types be merged when asking for eAllBehaviors."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "mergeSuperEvents"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A82B99F0165"
-		    documentation 	"Should the events of super types be merged when asking for eAllEvents."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "introspectProperties"
-		    quid       	"3A8427EC00A6"
-		    documentation 	"Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "introspectMethods"
-		    quid       	"3A84287501B1"
-		    documentation 	"Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "introspectEvents"
-		    quid       	"3A842877000F"
-		    documentation 	"Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "doBeaninfo"
-		    quid       	"3C9A46FC027C"
-		    documentation 	"This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes."
-		    type       	"boolean"
-		    initv      	"true"
-		    exportControl 	"Implementation")
-		(object ClassAttribute "notInheritedPropertyNames"
-		    quid       	"41EED50B0185"
-		    documentation 	
-|This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
-|<p>
-|This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
-|<p>
-|Note: This attribute is not meant to be changed by clients. It is an internal attribute.
-		    
-		    stereotype 	"0..*"
-		    type       	"String")
-		(object ClassAttribute "notInheritedMethodNames"
-		    quid       	"41F02C5F0399"
-		    documentation 	
-|This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
-|<p>
-|This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false.
-		    
-		    stereotype 	"0..*"
-		    type       	"String")
-		(object ClassAttribute "notInheritedEventNames"
-		    quid       	"41F02D0A0312"
-		    documentation 	
-|This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
-|<p>
-|This list will be empty if all events are inherited or if the mergeSuperEvents flag is false.
-		    
-		    stereotype 	"0..*"
-		    type       	"String")))
-	(object Class "EventSetDecorator"
-	    quid       	"3A79D1D2004F"
-	    documentation 	"Equivalent to EventSetDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DEA200EC"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "inDefaultEventSet"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D94F004C"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "unicast"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79D9580167"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "listenerMethodsExplicitEmpty"
-		    quid       	"3CB1AF7D0286"
-		    documentation 	"Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection."
-		    type       	"boolean"
-		    exportControl 	"Implementation")))
-	(object Class "MethodDecorator"
-	    quid       	"3A79D35E0027"
-	    documentation 	"Equivalent to MethodDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DEA603E1"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "parmsExplicitEmpty"
-		    quid       	"3B86ABE80092"
-		    documentation 	"Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection."
-		    type       	"boolean"
-		    exportControl 	"Implementation")))
-	(object Class "ParameterDecorator"
-	    quid       	"3A79D9C20304"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DEBB01C4"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "name"
-		    quid       	"3B86A6700099"
-		    documentation 	"The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated."
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PropertyDecorator"
-	    quid       	"3A79DA68010E"
-	    documentation 	"Equivalent to PropertyDecorator in java."
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DE9702BD"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"))
-	    operations 	(list Operations
-		(object Operation "getPropertyType"
-		    quid       	"3B8CF526039D"
-		    result     	"EClassifier"
-		    concurrency 	"Sequential"
-		    opExportControl 	"Public"
-		    uid        	0
-		    quidu      	"3ACE4FEE0371"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "bound"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DC250303"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "constrained"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DC2C00A0"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "designTime"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3BA27455019B"
-		    documentation 	
-|If not set, then normal default processing.
-|
-|If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.
-|
-|If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime.
-		    
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "alwaysIncompatible"
-		    quid       	"3BA27A1700BE"
-		    documentation 	"If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected."
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "filterFlags"
-		    quid       	"3BA3B18F0036"
-		    stereotype 	"0..*"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "fieldReadOnly"
-		    quid       	"4207E101018E"
-		    documentation 	
-|Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set.
-		    
-		    type       	"boolean"
-		    exportControl 	"Public")))
-	(object Class "IndexedPropertyDecorator"
-	    quid       	"3A79DC450309"
-	    documentation 	"Equivalent to IndexedPropertyDecorator"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A79DE840388"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Class "MethodProxy"
-	    quid       	"3A8984C901C3"
-	    documentation 	
-|This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
-|<p>
-|MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
-|<p>
-|MethodProxies would also have MethodDecorators.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3DFA19B600DE"
-		    supplier   	"Logical View::ecore::EOperation"
-		    quidu      	"3904DAA200A0")))
-	(object Class "BeanEvent"
-	    quid       	"3CB09CA90212"
-	    documentation 	
-|Event from Introspection/Reflection.
-|<p>
-|The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3CB09CB6038D"
-		    supplier   	"Logical View::java::JavaEvent"
-		    quidu      	"3C62FAF103C8")))
-	(object Class "FeatureAttributeMapEntry"
-	    quid       	"404CC85501F5"
-	    stereotype 	"MapEntry"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "key"
-		    quid       	"404CC8B70304"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "value"
-		    attributes 	(list Attribute_Set)
-		    quid       	"41E58414010A"
-		    type       	"FeatureAttributeValue"
-		    quidu      	"41E582F800BB"
-		    exportControl 	"Public")))
-	(object Class "FeatureAttributeValue"
-	    quid       	"41E582F800BB"
-	    documentation 	
-|This is the attribute value for feature attribute. It can only represent the following:
-|
-|- String
-|- primitives
-|- array (type Object) containing mixture of Strings and primitives (as the object types)
-|- array (type String)
-|- array (type primitive)
-|
-|Anything else cannot be represented.
-	    
-	    stereotype 	"datatype"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
-		    quid       	"41E583B503CA"
-		    stereotype 	"javaclass")))
-	(object Class "ImplicitItem"
-	    quid       	"41E59E5D0296"
-	    documentation 	
-|This enum is an internal enum. It is used by BeanInfo for cache maintenance.
-|<p>
-|This enum is not meant to be used by clients.
-	    
-	    stereotype 	"enumeration"
-	    exportControl 	"Protected"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "NOT_IMPLICIT"
-		    quid       	"41E59F2A00EC"
-		    documentation 	"Means this decorator is not implicit. That is it was created by customer.")
-		(object ClassAttribute "IMPLICIT_DECORATOR"
-		    quid       	"41E59F7200B4"
-		    documentation 	"This means that the decorator is implicit. That is it was not created by the customer.")
-		(object ClassAttribute "IMPLICIT_DECORATOR_AND_FEATURE"
-		    quid       	"41E59FA303B7"
-		    documentation 	"This means the decorator and the feature where implicit. That is they were not created by the customer.")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3A79CF6C0378"
-	    roles      	(list role_list
-		(object Role "attributes"
-		    attributes 	(list Attribute_Set)
-		    quid       	"3A79CF6E00BE"
-		    documentation 	"Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true."
-		    label      	"attributes"
-		    supplier   	"Logical View::beaninfo::FeatureAttributeMapEntry"
-		    quidu      	"404CC85501F5"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$1"
-		    quid       	"3A79CF6E00C8"
-		    supplier   	"Logical View::beaninfo::FeatureDecorator"
-		    quidu      	"3A799B3E01E9"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3A79D1350248"
-	    roles      	(list role_list
-		(object Role "customizerClass"
-		    attributes 	(list Attribute_Set)
-		    quid       	"3A79D13601D2"
-		    label      	"customizerClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3A79D13601E6"
-		    supplier   	"Logical View::beaninfo::BeanDecorator"
-		    quidu      	"3A79D0DF02D1")))
-	(object Association "$UNNAMED$4"
-	    quid       	"3A79D3080128"
-	    roles      	(list role_list
-		(object Role "addListenerMethod"
-		    quid       	"3A79D3090346"
-		    label      	"addListenerMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3A79D309035A"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$6"
-	    quid       	"3A79D3E10364"
-	    roles      	(list role_list
-		(object Role "listenerMethods"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isVolatile"
-			    value      	TRUE))
-		    quid       	"3A79D3E6007D"
-		    documentation 	
-|listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
-|<p>
-|ListenerMethods will be decorated with MethodDecorators.
-|<p>
-|Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead.
-		    
-		    label      	"listenerMethods"
-		    supplier   	"Logical View::beaninfo::MethodProxy"
-		    quidu      	"3A8984C901C3"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$7"
-		    quid       	"3A79D3E60091"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F"))
-	    derived    	TRUE)
-	(object Association "$UNNAMED$8"
-	    quid       	"3A79D4A80158"
-	    roles      	(list role_list
-		(object Role "listenerType"
-		    quid       	"3A79D4AA038B"
-		    label      	"listenerType"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$9"
-		    quid       	"3A79D4AA03B4"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$10"
-	    quid       	"3A79D4DF020B"
-	    roles      	(list role_list
-		(object Role "removeListenerMethod"
-		    quid       	"3A79D4E10395"
-		    label      	"removeListenerMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$11"
-		    quid       	"3A79D4E103A9"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$12"
-	    quid       	"3A79DA1A02F7"
-	    roles      	(list role_list
-		(object Role "parameterDescriptors"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE)
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isVolatile"
-			    value      	TRUE))
-		    quid       	"3A79DA1C0231"
-		    documentation 	
-|This is the parameter descriptors list.
-|<p>
-|Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead.
-		    
-		    label      	"parameterDescriptors"
-		    supplier   	"Logical View::beaninfo::ParameterDecorator"
-		    quidu      	"3A79D9C20304"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$13"
-		    quid       	"3A79DA1C0232"
-		    supplier   	"Logical View::beaninfo::MethodDecorator"
-		    quidu      	"3A79D35E0027"))
-	    derived    	TRUE)
-	(object Association "$UNNAMED$14"
-	    quid       	"3A79DB0B0339"
-	    roles      	(list role_list
-		(object Role "propertyEditorClass"
-		    quid       	"3A79DB0E013F"
-		    label      	"propertyEditorClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$15"
-		    quid       	"3A79DB0E0171"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Association "$UNNAMED$16"
-	    quid       	"3A79DBBD0000"
-	    roles      	(list role_list
-		(object Role "readMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DBBF0071"
-		    label      	"readMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$17"
-		    quid       	"3A79DBBF0085"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Association "$UNNAMED$18"
-	    quid       	"3A79DBDF02D0"
-	    roles      	(list role_list
-		(object Role "writeMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DBE101F7"
-		    label      	"writeMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$19"
-		    quid       	"3A79DBE1020B"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E")))
-	(object Association "$UNNAMED$20"
-	    quid       	"3A79DE34036F"
-	    roles      	(list role_list
-		(object Role "indexedReadMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DE3503CA"
-		    label      	"indexedReadMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$21"
-		    quid       	"3A79DE3503DE"
-		    supplier   	"Logical View::beaninfo::IndexedPropertyDecorator"
-		    quidu      	"3A79DC450309")))
-	(object Association "$UNNAMED$22"
-	    quid       	"3A79DE540180"
-	    roles      	(list role_list
-		(object Role "indexedWriteMethod"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A79DE5503D0"
-		    label      	"indexedWriteMethod"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$23"
-		    quid       	"3A79DE5503E4"
-		    supplier   	"Logical View::beaninfo::IndexedPropertyDecorator"
-		    quidu      	"3A79DC450309")))
-	(object Association "$UNNAMED$24"
-	    quid       	"3A89865B01D5"
-	    roles      	(list role_list
-		(object Role "method"
-		    quid       	"3A89865C01AE"
-		    label      	"method"
-		    supplier   	"Logical View::java::Method"
-		    quidu      	"3654AE910271"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$25"
-		    quid       	"3A89865C01CC"
-		    supplier   	"Logical View::beaninfo::MethodProxy"
-		    quidu      	"3A8984C901C3")))
-	(object Association "$UNNAMED$26"
-	    quid       	"3C9A6EDD02C2"
-	    roles      	(list role_list
-		(object Role "parameter"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"3C9A6EDE01FB"
-		    documentation 	"The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this."
-		    label      	"parameter"
-		    supplier   	"Logical View::java::JavaParameter"
-		    quidu      	"3654AD780280"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$27"
-		    quid       	"3C9A6EDE0205"
-		    supplier   	"Logical View::beaninfo::ParameterDecorator"
-		    quidu      	"3A79D9C20304")))
-	(object Association "$UNNAMED$28"
-	    quid       	"41F016E7002E"
-	    roles      	(list role_list
-		(object Role "serParmDesc"
-		    quid       	"41F016E802A7"
-		    documentation 	"This is a private feature. It is used internally only. "
-		    label      	"serParmDesc"
-		    supplier   	"Logical View::beaninfo::ParameterDecorator"
-		    quidu      	"3A79D9C20304"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    exportControl 	"Private"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$29"
-		    quid       	"41F016E802B1"
-		    supplier   	"Logical View::beaninfo::MethodDecorator"
-		    quidu      	"3A79D35E0027"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$30"
-	    quid       	"41F11E710387"
-	    roles      	(list role_list
-		(object Role "eventAdapterClass"
-		    quid       	"41F11E730249"
-		    documentation 	
-|For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass".
-		    
-		    label      	"eventAdapterClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$31"
-		    quid       	"41F11E73025D"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F")))
-	(object Association "$UNNAMED$32"
-	    quid       	"41F1278A01A5"
-	    roles      	(list role_list
-		(object Role "serListMthd"
-		    quid       	"41F1278B021F"
-		    documentation 	"This is a private feature. It is used internally only. "
-		    label      	"serListMthd"
-		    supplier   	"Logical View::beaninfo::MethodProxy"
-		    quidu      	"3A8984C901C3"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Value"
-		    exportControl 	"Private"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$33"
-		    quid       	"41F1278B0229"
-		    supplier   	"Logical View::beaninfo::EventSetDecorator"
-		    quidu      	"3A79D1D2004F"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$34"
-	    quid       	"4207D83F01DA"
-	    roles      	(list role_list
-		(object Role "field"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"4207D8400290"
-		    documentation 	"If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model."
-		    label      	"field"
-		    supplier   	"Logical View::java::Field"
-		    quidu      	"3654AF8F0280"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$35"
-		    quid       	"4207D8400292"
-		    supplier   	"Logical View::beaninfo::PropertyDecorator"
-		    quidu      	"3A79DA68010E"))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Main"
-	    quid       	"3A799AC8038E"
-	    title      	"Main"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	1144
-	    items      	(list diagram_item_list
-		(object NoteView @1
-		    location   	(2640, 1696)
-		    font       	(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   	(2358, 1608)
-			fill_color 	13434879
-			nlines     	3
-			max_width  	528
-			label      	"ListenerMethods will be decorated with MethodDecorators.")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	588
-		    height     	188)
-		(object NoteView @2
-		    location   	(3392, 2784)
-		    font       	(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   	(3076, 2568)
-			fill_color 	13434879
-			nlines     	8
-			max_width  	596
-			label      	
-|MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
-|
-|MethodProxies would also have MethodDecorators.
-			)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	656
-		    height     	444)
-		(object ClassView "Class" "Logical View::java::JavaEvent" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1248, 2688)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(1114, 2614)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	268
-			justify    	0
-			label      	"JavaEvent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777088
-		    quidu      	"3C62FAF103C8"
-		    width      	286
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::BeanEvent" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1232, 2992)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(1096, 2941)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	272
-			justify    	0
-			label      	"BeanEvent")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3CB09CA90212"
-		    width      	290
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @5
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CB09CB6038D"
-		    client     	@4
-		    supplier   	@3
-		    line_style 	0)
-		(object NoteView @6
-		    location   	(1856, 2944)
-		    font       	(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   	(1561, 2815)
-			fill_color 	13434879
-			nlines     	5
-			max_width  	555
-			label      	"The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	615
-		    height     	270)
-		(object ClassView "Class" "Logical View::ecore::EAnnotation" @7
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1056, 128)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@7
-			location   	(906, 54)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	300
-			justify    	0
-			label      	"EAnnotation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3D98A1C701AB"
-		    width      	318
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ecore::EOperation" @8
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2848, 2272)
-		    font       	(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   	(2702, 2198)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	292
-			justify    	0
-			label      	"EOperation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3904DAA200A0"
-		    width      	310
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::FeatureAttributeMapEntry" @9
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2224, 176)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@9
-			location   	(1887, 92)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	674
-			justify    	0
-			label      	"FeatureAttributeMapEntry")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@9
-			location   	(1887, 42)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	674
-			justify    	0
-			label      	"<<MapEntry>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"404CC85501F5"
-		    compartment 	(object Compartment
-			Parent_View 	@9
-			location   	(1887, 153)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	581)
-		    width      	692
-		    height     	292
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::FeatureDecorator" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1072, 656)
-		    font       	(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   	(665, 325)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	814
-			justify    	0
-			label      	"FeatureDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A799B3E01E9"
-		    compartment 	(object Compartment
-			Parent_View 	@10
-			location   	(665, 386)
-			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     	12
-			max_width  	700)
-		    width      	832
-		    height     	686
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @11
-		    location   	(1072, 1089)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@10
-		    vertices   	(list Points
-			(1072, 1089)
-			(1072, 999)))
-		(object InheritView "" @12
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3DFA185900DC"
-		    client     	@10
-		    supplier   	@7
-		    line_style 	0)
-		(object AssociationViewNew "$UNNAMED$0" @13
-		    location   	(1682, 401)
-		    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      	"3A79CF6C0378"
-		    roleview_list 	(list RoleViews
-			(object RoleView "attributes" @14
-			    Parent_View 	@13
-			    location   	(626, -63)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @15
-				Parent_View 	@14
-				location   	(1747, 309)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	207
-				justify    	0
-				label      	"+attributes"
-				pctDist    	0.457012
-				height     	62
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79CF6E00BE"
-			    client     	@13
-			    supplier   	@9
-			    line_style 	0
-			    label      	(object SegLabel @16
-				Parent_View 	@14
-				location   	(1812, 396)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.584653
-				height     	45
-				orientation 	1))
-			(object RoleView "$UNNAMED$1" @17
-			    Parent_View 	@13
-			    location   	(626, -63)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79CF6E00C8"
-			    client     	@13
-			    supplier   	@10
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::beaninfo::FeatureAttributeValue" @18
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(3456, 176)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@18
-			location   	(2683, 117)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1546
-			justify    	0
-			label      	"FeatureAttributeValue")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@18
-			location   	(2683, 67)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	1546
-			justify    	0
-			label      	"<<datatype>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"41E582F800BB"
-		    compartment 	(object Compartment
-			Parent_View 	@18
-			location   	(2683, 178)
-			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  	1493)
-		    width      	1564
-		    height     	242
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::ImplicitItem" @19
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2288, 656)
-		    font       	(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   	(1815, 547)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	946
-			justify    	0
-			label      	"ImplicitItem")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@19
-			location   	(1815, 497)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	946
-			justify    	0
-			label      	"<<enumeration>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12615935
-		    quidu      	"41E59E5D0296"
-		    compartment 	(object Compartment
-			Parent_View 	@19
-			location   	(1815, 608)
-			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  	812)
-		    width      	964
-		    height     	342
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::JavaParameter" @20
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(3712, 1776)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@20
-			location   	(3533, 1702)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	358
-			justify    	0
-			label      	"JavaParameter")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777088
-		    quidu      	"3654AD780280"
-		    width      	376
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::ParameterDecorator" @21
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(4272, 1344)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@21
-			location   	(4039, 1263)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	466
-			justify    	0
-			label      	"ParameterDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D9C20304"
-		    compartment 	(object Compartment
-			Parent_View 	@21
-			location   	(4039, 1324)
-			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      	484
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$26" @22
-		    location   	(3986, 1563)
-		    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      	"3C9A6EDD02C2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "parameter" @23
-			    Parent_View 	@22
-			    location   	(1074, -37)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @24
-				Parent_View 	@23
-				location   	(3948, 1643)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	215
-				justify    	0
-				label      	"+parameter"
-				pctDist    	0.386598
-				height     	41
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C9A6EDE01FB"
-			    client     	@22
-			    supplier   	@20
-			    line_style 	0
-			    label      	(object SegLabel @25
-				Parent_View 	@23
-				location   	(3888, 1572)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.412371
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$27" @26
-			    Parent_View 	@22
-			    location   	(1074, -37)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C9A6EDE0205"
-			    client     	@22
-			    supplier   	@21
-			    line_style 	0)))
-		(object InheritView "" @27
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DEBB01C4"
-		    client     	@21
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(4065, 1251)
-		    terminal_attachment 	(4065, 1089)
-		    drawSupplier 	@11)
-		(object ClassView "Class" "Logical View::beaninfo::MethodDecorator" @28
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(3120, 1344)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@28
-			location   	(2770, 1263)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	700
-			justify    	0
-			label      	"MethodDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D35E0027"
-		    compartment 	(object Compartment
-			Parent_View 	@28
-			location   	(2770, 1324)
-			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  	603)
-		    width      	718
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @29
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DEA603E1"
-		    client     	@28
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(3101, 1250)
-		    terminal_attachment 	(3101, 1089)
-		    drawSupplier 	@11)
-		(object AssociationViewNew "$UNNAMED$12" @30
-		    location   	(3722, 1474)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DA1A02F7"
-		    roleview_list 	(list RoleViews
-			(object RoleView "parameterDescriptors" @31
-			    Parent_View 	@30
-			    location   	(2250, 578)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @32
-				Parent_View 	@31
-				location   	(3798, 1410)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	427
-				justify    	0
-				label      	"+parameterDescriptors"
-				pctDist    	0.308262
-				height     	69
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DA1C0231"
-			    client     	@30
-			    supplier   	@21
-			    vertices   	(list Points
-				(3722, 1474)
-				(3781, 1487)
-				(4029, 1413))
-			    line_style 	0
-			    label      	(object SegLabel @33
-				Parent_View 	@31
-				location   	(3963, 1475)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.745977
-				height     	41
-				orientation 	1))
-			(object RoleView "$UNNAMED$13" @34
-			    Parent_View 	@30
-			    location   	(2250, 578)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DA1C0232"
-			    client     	@30
-			    supplier   	@28
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$28" @35
-		    location   	(3793, 1257)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"41F016E7002E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serParmDesc" @36
-			    Parent_View 	@35
-			    location   	(673, -87)
-			    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   	(3942, 1235)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	285
-				justify    	0
-				label      	"-serParmDesc"
-				pctDist    	0.595893
-				height     	48
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F016E802A7"
-			    client     	@35
-			    supplier   	@21
-			    line_style 	0
-			    label      	(object SegLabel @38
-				Parent_View 	@36
-				location   	(3997, 1348)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.904386
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$29" @39
-			    Parent_View 	@35
-			    location   	(673, -87)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F016E802B1"
-			    client     	@35
-			    supplier   	@28
-			    vertices   	(list Points
-				(3793, 1257)
-				(3734, 1247)
-				(3479, 1286))
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::beaninfo::IndexedPropertyDecorator" @40
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(752, 2288)
-		    font       	(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   	(460, 2237)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	584
-			justify    	0
-			label      	"IndexedPropertyDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79DC450309"
-		    width      	602
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::beaninfo::BeanDecorator" @41
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(512, 1456)
-		    font       	(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   	(7, 1150)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1010
-			justify    	0
-			label      	"BeanDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D0DF02D1"
-		    compartment 	(object Compartment
-			Parent_View 	@41
-			location   	(7, 1211)
-			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     	11
-			max_width  	868)
-		    width      	1028
-		    height     	636
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @42
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE8E007F"
-		    client     	@41
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(381, 1137)
-		    terminal_attachment 	(381, 1089)
-		    drawSupplier 	@11)
-		(object ClassView "Class" "Logical View::java::Method" @43
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(2592, 3264)
-		    font       	(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   	(2492, 3190)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	200
-			justify    	0
-			label      	"Method")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3654AE910271"
-		    width      	218
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::java::Method" @44
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    location   	(1664, 2096)
-		    font       	(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   	(1564, 2022)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	200
-			justify    	0
-			label      	"Method")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"3654AE910271"
-		    width      	218
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$20" @45
-		    location   	(1315, 2289)
-		    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      	"3A79DE34036F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "indexedReadMethod" @46
-			    Parent_View 	@45
-			    location   	(563, 401)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @47
-				Parent_View 	@46
-				location   	(1421, 2275)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	404
-				justify    	0
-				label      	"+indexedReadMethod"
-				pctDist    	0.385248
-				height     	14
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE3503CA"
-			    client     	@45
-			    supplier   	@44
-			    vertices   	(list Points
-				(1315, 2289)
-				(1375, 2289)
-				(1554, 2168))
-			    line_style 	0
-			    label      	(object SegLabel @48
-				Parent_View 	@46
-				location   	(1249, 2238)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.240775
-				height     	52
-				orientation 	0))
-			(object RoleView "$UNNAMED$21" @49
-			    Parent_View 	@45
-			    location   	(563, 401)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE3503DE"
-			    client     	@45
-			    supplier   	@40
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$22" @50
-		    location   	(1443, 2361)
-		    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      	"3A79DE540180"
-		    roleview_list 	(list RoleViews
-			(object RoleView "indexedWriteMethod" @51
-			    Parent_View 	@50
-			    location   	(691, 473)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @52
-				Parent_View 	@51
-				location   	(1597, 2374)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	409
-				justify    	0
-				label      	"+indexedWriteMethod"
-				pctDist    	0.501177
-				height     	37
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE5503D0"
-			    client     	@50
-			    supplier   	@44
-			    vertices   	(list Points
-				(1443, 2361)
-				(1632, 2382)
-				(1654, 2182))
-			    line_style 	0
-			    label      	(object SegLabel @53
-				Parent_View 	@51
-				location   	(1639, 2306)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.681972
-				height     	2
-				orientation 	0))
-			(object RoleView "$UNNAMED$23" @54
-			    Parent_View 	@50
-			    location   	(691, 473)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DE5503E4"
-			    client     	@50
-			    supplier   	@40
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::java::JavaClass" @55
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    location   	(240, 2192)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@55
-			location   	(106, 2118)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	268
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16776960
-		    quidu      	"36549FCC00FA"
-		    width      	286
-		    height     	172
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @56
-		    location   	(332, 1939)
-		    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      	"3A79D1350248"
-		    roleview_list 	(list RoleViews
-			(object RoleView "customizerClass" @57
-			    Parent_View 	@56
-			    location   	(92, 1043)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @58
-				Parent_View 	@57
-				location   	(298, 2044)
-				font       	(object Font
-				    size       	10
-				    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      	"+customizerClass"
-				pctDist    	0.631674
-				height     	4
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D13601D2"
-			    client     	@56
-			    supplier   	@55
-			    line_style 	0
-			    label      	(object SegLabel @59
-				Parent_View 	@57
-				location   	(326, 1989)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.284188
-				height     	12
-				orientation 	0))
-			(object RoleView "$UNNAMED$3" @60
-			    Parent_View 	@56
-			    location   	(92, 1043)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D13601E6"
-			    client     	@56
-			    supplier   	@41
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::beaninfo::MethodProxy" @61
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2560, 2768)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@61
-			location   	(2398, 2717)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	324
-			justify    	0
-			label      	"MethodProxy")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A8984C901C3"
-		    width      	342
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AttachView "" @62
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@2
-		    supplier   	@61
-		    line_style 	0)
-		(object AssociationViewNew "$UNNAMED$24" @63
-		    location   	(2575, 3004)
-		    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      	"3A89865B01D5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "method" @64
-			    Parent_View 	@63
-			    location   	(271, 1084)
-			    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   	(2539, 3072)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	162
-				justify    	0
-				label      	"+method"
-				pctDist    	0.376068
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A89865C01AE"
-			    client     	@63
-			    supplier   	@43
-			    line_style 	0
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(2639, 3158)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$25" @67
-			    Parent_View 	@63
-			    location   	(271, 1084)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A89865C01CC"
-			    client     	@63
-			    supplier   	@61
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::beaninfo::EventSetDecorator" @68
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2256, 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 	@68
-			location   	(1803, 1252)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	906
-			justify    	0
-			label      	"EventSetDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79D1D2004F"
-		    compartment 	(object Compartment
-			Parent_View 	@68
-			location   	(1803, 1313)
-			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  	778)
-		    width      	924
-		    height     	336
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$8" @69
-		    location   	(1102, 1855)
-		    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      	"3A79D4A80158"
-		    roleview_list 	(list RoleViews
-			(object RoleView "listenerType" @70
-			    Parent_View 	@69
-			    location   	(238, 959)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @71
-				Parent_View 	@70
-				location   	(676, 2057)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	259
-				justify    	0
-				label      	"+listenerType"
-				pctDist    	0.610677
-				height     	33
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4AA038B"
-			    client     	@69
-			    supplier   	@55
-			    line_style 	0
-			    label      	(object SegLabel @72
-				Parent_View 	@70
-				location   	(824, 2052)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.429590
-				height     	83
-				orientation 	0))
-			(object RoleView "$UNNAMED$9" @73
-			    Parent_View 	@69
-			    location   	(238, 959)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4AA03B4"
-			    client     	@69
-			    supplier   	@68
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$4" @74
-		    location   	(1700, 1732)
-		    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      	"3A79D3080128"
-		    roleview_list 	(list RoleViews
-			(object RoleView "addListenerMethod" @75
-			    Parent_View 	@74
-			    location   	(836, 836)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @76
-				Parent_View 	@75
-				location   	(1564, 1899)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	385
-				justify    	0
-				label      	"+addListenerMethod"
-				pctDist    	0.627386
-				height     	90
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D3090346"
-			    client     	@74
-			    supplier   	@44
-			    vertices   	(list Points
-				(1700, 1732)
-				(1647, 1763)
-				(1658, 2009))
-			    line_style 	0
-			    label      	(object SegLabel @77
-				Parent_View 	@75
-				location   	(1702, 1914)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.694068
-				height     	48
-				orientation 	0))
-			(object RoleView "$UNNAMED$5" @78
-			    Parent_View 	@74
-			    location   	(836, 836)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D309035A"
-			    client     	@74
-			    supplier   	@68
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$10" @79
-		    location   	(1924, 1792)
-		    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      	"3A79D4DF020B"
-		    roleview_list 	(list RoleViews
-			(object RoleView "removeListenerMethod" @80
-			    Parent_View 	@79
-			    location   	(1060, 896)
-			    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   	(1905, 1824)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	448
-				justify    	0
-				label      	"+removeListenerMethod"
-				pctDist    	0.129058
-				height     	6
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4E10395"
-			    client     	@79
-			    supplier   	@44
-			    line_style 	0
-			    label      	(object SegLabel @82
-				Parent_View 	@80
-				location   	(1798, 2022)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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$11" @83
-			    Parent_View 	@79
-			    location   	(1060, 896)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D4E103A9"
-			    client     	@79
-			    supplier   	@68
-			    line_style 	0)))
-		(object InheritView "" @84
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DEA200EC"
-		    client     	@68
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(2238, 1239)
-		    terminal_attachment 	(2238, 1089)
-		    drawSupplier 	@11)
-		(object AssociationViewNew "$UNNAMED$30" @85
-		    location   	(1161, 1934)
-		    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      	"41F11E710387"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eventAdapterClass" @86
-			    Parent_View 	@85
-			    location   	(-1095, 526)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @87
-				Parent_View 	@86
-				location   	(688, 2144)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	367
-				justify    	0
-				label      	"+eventAdapterClass"
-				pctDist    	0.629702
-				height     	10
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F11E730249"
-			    client     	@85
-			    supplier   	@55
-			    vertices   	(list Points
-				(1161, 1934)
-				(766, 2124)
-				(383, 2172))
-			    line_style 	0
-			    label      	(object SegLabel @88
-				Parent_View 	@86
-				location   	(471, 2200)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.898257
-				height     	38
-				orientation 	0))
-			(object RoleView "$UNNAMED$31" @89
-			    Parent_View 	@85
-			    location   	(-1095, 526)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F11E73025D"
-			    client     	@85
-			    supplier   	@68
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$6" @90
-		    location   	(2419, 2140)
-		    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      	"3A79D3E10364"
-		    roleview_list 	(list RoleViews
-			(object RoleView "listenerMethods" @91
-			    Parent_View 	@90
-			    location   	(1555, 1244)
-			    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   	(2501, 2590)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	324
-				justify    	0
-				label      	"+listenerMethods"
-				pctDist    	0.790503
-				height     	19
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D3E6007D"
-			    client     	@90
-			    supplier   	@61
-			    line_style 	0
-			    label      	(object SegLabel @93
-				Parent_View 	@91
-				location   	(2491, 2524)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.676961
-				height     	14
-				orientation 	1))
-			(object RoleView "$UNNAMED$7" @94
-			    Parent_View 	@90
-			    location   	(1555, 1244)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79D3E60091"
-			    client     	@90
-			    supplier   	@68
-			    line_style 	0)))
-		(object AttachView "" @95
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@1
-		    supplier   	@90
-		    line_style 	0)
-		(object AssociationViewNew "$UNNAMED$32" @96
-		    location   	(2283, 2216)
-		    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      	"41F1278A01A5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serListMthd" @97
-			    Parent_View 	@96
-			    location   	(27, 808)
-			    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   	(2262, 2707)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	229
-				justify    	0
-				label      	"-serListMthd"
-				pctDist    	0.765012
-				height     	39
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F1278B021F"
-			    client     	@96
-			    supplier   	@61
-			    vertices   	(list Points
-				(2283, 2216)
-				(2303, 2771)
-				(2388, 2769))
-			    line_style 	0
-			    label      	(object SegLabel @99
-				Parent_View 	@97
-				location   	(2170, 2642)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.657692
-				height     	129
-				orientation 	1))
-			(object RoleView "$UNNAMED$33" @100
-			    Parent_View 	@96
-			    location   	(27, 808)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"41F1278B0229"
-			    client     	@96
-			    supplier   	@68
-			    line_style 	0)))
-		(object InheritView "" @101
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3DFA19B600DE"
-		    client     	@61
-		    supplier   	@8
-		    line_style 	0)
-		(object AttachView "" @102
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@6
-		    supplier   	@4
-		    line_style 	0)
-		(object AttachView "" @103
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@6
-		    supplier   	@68
-		    vertices   	(list Points
-			(1878, 2808)
-			(2016, 2021)
-			(2189, 1576))
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::beaninfo::PropertyDecorator" @104
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    ShowOperationSignature 	TRUE
-		    location   	(1424, 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 	@104
-			location   	(1068, 1177)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	712
-			justify    	0
-			label      	"PropertyDecorator")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A79DA68010E"
-		    compartment 	(object Compartment
-			Parent_View 	@104
-			location   	(1068, 1238)
-			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  	603)
-		    width      	730
-		    height     	486
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @105
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE840388"
-		    client     	@40
-		    supplier   	@104
-		    line_style 	0)
-		(object InheritView "" @106
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A79DE9702BD"
-		    client     	@104
-		    supplier   	@10
-		    line_style 	3
-		    origin_attachment 	(1391, 1165)
-		    terminal_attachment 	(1391, 1089)
-		    drawSupplier 	@11)
-		(object AssociationViewNew "$UNNAMED$16" @107
-		    location   	(1029, 1973)
-		    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      	"3A79DBBD0000"
-		    roleview_list 	(list RoleViews
-			(object RoleView "readMethod" @108
-			    Parent_View 	@107
-			    location   	(261, 1077)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @109
-				Parent_View 	@108
-				location   	(1319, 2035)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	254
-				justify    	0
-				label      	"+readMethod"
-				pctDist    	0.553714
-				height     	7
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBBF0071"
-			    client     	@107
-			    supplier   	@44
-			    line_style 	0
-			    label      	(object SegLabel @110
-				Parent_View 	@108
-				location   	(1474, 2131)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.873365
-				height     	72
-				orientation 	1))
-			(object RoleView "$UNNAMED$17" @111
-			    Parent_View 	@107
-			    location   	(261, 1077)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBBF0085"
-			    client     	@107
-			    supplier   	@104
-			    vertices   	(list Points
-				(1029, 1973)
-				(909, 1950)
-				(1192, 1651))
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$18" @112
-		    location   	(1035, 2105)
-		    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      	"3A79DBDF02D0"
-		    roleview_list 	(list RoleViews
-			(object RoleView "writeMethod" @113
-			    Parent_View 	@112
-			    location   	(267, 1209)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @114
-				Parent_View 	@113
-				location   	(1325, 2090)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	254
-				justify    	0
-				label      	"+writeMethod"
-				pctDist    	0.560930
-				height     	12
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBE101F7"
-			    client     	@112
-			    supplier   	@44
-			    line_style 	0
-			    label      	(object SegLabel @115
-				Parent_View 	@113
-				location   	(1503, 2056)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.901632
-				height     	43
-				orientation 	0))
-			(object RoleView "$UNNAMED$19" @116
-			    Parent_View 	@112
-			    location   	(267, 1209)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DBE1020B"
-			    client     	@112
-			    supplier   	@104
-			    vertices   	(list Points
-				(1035, 2105)
-				(975, 2106)
-				(1265, 1651))
-			    line_style 	0)))
-		(object AssociationViewNew "$UNNAMED$14" @117
-		    location   	(714, 1877)
-		    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      	"3A79DB0B0339"
-		    roleview_list 	(list RoleViews
-			(object RoleView "propertyEditorClass" @118
-			    Parent_View 	@117
-			    location   	(-54, 981)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @119
-				Parent_View 	@118
-				location   	(670, 1937)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	392
-				justify    	0
-				label      	"+propertyEditorClass"
-				pctDist    	0.166430
-				height     	26
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DB0E013F"
-			    client     	@117
-			    supplier   	@55
-			    line_style 	0
-			    label      	(object SegLabel @120
-				Parent_View 	@118
-				location   	(952, 1870)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.490182
-				height     	126
-				orientation 	0))
-			(object RoleView "$UNNAMED$15" @121
-			    Parent_View 	@117
-			    location   	(-54, 981)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A79DB0E0171"
-			    client     	@117
-			    supplier   	@104
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::java::Field" @122
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(816, 2672)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@122
-			location   	(720, 2597)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	192
-			justify    	0
-			label      	"Field")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777088
-		    quidu      	"3654AF8F0280"
-		    width      	210
-		    height     	174
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$34" @123
-		    location   	(1193, 2164)
-		    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      	"4207D83F01DA"
-		    roleview_list 	(list RoleViews
-			(object RoleView "field" @124
-			    Parent_View 	@123
-			    location   	(-215, 756)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @125
-				Parent_View 	@124
-				location   	(937, 2514)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	112
-				justify    	0
-				label      	"+field"
-				pctDist    	0.892515
-				height     	57
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4207D8400290"
-			    client     	@123
-			    supplier   	@122
-			    vertices   	(list Points
-				(1193, 2164)
-				(1103, 2463)
-				(921, 2593))
-			    line_style 	0
-			    label      	(object SegLabel @126
-				Parent_View 	@124
-				location   	(1042, 2560)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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.780986
-				height     	43
-				orientation 	0))
-			(object RoleView "$UNNAMED$35" @127
-			    Parent_View 	@123
-			    location   	(-215, 756)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4207D8400292"
-			    client     	@123
-			    supplier   	@104
-			    line_style 	0)))))))
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl b/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl
deleted file mode 100644
index c07aeee..0000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl
+++ /dev/null
@@ -1,5028 +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 	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       	"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      	"3A7999AD02A1"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.emf.ecore\\src\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E")
-	    (object Class_Category "java"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.jem\\rose\\edocjava2.cat"
-		quid       	"36549F2C004E")
-	    (object Class_Category "beaninfo"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WorkspaceRoot\\org.eclipse.jem.beaninfo\\rose\\beaninfo.cat"
-		quid       	"3A799ABB0353"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3A7999B70309"
-		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::beaninfo" @1
-			location   	(272, 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 	@1
-			    location   	(128, 140)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"beaninfo")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3A799ABB0353"
-			width      	300
-			height     	180)))
-	    (object ClassDiagram "Dependencies (Don't edit)"
-		quid       	"3B869C9102E4"
-		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 CategoryView "Logical View::ecore" @2
-			location   	(256, 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 	@2
-			    location   	(112, 156)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	16776960
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::java" @3
-			location   	(896, 256)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(749, 222)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	294
-			    justify    	0
-			    label      	"java")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(749, 172)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	294
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	16776960
-			quidu      	"36549F2C004E"
-			width      	306
-			height     	180)
-		    (object NoteView @4
-			location   	(688, 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 	@4
-			    location   	(280, 532)
-			    fill_color 	13434879
-			    nlines     	7
-			    max_width  	780
-			    label      	"These are packages (cat files) that this model depends on. They must not be edited in here. They are only be edited by the model that owns them.")
-			line_color 	3342489
-			fill_color 	16744703
-			width      	840
-			height     	325)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3A7999AD02A1"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3A7999B702F5"
-		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       	"3A7999AD02A2"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3A7999AD02A4"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"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       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	"None")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	".;D:\\Program Files\\Rational\\RUPBuilder;D:\\Program Files\\Rational\\common\\java\\swingall.jar;D:\\Program Files\\Rational\\common\\java\\javahelp\\jh.jar;d:\\program files\\sun\\jdk1.3.1_03\\src.jar;d:\\program files\\sun\\jdk1.3.1_03\\jre\\lib\\i18n.jar;d:\\program files\\sun\\jdk1.3.1_03\\jre\\lib\\jaws.jar;d:\\program files\\sun\\jdk1.3.1_03\\jre\\lib\\rt.jar;d:\\program files\\sun\\jdk1.3.1_03\\lib\\dt.jar;d:\\program files\\sun\\jdk1.3.1_03\\lib\\tools.jar;d:\\program files\\sun\\jdk1.3.1_03\\jre\\lib\\sunrsasign.jar")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		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       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3A7999AD02A3"))
diff --git a/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd b/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd
deleted file mode 100644
index f738151..0000000
--- a/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.beaninfo">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jem.beaninfo" id="registrations" name="BeanInfo Extension Registrations"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to register contributors, beaninfo, and overrides for BeanInfo contributions.
-&lt;p&gt;An important concept is visibility of a container, plugin, or project to the top-level project. The top-level project is the project being introspected. For a container, plugin, or project to be visible to that project, the container, plugin, or project must be in the classpath of the top-level project, or it must be exported from a visible project or plugin. Once a non-visible project/plugin is reached, any projects, containers, or plugins that it may contain are not considered to be visible.
-&lt;p&gt;The registrations are identified with the container id and/or plugin id. If that container or plugin is visible, then that registration will be processed for the top-level project. If the container/plugin is found more than once in the build path of the top-level project, it will only be processed once.
-&lt;p&gt;There are three forms of registrations.
-&lt;ul&gt;
-&lt;li&gt;BeanInfo registrations. These supply standard BeanInfo and overrides.
-&lt;li&gt;&lt;samp&gt;IClasspathContainer&lt;/samp&gt; that implements &lt;samp&gt;IBeanInfoContributor&lt;/samp&gt;.
-&lt;li&gt;An explicit contributor that implements &lt;samp&gt;IBeanInfoContributor&lt;/samp&gt;.
-&lt;/ul&gt;
-&lt;p&gt;It runs through the visible BeanInfo registrations. 
-&lt;p&gt;
-The IClasspathContainer registration isn&apos;t specified as part of this extension point. For all visible containers, if the classpath container (from JDT) also implements IBeanInfoContributor, then it will be called to contribute to the BeanInfo.
-&lt;p&gt;Then it runs through the visible explicit contributors. Note that if the explicit contributor also implements &lt;samp&gt;org.eclipse.jem.internal.proxy.core.IConfigurationContributor&lt;/samp&gt; it will also be called for proxy contributions. This allows for special setup required by any contributed BeanInfo for the launched proxy registry. This shouldn&apos;t normally be necessary because normal classpath updates to include the BeanInfo jar will be done by the IBeanInfoContributor itself through the BeanInfo registration callback.
-&lt;p&gt;The order of processing for the overrides will be to first run through the specified overrides (through Beaninfo registrations). Then it runs through the visible containers that implement IBeanInfoContributor, and then finally it runs through the explicit IBeanInfoContributors. This order is chosen because the overrides files are not dynamic so they need to be applied in a consistent way. The contributors are dynamic and can handle change.
-&lt;p&gt;The only order guarantee is that contributions from this extension point will be processed in plugin order of where the extension was declared. For example if there was an extension declared in plugin A and in plugin B, and plugin B requires plugin A, then the extensions declarations in plugin A will be processed before the extension declarations in plugin B.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="registration" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="contributor" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="registration">
-      <annotation>
-         <documentation>
-            This is a registration for a container or plugin. It supplies the BeanInfo and the overrides.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="beaninfo" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="override" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="container" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a container. The value is the container id (e.g. &quot;JRE_CONTAINER&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="plugin" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a plugin. The value is the plugin id (e.g. &quot;org.eclipse.swt&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contributor">
-      <annotation>
-         <documentation>
-            This is a contributor for the visible container/plugin defined by container and plugin attributes.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="container" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a container. The value is the container id (e.g. &quot;JRE_CONTAINER&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="plugin" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a plugin. The value is the plugin id (e.g. &quot;org.eclipse.swt&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class that implements this contributor. The class must implement IBeanInfoContributor.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="beaninfo">
-      <annotation>
-         <documentation>
-            Provide a BeanInfo jar from this or some other plugin, and provide search path packages.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="searchpath" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the path to the BeanInfo jar from within this or some other plugin. If it is within this plugin, there should be no leading &apos;/&apos;. There can be subfolders though, e.g. &lt;samp&gt;xyz/qxr.jar&lt;/samp&gt;. If it is within another plugin, then it must be fully-qualified with leading &apos;/&apos; followed by plugin id, followed by a &apos;/&apos; and then the path to the jar relative to that plugin, e.g. &lt;samp&gt;/org.xyz/qxr/ddd.jar&lt;/samp&gt;.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="searchpath">
-      <annotation>
-         <documentation>
-            This is a search path. It gives the package to add to the search path for BeanInfo.
-It refers to packages within the BeanInfo jar contributed by the &lt;samp&gt;beaninfo&lt;/samp&gt; element that it is found within.
-There really should be at least one search path. The only way this jar could contribute BeanInfo and not need something added to the search path is if the BeanInfos are in the same package as the bean itself. This is not a recommended way of supplying BeanInfo.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="package" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the java package to search into for BeanInfo. If there are more than one search paths in this &lt;samp&gt;beaninfo&lt;/samp&gt; element, then they will be searched in the order found in the element.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="override">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="package"/>
-         </appInfo>
-         <documentation>
-            This describes an override file for BeanInfo. An override file is an XMI file that is read when a class is first introspected. It happens before the actual introspection. It allows overrides to the Java EMF model class (&lt;samp&gt;JavaClass&lt;/samp&gt;) that can be done through standard BeanInfo. These are annotations that are specific to the Visual Editor implementation in Eclipse. The annotations have no meaning to the standard BeanInfo specification so they are supplied here instead. They provide a much enriched experience in the Visual Editor by providing classes that run in the editor.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="package" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the name of a package or a package fragment. When this package or package fragment matches the package or fragment of a class being introspected, the specified override file from the given path will be applied. For example if the package was &lt;samp&gt;javax.swing&lt;/samp&gt; and the path was &quot;xyz&quot;, then for class &quot;javax.swing.Container&quot; it will look for file &quot;xyz/Container.override&quot;, and if found, it will apply it. If it was &lt;samp&gt;javax.swing.text.JTextComponent&lt;/samp&gt; it will look for file &quot;xyz/text/JTextComponent.override&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="path" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the path relative to the plugin where this extension is declared for the folder to search for the override files. See the package attribute description above for how this works.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a registration:
-&lt;p&gt;
-&lt;pre&gt;
-  &lt;extension point=&quot;org.eclipse.jem.beaninfo.registration&quot;&gt;
-    &lt;registration container=&quot;VE_CONTAINER&quot;&gt;
-      &lt;beaninfo path=&quot;xyzbeaninfo.jar&quot;&gt;
-        &lt;searchpath package=&quot;com.xyz.beaninfo&quot;/&gt;
-        &lt;searchpath package=&quot;com.xyz.qxr.beaninfo&quot;/&gt;
-      &lt;/beaninfo&gt;
-      &lt;override package=&quot;com.xyz&quot; path=&quot;overrides/e&quot;/&gt;
-    &lt;/registration&gt;
-    &lt;contributor plugin=&quot;org.eclipse.ve&quot; class=&quot;com.xyz.myContributor&quot;/&gt;
-  &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-&lt;p&gt;
-This says that if container &quot;VE_CONTAINER&quot; is visible to the project being introspected, then then BeanInfo jar &quot;xyzbeaninfo.jar&quot; (found in the plugin that declared this extension) will be looked into for BeanInfos. The two packages listed will be added to the search path of packages.
-&lt;p&gt;
-The override says that, again for &quot;VE_CONTAINER&quot; visible, for any classes that start with &quot;com.xyz&quot;, then the override file (classname.override) will be searched for in the directory &quot;overrides/e&quot;. For example, if the class was &lt;samp&gt;com.xyz.ABC&lt;/samp&gt; it will look for override file &quot;overrides/e/ABC.override&quot;. If the class was &lt;samp&gt;com.xyz.qxr.ABC&lt;/samp&gt; it will for file &quot;overrides/e/qxr/ABC.override&quot;.
-&lt;p&gt;
-Finally if plugin &quot;org.eclipse.ve&quot; is visible to the project, then &lt;samp&gt;com.xyz.myContributor&lt;/samp&gt; will be used to contribute to the BeanInfo.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The &lt;samp&gt;class&lt;/samp&gt; attribute must be a class that implements the &lt;samp&gt;org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor&lt;/samp&gt; interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
deleted file mode 100644
index e46cf67..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
+++ /dev/null
@@ -1,859 +0,0 @@
-package org.eclipse.jem.beaninfo.vm;
-
-/*******************************************************************************
- * Copyright (c) 2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: BaseBeanInfo.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 22:41:17 $ 
- */
-
-import java.awt.Image;
-import java.beans.*;
-import java.lang.reflect.*;
-
-/**
- * A BaseBeanInfo that provides common support for BeanInfos within the JEM environment.
- * 
- * @since 1.1.0
- */
-public abstract class BaseBeanInfo extends SimpleBeanInfo {
-
-	// Constants to use to create all descriptors etc.
-	protected static java.util.ResourceBundle RESBUNDLE = java.util.ResourceBundle.getBundle("org.eclipse.jem.beaninfo.vm.beaninfo"); //$NON-NLS-1$
-
-	/**
-	 * Bound indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String BOUND = "bound";//$NON-NLS-1$
-
-	/**
-	 * Constrained indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String CONSTRAINED = "constrained";//$NON-NLS-1$
-
-	/**
-	 * Property editor class indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String PROPERTYEDITORCLASS = "propertyEditorClass";//$NON-NLS-1$
-
-	/**
-	 * Read Method indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String READMETHOD = "readMethod";//$NON-NLS-1$
-
-	/**
-	 * Write method indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String WRITEMETHOD = "writeMethod";//$NON-NLS-1$
-
-	/**
-	 * Displayname indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String DISPLAYNAME = "displayName";//$NON-NLS-1$
-
-	/**
-	 * Expert indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String EXPERT = "expert";//$NON-NLS-1$
-
-	/**
-	 * Hidden indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String HIDDEN = "hidden";//$NON-NLS-1$
-
-	/**
-	 * Preferred indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String PREFERRED = "preferred";//$NON-NLS-1$
-
-	/**
-	 * Short description indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String SHORTDESCRIPTION = "shortDescription";//$NON-NLS-1$
-
-	/**
-	 * Customizer class indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String CUSTOMIZERCLASS = "customizerClass";//$NON-NLS-1$
-
-	/**
-	 * Category indicator for apply property arguments. Category is a pre-defined attribute name too. That is where the category is stored in a
-	 * descriptor.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String CATEGORY = "category"; //$NON-NLS-1$
-
-	/**
-	 * In Default eventset indicator for apply property arguments.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String INDEFAULTEVENTSET = "inDefaultEventSet";//$NON-NLS-1$
-	
-	/**
-	 * This is a Feature Attribute Key. When this key exists, the value is a java.lang.reflect.Field. It means this property
-	 * is a field and not a getter/setter. The getter/setter will be ignored and the property type will be the type of the field.
-	 * <p>
-	 * At this time, do not use field on an indexed property. This is currently an indefined situation.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String FIELDPROPERTY = "field";
-
-	/**
-	 * Enumeration values indicator for apply property arguments. Enumeration values is a pre-defined attribute name too. That is where the
-	 * enumeration values are stored.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String ENUMERATIONVALUES = "enumerationValues";//$NON-NLS-1$
-
-	/**
-	 * Obscure indicator for apply property arguments. Obsure is a pre-defined attribute name too. That is where the obscure setting is stored.
-	 * <p>
-	 * Obsure means most users don't need it. In the future such features won't even be cached so as to reduce the in-memory costs. Currently this
-	 * flag is ignored.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String OBSCURE = "ivjObscure";//$NON-NLS-1$
-
-	/**
-	 * Design time indicator for apply property arguments. Design time is a pre-defined attribute name too. That is where the design time setting is
-	 * stored.
-	 * <p>
-	 * Design time means:
-	 * <ul>
-	 * <li>Not set: Will be a property that can be connected to, and shows on property sheet (if not hidden).
-	 * <li><code>true</code>: Special property (it will show on property sheet if not hidden), but it can't be connected to. Usually this is a
-	 * property that is fluffed up for the IDE purposes but doesn't have a get/set method. This means it is a property for design time and not for
-	 * runtime.
-	 * <li><code>false</code>: This property will not show up on property sheet but it can be connected to.
-	 * </ul>
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String DESIGNTIMEPROPERTY = "ivjDesignTimeProperty"; //$NON-NLS-1$
-
-	/**
-	 * EventAdapterClass indicator for apply property arguments. Event adapter class is a pre-defined attribute name too. That is where the event
-	 * adapter is stored.
-	 * <p>
-	 * Adapter class for eventSetDescriptors that provide default no-op implementation of the interface methods. For example
-	 * <code>java.awt.event.WindowListener</code> has an adapter of <code>java.awt.event.WindowAdapter</code>. What is stored is actually the
-	 * class name, not the class itself.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final String EVENTADAPTERCLASS = "eventAdapterClass"; //$NON-NLS-1$
-
-	// The keys for icon file names, NOT THE java.awt.icon key.
-	public static final String ICONCOLOR16X16URL = "ICON_COLOR_16x16_URL"; //$NON-NLS-1$	// Not used.
-
-	public static final String ICONCOLOR32X32URL = "ICON_COLOR_32x32_URL"; //$NON-NLS-1$     	// Not used
-
-	public static final String ICONMONO16X16URL = "ICON_MONO_16x16_URL"; //$NON-NLS-1$        	// Not used
-
-	public static final String ICONMONO32X32URL = "ICON_MONO_32x32_URL"; //$NON-NLS-1$			// Not used
-
-	public static final boolean JVM_1_3 = System.getProperty("java.version", "").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
-	
-	/**
-	 * Empty args list for those descriptors that don't have arguments.
-	 * @since 1.1.0
-	 */
-	public static final Object[] EMPTY_ARGS = new Object[0];
-
-	/**
-	 * Capitalize the string. This uppercases only the first character. So if you have property name of "abc" it will become "Abc".
-	 * 
-	 * @param s
-	 * @return string with first letter capitalized.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String capitalize(String s) {
-		if (s.length() == 0) { return s; }
-		char chars[] = s.toCharArray();
-		chars[0] = Character.toUpperCase(chars[0]);
-		return new String(chars);
-	}
-
-	/**
-	 * Create a BeanDescriptor object given an array of keyword/value arguments. Use the keywords defined in this class, e.g. BOUND, EXPERT, etc.
-	 * 
-	 * @param cls
-	 *            bean for which the bean descriptor is being created.
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
-	 * @return new bean descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static BeanDescriptor createBeanDescriptor(Class cls, Object[] args) {
-		Class customizerClass = null;
-
-		/* Find the specified customizerClass */
-		for (int i = 0; i < args.length; i += 2) {
-			if (CUSTOMIZERCLASS.equals(args[i])) {
-				customizerClass = (Class) args[i + 1];
-				break;
-			}
-		}
-
-		BeanDescriptor bd = new BeanDescriptor(cls, customizerClass);
-
-		for (int i = 0; i < args.length; i += 2) {
-			String key = (String) args[i];
-			Object value = args[i + 1];
-			setFeatureDescriptorValue(bd, key, value);
-		}
-
-		return bd;
-	}
-
-	/**
-	 * Create a beans EventSetDescriptor given the following:
-	 * 
-	 * @param cls
-	 *            The bean class
-	 * @param name
-	 *            Name of event set
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
-	 * @param lmds
-	 *            array of MethodDescriptors defining the listener methods
-	 * @param listenerType
-	 *            type of listener
-	 * @param addListenerName
-	 *            add listener method name
-	 * @param removeListenerNameremove
-	 *            listener method name
-	 * @return new event set descriptor
-	 * @since 1.1.0
-	 */
-	public static EventSetDescriptor createEventSetDescriptor(Class cls, String name, Object[] args, MethodDescriptor[] lmds, Class listenerType,
-			String addListenerName, String removeListenerName) {
-		EventSetDescriptor esd = null;
-		Class[] paramTypes = { listenerType};
-		try {
-			java.lang.reflect.Method addMethod = null;
-			java.lang.reflect.Method removeMethod = null;
-			try {
-				/* get addListenerMethod with parameter types. */
-				addMethod = cls.getMethod(addListenerName, paramTypes);
-			} catch (Exception ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
-						new Object[] { addListenerName}));
-			}
-			;
-			try {
-				/* get removeListenerMethod with parameter types. */
-				removeMethod = cls.getMethod(removeListenerName, paramTypes);
-			} catch (Exception ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
-						new Object[] { removeListenerName}));
-			}
-			;
-
-			esd = new EventSetDescriptor(name, listenerType, lmds, addMethod, removeMethod);
-		} catch (Exception ie) {
-			throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_E1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-		;
-		// set the event set descriptor properties
-		for (int i = 0; i < args.length; i += 2) {
-			String key = (String) args[i];
-			Object value = args[i + 1];
-			if (INDEFAULTEVENTSET.equals(key)) {
-				esd.setInDefaultEventSet(((Boolean) value).booleanValue());
-			} else
-				setFeatureDescriptorValue(esd, key, value);
-		}
-
-		return esd;
-	}
-
-	/**
-	 * Create a bean's MethodDescriptor.
-	 * 
-	 * @param cls
-	 *            class of the method.
-	 * @param name
-	 *            name of the method.
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
-	 * @param params
-	 *            parameter descriptors or <code>null</code> if no parameter descriptors.
-	 * @param paramTypes
-	 *            parameter types
-	 * @return new method descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static MethodDescriptor createMethodDescriptor(Class cls, String name, Object[] args, ParameterDescriptor[] params, Class[] paramTypes) {
-		MethodDescriptor md = null;
-		try {
-			java.lang.reflect.Method aMethod = null;
-			try {
-				/* getMethod with parameter types. */
-				aMethod = cls.getMethod(name, paramTypes);
-			} catch (Exception ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
-						new Object[] { name}));
-			}
-			;
-			if (params != null && params.length > 0)
-				md = new MethodDescriptor(aMethod, params);
-			else
-				md = new MethodDescriptor(aMethod);
-		} catch (Exception ie) {
-			throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Method_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-		;
-		// set the method properties
-		for (int i = 0; i < args.length; i += 2) {
-			String key = (String) args[i];
-			Object value = args[i + 1];
-			setFeatureDescriptorValue(md, key, value);
-		}
-		return md;
-	}
-
-	private static PropertyDescriptor createOtherPropertyDescriptor(String name, Class cls) throws IntrospectionException {
-		Method readMethod = null;
-		Method writeMethod = null;
-		String base = capitalize(name);
-		Class[] parameters = new Class[0];
-
-		// First we try boolean accessor pattern
-		try {
-			readMethod = cls.getMethod("is" + base, parameters);//$NON-NLS-1$
-		} catch (Exception ex1) {
-		}
-		if (readMethod == null) {
-			try {
-				// Else we try the get accessor pattern.
-				readMethod = cls.getMethod("get" + base, parameters);//$NON-NLS-1$
-			} catch (Exception ex2) {
-				// Find by matching methods of the class
-				readMethod = findMethod(cls, "get" + base, 0);//$NON-NLS-1$
-			}
-		}
-
-		if (readMethod == null) {
-			// For write-only properties, find the write method
-			writeMethod = findMethod(cls, "set" + base, 1);//$NON-NLS-1$
-		} else {
-			// In Sun's code, reflection fails if there are two
-			// setters with the same name and the first setter located
-			// does not have the same return type of the getter.
-			// This fixes that.
-			parameters = new Class[1];
-			parameters[0] = readMethod.getReturnType();
-			try {
-				writeMethod = cls.getMethod("set" + base, parameters);//$NON-NLS-1$
-			} catch (Exception ex3) {
-			}
-		}
-		// create the property descriptor
-		if ((readMethod != null) || (writeMethod != null)) {
-			return new PropertyDescriptor(name, readMethod, writeMethod);
-		} else {
-			throw new IntrospectionException(java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_find_the_acc1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-	}
-
-	/**
-	 * Create a beans parameter descriptor.
-	 * 
-	 * @param name
-	 *            name of parameter
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
-	 * @return new parameter descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static ParameterDescriptor createParameterDescriptor(String name, Object[] args) {
-		ParameterDescriptor pd = null;
-		try {
-			pd = new ParameterDescriptor();
-		} catch (Exception ie) {
-			throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Param1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-		}
-		;
-		// set the name
-		pd.setName(name);
-		// set the method properties
-		for (int i = 0; i < args.length; i += 2) {
-			String key = (String) args[i];
-			Object value = args[i + 1];
-			setFeatureDescriptorValue(pd, key, value);
-		}
-
-		return pd;
-	}
-	
-	private static Method GETCLASS; 
-	
-	static {
-		try {
-			GETCLASS = Object.class.getMethod("getClass", null);
-		} catch (SecurityException e) {
-		} catch (NoSuchMethodException e) {
-		}
-	}
-	/**
-	 * Create a property descriptor describing a field property.
-	 * <p>
-	 * Note: This is non-standard. The VE knows how to handle this, but any one else using BeanInfo will see this as a property with
-	 * no getter or setter.
-	 * @param name
-	 * @param field
-	 * @param args
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static PropertyDescriptor createFieldPropertyDescriptor(String name, Field field, Object[] args) {
-		try {
-			PropertyDescriptor pd = new PropertyDescriptor(name, null, null);
-			pd.setValue(FIELDPROPERTY, field);	// Set the field property so we know it is a field.
-			applyFieldArguments(pd, args);
-			// Need to set in a phony read method because Introspector will throw it away otherwise. We just use Object.getClass for this.
-			// We will ignore the property type for fields. If used outside of VE then it will look like a class property.
-			pd.setReadMethod(GETCLASS);
-			return pd;
-		} catch (IntrospectionException e) {
-			throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-					new Object[] { name}));
-			return null;
-		}
-	}
-
-	/**
-	 * Create a bean's property descriptor.
-	 * 
-	 * @param cls
-	 *            class of who owns the property (usually the bean). It is used to look up get/set methods for the property.
-	 * @param name
-	 *            name of the property. It will use get{Name} and set{Name} to find get/set methods.
-	 * @param args
-	 *            arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
-	 * @return new property descriptor
-	 * 
-	 * @since 1.1.0
-	 */
-	public static PropertyDescriptor createPropertyDescriptor(Class cls, String name, Object[] args) {
-		PropertyDescriptor pd = null;
-		try {
-			// Create assuming that the getter/setter follows reflection patterns
-			pd = new PropertyDescriptor(name, cls);
-		} catch (IntrospectionException e) {
-			// Try creating a property descriptor for read-only, write-only
-			// or if Sun's reflection fails
-			try {
-				pd = createOtherPropertyDescriptor(name, cls);
-			} catch (IntrospectionException ie) {
-				throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-						new Object[] { name}));
-			}
-		}
-
-		applyPropertyArguments(pd, args, cls);
-
-		return pd;
-	}
-
-	/**
-	 * Create a new PropertyDescriptor based upon the PD sent in. It will clone the sent in one, and apply the args to override any specific setting.
-	 * Class cls is used for finding read/write methods, if any.
-	 * 
-	 * This is used when wanting to override only a few specific settings from a property descriptor from the super class.
-	 * 
-	 * @param fromPDS
-	 *            The PropertyDescriptor array to find the entry to clone. It will be changed in place in the array.
-	 * @param name
-	 *            The name of the property to find and clone and override.
-	 * @param cls
-	 *            The class to use to find read/write methods in args. If no read/write methods specified, then this may be null.
-	 * @param args
-	 *            The arguments to override from fromPD. arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
-	 */
-	public void replacePropertyDescriptor(PropertyDescriptor[] pds, String name, Class cls, Object[] args) {
-		PropertyDescriptor pd = null;
-		int iPD = findPropertyDescriptor(pds, name);
-		if (iPD == -1)
-			return;
-		PropertyDescriptor fromPD = pds[iPD];
-		try {
-
-			pd = pds[iPD] = new PropertyDescriptor(fromPD.getName(), null, null);
-		} catch (IntrospectionException e) {
-			throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-					new Object[] { fromPD.getName()}));
-		}
-
-		// Now copy over the contents of fromPD.
-		clonePropertySettings(fromPD, pd);
-
-		// Now apply the overrides
-		applyPropertyArguments(pd, args, cls);
-		return;
-	}
-
-	private void clonePropertySettings(PropertyDescriptor fromPD, PropertyDescriptor pd) {
-		try {
-			pd.setReadMethod(fromPD.getReadMethod());
-			pd.setWriteMethod(fromPD.getWriteMethod());
-			pd.setPropertyEditorClass(fromPD.getPropertyEditorClass());
-			pd.setBound(fromPD.isBound());
-			pd.setConstrained(fromPD.isConstrained());
-			cloneFeatureSettings(fromPD, pd);
-		} catch (IntrospectionException e) {
-			throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
-					new Object[] { fromPD.getName()}));
-		}
-	}
-
-	private void cloneFeatureSettings(FeatureDescriptor fromFD, FeatureDescriptor fd) {
-		fd.setExpert(fromFD.isExpert());
-		fd.setHidden(fromFD.isHidden());
-		fd.setPreferred(fromFD.isPreferred());
-		fd.setShortDescription(fromFD.getShortDescription());
-		fd.setDisplayName(fromFD.getDisplayName());
-
-		java.util.Enumeration keys = fromFD.attributeNames();
-		while (keys.hasMoreElements()) {
-			String key = (String) keys.nextElement();
-			Object value = fromFD.getValue(key);
-			fd.setValue(key, value);
-		}
-	}
-
-	/*
-	 * The common property arguments between field and standard properties.
-	 */
-	private static boolean applyCommonPropertyArguments(PropertyDescriptor pd, String key, Object value) {
-		if (BOUND.equals(key)) {
-			pd.setBound(((Boolean) value).booleanValue());
-		} else if (CONSTRAINED.equals(key)) {
-			pd.setConstrained(((Boolean) value).booleanValue());
-		} else if (PROPERTYEDITORCLASS.equals(key)) {
-			pd.setPropertyEditorClass((Class) value);
-		} else if (FIELDPROPERTY.equals(key))
-			return true;	// This should not be applied except through createFieldProperty.
-		else
-			return false;
-		return true;
-	
-	}
-	
-	private static void applyPropertyArguments(PropertyDescriptor pd, Object[] args, Class cls) {
-		for (int i = 0; i < args.length; i += 2) {
-			String key = (String) args[i];
-			Object value = args[i + 1];
-
-			if (!applyCommonPropertyArguments(pd, key, value)) {
-				if (READMETHOD.equals(key)) {
-					String methodName = (String) value;
-					Method method;
-					try {
-						method = cls.getMethod(methodName, new Class[0]);
-						pd.setReadMethod(method);
-					} catch (Exception e) {
-						throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_read_method_EXC_"), //$NON-NLS-1$
-								new Object[] { cls, methodName}));
-					}
-				} else if (WRITEMETHOD.equals(key)) {
-					String methodName = (String) value;
-					try {
-						if (methodName == null) {
-							pd.setWriteMethod(null);
-						} else {
-							Method method;
-							Class type = pd.getPropertyType();
-							method = cls.getMethod(methodName, new Class[] { type});
-							pd.setWriteMethod(method);
-						}
-					} catch (Exception e) {
-						throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_write_method_EXC_"), //$NON-NLS-1$
-								new Object[] { cls, methodName}));
-					}
-				} else {
-					// arbitrary value
-					setFeatureDescriptorValue(pd, key, value);
-				}
-			}
-		}
-	}
-
-	private static void applyFieldArguments(PropertyDescriptor pd, Object[] args) {
-		for (int i = 0; i < args.length; i += 2) {
-			String key = (String) args[i];
-			Object value = args[i + 1];
-
-			if (!applyCommonPropertyArguments(pd, key, value)) {
-				if (READMETHOD.equals(key)) {
-					// ignored for field.
-				} else if (WRITEMETHOD.equals(key)) {
-					// ignored for field.
-				} else {
-					// arbitrary value
-					setFeatureDescriptorValue(pd, key, value);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Find the method by comparing (name & parameter size) against the methods in the class. This is an expensive call and should be used only if
-	 * getMethod with specific parameter types can't find method.
-	 * 
-	 * @return java.lang.reflect.Method
-	 * @param aClass
-	 *            java.lang.Class
-	 * @param methodName
-	 *            java.lang.String
-	 * @param parameterCount
-	 *            int
-	 */
-	public static java.lang.reflect.Method findMethod(java.lang.Class aClass, java.lang.String methodName, int parameterCount) {
-		try {
-			/*
-			 * Since this method attempts to find a method by getting all methods from the class, this method should only be called if getMethod
-			 * cannot find the method.
-			 */
-			java.lang.reflect.Method methods[] = aClass.getMethods();
-			for (int index = 0; index < methods.length; index++) {
-				java.lang.reflect.Method method = methods[index];
-				if ((method.getParameterTypes().length == parameterCount) && (method.getName().equals(methodName))) { return method; }
-				;
-			}
-			;
-		} catch (java.lang.Throwable exception) {
-			return null;
-		}
-		;
-		return null;
-	}
-
-	/**
-	 * Find a property descriptor of a given name in the list.
-	 * 
-	 * @param pds
-	 *            The array of property descriptors to search, may be null.
-	 * @param name
-	 *            The name to search for.
-	 * @return The found property descriptor index, or -1 if not found.
-	 */
-	public static int findPropertyDescriptor(PropertyDescriptor[] pds, String name) {
-		for (int i = 0; i < pds.length; i++) {
-			if (name.equals(pds[i].getName()))
-				return i;
-		}
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.BeanInfo#getDefaultEventIndex()
-	 */
-	public int getDefaultEventIndex() {
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.beans.BeanInfo#getDefaultPropertyIndex()
-	 */
-	public int getDefaultPropertyIndex() {
-		return -1;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see java.beans.SimpleBeanInfo#getBeanDescriptor()
-	 */
-	public BeanDescriptor getBeanDescriptor() {
-		// Default is to create an empty one.
-		return createBeanDescriptor(getBeanClass(), EMPTY_ARGS);
-	}
-
-	/**
-	 * Implementation for BeanInfo. This implementation will return the BeanInfo of the superclass.
-	 * 
-	 * @see BeanInfo#getAdditionalBeanInfo()
-	 * @since 1.1.0
-	 */
-	public BeanInfo[] getAdditionalBeanInfo() {
-		try {
-			BeanInfo[] result = new BeanInfo[] { Introspector.getBeanInfo(getBeanClass().getSuperclass())};
-			PropertyDescriptor[] oPDs = result[0].getPropertyDescriptors();
-			PropertyDescriptor[] nPDs = overridePropertyDescriptors(oPDs);
-			if (oPDs != nPDs)
-				result[0] = new OverridePDBeanInfo(result[0], nPDs);
-			return result;
-		} catch (IntrospectionException e) {
-			return new BeanInfo[0];
-		}
-	}
-
-	private static class OverridePDBeanInfo implements BeanInfo {
-
-		private BeanInfo originalBeanInfo;
-
-		private PropertyDescriptor[] overridePDs;
-
-		public OverridePDBeanInfo(BeanInfo bi, PropertyDescriptor[] pds) {
-			originalBeanInfo = bi;
-			overridePDs = pds;
-		}
-
-		public BeanInfo[] getAdditionalBeanInfo() {
-			return originalBeanInfo.getAdditionalBeanInfo();
-		}
-
-		public BeanDescriptor getBeanDescriptor() {
-			return originalBeanInfo.getBeanDescriptor();
-		}
-
-		public int getDefaultEventIndex() {
-			return originalBeanInfo.getDefaultEventIndex();
-		}
-
-		public int getDefaultPropertyIndex() {
-			return originalBeanInfo.getDefaultPropertyIndex();
-		}
-
-		public EventSetDescriptor[] getEventSetDescriptors() {
-			return originalBeanInfo.getEventSetDescriptors();
-		}
-
-		public Image getIcon(int iconKind) {
-			return originalBeanInfo.getIcon(iconKind);
-		}
-
-		public MethodDescriptor[] getMethodDescriptors() {
-			return originalBeanInfo.getMethodDescriptors();
-		}
-
-		public PropertyDescriptor[] getPropertyDescriptors() {
-			return overridePDs;
-		}
-	}
-
-	/**
-	 * Allow overrides to parent beaninfo. Subclasses should override this method if they wish to override and change any inherited properties. This
-	 * allows removal of inherited properties or changes of specific properties (such as change from hidden to not hidden).
-	 * 
-	 * Note: If there any changes, this must return a DIFFERENT array. If it returns the same array, then the changes will not be accepted. If just
-	 * overriding, should use pds.clone() to get the new array and then change the specific entries.
-	 * 
-	 * @param pds
-	 * @return The new changed array or the same array if no changes.
-	 * @since 1.1.0
-	 */
-	protected PropertyDescriptor[] overridePropertyDescriptors(PropertyDescriptor[] pds) {
-		return pds;
-	}
-
-	/**
-	 * Get the bean class this beaninfo is for. Used by subclasses to quickly get the bean class without having to code it over and over.
-	 * 
-	 * @return bean class for this beaninfo.
-	 * 
-	 * @since 1.1.0
-	 */
-	public abstract Class getBeanClass();
-
-	/**
-	 * Called whenever the bean information class throws an exception. By default it prints a message and then a stacktrace to sys err.
-	 * 
-	 * @param exception
-	 *            java.lang.Throwable
-	 * @since 1.1.0
-	 */
-	public void handleException(Throwable exception) {
-		System.err.println(RESBUNDLE.getString("UNCAUGHT_EXC_")); //$NON-NLS-1$
-		exception.printStackTrace();
-	}
-
-	private static void setFeatureDescriptorValue(FeatureDescriptor fd, String key, Object value) {
-		if (DISPLAYNAME.equals(key)) {
-			fd.setDisplayName((String) value);
-		} else if (EXPERT.equals(key)) {
-			fd.setExpert(((Boolean) value).booleanValue());
-		} else if (HIDDEN.equals(key)) {
-			fd.setHidden(((Boolean) value).booleanValue());
-		} else if (PREFERRED.equals(key)) {
-			fd.setPreferred(((Boolean) value).booleanValue());
-			if (JVM_1_3) {
-				// Bug in 1.3 doesn't preserve the preferred flag, so we will put it into the attributes too.
-				fd.setValue(PREFERRED, value);
-			}
-		} else if (SHORTDESCRIPTION.equals(key)) {
-			fd.setShortDescription((String) value);
-		}
-		// Otherwise assume an arbitrary-named value
-		// Assume that the FeatureDescriptor private hashTable\
-		// contains only arbitrary-named attributes
-		else {
-			fd.setValue(key, value);
-		}
-	}
-
-	/**
-	 * Fatal errors are handled by calling this method. By default it throws an Error exception.
-	 * 
-	 * @param e
-	 *            exception exception message placed into the new Error thrown.
-	 * @param s
-	 *            message added to exception message. <code>null</code> if nothing to add.
-	 * 
-	 * @throws Error
-	 *             turns exception into an Error.
-	 * @since 1.1.0
-	 */
-	protected static void throwError(Exception e, String s) {
-		throw new Error(e.toString() + " " + s);//$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
deleted file mode 100644
index 03c2282..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/Attic/basebeaninfonls.properties,v $
-# $Revision: 1.4 $  $Date: 2005/04/06 18:03:41 $
-#
-
-
-#
-# Properties for the IvjBeanInfo
-#
-
-#
-# IvjBeanInfo Strings
-#
-Cannot_get_the_meth1_EXC_ = IWAV0011E Cannot get the method {0}.
-Cannot_create_the_E1_EXC_ = IWAV0012E Cannot create the EventSetDescriptor for {0}.
-Cannot_create_Method_EXC_ = IWAV0013E Cannot create the MethodDescriptor for {0}.
-Cannot_find_the_acc1_EXC_ = IWAV0014E Cannot find at least the write or read accessor for property {0}.
-Cannot_create_Param1_EXC_ = IWAV0015E Cannot create the ParameterDescriptor for {0}.
-Cannot_create_the_P1      = Cannot create the PropertyDescriptor for {0}.
-{0}_no_read_method_EXC_   = IWAV0016E Class {0} doesn''t have the requested read accessor {1}.
-{0}_no_write_method_EXC_  = IWAV0017E Class {0} doesn''t have the requested write accessor {1}.
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
deleted file mode 100644
index 134d87e..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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.beaninfo/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/Attic/beaninfo.properties,v $
-# $Revision: 1.3 $  $Date: 2005/04/06 18:03:41 $
-#
-
-
-#
-# Properties for the VCE Beaninfo
-#
-
-#
-# IvjBeanInfo Strings
-#
-Cannot_get_the_meth1_EXC_ = IWAV0007E Cannot get the method {0}.
-Cannot_create_the_E1_EXC_ = IWAV0008E Cannot create the EventSetDescriptor for {0}.
-Cannot_create_Method_EXC_ = IWAV0009E Cannot create the MethodDescriptor for {0}.
-Cannot_find_the_acc1_EXC_ = IWAV0010E Cannot find at least the write or read accessor for property {0}.
-Cannot_create_Param1_EXC_ = IWAV0146E Cannot create the ParameterDescriptor for {0}.
-Cannot_create_the_P1_EXC_ = IWAV0147E Cannot create the PropertyDescriptor for {0}.
-{0}_no_read_method_EXC_   = IWAV0148E Class {0} doesn''t have the requested read accessor {1}.
-{0}_no_write_method_EXC_  = IWAV0149E Class {0} doesn''t have the requested write accessor {1}.
-UNCAUGHT_EXC_             = IWAV0123E --------- UNCAUGHT EXCEPTION ---------
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
deleted file mode 100644
index 63ec7d9..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: BeanDescriptorEquality.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-/**
- * Equality tester for BeanDescriptors
- */
-public class BeanDescriptorEquality extends FeatureDescriptorEquality {
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(BeanDescriptor.class, (BeanDescriptorEquality.class).getConstructor(new Class[] {BeanDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}
-	
-	/**
-	 * Constructor for BeanDescriptorEquality.
-	 */
-	public BeanDescriptorEquality() {
-		super();
-	}
-
-
-	public BeanDescriptorEquality(BeanDescriptor descr) {
-		super(descr);
-	}
-	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		BeanDescriptor bd = (BeanDescriptor) fFeature;
-		int hc = bd.getBeanClass().hashCode();
-		if (bd.getCustomizerClass() != null)
-			hc += bd.getCustomizerClass().hashCode();
-			
-		return hashcode*31 + hc;
-	}
-	 
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-		if (!super.equals(obj))
-			return false;
- 	
-		BeanDescriptor ob = (BeanDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-		BeanDescriptor fb = (BeanDescriptor) fFeature;
- 		
-		if (ob.getBeanClass() != fb.getBeanClass())
-			return false;
-		if (ob.getCustomizerClass() != fb.getCustomizerClass())
-			return false;
- 			
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
deleted file mode 100644
index c1e9890..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: EventSetDescriptorEquality.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-import java.util.*;
-import java.lang.reflect.Method;
-/**
- * Equality tester for EventSetDescriptors
- */
-public class EventSetDescriptorEquality extends FeatureDescriptorEquality {
-	
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(EventSetDescriptor.class, (EventSetDescriptorEquality.class).getConstructor(new Class[] {EventSetDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}
-	
-	private ArrayList fListenerMethodDescriptors;	// Array of MethodDescriptorEquality's.
-	
-	/**
-	 * Constructor for EventSetDescriptorEquality.
-	 */
-	public EventSetDescriptorEquality() {
-		super();
-	}
-
-
-	public EventSetDescriptorEquality(EventSetDescriptor descr) {
-		super(descr);
-	}
-	
-	/**
-	 * A new feature is being set into this object,
-	 * clear any cache members so that they can be reconstructed.
-	 *
-	 * NOTE: Subclasses - remember to call super.clearFeature();
-	 */
-	protected void clearFeature() {
-		super.clearFeature();
-		fListenerMethodDescriptors = null;
-	}
-		
-	protected ArrayList listenerMethodDescriptors() {
-		if (fListenerMethodDescriptors == null) {
-			MethodDescriptor[] mds = ((EventSetDescriptor) fFeature).getListenerMethodDescriptors();
-			fListenerMethodDescriptors = new ArrayList(mds.length);
-			for (int i=0; i<mds.length; i++)
-				fListenerMethodDescriptors.add(new MethodDescriptorEquality(mds[i]));
-		}
-		return fListenerMethodDescriptors;
-	}	
-	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		EventSetDescriptor bd = (EventSetDescriptor) fFeature;
-		int hc = bd.getAddListenerMethod().hashCode();
-		Method[] methods = bd.getListenerMethods();
-		int mhc = 0;
-		for (int i=0; i<methods.length; i++)
-			mhc = mhc*31 + methods[i].hashCode();
-		hc += mhc;
-		hc += listenerMethodDescriptors().hashCode();
-		hc += bd.getListenerType().hashCode();
-		hc += bd.getRemoveListenerMethod().hashCode();
-		hc += (bd.isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		hc += (bd.isUnicast() ? Boolean.TRUE : Boolean.FALSE).hashCode();		
-
-		return hashcode*31 + hc;
-	}
-
-	 
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-			
-		if (!super.equals(obj))
- 			return false;
- 	
-		EventSetDescriptor oe = (EventSetDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-		EventSetDescriptor fe = (EventSetDescriptor) fFeature;
-		
-		EventSetDescriptorEquality oee = (EventSetDescriptorEquality) obj;
- 		
-		if (!oe.getAddListenerMethod().equals(fe.getAddListenerMethod()))
-			return false;
-		if (!java.util.Arrays.equals(oe.getListenerMethods(), fe.getListenerMethods()))
-			return false;	
-		if (oe.getListenerType() != fe.getListenerType())
-			return false;
-		if (oe.getRemoveListenerMethod() != fe.getRemoveListenerMethod())
-			return false;
-		if (oe.isInDefaultEventSet() != fe.isInDefaultEventSet())
-			return false;
-		if (oe.isUnicast() != oe.isUnicast())
-			return false;
-		
-		if (fListenerMethodDescriptors != null || oee.fListenerMethodDescriptors != null) {
-			// We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
-			if (!oee.listenerMethodDescriptors().equals(listenerMethodDescriptors()))			
-				return false;
-		} else {
-			// We are in the building the list phases, don't waste space building entire list.
-			MethodDescriptor[] ours = fe.getListenerMethodDescriptors();
-			MethodDescriptor[] theirs = oe.getListenerMethodDescriptors();
-			if (ours.length != theirs.length)
-				return false;
-			if (ours.length > 0) {
-				MethodDescriptorEquality workingOurs = new MethodDescriptorEquality();
-				MethodDescriptorEquality workingThiers = new MethodDescriptorEquality();
-				for (int i = 0; i < ours.length; i++) {
-					workingOurs.setFeature(ours[i]);
-					workingThiers.setFeature(theirs[i]);
-					if (!workingOurs.equals(workingThiers))
-						return false;
-				}
-			}			
-		}
-			
-		return true;			
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
deleted file mode 100644
index b93fd9c..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: FeatureDescriptorEquality.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-import java.util.*;
-import java.lang.reflect.*;
-/**
- * This object is used to test for semantic equality (equals())
- * between feature objects. It is needed because Feature's don't
- * provide a semantic equality, only an identity equality. Need
- * semantic equality so that keys in map can be found equal
- * semantically.
- */
-
-public class FeatureDescriptorEquality {
-	protected FeatureDescriptor fFeature;
-	
-	private HashMap fValues;	// The key/values for this feature. We grab them out
-								// so that we don't have to keep re-getting them for equality
-								// compares. This is done the first time needed in the equals
-								// statement.
-								
-	private int fHashCode = 0;	// Hashcode of this equality object. The hashcode for the feature is expensive
-					// so we will calculate it once (the assumption is that
-					// features once created aren't changed, which for our
-					// purposes here in beaninfo land is good).
-		
-	protected static HashMap MAP_EQUALITY = new HashMap(10);	// Map from descriptor to equality type.
-	static {
-		try {
-			MAP_EQUALITY.put(FeatureDescriptor.class, (FeatureDescriptorEquality.class).getConstructor(new Class[] {FeatureDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-		// Need to set up the others.
-		BeanDescriptorEquality.INIT();
-		EventSetDescriptorEquality.INIT();		
-		IndexedPropertyDescriptorEquality.INIT();
-		MethodDescriptorEquality.INIT();		
-		ParameterDescriptorEquality.INIT();
-		PropertyDescriptorEquality.INIT();
-	}
-			
-	/**
-	 * Create the appropriate descriptor equality for this object.
-	 */
-	public static FeatureDescriptorEquality createEquality(FeatureDescriptor descr) {
-		try {
-			return (FeatureDescriptorEquality) ((Constructor) MAP_EQUALITY.get(descr.getClass())).newInstance(new Object[] {descr});
-		} catch (IllegalAccessException e) {
-		} catch (InstantiationException e) {
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-		
-	public FeatureDescriptorEquality() {
-	}
-	
-	/**
-	 * NOTE: Every subclass needs to implement an override for the methods:
-	 *       calculateHashCode
-	 *       equals
-	 *       clearFeature - if it has any cache values
-	 */
-					
-	public FeatureDescriptorEquality(FeatureDescriptor feature) {
-		setFeature(feature);
-	}
-	
-	public final void setFeature(FeatureDescriptor feature) {
-		clearFeature();
-		fFeature = feature;
-	}
-	
-	/**
-	 * A new feature is being set into this object,
-	 * clear any cache members so that they can be reconstructed.
-	 *
-	 * NOTE: Subclasses - remember to call super.clearFeature();
-	 */
-	protected void clearFeature() {
-		fValues = null;
-		fHashCode = 0;
-	}
-	
-	public final int hashCode() {
-		if (fHashCode == 0)
-			fHashCode = calculateHashCode();
-		return fHashCode;
-	}
-
-	protected final HashMap values() {
-		if (fValues == null) {
-			fValues = new HashMap(5);
-			
-			Enumeration keys = fFeature.attributeNames();
-			while (keys.hasMoreElements()) {
-				String key = (String) keys.nextElement();
-				fValues.put(key, fFeature.getValue(key));
-			}
-		}
-		return fValues;
-	}
-	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = 0;
-		if (fFeature.getName() != null)
-			hashcode += fFeature.getName().hashCode();
-			
-		if (fFeature.getDisplayName() != fFeature.getName())
-			hashcode += fFeature.getDisplayName().hashCode();
-		if (fFeature.getShortDescription() != fFeature.getDisplayName())
-			hashcode += fFeature.getShortDescription().hashCode();			
-			
-		hashcode += (fFeature.isExpert() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		hashcode += (fFeature.isHidden() ? Boolean.TRUE : Boolean.FALSE).hashCode();		
-		hashcode += (fFeature.isPreferred() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		
-		hashcode += values().hashCode();
-		return hashcode;
-	}
-	
-	/**
-	 * equals: See if this is equal semantically.
-	 *
-	 * NOTE: Every subclass needs to implement this and
-	 *       the first few lines should be:
-	 *         if (identityTest())
-	 *           return true;
-	 *         if (!super.equals(obj))
-	 *           return false;
-	 */
-	 
-	 public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-		if (!(obj instanceof FeatureDescriptorEquality))
-			return false;
-			
-		FeatureDescriptorEquality ofe = (FeatureDescriptorEquality) obj;	 		
-	 	FeatureDescriptor of = ofe.fFeature;
-	 		
-	 	if (fFeature.getClass() != of.getClass())
-	 		return false;
-	 		
-	 	if (!fFeature.getName().equals(of.getName()))
-	 		return false;
-	 	if (!fFeature.getDisplayName().equals(of.getDisplayName()))
-	 		return false;
-	 	if (!fFeature.getShortDescription().equals(of.getShortDescription()))
-	 		return false;	 
-	 	if (fFeature.isExpert() != of.isExpert() ||
-		 		fFeature.isHidden() != of.isHidden() ||
-		 		fFeature.isPreferred() != of.isPreferred())
-	 		return false;
-	 	
-		if (!values().equals(ofe.values()))
-			return false;
-		return true;
-	 }
-	 
-	 /*
-	  * Identity test: Tests for quick identity of
-	  * descriptors. If this returns true, then 
-	  * no other tests required.
-	  */
-	 protected boolean identityTest(Object obj) {
-	 	if (!(obj instanceof FeatureDescriptorEquality))
-	 		return false;
-	 	if (this == obj)
-	 		return true;
-
-	 	if (((FeatureDescriptorEquality) obj).fFeature == fFeature)
-	 		return true;
-	 		
-	 	return false;	 	
-	 }	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
deleted file mode 100644
index aa417b0..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IndexedPropertyDescriptorEquality.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-/**
- * IndexedPropertyDescriptor equality tester
- */
-public class IndexedPropertyDescriptorEquality extends PropertyDescriptorEquality {
-
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(IndexedPropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {IndexedPropertyDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}	
-	
-	public IndexedPropertyDescriptorEquality() {
-	}
-	
-	public IndexedPropertyDescriptorEquality(IndexedPropertyDescriptor descr) {
-		super(descr);
-	}	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		IndexedPropertyDescriptor pd = (IndexedPropertyDescriptor) fFeature;
-		
-		int hc = pd.getIndexedPropertyType().hashCode();
-
-		if (pd.getIndexedReadMethod() != null)
-			hc += pd.getIndexedReadMethod().hashCode();
-		if (pd.getIndexedWriteMethod() != null)
-			hc += pd.getIndexedWriteMethod().hashCode();		
-						
-		return hashcode*31 + hc;
-	}
-
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-		if (!super.equals(obj))
-			return false;
- 	
-		IndexedPropertyDescriptor op = (IndexedPropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-		IndexedPropertyDescriptor fp = (IndexedPropertyDescriptor) fFeature;
- 		
-		if (op.getIndexedPropertyType() != fp.getIndexedPropertyType())
-			return false;
-		if (op.getIndexedReadMethod() != fp.getIndexedReadMethod())
-			return false;
-		if (op.getIndexedWriteMethod() != fp.getIndexedWriteMethod())
-			return false;													
-			
-		return true;
-	}
-
-
-	
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
deleted file mode 100644
index 2ee59f5..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: MethodDescriptorEquality.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-import java.util.*;
-/**
- * Equality tester for MethodDescriptors
- */
-public class MethodDescriptorEquality extends FeatureDescriptorEquality {
-	
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(MethodDescriptor.class, (MethodDescriptorEquality.class).getConstructor(new Class[] {MethodDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}	
-	
-	private ArrayList fParameterDescriptors;	// Array of ParameterDescriptorEquality's.
-	
-	public MethodDescriptorEquality() {
-	}
-	
-	public MethodDescriptorEquality(MethodDescriptor descr) {
-		super(descr);
-	}
-	
-	/**
-	 * A new feature is being set into this object,
-	 * clear any cache members so that they can be reconstructed.
-	 *
-	 * NOTE: Subclasses - remember to call super.clearFeature();
-	 */
-	protected void clearFeature() {
-		super.clearFeature();
-		fParameterDescriptors = null;
-	}	
-	
-	protected ArrayList parameterDescriptors() {
-		if (fParameterDescriptors == null) {
-			ParameterDescriptor[] pds = ((MethodDescriptor) fFeature).getParameterDescriptors();
-			if (pds != null) {			
-				fParameterDescriptors = new ArrayList(pds.length);
-				for (int i=0; i<pds.length; i++)
-					fParameterDescriptors.add(new ParameterDescriptorEquality(pds[i]));
-			}
-		}
-		return fParameterDescriptors;
-	}
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		MethodDescriptor bd = (MethodDescriptor) fFeature;
-		int hc = bd.getMethod().hashCode();
-		if (parameterDescriptors() != null)
-			hc += parameterDescriptors().hashCode(); 
-
-		return hashcode*31 + hc;
-	}
-
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-			
-		if (!super.equals(obj))
-			return false;
-
-		MethodDescriptorEquality oem = (MethodDescriptorEquality) obj;
-		MethodDescriptor om = (MethodDescriptor) oem.fFeature;
-		MethodDescriptor fm = (MethodDescriptor) fFeature;
- 		
-		if (fm.getMethod() != om.getMethod())
-			return false;
-				
-		if (fParameterDescriptors != null || oem.fParameterDescriptors != null) {
-			// We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
-			if (parameterDescriptors() == null)
-				if (((MethodDescriptorEquality) obj).parameterDescriptors() != null)
-					return false;
-				else ;
-			else
-				if (!parameterDescriptors().equals(((MethodDescriptorEquality) obj).parameterDescriptors()))
-					return false;
-		} else {
-			// We are in the building the list phases, don't waste space building entire list.
-			ParameterDescriptor[] ours = fm.getParameterDescriptors();
-			ParameterDescriptor[] theirs = om.getParameterDescriptors();
-			if (ours == theirs)
-				return true;
-			else if (ours == null)
-				if (theirs != null)
-					return false;
-				else
-					;
-			else if (theirs == null)
-				return false;
-			else if (ours.length != theirs.length)
-				return false;
-			else if (ours.length > 0) {
-				ParameterDescriptorEquality workingOurs = new ParameterDescriptorEquality();
-				ParameterDescriptorEquality workingThiers = new ParameterDescriptorEquality();
-				for (int i = 0; i < ours.length; i++) {
-					workingOurs.setFeature(ours[i]);
-					workingThiers.setFeature(theirs[i]);
-					if (!workingOurs.equals(workingThiers))
-						return false;
-				}
-			}			
-		}
-				
- 			
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
deleted file mode 100644
index 55807ab..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
+++ /dev/null
@@ -1,856 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ModelingBeanInfo.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import org.eclipse.jem.beaninfo.vm.BaseBeanInfo;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.proxy.common.*;
-
-/**
- * This class is the beaninfo class that is created when beaninfo modeling introspects a bean. Its purpose is to gather together and analyze the
- * beaninfo. For example, it checks with the supertype beaninfo to see if all of the supertype's descriptors are included in this list. If they are,
- * then it knows that it does a straight inheritance of the supertype's descriptors, and those descriptors can be removed from the list. This makes it
- * easier on the model side so that there isn't a great proliferation of descriptors all describing the same properties. In that case they can be
- * merged from the supertype model. If some are not found, then that means this beaninfo is trying to hide some of them, and in that case this is the
- * definitive list and inheritance shouldn't be used on the model side. However, for those features which are essentially the inherited feature (i.e.
- * the BeanInfo simply filtered out some inherited but not all), they will be returnable (by name). The IDE side will take these that are "inherited"
- * and will return the actual structured feature from the inherited class.
- * 
- * The test for seeing if the super feature is included in the beaninfo is first to see if the the feature is in the beaninfo by name, if it is then
- * it is marked as included. Then a check is made on equality, if they are equal, then the feature is removed from the beaninfo list, but the merge
- * flag is still left on, and removed inherited feature is added to the list of inherited features. If all inherited features are found, this list is
- * cleared and flag is set which simply says merge all inherited. This allows merging to occur but it also allows overrides to occur.
- * 
- * Note: Test for identity is different between JDK 1.5 and above and below. 1.5 and above, we can use actual equals() because the same descriptor is
- * returned from inherited features. In 1.3, clones were always returned and equals() would answer false, so we need to create a special equality
- * descriptor which turns the equals() into one that can test clones for semantic equality. See Java Bug ID#4996673 The problem was supposed to be
- * fixed in 1.4 but it was not fixed. Originally a new clone was created each time a beaninfo was requested. That is no longer done in 1.4, but the
- * processing to create the original beaninfo does a clone accidently under the covers. Looking at 1.5 it looks this was fixed, but it hasn't been
- * tested here yet.
- */
-
-public abstract class ModelingBeanInfo implements ICallback {
-
-	private static boolean PRE15;
-	static {
-		String version = System.getProperty("java.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		PRE15 = version.startsWith("1."); //$NON-NLS-1$
-		if (PRE15) {
-			// Continue to check, get the revision.
-			int revision = 0;
-			if (version.length() > 2) {
-				int revEnd = version.indexOf('.', 2);
-				revision = version.length() > 2 ? Integer.parseInt(revEnd != -1 ? version.substring(2, revEnd) : version.substring(2)) : 0;
-				PRE15 = revision < 5;
-			}
-		}
-	}
-
-	static class FeatureEqualitySet extends HashSet {
-
-		private FeatureDescriptorEquality workingKey;
-
-		public FeatureEqualitySet(List features) {
-			super(features.size());
-			// Get first feature to fiqure out type of working key. This will not be reentrant.
-			workingKey = FeatureDescriptorEquality.createEquality((FeatureDescriptor) features.get(0));
-			this.addAll(features);
-		}
-
-		/**
-		 * @see java.util.Collection#add(Object)
-		 */
-		public boolean add(Object o) {
-			return super.add(FeatureDescriptorEquality.createEquality((FeatureDescriptor) o));
-		}
-
-		/**
-		 * @see java.util.Collection#contains(Object)
-		 */
-		public boolean contains(Object o) {
-			workingKey.setFeature((FeatureDescriptor) o);
-			return super.contains(workingKey);
-		}
-
-	}
-
-	// The following fields indicate if the super info should be merged
-	// in on the model side. no merge means there were no inherited methods at all. So the
-	// beaninfo presented is definitive. If merge, then get...Descriptors will return just
-	// the ones for this level, and getSuper...Descriptors will return the inherited ones.
-	// Though in this case, if the returned super list is null, then that means use ALL of
-	// the inherited ones.
-	// The super list returns simply the names, don't need to have the full descriptors in that case.
-	protected boolean fMergeInheritedEvents = false, fMergeInheritedMethods = false, fMergeInheritedProperties = false;
-
-	protected final BeanInfo fTargetBeanInfo; // The beaninfo being modeled.
-
-	// Local descriptors
-	protected EventSetDescriptor[] fEventSets;
-
-	protected MethodDescriptor[] fMethods;
-
-	protected PropertyDescriptor[] fProperties;
-
-	// Not inherited descriptor names, will be null if no merge or if merge all. This is list of names to NOT merge. It is usually shorter than the list to merge from super.
-
-	// Methods are special. You can have duplicates, so name is not sufficient.
-	// So for methods,
-	// will use an array of Strings where:
-	//   For each one the full signature
-	//   will be in the list, e.g. "name:methodName(argtype,..." where argtype is the fullyqualified
-	//   classname (using "." notation for inner classes), and using format "java.lang.String[]" for
-	//   arrays.
-	//
-	// This is because even if there are no duplicates, it will take less time/space to simply create the entries
-	// then it would to create a set to see if there are duplicates and then create the final array.
-	protected String[] fNotInheritedEventSets;
-
-	protected String[] fNotInheritedMethods;
-
-	protected String[] fNotInheritedProperties;
-	
-	protected int doFlags;
-
-	/**
-	 * Method used to do introspection and create the appropriate ModelingBeanInfo
-	 * 
-	 * This will always introspect.
-	 */
-	public static ModelingBeanInfo introspect(Class introspectClass, int doFlags) throws IntrospectionException {
-		return introspect(introspectClass, true, doFlags);
-	}
-
-	/**
-	 * Method used to do introspection and create the appropriate ModelingBeanInfo
-	 * 
-	 * introspectIfNoBeanInfo: If this is true, then if no explicit beaninfo was found for this class, then introspection will be done anyway. The
-	 * Introspector will use reflection for local methods/events/properties of this class and then add in the results of the superclass introspection.
-	 * If this parameter is false, then if the explicit beaninfo is not found, then no introspection will be done and null will be returned.
-	 */
-	public static ModelingBeanInfo introspect(Class introspectClass, boolean introspectIfNoBeanInfo, int doFlags) throws IntrospectionException {
-		if (!introspectIfNoBeanInfo) {
-			// Need to check if the beaninfo is explicitly supplied.
-			// If not, then we return null.
-			// The checks will be the same that Introspector will use.
-
-			boolean found = false;
-			// 1. Is there a BeanInfo class in the same package
-			if (!classExists(introspectClass.getName() + "BeanInfo", introspectClass)) { //$NON-NLS-1$
-				// 2. Is this class a BeanInfo class for itself.
-				if (!(BeanInfo.class).isAssignableFrom(introspectClass)) {
-					// 3. Can this class be found in the Beaninfo searchpath.
-					String[] searchPath = Introspector.getBeanInfoSearchPath();
-					int startClassname = introspectClass.getName().lastIndexOf(".") + 1; //$NON-NLS-1$
-					String biName = "." + introspectClass.getName().substring(startClassname) + "BeanInfo"; //$NON-NLS-1$ //$NON-NLS-2$
-					for (int i = 0; i < searchPath.length; i++) {
-						if (classExists(searchPath[i] + biName, introspectClass)) {
-							found = true;
-							break;
-						}
-					}
-				} else
-					found = true;
-			} else
-				found = true;
-
-			if (!found)
-				return null;
-		}
-
-		BeanInfo bInfo = Introspector.getBeanInfo(introspectClass);
-		Class superClass = introspectClass.getSuperclass();
-
-		if (superClass == null)
-			return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, doFlags) : new ModelingBeanInfo15(bInfo, doFlags);
-		else
-			return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, Introspector.getBeanInfo(superClass), doFlags) : new ModelingBeanInfo15(bInfo,
-					Introspector.getBeanInfo(superClass), doFlags);
-	}
-
-	/**
-	 * See if this class exists, first in the class loader of the sent class, then in the system loader, then the bootstrap loader, and finally the
-	 * current thread context class loader.
-	 */
-	protected static boolean classExists(String className, Class fromClass) {
-		if (fromClass.getClassLoader() != null)
-			try {
-				fromClass.getClassLoader().loadClass(className);
-				return true;
-			} catch (ClassNotFoundException e) {
-			}
-		if (ClassLoader.getSystemClassLoader() != null)
-			try {
-				ClassLoader.getSystemClassLoader().loadClass(className);
-				return true;
-			} catch (ClassNotFoundException e) {
-			}
-		try {
-			Class.forName(className);
-			return true;
-		} catch (ClassNotFoundException e) {
-		}
-
-		try {
-			// Use the classloader from the current Thread.
-			ClassLoader cl = Thread.currentThread().getContextClassLoader();
-			cl.loadClass(className);
-			return true;
-		} catch (ClassNotFoundException e) {
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Used only for Object since that is the only bean that doesn't have a superclass. Superclass beaninfo required for all other classes. If this is
-	 * constructed then this means no merge and the list is definitive.
-	 */
-	protected ModelingBeanInfo(BeanInfo beanInfo, int doFlags) {
-		fTargetBeanInfo = beanInfo;
-		this.doFlags = doFlags;
-	}
-
-	protected ModelingBeanInfo(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
-		this(beanInfo, doFlags);
-
-		// Now go through the beaninfo to determine the merge state.
-		// The default is no merge.
-
-		if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0) {
-			List full = addAll(beanInfo.getEventSetDescriptors());
-			List inherited = addAll(superBeanInfo.getEventSetDescriptors());
-
-			fMergeInheritedEvents = stripList(full, inherited);
-			if (fMergeInheritedEvents) {
-				if (!full.isEmpty())
-					fEventSets = (EventSetDescriptor[]) full.toArray(new EventSetDescriptor[full.size()]);
-				if (!inherited.isEmpty())
-					createEventArray(inherited); // This is actually a list of those NOT inherited.
-			}
-		}
-
-		if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0) {
-			List full = addAll(beanInfo.getMethodDescriptors());
-			List inherited = addAll(superBeanInfo.getMethodDescriptors());
-
-			fMergeInheritedMethods = stripList(full, inherited);
-			if (fMergeInheritedMethods) {
-				if (!full.isEmpty())
-					fMethods = (MethodDescriptor[]) full.toArray(new MethodDescriptor[full.size()]);
-				if (!inherited.isEmpty())
-					createMethodEntries(inherited); // This is actually a list of those NOT inherited.
-			}
-		}
-
-		if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0) {
-			List full = addAll(beanInfo.getPropertyDescriptors());
-			List inherited = addAll(superBeanInfo.getPropertyDescriptors());
-
-			fMergeInheritedProperties = stripList(full, inherited);
-			if (fMergeInheritedProperties) {
-				if (!full.isEmpty())
-					fProperties = (PropertyDescriptor[]) full.toArray(new PropertyDescriptor[full.size()]);
-				if (!inherited.isEmpty())
-					createPropertyArray(inherited); // This is actually a list of those NOT inherited.
-			}
-		}
-	}
-
-	protected void createEventArray(List features) {
-		fNotInheritedEventSets = createDescriptorNames(features);
-	}
-
-	protected void createMethodEntries(List features) {
-		int s = features.size();
-		fNotInheritedMethods = new String[s];
-		for (int i = 0; i < s; i++) {
-			fNotInheritedMethods[i] = longName((MethodDescriptor) features.get(i));
-		}
-	}
-
-	protected String longName(MethodDescriptor md) {
-		String n = md.getName();
-		StringBuffer sb = new StringBuffer(n.length() + 20);
-		sb.append(n);
-		sb.append(':');
-		Method m = md.getMethod();
-		sb.append(m.getName());
-		sb.append('(');
-		Class[] parms = m.getParameterTypes();
-		for (int j = 0; j < parms.length; j++) {
-			if (j > 0)
-				sb.append(',');
-			if (!parms[j].isArray())
-				sb.append(parms[j].getName().replace('$', '.'));
-			else {
-				Class finalType = parms[j].getComponentType();
-				int insrt = sb.length();
-				while (finalType.isArray()) {
-					sb.append("[]"); //$NON-NLS-1$
-					finalType = finalType.getComponentType();
-				}
-				sb.insert(insrt, finalType.getName().replace('$', '.'));
-			}
-		}
-		return sb.toString();
-	}
-
-	protected void createPropertyArray(List features) {
-		fNotInheritedProperties = createDescriptorNames(features);
-	}
-
-	protected String[] createDescriptorNames(List features) {
-		String[] result = new String[features.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = ((FeatureDescriptor) features.get(i)).getName();
-		}
-		return result;
-	}
-
-	protected List addAll(Object[] set) {
-		if (set != null) {
-			ArrayList l = new ArrayList(set.length);
-			for (int i = 0; i < set.length; i++) {
-				l.add(set[i]);
-			}
-			return l;
-		} else
-			return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * If this returns true, then all of the super class's events should be merged in. If it returns false, then the events returned are it, there are
-	 * no others.
-	 */
-	public boolean isMergeInheritedEvents() {
-		return fMergeInheritedEvents;
-	}
-
-	/**
-	 * If this returns true, then all of the super class's methods should be merged in. If it returns false, then the methods returned are it, there
-	 * are no others.
-	 */
-	public boolean isMergeInheritedMethods() {
-		return fMergeInheritedMethods;
-	}
-
-	/**
-	 * If this returns true, then all of the super class's properties should be merged in. If it returns false, then the properties returned are it,
-	 * there are no others.
-	 */
-	public boolean isMergeInheritedProperties() {
-		return fMergeInheritedProperties;
-	}
-
-	public BeanInfo[] getAdditionalBeanInfo() {
-		return fTargetBeanInfo.getAdditionalBeanInfo();
-	}
-
-	public BeanDescriptor getBeanDescriptor() {
-		return fTargetBeanInfo.getBeanDescriptor();
-	}
-
-	public EventSetDescriptor[] getEventSetDescriptors() {
-		return fMergeInheritedEvents ? fEventSets : fTargetBeanInfo.getEventSetDescriptors();
-	}
-
-	public java.awt.Image getIcon(int iconKind) {
-		return fTargetBeanInfo.getIcon(iconKind);
-	}
-
-	public MethodDescriptor[] getMethodDescriptors() {
-		return fMergeInheritedMethods ? fMethods : fTargetBeanInfo.getMethodDescriptors();
-	}
-
-	public PropertyDescriptor[] getPropertyDescriptors() {
-		return fMergeInheritedProperties ? fProperties : fTargetBeanInfo.getPropertyDescriptors();
-	}
-
-	public String[] getNotInheritedEventSetDescriptors() {
-		return fNotInheritedEventSets;
-	}
-
-	public String[] getNotInheritedMethodDescriptors() {
-		return fNotInheritedMethods;
-	}
-
-	public String[] getNotInheritedPropertyDescriptors() {
-		return fNotInheritedProperties;
-	}
-
-	protected String computeKey(FeatureDescriptor feature) {
-		return feature instanceof MethodDescriptor ? longName((MethodDescriptor) feature) : feature.getName();
-	}
-
-	/*
-	 * Strip the list down using the Equality objects.
-	 */
-	protected boolean stripList(List fullList, List inheritedList) {
-		// The process is to create a boolean list mirroring the inheritedList.
-		// This boolean list indicates if the corresponding (by index)
-		// entry from the inheritedList is to be retained in the final computed
-		// list.
-		//
-		// A Hashmap is created where the key is the computedKey from the inheritedList
-		// and the value is the index into the inheritedList. This is so that we can quickly determine if the
-		// entry is matching.
-		//
-		// Then the fullList will be stepped through and see if there is
-		// an entry in the Hashmap for it. If there is an entry, then
-		// the entry is checked to see if it is semantically equal.
-		// If it is, then the boolean list entry is marked so that
-		// the inheritedList entry will be retained, the fullList entry removed and the counter
-		// of the number of entries in the inheritedList copy is incremented.
-		// If they aren't semantically equal, then we know that this is
-		// an override. In that case, the fullList entry is kept, the inheritedList
-		// entry is not retained, but we don't prevent merge later.
-		//
-		// If the fullList entry is not found in the HashMap, then we know it is not
-		// from the inheritedList, so it will be retained in the fullList.
-		//
-		// If we get all of the way through, then we know that what is left
-		// in fullList is just this level.
-		//
-		// When we return we know that
-		//   a) fullList has only the features that are found at the local level
-		//   b) inheritedList if not empty contains the ones from super that SHOULD NOT be inherited.
-		//      If it is empty, then if this method returns true, then ALL should be inherited,
-		//      or if this method returns false, then it doesn't matter because we aren't merging any.
-		//
-		// All of this is based upon the assumption that the list can
-		// get quite large (which it does for javax.swing) and that
-		// a simple n-squared order search would be too slow.
-
-		if (fullList.isEmpty()) {
-			return false; // There are none in the full list, so there should be none, and don't merge.
-		} else if (inheritedList.isEmpty())
-			return false; // There are no inheritedList features, so treat as no merge.
-
-		// We have some features and some inheritedList features, so we need to go through the lists.
-
-		// Create a working copy of the FeatureDescriptorEquality for fullList and stripList and just reuse them
-		FeatureDescriptorEquality workingStrip = FeatureDescriptorEquality.createEquality((FeatureDescriptor) inheritedList.get(0));
-		FeatureDescriptorEquality workingFull = FeatureDescriptorEquality.createEquality((FeatureDescriptor) fullList.get(0));
-
-		int inheritedSize = inheritedList.size();
-		boolean[] copy = new boolean[inheritedSize];
-
-		HashMap inheritedMap = new HashMap(inheritedSize);
-		for (int i = 0; i < inheritedSize; i++) {
-			FeatureDescriptor f = (FeatureDescriptor) inheritedList.get(i);
-			String key = computeKey(f);
-			Object value = inheritedMap.get(key);
-			if (value == null)
-				inheritedMap.put(key, new Integer(i));
-			else {
-				// Shouldn't occur.
-			}
-
-		}
-
-		// When we are done with this processing, inheritedList will contain the super that should not be used, and full list will contain only the locals
-		// (those defined at this class level).;
-		int inheritedRetained = 0;
-		Iterator fullItr = fullList.iterator();
-		// Continue while we've retained less than the full super amount. If we've retained all of the inheritedList, there is no
-		// need to continue processing the fullList because there can't possibly be any inheritedList entries left to find.
-		while (inheritedRetained < inheritedSize && fullItr.hasNext()) {
-			FeatureDescriptor f = (FeatureDescriptor) fullItr.next();
-			boolean foundFull = false;
-			Object index = inheritedMap.get(computeKey(f));
-			if (index != null) {
-				workingFull.setFeature(f);
-				int ndx = ((Integer) index).intValue();
-				workingStrip.setFeature((FeatureDescriptor) inheritedList.get(ndx));
-				if (workingFull.equals(workingStrip)) {
-					// They are semantically identical, so retain in the inheritedList.
-					copy[ndx] = true;
-					foundFull = true;
-					inheritedRetained++;
-				}
-			}
-
-			if (foundFull) {
-				// We found the inheritedList entry semantically equal in the full list somewhere, so we need to remove the full entry.
-				fullItr.remove();
-			}
-		}
-
-		if (inheritedRetained == inheritedSize) {
-			inheritedList.clear(); // All were found in inheritedList, so just clear the inheritedList and return just what was left in the found.
-								   // Those in full found in super had been removed from full during the processing.
-			return true; // We merge with all inherited. 
-		} else	if (inheritedRetained != 0) {
-			// Some were retained, take out of the list those that were retained.
-			// When done the list will contain those that should be dropped from the inherited list.
-			// We start from end because the actual number of bytes moved overall will be less than if we started from the front.
-			for (ListIterator itr = inheritedList.listIterator(inheritedList.size()); itr.hasPrevious();) {
-				int i = itr.previousIndex();
-				itr.previous();	// To back up the itr so that remove can remove it. We actually don't care what the value is.
-				if (copy[i])
-					itr.remove();
-			}
-			return true;	// We merge, and the list is not empty but it did have some removed, so we leave the list alone. Those are not inherited.
-		} else
-			return false;	// All were removed (retained == 0). None were retained. So we just don't do a merge. The list will be ignored.
-	}
-
-	// The modeling beaninfo is also used to send itself back in serialized mode as a callback.
-
-	private IVMServer vmServer;
-
-	private int callbackID;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.ICallback#initializeCallback(org.eclipse.jem.internal.proxy.common.IVMServer, int)
-	 */
-	public void initializeCallback(IVMServer vmServer, int callbackID) {
-		this.vmServer = vmServer;
-		this.callbackID = callbackID;
-	}
-	
-	public void send() throws IOException, CommandException {
-		if (doFlags != 0) {
-			ObjectOutputStream stream = new ObjectOutputStream(vmServer.requestStream(callbackID, 0));
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_BEAN_DECOR) != 0)
-				sendBeanDecorator(stream);
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0)
-				sendPropertyDecorators(stream);
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0)
-				sendMethodDecorators(stream);
-			if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0)
-				sendEventDecorators(stream);
-			stream.writeInt(IBeanInfoIntrospectionConstants.DONE);
-			stream.close();
-		}
-	}
-
-	/**
-	 * Called by IDE to send the bean decorator information back through the callback.
-	 * @throws CommandException
-	 * @throws IOException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void sendBeanDecorator(ObjectOutputStream stream) throws IOException, CommandException {
-		BeanRecord br = new BeanRecord();
-		BeanDescriptor bd = getBeanDescriptor();
-
-		if (bd != null) {
-			br.customizerClassName = getClassName(bd.getCustomizerClass());
-			br.mergeInheritedProperties = isMergeInheritedProperties();
-			br.mergeInheritedOperations = isMergeInheritedMethods();
-			br.mergeInheritedEvents = isMergeInheritedEvents();
-			br.notInheritedPropertyNames = getNotInheritedPropertyDescriptors();
-			br.notInheritedOperationNames = getNotInheritedMethodDescriptors();
-			br.notInheritedEventNames = getNotInheritedEventSetDescriptors();
-			fill(bd, br, BEAN_RECORD_TYPE);
-		}
-		stream.writeInt(IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT);
-		stream.writeObject(br);
-	}
-
-	/**
-	 * Called by IDE to send the property decorators information back through the callback.
-	 * 
-	 * @throws CommandException
-	 * @throws IOException
-	 * @since 1.1.0
-	 */
-	public void sendPropertyDecorators(ObjectOutputStream stream) throws IOException, CommandException {
-		PropertyDescriptor[] properties = getPropertyDescriptors();
-		if (properties != null && properties.length > 0) {
-			// Now start writing the records.
-			stream.writeInt(IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT);
-			stream.writeInt(properties.length);
-			for (int i = 0; i < properties.length; i++) {
-				PropertyDescriptor pd = properties[i];
-				// Much of the two types are common, so if indexed, fill in the index part and then pass on to property part.
-				PropertyRecord usepr = null;
-				int useType = 0;
-				if (pd.getClass() == IndexedPropertyDescriptor.class) {
-					IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
-					IndexedPropertyRecord ipr = new IndexedPropertyRecord();
-					usepr = ipr;
-					useType = INDEXEDPROPERTY_RECORD_TYPE;
-					ipr.indexedReadMethod = getReflectedMethodRecord(ipd.getIndexedReadMethod());
-					ipr.indexedWriteMethod = getReflectedMethodRecord(ipd.getIndexedWriteMethod());
-					ipr.indexedPropertyTypeName = getClassName(ipd.getIndexedPropertyType());
-				} else {
-					usepr = new PropertyRecord();
-					useType = PROPERTY_RECORD_TYPE;
-				}
-				usepr.propertyEditorClassName = getClassName(pd.getPropertyEditorClass());
-				usepr.propertyTypeName = getClassName(pd.getPropertyType());
-				usepr.readMethod = getReflectedMethodRecord(pd.getReadMethod());
-				usepr.writeMethod = getReflectedMethodRecord((pd.getWriteMethod()));
-				usepr.bound = pd.isBound();
-				usepr.constrained = pd.isConstrained();
-				usepr.designTime = null;
-				usepr.field = null;
-				fill(pd, usepr, useType);
-				stream.writeObject(usepr);
-			}
-		}
-	}
-
-	/**
-	 * Called by IDE to send the method decorators information back through the callback.
-	 * 
-	 * @throws CommandException
-	 * @throws IOException
-	 * @since 1.1.0
-	 */
-	public void sendMethodDecorators(ObjectOutputStream stream) throws IOException, CommandException {
-		MethodDescriptor[] methods = getMethodDescriptors();
-		if (methods != null && methods.length > 0) {
-			// Now start writing the records.
-			stream.writeInt(IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT);
-			stream.writeInt(methods.length);
-			for (int i = 0; i < methods.length; i++) {
-				MethodRecord mr = new MethodRecord();
-				fill(mr, methods[i]);
-				stream.writeObject(mr);
-			}
-		}
-	}
-
-	/**
-	 * Fill in a MethodRecord from the MethodDescriptor.
-	 * @param mr
-	 * @param md
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fill(MethodRecord mr, MethodDescriptor md) {
-		mr.methodForDescriptor = getReflectedMethodRecord(md.getMethod());
-		ParameterDescriptor[] parms = md.getParameterDescriptors();
-		if (parms == null)
-			mr.parameters = null;
-		else {
-			mr.parameters = new ParameterRecord[parms.length];
-			for (int j = 0; j < parms.length; j++) {
-				ParameterRecord pr = new ParameterRecord();
-				fill(parms[j], pr, PARAMETER_RECORD_TYPE);
-				mr.parameters[j] = pr;
-			}
-		}
-		fill(md, mr, METHOD_RECORD_TYPE);
-	}
-
-	/**
-	 * Called by IDE to send the event set decorators information back through the callback.
-	 * 
-	 * @throws CommandException
-	 * @throws IOException
-	 * @since 1.1.0
-	 */
-	public void sendEventDecorators(ObjectOutputStream stream ) throws IOException, CommandException {
-		EventSetDescriptor[] events = getEventSetDescriptors();
-		if (events != null && events.length > 0) {
-			// Now start writing the records.
-			stream.writeInt(IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT);
-			stream.writeInt(events.length);
-			for (int i = 0; i < events.length; i++) {
-				EventSetDescriptor ed = events[i];
-				EventSetRecord er = new EventSetRecord();
-				er.addListenerMethod = getReflectedMethodRecord(ed.getAddListenerMethod());
-				MethodDescriptor[] mds = ed.getListenerMethodDescriptors();
-				if (mds == null)
-					er.listenerMethodDescriptors = null;
-				else {
-					er.listenerMethodDescriptors = new MethodRecord[mds.length];
-					for (int j = 0; j < mds.length; j++) {
-						fill(er.listenerMethodDescriptors[j] = new MethodRecord(), mds[j]);
-					}
-				}
-				er.listenerTypeName = getClassName(ed.getListenerType());
-				er.removeListenerMethod = getReflectedMethodRecord(ed.getRemoveListenerMethod());
-				er.inDefaultEventSet = ed.isInDefaultEventSet();
-				er.unicast = ed.isUnicast();
-				er.eventAdapterClassName = null;
-				fill(ed, er, EVENTSET_RECORD_TYPE);
-				stream.writeObject(er);
-			}
-		}
-	}
-
-	protected static final int BEAN_RECORD_TYPE = 0;
-
-	protected static final int PROPERTY_RECORD_TYPE = 1;
-
-	protected static final int INDEXEDPROPERTY_RECORD_TYPE = 2;
-	
-	protected static final int METHOD_RECORD_TYPE = 3;
-	
-	protected static final int PARAMETER_RECORD_TYPE = 4;
-	
-	protected static final int EVENTSET_RECORD_TYPE = 5;
-
-	/**
-	 * Fill in the special attr/values for the given record type. The default handles the standard ones.
-	 * 
-	 * @param record
-	 * @param descr
-	 * @param attributeName
-	 * @param recordType
-	 *            type of record ultimately being processed.
-	 * @return <code>true</code> if this attribute is a special one and processed, <code>false</code> if not special and should be added to
-	 *         attributes list transferred to IDE.
-	 * 
-	 * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
-	 * @since 1.1.0
-	 */
-	protected boolean fillFromAttributes(FeatureRecord record, FeatureDescriptor descr, String attributeName, int recordType) {
-		switch (recordType) {
-			case INDEXEDPROPERTY_RECORD_TYPE:
-			case PROPERTY_RECORD_TYPE:
-				if (BaseBeanInfo.DESIGNTIMEPROPERTY.equals(attributeName)) {
-					((PropertyRecord) record).designTime = (Boolean) descr.getValue(attributeName);
-					return true;
-				} else if (BaseBeanInfo.FIELDPROPERTY.equals(attributeName)) {
-					Field f = (Field) descr.getValue(attributeName);
-					// We have a field, set the property type to this since we couldn't correctly create this otherwise.
-					PropertyRecord pr = (PropertyRecord) record;
-					pr.propertyTypeName = getClassName(f.getType());
-					pr.field = getReflectedFieldRecord(f);
-					pr.readMethod = null;	// Need to wipe out our dummy.
-					pr.writeMethod = null;	// Or if it set, not valid for a field.
-					return true;
-				}
-				break;
-			case EVENTSET_RECORD_TYPE:
-				if (BaseBeanInfo.EVENTADAPTERCLASS.equals(attributeName)) {
-					((EventSetRecord) record).eventAdapterClassName = (String) descr.getValue(attributeName);
-					return true;
-				}
-				break;
-			default:
-				break; // Didn't handle it.
-		}
-		return false;
-	}
-
-	/**
-	 * Fill in the feature portion of the Descriptor into the record. We can be reusing some records (so we don't keep allocating when not needed), so
-	 * we will null out unset fields.
-	 * 
-	 * @param descr
-	 * @param record
-	 * @param recordType
-	 *            type of record ultimately being processed. Used for fillFromAttributes.
-	 * 
-	 * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
-	 * @since 1.1.0
-	 */
-	protected void fill(FeatureDescriptor descr, FeatureRecord record, int recordType) {
-		record.name = descr.getName();
-		String dn = descr.getDisplayName();
-		if (!record.name.equals(dn))
-			record.displayName = dn; // display name returns name if display name not set. We don't want to send it if identical. (Note some Beaninfos are setting displayname the same text but not same string).
-		else
-			record.displayName = null;
-		String shd = descr.getShortDescription();
-		if (!dn.equals(shd))
-			record.shortDescription = shd; // short description returns displayname if short description not set. We don't want to send it if
-										   // identical.
-		else
-			record.shortDescription = null;
-		record.expert = descr.isExpert();
-		record.hidden = descr.isHidden();
-		record.preferred = descr.isPreferred();
-		record.category = null; // Clear out in case not set.
-		Enumeration attrs = descr.attributeNames();
-		if (attrs.hasMoreElements()) {
-			// We don't have a way of knowing how many there are ahead of time, so we will build into lists and then turn into arrays at the end.
-			List names = new ArrayList();
-			List values = new ArrayList();
-			while (attrs.hasMoreElements()) {
-				String attrName = (String) attrs.nextElement();
-				if (attrName.equals(BaseBeanInfo.CATEGORY))
-					record.category = (String) descr.getValue(BaseBeanInfo.CATEGORY);
-				else if (attrName.equals(BaseBeanInfo.PREFERRED)) {
-					// A bug in Java 1.3, doing setPreferred was lost. So for those also stored it in attributes. So if set here, then use it.
-					record.preferred = ((Boolean) descr.getValue(BaseBeanInfo.PREFERRED)).booleanValue();
-				} else if (!fillFromAttributes(record, descr, attrName, recordType)) {
-					// Just copy accross. FillfromAttributes didn't handle it.
-					FeatureAttributeValue fv = new FeatureAttributeValue();
-					fv.setValue(descr.getValue(attrName));
-					names.add(attrName);
-					values.add(fv);
-				}
-			}
-			if (!names.isEmpty()) {
-				record.attributeNames = (String[]) names.toArray(new String[names.size()]);
-				record.attributeValues = (FeatureAttributeValue[]) values.toArray(new FeatureAttributeValue[values.size()]);
-			} else {
-				record.attributeNames = null;
-				record.attributeValues = null;
-			}
-		} else {
-			record.attributeNames = null;
-			record.attributeValues = null;
-		}
-
-	}
-
-	/*
-	 * Get the classname from the class. If classs is null, then this return null.
-	 */
-	private String getClassName(Class classs) {
-		return classs != null ? classs.getName() : null;
-	}
-
-	private ReflectMethodRecord getReflectedMethodRecord(Method method) {
-		if (method != null) {
-			ReflectMethodRecord rmr = new ReflectMethodRecord();
-			rmr.className = getClassName(method.getDeclaringClass());
-			rmr.methodName = method.getName();
-			Class[] parmTypes = method.getParameterTypes();
-			if (parmTypes.length > 0) {
-				rmr.parameterTypeNames = new String[parmTypes.length];
-				for (int i = 0; i < parmTypes.length; i++) {
-					rmr.parameterTypeNames[i] = getClassName(parmTypes[i]);
-				}
-			}
-			return rmr;
-		} else
-			return null;
-	}
-	
-	private ReflectFieldRecord getReflectedFieldRecord(Field field) {
-		if (field != null) {
-			ReflectFieldRecord rf = new ReflectFieldRecord();
-			rf.className = getClassName(field.getDeclaringClass());
-			rf.fieldName = field.getName();
-			rf.readOnly = Modifier.isFinal(field.getModifiers());
-			return rf;
-		} else
-			return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
deleted file mode 100644
index 9c954d1..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ModelingBeanInfo15.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.BeanInfo;
-
-/**
- * This was supposed to for 1.4 or above where it can use identity
- * to test for inherited features, but it still is not correct
- * in 1.4. See the header comments in ModelingBeanInfo.
- * @see org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo
- */
-public class ModelingBeanInfo15 extends ModelingBeanInfo {
-
-	/**
-	 * Constructor for ModelingBeanInfo15.
-	 * @param beanInfo
-	 */
-	public ModelingBeanInfo15(BeanInfo beanInfo, int doFlags) {
-		super(beanInfo, doFlags);
-	}
-
-	/**
-	 * Constructor for ModelingBeanInfo15.
-	 * @param beanInfo
-	 * @param superBeanInfo
-	 */
-	public ModelingBeanInfo15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
-		super(beanInfo, superBeanInfo, doFlags);
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
deleted file mode 100644
index 79f2acd..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ModelingBeanInfoPre15.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.BeanInfo;
-
-/**
- * This is the modeling BeanInfo for Pre-JDK 1.4.
- */
-public class ModelingBeanInfoPre15 extends ModelingBeanInfo {
-
-	public ModelingBeanInfoPre15(BeanInfo beanInfo, int doFlags) {
-		super(beanInfo, doFlags);
-	}
-
-	public ModelingBeanInfoPre15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
-		super(beanInfo, superBeanInfo, doFlags);
-	}
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
deleted file mode 100644
index f4d2fca..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ParameterDescriptorEquality.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-/**
- * ParameterDescriptor equality tester
- */
-public class ParameterDescriptorEquality extends FeatureDescriptorEquality {
-	
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(ParameterDescriptor.class, (ParameterDescriptorEquality.class).getConstructor(new Class[] {ParameterDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}	
-	
-	public ParameterDescriptorEquality() {
-	}
-	
-	public ParameterDescriptorEquality(ParameterDescriptor descr) {
-		super(descr);
-	}	
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
deleted file mode 100644
index bbbbc4a..0000000
--- a/plugins/org.eclipse.jem.beaninfo/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.jem.internal.beaninfo.vm;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: PropertyDescriptorEquality.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:45:49 $ 
- */
-
-import java.beans.*;
-/**
- * PropertyDescriptor equality tester
- */
-public class PropertyDescriptorEquality extends FeatureDescriptorEquality {
-	
-	static void INIT() {
-		try {
-			MAP_EQUALITY.put(PropertyDescriptor.class, (PropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
-		} catch (NoSuchMethodException e) {
-		}
-	}	
-	
-	public PropertyDescriptorEquality() {
-	}
-	
-	public PropertyDescriptorEquality(PropertyDescriptor descr) {
-		super(descr);
-	}	
-	/**
-	 * Calculate the hashcode for the current feature, add this
-	 * to the hashcode received from super.calculateHashCode
-	 * and return the new value.
-	 *
-	 * NOTE: for subclasses, it is MANDITORY that the first line be:
-	 *         int hashcode = super.calculateHashCode();
-	 *       and the last line be:
-	 *         return hashcode*31 + (your calculated hashcode for just this subclass);
-	 */
-	protected int calculateHashCode() {
-		int hashcode = super.calculateHashCode();
-		PropertyDescriptor pd = (PropertyDescriptor) fFeature;
-		int hc = 0;
-		if (pd.getPropertyEditorClass() != null)
-			hc += pd.getPropertyEditorClass().hashCode();
-		if (pd.getPropertyType() != null)
-			hc += pd.getPropertyType().hashCode();
-		if (pd.getReadMethod() != null)
-			hc += pd.getReadMethod().hashCode();
-		if (pd.getWriteMethod() != null)
-			hc += pd.getWriteMethod().hashCode();
-			
-		hc += (pd.isBound() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-		hc += (pd.isConstrained() ? Boolean.TRUE : Boolean.FALSE).hashCode();		
-						
-		return hashcode*31 + hc;
-	}
-
-	public boolean equals(Object obj) {
-		if (identityTest(obj))
-			return true;
-			
-		if (!super.equals(obj))
-			return false;
- 	
-		PropertyDescriptor op = (PropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
-		PropertyDescriptor fp = (PropertyDescriptor) fFeature;
- 		
-		if (op.getPropertyEditorClass() != fp.getPropertyEditorClass())
-			return false;
-		if (op.getReadMethod() != fp.getReadMethod())
-			return false;
-		if (op.getWriteMethod() != fp.getWriteMethod())
-			return false;
-		if (op.isBound() != fp.isBound())
-			return false;				
-		if (op.isConstrained() != fp.isConstrained())
-			return false;														
-			
-		return true;
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/.classpath b/plugins/org.eclipse.jem.proxy/.classpath
deleted file mode 100644
index 17c24e4..0000000
--- a/plugins/org.eclipse.jem.proxy/.classpath
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry output="common_bin" kind="src" path="proxyCommon">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry output="common_bin" kind="src" path="initParser">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry output="common_bin" kind="src" path="remoteCommon">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry output="vm_bin" kind="src" path="vm_remotevm">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="proxy">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="proxyRemote">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="proxyide">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.proxy/.cvsignore b/plugins/org.eclipse.jem.proxy/.cvsignore
deleted file mode 100644
index 44fb1cf..0000000
--- a/plugins/org.eclipse.jem.proxy/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-common_bin
-vm_bin
diff --git a/plugins/org.eclipse.jem.proxy/.options b/plugins/org.eclipse.jem.proxy/.options
deleted file mode 100644
index 95c080f..0000000
--- a/plugins/org.eclipse.jem.proxy/.options
+++ /dev/null
@@ -1,9 +0,0 @@
-org.eclipse.jem.proxy/remote/debug/debugvm=false
-org.eclipse.jem.proxy/remote/debug/ioconsole=false
-org.eclipse.jem.proxy/remote/debug/vmtraceout=false
-org.eclipse.jem.proxy/remote/debug/notimeouts=false
-org.eclipse.jem.proxy/debug/traceexpressions=false
-org.eclipse.jem.proxy/debug/traceexpressionstimethreshold=100
-org.eclipse.jem.proxy/debug/logtrace=default
-org.eclipse.jem.proxy/debug/logtracefile=default
-org.eclipse.jem.proxy/debug/loglevel=default
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/.project b/plugins/org.eclipse.jem.proxy/.project
deleted file mode 100644
index b820075..0000000
--- a/plugins/org.eclipse.jem.proxy/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.proxy</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.pde.core</project>
-	</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.proxy/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9080e5..0000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,282 +0,0 @@
-#Wed May 11 18:32:12 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.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=ignore
-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.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_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_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_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_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_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_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
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4cff627..0000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed May 11 16:20:15 EDT 2005
-eclipse.preferences.version=1
-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.proxy/about.html b/plugins/org.eclipse.jem.proxy/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jem.proxy/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/build.properties b/plugins/org.eclipse.jem.proxy/build.properties
deleted file mode 100644
index 3a6d52a..0000000
--- a/plugins/org.eclipse.jem.proxy/build.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.proxyide.jar = proxyide/
-source.proxycommon.jar = proxyCommon/
-output.proxycommon.jar = common_bin/
-source.proxy.jar = proxy/
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               proxycommon.jar,\
-               proxy.jar,\
-               remotecommon.jar,\
-               proxyremote.jar,\
-               initparser.jar,\
-               vm/remotevm.jar,\
-               .options,\
-               about.html,\
-               proxyide.jar
-src.includes = about.html,\
-               schema/,\
-               proxy.jars
-source.proxyremote.jar = proxyRemote/
-source.initparser.jar = initParser/
-output.initparser.jar = common_bin/
-source.remotecommon.jar = remoteCommon/
-output.remotecommon.jar = common_bin/
-jars.compile.order = proxycommon.jar,\
-                     initparser.jar,\
-                     remotecommon.jar,\
-                     vm/remotevm.jar,\
-                     proxy.jar,\
-                     proxyremote.jar,\
-                     proxyide.jar
-source.vm/remotevm.jar = vm_remotevm/
-output.vm/remotevm.jar = vm_bin/
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java
deleted file mode 100644
index 2fd52de..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ArrayArguments.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-import java.io.StringWriter;
-import java.lang.reflect.Array;
-import java.util.*;
-/**
- * This represents the arguments in a multi dimensional array with construction parameters, e.g.
- * new int[][] { { 2 ,3 } , { 4 ,5 }}
- * the arguments of the constructor will be instance of ArrayArguments 
- */
-public class ArrayArguments extends Expression {
-	
-	Static fType;
-	List arguments = new ArrayList(2);
-	boolean argsClosed;
-	boolean insideArgsOpenedParen;
-	boolean insideArgsClosedParen;
-	
-public Expression push(char[] token, char tokenDelimiter) {
-	
-	// If the args are opened and a token was supplied then it must be an argument
-	//if ( argsOpened && ( tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma || 
-	//tokenDelimiter == DelimiterSpace || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterPeriod)) {
-	if (!argsClosed){	
-		if ( arguments.size() > 0 ){
-			Expression openArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( !openArgument.isComplete() ) {
-				openArgument.push(token,tokenDelimiter);
-				// If the argument is complete and we received a ) then the message is complete
-				if ( openArgument.isComplete() && tokenDelimiter == DelimiterCloseElipse){
-					argsClosed = true;
-				}
-				return this;
-			}
-		}	
-		
-		// We must have a new argument - process accordingly	
-		Expression newArgument = null;
-		if (!insideArgsOpenedParen && tokenDelimiter == DelimiterOpenParen){
-			insideArgsOpenedParen = true;
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-
-		}
-		if ( token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote || tokenDelimiter == OperMinus ) {
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-		}
-		// If the token after the argument is a ) then the message is being closed
-		if ( !insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseElipse ) {
-			argsClosed = true;
-			return this;
-		}
-		if ( insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseElipse ) {
-			insideArgsClosedParen  = true;
-			argsClosed = true;
-			return this;
-		}
-	}
-	return this;
-}
-/**
- * In the case of the expression new int[][] { {2,3} , {4,5} } then we are the 2,3 or the 4,5
- * to evaluate we must return an array of ints based on our size.  The type we return is determined by the initial 
- * constructor who will have given this to us as our fType
- */	
-public Object evaluate() throws Exception {
-
-	Object result = Array.newInstance(fType.getPrimitiveTypeClass(),arguments.size());
-	for (int i = 0; i < arguments.size(); i++) {
-		Object argumentValue = ((Expression)arguments.get(i)).evaluate();
-		Array.set(result,i,argumentValue);
-	}
-	return result;
-}
-
-public Class getTypeClass() throws Exception {
-	return null;
-}
-
-public boolean isComplete() {
-	return argsClosed;
-}
-
-public boolean isPrimitive() throws Exception {
-	return false;
-}
-public void setType(Static type) {
-	fType = type;
-}
-public void contributeArgumentNumber(List argumentNumberList){
-	
-	// Add the number of arguments we have to the list
-	argumentNumberList.add(new Integer(arguments.size()));
-	// If our arguments are themselves array arguments ( which will occur in an array of 3 or more dimensions )
-	// then we should cascade this message to our argument so that the total array depth is known
-	if ( arguments.size() > 0 ) {
-		Object firstArgument = arguments.get(0);
-		if ( firstArgument instanceof ArrayArguments ) {
-//			((ArrayArguments)firstArgument)contributeArgumentNumber(argumentNumberList);
-		}
-	}
-	
-}
-public String toString(){
-	StringWriter writer = new StringWriter();
-	writer.write("Args("); //$NON-NLS-1$
-	writer.write(new Integer(arguments.size()).toString());
-	writer.write(")-"); //$NON-NLS-1$
-	writer.write(arguments.toString());
-	return writer.toString();
-}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return "";	// Not applicable //$NON-NLS-1$
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java
deleted file mode 100644
index 49180d6..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: Block.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-/**
- */
-public class Block extends Expression {
-	
-	protected boolean fIsClosed = false;
-	protected boolean fIsComplete = false;
-	protected boolean fMessageOrField = false;
-	
-	public Block(Expression anExpression){
-		currentExpression = anExpression;
-	}
-
-	public Block(ClassLoader fClassLoader){
-		currentExpression = new Statement(fClassLoader);
-	}
-
-	public Object evaluate() throws Exception {
-		return currentExpression.evaluate();
-	}
-
-	public boolean isComplete() {
-		return fIsComplete;
-	}
-
-	public Class getTypeClass() throws Exception {
-		return currentExpression.getTypeClass();
-	}
-
-
-	public Expression push(char[] token, char tokenDelimiter) {
-			
-		// If we are closed (i.e. completed with a )) and we get a ) or , then we are all finished up
-		// We should not forward this token to the expression, as it isComplete
-		if ((fIsClosed || currentExpression.isComplete()) && (tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma)){
-			fIsComplete = true;
-			return this;
-		}
-		
-		// If we are a message of field and we get a ( we are message or a field otherwise
-		if (fMessageOrField){
-			fMessageOrField = false;
-			// The problem now is that we are a block of an expression and we need to create a message
-			// where we are the receiver.  However we are on the stack and going to be popped when the message finishes
-			// so we must alter ourself to be a block whose current expression is message whose argument
-			// is a copy of us
-			if ( tokenDelimiter == DelimiterOpenParen){
-				Message message = new Message(currentExpression,token,fClassLoader);
-				currentExpression = message;
-				return message;
-			} else {
-				Field field = new Field(currentExpression,token,fClassLoader);
-				currentExpression = field;
-				return field;
-			}
-		}
-		
-		// If we are closed and we get a . then we must begin a message or field expression
-		if (currentExpression.isComplete() && tokenDelimiter == DelimiterPeriod ){
-			fMessageOrField = true;
-			return this;
-		}
-		
-		Expression result = currentExpression.push(token,tokenDelimiter);
-		// If the result if a push then push the stack
-		if ( result != currentExpression ) {
-			pushExpressionStack(result);	
-		}
-		// If our current expression is complete and we are receiving a close parent then we are closed
-		if (currentExpression.isComplete() && tokenDelimiter == DelimiterCloseParen){
-			fIsClosed = true;
-
-		}
-		// If we are here the current expression is still processing tokens so we should return it
-		return currentExpression;
-	}
-
-	public boolean isPrimitive() throws Exception {
-		return false;
-	}
-	public String toString(){
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("Block("); //$NON-NLS-1$
-		if ( currentExpression != null ) {
-			buffer.append(currentExpression.toString());
-		}
-		buffer.append(')');
-		return buffer.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return currentExpression.getTypeClassName();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java
deleted file mode 100644
index 784ae1d..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: BooleanLiteral.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-public class BooleanLiteral extends Expression {
-	public boolean value;
-public BooleanLiteral(boolean aValue){
-
-	value = aValue;
-
-}
-
-public boolean isComplete(){
-	return true;
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
-	return new Boolean(value);
-}
-/**
- * evaluate method comment.
- */
-public Class getTypeClass(){
-	return Boolean.TYPE;
-}
-/**
- * true or false cannot consume any kind of expression so we must return null
- */
-public Expression push(char[] token , char delimiter){
-
-	return null;	
-
-}
-
-/**
- * This is primitive
- */
-public boolean isPrimitive() {
-	return true;
-}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return Boolean.TYPE.getName();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java
deleted file mode 100644
index 744a8a2..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: CannotProcessArrayTypesException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-/**
- * Exception to indicate that the initStringParser can't deal with arrays right now
- */
-public class CannotProcessArrayTypesException extends RuntimeException {
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java
deleted file mode 100644
index 1b78ab1..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: CannotProcessInnerClassesException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-/**
- * This exception is thrown to indicate that inner classes cannot be processed
- */
-public class CannotProcessInnerClassesException extends RuntimeException {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java
deleted file mode 100644
index 9aae83f..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: Cast.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.util.HashMap;
-
-public class Cast extends Expression {
-	protected static final int BYTE_TYPE = 0;
-	protected static final int SHORT_TYPE = 1;
-	protected static final int INT_TYPE = 2;
-	protected static final int LONG_TYPE = 3;
-	protected static final int FLOAT_TYPE = 4;
-	protected static final int DOUBLE_TYPE = 5;
-	
-	protected static final HashMap sTypeLookup;
-	static {
-		sTypeLookup = new HashMap(6);
-		sTypeLookup.put(Byte.TYPE, new Integer(BYTE_TYPE));
-		sTypeLookup.put(Short.TYPE, new Integer(SHORT_TYPE));
-		sTypeLookup.put(Integer.TYPE, new Integer(INT_TYPE));
-		sTypeLookup.put(Long.TYPE, new Integer(LONG_TYPE));
-		sTypeLookup.put(Float.TYPE, new Integer(FLOAT_TYPE));
-		sTypeLookup.put(Double.TYPE, new Integer(DOUBLE_TYPE));
-	}
-		
-	protected Static fCastType;
-	protected boolean fIsClosed = false;
-	
-	public Cast(Static castType, ClassLoader aClassLoader) {
-		fCastType = castType;
-		fClassLoader = aClassLoader;
-	}
-	
-	public boolean isPrimitive() throws Exception {
-		return getTypeClass().isPrimitive();
-	}
-	
-	/**
-	 * The type of a Cast expression is the type of the cast type.
-	 */
-	public Class getTypeClass() throws Exception {
-		return fCastType.getTypeClass();
-	}
-	
-	
-	public boolean isComplete() {
-		return currentExpression != null && currentExpression.isComplete();
-	}
-	
-	/**
-	 * If the type is primitive, then we need to
-	 * convert the value, otherwise just pass
-	 * the value on.
-	 *
-	 * This is important for primitives because if your
-	 * entire initialization string was simply "(short) 3"
-	 * then a Short value must be returned so that the
-	 * correct kind of primitive proxy is created.
-	 */
-	public Object evaluate() throws Exception {
-		if (getTypeClass() == currentExpression.getTypeClass())
-			return currentExpression.evaluate();	// They're the same, so just return it.
-		if (getTypeClass().isPrimitive()) {
-			// Can only cast a primitive to a primitive, except null can't be cast to a primitive.
-			if (!currentExpression.getTypeClass().isPrimitive() || currentExpression.getTypeClass() == Void.TYPE)
-				throw new EvaluationException(new ClassCastException(currentExpression.getTypeClass().getName()));			
-			// boolean only allows boolean cast.
-			if (fCastType.getTypeClass() == Boolean.TYPE || currentExpression.getTypeClass() == Boolean.TYPE)
-				throw new EvaluationException(new ClassCastException(currentExpression.getTypeClass().getName()));
-			if (fCastType.getTypeClass() == Character.TYPE) {
-				// So we have either a Character or a number as the value. Cast that.				
-				return new Character((char) ((Number) currentExpression.evaluate()).intValue());
-			} else {
-				Number value = null;
-				// See if the value is character or a number.
-				if (currentExpression.getTypeClass() == Character.TYPE)
-					value = new Integer(((Character) currentExpression.evaluate()).charValue());
-				else
-					value = (Number) currentExpression.evaluate();
-				switch (((Integer) sTypeLookup.get(fCastType.getTypeClass())).intValue()) {
-					case BYTE_TYPE:
-						return new Byte(value.byteValue());
-					case SHORT_TYPE:
-						return new Short(value.shortValue());
-					case INT_TYPE:
-						return new Integer(value.intValue());
-					case LONG_TYPE:
-						return new Long(value.longValue());
-					case FLOAT_TYPE:
-						return new Float(value.floatValue());
-					case DOUBLE_TYPE:
-						return new Double(value.doubleValue());
-					default:
-						return null;	// Shouldn't occur. Just satisifies compiler.
-				}
-			}
-			
-		} else
-			return currentExpression.evaluate();
-	}
-	/**
-	 * A cast expression always pushes onto the cast value
-	 */
-	public Expression push(char[] token , char tokenDelimiter) {
-		// If we don't have a class yet then we are within the statement to try and deterine the type being cast to
-		if(fCastType.getPrimitiveTypeClass() == null && !fIsClosed){
-			fCastType.push(token,tokenDelimiter);
-			// If the type was completed and we have a ) then close us
-			if(fCastType.getPrimitiveTypeClass() != null && tokenDelimiter == DelimiterCloseParen){
-				fIsClosed = true;
-			}
-			return this;			
-		}
-		
-		if (!fIsClosed) {
-			// The cast is not closed, but we have a static class.  This class must therefore keep processing the tokens as it could be a method or message send
-			Expression result =  fCastType.push(token,tokenDelimiter);
-			result.parenthesisLevel++;
-			return result; 
-		}
-		
-		// If we have no expression push onto the cast value		
-		if(currentExpression == null){
-			currentExpression = new Statement(fClassLoader);
-			currentExpression = currentExpression.push(token,tokenDelimiter);
-			return this;
-		} 
-		Expression result = currentExpression.push(token, tokenDelimiter);
-		// If the result if a push then push the stack
-		if ( result.isComplete() ) {
-			popExpressionStack();
-		} else if ( result != currentExpression ) {
-			pushExpressionStack(result);
-		}		
-		return this;
-	}
-	public String toString(){
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("Cast("); //$NON-NLS-1$
-		if (fCastType != null){
-			buffer.append(fCastType.toString());
-		} else {
-			buffer.append("???"); //$NON-NLS-1$
-		}
-		buffer.append(") "); //$NON-NLS-1$
-		if ( currentExpression != null){
-			buffer.append(currentExpression.toString());
-		} else {
-			buffer.append("???");			 //$NON-NLS-1$
-		}
-		return buffer.toString();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
-	 */
-	protected String getTypeClassName() {
-		return fCastType.getTypeClassName();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
deleted file mode 100644
index 1f1ea06..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: CharLiteral.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-import java.text.MessageFormat;
-
-
-
-public class CharLiteral extends Expression {
-	protected boolean isComplete;
-	public char value;
-	public StringBuffer valueBuffer = new StringBuffer();
-	protected boolean isEscaped = false;
-
-/**
- * constructor
- */
-public CharLiteral(){
-}
-	
-/**
- * evaluate method comment.
- */
-public Object evaluate() throws Exception {
-	if (valueBuffer.length() == 1)
-		return new Character(valueBuffer.charAt(0));
-	else
-		throw new EvaluationException(
-			new IllegalArgumentException(MessageFormat.format(ProxyInitParserMessages.getString("CharTooComplicated_EXC_"), //$NON-NLS-1$
-				new Object[] {valueBuffer.toString()})));
-}
-
-public boolean isComplete(){
-	return isComplete;
-}
-/**
- * We must evaluate ourself and return the type of the result
- */
- 
-public Class getTypeClass() {
-	return Character.TYPE;
-}
-
-protected String getTypeClassName() {
-	return Character.TYPE.getName();
-}
-/**
- *This string might be broken into a few tokens
- *so we need a StringBuffer 
- */
-public Expression push(char[] token , char delimiter){
-	
-	if (isEscaped) {
-		isEscaped = false;
-		if (token.length != 0) {
-			// Had an escape followed by stuff, so not a true esc for our current definition
-			valueBuffer.append(DelimiterEscape);
-		} else {
-			if (delimiter == DelimiterSingleQuote || delimiter == DelimiterEscape)
-				valueBuffer.append(delimiter);	// It was a true escape.
-			else {
-				valueBuffer.append(DelimiterEscape);	// If wasn't a true escape
-				valueBuffer.append(delimiter);
-			}
-			return this;
-		}
-	}
-	
-	valueBuffer.append(token);
-	
-	if (delimiter == DelimiterSingleQuote){		
-		isComplete =true;
-		return this;
-	}
-	
-	// If the delimiter is an escape character remember it so we can escape
-	// the next token, otherwise treat it as a literal
-	if (delimiter == DelimiterEscape ){
-		isEscaped = true;
-	} else {
-		valueBuffer.append(delimiter);
-	}
-	return this;
-}
-
-/**
- * chars are primitives.
- */
-public boolean isPrimitive() {
-	return true;
-}
-public String toString(){
-	StringBuffer buffer = new StringBuffer();
-	buffer.append("Char('"); //$NON-NLS-1$
-	if ( valueBuffer != null ) {
-		buffer.append(valueBuffer.toString());
-	}
-	buffer.append(')');
-	return buffer.toString();
-}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java
deleted file mode 100644
index ebfa5bd..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: Constructor.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:52:36 PM)
- * @author: Administrator
- */
-public class Constructor extends Expression {
-	public boolean argsOpened = false;
-	public boolean argsClosed = false;
-	public boolean trailingPeriod = false;
-	public ArrayList arguments = new ArrayList(2);
-	public Static type;
-	protected boolean fIsComplete;
-	public boolean insideArgsOpenedParen = false;
-	public boolean insideArgsClosedParen = false;
-	public boolean isString = false;
-	public java.lang.reflect.Constructor ctor;
-/**
- * Constructor constructor comment.
- */
-public Constructor(ClassLoader aClassLoader) {
-	super();
-	fClassLoader = aClassLoader;
-}
-
-public boolean isComplete(){
-	return fIsComplete;
-}
-
-/**
- * Invoke the construtor
- */
-public Object evaluate() throws Exception {
-
-	if ( type.isArray() ) {
-		// For arrays we get the array that is actually held inside the static
-		// To instantiate the array it is possible that the static knows the array size, e.g. new int[2]
-		// or else it must be given this from the number of arguments we have, e.g. new int[] { 2 , 3 }
-		if ( arguments.size() > 0 ) {
-			type.setArrayArguments(arguments);
-		}
-		Object result = type.evaluate();
-		// Deal with array initialization arguments
-		return result;
-	} else {
-		// For non arrays we find the method and invoke it on the type
-		cacheCtor();
-		// Get the array of arguments
-		Object[] args = new Object[arguments.size()];
-		Iterator itr = arguments.iterator();
-		for (int i = 0; i < arguments.size() ; i++){
-			Expression anExpression = (Expression)itr.next();
-			args[i] = anExpression.evaluate();
-		}
-	
-		try {
-			return ctor.newInstance(args);	
-		} catch (Exception e) {
-			// If we got this far, then we have a valid parse, so anything is an evaluation exception.
-			throw new EvaluationException(e);
-		}
-	}
-}
-/** A constructor can only return the class of its type
- */
-public Class getTypeClass() throws Exception {
-	if ( type.isArray() ) {
-		// For arrays we get the array that is actually held inside the static
-		// To instantiate the array it is possible that the static knows the array size, e.g. new int[2]
-		// or else it must be given this from the number of arguments we have, e.g. new int[] { 2 , 3 }
-		if ( arguments.size() > 0 ) {
-			type.setArrayArguments(arguments);
-		}
-	}
-	return type.getTypeClass();
-}
-
-protected String getTypeClassName() {
-	return type.getTypeClassName();
-}
-
-private void cacheCtor() throws Exception {
-	
-	if (ctor == null) {
-		Class[] argTypes = new Class[arguments.size()];
-		Iterator itr = arguments.iterator();
-		for (int i=0; i<argTypes.length; i++)
-			argTypes[i] = getEvaluationTypeClass((Expression) itr.next());
-			
-		try {
-			ctor = MethodHelper.findCompatibleConstructor(getEvaluationTypeClass(this), argTypes);
-		} catch (NoSuchMethodException e) {
-			throw new EvaluationException(e);
-		} catch (AmbiguousMethodException e) {
-			throw new EvaluationException(e);
-		}
-	}
-}
-protected boolean isDelimiterOpened(char token){
-	return type.isArray() ? token == DelimiterOpenElipse : token == DelimiterOpenParen;	
-}
-protected boolean isDelimiterClosed(char token){
-	return type.isArray() ? token == DelimiterCloseElipse : token == DelimiterCloseParen;
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-
-	// If we are closed and we receive a . with no token then remember this
-	if ( argsClosed && !trailingPeriod && tokenDelimiter == DelimiterPeriod && token.length == 0 ) {
-		trailingPeriod = true;
-		return this;
-	}
-	// If we have been closed with a . and we receive a . then we are a field
-	if ( trailingPeriod && tokenDelimiter == DelimiterPeriod ) {
-		return new Field(this,token,fClassLoader);
-	}
-	// If we have been closed with a . and we receive a ( we are a message
-	if ( trailingPeriod && tokenDelimiter == DelimiterOpenParen ) {
-		return new Message(this,token,fClassLoader);
-	}
-	
-	// Lazy initialize the type if required
-	if ( type == null ) {
-		switch ( tokenDelimiter ) {
-			case DelimiterPeriod: {
-				type = new Static(token,tokenDelimiter,fClassLoader);
-				type.setClassLoader(fClassLoader);
-				return this;
-			}
-			case DelimiterOpenParen: {
-				type = new Static(token,tokenDelimiter,fClassLoader);
-				type.setClassLoader(fClassLoader);
-				argsOpened = true;
-				return this;
-			} 
-			case DelimiterOpenSquareBrace: { 
-//				throw new CannotProcessArrayTypesException();
-				// Array dimenions are created as staements in the arrayDimensions
-				// This is for expressions like new String[] or new String[3], where the Statement represents the 3, i.e.
-				// the code that declares the size of the array
-				type = new Static(token,tokenDelimiter,fClassLoader,true);
-				return this;
-			}
-			// If we get a { and our static is an array then this is the array initialization parameters
-			case DelimiterOpenElipse: { 
-				if ( type != null && type.isArray() ) {
-					argsOpened = true;
-				}
-			}
-			default: {
-				return null;
-			}
-		}
-	}
-	
-	// If we have a static that is an array then it consumes token until it is complete
-	if ( type != null && type.isArray() ) {
-		// The type consumes token as long as it is still in the array declaration section
-		if ( type.isProcessingArrayDimension || tokenDelimiter == DelimiterOpenSquareBrace ) {
-			type.push(token,tokenDelimiter);
-			return this;
-		}
-	}
-		
-	// If the type is incomplete and the token is a . ( for another class ) or a [ for an array then push it onto the type
-	if (!type.isArray() && type.getTypeClass() == null && (tokenDelimiter == DelimiterPeriod || tokenDelimiter == DelimiterOpenSquareBrace)) {
-		type.push(token , tokenDelimiter);
-		return this;
-	}
-	// If the type is incomplete and the token is a ( then push it onto the type and open the parens
-	if (!type.isArray()){
-		if (type.getTypeClass() == null && !argsOpened && isDelimiterOpened(tokenDelimiter)) {
-			argsOpened = true;
-			insideArgsOpenedParen = true;
-			type.push(token , DelimiterSpace );
-			return this;
-		}
-	} else { 
-		if ( !argsOpened && isDelimiterOpened(tokenDelimiter)) {
-			argsOpened = true;
-			insideArgsOpenedParen = true;
-			return this;			
-		}
-	}
-	
-	// If the args are already closed and we get another close expression, then just return ourselves
-	// This occurs in the case of nested array arguments within constructors
-	if ( argsClosed && (tokenDelimiter == DelimiterCloseParen)){
-		fIsComplete = true;
-		return this;
-	}
-	
-	// If the arguments are closed and we receive a { then this is an inner class declaration, e.g.
-	// new javax.swing.table.DefaultTableModel(){}
-	// This can't be processed by us so we need to throw an exception
-	if (argsClosed && tokenDelimiter == DelimiterOpenElipse ) {
-		throw new CannotProcessInnerClassesException();
-	}
-
-	// If the args are opened and a token was supplied then it must be an argument
-	if (argsOpened){
-		// If we already have an incomplete argument then this may be a constructor, a static reference, etc...
-		// and we should forward the request to the argument
-		Expression openArgument = null;
-		if ( arguments.size() > 0 ){
-			openArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( !openArgument.isComplete() ) {
-				openArgument.push(token,tokenDelimiter);
-				// If the argument is complete and we received a ) then the constructor is complete
-				// or if we receive a } and are an array we are complete
-				if ( openArgument.isComplete() && isDelimiterClosed(tokenDelimiter) ){
-					argsClosed = true;
-				}
-				return this;
-			} 
-		}
-			
-		Expression newArgument = null;
-		// If we are not already inside the open arg and we get another open paren this is probably a cast
-		// or some kind of statement, and OperMinus is probably the start of a number
-		// If the args are not already open we must be opened with either a { or a ( depending on whether we are an array or not
-		// however if the args are opened already and we receive a ( then this is the start of a new statement
-//		if ((!insideArgsOpenedParen && isDelimiterOpened(tokenDelimiter)) || tokenDelimiter == DelimiterOpenParen){
-		if (tokenDelimiter == DelimiterOpenElipse || tokenDelimiter == DelimiterOpenParen){
-			insideArgsOpenedParen = true;
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			if ( newArgument instanceof ArrayArguments ) {
-				((ArrayArguments)newArgument).setType(type);
-			}
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-
-		}
-		
-		// Start of a possible string or number or character
-		if ( ( token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote) || tokenDelimiter == OperMinus ){
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-		}
-		// If the token after the argument is a ) then the message is being closed
-		if ( !insideArgsOpenedParen || argumentsAreComplete() && isDelimiterClosed(tokenDelimiter) ) {
-			argsClosed = true;
-			return this;
-		}
-		if ( insideArgsOpenedParen && isDelimiterClosed(tokenDelimiter) ) {
-			insideArgsClosedParen  = true;
-			return this;
-		}
-
-		// If the token after the argument is a , or a ' ' then the argument is being closed
-		if ( tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterSpace ) {
-			// If our arguments are closed then we must be complete.  We need to signal the fact we are closed
-			// otherwise we will not be processed correctly if we are part of a stack 
-			if ( argsClosed ) {
-				fIsComplete = true;
-			}			
-			return this;
-		}
-		
-		// If we receive a close bracket then we are closed as long as the last argument is closed
-		if(argsOpened &&  isDelimiterClosed(tokenDelimiter)){
-			// No parms - we are a closed constructor
-			if(arguments.size() == 0){
-				argsClosed = true;
-				return this;
-			} 
-		}
-		
-		// If our last argument is closed and receive a ) and we have no new argument then we are closed
-		if (tokenDelimiter == DelimiterCloseParen && newArgument == null){
-			Expression lastArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( lastArgument.isComplete() ) {
-				argsClosed = true;
-				return this;
-			}
-		}			
-				
-		// Otherwise the new argument is stil processing.  Return it
-		return newArgument;
-	}
-
-	return this;
-}
-protected boolean argumentsAreComplete(){
-	if ( arguments.size() == 0) return true;
-	return ((Expression)arguments.get(arguments.size()-1)).isComplete();
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Constructor \""); //$NON-NLS-1$
-	if ( type != null ) {
-		writer.write(type.typeWriter.toString());
-	} else {
-		writer.write("UNTYPED"); //$NON-NLS-1$
-	}
-	for (int i = 0; i < arguments.size() ; i++){
-		writer.write(" Arg("); //$NON-NLS-1$
-		writer.write("" + (i+1)); //$NON-NLS-1$
-		writer.write(") = "); //$NON-NLS-1$
-		writer.write(arguments.get(i).toString());
-	}
-	
-	return writer.toString();
-
-}
-
-/**
- * This is never primitive
- */
-public boolean isPrimitive() {
-	return false;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java
deleted file mode 100644
index 914e664..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: EvaluationException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This is an InitializationStringEvaluationException, but
- * in addition, the exception that it wrappers is what should be
- * returned. This means it was a valid exception, parsing had
- * gone fine, but it was an evaluation that occured. This is
- * distinguished from the straight InitializationStringEvaluationException,
- * which means some error during parsing and evaluation.
- * 
- * Note: InvocationTargetExceptions will be unwrappered to the true exception.
- */
-public class EvaluationException extends InitializationStringEvaluationException {
-
-	/**
-	 * Constructor for ReturnableException.
-	 * @param exc
-	 */
-	public EvaluationException(Throwable exc) {
-		super(exc instanceof InvocationTargetException ? ((InvocationTargetException) exc).getTargetException() : exc);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java
deleted file mode 100644
index 471a17f..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: Expression.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.util.*;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:46:44 PM)
- * @author: Administrator
- */
-public abstract class Expression implements IParserConstants {
-	protected Expression currentExpression;
-	protected List fExpressionStack;
-	protected ClassLoader fClassLoader;
-	public int parenthesisLevel = 0;
-/** Compare the two char arrays
- */
-public static boolean compare(char[] from , char[] to){
-
-	return Arrays.equals(from, to);
-}
-/**
- * Expression constructor comment.
- * Note: If any exceptions that are due to evaluation, and not due to some
- * invalid state, then the exception should be wrappered in an EvaluationException,
- * and the EvaluationException thrown instead. This way we can distinquish between
- * valid exceptions that result evaluations (such as null pointer exceptions) from
- * parser errors due to string is too complicated.
- */
-public abstract Object evaluate() throws Exception;
-
-public abstract boolean isComplete();
-/**
- * Return a class type that the expression syntactically would produce.
- * For example, if a field is of type XYZ, return XYZ, even though
- * the value of the field may be SubXYZ where SubXYZ is a subclass of XYZ.
- */
-public abstract Class getTypeClass() throws Exception;
-/**
- * In evaluation phase, get the type class from the expression.
- * If typeclass not found, then a ClassCastException is thrown.
- * @param exp To getTypeClass from
- * @return type class.
- * @throws Exception ClassNotFoundException if type not found.
- */
-public Class getEvaluationTypeClass(Expression exp) throws Exception {
-	Class cls = exp.getTypeClass();
-	if (cls == null)
-		throw new EvaluationException(new ClassNotFoundException(exp.getTypeClassName()));
-	return cls;
-}
-
-/**
- * @return Type name that should be returned from this expression.
- */
-protected abstract String getTypeClassName();
-
-public boolean isNumber(char[] token){
-
-	if ( token.length == 0) return false;
-	// See whether the token is a number
-	int parsePosition = 0;
-	// Take into account it may start with a - sign, e.g. -1
-	if ( token[0] == '-' ) parsePosition = 1;
-	for (int i = parsePosition; i < token.length ; i++){
-		// If the next token is a digit return true
-		// Other things like decimals or primitive types, e.g. 2.2 or 2.2f are 
-		// handled by NumberLiteral
-		return Character.isDigit(token[i]);
-	}
-	return true;
-}
-public boolean isPop(){
-	return false;
-}
-protected void popExpressionStack(){
-
-	if ( fExpressionStack != null && fExpressionStack.size() > 0 ) {
-		currentExpression = (Expression) fExpressionStack.remove(fExpressionStack.size()-1);
-	}	
-}
-protected void pushExpressionStack(Expression anExpression){
-
-	if ( fExpressionStack == null ) fExpressionStack = new ArrayList(2);
-	// The current expression should go onto the stack
-	fExpressionStack.add(currentExpression);
-	// The current expression is replaced with the argument
-	currentExpression = anExpression;
-	
-}	
-
-void setClassLoader(ClassLoader aClassLoader){
-}
-
-/**
- * Push an expression onto us
- * Return the new expression onto which subsequent token should be pushed
- */
-public abstract Expression push(char[] token , char tokenDelimiter);
-
-/**
- * Answer if this expression results in a primitive.
- */
-public abstract boolean isPrimitive() throws Exception;
-
-public String toString(int depth, boolean aBreak){
-	StringBuffer buffer = new StringBuffer();
-	if ( aBreak ) {
-		buffer.append(System.getProperty("System.lineSeparator")); //$NON-NLS-1$
-	}
-	for(int i=0;i<depth;i++){
-		buffer.append(" "); //$NON-NLS-1$
-	}
-	buffer.append(toString());
-	return buffer.toString();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
deleted file mode 100644
index 5544cea..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: Field.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/05/00 10:39:28 PM)
- * @author: Administrator
- */
-public class Field extends Expression {
-	public boolean isComplete;
-	protected java.lang.reflect.Field fField;
-	public Expression receiver;
-	public String fieldName;
-	protected Class fResultType;
-	
-public Field(Expression aReceiver , char[] token , ClassLoader aClassLoader){
-
-	receiver = aReceiver;
-	if ( token.length > 0 ){
-		fieldName = new String(token);
-	}
-
-}
-public boolean isComplete(){
-	return isComplete;
-}
-
-/**
- * Send the message to the receiver
- */
-public Object evaluate() throws Exception {
-	Object receiverValue = receiver.evaluate();	// So if it fails, we get an evaluation exception going on up.
-	try {
-		cacheField();		
-		return fField.get(receiverValue);
-	} catch (Exception e) {
-		throw new EvaluationException(e);	// Any exception at this point is an evaluation exception.
-	}
-}
-
-/**
- * Get the field from reflection.
- */
-protected void cacheField() throws Exception {
-	if (fField == null) {
-		Class aReceiverClass = getEvaluationTypeClass(receiver);
-		fField = aReceiverClass.getField(fieldName);
-		fResultType = fField.getType();		
-	}
-}
-
-/**
- * The result type is the type of the field.
- */
-public Class getTypeClass() throws Exception {
-	if ( fResultType == null ) {
-		cacheField();
-	}
-	return fResultType;
-}
-
-protected String getTypeClassName() {
-	return "";	// If we got this far, we don't know what it is. //$NON-NLS-1$
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-
-	// If the delimiter is a ( then this is the start of a message
-	if ( tokenDelimiter == DelimiterOpenParen ) {
-		return new Message(this , token , fClassLoader);
-	}
-
-	// If the delimiter is a . then this is a field
-	if (token.length > 0  && ( tokenDelimiter == DelimiterPeriod || tokenDelimiter == DelimiterSpace
-	|| tokenDelimiter == DelimiterComma)) {
-		isComplete = true;
-		return new Field(this , token , fClassLoader);
-		
-	}
-	
-	if(fieldName != null && tokenDelimiter == DelimiterComma){
-		isComplete = true;
-		return this;
-	}
-	
-	// If we have no delimiter or a close paren then we have just received the field name
-	if (!isComplete && fieldName == null) {
-		fieldName = new String(token);
-		return this;
-	}
-	
-	if(tokenDelimiter == BitOR || tokenDelimiter == BitAND){
-		isComplete = true;
-		PrimitiveOperation result = new PrimitiveOperation(this,tokenDelimiter);
-		return result;
-	}
-	
-	// Ignore spaces as this maybe padding between the field and the next valid token
-	if(token.length == 0 && tokenDelimiter == ' ') return this;
-
-	throw new RuntimeException(java.text.MessageFormat.format(ProxyInitParserMessages.getString(ProxyInitParserMessages.UNEXPECTED_TOKEN), new Object[] {new StringBuffer(token.length+1).append(token).append(tokenDelimiter).toString()}));
-	
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Field Name=\""); //$NON-NLS-1$
-	if ( fieldName != null ) {
-		writer.write(fieldName);
-	} else {
-		writer.write("UNNAMED"); //$NON-NLS-1$
-	}
-	writer.write("\" Receiver="); //$NON-NLS-1$
-	if ( receiver != null ){
-		writer.write(receiver.toString());
-	} else {
-		writer.write("NONE"); //$NON-NLS-1$
-	}
-	return writer.toString();
-
-}
-
-/**
- * Test the field type to determine if primitive or not.
- */
-public boolean isPrimitive() throws Exception {
-	cacheField();
-	return getTypeClass().isPrimitive();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java
deleted file mode 100644
index e282d07..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IParserConstants.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-/**
- * Constants for the parser.
- * Creation date: (11/05/00 9:37:45 PM)
- * @author: Administrator
- */
-public interface IParserConstants {
-	// Define the delimiters
-	public static final char DelimiterSpace = ' ';
-	public static final char DelimiterPeriod = '.';
-	public static final char DelimiterOpenParen = '(';
-	public static final char DelimiterCloseParen = ')';
-	public static final char DelimiterComma = ',';
-	public static final char DelimiterQuote = '"';
-	public static final char DelimiterEscape = '\\';
-	public static final char DelimiterSingleQuote = '\'';
-	public static final char DelimiterOpenElipse = '{';
-	public static final char DelimiterCloseElipse = '}';	
-	public static final char DelimiterOpenSquareBrace = '[';
-	public static final char DelimiterCloseSquareBrace = ']';
-	// Define the math functions
-	public static final char OperPlus = '+';
-	public static final char OperMinus = '-';
-	public static final char OperMultiply = '*';
-	public static final char OperDivide = '/';
-	// Define the primitive functions
-	public static final char BitOR = '|';
-	public static final char BitAND = '&';
-	
-	// Define constants
-	public static final char[] ConstantNew = new char[] { 'n' , 'e' , 'w' };
-	public static final char[] ConstantTrue = new char[] { 't' , 'r' , 'u' , 'e' };
-	public static final char[] ConstantFalse = new char[] { 'f' , 'a' , 'l' , 's' , 'e' };
-	public static final char[] ConstantNull = new char[] { 'n' , 'u' , 'l' , 'l' };
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java
deleted file mode 100644
index 8844fb6..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: InitializationStringEvaluationException.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-
-public class InitializationStringEvaluationException extends Exception {
-	
-	
-public InitializationStringEvaluationException(Throwable exc){
-	super(exc);
-}
-public Throwable getOriginalException(){
-	return getCause();
-}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java
deleted file mode 100644
index eed43a4..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java
+++ /dev/null
@@ -1,300 +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.jem.internal.proxy.initParser;
-/*
- *  $RCSfile: InitializationStringParser.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.util.ArrayList;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:53:45 PM)
- * @author: Administrator
- */
-public class InitializationStringParser implements IParserConstants {
-	protected ClassLoader fClassLoader;
-	protected boolean isComplete = false;
-	protected String fInitString;
-	protected int fSourceLength;
-	protected char[] fSource;
-	protected int fSourcePosition = -1;
-	private char[] fCurrentToken;
-	private char fCurrentTokenDelimiter = 0;
-	protected ArrayList fExpressionStack = new ArrayList(4);
-	protected Expression fExpression;
-/**
- * InitializationStringParser constructor comment.
- */
-public InitializationStringParser(String initString){
-
-	fInitString = initString;
-	fSource = initString.toCharArray();
-	fSourceLength = fSource.length;
-
-}
-/** Look for a known token
- */
-protected void createNextToken(){
-
-	fCurrentTokenDelimiter = 0;
-	if ( fSourcePosition >= fSourceLength - 1 ) {
-		isComplete = true;
-		return;
-	}
-
-	fSourcePosition++;
-	// If we are not in a token then look for " " or else for a period
-	char[] fCurrentTokenSource = new char[fSourceLength];
-	int i = 0;
-	scanner : for ( ; fSourcePosition < fSourceLength ; fSourcePosition++ , i++ ){
-		// Advance the source position so when finding the next token we skip over the '.' or ' '
-		// Record the delimiter that was found
-		switch ( fSource[fSourcePosition] ) {
-			case DelimiterPeriod: {
-				fCurrentTokenDelimiter = DelimiterPeriod;
-				break scanner;
-			}
-			case DelimiterOpenParen: {
-				fCurrentTokenDelimiter = DelimiterOpenParen;
-				break scanner;
-			}
-			case DelimiterCloseParen: {
-				fCurrentTokenDelimiter = DelimiterCloseParen;
-				break scanner;
-			}
-			case DelimiterComma: {
-				fCurrentTokenDelimiter = DelimiterComma;
-				break scanner;
-			}
-			case DelimiterSpace: {
-				fCurrentTokenDelimiter = DelimiterSpace;
-				break scanner;
-			}
-			case DelimiterQuote: {
-				fCurrentTokenDelimiter = DelimiterQuote;
-				break scanner;
-			}
-			case DelimiterSingleQuote: {
-				fCurrentTokenDelimiter = DelimiterSingleQuote;
-				break scanner;
-			}			
-			case DelimiterEscape: {
-				fCurrentTokenDelimiter = DelimiterEscape;
-				break scanner;
-			}
-			case DelimiterOpenElipse:{
-				fCurrentTokenDelimiter = DelimiterOpenElipse;
-				break scanner;
-			}
-			case DelimiterOpenSquareBrace:{
-				fCurrentTokenDelimiter = DelimiterOpenSquareBrace;
-				break scanner;
-			}
-			case DelimiterCloseSquareBrace:{
-				fCurrentTokenDelimiter = DelimiterCloseSquareBrace;
-				break scanner;
-			}			
-			case DelimiterCloseElipse:{
-				fCurrentTokenDelimiter = DelimiterCloseElipse;
-				break scanner;
-			}				
-			// Do the math functions
-			case OperPlus: {
-				fCurrentTokenDelimiter = OperPlus;
-				break scanner;
-			}
-			case OperMinus: {
-				fCurrentTokenDelimiter = OperMinus;
-				break scanner;
-			}
-			case OperMultiply: {
-				fCurrentTokenDelimiter = OperMultiply;
-				break scanner;
-			}
-			case OperDivide: {
-				fCurrentTokenDelimiter = OperDivide;
-				break scanner;
-			}
-			// Do the primitive BitWise operations
-			case BitOR: {
-				fCurrentTokenDelimiter = BitOR;
-				break scanner;
-			}
-			case BitAND: {
-				fCurrentTokenDelimiter = BitAND;
-				break scanner;
-			}			
-			default: {
-				fCurrentTokenSource[i] = fSource[fSourcePosition];
-			}
-		}
-	}
-
-	// Push the token onto the stack for later decoding
-	if ( i >= 1 ) {
-		fCurrentToken = new char[i];
-		System.arraycopy( fCurrentTokenSource , 0 , fCurrentToken , 0 , i );
-	} else {
-		fCurrentToken = new char[0];
-	}
-
-}
-/** Answer the result of evaluating the expression
- */
-public Object evaluate() throws InitializationStringEvaluationException {
-
-	try {
-		return fExpression.evaluate();
-	} catch (java.lang.reflect.InvocationTargetException e) {
-		throw new EvaluationException(e);
-	} catch (EvaluationException e) {
-		throw e;	// Don't loose these
-	} catch (Throwable e) {
-		throw new InitializationStringEvaluationException(e);
-	}
-
-}
-public static Object evaluate(String initString) throws InitializationStringEvaluationException {
-
-	return evaluate(initString,null);
-
-}
-public static Object evaluate(String initString,ClassLoader aClassLoader) throws InitializationStringEvaluationException {
-
-	InitializationStringParser parser = null;;
-	try {
-		parser = new InitializationStringParser(initString);
-		parser.setClassLoader(aClassLoader);
-		parser.parse();
-	} catch ( Throwable exc ) {
-		throw new InitializationStringEvaluationException(exc);
-	}		
-	return parser.evaluate();
-}
-
-/**
- * Return a parser already parsed. Use the default classloader (i.e. classloader that loaded InitializationStringParser).
- * 
- * @param initString
- * @return The parser, already parsed.
- * @throws InitializationStringEvaluationException
- */
-
-public static InitializationStringParser createParser(String initString) throws InitializationStringEvaluationException {
-	return createParser(initString, null);
-}
- 
-/**
- * Return a parser already parsed. Use the given classloader.
- * 
- * @param initString
- * @param classLoader
- * @return The parser, already parsed.
- * @throws InitializationStringEvaluationException
- */
-public static InitializationStringParser createParser(String initString, ClassLoader classLoader) throws InitializationStringEvaluationException {
-
-	try {
-		InitializationStringParser parser = new InitializationStringParser(initString);
-		parser.setClassLoader(classLoader);
-		parser.parse();
-		return parser;
-	} catch ( Throwable exc ) {
-		throw new InitializationStringEvaluationException(exc);
-	}
-
-}
-
-/** Analyze the string
- */
-public void parse(){
-	
-	createFirstExpression();
-	int i =1;
-	while ( true ){
-		createNextToken();
-		if ( isComplete ) {
-			// If the current expression is incomplete it must be completed 
-			// by the end, which is basically the equiavlent of a;
-			return;
-		} else  {
-			i++;
-			Expression result = fExpression.push( fCurrentToken , fCurrentTokenDelimiter );
-			// If the result if a push then push the stack
-			if ( result.isComplete() ) {
-				popExpressionStack();
-			} else if ( result != fExpression ) {
-				pushExpressionStack(result);
-			}
-		}
-	}
-}
-
-/**
- * Answer if the string results in a primitive.
- */
-public boolean isPrimitive() throws InitializationStringEvaluationException {
-	try {
-		return fExpression.isPrimitive();
-	} catch (Exception e) {
-		throw new InitializationStringEvaluationException(e);
-	}
-}
-
-public Class getExpectedType() throws InitializationStringEvaluationException {
-	try {
-		return fExpression.getTypeClass();
-	} catch (Exception e) {
-		throw new InitializationStringEvaluationException(e);
-	}
-}
-
-/* Pop the top expression off the stack
- */
-protected void popExpressionStack(){
-
-	if ( fExpressionStack.size() > 0 ) {
-		fExpression = (Expression) fExpressionStack.remove(fExpressionStack.size()-1);
-	}	
-}
-/* Push the expression onto the stack
- */
-protected void pushExpressionStack(Expression anExpression){
-
-	// The current expression should go onto the stack
-	fExpressionStack.add(fExpression);
-	// The current expression is replaced with the argument
-	fExpression = anExpression;
-	
-}
-protected void createFirstExpression(){
-	if ( fExpression == null ) {
-		fExpression = new Statement(fClassLoader);
-	};
-}
-public void setClassLoader(ClassLoader aClassLoader){
-	fClassLoader = aClassLoader;	
-}
-public String toString(){
-	StringBuffer writer = new StringBuffer();
-	writer.append("Parser. token=\""); //$NON-NLS-1$
-	if ( fCurrentToken != null ) {
-		writer.append(fCurrentToken);
-	} 
-	writer.append("\", delim=\""); //$NON-NLS-1$
-	writer.append(fCurrentTokenDelimiter);
-	writer.append("\", initString=\""); //$NON-NLS-1$
-	writer.append(fInitString);
-	return writer.toString();	
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java
deleted file mode 100644
index bf324ad..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: Message.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-
-public class Message extends Expression {
-	protected boolean trailingPeriod = false;
-	protected Method fMethod;
-	public Expression receiver;
-	public String message;
-	public boolean argsClosed = false;
-	public boolean insideArgsOpenedParen = false;
-	public boolean insideArgsClosedParen = false;
-	protected boolean isComplete = false;
-	public ArrayList arguments = new ArrayList(2);
-	
-public Message(Expression aReceiver , char[] token , ClassLoader aClassLoader){
-	receiver = aReceiver;
-	message = new String(token);
-	fClassLoader = aClassLoader;
-}
-public boolean isComplete(){
-	return isComplete;
-}
-
-/**
- * Send the message to the receiver
- */
-public Object evaluate() throws Exception {
-	cacheMethod();
-	
-	// Get the array of arguments
-	Object[] args = new Object[arguments.size()];
-	Iterator itr = arguments.iterator();
-	for (int i = 0; i < arguments.size() ; i++){
-		Expression anExpression = (Expression)itr.next();
-		args[i] = anExpression.evaluate();
-	}
-	
-	Object receiverValue = receiver.evaluate();	// So if evaluation exception thrown, we don't wrapper again.
-	
-	try {
-		return fMethod.invoke(receiverValue, args);
-	} catch (Exception e) {
-		throw new EvaluationException(e);
-	}
-}
-
-/**
- * Cache the message
- */
-protected void cacheMethod() throws Exception {
-	if (fMethod == null) {
-		Class[] argTypes = new Class[arguments.size()];
-		Iterator itr = arguments.iterator();
-		for (int i=0; i<argTypes.length; i++)
-			argTypes[i] = getEvaluationTypeClass((Expression) itr.next());
-			
-		try {
-			fMethod = MethodHelper.findCompatibleMethod(getEvaluationTypeClass(receiver), message, argTypes);
-		} catch (NoSuchMethodException e) {
-			throw new EvaluationException(e);
-		} catch (AmbiguousMethodException e) {
-			throw new EvaluationException(e);
-		}
-	}
-}
-
-
-/**
- * getTypeClass method comment.
- */
-public Class getTypeClass() throws Exception {
-	cacheMethod();
-	return fMethod.getReturnType();
-}
-
-protected String getTypeClassName() {
-	return "";	// If we got this far, we don't know what it is. //$NON-NLS-1$
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-	
-	// If we are closed and we receive a . with no token then remember this
-	if ( argsClosed && !trailingPeriod && tokenDelimiter == DelimiterPeriod && token.length == 0 ) {
-		trailingPeriod = true;
-		return this;
-	}
-	// If we have been closed with a . and we receive a . then we are a field
-	if ( trailingPeriod && tokenDelimiter == DelimiterPeriod ) {
-		return new Field(this,token,fClassLoader);
-	}
-	// If we have been closed with a . and we receive a ( we are a message
-	if ( trailingPeriod && tokenDelimiter == DelimiterOpenParen ) {
-		return new Message(this,token,fClassLoader);
-	}
-	
-	// If we have been closed and we receive a , or a ) we are complete - this is a structural token intended for someone else,
-	// probably a message argument lower down the stack
-	if (argsClosed && (tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterCloseParen)){
-		isComplete = true;
-		return this;
-	}
-	
-
-	// If the args are opened and a token was supplied then it must be an argument
-	//if ( argsOpened && ( tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma || 
-	//tokenDelimiter == DelimiterSpace || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterPeriod)) {
-	if (!argsClosed){	
-		if ( arguments.size() > 0 ){
-			Expression openArgument = (Expression)arguments.get(arguments.size()-1);
-			if ( !openArgument.isComplete() ) {
-				openArgument.push(token,tokenDelimiter);
-				// If the argument is complete and we received a ) then the message is complete
-				if ( openArgument.isComplete() && tokenDelimiter == DelimiterCloseParen){
-					argsClosed = true;
-				}
-				return this;
-			}
-		}	
-		
-		// We must have a new argument - process accordingly	
-		Expression newArgument = null;
-		if (!insideArgsOpenedParen && tokenDelimiter == DelimiterOpenParen){
-			insideArgsOpenedParen = true;
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-
-		}
-		if ( newArgument == null && (token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote || tokenDelimiter == DelimiterOpenParen )) {
-			newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
-			newArgument = new MessageArgument(newArgument);
-			arguments.add(newArgument);
-		}
-		// If the token after the argument is a ) then the message is being closed
-		if ( !insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseParen ) {
-			argsClosed = true;
-			return this;
-		}
-		if ( insideArgsOpenedParen  && tokenDelimiter == DelimiterCloseParen ) {
-			insideArgsClosedParen  = true;
-			return this;
-		}
-
-		// If the token after the argument is a , or a ' ' then the argument is being closed
-		if ( tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterSpace ) {
-			return this;
-		}
-		
-		// Otherwise the new argument is stil processing.  Return it
-//		return newArgument;
-	}
-	
-	// If we don't have a message yet, then consume this one
-	if ( message.length() == 0 ) {
-		message = new String(token);
-		return this;
-	}	
-
-	return this;	
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Msg Name=\""); //$NON-NLS-1$
-	if ( message != null ) {
-		writer.write(message);
-	} else {
-		writer.write("UNNAMED"); //$NON-NLS-1$
-	}
-	writer.write("\" Rcv=("); //$NON-NLS-1$
-	if ( receiver != null ){
-		writer.write(receiver.toString());
-	} else {
-		writer.write("NONE"); //$NON-NLS-1$
-	}
-	writer.write(')');
-	if ( arguments != null ) {
-		writer.write("Args(");		 //$NON-NLS-1$
-		Iterator iter = arguments.iterator();
-		int i=1;
-		while(iter.hasNext()){
-			writer.write(new Integer(i).toString());
-			writer.write('(');
-			writer.write(iter.next().toString());
-			writer.write("),");			 //$NON-NLS-1$
-		}
-		writer.write(')');				
-	}
-	
-	return writer.toString();
-
-}
-
-/**
- * Is the message result a primitive.
- */
-public boolean isPrimitive() throws Exception {
-	cacheMethod();
-	return fMethod.getReturnType().isPrimitive();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java
deleted file mode 100644
index 1079049..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: MessageArgument.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.io.StringWriter;
-import java.util.*;
-
-public class MessageArgument extends Expression {
-
-	protected boolean isComplete = false;
-	Expression fExpression;
-	ArrayList fExpressionStack = new ArrayList();
-
-public MessageArgument(Expression anExpression){
-	fExpression = anExpression;
-}
-	
-public Object evaluate() throws Exception {
-	
-	return fExpression.evaluate();
-	
-}	
-
-public Class getTypeClass() throws Exception {
-	
-	return fExpression.getTypeClass();
-	
-}
-
-protected String getTypeClassName() {
-	return fExpression.getTypeClassName();
-}
-public boolean isComplete(){
-	return isComplete || fExpression.isComplete();
-}
-	
-public Expression push(char[] token , char delimiter){
-
-	// Even if our expression is complete and we receive anything other than a , then the expression must process it as this may be a field or message
-	// that is being sent to the expression to make up a complex argument	
-	Expression result = fExpression.push(token,delimiter);
-	// If the result if a push then push the stack
-	if ( result != fExpression ) {
-		pushExpressionStack(result);
-	} else if (result.isComplete()){
-		// If our expression is complete, we are completed with a ) pop the stack so the previous expression can process us
-		if (delimiter == DelimiterCloseParen ) {
-			isComplete = true;
-			popExpressionStack();
-		} else if (delimiter == DelimiterComma || delimiter == DelimiterQuote ) {
-			// If we receive a comma we pop the stack so the previous expression can process us but we don't flag us as complete
-			popExpressionStack();
-			// unless our expression is some array argument AND it is complete AND we have a close elipse }
-		} else if ( delimiter == DelimiterCloseElipse ) {
-			popExpressionStack();
-			if ( fExpression instanceof ArrayArguments ) {
-				isComplete = true;
-			}
-		}
-	}
-	return this;
-}	
-	
-/* Pop the top expression off the stack
- */
-protected void popExpressionStack(){
-
-	if ( fExpressionStack.size() > 0 ) {
-		Expression lastExpression = (Expression)fExpressionStack.get(fExpressionStack.size() - 1);
-		if ( !lastExpression.isComplete() ) {
-			fExpression = (Expression) fExpressionStack.remove(fExpressionStack.size() - 1);
-		} else { 
-			isComplete = true;
-		} 
-	} else {
-		isComplete = true;
-	}
-}
-
-/* Push the expression onto the stack
- */
-protected void pushExpressionStack(Expression anExpression){
-
-	// The current expression should go onto the stack
-	fExpressionStack.add(fExpression);
-	// The current expression is replaced with the argument
-	fExpression = anExpression;
-	
-}
-
-public boolean isPrimitive(){
-	return false;
-}
-public String toString(){
-	StringWriter writer = new StringWriter();
-	writer.write("Arg("); //$NON-NLS-1$
-	if ( fExpression != null ) {
-		writer.write(fExpression.toString());
-	}
-	writer.write(")"); //$NON-NLS-1$
-	return writer.toString();
-}
-public void contributeArgumentNumber(List argumentNumberList){
-
-	if ( fExpression instanceof ArrayArguments ) {
-		((ArrayArguments)fExpression).contributeArgumentNumber(argumentNumberList);
-	}	
-	
-}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java
deleted file mode 100644
index 102b65d..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-
-/*
- *  $RCSfile: NullLiteral.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-public class NullLiteral extends Expression {
-public NullLiteral(){
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
-	return null;
-}
-/**
- * evaluate method comment.
- */
-public Class getTypeClass(){
-	return MethodHelper.NULL_TYPE;
-}
-
-protected String getTypeClassName() {
-	return MethodHelper.NULL_TYPE.getName();
-}
-/**
- * true or false cannot consume any kind of expression so we must return null
- */
-public Expression push(char[] token , char delimiter){
-	return null;
-}
-
-public boolean isComplete(){
-	return true;
-}
-
-/**
- * Null is not primitive
- */
-public boolean isPrimitive() {
-	return false;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java
deleted file mode 100644
index 92beb22..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: NumberLiteral.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-public class NumberLiteral extends Expression {
-	protected String numberString = ""; //$NON-NLS-1$
-	protected boolean isComplete = false;
-	protected Class numberClass = Integer.TYPE;
-	protected int exponentFlag = NO_EXPONENT;
-	
-	protected static final int
-		NO_EXPONENT = 0,
-		HAS_EXPONENT = 1,
-		HAS_EXPONENT_MINUS = 2;
-/**
- * evaluate method comment.
- */
-public NumberLiteral(){
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() throws Exception {
-	try {
-		// Return a number of the correct instance
-		if (numberClass == Float.TYPE){
-			return new Float(Float.parseFloat(numberString));
-		} else if (numberClass == Long.TYPE ) {
-			return Long.decode(numberString);
-		} else if (numberClass == Double.TYPE ){
-			return new Double(Double.parseDouble(numberString));
-		} else
-			return Integer.decode(numberString);
-	} catch (Exception e) {
-		throw new EvaluationException(e);
-	}
-	
-}
-public boolean isComplete(){
-	return isComplete;
-}
-
-/**
- * Return the type of number that we are.
- */
-public Class getTypeClass(){
-	return numberClass;
-}
-
-protected String getTypeClassName() {
-	return numberClass != null ? numberClass.getName() : ""; //$NON-NLS-1$
-}
-/**
- * If the delimiter is an operation such as a +,-,/,* then we can consume it
- * If the delimiter is period and we don't already have one then it is the decimal portion of us
- */
-public Expression push(char[] token , char delimiter){
-		
-	// Close brackets complete use		
-	if(delimiter == DelimiterCloseParen || delimiter == DelimiterComma || delimiter == DelimiterCloseElipse){
-		isComplete = true;
-	}
-	
-	if (delimiter == OperMinus && numberString.length() == 0)
-		numberString+=OperMinus;	// No digits yet, but we have a minus sign, so add to accumulating number.
-		
-	numberString += processNumberToken(token);	
-	
-	// If we have part of a number and are asked to do some arithmetic throw an 
-	// error that this has not been coded yet, except minus could be part of an exponent.
-	if(numberString.length() > 0 && token.length > 1) {
-		switch(delimiter){
-			case OperMinus:
-				if (exponentFlag == HAS_EXPONENT) {
-					exponentFlag = HAS_EXPONENT_MINUS;
-					numberString += OperMinus;
-					break;
-				}
-			case OperPlus:			
-			case OperMultiply:
-			case OperDivide:
-			{
-				throw new RuntimeException("Can't do arithmetic yet"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	if (delimiter == DelimiterPeriod){
-		numberClass = Double.TYPE;	// A decimal makes it double.
-		numberString += DelimiterPeriod;
-	}	
-
-	if(delimiter == BitOR || delimiter == BitAND){
-			Expression result = new PrimitiveOperation(this,delimiter);
-			isComplete = true;
-			return result;
-	}
-
-	return this;
-	
-}
-protected String processNumberToken(char[] token){
-	
-	for (int i=0; i<token.length; i++)
-		if (token[i] == 'E' || token[i] == 'e') {
-			numberClass = Double.TYPE;	// Definitely a floating because of this.
-			exponentFlag = HAS_EXPONENT;
-			break;
-		}
-			
-	// The token could be a number, e.g. 10 or 5 or could be qualified with a primitive
-	// suffix, e.g. 10l or 5f
-	char[] numberToken = token;
-	if ( token.length > 0 ) {
-		switch(token[token.length - 1]){
-			case 'F': 			
-			case 'f':
-				numberClass = Float.TYPE;
-				numberToken = new char[token.length - 1];
-				System.arraycopy(token,0,numberToken,0,numberToken.length);
-				isComplete = true;
-				break;
-			case 'L':			
-			case 'l':
-				numberClass = Long.TYPE;
-				numberToken = new char[token.length - 1];
-				System.arraycopy(token,0,numberToken,0,numberToken.length);				
-				isComplete = true;
-				break;
-			case 'D':			
-			case 'd':
-				numberClass = Double.TYPE;
-				numberToken = new char[token.length - 1];
-				System.arraycopy(token,0,numberToken,0,numberToken.length);				
-				isComplete = true;
-				break;
-		}
-	}
-			
-	return new String(numberToken);
-}
-public String toString(){
-
-	java.io.StringWriter writer = new java.io.StringWriter();
-	writer.write("Number \""); //$NON-NLS-1$
-	writer.write(numberString);
-	writer.write("\""); //$NON-NLS-1$
-	return writer.toString();
-
-}
-
-/**
- * Number literals are primitive
- */
-public boolean isPrimitive() {
-	return true;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
deleted file mode 100644
index f090756..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * This is for primitive expressions that are optimized out the compiler such as bit or, bit and, etc..
-   */
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: PrimitiveOperation.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-public class PrimitiveOperation extends Expression {
-	
-	protected int operation;				// This can be BitOR or BitAND
-	protected Expression receiver;	// The left hand side of the expression
-	protected boolean isComplete = false;
-	
-	public PrimitiveOperation(Expression aReceiver, int anOperation){
-		receiver = aReceiver;
-		operation = anOperation;
-	}
-
-	public Object evaluate() throws Exception {
-		Object leftHandSide = receiver.evaluate();
-		Object rightHandSide = currentExpression.evaluate();
-		if (leftHandSide instanceof Integer && rightHandSide instanceof Integer) {
-			if(operation == BitOR) {
-				return new Integer(((Integer)leftHandSide).intValue() | ((Integer)rightHandSide).intValue());				
-			} else if(operation == BitAND) {
-				return new Integer(((Integer)leftHandSide).intValue() & ((Integer)rightHandSide).intValue());				
-			}
-		}
-		throw new RuntimeException("Invalid operator " + getOperDescription() + " between " + leftHandSide + " and " + rightHandSide);		
-	}
-	protected String getOperDescription(){
-		if(operation == BitOR) return "|";
-		if (operation == BitAND) return "&";			
-		return "???";
-	}
-
-	public boolean isComplete() {
-		return isComplete;
-	}
-
-	public Class getTypeClass() throws Exception {
-		return Integer.TYPE;
-	}
-
-	protected String getTypeClassName() {
-		return Integer.TYPE.getName();
-	}
-
-	public Expression push(char[] token, char tokenDelimiter) {
-	
-		// Create a new statement if the argument is null ( we are always created with a receiver )
-		if(currentExpression == null && token.length > 0){
-			currentExpression = new Statement(fClassLoader).push(token,tokenDelimiter);
-			pushExpressionStack(currentExpression);
-			return this;
-		} 
-		
-		// Ignore whitespace
-		if(token.length == 0 && tokenDelimiter == ' ') return this;
-		
-		// If we have an argument we just keep pushing the expression onto this
-		if(currentExpression != null){
-			Expression result = currentExpression.push(token,tokenDelimiter);
-			if(result != currentExpression){
-				pushExpressionStack(result);
-			}
-		}
-		
-		if(currentExpression != null && currentExpression.isComplete()){
-			if(tokenDelimiter == DelimiterComma){
-				isComplete = true;
-				return this;
-			} else if (tokenDelimiter == DelimiterCloseParen){
-				if(receiver.parenthesisLevel > 0){
-					receiver.parenthesisLevel--;
-				} else {
-					isComplete = true;			
-					return this;		
-				}
-			}
-		}				
-	
-		return this;
-	}
-
-	public boolean isPrimitive() throws Exception {
-		return true;
-	}
-	
-	public String toString(){
-		StringBuffer buffer = new StringBuffer();
-		if (receiver != null) buffer.append(receiver.toString());
-		buffer.append(getOperDescription());
-		if (currentExpression != null) buffer.append(currentExpression.toString()); 
-		return buffer.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
deleted file mode 100644
index 6372fae..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ProxyInitParserMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
- * General Proxy NLS Constants
- * Creation date: (4/13/00 10:46:58 AM)
- * @author: Administrator
- */
-public class ProxyInitParserMessages {
-	// Resource Bundle to use for basic Proxy NLS resources.
-	static private final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("org.eclipse.jem.internal.proxy.initParser.messages"); //$NON-NLS-1$
-
-	// Keys for messages/strings within the resource bundle.
-	static public final String
-		UNEXPECTED_TOKEN = "UnexpectedToken_EXC_", //$NON-NLS-1$
-		STATEMENT_UNEXPECTED_EXECUTION = "Statement.UnexpectedExecution_EXC_", //$NON-NLS-1$
-		STATEMENT_UNEXPECTED_EVALUATION = "Statement.UnexpectedEvaluation_EXC_"		; //$NON-NLS-1$
-		
-	private ProxyInitParserMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
deleted file mode 100644
index 00c3df9..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-
-public class Statement extends Expression {
-	public boolean isStringObject = false;
-	public boolean isCast = false;
-	protected boolean messageOrFieldStarted;
-	
-/**
- * Statement constructor comment.
- */
-public Statement(ClassLoader aClassLoader) {
-	super();
-	fClassLoader = aClassLoader;
-}
-
-public boolean isComplete(){
-	return currentExpression != null && currentExpression.isComplete();
-}
-
-/** Defer this to the expression
- */
-public Object evaluate() throws Exception {
-	if ( currentExpression != null ) {
-		return currentExpression.evaluate();
-	} else {
-		throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION));	// This is not an evaluation error, it shouldn't of occured, so it is a parser error.
-	}
-}
-/**
- */
-public Class getTypeClass() throws Exception {
-	return currentExpression.getTypeClass();
-	//throw new RuntimeException(ProxyBaseVMNLS.RESBUNDLE.getString(ProxyBaseVMNLS.STATEMENT_UNEXPECTED_EVALUATION));
-}
-
-protected String getTypeClassName() {
-	return currentExpression.getTypeClassName();
-}
-/** There are several types of token that can begin a statement.
- *  new , ' '						-	Create a constructor
- *	1-10, true, false, etc...		-	Create a literal
- *  Foo,  '.'						-	Create a Type
- */
-public Expression push(char[] token , char delimiter){
-	
-	// If messageOrFieldStart is true then our expression is complete and either a message or field is being created
-	// See which it is and create the correct expression
-	if (messageOrFieldStarted){
-		messageOrFieldStarted = false;
-		if ( delimiter == DelimiterOpenParen){
-			Message message = new Message(currentExpression,token,fClassLoader);
-			currentExpression = message;
-			return message;
-		} else { 
-			Field field = new Field(currentExpression,token,fClassLoader);
-			currentExpression = field;
-			return field;
-		}
-	}	
-	
-	// Look for "new " for a constructor"
-	if ( delimiter == DelimiterSpace && compare( token , ConstantNew ) ) {
-		// If we thought we were a possible cast and we now aren't then we must be a block expression
-		if ( isCast ) {
-			currentExpression = new Block(new Constructor(fClassLoader));
-		} else {
-			currentExpression = new Constructor(fClassLoader);
-		}
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;
-	}
-	
-	// Look for "null" 
-	if ( compare( token , ConstantNull ) ) {
-		currentExpression = new NullLiteral();
-		isCast = false;	// Can't be a cast now		
-		// Null cannot process anything so we return the statement
-		return this;
-	}
-
-	// Look for a number
-	if ( isNumber( token ) || delimiter == OperMinus ) {
-		currentExpression = new NumberLiteral();
-		currentExpression = currentExpression.push(token,delimiter);
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;
-	}
-
-	if ( compare( token , ConstantTrue ) ) {
-		currentExpression  = new BooleanLiteral(true);
-		// true cannot process anything so we return the statement
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;
-//		return this;
-	}
-
-	if ( compare( token , ConstantFalse ) ) {
-		// false cannot process anything so we return the statement
-		currentExpression = new BooleanLiteral(false);
-		isCast = false;	// Can't be a cast now		
-		return this;
-	}
-	
-	if ( delimiter == DelimiterQuote ) {
-		currentExpression = new StringLiteral();
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;		
-	}
-	
-	if ( delimiter == DelimiterSingleQuote ) {
-		currentExpression = new CharLiteral();
-		isCast = false;	// Can't be a cast now		
-		return currentExpression;		
-	}	
-	
-	if (delimiter == DelimiterPeriod && token.length == 0 && currentExpression != null){
-		if (currentExpression instanceof StringLiteral){
-			//String s = "\"" + (String)(currentExpression.evaluate()) + "\"" ;
-			//return new Constructor(s);
-			isStringObject = true;
-			return this;
-		}
-	}
-	
-	if (isStringObject && (token.length > 0) && (delimiter == DelimiterOpenParen)){
-		return new Message(currentExpression, token,fClassLoader);
-	}
-	
-	//handle type casting
-	if ((token.length == 0) && (delimiter == DelimiterOpenParen)){
-		// If we are a already a cast then we must be a block.
-		if ( isCast ) {
-			currentExpression = new Block(fClassLoader);
-		} else {
-			isCast = true;	// Possibly a cast
-		}
-		return this;
-	}	
-	if (isCast && (delimiter == DelimiterCloseParen || token.length != 0)){
-		Static aStatic = new Static(fClassLoader);
-		Cast aCast = new Cast(aStatic,fClassLoader);
-		currentExpression = aCast.push(token,delimiter);
-		return currentExpression;
-	}
-	
-	if ( token.length != 0 ) {
-		currentExpression = new Static(fClassLoader).push(token,delimiter);
-		return currentExpression;
-	}
-	
-	// If we get a { then we are part of an array argument
-	if (delimiter == DelimiterOpenElipse){
-		currentExpression = new ArrayArguments();
-		return currentExpression;
-	}
-	
-	// If our expression is closed and we receive a . we are either a message or a field.  We won't know this until
-	// the next token we receive, which will be either be delimited by a ( in which case it is a message, else it is a field
-	if (currentExpression != null && currentExpression.isComplete() && delimiter == DelimiterPeriod){
-		messageOrFieldStarted = true;
-	}
-		
-	return this;
-}
-
-public String toString(){
-	StringBuffer buffer = new StringBuffer();
-	buffer.append("Statement{"); //$NON-NLS-1$
-	if ( currentExpression != null ) {
-		buffer.append(currentExpression.toString());
-	}
-	buffer.append('}');
-	return buffer.toString();
-}
-/**
- * Is this statement a primitive.
- */
-public boolean isPrimitive() throws Exception {
-	if ( currentExpression != null ) {
-		return currentExpression.isPrimitive();
-	} else {
-		throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION));
-	}
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java
deleted file mode 100644
index 342894d..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: Static.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-import java.io.*;
-import java.lang.reflect.Array;
-import java.util.*;
-
-public class Static extends Expression {
-	protected static final HashMap sPrimitiveTypes;
-	
-	static {
-		sPrimitiveTypes = new HashMap(10);
-		sPrimitiveTypes.put("byte", Byte.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("char", Character.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("short", Short.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("int", Integer.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("long", Long.TYPE); //$NON-NLS-1$
-		sPrimitiveTypes.put("float", Float.TYPE);		 //$NON-NLS-1$
-		sPrimitiveTypes.put("double", Double.TYPE); //$NON-NLS-1$
-	}
-
-	protected ArrayList arrayDimensions;
-	protected List fArrayArguments;
-	protected StringWriter typeWriter = new StringWriter();
-	protected boolean completedWithPeriod = false;
-	protected char[] completionToken;
-	public Class type;
-	protected boolean isComplete;
-
-	public boolean isProcessingArrayDimension;
-/**
- * Create an unknown expression
- */
-public Static(ClassLoader aClassLoader){
-	fClassLoader = aClassLoader;
-}
-public Static(char[] aToken,char delimiter,ClassLoader aClassLoader){
-	
-	fClassLoader = aClassLoader;
-	try { 
-		typeWriter.write(aToken);
-	} catch ( IOException exc ) {};
-	checkForValidType();
-	if ( type == null && delimiter == DelimiterPeriod ){
-		typeWriter.write(DelimiterPeriod);
-	}
-		
-}
-public Static(char[] aToken,char delimiter,ClassLoader aClassLoader,boolean isArray){
-	this(aToken,delimiter,aClassLoader);
-	isProcessingArrayDimension = true;
-	arrayDimensions = new ArrayList(1);
-	arrayDimensions.add(new Statement(aClassLoader));
-}
-
-public boolean isComplete(){
-	return isComplete;
-}
-public boolean isArray(){
-	return arrayDimensions != null;
-}
-/**
- * See whether or not we have a valid type
- * This uses the class loader given to us if one specified.  The reason for this
- * is that Eclipse uses a special plugin class loader and when we are running
- * in a VM inside eclipse ( e.g. for IDEVM proxy stuff ) we must have
- * reference to the plugin that is using us otherwise we can't load its classes
- */
-protected void checkForValidType(){
-
-	type = (Class) sPrimitiveTypes.get(typeWriter.toString());
-	if (type == null)
-		try {
-			if ( fClassLoader == null ) {
-				type = Class.forName(typeWriter.toString());
-			} else {
-				type = fClassLoader.loadClass(typeWriter.toString());
-			}
-		} catch ( ClassNotFoundException exc ) {
-			try {
-				type = Class.forName("java.lang." + typeWriter.toString()); //$NON-NLS-1$
-				StringWriter writer = new StringWriter();
-				writer.write(type.getName());
-				typeWriter = writer;
-			} catch ( ClassNotFoundException exc1 ) {}
-		} catch ( NoClassDefFoundError exc ) {
-			// A mismatch in some way. Found a class, probably different case. One possibility
-			// is found a class, but this was really a package. So class and package with same name
-			// but different case caused this to occur. [46376].
-		}
-	
-}
-/**
- * If we have any static methods return the result of evaluating them against the type
- */
-public Object evaluate() {
-
-	// If we are an array but haven't created it do so
-	if ( isArray() ) {
-		if ( array == null ) {
-			evaluateArray();
-		}
-		return array;
-	} else {
-		if ( type != null ) { 
-			return type;
-		} else { 
-			// If we have no type then we are some kind incomplete expression that cannot be evaluted
-			throw new RuntimeException();
-		}
-	}
-}
-/**
- * The type of us is either simply the class, or if we are an array then we must create the java.lang.reflect.Array
- * using the reflective APIs
- */
-protected Object array;
-public Class getTypeClass() {
-
-	if ( isArray() ) {
-		if ( array == null ) {
-			// Do not evaluate the array and return its class.  Instead just work out the class by our type
-			// and number of dimensions
-			Object result = Array.newInstance(type,getNumberOfDimensions());
-			return result.getClass();
-		} else { 
-			return array.getClass();
-		}
-	} else { 
-		return type;
-	}
-}
-
-protected String getTypeClassName() {
-	return typeWriter.toString();
-}
-public Class getPrimitiveTypeClass(){
-	return type;
-}
-protected int[] getNumberOfDimensions(){
-	List dimensions = new ArrayList(1);
-	dimensions.add(new Integer(fArrayArguments.size()));
-	((MessageArgument)fArrayArguments.get(0)).contributeArgumentNumber(dimensions);
-	// The total number of arguments is a set of Integer objects in the dimensions list
-	// convert this to an int[]
-	int[] intDimensions = new int[dimensions.size()];
-	for (int i = 0; i < dimensions.size(); i++) {
-		intDimensions[i] = ((Integer)dimensions.get(i)).intValue();
-	}
-	return intDimensions;
-}
-/**
- * Evaluate the array
- */
-protected void evaluateArray(){
-	if ( fArrayArguments != null ) { 
-		// If the array isn't declared with a size but this is supplied with argument these will be in the fArrayArguments
-		// new int[] { 2 ,3 } will have the constructor arguments supplied as two message arguments with 
-		if ( array == null ) {
-			// The size of the array arguments is our array size, however for a multi arg array we need
-			// to find the size of any nested arrays within arguments themselves, e.g. 
-			// new int[][] { {2,3} , {3,4} } then we have two array arguments, each of which is a MessageArgument
-			// whose statement is an ArrayArguments that has two arguments, etc...
-			// To find the number of arguments we create a list that we add our number of arguments to, and then
-			// pass this all the way up the arguments chain using contributeArgumentNumber(List) so that each element
-			// can add to the list the number of arguments ( if any ) that they have.  
-			array = Array.newInstance(type,getNumberOfDimensions());
-			// Set the elements in the array to be the result of evaluating the constructor arguments
-			for (int i = 0; i < fArrayArguments.size(); i++) {
-				Expression expression = (Expression)fArrayArguments.get(i);
-				try {	
-					Object element = expression.evaluate();
-					Array.set(array,i,element);
-				} catch ( Exception exc ) {
-					// Any evaluation exceptions should be thrown back
-					throw new RuntimeException();
-				}
-			}
-		}
-	} else if ( arrayDimensions != null ) {
-		// To get the class of a reflective array we must actually first create it and then ask it for its class
-		// The array Dimensions are present if the array was explicitly declared with a size, e.g. new int[2][3]
-		// will have to arrayDimensions that represent the expressions 2 and 3 ( as NumberLiteral instances )
-		if ( array == null ) {
-			// Evaluate all of the arrayDimensions.  These should be integers
-			int[] dimensionSizes = new int[arrayDimensions.size()];
-			for (int i = 0; i < dimensionSizes.length; i++) {
-				try { 
-					Integer dimensionSize = (Integer) ((Expression)arrayDimensions.get(i)).evaluate();
-					dimensionSizes[i] = dimensionSize.intValue();
-				} catch ( Exception exc ) {
-					throw new RuntimeException();
-				}
-			}
-			// For a multi arg array we need to create using the static method on array that takes an int[] that represents
-			// the number of dimensions, e.g. for new String[2][3] we do Array.newInstance(String.class,new int[] { 2 , 3 };
-			array = Array.newInstance(type,dimensionSizes);
-		}
-	}
-}
-/**
- * If the token is a period then it could either be part of the type or else a static method call
- */
-public Expression push(char[] token , char delimiter ) {
-
-	// If we don't yet have a valid type then see if we now do
-	if (type == null){
-		try { 
-			typeWriter.write(token);
-		} catch ( IOException exc ) {};
-		checkForValidType();
-		// If we got a valid type and a period then remember it
-		if ( delimiter == DelimiterPeriod ) {
-			if (type != null) {
-				completedWithPeriod = true;
-				return this;
-			}
-		}		
-	}
-	
-	if ( arrayDimensions != null && isProcessingArrayDimension ) {
-		Expression lastArrayDimension = (Expression)arrayDimensions.get(arrayDimensions.size()-1);
-		lastArrayDimension.push(token,delimiter);
-		if ( delimiter == DelimiterCloseSquareBrace && isProcessingArrayDimension ) {
-			isProcessingArrayDimension = false;
-		}
-		return this;
-	}
-	
-	if ( delimiter == DelimiterOpenSquareBrace && !isProcessingArrayDimension ) {
-		if ( arrayDimensions == null ) arrayDimensions = new ArrayList(1);
-		Statement statement = new Statement(fClassLoader);
-		arrayDimensions.add(statement);
-		isProcessingArrayDimension = true;
-		return this;		
-	}
-	
-	// If we have a type and the delimiter is a ( then it must be a message beginning
-	if ( type != null ) {
-		if (delimiter == DelimiterOpenParen) {
-			isComplete = true;
-			return new Message( this , token , fClassLoader );
-		} else if (completedWithPeriod){
-			isComplete = true;
-			Field field = new Field(this,token,fClassLoader);
-			// If our token is a ), ' ' or , then the field is completed,
-			// otherwise leave it open so it will process the remaining tokens
-//			if (delimiter == DelimiterCloseParen || delimiter == DelimiterSpace || delimiter == DelimiterComma) {
-			if (delimiter == DelimiterCloseParen || delimiter == DelimiterComma) {
-				field.isComplete = true;
-			}
-			return field;
-		}
-	}
-			
-	// We are still looking for a type so append a .
-	if ( type == null ) {
-		typeWriter.write('.');
-	}
-	return this;
-}
-public String toString(){
-
-	StringWriter writer = new StringWriter();
-	writer.write("Static "); //$NON-NLS-1$
-	if ( type == null ) { 
-		writer.write("(Incomplete) {"); //$NON-NLS-1$
-	} else {
-		writer.write("(Complete) {"); //$NON-NLS-1$
-	}
-	writer.write(typeWriter.toString());
-	writer.write("}"); //$NON-NLS-1$
-	if ( arrayDimensions != null ) {
-		writer.write(" array dimensions="); //$NON-NLS-1$
-		writer.write(new Integer(arrayDimensions.size()).toString());
-	}
-	if ( fArrayArguments != null ) {	
-		writer.write(" array dimensions="); //$NON-NLS-1$
-		writer.write(new Integer(fArrayArguments.size()).toString());
-	}
-	return writer.toString();
-
-}
-
-public boolean isPrimitive() {
-	return getTypeClass().isPrimitive();
-}
-public void setArrayArguments(List arguments) {
-	fArrayArguments = arguments;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java
deleted file mode 100644
index 1b7c3a6..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: StringLiteral.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-
-
-
-public class StringLiteral extends Expression {
-	protected boolean isComplete;
-	public String value;
-	public StringBuffer valueBuffer = new StringBuffer();
-	protected boolean isEscaped = false;
-
-/**
- * constructor
- */
-public StringLiteral(){
-}
-	
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
-	return valueBuffer.toString();
-}
-
-public boolean isComplete(){
-	return isComplete;
-}
-/**
- * We must evaluate ourself and return the type of the result
- */
- 
-public Class getTypeClass() {
-	return String.class;
-}
-
-protected String getTypeClassName() {
-	return String.class.getName();
-}
-
-/**
- *This string might be broken into a few tokens
- *so we need a StringBuffer.
- * 
- * For now can only handle \" and \\ as escapes. 
- * Any other escapes will be left untouched. (i.e.
- * "\r" will be a backslash followed by "r", not a
- * return char.
- */
-public Expression push(char[] token , char delimiter){
-	
-	if (isEscaped) {
-		isEscaped = false;
-		if (token.length != 0) {
-			// Had an escape followed by stuff, so not a true esc for our current definition
-			valueBuffer.append(DelimiterEscape);
-		} else {
-			if (delimiter == DelimiterQuote || delimiter == DelimiterEscape)
-				valueBuffer.append(delimiter);	// It was a true escape.
-			else {
-				valueBuffer.append(DelimiterEscape);	// If wasn't a true escape
-				valueBuffer.append(delimiter);
-			}
-			return this;
-		}
-	}
-	
-	valueBuffer.append(token);
-	
-	if (delimiter == DelimiterQuote){		
-		isComplete =true;
-		return this;
-	}
-	
-	// If the delimiter is an escape character remember it so we can escape
-	// the next token, otherwise treat it as a literal
-	if (delimiter == DelimiterEscape ){
-		isEscaped = true;
-	} else {
-		valueBuffer.append(delimiter);
-	}
-	return this;
-}
-
-/**
- * Strings are not primitives.
- */
-public boolean isPrimitive() {
-	return false;
-}
-public String toString(){
-	StringBuffer buffer = new StringBuffer();
-	buffer.append("String(\""); //$NON-NLS-1$
-	if ( valueBuffer != null ) {
-		buffer.append(valueBuffer.toString());
-	}
-	buffer.append("\""); //$NON-NLS-1$
-	return buffer.toString();
-}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
deleted file mode 100644
index ed8cc3c..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties,v $
-# $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $
-#
-
-
-#
-# Properties for the Proxy Base VM Support
-#
-UnexpectedToken_EXC_                = IWAV0127E Unexpected Token "{0}".
-Statement.UnexpectedExecution_EXC_  = IWAV0128E Statement was executed unexpectedly.
-Statement.UnexpectedEvaluation_EXC_ = IWAV0129E Statements should not be evaluated.
-CharTooComplicated_EXC_             = IWAV0130E Input text not a char that can be evaluated. Too complicated. \"{0}"
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java
deleted file mode 100644
index 010b0bc..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.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: AbstractEnum.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Base abstract implementation of the enum.
- * @since 1.1.0
- */
-public abstract class AbstractEnum implements Enum {
-
-	/**
-	 * The name of the enumerator.
-	 */
-	private final String name;
-
-	/**
-	 * The <code>int</code> value of the enumerator.
-	 */
-	private final int value;
-
-	/**
-	 * Creates an initialized instance.
-	 * 
-	 * @param value
-	 *            the <code>int</code> value of the enumerator.
-	 * @param name
-	 *            the name of the enumerator.
-	 */
-	protected AbstractEnum(int value, String name) {
-		this.name = name;
-		this.value = value;
-	}
-
-	/**
-	 * Returns the name of the enumerator.
-	 * 
-	 * @return the name.
-	 */
-	public final String getName() {
-		return name;
-	}
-
-	/**
-	 * Returns the <code>int</code> value of the enumerator.
-	 * 
-	 * @return the value.
-	 */
-	public final int getValue() {
-		return value;
-	}
-
-	/**
-	 * Returns the name of the enumerator.
-	 * 
-	 * @return the name.
-	 */
-	public final String toString() {
-		return name;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java
deleted file mode 100644
index 7d2fb3e..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: Enum.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * TypeSafe enumerations for the IExpression processing.
- * 
- * @since 1.1.0
- */
-public interface Enum {
-
-	/**
-	 * Returns the name of the enumerator.
-	 * 
-	 * @return the name.
-	 */
-	String getName();
-
-	/**
-	 * Returns the <code>int</code> value of the enumerator.
-	 * 
-	 * @return the value.
-	 */
-	int getValue();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
deleted file mode 100644
index dcedc09..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
+++ /dev/null
@@ -1,3214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ExpressionProcesser.java,v $
- *  $Revision: 1.9 $  $Date: 2005/05/11 22:41:24 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-import java.lang.reflect.*;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringEvaluationException;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringParser;
- 
-/**
- * Expression processing. This does the actual expression processing with the live objects.
- * It is meant to be subclassed only to provide additional expression types. All of the
- * current expressions cannot be overridden. This is because the stack is very sensitive to 
- * call order.
- * 
- * @since 1.0.0
- */
-public class ExpressionProcesser {
-
-	/**
-	 * A variable reference for a field access.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class FieldAccessReference extends VariableReference {
-		
-		private final Field field;
-		private final Object receiver;
-
-		/**
-		 * Use this to construct a FieldAccessReference. This will do checks to make sure
-		 * it is valid so that exceptions won't be thrown later when actually dereferenced.
-		 * 
-		 * @param field
-		 * @param receiver
-		 * @return
-		 * @throws IllegalArgumentException
-		 * 
-		 * @since 1.1.0
-		 */
-		public static FieldAccessReference createFieldAccessReference(Field field, Object receiver) throws IllegalArgumentException {
-			// If static, then receiver is ignored.
-			if (!Modifier.isStatic(field.getModifiers())) {
-				if (!field.getDeclaringClass().isInstance(receiver))
-					throw new IllegalArgumentException("Field receiver does not match the type of the field: Field: "+field.getType()+" receiver: "+(receiver!=null ? receiver.getClass() : null));
-			}
-			field.setAccessible(true);	// Make it always accessible. Trust it. 
-			return new FieldAccessReference(field, receiver);
-		}
-		
-		protected FieldAccessReference(Field field, Object receiver) {
-			this.field = field;
-			this.receiver = receiver;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser.VariableReference#dereference()
-		 */
-		public Object dereference() {
-			try {
-				return field.get(receiver);
-			} catch (IllegalArgumentException e) {
-				// Shouldn't occur. Already tested for this.
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				// Shouldn't occur. Already tested for this.
-				e.printStackTrace();
-			}
-			return null;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser.VariableReference#set(java.lang.Object, java.lang.Class)
-		 */
-		public Object set(Object value, Class type) throws IllegalArgumentException, IllegalAccessException {
-			field.set(receiver, value);
-			return field.get(receiver);	// Just in case some conversion happened. Technically it is not the value set but the retrieved when in an assignment.
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		public String toString() {
-			return "FieldAccess{"+field.toString()+"} on "+receiver.toString();
-		}
-	}
-	
-	/**
-	 * A variable reference for an Array access. It will reference only the last indexed entry of the array.
-	 * For example if <code>x[3][4]</code> is the access, then what will be given to this reference will be
-	 * the array entry at x[3][4], not the x array itself.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class ArrayAccessReference extends VariableReference {
-		
-		
-		private final Object array;
-		private final int index;
-
-		/**
-		 * Use this to construct an array access reference. This will do checks to make sure
-		 * it is valid so that exceptions won't be thrown later when actually dereferenced.
-		 * 
-		 * @param array
-		 * @param index
-		 * @return
-		 * @throws IllegalArgumentException
-		 * 
-		 * @since 1.1.0
-		 */
-		public static ArrayAccessReference createArrayAccessReference(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
-			int len = Array.getLength(array);
-			if (index < 0 || len <= index)
-				throw new ArrayIndexOutOfBoundsException("Index: "+index+" size:"+len);
-			return new ArrayAccessReference(array, index);
-		}
-		/**
-		 * Construct the reference with the array and the index of the entry being referenced.
-		 * @param array
-		 * @param index
-		 * 
-		 * @since 1.1.0
-		 */
-		protected ArrayAccessReference(Object array, int index) {
-			this.array = array;
-			this.index = index;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.VariableReference#dereference()
-		 */
-		public Object dereference() {
-			return Array.get(array, index);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.VariableReference#set(java.lang.Object, java.lang.Class)
-		 */
-		public Object set(Object value, Class type) throws IllegalArgumentException {
-			Array.set(array, index, value);
-			return Array.get(array, index);	// In case there was some conversion applied. Technically it is not the value set but the retrieved when in an assignment.
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		public String toString() {
-			return "ArrayAccess["+index+"]: "+array.toString();
-		}
-	}
-	
-	/**
-	 * The expression result stack and the expression result type stack.
-	 * The type stack is used to be expected type of the corresponding
-	 * expression result. This is needed for converting to primitives
-	 * and for finding correct method call from the argument types. In
-	 * this case, it is not the true value, but the value expected, e.g.
-	 * <code>Object getObject()</code> returns something of type Object.
-	 * This needs to be maintained so that if it goes into another method
-	 * we don't accidently return a more specific method instead of the
-	 * one that takes Object as an argument. 
-	 * 
-	 * expressionStack has result of the expression.
-	 * expressionTypeStack has the computed type of the expression i.e.
-	 * the type that the expression returns, not the type of the value.
-	 * These can be different because the expression (e.g. method) may
-	 * return an Object, but the expression value will be some specific
-	 * subclass. So the expressionTypeStack would have a <code>java.lang.Object.class</code>
-	 * on it in that case.
-	 * Note: if the expressionStack has a <code>null</code> on it, then the type stack
-	 * may either have a specific type in it, or it may be <code>MethodHelper.NULL_TYPE</code>. It
-	 * would be this if it was explicitly pushed in and not as the
-	 * result of a computation. If the result of a computation, it would have the
-	 * true value.
-	 * Note: if the expressionStack has a <code>Void.type</code> on it, then that
-	 * means the previous expression had no result. This is an error if trying to
-	 * use the expression in another expression.
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.initParser.MethodHelper#NULL_TYPE
-	 */
-	private List expressionStack = new ArrayList(10);
-	private List expressionTypeStack = new ArrayList(10);
-	
-	/**
-	 * List of the expression proxies. The index into the list is the
-	 * same as the expression proxy id. 
-	 */
-	private ArrayList expressionProxies;	// It is array list because we want to call ensureCapacity and that is not available on List.
-	
-	/**
-	 * An error has occurred. At this point all subcommands will simply make sure they flush the input stream
-	 * correctly, but they do not process it.
-	 * 
-	 * @since 1.0.0
-	 */
-	private boolean errorOccurred = false;
-	private boolean novalueException = false;
-	
-	private Throwable exception = null;	// Was there another kind of exception that was caught.
-	
-	/**
-	 * Process all other exceptions then the NoExpressionValueException. This can be called from usage code so that if there was an error
-	 * in setting up for a call to the processer it can be logged.
-	 * 
-	 * @param e
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void processException(Throwable e) {
-		// Process all other exceptions.
-		novalueException = false;
-		while (e.getCause() != null)
-			e = e.getCause();
-		if (traceOn) {
-			System.out.println();
-			System.out.print("***** >>>\tException: ");
-			System.out.println(e);
-		}
-		throwException(e);	// Treat as a throw to let try/catches expressions handle it.
-	}
-	
-	/**
-	 * This is a syntax exception. This means data coming across is corrupted in
-	 * some way so no further processing should occur. 
-	 * @param e
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final void processSyntaxException(Throwable e) {
-		errorOccurred = true;
-		novalueException = false;
-		exception = e;		
-	}
-		
-	/**
-	 * Process a NoExpressionValueException. Don't wrapper these.
-	 * @param e
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final void processSyntaxException(NoExpressionValueException e) {
-		if (traceOn)
-			printTrace("Expression has no value", false);
-		try {
-			errorOccurred = true;
-			novalueException = true;
-			exception = e;
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Return whether there are any errors.
-	 * 
-	 * @return <code>true</code> if no errors.
-	 * 
-	 * @since 1.0.0
-	 */
-	public boolean noErrors() {
-		return !errorOccurred;
-	}
-	
-	/**
-	 * Return whether the error is a NoExpressionValueException or not.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isNoExpressionValue() {
-		return novalueException;
-	}
-	
-	/**
-	 * Return the throwable if a Throwable was caught.
-	 * 
-	 * @return The throwable, or <code>null</code> if not set.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Throwable getErrorThrowable() {
-		return exception;
-	}
-
-	/**
-	 * Push the expression value and its expected type.
-	 * @param o
-	 * @param type
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void pushExpressionValue(Object o, Class type) {
-		expressionStack.add(o);
-		expressionTypeStack.add(type);
-	}
-
-	/**
-	 * Pop just the expression value. It is imperitive that the expression type
-	 * is popped immediately following. Separated the methods so that we
-	 * don't need to create an array to return two values. This will dereference
-	 * any variable references.
-	 * 
-	 * @return The value.
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object popExpression() throws NoExpressionValueException {
-		return popExpression(true);
-	}
-	
-	/**
-	 * Pop just the expression value. It is imperitive that the expression type
-	 * is popped immediately following. Separated the methods so that we
-	 * don't need to create an array to return two values.
-	 * 
-	 * @param deReference If the top expression is a Reference, then dereference it.
-	 * @return The value.
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object popExpression(boolean deReference) throws NoExpressionValueException {
-		try {
-			Object result = expressionStack.remove(expressionStack.size()-1);
-			if (deReference && result instanceof VariableReference)
-				result = ((VariableReference) result).dereference();
-			return result;
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-
-	/**
-	 * Get the expression at <code>fromTop</code> down from the top. This is
-	 * need for when multi-operators happen and they are stored in reverse of 
-	 * what is needed. They would normally be stored left to right, with the
-	 * rightmost one on top. But they need to be processed left to right, so
-	 * to get the left most one requires digging down in the stack.
-	 * <p>
-	 * When done, <code>popExpressions(int count)</code> must be called to
-	 * clean them out since they were processed.
-	 * <p>
-	 * This will not dereference the expression. It is the job of the caller to do this. 
-	 *  
-	 * @param fromTop <code>1</code> is the top one, <code>2</code> is the next one down.
-	 * @return The entry from the top that was requested.
-	 * @throws NoExpressionValueException
-	 * 
-	 * @see IDEExpression#popExpressions(int)
-	 * @since 1.0.0
-	 */
-	protected final Object getExpression(int fromTop) throws NoExpressionValueException {
-		try {
-			return expressionStack.get(expressionStack.size()-fromTop);
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-	
-	/**
-	 * Remove the top <code>count</code> items. This will not cause dereferencing to occur. It
-	 * removes the corresponding type stack entries.
-	 * 
-	 * @param count
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void popExpressions(int count) throws NoExpressionValueException {
-		try {
-			int remove = expressionStack.size()-1;
-			while (count-- > 0) {
-				expressionStack.remove(remove);
-				expressionTypeStack.remove(remove--);
-			}
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-	
-	/**
-	 * Pop just the expression type. It is imperitive that the expression type
-	 * is popped immediately following popExpression. Separated the methods so that we
-	 * don't need to create an array to return two values.
-	 * <p>
-	 * If the allowVoid is false and type is void, then a NoExpressionValueException will be thrown.
-	 * This is for the case where the expression was trying to be used in a different
-	 * expression. This will be set to void only on expressions that return no value (only
-	 * method's do this for now).
-	 * 
-	 * @param allowVoid Allow void types if <code>true</code>
-	 * @return The type.
-	 * @throws NoExpressionValueException
-	 * @since 1.0.0
-	 */
-	protected final Class popExpressionType(boolean allowVoid) throws NoExpressionValueException {
-		try {
-			Class result = (Class) expressionTypeStack.remove(expressionTypeStack.size()-1);
-			if (!allowVoid && result == Void.TYPE)
-				throw new NoExpressionValueException("Expression was void.");
-			return result;
-				
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-
-	/**
-	 * Get the expression type at <code>fromTop</code> down from the top. This is
-	 * need for when multi-operators happen and they are stored in reverse of 
-	 * what is needed. They would normally be stored left to right, with the
-	 * rightmost one on top. But they need to be processed left to right, so
-	 * to get the left most one requires digging down in the stack.
-	 * <p>
-	 * When done, <code>popExpressionTypes(int count)</code> must be called to
-	 * clean them out since they were processed.
-
-	 * @param fromTop <code>1</code> is the top one, <code>2</code> is the next one down.
-	 * @param allowVoid Allow void types if <code>true</code>
-	 * @return The type from the top that was requested.
-	 * @throws ThrowableProxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @see IDEExpression#popExpressionTypes(int)
-	 * @since 1.0.0
-	 */
-	protected final Class getExpressionType(int fromTop, boolean allowVoid) throws NoExpressionValueException {
-		try {
-			Class result = (Class) expressionTypeStack.get(expressionTypeStack.size()-fromTop);
-			if (!allowVoid && result == Void.TYPE)
-				throw new NoExpressionValueException();
-			return result;
-		} catch (IndexOutOfBoundsException e) {
-			throw new NoExpressionValueException();
-		}
-	}
-	
-	/**
-	 * Flag indicating expression should be ignored and not processed.
-	 * This happens because of few cases, like conditional and, that
-	 * if one returns false, the rest of the expressions in that conditional and
-	 * expression should be ignored and not processed.
-	 * <p>
-	 * It is an Object that acts as an enum for the type of expression that initiated the ignore. 
-	 * If it is <code>null</code> then no one is ignoring. 
-	 * <p>
-	 * All of the pushTo...Proxy methods must test this for this to work correctly.
-	 * Each expression has some way of testing that their particular nesting of 
-	 * expressions is complete and they can turn off the ignore flag.
-	 * <p>
-	 * Only one type of ignore can exist at a time.
-	 */
-	protected Object ignoreExpression = null;	
-	
-	
-	private List saveStates;
-	
-	/**
-	 * Are we tracing or not.
-	 */
-	protected final boolean traceOn;
-	private final long thresholdTime;
-	private long startExpressionStepTime;
-	private long startExpressionTime;
-	private long lastExpressionEndTime;
-	
-	/**
-	 * Trace head of this expression. So that traces from different expressions can be distinquished.
-	 * It is simply an monotonically increasing counter. It is the header string for any trace output.
-	 */
-	protected final String traceHeader;
-	
-	private int indent = 0;	// Indented for certain block expressions.
-	
-	/*
-	 * Trace counter. It is incremented once for each expression and assigned to the traceId of the expression.
-	 */
-	private static int TRACE_COUNTER;
-	
-	/**
-	 * Create the Expression without tracing.
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public ExpressionProcesser() {
-		this(false, -1);
-	}
-	
-	/**
-	 * Create the expression, and set the tracing mode and threshold time. Use -1
-	 * for default time of 100ms.
-	 * @param traceOn
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProcesser(boolean traceOn, long threshold) {
-		this.traceOn = traceOn;
-		if (traceOn) {
-			traceHeader = "**"+(++TRACE_COUNTER)+':';
-			System.out.print(traceHeader);
-			System.out.println(" Start expression");
-			this.thresholdTime = threshold != -1 ? threshold : 100;
-			lastExpressionEndTime = startExpressionTime = System.currentTimeMillis();
-		} else {
-			traceHeader = null;
-			thresholdTime = 100;
-		}
-	}
-	
-	/**
-	 * Trace msg helper. Should only be called if traceOn is true. This method is only used to start a new trace message.
-	 * The caller is must call printTraceEnd at the end.
-	 *  
-	 * @param msg message to print
-	 * @param ignore are we ignoring the expression, or is it being processed (this just alters the trace output slightly).
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void printTrace(String msg, boolean ignore) {
-		startExpressionStepTime = System.currentTimeMillis();
-		long sinceLastExpression = startExpressionStepTime - lastExpressionEndTime;
-		System.out.print(traceHeader);
-		if (sinceLastExpression > 0) {
-			System.out.print('(');
-			if (sinceLastExpression > thresholdTime)
-				System.out.print("***");
-			System.out.print(sinceLastExpression);
-			System.out.print("ms)");
-		}
-		System.out.print('\t');
-		if (!ignore)
-			System.out.print("\t");
-		else
-			System.out.print("##\t");
-		
-		printIndent();
-		System.out.print(msg);
-	}
-	
-	/**
-	 * print the indent. It will not do a new line before nor after.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void printIndent() {
-		for(int i=indent; i>0; i--) {
-			System.out.print("  ");
-		}
-	}
-
-	protected void printTraceEnd() {
-		long stop = System.currentTimeMillis()-startExpressionStepTime;
-		if (stop > 0) {
-			System.out.print(" (");
-			if (stop > thresholdTime)
-				System.out.print("***");
-			System.out.print(stop);
-			System.out.print("ms)");
-		}
-		System.out.println();
-		lastExpressionEndTime = System.currentTimeMillis();
-	}
-	
-	/**
-	 * Do an indent (undent) according to indent flag.
-	 * @param indent <code>true</code> to increment indent, or otherwise decrement.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void indent(boolean indent) {
-		this.indent += (indent ? 1 : -1);
-		if (this.indent < 0)
-			this.indent = 0;
-	}
-	
-	/**
-	 * Print the object and type. It will not end with a newline char, so one will be needed afterwards.
-	 * 
-	 * @param o
-	 * @param t
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void printObjectAndType(Object o, Class t) {
-		System.out.print(' ');
-		System.out.print("Object-");
-		System.out.print(o);
-		System.out.print(" Type-");
-		System.out.print(t);
-		System.out.print(' ');
-	}
-	
-	/**
-	 * Close the exception processing
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void close() {
-		boolean firstClose = expressionStack != null;
-		if (firstClose && traceOn) {
-			printTrace("End expression", false);
-			long totalTime = System.currentTimeMillis()-startExpressionTime;
-			System.out.print(" Total expression evaluation time: ");
-			System.out.print(totalTime);
-			System.out.print("ms.");
-		}
-		try {
-			expressionStack = null;
-			expressionTypeStack = null;
-			expressionProxies = null;
-			exception = null;
-			catchThrowable = null;
-			saveStates = null;
-		} finally {
-			if (firstClose && traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Pull the value. The value will be placed into the array passed in.
-	 * It will be stored as value[0] = value value[1] = valuetype(Class).
-	 * 
-	 * @param value The value array to store the value and type into.
-	 * @throws NoExpressionValueException
-	 * @since 1.0.0
-	 */
-	public final void pullValue(Object[] value) throws NoExpressionValueException {
-		if (traceOn)
-			printTrace("Pull value:", false);
-		try {
-			value[0] = popExpression();
-			value[1] = popExpressionType(false);
-		} finally {
-			if (traceOn) {
-				printObjectAndType(value[0], (Class) value[1]);
-				printTraceEnd();
-			}
-		}
-		close();
-	}
-	
-	/**
-	 * Pull the value of the expression proxy, dereferencing it if necessary. This is for resolution only purposes at the
-	 * end of the expression being processed. Not meant for general access to the value of expression proxy. Use 
-	 * {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])} instead for general access to the value.
-	 * 
-	 * @param proxyid
-	 * @param value
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pullExpressionProxyValue(int proxyid, Object[] value) throws NoExpressionValueException {
-		getExpressionProxyValue(proxyid, value, true, true);
-	}
-	
-	/**
-	 * Get the expression proxy value. If the expression has not yet been evaluated it will
-	 * return false. If it has it will return true.
-	 * @param proxyid
-	 * @param value put value into value[0] and the type into value[1].
-	 * @return <code>true</code> if successful, or <code>false</code> if the expression proxy was never resolved or doesn't exist.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean getExpressionProxyValue(int proxyid, Object[] value) {
-		try {
-			return getExpressionProxyValue(proxyid, value, true, false);
-		} catch (NoExpressionValueException e) {
-			return false;
-		}
-	}
-	
-	/*
-	 * Internal method use to actually get the value, but to distinquish between pull and get of the public interface.
-	 * Get will process the errors as normal execution errors, while pull will throw the errors. finalTrace is when
-	 * this is the final call to return the values to the client. We will trace the results in that case.
-	 * Return true if successful.
-	 */
-	private boolean getExpressionProxyValue(int proxyid, Object[] value, boolean pull, boolean finalTrace) throws NoExpressionValueException {
-		// Note: This will throw the exceptions right away since this is called from outside to fill in the value and
-		// so we are holding such exceptions.
-		boolean doTrace = finalTrace && traceOn;
-		try {
-			if (expressionProxies != null && expressionProxies.size() > proxyid) {
-				InternalExpressionProxy proxy = (InternalExpressionProxy) expressionProxies.get(proxyid);
-				if (proxy != null && proxy.isSet()) {
-					value[0] = proxy.getValue();
-					if (value[0] instanceof VariableReference)
-						value[0] = ((VariableReference) value[0]).dereference(); // Here we want the final current value.
-					value[1] = proxy.getType();
-					if (doTrace)
-						if (value[1] != Void.TYPE) {
-							printTrace("Return Proxy #" + proxyid + " Resolved to", false);
-							printObjectAndType(value[0], (Class) value[1]);
-						} else
-							printTrace("Return Proxy #" + proxyid + " Resolved to void.", false);
-					return true;
-
-				} else {
-					if (doTrace)
-						printTrace("Return Proxy #" + proxyid + ": Not resolved", false);
-					NoExpressionValueException e = new NoExpressionValueException("Expression Proxy never set.");
-					if (pull)
-						throw e;
-					else
-						processSyntaxException(e);
-					return false;
-				}
-			} else {
-				if (doTrace)
-					printTrace("Return Proxy #" + proxyid + ": Never created.", false);
-				NoExpressionValueException e = new NoExpressionValueException("Expression proxy doesn't exist.");
-				if (pull)
-					throw e;
-				else
-					processSyntaxException(e);
-				return false;
-			}
-		} finally {
-			if (doTrace)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push the expression (just a value) onto the stack.
-	 * 
-	 * @param o
-	 * @param t
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushExpression(Object o, Class t) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn) {
-			printTrace("Push: ", ignore);
-			printObjectAndType(o, t);
-		}
-		try {
-			if (ignore)
-				return;
-			pushExpressionValue(o, t);
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Get the value of the expression proxy (from proxy id), and push the value onto the stack.
-	 *  
-	 * @param proxyid The proxy id of the ExpressionProxy to push as a value.
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushExpressionProxy(int proxyid) {
-		boolean ignore =(ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Push Expression Proxy #"+proxyid, ignore);
-		try {
-			if (ignore)
-				return;
-			if (expressionProxies != null && expressionProxies.size() > proxyid) {
-				InternalExpressionProxy proxy = (InternalExpressionProxy) expressionProxies.get(proxyid);
-				if (proxy != null && proxy.isSet()) {
-					if (traceOn)
-						printObjectAndType(proxy.getValue(), proxy.getType());
-					pushExpressionValue(proxy.getValue(), proxy.getType());	// Can push a VariableReference. This is ok. When used it will then deref with the current value.
-				} else
-					processSyntaxException(new NoExpressionValueException());
-			} else
-				processSyntaxException(new NoExpressionValueException());
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push a cast onto stack. The type passed in is either a String (with classname to cast to) or the
-	 * type to cast to.
-	 * @param type To cast to. If <code>String</code> then convert to type (using something like <code>Class.forName()</code>) or it is a Class
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushCast(Class type) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Cast to: "+type, ignore);
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				Object exp = popExpression();
-				Class exptype = popExpressionType(false);
-				
-				pushExpressionValue(castBean(type, exp, exptype), type);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-	
-	/**
-	 * Cast a bean into the return type. If the return type is not primitive, then
-	 * the bean is left alone, however it is checked to be an instance of
-	 * the return type. If the return type is primitive, then the
-	 * correct primitive wrapper is created from the bean (bean must be a number or character or boolean primitve so
-	 * that cast will work).
-	 * <p>
-	 * However if can't be cast for primitive or if not an instance of the
-	 * returntype for objects, a ClassCastException will be raised.
-	 * <p>
-	 * This is a helper method for expression processer to cast a bean. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * 
-	 * @param returnType
-	 * @param bean
-	 * @param beanType The type that bean is supposed to be (e.g. even though it is a Number, it actually represents a primitive).
-	 * @return The cast bean (either to the appropriate primitive wrapper type or bean)
-	 * 
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final Object castBean(Class returnType, Object bean, Class beanType) throws ClassCastException {
-		// Cast uses true value and true class of bean, not expected type (i.e. not beanType).
-		if (bean == null)
-			if (!returnType.isPrimitive())
-				return bean;	// bean is null, and return type is not primitive, so this is a valid cast.
-			else 
-				throwClassCast(returnType, bean);
-		else if (returnType.equals(bean.getClass()))
-			return bean;	// They are already the same.
-		else if (!returnType.isPrimitive()) {
-			if (!beanType.isPrimitive() && returnType.isInstance(bean))
-				return bean;
-			else
-				throwClassCast(returnType, bean);	// Either bean type was wrappering primitive or not instanceof returntype.
-		} else {
-			if (!beanType.isPrimitive())
-				throwClassCast(returnType, bean);	// bean type was not wrappering a primitive. Can't cast to primitive.
-			// It is return type of primitive. Now convert to correct primitive.
-			if (returnType == Boolean.TYPE)
-				if (bean instanceof Boolean)
-					return bean;
-				else
-					throwClassCast(returnType, bean);
-			else {
-				if (bean instanceof Number) {
-					if (returnType == Integer.TYPE)
-						if (bean instanceof Integer)
-							return bean;
-						else
-							return new Integer(((Number) bean).intValue());
-					else if (returnType == Byte.TYPE)
-						if (bean instanceof Byte)
-							return bean;
-						else
-							return new Byte(((Number) bean).byteValue());
-					else if (returnType == Character.TYPE)
-						if (bean instanceof Character)
-							return bean;
-						else
-							return new Character((char) ((Number) bean).intValue());
-					else if (returnType == Double.TYPE)
-						if (bean instanceof Double)
-							return bean;
-						else
-							return new Double(((Number) bean).doubleValue());
-					else if (returnType == Float.TYPE)
-						if (bean instanceof Float)
-							return bean;
-						else
-							return new Float(((Number) bean).floatValue());
-					else if (returnType == Long.TYPE)
-						if (bean instanceof Long)
-							return bean;
-						else
-							return new Long(((Number) bean).longValue());
-					else if (returnType == Short.TYPE)
-						if (bean instanceof Short)
-							return bean;
-						else
-							return new Short(((Number) bean).shortValue());	
-					else
-						throwClassCast(returnType, bean);
-				} else if (bean instanceof Character) {
-					if (returnType == Character.TYPE)
-						return bean;
-					else if (returnType == Integer.TYPE)
-						return new Integer(((Character) bean).charValue());
-					else if (returnType == Byte.TYPE)
-						return new Byte((byte) ((Character) bean).charValue());
-					else if (returnType == Double.TYPE)
-						return new Double(((Character) bean).charValue());
-					else if (returnType == Float.TYPE)
-						return new Float(((Character) bean).charValue());
-					else if (returnType == Long.TYPE)
-						return new Long(((Character) bean).charValue());
-					else if (returnType == Short.TYPE)
-						return new Short((short) ((Character) bean).charValue());	
-					else
-						throwClassCast(returnType, bean);
-				} else
-					throwClassCast(returnType, bean);
-			}
-			
-		}
-		return null;	// It should never get here;
-	}
-	
-	private void throwClassCast(Class returnType, Object bean) throws ClassCastException {
-		throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {bean != null ? bean.getClass().getName() : null, returnType.getName()})); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the primitive type that the wrapper bean represents (i.e. Boolean instance returns Boolean.TYPE) 
-	 * <p>
-	 * This is a helper method for expression processer to get the primitive type. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-
-	 * @param bean
-	 * @return the primitive type class of the given bean.
-	 * @throws IllegalArgumentException if bean is <code>null</code> or not of the type that can be converted to a primitive.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Class getPrimitiveType(Object bean) throws IllegalArgumentException {
-		if (bean instanceof Boolean)
-			return Boolean.TYPE;
-		else if (bean instanceof Integer)
-			return Integer.TYPE;
-		else if (bean instanceof Byte)
-			return Byte.TYPE;
-		else if (bean instanceof Character)
-			return Character.TYPE;
-		else if (bean instanceof Double)
-			return Double.TYPE;
-		else if (bean instanceof Float)
-			return Float.TYPE;
-		else if (bean instanceof Long)
-			return Long.TYPE;
-		else if (bean instanceof Short)
-			return Short.TYPE;
-		else
-			throw new IllegalArgumentException(bean != null ? bean.getClass().getName() : "null"); //$NON-NLS-1$
-	}
-	
-	private static final Object IFELSE_IGNORE = "IF/ELSE IGNORE";	// Flag for if/else in ingore
-	private int ifElseNesting = 0;	// Nesting of if/else expressions.
-	private int ifElseIgnoreNestCount = 0;	// When ignoring if/else expressions, ignore until this nest count.
-	private boolean ifElseSkipTruePart;
-
-	
-	/**
-	 * Push an if test expression.
-	 * @param hasElseClause
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushIfElse() {
-		try {
-			boolean ignore = true;
-			try {
-				if (errorOccurred)
-					return;
-				// Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
-				// we can get the expression grouping correct.
-				ifElseNesting++;	// We have the test.
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-			} finally {
-				if (traceOn)
-					printTrace("If test condition", ignore);
-			}
-					
-			try {
-				Object condition = popExpression();
-				Class type = popExpressionType(false);
-				if (type != Boolean.TYPE)
-					throwClassCast(Boolean.TYPE, condition);
-				if (traceOn) {
-					System.out.print(" Test Result="+condition);
-					printTraceEnd();
-					indent(true);
-					printTrace("Begin True Expression.", ignore);
-					printTraceEnd();
-					indent(true);
-				}				
-				if (((Boolean) condition).booleanValue()) {
-					// Condition was true.
-					// Do nothing. Let true condition be processed.
-				} else {
-					// Condition was false.
-					ifElseSkipTruePart = true;	// Tell the true condition should be ignored.
-					ignoreExpression = IFELSE_IGNORE;
-					ifElseIgnoreNestCount = ifElseNesting;
-				}
-				// We don't put anything back on the stack because the condition test is not ever returned.
-				// The appropriate true or false condition evaluation will be left on the stack.
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Push an if/else clause. It can be any clause of the if (true, or false clause).
-	 * @param clauseType
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushIfElse(InternalIfElseOperandType clauseType) {
-		try {
-			boolean ignore = true;
-			if (errorOccurred)
-				return;
-			// Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
-			// we can get the expression grouping correct.
-			switch (clauseType.getValue()) {
-			case InternalIfElseOperandType.TRUE_CLAUSE_VALUE:
-					if (traceOn) {
-						indent(false);
-						printTrace("Begin False Expression.", ignore);
-						printTraceEnd();
-						indent(true);
-					}
-					if (ifElseSkipTruePart && ignoreExpression == IFELSE_IGNORE && ifElseIgnoreNestCount == ifElseNesting) {
-						// stop ignoring, we've ignored the true condition of interest.
-						ignoreExpression = null;
-						return; // However, leave because since this condition was ignored.
-					}
-					break;
-				case InternalIfElseOperandType.ELSE_CLAUSE_VALUE:
-					if (traceOn) {
-						indent(false);
-						indent(false);
-						printTrace("End IF/ELSE Expression.", ignore);
-						printTraceEnd();
-					}					
-					int currentNesting = ifElseNesting--;
-					if (ignoreExpression == IFELSE_IGNORE && ifElseIgnoreNestCount == currentNesting) {
-						// stop ignoring, we've ignored the false condition of interest.
-						ignoreExpression = null;
-						return; // However, leave because since this condition was ignored.
-					}
-			}
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-
-					
-			try {
-				switch (clauseType.getValue()) {
-					case InternalIfElseOperandType.TRUE_CLAUSE_VALUE:
-						ifElseSkipTruePart = false;	// Tell the false condition should be ignored.
-						ignoreExpression = IFELSE_IGNORE;
-						ifElseIgnoreNestCount = ifElseNesting;
-						break;
-					case InternalIfElseOperandType.ELSE_CLAUSE_VALUE:
-						// There's nothing to do, if it was ignored due to true, we wouldn't of gotton here.
-						// If it wasn't ignored, then the result of the false expression is on the stack, which is what it should be.
-						break;
-				}
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Push the instanceof expression.  The type passed in is either a String (with classname to test against) or the
-	 * type to test against.
-	 * @param type To test against.
-	 * @since 1.0.0
-	 */
-	public final void pushInstanceof(Class type) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Instanceof type: "+type, ignore);
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				Object exp = popExpression();
-				Class exptype = popExpressionType(false);
-				pushExpressionValue(Boolean.valueOf(isInstance(type, exp, exptype)), Boolean.TYPE);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Test if instance of. It will make sure that primitive to non-primitive is not permitted.
-	 * This is a true instance of, which means null IS NOT AN instance of any type. This is
-	 * different then assignable from, in that case null can be assigned to any class type.
-	 * <p>
-	 * This is a helper method for expression processer to do isInstance. Since it is a helper method it doesn't
-	 * check nor process exceptions.
-
-	 * @param type
-	 * @param bean
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final boolean isInstance(Class type, Object bean, Class beanType) {
-		if (type.isPrimitive())
-			return beanType.isPrimitive() && type == beanType;	// Can't use isInstance because for a primitive type isInstance returns false.
-		else 
-			return type.isInstance(bean);
-	}
-	
-	/**
-	 * Push new instance from string.
-	 * @param initializationString
-	 * @param resultType expected result type. If it isn't of that type, a classcast will be processed. 
-	 * @param classloader classloader to use for finding classes, or <code>null</code> to use classloader of InitializationStringParser.class.
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushNewInstanceFromString(String initializationString, Class resultType, ClassLoader classloader) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("New instance from string: \""+initializationString+"\" Type="+resultType, ignore);
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				InitializationStringParser parser = InitializationStringParser.createParser(initializationString, classloader);
-				Object newValue = parser.evaluate();
-				newValue = castBean(resultType, newValue, parser.getExpectedType());
-				pushExpressionValue(newValue, resultType);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (InitializationStringEvaluationException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-
-	}
-
-	/**
-	 * Push prefix expression.
-	 * @param operator 
-	 * @since 1.0.0
-	 */
-	public final void pushPrefix(PrefixOperator operator) {
-		try {
-			if (ignoreExpression != null || errorOccurred) {
-				if (traceOn)
-					printTrace("Prefix: \'"+operator+"\'", true);
-				return;
-			}
-			
-			if (operator == PrefixOperator.PRE_PLUS)
-				return;	// Do nothing. "+" doesn't affect the result of the current top expression.
-	
-			if (traceOn)
-				printTrace("Prefix: \'"+operator+"\' ", false);
-	
-			try {
-				Object exp = popExpression();
-				Class exptype = popExpressionType(false);
-				if (!exptype.isPrimitive())
-					throwInvalidPrefix(operator, exp);
-				
-				int primTypeEnum = getEnumForPrimitive(exptype);
-				switch (operator.getValue()) {
-					case PrefixOperator.PRE_MINUS_VALUE:
-						switch (primTypeEnum) {
-							case BOOLEAN:
-								throwInvalidPrefix(operator, exp);						
-							case BYTE:
-								exp = new Integer(-((Number) exp).byteValue());
-								break;
-							case CHAR:
-								exp = new Integer(-((Character) exp).charValue());
-								break;
-							case DOUBLE:
-								exp = new Double(-((Number) exp).doubleValue());
-								break;
-							case FLOAT:
-								exp = new Float(-((Number) exp).floatValue());
-								break;
-							case INT:
-								exp = new Integer(-((Number) exp).intValue());
-								break;
-							case LONG:
-								exp = new Long(-((Number) exp).longValue());
-								break;
-							case SHORT:
-								exp = new Integer(-((Number) exp).shortValue());
-								break;
-						}
-						exptype = getPrimitiveType(exp);	// It can actually change the type.				
-						break;
-						
-					case PrefixOperator.PRE_COMPLEMENT_VALUE:
-						switch (primTypeEnum) {
-							case BOOLEAN:
-							case DOUBLE:
-							case FLOAT:
-								throwInvalidPrefix(operator, exp);						
-							case BYTE:
-								exp = new Integer(~((Number) exp).byteValue());
-								break;
-							case CHAR:
-								exp = new Integer(~((Character) exp).charValue());
-								break;
-							case INT:
-								exp = new Integer(~((Number) exp).intValue());
-								break;
-							case LONG:
-								exp = new Long(~((Number) exp).longValue());
-								break;
-							case SHORT:
-								exp = new Integer(~((Number) exp).shortValue());
-								break;
-						}
-						exptype = getPrimitiveType(exp);	// It can actually change the type.
-						break;
-					case PrefixOperator.PRE_NOT_VALUE:
-						switch (primTypeEnum) {
-							case BOOLEAN:
-								exp = !((Boolean) exp).booleanValue() ? Boolean.TRUE : Boolean.FALSE;
-								break;
-							case BYTE:
-							case CHAR:
-							case DOUBLE:
-							case FLOAT:
-							case INT:
-							case LONG:
-							case SHORT:
-								throwInvalidPrefix(operator, exp);						
-						}				
-						break;
-					}
-				
-				if (traceOn)
-					printObjectAndType(exp, exptype);
-				pushExpressionValue(exp, exptype);	// Push the result back on the stack.
-	
-			} catch (IllegalArgumentException e) {
-				processSyntaxException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			} 
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-	
-	/**
-	 * Assign the right expression to the left expression.
-	 * @since 1.1.0
-	 */
-	public final void pushAssignment() {
-		if (ignoreExpression != null || errorOccurred) {
-			if (traceOn) {
-				printTrace("Assignment", true);
-				printTraceEnd();
-			}
-			return;
-		}
-		
-		try {
-			// KLUDGE: The only reason leftValue/refType are outside of try/finally is because
-			// of tracing. pushExpression() does its own trace statements, so we need to end
-			// our trace before calling pushExpression. 
-			Object leftValue;
-			Class refType;
-			try {
-				if (traceOn)
-					printTrace("Assignment: ", false);				
-				// The order on the stack is right then left operand.
-				// First the right operand
-				Object value = popExpression();
-				Class type = popExpressionType(false);
-
-				// Next the left operand, should be a reference.
-				VariableReference left = (VariableReference) popExpression(false); // Don't dereference it.
-				refType = popExpressionType(false);
-
-				if (traceOn)
-					printObjectAndType(left, refType);
-
-				leftValue = left.set(value, type);
-			} finally {
-				if (traceOn)
-					printTraceEnd();
-			}
-			
-			// Now do assignment and return the value to the stack.
-			pushExpression(leftValue, refType);	// The type of the result is the type of the reference.
-
-		} catch (IllegalArgumentException e) {
-			processException(e);
-		} catch (NoExpressionValueException e) {
-			processSyntaxException(e);
-		} catch (IllegalAccessException e) {
-			processException(e);
-		} catch (RuntimeException e) {
-			processException(e);
-		}
-			
-	}
-	
-	/**
-	 * Assign the expression proxy to the top expression value.
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushAssignment(InternalExpressionProxy proxy) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		try {
-			if (traceOn) {
-				printTrace("Assign to Proxy #"+proxy.getProxyID(), ignore);
-			}
-			if (ignore)
-				return;
-			
-			try {
-				assignToExpressionProxyFromTopStackEntry(proxy);
-				if (traceOn)
-					printObjectAndType(proxy.getValue(), proxy.getType());
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-
-	}
-
-	/**
-	 * Assign the top stack entry to the new expression proxy and allocate it for callback later.
-	 * @param proxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void assignToExpressionProxyFromTopStackEntry(InternalExpressionProxy proxy) throws NoExpressionValueException {
-		Object value = getExpression(1);
-		Class type = getExpressionType(1, true);
-		if (value instanceof VariableReference)
-			value = ((VariableReference) value).dereference();	// Here we want the final current value.
-
-		proxy.setProxy(value, type);
-		allocateExpressionProxy(proxy);
-	}
-
-	/**
-	 * Allocate an expression proxy. This is used to make an expression proxy known to the processor. The expression proxy must
-	 * have been setProxy() at this point. This is used to assign from the top of the stack or to add from outside an evaluated proxy
-	 * to be used later by others.
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	public void allocateExpressionProxy(InternalExpressionProxy proxy) {
-		int minSize = proxy.getProxyID()+1;
-		if (expressionProxies == null)
-			expressionProxies = new ArrayList(minSize+10);	// Allow room to grow ten more.
-		else if (expressionProxies.size() < minSize)
-			expressionProxies.ensureCapacity(minSize+10);	// Allow room to grow ten more.
-		int fill = minSize-expressionProxies.size();	// Number of "null" fill entries needed. Probably shouldn't occur, but to be safe.
-		if (fill > 0) {
-			while (--fill > 0)
-				expressionProxies.add(null);
-			expressionProxies.add(proxy);
-		} else
-			expressionProxies.set(proxy.getProxyID(), proxy);	// Already large enough, replace entry.
-
-	}
-
-	/**
-	 * The primitive enums. 
-	 * NOTE: Their order must not changed. They are in order of permitted widening.
-	 * 
-	 */
-	protected static final int
-		BOOLEAN = 0,
-		BYTE = 1,
-		SHORT = 2,	
-		CHAR = 3,
-		INT = 4,
-		LONG = 5,
-		FLOAT = 6,
-		DOUBLE = 7;
-		
-		
-	
-	/**
-	 * Get the enum constant for the type of primitive passed in.
-	 * <p>
-	 * This is a helper method for expression processer to get the enum for the primitive type. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-
-	 * @param primitiveType
-	 * @return
-	 * @throws IllegalArgumentException if type is not a primitive.
-	 * 
-	 * @see ExpressionProcesser#BOOLEAN
-	 * @since 1.0.0
-	 */
-	protected final int getEnumForPrimitive(Class primitiveType) throws IllegalArgumentException {
-		if (primitiveType == Boolean.TYPE)
-			return BOOLEAN;
-		else if (primitiveType == Integer.TYPE)
-			return INT;
-		else if (primitiveType == Byte.TYPE)
-			return BYTE;
-		else if (primitiveType == Character.TYPE)
-			return CHAR;
-		else if (primitiveType == Double.TYPE)
-			return DOUBLE;
-		else if (primitiveType == Float.TYPE)
-			return FLOAT;
-		else if (primitiveType == Long.TYPE)
-			return LONG;
-		else if (primitiveType == Short.TYPE)
-			return SHORT;
-		else
-			throw new IllegalArgumentException(primitiveType != null ? primitiveType.getName() : "null");
-	}
-	
-	private void throwInvalidPrefix(PrefixOperator operator, Object exp) throws IllegalArgumentException {
-		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_"), new Object[] {exp != null ? exp.toString() : null, operator.toString()})); //$NON-NLS-1$
-	}		
-	
-	private static final Object INFIX_IGNORE = "INFIX IGNORE";	// Flag for infix in ingore
-	private int infixNesting = 0;	// Nesting of infix expressions.
-	private int infixIgnoreNestCount = 0;	// When ignoring infix expressions, ignore until this nest count.
-	/**
-	 * Push the infix expression onto the stack.
-	 * @param operator
-	 * @param operandType The operator type. Left, right, other.
-	 * @since 1.0.0
-	 */
-	public final void pushInfix(InfixOperator operator, InternalInfixOperandType operandType) {
-		try {
-			boolean ignore = true;
-			try {
-				if (errorOccurred) {
-					return;
-				}
-				// Slightly different here in that if an ignored occurred we still need to process at least part of it so that
-				// we can get the expression grouping correct.
-				if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-					infixNesting++;
-				else if (operandType == InternalInfixOperandType.INFIX_LAST_OPERAND) {
-					int currentNest = infixNesting--;
-					if (ignoreExpression == INFIX_IGNORE && currentNest == infixIgnoreNestCount) {
-						// We were ignoring, and it was this expression that was being ignore.
-						// We have received the last operand of the nested expression that was being ignored,
-						// so we can stop ignoring. But we still leave since the value of the expression is on the
-						// top of the stack.
-						ignoreExpression = null;
-						return;
-					}
-				}
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-			} finally {
-				if (traceOn)
-					printTrace("Infix: "+operator, ignore);
-			}
-			
-			try {
-				Object right = null;
-				Class rightType = null;
-				if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-					// We are not the left operand, so the stack has the right on the top, followed by the left.
-					right = popExpression();
-					rightType = popExpressionType(false);
-				} 
-				
-				Object value = popExpression();
-				Class valueType = popExpressionType(false);
-	
-				switch (operator.getValue()) {
-					case InfixOperator.IN_AND_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_AND);
-						testValidBitType(rightType, InfixOperator.IN_AND);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) & getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) & getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_CONDITIONAL_AND_VALUE:
-						// This is tricky.
-						// First if this is left type, then just continue.
-						// Else if this other or last, then need to make it the new value.
-						if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-							value = right;
-							valueType = rightType;
-						}
-							
-						//If the value is now false, we need to ignore the rest.
-						if (valueType != Boolean.TYPE)
-							throwInvalidInfix(operator, value);
-						if (!((Boolean) value).booleanValue() && operandType != InternalInfixOperandType.INFIX_LAST_OPERAND)
-							startInfixIgnore();	// Start ignoring because we know the value of the expression at this point. It is false.
-						break;
-					case InfixOperator.IN_CONDITIONAL_OR_VALUE:
-						// This is tricky.
-						// First if this is left type, then just continue.
-						// Else if this other or last, then need to make it the new value.
-						if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-							value = right;
-							valueType = rightType;
-						}
-						
-						//If the value is now true, we need to ignore the rest.
-						if (valueType != Boolean.TYPE)
-							throwInvalidInfix(operator, value);
-						if (((Boolean) value).booleanValue() && operandType != InternalInfixOperandType.INFIX_LAST_OPERAND)
-							startInfixIgnore(); // Start ignoring because we know the value of the expression at this point. It is true.
-						break;
-					case InfixOperator.IN_DIVIDE_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_DIVIDE);
-						testValidArithmeticType(rightType, InfixOperator.IN_DIVIDE);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) / getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) / getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) / getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) / getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						// We should never get extended operator for this, but we'll ignore the possibility.
-						if (valueType.isPrimitive() && rightType.isPrimitive()) {
-							// Primitives require more testing than just ==. boolean primitives 
-							if (valueType == Boolean.TYPE || rightType == Boolean.TYPE) {
-								// If either side is a boolean, then the other side needs to be boolean for it to even try to be true.
-								if (valueType != Boolean.TYPE || valueType != Boolean.TYPE)
-									value = Boolean.FALSE;
-								else
-									value = (((Boolean) value).booleanValue() == ((Boolean) right).booleanValue()) ? Boolean.TRUE : Boolean.FALSE;
-							} else {
-								// Now do number tests since not boolean primitive, only numbers are left
-								if (valueType == Double.TYPE || rightType == Double.TYPE) {
-									// If either side is double, compare as double.
-									value = (getDouble(value) == getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-									// If either side is float, compare as float.
-									value = (getFloat(value) == getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-									// If either side is long, the compare as long.
-									value = (getLong(value) == getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else {
-									// Else it will compare as int, even if both sides are short.
-									value = (getInt(value) == getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-								}
-							}
-						} else if (valueType.isPrimitive() || rightType.isPrimitive())
-							value = Boolean.FALSE;	// Can't be true if one side prim and the other isn't
-						else {
-							// Just do object ==
-							value = (value == right) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_GREATER_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_GREATER);
-						testValidArithmeticType(rightType, InfixOperator.IN_GREATER);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) > getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) > getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) > getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) > getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_GREATER_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_GREATER_EQUALS);
-						testValidArithmeticType(rightType, InfixOperator.IN_GREATER_EQUALS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) >= getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) >= getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) >= getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) >= getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_LEFT_SHIFT_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_LEFT_SHIFT);
-						testValidBitType(rightType, InfixOperator.IN_LEFT_SHIFT);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) << getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) << getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_LESS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_LESS);
-						testValidArithmeticType(rightType, InfixOperator.IN_LESS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) < getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) < getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) < getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) < getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_LESS_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_LESS_EQUALS);
-						testValidArithmeticType(rightType, InfixOperator.IN_LESS_EQUALS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, compare will be double.
-							value = (getDouble(value) <= getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, compare will be float.
-							value = (getFloat(value) <= getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, compare will be long.
-							value = (getLong(value) <= getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-						} else {
-							// Else compare will be int, even if both sides are short.
-							value = (getInt(value) <= getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_MINUS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_MINUS);
-						testValidArithmeticType(rightType, InfixOperator.IN_MINUS);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) - getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) - getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) - getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) - getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_NOT_EQUALS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						// We should never get extended operator for this, but we'll ignore the possibility.
-						if (valueType.isPrimitive() && rightType.isPrimitive()) {
-							// Primitives require more testing than just ==. boolean primitives 
-							if (valueType == Boolean.TYPE || rightType == Boolean.TYPE) {
-								// If either side is a boolean, then the other side needs to be boolean for it to even try to be true.
-								if (valueType != Boolean.TYPE || valueType != Boolean.TYPE)
-									value = Boolean.TRUE;
-								else
-									value = (((Boolean) value).booleanValue() != ((Boolean) right).booleanValue()) ? Boolean.TRUE : Boolean.FALSE;
-							} else {
-								// Now do number tests since not boolean primitive, only numbers are left
-								if (valueType == Double.TYPE || rightType == Double.TYPE) {
-									// If either side is double, compare as double.
-									value = (getDouble(value) != getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-									// If either side is float, compare as float.
-									value = (getFloat(value) != getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-									// If either side is long, the compare as long.
-									value = (getLong(value) != getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
-								} else {
-									// Else it will compare as int, even if both sides are short.
-									value = (getInt(value) != getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
-								}
-							}
-						} else if (valueType.isPrimitive() || rightType.isPrimitive())
-							value = Boolean.TRUE;	// Must be true if one side prim and the other isn't
-						else {
-							// Just do object !=
-							value = (value != right) ? Boolean.TRUE : Boolean.FALSE;
-						}
-						valueType = Boolean.TYPE;	// We know result will be a boolean.
-						break;
-					case InfixOperator.IN_OR_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_OR);
-						testValidBitType(rightType, InfixOperator.IN_OR);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) | getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) | getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_PLUS_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND) {
-							if (valueType == String.class) {
-								// Special. left argument is a string, so we want to store a string buffer instead
-								// since we know we will be appending to it. 
-								value = new StringBuffer((String) value);
-							}	
-							break;	// Do nothing with first operand
-						}
-						
-						testValidPlusType(valueType, rightType);
-						if (valueType == String.class || rightType == String.class) {
-							// Special we have a string on one side. Need to do it as strings instead.
-							// We are going to be tricky in that we will store a StringBuffer on the stack (if not last operand)
-							// but call it a string.
-							StringBuffer sb = null;
-							if (valueType == String.class) {
-								sb = (StringBuffer) value;	// We know that if the value (left) is string type, we've already converted it to buffer.
-							} else {
-								// The right is the one that introduces the string, so we change the value over to a string buffer.
-								sb = new StringBuffer(((String) right).length()+16);	// We can't put the value in yet, need to get left into it.
-								appendToBuffer(sb, value, valueType);	// Put the left value in now
-								value = sb;
-								valueType = String.class;	// Make it a string class
-							}
-							appendToBuffer(sb, right, rightType);
-							// Now if we are the last operand, we should get rid of the buffer and put a true string back in.
-							if (operandType == InternalInfixOperandType.INFIX_LAST_OPERAND)
-								value = sb.toString();
-						} else if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) + getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) + getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) + getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) + getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_REMAINDER_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_REMAINDER);
-						testValidArithmeticType(rightType, InfixOperator.IN_REMAINDER);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) % getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) % getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) % getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) % getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_RIGHT_SHIFT_SIGNED_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_RIGHT_SHIFT_SIGNED);
-						testValidBitType(rightType, InfixOperator.IN_RIGHT_SHIFT_SIGNED);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) >> getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) >> getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_RIGHT_SHIFT_UNSIGNED_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED);
-						testValidBitType(rightType, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) >>> getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) >>> getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_TIMES_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidArithmeticType(valueType, InfixOperator.IN_TIMES);
-						testValidArithmeticType(rightType, InfixOperator.IN_TIMES);
-						if (valueType == Double.TYPE || rightType == Double.TYPE) {
-							// If either side is double, the result will be double.
-							value = new Double(getDouble(value) * getDouble(right));
-							valueType = Double.TYPE;
-						} else if (valueType == Float.TYPE || rightType == Float.TYPE) {
-							// If either side is float, the result will be float.
-							value = new Float(getFloat(value) * getFloat(right));
-							valueType = Float.TYPE;
-						} else if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) * getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it will result in an int, even if both sides are short.
-							value = new Integer(getInt(value) * getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					case InfixOperator.IN_XOR_VALUE:
-						if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
-							break;	// Do nothing with first operand
-						
-						testValidBitType(valueType, InfixOperator.IN_XOR);
-						testValidBitType(rightType, InfixOperator.IN_XOR);
-						if (valueType == Long.TYPE || rightType == Long.TYPE) {
-							// If either side is long, the result will be long.
-							value = new Long(getLong(value) ^ getLong(right));
-							valueType = Long.TYPE;
-						} else {
-							// Else it is int. (even two shorts together produce an int).
-							value = new Integer(getInt(value) ^ getInt(right));
-							valueType = Integer.TYPE;
-						}
-						break;
-					} 
-				
-				if (traceOn)
-					printObjectAndType(value, valueType);
-				pushExpressionValue(value, valueType);	// Push the result back on the stack.
-	
-			} catch (IllegalArgumentException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Start ignoring rest of the current infix expression.
-	 * 
-	 * @since 1.1.0
-	 */
-	private void startInfixIgnore() {
-		ignoreExpression = INFIX_IGNORE;
-		infixIgnoreNestCount = infixNesting;	// Ignore until we get back to the current nesting.
-
-	}
-
-	/**
-	 * Get int value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the int value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * @param bean
-	 * @return the int value of the number/character
-	 * @throws ClassCastException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final int getInt(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).intValue() : ((Character) bean).charValue();
-	}
-	
-	/**
-	 * Get float value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * @param bean 
-	 * @return float value of the Number/character
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final float getFloat(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).floatValue() : ((Character) bean).charValue();
-	}
-
-	/**
-	 * Get double value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * 
-	 * @param bean
-	 * @return double value of the Number/Character.
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final double getDouble(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).doubleValue() : ((Character) bean).charValue();
-	}
-	
-	/**
-	 * Get long value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
-	 * Anything else will cause a class cast error.
-	 * <p>
-	 * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
-	 * check nor process the exception. It throws it. Callers must handle it as they see fit.
-	 * 
-	 * @param bean
-	 * @return
-	 * @throws ClassCastException
-	 * @since 1.0.0
-	 */
-	protected final long getLong(Object bean) throws ClassCastException {
-		return (bean instanceof Number) ? ((Number) bean).longValue() : ((Character) bean).charValue();
-	}
-	
-	private void throwInvalidInfix(InfixOperator operator, Object value) throws IllegalArgumentException {
-		throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfOperator_EXC_"), new Object[] {value != null ? value.toString() : null, operator.toString()})); //$NON-NLS-1$
-	}
-	
-	private void testValidBitType(Class type, InfixOperator operator) {
-		if (!type.isPrimitive() || type == Boolean.TYPE || type == Double.TYPE|| type == Float.TYPE)
-			throwInvalidInfix(operator, type);
-	}
-	
-	private void testValidArithmeticType(Class type, InfixOperator operator) {
-		if (!type.isPrimitive() || type == Boolean.TYPE)
-			throwInvalidInfix(operator, type);
-	}
-
-	private void testValidPlusType(Class left, Class right) {
-		// Plus is special in that string objects are also valid.
-		if (left == String.class || right == String.class)
-			return;	// As long as one side is string. Anything is valid.
-		// If neither is string, then standard arithmetic test.
-		testValidArithmeticType(left, InfixOperator.IN_PLUS);
-		testValidArithmeticType(right, InfixOperator.IN_PLUS);
-	}
-	
-	private void appendToBuffer(StringBuffer sb, Object value, Class valueType) {
-		if (value == null)
-			sb.append((Object)null);
-		else if (valueType == String.class)
-			sb.append((String) value);
-		else if (valueType.isPrimitive()) {
-			switch (getEnumForPrimitive(valueType)) {
-				case BOOLEAN:
-					sb.append(((Boolean) value).booleanValue());
-					break;
-				case BYTE:
-					sb.append(((Number) value).byteValue());
-					break;
-				case CHAR:
-					sb.append(((Character) value).charValue());
-					break;
-				case DOUBLE:
-					sb.append(((Number) value).doubleValue());
-					break;
-				case FLOAT:
-					sb.append(((Number) value).floatValue());
-					break;
-				case INT:
-					sb.append(((Number) value).intValue());
-					break;
-				case LONG:
-					sb.append(((Number) value).longValue());
-					break;
-				case SHORT:
-					sb.append(((Number) value).shortValue());
-					break;		
-			}
-		} else {
-			// Just an object.
-			sb.append(value);
-		}
-	}
-	
-	/**
-	 * Push the array access expression.
-	 * 
-	 * @param indexCount Number of dimensions being accessed
-	 * @since 1.0.0
-	 */
-	public final void pushArrayAccess(int indexCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		
-		if (traceOn) {
-			printTrace("Array Access["+indexCount+']', ignore);
-		}
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				// We need to pop off the args. The topmost will be the rightmost index, and the bottom most will be the array itself.
-				int[] arguments = new int[indexCount];
-				// Fill the arg array in reverse order.
-				for(int i=indexCount-1; i >= 0; i--) {
-					Object index = popExpression();
-					Class indexType = popExpressionType(false);
-					if (indexType.isPrimitive() && (indexType == Integer.TYPE || indexType == Short.TYPE || indexType == Character.TYPE || indexType == Byte.TYPE)) {
-						arguments[i] = getInt(index);
-					} else
-						throwClassCast(Integer.TYPE, index);
-				}
-				
-				Object array = popExpression();
-				Class arrayType = popExpressionType(false);
-				if (arrayType.isArray()) {
-					// First figure out how many dimensions are available. Stop when we hit indexcount because we won't be going further.
-					int dimcount = 0;
-					Class[] componentTypes = new Class[indexCount];	// 
-					Class componentType = arrayType;
-					while (dimcount < indexCount && componentType.isArray()) {
-						componentTypes[dimcount++] = componentType = componentType.getComponentType();
-					}
-					
-					if (dimcount < indexCount)
-						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_"), new Object[] {new Integer(indexCount), new Integer(dimcount)})); //$NON-NLS-1$
-					
-					// Now start accessing one index at a time, stop just before the last one. The last one will be turned into an ArrayAccessReference.
-					Object value = array;	// Final value, start with full array.
-					int pullCount = indexCount-1;
-					for(int i=0; i<pullCount; i++) {
-						value = Array.get(value, arguments[i]);
-					}
-					ArrayAccessReference arrayValue = ArrayAccessReference.createArrayAccessReference(value, arguments[pullCount]);
-					if (traceOn)
-						printObjectAndType(arrayValue, componentTypes[pullCount]);
-					pushExpressionValue(arrayValue, componentTypes[pullCount]);
-				}  else
-					 throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.NotAnArray_EXC_"), new Object[] {arrayType})); //$NON-NLS-1$
-	
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (RuntimeException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push the array creation request.
-	 * 
-	 * @param arrayType The type of the array
-	 * @param dimensionCount The number of dimensions being initialized. Zero if using an initializer.
-	 * @since 1.0.0
-	 */
-	public final void pushArrayCreation(Class arrayType, int dimensionCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		if (traceOn)
-			printTrace("Array Creation: "+arrayType.getName()+'['+dimensionCount+']', ignore);
-		
-		try {
-			if (ignore)
-				return;
-			
-			try {
-				if (dimensionCount == 0) {
-					// The top value is the array itself, from the array initializer.
-					// So we do nothing.
-				} else {
-					// Strip off dimensionCounts from the array type, e.g.
-					// ArrayType is int[][][]
-					// Dimensioncount is 2
-					// Then we need to strip two componenttypes off of the array type
-					// wind up with int[]
-					// This is necessary because Array.new will add those dimensions back
-					// on through the dimension count.
-					Class componentType = arrayType;
-					for(int i=0; i < dimensionCount && componentType != null; i++)
-						componentType = componentType.getComponentType();
-					if (componentType == null)
-						throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_"), new Object[] {arrayType, new Integer(dimensionCount)})); //$NON-NLS-1$
-					
-					// We need to pull in the dimension initializers. They are stacked in reverse order.
-					int[] dimInit = new int[dimensionCount];
-					for(int i=dimensionCount-1; i >= 0; i--) {
-						Object index = popExpression();
-						Class dimType = popExpressionType(false);
-						if (dimType.isPrimitive() && (dimType == Integer.TYPE || dimType == Short.TYPE || dimType == Character.TYPE || dimType == Byte.TYPE)) {
-							dimInit[i] = getInt(index);
-						} else
-							throwClassCast(Integer.TYPE, index);
-					}
-					
-					// Finally create the array.
-					Object array = Array.newInstance(componentType, dimInit);
-					pushExpressionValue(array, arrayType);
-				}
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the array initializer request.
-	 * 
-	 * @param arrayType The original type of the array to create.
-	 * @param stripCount the count of how many dimensions to strip to get the type needed for this initializer.
-	 * @param expressionCount
-	 * @since 1.0.0
-	 */
-	public final void pushArrayInitializer(Class arrayType, int stripCount, int expressionCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		
-		if (traceOn)
-			printTrace("Initialize Array: "+arrayType.getName()+'{'+expressionCount+'}', ignore);
-		
-		try {
-			if (ignore)
-				return;
-	
-			try {
-				if (!arrayType.isArray()) {
-					// It is not an array type.
-					throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {arrayType, "array"}));
-				} 
-				// Strip off the number of dimensions specified.
-				while(stripCount-->0) {
-					arrayType = arrayType.getComponentType();
-				}
-				Object[] dimValues = null;
-				if (expressionCount > 0) {
-					// We need to pull in the initializers. They are stacked in reverse order.
-					dimValues = new Object[expressionCount];
-					for (int i = expressionCount - 1; i >= 0; i--) {
-						Object dimValue = dimValues[i] = popExpression();
-						Class dimType = popExpressionType(false);
-						if (arrayType.isPrimitive()) {
-							if (dimValue == null || !dimType.isPrimitive())
-								throwClassCast(arrayType, dimType);
-							// A little trickier. Can assign short to an int, but can't assign long to an int. Widening is permitted.
-							if (arrayType != dimType) {
-								int compEnum = getEnumForPrimitive(arrayType);
-								int dimEnum = getEnumForPrimitive(dimType);
-								if (compEnum == BOOLEAN || dimEnum == BOOLEAN)
-									throwClassCast(arrayType, dimType);
-								int dimValueAsInt = getInt(dimValue);
-								switch (compEnum) {
-									case BYTE :
-										// Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
-										// Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
-										// however, at this point in time we no longer know this. So we will simply allow it.
-										if (dimEnum > INT || dimValueAsInt > Byte.MAX_VALUE || dimValueAsInt < Byte.MIN_VALUE)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Byte((byte)dimValueAsInt);
-										break;
-									case SHORT :								
-										// Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
-										// Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
-										// however, at this point in time we no longer know this. So we will simply allow it.
-										if (dimEnum > INT || dimValueAsInt > Short.MAX_VALUE || dimValueAsInt < Short.MIN_VALUE)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Short((short)dimValueAsInt);
-										break;
-									case CHAR :
-										// Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
-										// Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
-										// however, at this point in time we no longer know this. So we will simply allow it.
-										if (dimEnum > INT || dimValueAsInt > Character.MAX_VALUE || dimValueAsInt < Character.MIN_VALUE)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Character((char)dimValueAsInt);
-										break;
-									case INT :
-										// Can accept byte, short, char, or int. Can't accept long, double, float at all.
-										if (dimEnum > INT)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Integer(dimValueAsInt);
-										break;
-									case LONG :
-										// Can accept byte, short, char, int, or long. Can't accept double, float at all.
-										if (dimEnum > LONG)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Long(getLong(dimValue));
-										break;
-									case FLOAT :
-										// Can accept byte, short, char, int, long, or float. Can't accept double at all.
-										if (dimEnum > FLOAT)
-											throwClassCast(arrayType, dimType);
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Float(getFloat(dimValue));
-										break;
-									case DOUBLE :
-										// But need to be changed to appropriate type for the array.set to work.									
-										dimValues[i] = new Double(getDouble(dimValue));
-										break;
-	
-								}
-							}
-							// Compatible, so ok.
-						} else if (dimType != MethodHelper.NULL_TYPE && !arrayType.isAssignableFrom(dimType)) {
-							// If it is NULL_TYPE, then this is a pushed null. This is always assignable to a non-primitive.
-							// So we don't enter here in that case. However, a null that was returned from some expression
-							// won't have a NULL_TYPE, it will instead have the expected return type. That must be used
-							// in the assignment instead. That is because in java it uses the expected type to determine
-							// compatibility, not the actual type.
-							throwClassCast(arrayType, dimType);
-						}
-					}
-					
-				}
-				
-				// Now we finally create the array.
-				Object array = Array.newInstance(arrayType, new int[] {expressionCount});
-				for (int i = 0; i < expressionCount; i++) {
-					Array.set(array, i, dimValues[i]);
-				}
-				
-				pushExpressionValue(array, array.getClass());	// Adjust to true array type, not the incoming type (which is one dimension too small).
-	
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the class instance creation request.
-	 * 
-	 * @param type The type to create an instance of
-	 * @param argumentCount The number of arguments (which are stored on the stack).	 * @throws NoExpressionValueException
-	 * @since 1.0.0
-	 */
-	public final void pushClassInstanceCreation(Class type, int argumentCount) {
-		boolean ignore = (ignoreExpression != null || errorOccurred);
-		
-		if (traceOn)
-			printTrace("Create Class: "+type+" (", ignore);
-		try {
-			if (ignore)
-				return;
-						
-			try {
-				// We need to pull in the arguments. They are stacked in reverse order.
-				Object value = null;	// The new instance.
-				if (argumentCount > 0) {
-					Object[]  args = new Object[argumentCount];
-					Class[] argTypes = new Class[argumentCount];
-					for (int i = argumentCount - 1; i >= 0; i--) {
-						args[i] = popExpression();
-						argTypes[i] = popExpressionType(false);
-					}
-					
-					// Now we need to find the appropriate constructor.
-					Constructor ctor;
-					ctor = MethodHelper.findCompatibleConstructor(type, argTypes);
-					if (traceOn) {
-						System.out.print(ctor);
-						System.out.print(')');
-					}
-					value = ctor.newInstance(args);
-				} else {
-					// No args, just do default ctor.
-					if (traceOn) {
-						System.out.print("Default ctor)");
-					}
-					value = type.newInstance();
-				}
-				
-				pushExpressionValue(value, type);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (InstantiationException e) {
-				processException(e);
-			} catch (IllegalAccessException e) {
-				processException(e);
-			} catch (InvocationTargetException e) {
-				processException(e);
-			} catch (NoSuchMethodException e) {
-				processException(e);
-			} catch (AmbiguousMethodException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the field access expression.
-	 * @param field String for fieldname, or a java.lang.reflect.Field.
-	 * @param fieldIsString <code>true</code> if field is a string name, and not a java.lang.reflect.Field.
-	 * @param hasReceiver
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushFieldAccess(Object field, boolean fieldIsString, boolean hasReceiver) {
-		try {
-			if (ignoreExpression != null || errorOccurred) {
-				if (traceOn)
-					printTrace("Field Access", true);
-				return;
-			}
-		
-			if (traceOn)
-				printTrace("Field Access: ", false);
-			try {
-				// Get the receiver off of the stack.
-				Object receiver = null;
-				Class receiverType = null;
-				if (hasReceiver) {
-					receiver = popExpression();
-					receiverType = popExpressionType(false);
-				}
-				
-				// Find the field.
-				Field reflectField = fieldIsString ? receiverType.getField((String) field) : (Field) field;
-				// Access the field.
-				Object value = FieldAccessReference.createFieldAccessReference(reflectField, receiver);
-				Class valueType = reflectField.getType();
-				if (traceOn) {
-					System.out.print("Field: ");
-					System.out.print(reflectField);
-					System.out.print(">");
-					printObjectAndType(value, valueType);
-				}
-					
-				pushExpressionValue(value, valueType);
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (NoSuchFieldException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	/**
-	 * Push the method invocation expression.
-	 * @param method
-	 * @param methodIsString <code>true</code> if method is a string (so string name) or else it is a java.lang.reflect.Method.
-	 * @param hasReceiver
-	 * @param argCount
-	 * @since 1.0.0
-	 */
-	public final void pushMethodInvocation(Object method, boolean methodIsString, boolean hasReceiver, int argCount) {
-		try {
-			if (ignoreExpression != null || errorOccurred) {
-				if (traceOn)
-					printTrace("Invoke", true);
-				return;
-			}
-			
-			if (traceOn)
-				printTrace("Invoke: ", false);
-			
-			try {
-				// We need to pull in the arguments. They are stacked in reverse order.
-				Object[]  args = new Object[argCount];
-				Class[] argTypes = new Class[argCount];
-				for (int i = argCount - 1; i >= 0; i--) {
-					args[i] = popExpression();
-					argTypes[i] = popExpressionType(false);
-				}
-				
-				// Now get receiver
-				Object receiver = null;
-				Class receiverType = null;
-				if (hasReceiver) {
-					receiver = popExpression();
-					receiverType = popExpressionType(false);
-				}
-				
-				// Now we need to find the appropriate method. If it is a string then there must be a receiver, otherwise no way to know.
-				Method reflectMethod;
-				if (methodIsString) {
-					reflectMethod = MethodHelper.findCompatibleMethod(receiverType, (String) method, argTypes);
-				} else
-					reflectMethod = (Method) method;
-				
-				if (traceOn && reflectMethod != null) {
-					System.out.print("Method: ");
-					System.out.print(reflectMethod);					
-				}
-				
-				Object value = reflectMethod.invoke(receiver, args);
-				
-				if (traceOn) {
-					System.out.print(" returns: ");
-					printObjectAndType(value, reflectMethod.getReturnType());
-				}
-				pushExpressionValue(value, reflectMethod.getReturnType());
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (IllegalAccessException e) {
-				processException(e);
-			} catch (InvocationTargetException e) {
-				processException(e);
-			} catch (NoSuchMethodException e) {
-				processException(e);
-			} catch (AmbiguousMethodException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-			
-	}
-
-	private static final Object CONDITIONAL_IGNORE = "CONDITIONAL IGNORE";	// Flag for conditional in ingore
-	private int conditionalNesting = 0;	// Nesting of conditional expressions.
-	private int conditionalIgnoreNestCount = 0;	// When ignoring conditional expressions, ignore until this nest count.
-	private boolean skipTruePart;
-
-	/**
-	 * Push a conditional expression. It can be any clause of the conditional (test, true, or false clause).
-	 * @param expressionType
-	 * 
-	 * @since 1.0.0
-	 */
-	public final void pushConditional(InternalConditionalOperandType expressionType) {
-		try {
-			boolean ignore = true;
-			try {
-				if (errorOccurred)
-					return;
-				// Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
-				// we can get the expression grouping correct.
-				switch (expressionType.getValue()) {
-					case InternalConditionalOperandType.CONDITIONAL_TEST_VALUE:
-						conditionalNesting++;
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_TRUE_VALUE:
-						if (skipTruePart && ignoreExpression == CONDITIONAL_IGNORE && conditionalIgnoreNestCount == conditionalNesting) {
-							// stop ignoring, we've ignored the true condition of interest.
-							ignoreExpression = null;
-							return; // However, leave because since this condition was ignored.
-						}
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_FALSE_VALUE:
-						int currentNesting = conditionalNesting--;
-						if (ignoreExpression == CONDITIONAL_IGNORE && conditionalIgnoreNestCount == currentNesting) {
-							// stop ignoring, we've ignored the false condition of interest.
-							ignoreExpression = null;
-							return; // However, leave because since this condition was ignored.
-						}
-				}
-	
-				if (ignoreExpression != null)
-					return;
-				ignore = false;
-			} finally {
-				if (traceOn)
-					printTrace("Conditional "+expressionType, ignore);
-			}
-					
-			try {
-				switch (expressionType.getValue()) {
-					case InternalConditionalOperandType.CONDITIONAL_TEST_VALUE:
-						Object condition = popExpression();
-						Class type = popExpressionType(false);
-						if (type != Boolean.TYPE)
-							throwClassCast(Boolean.TYPE, condition);
-						if (((Boolean) condition).booleanValue()) {
-							// Condition was true.
-							// Do nothing. Let true condition be processed.
-						} else {
-							// Condition was false.
-							skipTruePart = true;	// Tell the true condition should be ignored.
-							ignoreExpression = CONDITIONAL_IGNORE;
-							conditionalIgnoreNestCount = conditionalNesting;
-						}
-						// We don't put anything back on the stack because the condition test is not ever returned.
-						// The appropriate true or false condition evaluation will be left on the stack.
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_TRUE_VALUE:
-						skipTruePart = false;	// Tell the false condition should be ignored.
-						ignoreExpression = CONDITIONAL_IGNORE;
-						conditionalIgnoreNestCount = conditionalNesting;
-						break;
-					case InternalConditionalOperandType.CONDITIONAL_FALSE_VALUE:
-						// There's nothing to do, if it was ignored due to true, we wouldn't of gotton here.
-						// If it wasn't ignored, then the result of the false expression is on the stack, which is what it should be.
-						break;
-				}
-			} catch (RuntimeException e) {
-				processException(e);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	private static final Object BLOCK_IGNORE = "BLOCK IGNORE";
-	private int[] blocks;	// Stack of block numbers currently evaluating.
-	private int topBlock = -1;	// Top block index.
-	private int breakBlock = -1;	// Block number we are breaking to.
-	
-	/**
-	 * Push a begin block.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushBlockBegin(int blockNumber) {
-		if (traceOn) {
-			printTrace("Begin Block #"+blockNumber, errorOccurred);
-			indent(true);
-		}
-		try {
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (blocks == null)
-				blocks = new int[10];
-			if (++topBlock >= blocks.length) {
-				int[] newList = new int[blocks.length*2];
-				System.arraycopy(blocks, 0, newList, 0, blocks.length);
-				blocks = newList;
-			}
-			blocks[topBlock] = blockNumber;
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	/**
-	 * Push a block end. The current block must be the given number, or it is an error.
-	 * 
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushBlockEnd(int blockNumber) {
-		try {
-			if (traceOn) {
-				indent(false);
-				printTrace("End Block #"+blockNumber, errorOccurred);
-			}
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (blocks == null || topBlock < 0 || blocks[topBlock] != blockNumber) {
-				processSyntaxException(new IllegalStateException("End Blocks received out of order."));
-			} else {
-				topBlock--;
-				if (ignoreExpression == BLOCK_IGNORE && blockNumber == breakBlock) {
-					ignoreExpression = null;
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Skip all following until we hit the requested block number.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushBlockBreak(int blockNumber) {
-		try {
-			if (traceOn)
-				printTrace("Break Block #"+blockNumber, errorOccurred);
-			if (errorOccurred)
-				return;
-			if (ignoreExpression == null) {
-				ignoreExpression = BLOCK_IGNORE;	// Start ignoring expressions until we hit the block number end block.
-				breakBlock = blockNumber;
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-	
-	private static final Object TRY_THROW_IGNORE = "TRY THROW IGNORE";
-	private static final Object TRY_FINAL_IGNORE = "TRY FINAL IGNORE";
-	private int[] trys;	// Stack of try numbers currently evaluating.
-	// Stack of trys in catch clause (i.e. starting executing a catch/final clause for the try). Corresponds with try from same index in trys. Contains the throwable for the catch.
-	// This is used to know we are executing a catch (entry not null) and for the rethrow short-hand to rethrow the same exception within the catch.
-	private Throwable[] trysInCatch;	
-	private int topTry = -1;	// Top try index.
-	private int breakTry = -1;	// Try number we are breaking to.
-	private Throwable catchThrowable;	// The throwable to check catches against.
-	
-	/**
-	 * Push a try statement.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryBegin(int tryNumber) {
-		try {
-			if (traceOn) {
-				printTrace("Begin Try #"+tryNumber, errorOccurred);
-				indent(true);
-			}
-	
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null) {
-				trys = new int[10];
-				trysInCatch = new Throwable[10];
-			}
-			if (++topTry >= trys.length) {
-				int[] newList = new int[trys.length*2];
-				System.arraycopy(trys, 0, newList, 0, trys.length);
-				trys = newList;
-				Throwable[] newCatches = new Throwable[trys.length];
-				System.arraycopy(trysInCatch, 0, newCatches, 0, trysInCatch.length);
-				trysInCatch = newCatches;
-			}
-			trys[topTry] = tryNumber;
-			trysInCatch[topTry] = null;
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-
-	/**
-	 * Throw the top stack entry. It must be an exception.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushThrowException() {
-		try {
-			boolean ignore = (ignoreExpression != null || errorOccurred);
-			if (traceOn)
-				printTrace("Throw exception: ", ignore);
-			
-			if (ignore)
-				return;
-	
-			try {
-				Object t = popExpression();
-				popExpressionType(false);
-				if (traceOn) {
-					System.out.print(t);
-				}
-				throwException((Throwable) t);
-			} catch (NoExpressionValueException e) {
-				processSyntaxException(e);
-			} catch (ClassCastException e) {
-				processException(e);
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Throw this exception (means throw through the expression being processed, not throw for this thread).
-	 * @param exception
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final void throwException(Throwable exception) {
-		if (topTry == -1) {
-			// There are no tries, so treat this as a syntax error.
-			processSyntaxException(exception);
-		} else if (trysInCatch[topTry] == null) {
-			// We are not in a catch clause of the top try. So do a throw ignore for toptry.
-			ignoreExpression = TRY_THROW_IGNORE;
-			breakTry = trys[topTry];
-			catchThrowable = exception;
-		} else {
-			// We are in a catch of the top try. So do a throw to finally instead.
-			ignoreExpression = TRY_FINAL_IGNORE;
-			trysInCatch[topTry] = FINAL_CATCH;
-			breakTry = trys[topTry];
-			catchThrowable = exception;
-		}
-	}
-	
-	/**
-	 * Push a catch clause
-	 * @param tryNumber
-	 * @param exceptionType
-	 * @param expressionProxy
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryCatchClause(int tryNumber, Class exceptionType, InternalExpressionProxy expressionProxy) {
-		try {
-			if (traceOn) {
-				indent(false);
-				if (expressionProxy == null)
-					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+')', errorOccurred);
-				else
-					printTrace("Catch Try #"+tryNumber+" ("+exceptionType+") Return exception in proxy #"+expressionProxy.getProxyID(), errorOccurred);
-				indent(true);
-			}
-			
-			if (errorOccurred)
-				return;
-			
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Catch received out of order."));
-			} else {
-				if (ignoreExpression == null) {
-					// Normal flow, no throw in progress, so just ignore now until the finally or end try reached.
-					ignoreExpression = TRY_FINAL_IGNORE;
-					breakTry = tryNumber;
-				} else if (ignoreExpression == TRY_THROW_IGNORE && tryNumber == breakTry) {
-					// We are here due to a throw occuring in this try block, see if for us, and if it is, stop ignoring.
-					// Else just continue ignoring.
-					if (exceptionType.isInstance(catchThrowable)) {
-						// For us, so just turn everything back on, except mark that we are in the catch phase.
-						ignoreExpression = null;
-						trysInCatch[topTry] = catchThrowable; // This is so that we know if we throw again that we should not catch anything.
-						breakTry = -1;
-						if (expressionProxy != null) {
-							expressionProxy.setProxy(catchThrowable, catchThrowable.getClass());
-							allocateExpressionProxy(expressionProxy);
-						}
-						if (traceOn) {
-							System.out.print(" Caught: ");
-							System.out.print(catchThrowable);
-						}
-						catchThrowable = null;
-					}
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	// This is used only so that finally clause can indicate it was executing so that end expression knows this.
-	private static final Throwable FINAL_CATCH = new RuntimeException();
-
-	/**
-	 * Push the try finally clause.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryFinallyClause(int tryNumber) {
-		try {
-			if (traceOn) {
-				indent(false);
-				printTrace("Finally Try #"+tryNumber, errorOccurred);
-				indent(true);
-			}
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Finally received out of order."));
-			} else {
-				if (tryNumber == breakTry && (ignoreExpression == TRY_THROW_IGNORE || ignoreExpression == TRY_FINAL_IGNORE)) {
-					// We are here due to a throw occuring in this try block or a catch was reached (in which case all intervening catch's were ignored).
-					// Now do a normal execution. If we are here due to a throw that wasn't cleared (either no catch or another throw occured within the catch)
-					// then we leave it uncleared so that try/end may rethrow it.
-					ignoreExpression = null;
-					trysInCatch[topTry] = FINAL_CATCH; // We are in the finally clause of a exception being thrown within this try.
-					breakTry = -1;
-					if (traceOn)
-						System.out.print(" Executing finally.");
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Rethrow the caught exception. This is a shortcut for:
-	 * } catch (Exception e) {
-	 *   ... do stuff ...
-	 *   throw e;
-	 * }
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushTryRethrow(int tryNumber) {
-		if (traceOn)
-			printTrace("Rethrow Try #"+tryNumber, errorOccurred  || ignoreExpression != null);
-		
-		try {
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because we need to make sure this is not called out of order.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Rethrow received out of order."));
-			} else if (ignoreExpression == null) {
-				if (trysInCatch[topTry] == null || trysInCatch[topTry] == FINAL_CATCH)
-					processSyntaxException(new IllegalStateException("Retry received outside of an executing catch clause"));
-				else {
-					throwException(trysInCatch[topTry]);
-				}
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}		
-	}
-	
-	public final void pushTryEnd(int tryNumber) {
-		if (traceOn) {
-			indent(false);
-			printTrace("End Try #"+tryNumber, errorOccurred);
-		}
-		try {
-			if (errorOccurred)
-				return;
-			// We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
-			if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
-				processSyntaxException(new IllegalStateException("Try/end received out of order."));
-			} else {
-				boolean inCatch = trysInCatch[topTry] != null;
-				trysInCatch[topTry] = null;
-				topTry--;
-				if (inCatch || (tryNumber == breakTry && (ignoreExpression == TRY_THROW_IGNORE || ignoreExpression == TRY_FINAL_IGNORE))) {
-					// We are here due to a throw or normal flow through a catch. Either way if there is a throwable still pending, we rethrow.
-					ignoreExpression = null;
-					breakTry = -1;
-					if (catchThrowable != null)
-						throwException(catchThrowable);
-				} 
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}			
-	}
-	
-	/**
-	 * Class used to save the state at time of mark. It will
-	 * be used to restore state if error.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected class SaveState {
-		public int markID;
-		
-		// Block state
-		public int topBlock;
-		public int breakBlock;
-		
-		// Try state
-		public int topTry;
-		public int breakTry;
-		public Throwable catchThrowable;
-		
-		// Error state
-		public boolean errorOccurred;
-		public boolean novalueException;
-		public Throwable exception;
-		public Object ignoreExpression;
-		
-		// Expression stack state
-		public int expressionStackPos;
-		
-		// If/else state
-		public int ifElseNesting;
-		public int ifElseIgnoreNestCount;
-		public boolean ifElseSkipTruePart;
-		
-		// Other
-		public int indent;
-		public int expressionProxyPos;
-		
-		/**
-		 * Construct and save the state.
-		 * 
-		 * @param markNumber
-		 * 
-		 * @since 1.1.0
-		 */
-		public SaveState(int markID) {
-			this.markID = markID;
-			
-			ExpressionProcesser ep = ExpressionProcesser.this;
-			this.topBlock = ep.topBlock;
-			this.breakBlock = ep.breakBlock;
-			
-			this.topTry = ep.topTry;
-			this.breakTry = ep.breakTry;
-			this.catchThrowable = ep.catchThrowable;
-			
-			this.errorOccurred = ep.errorOccurred;
-			this.novalueException = ep.novalueException;
-			this.exception = ep.exception;
-			this.ignoreExpression = ep.ignoreExpression;
-			
-			this.expressionStackPos = expressionStack.size()-1;
-			
-			this.ifElseNesting = ep.ifElseNesting;
-			this.ifElseIgnoreNestCount = ep.ifElseIgnoreNestCount;
-			this.ifElseSkipTruePart = ep.ifElseSkipTruePart;
-			
-			this.indent = ep.indent;
-			this.expressionProxyPos = expressionProxies != null ? expressionProxies.size()-1 : -1;
-		}
-		
-		/**
-		 * Restore the state.
-		 * 
-		 * 
-		 * @since 1.1.0
-		 */
-		public void restoreState() {
-			ExpressionProcesser ep = ExpressionProcesser.this;
-			ep.topBlock = this.topBlock;
-			ep.breakBlock = this.breakBlock;
-			
-			ep.topTry = this.topTry;
-			ep.breakTry = this.breakTry;
-			ep.catchThrowable = this.catchThrowable;
-			if (trysInCatch != null) {
-				for (int i = topTry + 1; i < ep.trysInCatch.length; i++) {
-					ep.trysInCatch[i] = null;
-				}
-			}
-			
-			ep.errorOccurred = this.errorOccurred;
-			ep.novalueException = ep.novalueException;
-			ep.exception = this.exception;
-			ep.ignoreExpression = this.ignoreExpression;
-			
-			// Pop stack down to saved state.
-			for (int i = expressionStack.size()-1; i > this.expressionStackPos; i--) {
-				expressionStack.remove(i);
-				expressionTypeStack.remove(i);
-			}
-			
-			ep.ifElseNesting = this.ifElseNesting;
-			ep.ifElseIgnoreNestCount = this.ifElseIgnoreNestCount;
-			ep.ifElseSkipTruePart = this.ifElseSkipTruePart;
-			
-			ep.indent = this.indent;
-			
-			if (expressionProxies != null) {
-				for (int i = expressionProxies.size() - 1; i > this.expressionProxyPos; i--) {
-					expressionProxies.remove(i);
-				}
-			}
-			
-			// These settings can't cross mark boundaries, so reset them to not set. This is in case we were in this state somewhere
-			// in the mark when the restore occurred.
-			ep.conditionalIgnoreNestCount = 0;
-			ep.conditionalNesting = 0;
-			ep.skipTruePart = false;
-			
-			ep.infixIgnoreNestCount = 0;
-			ep.infixNesting = 0;
-		}
-	}
-	
-	/**
-	 * Create the save state with the given id.
-	 * @param markID
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected SaveState createSaveState(int markID) {
-		return new SaveState(markID);
-	}
-	
-	/**
-	 * Push the start of a mark.
-	 * @param markNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushMark(int markNumber) {
-		if (traceOn)
-			printTrace("Mark#"+markNumber, false);
-		
-		if (saveStates == null)
-			saveStates = new ArrayList();
-		saveStates.add(createSaveState(markNumber));
-		
-		if (traceOn)
-			printTraceEnd();
-	}
-	
-	/**
-	 * Push the end mark. If there is no error, it will simply
-	 * remove it and all save states in the map after it. If there
-	 * is an error it will do this plus it will restore the state.
-	 * <p>
-	 * It is assumed that the calls are coming in correct order from
-	 * the server so we won't check validity.
-	 * 
-	 * @param markID
-	 * @param restore
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void pushEndmark(int markID, boolean restore) {
-		if (traceOn)
-			printTrace("End Mark#"+markID+" Restored="+restore, false);
-		
-		try {
-			if (saveStates != null) {
-				// Start from the end (since that is where it most likely will be) and start
-				// search, removing the end one until we reach the markID.
-				for (int i = saveStates.size() - 1; i >= 0; i--) {
-					SaveState state = (SaveState) saveStates.remove(i);
-					if (state.markID == markID) {
-						// We found it.
-						if (restore)
-							state.restoreState();
-						return;
-					}
-				}
-				// But to be safe, if we got here, this is bad. We tried restore a mark we didn't have.
-				processSyntaxException(new IllegalStateException("Tried to do an end mark on a non-existing markID (" + markID + ')'));
-			}
-		} finally {
-			if (traceOn)
-				printTraceEnd();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
deleted file mode 100644
index 18e1ee0..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
+++ /dev/null
@@ -1,213 +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: ForExpression.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Enum for the forExpression parameters.
- * <p>
- * This is not meant to be subclassed by customers.
- * @since 1.1.0
- */
-public class ForExpression extends AbstractEnum {
-
-	/**
-	 * forExpression: Creating a root expression
-	 */
-	public static final int ROOTEXPRESSION_VALUE = 0;
-
-	public static final ForExpression ROOTEXPRESSION = new ForExpression(ROOTEXPRESSION_VALUE, "Root");
-
-	/**
-	 * forExpression: Creating the array expression for an array access (i.e. the array to access)
-	 */
-	public static final int ARRAYACCESS_ARRAY_VALUE = 1;
-
-	public static final ForExpression ARRAYACCESS_ARRAY = new ForExpression(ARRAYACCESS_ARRAY_VALUE, "Array Access: Array Operand");
-
-	/**
-	 * forExpression: Creating an index expression for an array access (i.e. one of the expressions within the <code>[]</code>).
-	 */
-	public static final int ARRAYACCESS_INDEX_VALUE = 2;
-
-	public static final ForExpression ARRAYACCESS_INDEX = new ForExpression(ARRAYACCESS_INDEX_VALUE, "Array Access: Index");
-
-	/**
-	 * forExpression: Creating an dimension expression for an array creation (i.e. one of the expressions within the <code>[]</code>).
-	 */
-	public static final int ARRAYCREATION_DIMENSION_VALUE = 3;
-
-	public static final ForExpression ARRAYCREATION_DIMENSION = new ForExpression(ARRAYCREATION_DIMENSION_VALUE, "Array Access: Dimension");
-
-	/**
-	 * forExpression: Creating an expression for an array initializer (i.e. one of the expressions with the <code>{}</code>). Special case is that
-	 * array initializers are valid as an expression within an array initializer and it doesn't use a for expression.
-	 */
-	public static final int ARRAYINITIALIZER_EXPRESSION_VALUE = 4;
-
-	public static final ForExpression ARRAYINITIALIZER_EXPRESSION = new ForExpression(ARRAYINITIALIZER_EXPRESSION_VALUE, "Array Initializer");
-
-	/**
-	 * forExpression: Creating the expression for the cast (i.e. the expresion after the <code>(type)</code>).
-	 */
-	public static final int CAST_EXPRESSION_VALUE = 5;
-
-	public static final ForExpression CAST_EXPRESSION = new ForExpression(CAST_EXPRESSION_VALUE, "Cast");
-
-	/**
-	 * forExpression: Creating the argument expression for the new instance.
-	 */
-	public static final int CLASSINSTANCECREATION_ARGUMENT_VALUE = 6;
-
-	public static final ForExpression CLASSINSTANCECREATION_ARGUMENT = new ForExpression(CLASSINSTANCECREATION_ARGUMENT_VALUE,
-			"Class Instance Creation: Argument");
-
-	/**
-	 * forExpression: Creating the condition for a conditional expression.
-	 */
-	public static final int CONDITIONAL_CONDITION_VALUE = 7;
-
-	public static final ForExpression CONDITIONAL_CONDITION = new ForExpression(CONDITIONAL_CONDITION_VALUE, "Conditional: Condition");
-
-	/**
-	 * forExpression: Creating the true (then) expression for a conditional expression.
-	 */
-	public static final int CONDITIONAL_TRUE_VALUE = 8;
-
-	public static final ForExpression CONDITIONAL_TRUE = new ForExpression(CONDITIONAL_TRUE_VALUE, "Conditional: True");
-
-	/**
-	 * forExpression: Creating the false (else) condition for a conditional expression.
-	 */
-	public static final int CONDITIONAL_FALSE_VALUE = 9;
-
-	public static final ForExpression CONDITIONAL_FALSE = new ForExpression(CONDITIONAL_FALSE_VALUE, "Conditional: False");
-
-	/**
-	 * forExpression: Creating the receiver for a field access (i.e. the expression before the ".")
-	 */
-	public static final int FIELD_RECEIVER_VALUE = 10;
-
-	public static final ForExpression FIELD_RECEIVER = new ForExpression(FIELD_RECEIVER_VALUE, "Field Access: Receiver");
-
-	/**
-	 * forExpression: Creating the left operand of an infix expression.
-	 */
-	public static final int INFIX_LEFT_VALUE = 11;
-
-	public static final ForExpression INFIX_LEFT = new ForExpression(INFIX_LEFT_VALUE, "Infix: Left");
-
-	/**
-	 * forExpression: Creating the right operand of an infix expression.
-	 */
-	public static final int INFIX_RIGHT_VALUE = 12;
-
-	public static final ForExpression INFIX_RIGHT = new ForExpression(INFIX_RIGHT_VALUE, "Infix: Right");
-
-	/**
-	 * forExpression: Creating an extended operand of an infix expression.
-	 */
-	public static final int INFIX_EXTENDED_VALUE = 13;
-
-	public static final ForExpression INFIX_EXTENDED = new ForExpression(INFIX_EXTENDED_VALUE, "Infix: Extended");
-
-	/**
-	 * forExpression: Creating the value expression of an instanceof.
-	 */
-	public static final int INSTANCEOF_VALUE_VALUE = 14;
-
-	public static final ForExpression INSTANCEOF_VALUE = new ForExpression(INSTANCEOF_VALUE_VALUE, "Instanceof");
-
-	/**
-	 * forExpression: Creating a receiver expression for a method invocation.
-	 */
-	public static final int METHOD_RECEIVER_VALUE = 15;
-
-	public static final ForExpression METHOD_RECEIVER = new ForExpression(METHOD_RECEIVER_VALUE, "Method Invoke: Receiver");
-
-	/**
-	 * forExpression: Creating an argument for a method invocation.
-	 */
-	public static final int METHOD_ARGUMENT_VALUE = 16;
-
-	public static final ForExpression METHOD_ARGUMENT = new ForExpression(METHOD_ARGUMENT_VALUE, "Method Invoke: Argument");
-
-	/**
-	 * forExpression: Creating the operand expression for a prefix operator.
-	 */
-	public static final int PREFIX_OPERAND_VALUE = 17;
-
-	public static final ForExpression PREFIX_OPERAND = new ForExpression(PREFIX_OPERAND_VALUE, "Prefix: Operand");
-
-	/**
-	 * forExpression: Creating the right operand of an assignment operator.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static final int ASSIGNMENT_RIGHT_VALUE = 18;
-
-	public static final ForExpression ASSIGNMENT_RIGHT = new ForExpression(ASSIGNMENT_RIGHT_VALUE, "Assignment: Right");
-
-	/**
-	 * forExpression: Creating the left operand of an assignment operator.
-	 * <p>
-	 * Note: The left expression can only be a FieldAccess or ArrayAccess.
-	 */
-	public static final int ASSIGNMENT_LEFT_VALUE = 19;
-
-	public static final ForExpression ASSIGNMENT_LEFT = new ForExpression(ASSIGNMENT_LEFT_VALUE, "Assignment: Left");
-
-	/**
-	 * forExpression: Creating the throw operand of the throw expression.
-	 */
-	public static final int THROW_OPERAND_VALUE = 20;
-
-	public static final ForExpression THROW_OPERAND = new ForExpression(THROW_OPERAND_VALUE, "Throw operand");
-
-	/**
-	 * forExpression: Creating the if conditional operand of the if expression.
-	 */
-	public static final int IF_CONDITION_VALUE = 21;
-
-	public static final ForExpression IF_CONDITION = new ForExpression(IF_CONDITION_VALUE, "If condition");
-
-	/**
-	 * forExpression: Creating the if true clause of the if expression.
-	 */
-	public static final int IF_TRUE_VALUE = 22;
-
-	public static final ForExpression IF_TRUE = new ForExpression(IF_TRUE_VALUE, "If true clause");
-
-	/**
-	 * forExpression: Creating the if else clause of the if expression.
-	 */
-	public static final int IF_ELSE_VALUE = 23;
-
-	public static final ForExpression IF_ELSE = new ForExpression(IF_ELSE_VALUE, "If else clause");
-
-	
-	/**
-	 * This is not private, but protected only so that proxy core can add an internal ForExpression enum.
-	 * <p>
-	 * This is not meant to be subclassed by customers.
-	 * @param value
-	 * @param name
-	 * 
-	 * @since 1.1.0
-	 */
-	protected ForExpression(int value, String name) {
-		super(value, name);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java
deleted file mode 100644
index 8b61eaa..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IExpressionConstants.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-/**
- * These are constants needed by IExpression that will be common between
- * the vm and the IDE. They are also available to users of the IExpression
- * interface.
- * 
- * @since 1.0.0
- */
-public interface IExpressionConstants {
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
deleted file mode 100644
index f74f672..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
+++ /dev/null
@@ -1,212 +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: InfixOperator.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Enum for Infix operator
- * 
- * @since 1.1.0
- */
-public class InfixOperator extends AbstractEnum {
-
-	/**
-	 * Infix times "*"
-	 */
-	public static final int IN_TIMES_VALUE = 0;
-
-	public static final InfixOperator IN_TIMES = new InfixOperator(IN_TIMES_VALUE, "Infix *");
-
-	/**
-	 * Infix divide "/"
-	 */
-	public static final int IN_DIVIDE_VALUE = 1;
-
-	public static final InfixOperator IN_DIVIDE = new InfixOperator(IN_DIVIDE_VALUE, "Infix /");
-
-	/**
-	 * Infix remainder "%"
-	 */
-	public static final int IN_REMAINDER_VALUE = 2;
-
-	public static final InfixOperator IN_REMAINDER = new InfixOperator(IN_REMAINDER_VALUE, "Infix %");
-
-	/**
-	 * Infix plus "+"
-	 */
-	public static final int IN_PLUS_VALUE = 3;
-
-	public static final InfixOperator IN_PLUS = new InfixOperator(IN_PLUS_VALUE, "Infix +");
-
-	/**
-	 * Infix minus "-"
-	 */
-	public static final int IN_MINUS_VALUE = 4;
-
-	public static final InfixOperator IN_MINUS = new InfixOperator(IN_MINUS_VALUE, "Infix -");
-
-	/**
-	 * Infix left shift " < <"
-	 */
-	public static final int IN_LEFT_SHIFT_VALUE = 5;
-
-	public static final InfixOperator IN_LEFT_SHIFT = new InfixOperator(IN_LEFT_SHIFT_VALUE, "Infix <<");
-
-	/**
-	 * Infix right shift signed ">>"
-	 */
-	public static final int IN_RIGHT_SHIFT_SIGNED_VALUE = 6;
-
-	public static final InfixOperator IN_RIGHT_SHIFT_SIGNED = new InfixOperator(IN_RIGHT_SHIFT_SIGNED_VALUE, "Infix >>");
-
-	/**
-	 * Infix right shift unsigned ">>>"
-	 */
-	public static final int IN_RIGHT_SHIFT_UNSIGNED_VALUE = 7;
-
-	public static final InfixOperator IN_RIGHT_SHIFT_UNSIGNED = new InfixOperator(IN_RIGHT_SHIFT_UNSIGNED_VALUE, "Infix >>>");
-
-	/**
-	 * Infix less " <"
-	 */
-	public static final int IN_LESS_VALUE = 8;
-
-	public static final InfixOperator IN_LESS = new InfixOperator(IN_LESS_VALUE, "Infix <");
-
-	/**
-	 * Infix greater ">"
-	 */
-	public static final int IN_GREATER_VALUE = 9;
-
-	public static final InfixOperator IN_GREATER = new InfixOperator(IN_GREATER_VALUE, "Infix >");
-
-	/**
-	 * Infix less than or equals " <="
-	 */
-	public static final int IN_LESS_EQUALS_VALUE = 10;
-
-	public static final InfixOperator IN_LESS_EQUALS = new InfixOperator(IN_LESS_EQUALS_VALUE, "Infix <=");
-
-	/**
-	 * Infix Greater than or equlas ">="
-	 */
-	public static final int IN_GREATER_EQUALS_VALUE = 11;
-
-	public static final InfixOperator IN_GREATER_EQUALS = new InfixOperator(IN_GREATER_EQUALS_VALUE, "Infix >=");
-
-	/**
-	 * Infix equals "=="
-	 */
-	public static final int IN_EQUALS_VALUE = 12;
-
-	public static final InfixOperator IN_EQUALS = new InfixOperator(IN_EQUALS_VALUE, "Infix ==");
-
-	/**
-	 * Infix not equals "!="
-	 */
-	public static final int IN_NOT_EQUALS_VALUE = 13;
-
-	public static final InfixOperator IN_NOT_EQUALS = new InfixOperator(IN_NOT_EQUALS_VALUE, "Infix !=");
-
-	/**
-	 * Infix exclusive or "^"
-	 */
-	public static final int IN_XOR_VALUE = 14;
-
-	public static final InfixOperator IN_XOR = new InfixOperator(IN_XOR_VALUE, "Infix ^");
-
-	/**
-	 * Infix bitwise and "&"
-	 */
-	public static final int IN_AND_VALUE = 15;
-
-	public static final InfixOperator IN_AND = new InfixOperator(IN_AND_VALUE, "Infix &");
-
-	/**
-	 * Infix bitwise or "|"
-	 */
-	public static final int IN_OR_VALUE = 16;
-
-	public static final InfixOperator IN_OR = new InfixOperator(IN_OR_VALUE, "Infix |");
-
-	/**
-	 * Infix Conditional logical and "&&"
-	 */
-	public static final int IN_CONDITIONAL_AND_VALUE = 17;
-
-	public static final InfixOperator IN_CONDITIONAL_AND = new InfixOperator(IN_CONDITIONAL_AND_VALUE, "Infix &&");
-
-	/**
-	 * Infix Conditional logical or "||"
-	 */
-	public static final int IN_CONDITIONAL_OR_VALUE = 18;
-
-	public static final InfixOperator IN_CONDITIONAL_OR = new InfixOperator(IN_CONDITIONAL_OR_VALUE, "Ifnix ||");
-
-	/**
-	 * Return the infix operator for the given enum value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InfixOperator get(int value) {
-		switch (value) {
-			case IN_TIMES_VALUE:
-				return IN_TIMES;
-			case IN_DIVIDE_VALUE:
-				return IN_DIVIDE;
-			case IN_REMAINDER_VALUE:
-				return IN_REMAINDER;
-			case IN_PLUS_VALUE:
-				return IN_PLUS;
-			case IN_MINUS_VALUE:
-				return IN_MINUS;
-			case IN_LEFT_SHIFT_VALUE:
-				return IN_LEFT_SHIFT;
-			case IN_RIGHT_SHIFT_SIGNED_VALUE:
-				return IN_RIGHT_SHIFT_SIGNED;
-			case IN_RIGHT_SHIFT_UNSIGNED_VALUE:
-				return IN_RIGHT_SHIFT_UNSIGNED;
-			case IN_LESS_VALUE:
-				return IN_LESS;
-			case IN_GREATER_VALUE:
-				return IN_GREATER;
-			case IN_LESS_EQUALS_VALUE:
-				return IN_LESS_EQUALS;
-			case IN_GREATER_EQUALS_VALUE:
-				return IN_GREATER_EQUALS;
-			case IN_EQUALS_VALUE:
-				return IN_EQUALS;
-			case IN_NOT_EQUALS_VALUE:
-				return IN_NOT_EQUALS;
-			case IN_XOR_VALUE:
-				return IN_XOR;
-			case IN_AND_VALUE:
-				return IN_AND;
-			case IN_OR_VALUE:
-				return IN_OR;
-			case IN_CONDITIONAL_AND_VALUE:
-				return IN_CONDITIONAL_AND;
-			case IN_CONDITIONAL_OR_VALUE:
-				return IN_CONDITIONAL_OR;
-		}
-		return null;
-	}
-
-	private InfixOperator(int value, String name) {
-		super(value, name);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
deleted file mode 100644
index ee9f24d..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InitparserTreeMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:55:20 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class InitparserTreeMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.initParser.tree.messages";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InitparserTreeMessages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
deleted file mode 100644
index 3723651..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InternalConditionalOperandType.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Internal class for the Conditional operand type. Not meant to be used by customers.
- * 
- * @since 1.1.0
- */
-public class InternalConditionalOperandType extends AbstractEnum {
-
-	/**
-	 * Used in Conditional processing. False operand on expression stack
-	 */
-	public final static int CONDITIONAL_FALSE_VALUE = 0;
-
-	public final static InternalConditionalOperandType CONDITIONAL_FALSE = new InternalConditionalOperandType(CONDITIONAL_FALSE_VALUE,
-			"Conditional False Operand Flag");
-
-	/**
-	 * Used in Conditional processing. True operand on expression stack
-	 */
-	public final static int CONDITIONAL_TRUE_VALUE = 1;
-
-	public final static InternalConditionalOperandType CONDITIONAL_TRUE = new InternalConditionalOperandType(CONDITIONAL_TRUE_VALUE,
-			"Conditional True Operand Flag");
-
-	/**
-	 * Used in Conditional processing. Test operand on expression stack
-	 */
-	public final static int CONDITIONAL_TEST_VALUE = 2;
-
-	public final static InternalConditionalOperandType CONDITIONAL_TEST = new InternalConditionalOperandType(CONDITIONAL_TEST_VALUE,
-			"Conditional Test Operand Flag");
-
-	/**
-	 * Return the enum for the given value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InternalConditionalOperandType get(int value) {
-		switch (value) {
-			case CONDITIONAL_FALSE_VALUE:
-				return CONDITIONAL_FALSE;
-			case CONDITIONAL_TRUE_VALUE:
-				return CONDITIONAL_TRUE;
-			case CONDITIONAL_TEST_VALUE:
-				return CONDITIONAL_TEST;
-		}
-		return null;
-	}
-
-	private InternalConditionalOperandType(int value, String name) {
-		super(value, name);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java
deleted file mode 100644
index f913089..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java
+++ /dev/null
@@ -1,77 +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 Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InternalExpressionProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-
-/**
- * This interface is used for expression proxies in the evaluation side (in {@link org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser}).
- * <p>
- * It is meant to be implemented only by users of the ExpressionProcessor.
- * 
- * @since 1.1.0
- */
-public interface InternalExpressionProxy {
-	
-	/**
-	 * Get the id of the proxy.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public int getProxyID();
-	
-	/**
-	 * Called by ExpressionProcesser to give the expression proxy its value and type, i.e. it has been evaluated.
-	 * <p>
-	 * The type may not be the actual type of the value, it may be a superclass of it. It is the type that the proxy
-	 * represents from the return of the expression. For instance it may of returned null but it is supposed to be
-	 * java.lang.String. Or it is supposed to be a primitive int, since we can't store that, we need to store
-	 * an Integer value with the type indicating it is Interger.TYPE.
-	 * 
-	 * @param value
-	 * @param type
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setProxy(Object value, Class type);
-	
-	/**
-	 * Get the value of the proxy. 
-	 * <p>
-	 * Note: The value may be a {@link VariableReference}, in which
-	 * case further dereferencing may be with the returned value.
-	 * @return the value of the proxy, it may be an ExpressionProcesser.VariableReference.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Object getValue();
-	
-	/**
-	 * Get the type of the proxy.
-	 * @return
-	 * 
-	 * @see InternalExpressionProxy#setProxy(Object, Class) for what type means.
-	 * @since 1.1.0
-	 */
-	public Class getType();
-
-	/**
-	 * Return whether the proxy has had a value/class set into it yet.
-	 * @return <code>true</code> if it has been set.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isSet();
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
deleted file mode 100644
index b6ebbc9..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * These constants are for communicating between the IDE and the proxy side for expression evaluation. It is not meant to be used by customers.
- * 
- * @since 1.0.0
- */
-public class InternalExpressionTypes extends AbstractEnum {
-
-	/**
-	 * ARRAY ACCESS Expression
-	 */
-	public final static int ARRAY_ACCESS_EXPRESSION_VALUE = 1;
-
-	public final static InternalExpressionTypes ARRAY_ACCESS_EXPRESSION = new InternalExpressionTypes(ARRAY_ACCESS_EXPRESSION_VALUE,
-			"Array Access Expression");
-
-	/**
-	 * ARRAY CREATION Expression
-	 */
-	public final static int ARRAY_CREATION_EXPRESSION_VALUE = 2;
-
-	public final static InternalExpressionTypes ARRAY_CREATION_EXPRESSION = new InternalExpressionTypes(ARRAY_CREATION_EXPRESSION_VALUE,
-			"Array Creation Expression");
-
-	/**
-	 * ARRAY INITIALIZER expression
-	 */
-	public final static int ARRAY_INITIALIZER_EXPRESSION_VALUE = 3;
-
-	public final static InternalExpressionTypes ARRAY_INITIALIZER_EXPRESSION = new InternalExpressionTypes(ARRAY_INITIALIZER_EXPRESSION_VALUE,
-			"Array Initializer Expression");
-
-	/**
-	 * CAST Expression.
-	 */
-	public final static int CAST_EXPRESSION_VALUE = 4;
-
-	public final static InternalExpressionTypes CAST_EXPRESSION = new InternalExpressionTypes(CAST_EXPRESSION_VALUE, "Cast Expression");
-
-	/**
-	 * CONDITIONAL expression
-	 */
-	public final static int CONDITIONAL_EXPRESSION_VALUE = 5;
-
-	public final static InternalExpressionTypes CONDITIONAL_EXPRESSION = new InternalExpressionTypes(CONDITIONAL_EXPRESSION_VALUE,
-			"Conditional Expression");
-
-	/**
-	 * CLASS INSTANCE CREATION expression
-	 */
-	public final static int CLASS_INSTANCE_CREATION_EXPRESSION_VALUE = 6;
-
-	public final static InternalExpressionTypes CLASS_INSTANCE_CREATION_EXPRESSION = new InternalExpressionTypes(
-			CLASS_INSTANCE_CREATION_EXPRESSION_VALUE, "Class Instance Creation Expression");
-
-	/**
-	 * FIELD ACCESS expression.
-	 */
-	public final static int FIELD_ACCESS_EXPRESSION_VALUE = 7;
-
-	public final static InternalExpressionTypes FIELD_ACCESS_EXPRESSION = new InternalExpressionTypes(FIELD_ACCESS_EXPRESSION_VALUE,
-			"Field Access Expression");
-
-	/**
-	 * INSTANCEOF Expression.
-	 */
-	public final static int INSTANCEOF_EXPRESSION_VALUE = 8;
-
-	public final static InternalExpressionTypes INSTANCEOF_EXPRESSION = new InternalExpressionTypes(INSTANCEOF_EXPRESSION_VALUE,
-			"Instanceof Expression");
-
-	/**
-	 * Infix expression
-	 */
-	public final static int INFIX_EXPRESSION_VALUE = 9;
-
-	public final static InternalExpressionTypes INFIX_EXPRESSION = new InternalExpressionTypes(INFIX_EXPRESSION_VALUE, "Infix Expression");
-
-	/**
-	 * Method expression.
-	 */
-	public final static int METHOD_EXPRESSION_VALUE = 10;
-
-	public final static InternalExpressionTypes METHOD_EXPRESSION = new InternalExpressionTypes(METHOD_EXPRESSION_VALUE, "Method Invoke Expression");
-
-	/**
-	 * Prefix expression
-	 */
-	public final static int PREFIX_EXPRESSION_VALUE = 11;
-
-	public final static InternalExpressionTypes PREFIX_EXPRESSION = new InternalExpressionTypes(PREFIX_EXPRESSION_VALUE, "Prefix Expression");
-
-	/**
-	 * Push to proxy expression.
-	 */
-	public final static int PUSH_TO_PROXY_EXPRESSION_VALUE = 12;
-
-	public final static InternalExpressionTypes PUSH_TO_PROXY_EXPRESSION = new InternalExpressionTypes(PUSH_TO_PROXY_EXPRESSION_VALUE,
-			"Push to Proxy Expression");
-
-	/**
-	 * Push BeanType expression proxy expression.
-	 */
-	public final static int PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE = 13;
-	
-	public final static InternalExpressionTypes PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push BeanType ExpressionProxy Expression");
-
-	
-	/**
-	 * Type receiver expression.
-	 */
-	public final static int TYPERECEIVER_EXPRESSION_VALUE = 14;
-
-	public final static InternalExpressionTypes TYPERECEIVER_EXPRESSION = new InternalExpressionTypes(TYPERECEIVER_EXPRESSION_VALUE,
-			"Type Receiver Expression");
-
-	/**
-	 * Assignment to an ExpressionProxy expression.
-	 */
-	public final static int ASSIGNMENT_PROXY_EXPRESSION_VALUE = 15;
-
-	public final static InternalExpressionTypes ASSIGNMENT_PROXY_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_PROXY_EXPRESSION_VALUE,
-			"Assignment to Proxy Expression");
-
-	/**
-	 * Push expression proxy value expression.
-	 */
-	public final static int PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE = 16;
-
-	public final static InternalExpressionTypes PUSH_TO_EXPRESSION_PROXY_EXPRESSION = new InternalExpressionTypes(
-			PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE, "Push to Expression Proxy Expression");
-
-	/**
-	 * Assignment expression.
-	 */
-	public final static int ASSIGNMENT_EXPRESSION_VALUE = 17;
-
-	public final static InternalExpressionTypes ASSIGNMENT_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_EXPRESSION_VALUE,
-			"Assignment Expression");
-
-	/**
-	 * Block End expression.
-	 */
-	public final static int BLOCK_BEGIN_EXPRESSION_VALUE = 18;
-	
-	public final static InternalExpressionTypes BLOCK_BEGIN_EXPRESSION = new InternalExpressionTypes(BLOCK_BEGIN_EXPRESSION_VALUE,
-			"Begin block Expression");
-
-	/**
-	 * Block End expression.
-	 */
-	public final static int BLOCK_BREAK_EXPRESSION_VALUE = 19;
-	
-	public final static InternalExpressionTypes BLOCK_BREAK_EXPRESSION = new InternalExpressionTypes(BLOCK_BREAK_EXPRESSION_VALUE,
-			"Break block Expression");
-
-	/**
-	 * Block End expression.
-	 */
-	public final static int BLOCK_END_EXPRESSION_VALUE = 20;
-	
-	public final static InternalExpressionTypes BLOCK_END_EXPRESSION = new InternalExpressionTypes(BLOCK_END_EXPRESSION_VALUE,
-			"End block Expression");
-
-	/**
-	 * Try Begin expression.
-	 */
-	public final static int TRY_BEGIN_EXPRESSION_VALUE = 21;
-	
-	public final static InternalExpressionTypes TRY_BEGIN_EXPRESSION = new InternalExpressionTypes(TRY_BEGIN_EXPRESSION_VALUE,
-			"Begin try Expression");
-
-	/**
-	 * Try Catch expression.
-	 */
-	public final static int TRY_CATCH_EXPRESSION_VALUE = 22;
-	
-	public final static InternalExpressionTypes TRY_CATCH_EXPRESSION = new InternalExpressionTypes(TRY_CATCH_EXPRESSION_VALUE,
-			"Try catch Expression");
-	
-	/**
-	 * Try Finally expression.
-	 */
-	public final static int TRY_FINALLY_EXPRESSION_VALUE = 23;
-	
-	public final static InternalExpressionTypes TRY_FINALLY_EXPRESSION = new InternalExpressionTypes(TRY_FINALLY_EXPRESSION_VALUE,
-			"Try finally Expression");
-
-	/**
-	 * Try End expression.
-	 */
-	public final static int TRY_END_EXPRESSION_VALUE = 24;
-	
-	public final static InternalExpressionTypes TRY_END_EXPRESSION = new InternalExpressionTypes(TRY_END_EXPRESSION_VALUE,
-			"End try Expression");
-	
-	/**
-	 * Throw expression.
-	 */
-	public final static int THROW_EXPRESSION_VALUE = 25;
-	
-	public final static InternalExpressionTypes THROW_EXPRESSION = new InternalExpressionTypes(THROW_EXPRESSION_VALUE,
-			"Throw Expression");
-
-	/**
-	 * Rethrow expression.
-	 */
-	public final static int RETHROW_EXPRESSION_VALUE = 26;
-	
-	public final static InternalExpressionTypes RETHROW_EXPRESSION = new InternalExpressionTypes(RETHROW_EXPRESSION_VALUE,
-			"Rethrow Expression");
-
-	/**
-	 * Push Method Lookup expression proxy expression.
-	 */
-	public final static int PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE = 27;
-	
-	public final static InternalExpressionTypes PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push Method ExpressionProxy Expression");
-
-	/**
-	 * Push Field Lookup expression proxy expression.
-	 */
-	public final static int PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE = 28;
-	
-	public final static InternalExpressionTypes PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE,
-			"Push Field ExpressionProxy Expression");
-
-	/**
-	 * Push If/else (the clauses) expression proxy expression.
-	 */
-	public final static int IF_ELSE_EXPRESSION_VALUE = 29;
-	
-	public final static InternalExpressionTypes IF_ELSE_EXPRESSION = new InternalExpressionTypes(IF_ELSE_EXPRESSION_VALUE,
-			"Push If/else Expression");
-
-	/**
-	 * Push If/else condition test expression proxy expression.
-	 */
-	public final static int IF_TEST_EXPRESSION_VALUE = 30;
-	
-	public final static InternalExpressionTypes IF_TEST_EXPRESSION = new InternalExpressionTypes(IF_TEST_EXPRESSION_VALUE,
-			"Push If Test Expression");
-
-
-	/**
-	 * Push new instance from init string proxy expression.
-	 */
-	public final static int NEW_INSTANCE_VALUE = 31;
-	
-	public final static InternalExpressionTypes NEW_INSTANCE = new InternalExpressionTypes(NEW_INSTANCE_VALUE,
-			"Push New Instance Expression");
-
-
-	/**
-	 * Push mark proxy expression.
-	 */
-	public final static int MARK_VALUE = 32;
-	
-	public final static InternalExpressionTypes MARK = new InternalExpressionTypes(MARK_VALUE,
-			"Push Mark Expression");
-
-	/**
-	 * Push end mark proxy expression.
-	 */
-	public final static int ENDMARK_VALUE = 33;
-	
-	public final static InternalExpressionTypes ENDMARK = new InternalExpressionTypes(ENDMARK_VALUE,
-			"Push End Mark Expression");
-
-	private InternalExpressionTypes(int value, String name) {
-		super(value, name);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
deleted file mode 100644
index 8707a27..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InternalIfElseOperandType.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Internal class for the If/else operand type. Not meant to be used by customers.
- * 
- * @since 1.1.0
- */
-public class InternalIfElseOperandType extends AbstractEnum {
-
-	/**
-	 * Used in If/else processing. False clause on expression stack
-	 */
-	public final static int ELSE_CLAUSE_VALUE = 0;
-
-	public final static InternalIfElseOperandType ELSE_CLAUSE = new InternalIfElseOperandType(ELSE_CLAUSE_VALUE,
-			"Else Clause Flag");
-
-	/**
-	 * Used in If/else processing. If operand on expression stack
-	 */
-	public final static int TRUE_CLAUSE_VALUE = 1;
-
-	public final static InternalIfElseOperandType TRUE_CLAUSE = new InternalIfElseOperandType(TRUE_CLAUSE_VALUE,
-			"If True Clause Flag");
-
-	/**
-	 * Return the enum for the given value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InternalIfElseOperandType get(int value) {
-		switch (value) {
-			case ELSE_CLAUSE_VALUE:
-				return ELSE_CLAUSE;
-			case TRUE_CLAUSE_VALUE:
-				return TRUE_CLAUSE;
-		}
-		return null;
-	}
-
-	private InternalIfElseOperandType(int value, String name) {
-		super(value, name);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
deleted file mode 100644
index e4b2e89..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InternalInfixOperandType.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-
-/**
- * Internal class for the Prefix operand type. Not meant to be used by customers.
- * @since 1.1.0
- */
-public class InternalInfixOperandType extends AbstractEnum {
-
-	/**
-	 * Used in Infix processing. Left operand on expression stack
-	 */
-	public final static int INFIX_LEFT_OPERAND_VALUE = 0;
-	public final static InternalInfixOperandType INFIX_LEFT_OPERAND = new InternalInfixOperandType(INFIX_LEFT_OPERAND_VALUE, "Infix Left Operand Flag");
-	/**
-	 * Used in Infix processing. Other operand (but not last) on expression stack
-	 */
-	public final static int INFIX_OTHER_OPERAND_VALUE = 1;
-	public final static InternalInfixOperandType INFIX_OTHER_OPERAND = new InternalInfixOperandType(INFIX_OTHER_OPERAND_VALUE,
-	"Infix Other Operand Flag");
-	/**
-	 * Used in Infix processing. Rightmost (last) operand on expression stack
-	 */
-	public final static int INFIX_LAST_OPERAND_VALUE = 2;
-	public final static InternalInfixOperandType INFIX_LAST_OPERAND = new InternalInfixOperandType(INFIX_LAST_OPERAND_VALUE, "Infix Last Operand Flag");
-
-	/**
-	 * Return the enum for the given value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static InternalInfixOperandType get(int value) {
-		switch (value) {
-			case INFIX_LAST_OPERAND_VALUE:
-				return INFIX_LAST_OPERAND;
-			case INFIX_LEFT_OPERAND_VALUE:
-				return INFIX_LEFT_OPERAND;
-			case INFIX_OTHER_OPERAND_VALUE:
-				return INFIX_OTHER_OPERAND;
-		}
-		return null;
-	}
-	
-	private InternalInfixOperandType(int value, String name) {
-		super(value, name);
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java
deleted file mode 100644
index 406da02..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: NoExpressionValueException.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-
-/**
- * The expression (or some nested expression) did not return a value. I.e. it was <code>void</code>.
- * This would occur only if the value of expression was being retrieved through getExpressionValue,
- * or if a nested expression was used, since in that case the value would of been used as an
- * argument or receiver to another expression.
- * 
- * @since 1.0.0
- */
-public class NoExpressionValueException extends Exception {
-	
-	/**
-	 * Construct with no arguments.
-	 * 
-	 * @since 1.0.0
-	 */
-	public NoExpressionValueException() {
-		super();
-	}
-	
-	public NoExpressionValueException(Throwable e) {
-		super(e);
-	}
-
-	/**
-	 * Construct with a message.
-	 * 
-	 * @param message
-	 * 
-	 * @since 1.0.0
-	 */
-	public NoExpressionValueException(String message) {
-		super(message);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
deleted file mode 100644
index 6cc2a9c..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
+++ /dev/null
@@ -1,77 +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: PrefixOperator.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Enum for prefix operator.
- * 
- * @since 1.1.0
- */
-public class PrefixOperator extends AbstractEnum {
-
-	/**
-	 * Prefix plus "+"
-	 */
-	public static final int PRE_PLUS_VALUE = 0;
-
-	public static final PrefixOperator PRE_PLUS = new PrefixOperator(PRE_PLUS_VALUE, "Prefix +");
-
-	/**
-	 * Prefix minus "-"
-	 */
-	public static final int PRE_MINUS_VALUE = 1;
-
-	public static final PrefixOperator PRE_MINUS = new PrefixOperator(PRE_MINUS_VALUE, "Prefix -");
-
-	/**
-	 * Prefix bitwise complement "~"
-	 */
-	public static final int PRE_COMPLEMENT_VALUE = 2;
-
-	public static final PrefixOperator PRE_COMPLEMENT = new PrefixOperator(PRE_COMPLEMENT_VALUE, "Prefix ~");
-
-	/**
-	 * Prefix logical not "!"
-	 */
-	public static final int PRE_NOT_VALUE = 3;
-
-	public static final PrefixOperator PRE_NOT = new PrefixOperator(PRE_NOT_VALUE, "Prefix !");
-
-	/**
-	 * Return the prefix operator for the given enum value.
-	 * @param value
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static PrefixOperator get(int value) {
-		switch (value) {
-			case PRE_PLUS_VALUE:
-				return PRE_PLUS;
-			case PRE_MINUS_VALUE:
-				return PRE_MINUS;
-			case PRE_COMPLEMENT_VALUE:
-				return PRE_COMPLEMENT;
-			case PRE_NOT_VALUE:
-				return PRE_NOT;
-		}
-		return null;
-	}
-
-	private PrefixOperator(int value, String name) {
-		super(value, name);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java
deleted file mode 100644
index a4cd136..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: VariableReference.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
- 
-
-/**
- * This represents a Variable Reference value. A variable reference value can be on the left
- * side of an assignment (e.g. field or array access) or on any side
- * of any expression. When on the left side of an assignment, then the
- * value can assigned to. Such as <code>x[3] = 4</code>. Or it is value
- * that can be used in expressions, such as <code>x[3] + 2</code>.
- * <p>
- * When dereferenced, the value is given (see {@link VariableReference#dereference()}) as
- * the result or it is set with a value and then deferenced (see {@link VariableReference#set(Object, Class)}).
- * <p>
- * The type of the reference is the type stored in the corresponding expressionTypeStack entry. This is the type
- * for assignment, and the type for dereferenced.
- * @since 1.1.0
- */
-public abstract class VariableReference {
-
-	/**
-	 * Dereference the value. 
-	 * @return the dereferenced value. Such as the result of <code>x[3]</code>. The type of the reference 
-	 * is the type stored in the corresponding expressionTypeStack entry for this reference.
-	 * @throws IllegalAccessException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public abstract Object dereference();
-	
-	/**
-	 * Set the value into the variable and dereference it. Once it is set it is
-	 * no longer a reference and must be dereferenced.
-	 * @param value value to set to.
-	 * @param type type of the value being set. It may be of use to the reference or maybe not.
-	 * @return the dereferenced value after being set. The type of the dereferenced value 
-	 * is the type stored in the corresponding expressionTypeStack entry for this reference.
-	 * @throws IllegalAccessException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @since 1.1.0
-	 */
-	public abstract Object set(Object value, Class type) throws IllegalArgumentException, IllegalAccessException;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
deleted file mode 100644
index c3f193e..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-ExpressionProcesser.CannotCastXToY_EXC_                           = IWAV0156E Cannot cast "{0}" to be "{1}".
-ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_           = IWAV0157E {0} not valid as the operand of prefix operator "{1}".
-ExpressionProcesser.InvalidOperandOfOperator_EXC_                 = IWAV0158E {0} not valid as the operand of operator "{1}".
-ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_  = IWAV0159E {0} is greater then number of dimensions ({1}) in the array
-ExpressionProcesser.NotAnArray_EXC_                               = IWAV0160E "{0}" is not an array.
-ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_ = IWAV0161E Arraytype "{0}" has fewer dimensions than creation requested ({1}).
diff --git a/plugins/org.eclipse.jem.proxy/plugin.properties b/plugins/org.eclipse.jem.proxy/plugin.properties
deleted file mode 100644
index b2248a7..0000000
--- a/plugins/org.eclipse.jem.proxy/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/plugin.properties,v $
-# $Revision: 1.5 $  $Date: 2005/02/15 22:59:19 $
-#
-
-
-pluginName=Java EMF Model Proxy Support
-providerName = Eclipse.org
-contributors.extensionpoint.name=Proxy configuration contributors
-Launch.localProxy=Local Proxy Application
diff --git a/plugins/org.eclipse.jem.proxy/plugin.xml b/plugins/org.eclipse.jem.proxy/plugin.xml
deleted file mode 100644
index 4359a89..0000000
--- a/plugins/org.eclipse.jem.proxy/plugin.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jem.proxy"
-   name="%pluginName"
-   version="1.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jem.internal.proxy.core.ProxyPlugin">
-
-   <runtime>
-      <library name="proxy.jar">
-         <export name="*"/>
-      </library>
-      <library name="proxycommon.jar">
-         <export name="*"/>
-      </library>
-      <library name="initparser.jar">
-         <export name="*"/>
-      </library>
-      <library name="proxyremote.jar">
-         <export name="*"/>
-      </library>
-      <library name="remotecommon.jar">
-         <export name="*"/>
-      </library>
-      <library name="proxyide.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.pde.core" optional="true"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui" optional="true"/>
-   </requires>
-
-
-   <extension-point id="contributors" name="%contributors.extensionpoint.name" schema="schema/contributors.exsd"/>
-
-   <extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            name="%Launch.localProxy"
-            delegate="org.eclipse.jem.internal.proxy.remote.LocalProxyLaunchDelegate"
-            category="org.eclipse.jem.proxy"
-            modes="run"
-            id="org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
-            sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-            sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
-      </launchConfigurationType>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.proxy/proxy.jars b/plugins/org.eclipse.jem.proxy/proxy.jars
deleted file mode 100644
index 10aede4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy.jars
+++ /dev/null
@@ -1,4 +0,0 @@
-proxycommon.jar=/org.eclipse.jem.proxy/common_bin/
-initparser.jar=/org.eclipse.jem.proxy/common_bin/
-remotecommon.jar=/org.eclipse.jem.proxy/common_bin/
-vm/remotevm.jar=/org.eclipse.jem.proxy/vm_bin/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java
deleted file mode 100644
index 43bb8a5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jem.internal.proxy.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IStandardAwtBeanProxyFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IBeanProxyFactory;
-/**
- * The Standard awt bean proxy factory.
- * This is the Interface that the desktop will talk
- * to.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IStandardAwtBeanProxyFactory extends IBeanProxyFactory {
-	public static final String REGISTRY_KEY = "standard-java.awt"; //$NON-NLS-1$
-
-/**
- * Return a new bean proxy for the dimension argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IDimensionBeanProxy createDimensionBeanProxyWith(int width, int height);
-/**
- * Return a new bean proxy for the point argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IPointBeanProxy createPointBeanProxyWith(int x, int y);
-/**
- * Return a new bean proxy for the rectangle argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IRectangleBeanProxy createBeanProxyWith(int x, int y, int width, int height);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java
deleted file mode 100644
index c40e9c2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package org.eclipse.jem.internal.proxy.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: JavaStandardAwtBeanConstants.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Standard AWT Constants
- *
- * Use the static accessor method (getConstants()) to get the appropriate 
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * NOTE: Since everything in here just proxies, there is
- *       no need to have them separated by VM. That is why
- *       this in the Proxy package.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class JavaStandardAwtBeanConstants {
-		
-	public static final Object REGISTRY_KEY = new Object();
-			
-	final boolean AWTLoaded;	// AWT may not be available. So non-ui JVM's don't have AWT.
-	final boolean AWTRegistered;	// AWT was registered to be used in this VM. It may be registered, but still not available.
-		
-	final IFieldProxy dimensionHeightProxy;
-	final IFieldProxy dimensionWidthProxy;
-	final IMethodProxy setDimensionSizeHWProxy;
-	final IMethodProxy setDimensionSizeDProxy;
-	
-	final IFieldProxy pointXProxy;
-	final IFieldProxy pointYProxy;
-	final IMethodProxy setPointLocationXYProxy;
-	final IMethodProxy setPointLocationPProxy;
-	
-	final IFieldProxy rectangleHeightProxy;
-	final IFieldProxy rectangleWidthProxy;
-	final IFieldProxy rectangleXProxy;
-	final IFieldProxy rectangleYProxy;
-	final IMethodProxy setRectangleSizeHWProxy;
-	final IMethodProxy setRectangleSizeDProxy;
-	final IMethodProxy setRectangleLocationXYProxy;
-	final IMethodProxy setRectangleLocationPProxy;
-	final IMethodProxy setRectangleBoundsXYHWProxy;
-	final IMethodProxy setRectangleBoundsRProxy;
-	
-/**
- * Get the constants instance for the specified registry.
- */
-public static JavaStandardAwtBeanConstants getConstants(ProxyFactoryRegistry registry) {
-	JavaStandardAwtBeanConstants constants = (JavaStandardAwtBeanConstants) registry.getConstants(REGISTRY_KEY);
-	if (constants == null)
-		registry.registerConstants(REGISTRY_KEY, constants = new JavaStandardAwtBeanConstants(registry, registry.getBeanProxyFactoryExtension(IStandardAwtBeanProxyFactory.REGISTRY_KEY) != null));
-	return constants;
-}
-		
-
-public JavaStandardAwtBeanConstants(ProxyFactoryRegistry registry, boolean isRegistered) {
-	super();
-	
-	AWTRegistered = isRegistered;
-	if (!AWTRegistered) {
-		AWTLoaded = false;
-		dimensionHeightProxy = dimensionWidthProxy = pointXProxy = pointYProxy = rectangleHeightProxy = rectangleWidthProxy = rectangleXProxy = rectangleYProxy = null;
-		setDimensionSizeHWProxy = setDimensionSizeDProxy = setPointLocationXYProxy = setPointLocationPProxy = setRectangleSizeHWProxy = setRectangleSizeDProxy = setRectangleLocationXYProxy = setRectangleLocationPProxy = setRectangleBoundsXYHWProxy = setRectangleBoundsRProxy = null;		
-		return;
-	}
-	
-	IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-	
-	IBeanTypeProxy dimensionTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Dimension");//$NON-NLS-1$
-	if (dimensionTypeProxy != null) {
-		// AWT is available.
-		AWTLoaded = true;
-		IBeanTypeProxy intTypeProxy = typeFactory.getBeanTypeProxy("int"); //$NON-NLS-1$
-		
-		dimensionHeightProxy = dimensionTypeProxy.getFieldProxy("height");//$NON-NLS-1$
-		dimensionWidthProxy = dimensionTypeProxy.getFieldProxy("width");//$NON-NLS-1$
-		setDimensionSizeHWProxy = dimensionTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setDimensionSizeDProxy = dimensionTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {dimensionTypeProxy}); //$NON-NLS-1$
-	
-		IBeanTypeProxy pointTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Point");//$NON-NLS-1$
-		pointXProxy = pointTypeProxy.getFieldProxy("x");//$NON-NLS-1$
-		pointYProxy = pointTypeProxy.getFieldProxy("y");	//$NON-NLS-1$
-		setPointLocationXYProxy = pointTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setPointLocationPProxy = pointTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {pointTypeProxy}); //$NON-NLS-1$
-		
-		
-		IBeanTypeProxy rectangleTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Rectangle");//$NON-NLS-1$
-		rectangleHeightProxy = rectangleTypeProxy.getFieldProxy("height");//$NON-NLS-1$
-		rectangleWidthProxy = rectangleTypeProxy.getFieldProxy("width");//$NON-NLS-1$
-		rectangleXProxy = rectangleTypeProxy.getFieldProxy("x");//$NON-NLS-1$
-		rectangleYProxy = rectangleTypeProxy.getFieldProxy("y");//$NON-NLS-1$
-		setRectangleSizeHWProxy = rectangleTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setRectangleSizeDProxy = rectangleTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {dimensionTypeProxy}); //$NON-NLS-1$
-		setRectangleLocationXYProxy = rectangleTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setRectangleLocationPProxy = rectangleTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {pointTypeProxy});		 //$NON-NLS-1$
-		setRectangleBoundsXYHWProxy = rectangleTypeProxy.getMethodProxy("setBounds", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy, intTypeProxy, intTypeProxy}); //$NON-NLS-1$
-		setRectangleBoundsRProxy = rectangleTypeProxy.getMethodProxy("setBounds", new IBeanTypeProxy[] {rectangleTypeProxy}); //$NON-NLS-1$
-	} else {
-		AWTLoaded = false;
-		dimensionHeightProxy = dimensionWidthProxy = pointXProxy = pointYProxy = rectangleHeightProxy = rectangleWidthProxy = rectangleXProxy = rectangleYProxy = null;
-		setDimensionSizeHWProxy = setDimensionSizeDProxy = setPointLocationXYProxy = setPointLocationPProxy = setRectangleSizeHWProxy = setRectangleSizeDProxy = setRectangleLocationXYProxy = setRectangleLocationPProxy = setRectangleBoundsXYHWProxy = setRectangleBoundsRProxy = null;
-	}
-}
-
-/**
- * Answer if AWT is available.
- */
-public boolean isAWTAvailable() {
-	return AWTLoaded;
-}
-
-/**
- * Answer if AWT was registered to be available.
- */
-public boolean isAWTRegistered() {
-	return AWTRegistered;
-}
-
-
-
-/**
- * getDimensionHeightFieldProxy method comment.
- */
-public IFieldProxy getDimensionHeightFieldProxy() {
-	return dimensionHeightProxy;
-}
-/**
- * getDimensionWidthProxy method comment.
- */
-public IFieldProxy getDimensionWidthFieldProxy() {
-	return dimensionWidthProxy;
-}
-/**
- * getDimensionSetSizeWHProxy method comment.
- */
-public IMethodProxy getDimensionSetSizeHWProxy() {
-	return setDimensionSizeHWProxy;
-}
-/**
- * getDimensionSetSizeDProxy method comment.
- */
-public IMethodProxy getDimensionSetSizeDProxy() {
-	return setDimensionSizeDProxy;
-}
-
-/**
- * getPointXFieldProxy method comment.
- */
-public IFieldProxy getPointXFieldProxy() {
-	return pointXProxy;
-}
-/**
- * getPointYFieldProxy method comment.
- */
-public IFieldProxy getPointYFieldProxy() {
-	return pointYProxy;
-}
-/**
- * getPointSetLocationXYProxy method comment.
- */
-public IMethodProxy getPointSetLocationXYProxy() {
-	return setPointLocationXYProxy;
-}
-/**
- * getPointSetLocationPProxy method comment.
- */
-public IMethodProxy getPointSetLocationPProxy() {
-	return setPointLocationPProxy;
-}
-/**
- * getRectangleHeightFieldProxy method comment.
- */
-public IFieldProxy getRectangleHeightFieldProxy() {
-	return rectangleHeightProxy;
-}
-/**
- * getRectangleWidthFieldProxy method comment.
- */
-public IFieldProxy getRectangleWidthFieldProxy() {
-	return rectangleWidthProxy;
-}
-/**
- * getRectangleXFieldProxy method comment.
- */
-public IFieldProxy getRectangleXFieldProxy() {
-	return rectangleXProxy;
-}
-/**
- * getRectangleYFieldProxy method comment.
- */
-public IFieldProxy getRectangleYFieldProxy() {
-	return rectangleYProxy;
-}
-/**
- * getRectangleSetSizeWHProxy method comment.
- */
-public IMethodProxy getRectangleSetSizeHWProxy() {
-	return setRectangleSizeHWProxy;
-}
-/**
- * getRectangleSetSizeDProxy method comment.
- */
-public IMethodProxy getRectangleSetSizeDProxy() {
-	return setRectangleSizeDProxy;
-}
-/**
- * getRectangleSetLocationXYProxy method comment.
- */
-public IMethodProxy getRectangleSetLocationXYProxy() {
-	return setRectangleLocationXYProxy;
-}
-/**
- * getRectangleSetLocationPProxy method comment.
- */
-public IMethodProxy getRectangleSetLocationPProxy() {
-	return setRectangleLocationPProxy;
-}
-
-/**
- * getRectangleSetBoundsXYHWProxy method comment.
- */
-public IMethodProxy getRectangleSetBoundsXYHWProxy() {
-	return setRectangleBoundsXYHWProxy;
-}
-/**
- * getRectangleSetBoundsRProxy method comment.
- */
-public IMethodProxy getRectangleSetBoundsRProxy() {
-	return setRectangleBoundsRProxy;
-}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java
deleted file mode 100644
index 90c63e5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java
+++ /dev/null
@@ -1,137 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: CollectionBeanProxyWrapper.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-import org.eclipse.core.runtime.*;
-/**
- * This is a wrapper for an java.util.Collection proxy.
- * It provides the collection methods to interface to
- * the proxy.
- */
-
-public class CollectionBeanProxyWrapper {
-	protected final IBeanProxy fCollection;
-	protected final JavaStandardBeanProxyConstants fConstants;
-	
-	/**
-	 * Construct with the collection.
-	 */
-	public CollectionBeanProxyWrapper(IBeanProxy aCollectionProxy) {
-		if (!aCollectionProxy.getTypeProxy().isKindOf(aCollectionProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.Collection"))) //$NON-NLS-1$
-			throw new ClassCastException(java.text.MessageFormat.format(ProxyMessages.getString(ProxyMessages.CLASSCAST_INCORRECTTYPE), new Object[] {aCollectionProxy.getTypeProxy().getTypeName(), "java.util.Collection"})); //$NON-NLS-1$
-		else
-			fCollection = aCollectionProxy;
-			
-		fConstants = JavaStandardBeanProxyConstants.getConstants(aCollectionProxy.getProxyFactoryRegistry());
-	}
-	
-	/**
-	 * Answer the collection proxy that this is wrappering.
-	 */
-	public IBeanProxy getBeanProxy() {
-		return fCollection;
-	}
-
-	/**
-	 * equals - Pass it on to the proxy to handle this.
-	 */
-	public boolean equals(Object object) {
-		return fCollection.equals(object);
-	}
-	
-	/**
-	 * hashCode - Pass it on to the proxy to handle this.
-	 */
-	public int hashCode() {
-		return fCollection.hashCode();
-	}
-	
-	/**
-	 * Collection accessors
-	 */
-	public boolean add(IBeanProxy object) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionAdd().invoke(fCollection, object)).booleanValue();
-	}
-	public boolean addAll(IBeanProxy collection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionAddAll().invoke(fCollection, collection)).booleanValue();
-	}
-	public void clear() throws ThrowableProxy {
-		fConstants.getCollectionClear().invoke(fCollection);
-	}
-	public boolean contains(IBeanProxy object) {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getCollectionContains().invoke(fCollection, object)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return false;
-		}
-	}
-	public boolean containsAll(IBeanProxy collection) {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getCollectionContainsAll().invoke(fCollection, collection)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return false;
-		}			
-	}		
-	public boolean isEmpty() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getCollectionIsEmpty().invoke(fCollection)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return true;
-		}			
-	}		
-	public IteratorBeanProxyWrapper iterator() {
-		try {
-			IBeanProxy itr = fConstants.getCollectionIterator().invoke(fCollection);
-			if (itr != null)
-				return new IteratorBeanProxyWrapper(itr);
-			else
-				return null;
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return null;
-		}			
-	}
-	public boolean remove(IBeanProxy object) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionRemove().invoke(fCollection, object)).booleanValue();
-	}
-	public boolean removeAll(IBeanProxy collection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionRemoveAll().invoke(fCollection, collection)).booleanValue();
-	}		
-	public boolean retainAll(IBeanProxy collection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getCollectionRetainAll().invoke(fCollection, collection)).booleanValue();
-	}
-	public int size() {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getCollectionSize().invoke(fCollection)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return 0;
-		}			
-	}	
-	public IArrayBeanProxy toArray() throws ThrowableProxy {
-		return (IArrayBeanProxy) fConstants.getCollectionToArray().invoke(fCollection);
-	}
-	public IArrayBeanProxy toArray(IArrayBeanProxy array) throws ThrowableProxy {
-		return (IArrayBeanProxy) fConstants.getCollectionToArrayWithArray().invoke(fCollection, array);
-	}	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java
deleted file mode 100644
index e2fea6e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ConfigurationContributorAdapter.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
- 
-/**
- * This is an implementation of IConfigurationContributor that does nothing. It
- * can be subclassed to provide specific overrides.
- * @since 1.0.0
- */
-public class ConfigurationContributorAdapter implements IConfigurationContributor {
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
-	 */
-	public void initialize(IConfigurationContributionInfo info) {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeClasspaths(org.eclipse.jem.internal.proxy.core.IConfigurationContributionController)
-	 */
-	public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeToConfiguration(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) throws CoreException {
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeToRegistry(org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry)
-	 */
-	public void contributeToRegistry(ProxyFactoryRegistry registry) {
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java
deleted file mode 100644
index 817ee64..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java
+++ /dev/null
@@ -1,77 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: EnumerationBeanProxyWrapper.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Enumeration proxy.
- * It provides the Enumeration methods to interface to
- * the proxy.
- */
-
-public class EnumerationBeanProxyWrapper {
-	protected final IBeanProxy fEnumeration;
-	protected final JavaStandardBeanProxyConstants fConstants;
-	
-	/**
-	 * Construct with the collection.
-	 */
-	public EnumerationBeanProxyWrapper(IBeanProxy anEnumerationProxy) {
-		
-		fEnumeration = anEnumerationProxy;
-			
-		fConstants = JavaStandardBeanProxyConstants.getConstants(anEnumerationProxy.getProxyFactoryRegistry());
-	}
-	
-	/**
-	 * Answer the iterator proxy that this is wrappering.
-	 */
-	public IBeanProxy getBeanProxy() {
-		return fEnumeration;
-	}
-
-	/**
-	 * equals - Pass it on to the proxy to handle this.
-	 */
-	public boolean equals(Object object) {
-		return fEnumeration.equals(object);
-	}
-	
-	/**
-	 * hashCode - Pass it on to the proxy to handle this.
-	 */
-	public int hashCode() {
-		return fEnumeration.hashCode();
-	}
-	
-	/**
-	 * Enumeration accessors
-	 */
-	public boolean hasMoreElements() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getEnumerationHasMoreElements().invoke(fEnumeration)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return false;
-		}			
-	}
-	public IBeanProxy nextElement() throws ThrowableProxy {
-		return fConstants.getEnumerationNextElement().invoke(fEnumeration);
-	}	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
deleted file mode 100644
index 2fed66e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
+++ /dev/null
@@ -1,2411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: Expression.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/16 19:11:23 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
- 
-/**
- * This is implementation of IExpression. It encapsulates much of the processing required
- * into a common form that will be turned into simple push/pop/evaluate type of interaction with the
- * actual other side. All registry specific implementations of IExpression must subclass this class.
- * <p>
- * It will maintain a stack of the expressions. As the expressions come in they will be stacked if not
- * able to be executed immediately. The expressions come to this class in an  outside to inside order,
- * but they need to be processed in an inside-out order instead. 
- * <p>
- * Subclasses will be used for the different types of proxy interfaces. The abstract methods will
- * then be the simple interface. 
- * <p>
- * It is not meant for subclasses to override the actual create expression methods because the processing the stack
- * is very sensitive and must execute in the proper sequence. So the create methods are final for this reason.
- * <p>
- * This class is not thread-safe.
- * <p>
- * This class also has API of its own and can be used by customers for advanced usage. Those advanced API are
- * listed on each method as to whether it is customer API or implementers API (i.e. API for implementers of
- * expression subclasses to use). 
- * 
- * 
- * @since 1.0.0
- */
-public abstract class Expression implements IExpression {
-
-	/*
-	 * We have stack here, but rather than create a class that does the
-	 * stack protocol, will simply have some private methods to do
-	 * the same thing for the stack. (Note: Can't use java.util.Stack
-	 * because that is a synchronized class, and don't want the overhead). 
-	 * 
-	 * The purpose of the stack is to stack up expressions that have not yet
-	 * been evaluated. 
-	 * 
-	 * Each expression type will control the content of what it pushes and pops.
-	 * The expression type will be the last thing it pushes so that on popping
-	 * we know what kind of expression is now completed and ready for evaluation.
-	 */
-	private ArrayList controlStack = new ArrayList(30);
-	
-	protected final ProxyFactoryRegistry registry;
-	protected final IStandardBeanProxyFactory beanProxyFactory;
-	
-	/**
-	 * Push an object onto the control stack.
-	 * 
-	 * @param o
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void push(Object o) {
-		controlStack.add(o);
-	}
-	
-	/**
-	 * Pop an object off of the control stack
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object pop() {
-		return controlStack.remove(controlStack.size()-1);
-	}
-	
-	/**
-	 * Peek at an object from the control stack. <code>fromTop</code> is how far from the top of the stack to look.
-	 * If it one, then it is the top entry, two is the next one down. Zero is an invalid value for the parameter.
-	 * @param fromTop How far from the top to peek. <code>1</code> is the top, not zero.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final Object peek(int fromTop) {
-		// 1 means the top, 2 is the next one down.
-		return controlStack.get(controlStack.size()-fromTop);
-	}
-	
-	/*
-	 * Expression type constants.
-	 */
-	
-	/*
-	 * ARRAY ACCESS expression.
-	 * The expression stack will have:
-	 * 	IExpression.ARRAYACCESS_ARRAY
-	 * 	IExpression.ARRAYACCESS_INDEX (for 1 to n times depending on index count)
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 * 	ARRAYACCESS
-	 * 	Integer(index count) 
-	 */
-	private static final Integer ARRAYACCESS_INDEX_1 = new Integer(1);	// Use in normal case of one index count. Saves object creation.
-	
-	/*
-	 * ARRAY CREATION expression.
-	 * The expression stack will have:
-	 * 	ARRAYCREATION_INITIALIZER - if hasInitializer
-	 *  IExpression.ARRAYCREATION_DIMENSION (for 0 to n times depending on dimension count)
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 *  ARRAYCREATION
-	 *  type (either a string representing the type, or an IBeanProxyType representing the type).
-	 *  Integer(dimension count) (if zero then there is an initializer) 
-	 * 
-	 * 
-	 * Note: Array Initializer works with this in that it will peek into the value stack two entries down
-	 * to find the type of array it should be creating.
-	 */
-	private static final Integer ARRAY_CREATION_DIMENSION_1 = new Integer(1);	// Use in normal case of one dimension. Save object creation.
-	private static final Integer ARRAY_CREATION_DIMENSION_0 = new Integer(0);	// Use in normal case of initializer. Save object creation.
-	private static final ForExpression ARRAY_INITIALIZER = new ExpressionEnum(Integer.MIN_VALUE+1, "Array Initializer Internal");
-	
-	/*
-	 * ARRAY INITIALIZER expression
-	 * The expression stack will have:
-	 * 	IExpression.ARRAYINITIALIZER_EXPRESSION (for n times depending on number of expressions count)
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 * 	ARRAYINITIALIZER
-	 *  type (either a string representing the type, or an IBeanProxyType representing the type).
-	 * 		I.e. if array being created is int[][], the value pushed here will be int[]. This is because when created
-	 * 		the array will wind up with int[expressioncount][] in the end.
-	 * 	Integer (expression count)
-	 * 
-	 * Note: Imbedded Array Initializers works with this in that it will peek into the value stack two entries down
-	 * to find the type of array it should be creating.
-	 */
-	private static final Integer ARRAYINITIALIZER_COUNT_0 = new Integer(0);	// Use in normal case of empty array. Save object creation.
-	private static final Integer ARRAYINITIALIZER_COUNT_1 = new Integer(1);	// Use in normal case of one element array. Save object creation.
-	private static final Integer ARRAYINITIALIZER_COUNT_2 = new Integer(2);	// Use in normal case of two element array. Save object creation.	
-	
-	/*
-	 * CAST expression.
-	 * The expression stack will have:
-	 * 	IExpression.CAST_EXPRESSION
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	CAST
-	 * 	type (either a string representing the type, or an IBeanProxyType representing the type).
-	 */
-
-	/*
-	 * CLASS INSTANCE CREATION expression.
-	 * The expression stack will have:
-	 *  IExpression.CLASSINSTANCECREATION_ARGUMENT (for 0 to n times depending on argument count)
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have
-	 *  CLASSINSTANCECREATION
-	 *  type (either a string representing the type, or an IBeanProxyType representing the type).
-	 *  Integer(argument count) 
-	 * 
-	 * 
-	 * Note: Array Initializer works with this in that it will peek into the value stack two entries down
-	 * to find the type of array it should be creating.
-	 */
-	private static final Integer CLASS_INSTANCE_CREATION_ARGUMENTS_1 = new Integer(1);	// Use in normal case of one argument. Save object creation.
-	private static final Integer CLASS_INSTANCE_CREATION_ARGUMENTS_0 = new Integer(0);	// Use in normal case of no arguments (default ctor). Save object creation.
-
-	/*
-	 * CONDITIONAL expression.
-	 * Since this can cause skipping of expressions (e.g. if condition is false, then the true condition should not be evaluated),
-	 * we need to have a process expression and process call to the other side for each expression so that it can
-	 * determine if it should be ignored or not.
-	 * 
-	 * The expression stack will have:
-	 * 	IExpression.CONDITIONAL_CONDITION
-	 * 	PROCESS_EXPRESSION
-	 * 	IExpression.CONDITIONAL_TRUE
-	 * 	PROCESS_EXPRESSION
-	 * 	IExpression.CONDITIONAL_FALSE
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	CONDITIONAL
-	 * 	CONDITIONAL_CONDITION
-	 * 	CONDITIONAL
-	 * 	CONDITIONAL_TRUE
-	 * 	CONDITIONAL
-	 * 	CONDITIONAL_FALSE
-	 * 
-	 */
-	
-	/*
-	 * PREFIX expression.
-	 * The expression stack will have:
-	 * 	IExpression.PREFIX_OPERAND
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	PREFIX
-	 * 	operator (using Integer prefix operator constants defined here) 
-	 */
-	
-	/*
-	 * INFIX expression.
-	 * Since two types of infix operators (conditional and AND or) can cause skipping of expressions (e.g. once
-	 * conditional and sees a false expression, the rest of the expressions are skipped and should not be evaluated),
-	 * we need to have a process expression and process call to the other side for each expression so that it can
-	 * determine if it should be ignored or not.
-	 * 
-	 * The expression stack will have:
-	 * 	IExpression.INFIX_LEFT
-	 * 	PROCESS_EXPRESSION
-	 * 	IExpression.INFIX_RIGHT
-	 *  PROCESS_EXPRESSION
-	 * 		(for 0 to n times depending upon extended count)
-	 * 		IExpression.INFIX_EXTENDED 
-	 * 		PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	INFIX
-	 * 	operator (using Integer infix operator constants defined here)
-	 *  IN_LEFT
-	 * 		(for (extendedCount) times) This will cover the right one and all but last extended
-	 * 		INFIX
-	 * 		operator (using Integer infix operator constants defined here)
-	 *  	IN_OTHER
-	 * INFIX
-	 * 	operator (using Integer infix operator constants defined here)
-	 *  IN_LAST (this is covers either the right one if no extended, or the last extended)
-	 */
-	
-	/*
-	 * INSTANCEOF expression.
-	 * The expression stack will have:
-	 * 	IExpression.INSTANCEOF_EXPRESSION
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	INSTANCEOF
-	 * 	type (either a string representing the type, or an IBeanProxyType representing the type).
-	 */
-
-	/*
-	 * Field access expression.
-	 * The expression stack will have:
-	 * 	IExpression.FIELD_RECEIVER (if hasReceiver is true)
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	FIELDACCESS
-	 * 	name (the name of the field)
-	 *  Boolean (true if has receiver)
-	 */
-
-	/*
-	 * Method invocation expression.
-	 * The expression stack will have:
-	 * 	IExpression.METHOD_RECEIVER (if hasReceiver is true)
-	 * 	IExpression.METHOD_ARGUMENT (0 to n times for how many arguments).
-	 * 	PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 * 	METHODINVOCATION
-	 * 	name (the name of the method)
-	 *  Boolean (true if has receiver)
-	 *  argCount (the number of arguments).
-	 */
-	private static final Integer METHOD_ARGUMENTS_1 = new Integer(1);	// Use in normal case of one argument. Save object creation.
-	private static final Integer METHOD_ARGUMENTS_0 = new Integer(0);	// Use in normal case of no arguments. Save object creation.
-	
-
-	/*
-	 * Assignment expression
-	 * The expression stack will have:
-	 *  IExpression.ASSIGNMENT_RIGHT
-	 *  IExpression.ASSIGNMENT_LEFT
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 *  ASSIGNMENT
-	 *  left expression (variable reference)
-	 *  right expression
-	 */
-
-	/*
-	 * Assignment proxy expression
-	 * The expression stack will have:
-	 *  IExpression.ASSIGNMENT_RIGHT
-	 *  PROCESS_EXPRESSION
-	 * 
-	 * The value stack will have:
-	 *  ASSIGNMENT_PROXY
-	 *  expression proxy (an expression proxy)
-	 */
-	
-	/*
-	 * Next valid for expression stack. This is kept as a stack also.
-	 * As the expressions come in, the appropriate order (in reverse)
-	 * of expression types will be pushed, and then popped as they 
-	 * come in.
-	 * 
-	 * Since we can't have an array list of ints, will simulate the
-	 * stack here.
-	 */
-	private ForExpression[] nextForExpressionStack = new ForExpression[30];
-	private int nextForExpressionStackPos = -1;	// Position of top entry in stack.
-	private boolean expressionValid = true;	// Is the expression currently valid.
-	private String invalidMsg = null;	// Msg for being invalid if default msg not sufficient.
-	private List expressionProxies;	// List of expression proxies. The index of the proxy is its id. This list must never shrink in size.
-
-	// A MarkEntry. To allow restore in case of error.
-	private static class MarkEntry {
-		public int markID;
-		public int controlStackPos;	// Position of control stack at time of mark.
-		public int nextExpressionStackPos;	// Position of nextForExpression stack at time of mark.
-		public int expressionProxiesPos;	// Position of expressionProxies list at time of mark.
-	}
-	
-	private int highestMarkID = 0;	// Next mark id. '0' is invalid, as in no marks. This is incremented for each new mark. Never decremented.
-	private MarkEntry currentMarkEntry;	// Just a convienence to the current mark entry so no need to look into the list every time.
-	private List markEntries;	// Stack of mark entries.
-	
-	// This class is here so we can add our special internal ForExpression: PROCESS_EXPRESSION. These are never used outside Expression.
-	private static class ExpressionEnum extends ForExpression {
-
-		public ExpressionEnum(int value, String name) {
-			super(value, name);
-		}
-		
-	}
-	
-	// This is pushed onto the next expression stack, and when it is popped, then the expression is complete and ready to be pushed to the proxy side.
-	private static final ForExpression PROCESS_EXPRESSION = new ExpressionEnum(Integer.MIN_VALUE, "Process Expression");
-	
-	// This is pushed onto the next expression stack for end block and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression BLOCKEND_EXPRESSION = new ExpressionEnum(PROCESS_EXPRESSION.getValue()-2, "End Block Expression");
-
-	// This is pushed onto the next expression stack for end try and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression TRYEND_EXPRESSION = new ExpressionEnum(BLOCKEND_EXPRESSION.getValue()-1, "End Try Expression");
-
-	// This is pushed onto the next expression stack for catch and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression TRYCATCH_EXPRESSION = new ExpressionEnum(TRYEND_EXPRESSION.getValue()-1, "Catch Expression");
-	
-
-	// This is pushed onto the next expression stack for begin thread transfer and will test if this there to make sure that it is being called correctly.
-	private static final ForExpression THREADTRANSFER_EXPRESSION = new ExpressionEnum(TRYCATCH_EXPRESSION.getValue()-1, "Catch Expression");
-
-	/**
-	 * Check the for expression, and if legal, set to the next valid for expression type,
-	 * if it can. If the stack entry is ROOTEXPRESSION, and the forExpression is ROOTEXPRESSION,
-	 * then the expression is allowed, but it is not popped. It must be popped later when appropriate.
-	 * <p>
-	 * This is for "block" expressions. We don't want to pop down the stack passed the ROOTEXPRESSION
-	 * that got added by the create block until we get an end block. That allows root expressions to
-	 * be added to the block without the stack popping up past the block start in the stack.
-	 * 
-	 * @param forExpression
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void checkForExpression(ForExpression forExpression) throws IllegalStateException {
-		if (expressionValid) {
-			if (nextForExpressionStackPos == -1)
-				if (forExpression == ForExpression.ROOTEXPRESSION)
-					return;	// valid. We are at the root (i.e. nothing is waiting).
-				else
-					;	// invalid. drop through
-			else if (nextForExpressionStack[nextForExpressionStackPos] == forExpression) {
-				// Valid, either the root expression matched (We don't implicitly pop those. That needs to be done explicitly). 
-				// Or we matched non-root, those will be popped.
-				if (forExpression != ForExpression.ROOTEXPRESSION) {
-					popForExpression();	// Pop the stack since stack not a root expression.
-				}
-				return;	
-			}
-		} else {
-			String expMsg = invalidMsg != null ? MessageFormat.format(ProxyMessages.getString("Expression.InInvalidStateDueTo_EXC_"), new Object[] {invalidMsg}) : ProxyMessages.getString("Expression.InInvalidState_EXC_"); //$NON-NLS-1$ //$NON-NLS-2$
-			throw new IllegalStateException(expMsg);
-		}
-		
-		// If we got here, then invalid.
-		ForExpression expected = nextForExpressionStack[nextForExpressionStackPos];
-		expressionValid = false;
-		throw new IllegalStateException(MessageFormat.format(ProxyMessages.getString("Expression.TypeSentInInvalidOrder_EXC_"), new Object[] {forExpression, expected})); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Pop the top for expression, whatever it is.
-	 * @throws IllegalStateException thrown if try to pop through through the current mark entry. The endMark is the only one who can do this.
-	 * @since 1.1.0
-	 */
-	protected final void popForExpression() throws IllegalStateException {
-		if (expressionValid && nextForExpressionStackPos >= 0) {
-			nextForExpressionStackPos--;
-			if (currentMarkEntry != null && nextForExpressionStackPos < currentMarkEntry.nextExpressionStackPos) {
-				nextForExpressionStackPos++;	// Restore to what it was
-				throwInvalidMarkNesting();
-			}
-		}
-	}
-
-	/*
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	private void throwInvalidMarkNesting() throws IllegalStateException {
-		expressionValid = false;
-		throw new IllegalStateException(MessageFormat.format(ProxyMessages.getString("Expression.InvalidMarkNesting"), new Object[] {new Integer(currentMarkEntry != null ? currentMarkEntry.markID : 0)})); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Peek into the for expression stack to see if the top entry is the passed in value. It will
-	 * not pop the stack nor throw any exceptions.
-	 * 
-	 * @param forExpression The top expression flag will be compared against this value.
-	 * @return <code>true</code> if the top expression equals the parameter passed in.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final boolean peekForExpression(ForExpression forExpression) {
-		if (expressionValid) {
-			if (nextForExpressionStackPos == -1)
-				if (forExpression == ForExpression.ROOTEXPRESSION)
-					return true;	// valid. We are at the root (i.e. nothing is waiting).
-				else
-					;	// invalid. drop through
-			else if (nextForExpressionStack[nextForExpressionStackPos] == forExpression)
-				return true;	// Valid, the top expression matched.
-		} 
-		return false;
-	}	
-	
-	/**
-	 * Mark this expression as now invalid.
-	 */
-	protected final void markInvalid() {
-		expressionValid = false;
-	}
-	
-	/**
-	 * Mark this expression as now invalid, but supply a message to go with it.
-	 * 
-	 * @param msg
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final void markInvalid(String msg) {
-		invalidMsg = msg;
-		markInvalid();
-	}
-	
-	public void close() {
-		nextForExpressionStackPos = -1;
-		controlStack.clear();
-		if (expressionProxies != null)
-			markAllProxiesNotResolved(expressionProxies);	// They weren't processed, close must of been called early.
-		expressionProxies = null;
-		markEntries = null;
-		expressionValid = false;
-		closeProxy();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#isValid()
-	 */
-	public boolean isValid() {
-		return expressionValid;
-	}
-	
-	/*
-	 * Check if the pending expression is ready for evaluation.
-	 * It is complete if the next entry on the stack is a PROCESS_EXPRESSION
-	 */
-	private boolean expressionReady() {
-		if (nextForExpressionStackPos >= 0 && nextForExpressionStack[nextForExpressionStackPos] == PROCESS_EXPRESSION) {
-			checkForExpression(PROCESS_EXPRESSION);	// pop it
-			return true;
-		} else
-			return false;
-	}
-	
-	/*
-	 * Push the next expression type.
-	 */
-	private void pushForExpression(ForExpression nextExpression) {
-		if (++nextForExpressionStackPos >= nextForExpressionStack.length) {
-			// Increase stack size.
-			ForExpression[] newStack = new ForExpression[nextForExpressionStackPos*2];	// So room to grow without excessive allocations.
-			System.arraycopy(nextForExpressionStack, 0, newStack, 0, nextForExpressionStack.length);
-			nextForExpressionStack = newStack;
-		}
-		nextForExpressionStack[nextForExpressionStackPos] = nextExpression;
-	}
-	
-	/*
-	 * Check if expression is complete, and if it is, process it.
-	 */
-	private void processExpression() {
-		while (expressionReady()) {
-			try {
-				// We've received all of the expressions for the expression, so process it.
-				int expType = ((InternalExpressionTypes) pop()).getValue();
-				switch (expType) {
-					case InternalExpressionTypes.CAST_EXPRESSION_VALUE:
-						pushCastToProxy((IProxyBeanType) pop());
-						break;
-					case InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE:
-						pushInstanceofToProxy((IProxyBeanType) pop());
-						break;
-					case InternalExpressionTypes.PREFIX_EXPRESSION_VALUE:
-						pushPrefixToProxy((PrefixOperator)pop());
-						break;
-					case InternalExpressionTypes.INFIX_EXPRESSION_VALUE:
-						pushInfixToProxy((InfixOperator) pop(), (InternalInfixOperandType) pop());
-						break;
-					case InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE:
-						pushArrayAccessToProxy(((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE:
-						pushArrayCreationToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE:
-						pushArrayInitializerToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE:
-						pushClassInstanceCreationToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE:
-						pushFieldAccessToProxy(pop(), ((Boolean) pop()).booleanValue());
-						break;
-					case InternalExpressionTypes.METHOD_EXPRESSION_VALUE:
-						pushMethodInvocationToProxy(pop(), ((Boolean) pop()).booleanValue(), ((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE:
-						pushConditionalToProxy((InternalConditionalOperandType) pop());
-						break;
-					case InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE:
-						pushAssignmentToProxy((ExpressionProxy) pop());
-						break;
-					case InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE:
-						pushAssignmentToProxy();
-						break;
-					case InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE:
-						pushBlockEndToProxy(((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.TRY_END_EXPRESSION_VALUE:
-						pushTryEndToProxy(((Integer) pop()).intValue());
-						break;
-					case InternalExpressionTypes.THROW_EXPRESSION_VALUE:
-						pushThrowToProxy();
-						break;
-					case InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE:
-						pushIfTestToProxy();
-						break;												
-					case InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE:
-						pushIfElseToProxy((InternalIfElseOperandType) pop());
-						break;						
-					default:
-						internalProcessUnknownExpressionType(expType);
-				}
-			} catch (RuntimeException e) {
-				markInvalid();
-				throw e;
-			}
-		}
-	}
-	
-
-	private void internalProcessUnknownExpressionType(int expressionType) throws IllegalArgumentException {
-		if (!processUnknownExpressionType(expressionType))
-			throw new IllegalArgumentException();
-	}
-
-	/**
-	 * An unknown expression type was found in the processing of expression stack. Subclasses can override
-	 * to process new types of expressions. 
-	 * <p>
-	 * Overrides must return <code>true</code> if they processed the expression type. If they return <code>false</code>
-	 * it means they didn't understand it either and we should do default processing for unknow type.
-	 * @param expressionType
-	 * @return <code>true</code> if type was processed, <code>false</code> if not known by subclass either.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected boolean processUnknownExpressionType(int expressionType) {
-		return false;
-	}
-
-	/**
-	 * Create the expression.
-	 * 
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	protected Expression(ProxyFactoryRegistry registry) {
-		this.registry = registry;
-		this.beanProxyFactory = this.registry.getBeanProxyFactory();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#getRegistry()
-	 */
-	public ProxyFactoryRegistry getRegistry() {
-		return registry;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#invokeExpression()
-	 */
-	public final void invokeExpression() throws ThrowableProxy, IllegalStateException, NoExpressionValueException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION); // We are at the root.
-			popForExpression();	// Get rid of any intermediate roots.
-			checkForExpression(ForExpression.ROOTEXPRESSION);	// We should be at true root now. We don't have more than one intermediate root pushed in sequence.
-			List proxies = expressionProxies;
-			expressionProxies = null;
-			pushInvoke(processExpressionProxyCallbacks(proxies), proxies);
-		} finally {
-			markInvalid(); // Mark invalid so any new calls after this will fail.
-			close();
-		}
-	}
-		
-	/*
-	 * Process the expression proxy callbacks, if any.
-	 * @return the number of proxies that have callbacks.
-	 */
-	private int processExpressionProxyCallbacks(List proxies) {
-		if (proxies != null) {
-			// Strip list down to only those with callbacks and send on.
-			int proxiesWithCallbacks = 0;
-			for (ListIterator eps = proxies.listIterator(); eps.hasNext();) {
-				ExpressionProxy proxy = (ExpressionProxy) eps.next();
-				if (!proxy.hasListeners())
-					eps.set(null);	// Remove it from the list. No one cares.
-				else
-					proxiesWithCallbacks++;
-			}
-			return proxiesWithCallbacks;
-		}
-		return 0;
-	}
-		
-	/**
-	 * Called by subclass to fill in the value of an expression proxy. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
-	 * @param ep
-	 * @param beanproxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireProxyResolved(ExpressionProxy ep, IBeanProxy beanproxy) {
-		ep.fireResolved(beanproxy);
-	}
-	
-	/**
-	 * Called by subclass to fire proxy was not resolved. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
-	 * @param ep
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireProxyNotResolved(ExpressionProxy ep) {
-		ep.fireNotResolved();
-	}
-	
-	/**
-	 * Called by subclass to fire proxy resolved to a void return type. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
-	 * @param ep
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireProxyVoid(ExpressionProxy ep) {
-		ep.fireVoidResolved();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#getExpressionValue()
-	 */
-	public final IBeanProxy getExpressionValue() throws ThrowableProxy, NoExpressionValueException, IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION); // We are at the root.
-			popForExpression();	// Get rid of any intermediate roots.
-			checkForExpression(ForExpression.ROOTEXPRESSION);	// We should be at true root now. We don't have more than one intermediate root pushed in sequence.
-			List proxies = expressionProxies;
-			expressionProxies = null;
-			return pullProxyValue(processExpressionProxyCallbacks(proxies), proxies); // Get the top value.
-		} finally {
-			markInvalid();	// Mark invalid so any new calls after this will fail. 
-			close();
-		}
-	}
-
-	
-	/**
-	 * Mark the list of proxies as not resolved. 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void markAllProxiesNotResolved(List proxies) {
-		if (proxies != null) {
-			for (ListIterator eps = proxies.listIterator(); eps.hasNext();) {
-				ExpressionProxy proxy = (ExpressionProxy) eps.next();
-				if (proxy != null && proxy.hasListeners())
-					fireProxyNotResolved(proxy);
-			}
-		}
-	}
-
-	private int blockNumber = -1;	// Current block number. This is always incrementing.
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockBegin()
-	 */
-	public final int createBlockBegin() throws IllegalStateException {
-		try {
-			// Blocks are special, they can be anywhere at root, of could be the true or else clause of an if/else.
-			if (peekForExpression(ForExpression.ROOTEXPRESSION))
-				checkForExpression(ForExpression.ROOTEXPRESSION);
-			else if (peekForExpression(ForExpression.IF_TRUE))
-				checkForExpression(ForExpression.IF_TRUE);
-			else
-				checkForExpression(ForExpression.IF_ELSE);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(BLOCKEND_EXPRESSION);
-			pushForExpression(ForExpression.ROOTEXPRESSION);
-
-			pushBlockBeginToProxy(++blockNumber);
-			push(new Integer(blockNumber));
-			push(InternalExpressionTypes.BLOCK_END_EXPRESSION);
-			processExpression();
-			return blockNumber;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockBreak(int)
-	 */
-	public final void createBlockBreak(int blockNumber) throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			pushBlockBreakToProxy(blockNumber);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockEnd()
-	 */
-	public final void createBlockEnd() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since block is done.
-			checkForExpression(BLOCKEND_EXPRESSION); // This needs to be next for it to be valid.
-			processExpression(); // Now let it handle the previously pushed end block, containing the block number being ended.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayAccess(int, int)
-	 */
-	public final void createArrayAccess(ForExpression forExpression, int indexCount) {
-		try {
-			checkForExpression(forExpression);
-			pushForExpression(PROCESS_EXPRESSION);
-			int i = indexCount;
-			while (i-- > 0)
-				pushForExpression(ForExpression.ARRAYACCESS_INDEX);
-			pushForExpression(ForExpression.ARRAYACCESS_ARRAY);
-
-			push(indexCount == 1 ? ARRAYACCESS_INDEX_1 : new Integer(indexCount));
-			push(InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayCreation(int, java.lang.String, int)
-	 */
-	public final void createArrayCreation(ForExpression forExpression, String type, int dimensionExpressionCount)
-		throws IllegalStateException {
-		pushArrayCreation(forExpression, getProxyBeanType(type), dimensionExpressionCount);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayCreation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	public final void createArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount)
-		throws IllegalStateException {
-		pushArrayCreation(forExpression, type, dimensionExpressionCount);
-	}
-
-	private void pushArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-
-			switch (dimensionExpressionCount) {
-				case 0:
-					push(ARRAY_CREATION_DIMENSION_0);
-					break;
-				case 1:
-					push(ARRAY_CREATION_DIMENSION_1);
-					break;
-				default:
-					push(new Integer(dimensionExpressionCount));
-					break;
-			}
-			push(type);
-			push(InternalExpressionTypes.ARRAY_CREATION_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			if (dimensionExpressionCount == 0)
-				pushForExpression(ARRAY_INITIALIZER);
-			else {
-				while (dimensionExpressionCount-- > 0)
-					pushForExpression(ForExpression.ARRAYCREATION_DIMENSION);
-			}
-			processExpression(); // See if previous expression is ready for processing.		
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayInitializer(int)
-	 */
-	public final void createArrayInitializer(int expressionCount) throws IllegalStateException {
-		try {
-			// This is special, we could be waiting for an array initializer or an array initializer expression.
-			// We will peek to see what it is and handle it.
-			if (peekForExpression(ARRAY_INITIALIZER))
-				checkForExpression(ARRAY_INITIALIZER);
-			else
-				checkForExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
-
-			// At this point in time that stack may either have:
-			// array_type, array_creation
-			// strip_count, array_type, array_initializer
-			// So we can get the array type from peek(2), and get the command type from peek(1).
-			// Then if the command type is array_creation, strip_count will be inited to 0, while
-			// else it will be inited to peek(3). From that we can increment the strip_count to
-			// use for this initializer.
-			//
-			// We need to peek here because we will be adding various pushes to the stack and we
-			// need to get the info while it is still at the top of the stack.
-			Object arrayType = peek(2); 
-			int stripCount = 0;
-			if (peek(1) == InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION)
-				stripCount = ((Integer) peek(3)).intValue();
-
-			switch (expressionCount) {
-				case 0:
-					push(ARRAYINITIALIZER_COUNT_0);
-					break;
-				case 1:
-					push(ARRAYINITIALIZER_COUNT_1);
-					break;
-				case 2:
-					push(ARRAYINITIALIZER_COUNT_2);
-					break;
-				default:
-					push(new Integer(expressionCount));
-					break;
-			}
-
-			if (arrayType instanceof String) {
-				String at = (String) arrayType;
-				int i = at.lastIndexOf("[]"); //$NON-NLS-1$
-				if (i == -1)
-					throw new IllegalArgumentException(MessageFormat.format(
-							ProxyMessages.getString("Expression.ArrayTypeNotAnArray_EXC_"), new Object[] { arrayType})); //$NON-NLS-1$
-				arrayType = getProxyBeanType(at);
-			} else if (!(arrayType instanceof IProxyBeanType)) {
-				throw new IllegalArgumentException(MessageFormat.format(
-						ProxyMessages.getString("Expression.ArrayTypeNotAnArray_EXC_"), new Object[] { arrayType})); //$NON-NLS-1$
-			}
-			push(new Integer(++stripCount));
-			push(arrayType);
-			push(InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			while (expressionCount-- > 0)
-				pushForExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
-
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
- 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createCastExpression(int, java.lang.String)
-	 * A cast expression has one nested expression.
-	 */
-	public final void createCastExpression(ForExpression forExpression, String type) throws IllegalStateException {
-		pushCast(forExpression, getProxyBeanType(type)); // Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createCastExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	public final void createCastExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException {
-		pushCast(forExpression, type); // Push this onto the local stack to wait for completion.
-	}
-	
-	/*
-	 * Push for a cast.
-	 */
-	private void pushCast(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(type);
-			push(InternalExpressionTypes.CAST_EXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CAST_EXPRESSION); // The next expression must be for the cast expression.
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createClassInstanceCreation(int, java.lang.String, int)
-	 */
-	public final void createClassInstanceCreation(ForExpression forExpression, String type, int argumentCount)
-		throws IllegalStateException {
-		pushClassInstanceCreation(forExpression, getProxyBeanType(type), argumentCount);	// Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createClassInstanceCreation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	public final void createClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount)
-		throws IllegalStateException {
-		pushClassInstanceCreation(forExpression, type, argumentCount);	// Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 * Push for a class instance creation
-	 */
-	private void pushClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			switch (argumentCount) {
-				case 0:
-					push(CLASS_INSTANCE_CREATION_ARGUMENTS_0);
-					break;
-				case 1:
-					push(CLASS_INSTANCE_CREATION_ARGUMENTS_1);
-					break;
-				default:
-					push(new Integer(argumentCount));
-					break;
-			}
-			push(type);
-			push(InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			while (argumentCount-- > 0)
-				pushForExpression(ForExpression.CLASSINSTANCECREATION_ARGUMENT);
-			processExpression(); // See if previous expression is ready for processing.						
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createConditionalExpression(int)
-	 */
-	public final void createConditionalExpression(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CONDITIONAL_FALSE);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CONDITIONAL_TRUE);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.CONDITIONAL_CONDITION);
-
-			push(InternalConditionalOperandType.CONDITIONAL_FALSE);
-			push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
-			push(InternalConditionalOperandType.CONDITIONAL_TRUE);
-			push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
-			push(InternalConditionalOperandType.CONDITIONAL_TEST);
-			push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createFieldAccess(int, java.lang.String, boolean)
-	 */
-	public final void createFieldAccess(ForExpression forExpression, String fieldName, boolean hasReceiver) throws IllegalStateException, IllegalArgumentException {
-		try {
-			// Only for string fieldnames is this invalid when no receiver because no way to determine receiver. (Don't handle implicit "this" yet for fields). 
-			// For the accessor that takes a IFieldProxy we can get away with no receiver because the field proxy can determine if static or not, and if not
-			// static it will fail at evaluation time.
-			if (!hasReceiver)
-				throw new IllegalArgumentException(MessageFormat.format(
-						ProxyMessages.getString("Expression.CannotHandleNoReceiveOnFieldAccess_EXC_"), new Object[] { fieldName})); //$NON-NLS-1$
-			pushFieldAccess(forExpression, fieldName, hasReceiver);
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createIfElse(boolean)
-	 */
-	public final void createIfElse(boolean hasElseClause) throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			if (hasElseClause) {
-				pushForExpression(ForExpression.IF_ELSE);
-			}
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.IF_TRUE);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.IF_CONDITION);
-
-			// We still push an else clause so that we know when finished. We don't have a pushForExpression for it because there
-			// won't be any. But the else clause processing will be on the push stack so that we can clean up when end of if stmt occurs.
-			push(InternalIfElseOperandType.ELSE_CLAUSE);	
-			push(InternalExpressionTypes.IF_ELSE_EXPRESSION);
-			
-			push(InternalIfElseOperandType.TRUE_CLAUSE);
-			push(InternalExpressionTypes.IF_ELSE_EXPRESSION);
-			push(InternalExpressionTypes.IF_TEST_EXPRESSION);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 * Push the field access.
-	 * @param forExpression
-	 * @param field String if field name, or IProxyField.
-	 * @param hasReceiver
-	 * @throws IllegalAccessException
-	 * 
-	 * @since 1.1.0
-	 */
-	private void pushFieldAccess(ForExpression forExpression, Object field, boolean hasReceiver) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(hasReceiver ? Boolean.TRUE : Boolean.FALSE); // We have a receiver
-			push(field);
-			push(InternalExpressionTypes.FIELD_ACCESS_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			if (hasReceiver)
-				pushForExpression(ForExpression.FIELD_RECEIVER);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createInfixExpression(int, int, int)
-	 */
-	public final void createInfixExpression(ForExpression forExpression, InfixOperator operator, int extendedOperandCount) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(InternalInfixOperandType.INFIX_LAST_OPERAND);
-			push(operator);
-			push(InternalExpressionTypes.INFIX_EXPRESSION);
-			int i = extendedOperandCount;
-			while (i-- > 0) {
-				push(InternalInfixOperandType.INFIX_OTHER_OPERAND);
-				push(operator);
-				push(InternalExpressionTypes.INFIX_EXPRESSION);
-			}
-			push(InternalInfixOperandType.INFIX_LEFT_OPERAND);
-			push(operator);
-			push(InternalExpressionTypes.INFIX_EXPRESSION);
-
-			i = extendedOperandCount;
-			while (i-- > 0) {
-				pushForExpression(PROCESS_EXPRESSION);
-				pushForExpression(ForExpression.INFIX_EXTENDED);
-			}
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.INFIX_RIGHT);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.INFIX_LEFT);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createInstanceofExpression(int, java.lang.String)
-	 */
-	public final void createInstanceofExpression(ForExpression forExpression, String type) throws IllegalStateException {
-		pushInstanceof(forExpression, getProxyBeanType(type));	// Push this onto the local stack to wait for completion.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createInstanceofExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	public final void createInstanceofExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException {
-		pushInstanceof(forExpression, type);	// Push this onto the local stack to wait for completion.
-	}
-	
-	/*
-	 * Push for a cast.
-	 */
-	private void pushInstanceof(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(type);
-			push(InternalExpressionTypes.INSTANCEOF_EXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.INSTANCEOF_VALUE); // The next expression must be for the instance of expression.
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createMethodInvocation(int, java.lang.String, boolean, int)
-	 */
-	public final void createMethodInvocation(ForExpression forExpression, String name, boolean hasReceiver, int argumentCount)
-		throws IllegalStateException, IllegalArgumentException {
-		try {
-			// Only for string methodnames is this invalid when no receiver because no way to determine receiver. (Don't handle implicit "this" yet for methods). 
-			// For the accessor that takes a IFieldProxy we can get away with no receiver because the field proxy can determine if static or not, and if not
-			// static it will fail at evaluation time.
-			if (!hasReceiver)
-				throw new IllegalArgumentException(MessageFormat.format(
-						ProxyMessages.getString("Expression.MethodsNeedReceiver_EXC_"), new Object[] { name})); //$NON-NLS-1$
-
-			pushMethodInvocation(forExpression, name, hasReceiver, argumentCount);
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/**
-	 * @param forExpression
-	 * @param method String for method name, IMethodProxy otherwise.
-	 * @param hasReceiver 
-	 * @param argumentCount
-	 * @throws ThrowableProxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	private void pushMethodInvocation(ForExpression forExpression, Object method, boolean hasReceiver, int argumentCount) throws IllegalArgumentException, IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			switch (argumentCount) {
-				case 0:
-					push(METHOD_ARGUMENTS_0);
-					break;
-				case 1:
-					push(METHOD_ARGUMENTS_1);
-					break;
-				default:
-					push(new Integer(argumentCount));
-					break;
-			}
-			push(hasReceiver ? Boolean.TRUE : Boolean.FALSE);
-			push(method);
-			push(InternalExpressionTypes.METHOD_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			while (argumentCount-- > 0)
-				pushForExpression(ForExpression.METHOD_ARGUMENT);
-			if (hasReceiver)
-				pushForExpression(ForExpression.METHOD_RECEIVER);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrefixExpression(int, org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
-	 */
-	public final void createPrefixExpression(ForExpression forExpression, PrefixOperator operator) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(operator);
-			push(InternalExpressionTypes.PREFIX_EXPRESSION);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.PREFIX_OPERAND);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/**
-	 * Create a new instance using the initialization string. The result must be compatible with the
-	 * given type. This is not on the IExpression interface because it is not for use of regular
-	 * customers. It is here for the allocation processer to create entries that are just strings.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param forExpression
-	 * @param initializationString
-	 * @param type
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void createNewInstance(ForExpression forExpression, String initializationString, IProxyBeanType type) {
-		try {
-			checkForExpression(forExpression);
-			pushNewInstanceToProxy(initializationString, type);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createNull(int)
-	 */
-	public final void createNull(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(null);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeLiteral(int, java.lang.String)
-	 */
-	public final void createTypeLiteral(ForExpression forExpression, String type) throws IllegalStateException {
-		createProxyExpression(forExpression, getProxyBeanType(type));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeReceiver(java.lang.String)
-	 */
-	public final void createTypeReceiver(String type) throws IllegalStateException {
-		pushTypeReceiver(getProxyBeanType(type));
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeReceiver(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	public final void createTypeReceiver(IProxyBeanType type) throws IllegalStateException {
-		pushTypeReceiver(type);
-	}
-
-	/*
-	 * Push for a type receiver.
-	 * @param type
-	 * 
-	 * @since 1.0.0
-	 */
-	private void pushTypeReceiver(IProxyBeanType type) throws IllegalStateException {
-		try {
-			// This is special because type receivers are only valid as the receiver for a field access or a method access.
-			// Since each has a different forExpression we need to test for one or the other. It doesn't make any difference
-			// which one it is, but it must be one or the other.
-			if (peekForExpression(ForExpression.FIELD_RECEIVER))
-				checkForExpression(ForExpression.FIELD_RECEIVER);
-			else
-				checkForExpression(ForExpression.METHOD_RECEIVER);
-			
-			pushTypeReceiverToProxy(type);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}			
-	}
-	
-	/*
-	 * For all of the primitive types we will be creating a IBeanProxy for them. That is because that
-	 * would be the expected result of the expression, and no need to get the other side involved.
-	 */
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, boolean)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, boolean value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, char)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, char value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, byte)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, byte value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, double)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, double value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, float)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, float value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, int)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, int value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, long)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, long value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, short)
-	 */
-	public final void createPrimitiveLiteral(ForExpression forExpression, short value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createStringLiteral(int, java.lang.String)
-	 */
-	public final void createStringLiteral(ForExpression forExpression, String value) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(beanProxyFactory.createBeanProxyWith(value));
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createProxyExpression(int, org.eclipse.jem.internal.proxy.core.IProxy)
-	 */
-	public final void createProxyExpression(ForExpression forExpression, IProxy proxy) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			pushToProxy(proxy);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createAssignmentExpression(int)
-	 */
-	public final void createAssignmentExpression(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			push(InternalExpressionTypes.ASSIGNMENT_EXPRESSION);
-			
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
-			pushForExpression(ForExpression.ASSIGNMENT_LEFT);
-			processExpression();	// See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createAssignmentExpression(int)
-	 */
-	public final ExpressionProxy createProxyAssignmentExpression(ForExpression forExpression) throws IllegalStateException {
-		try {
-			checkForExpression(forExpression);
-			ExpressionProxy proxy = allocateExpressionProxy(NORMAL_EXPRESSION_PROXY);
-			push(proxy);
-			push(InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
-			processExpression(); // See if previous expression is ready for processing.
-			return proxy;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/**
-	 * Called by registries to create an expression proxy for a bean type. It is not in the interface because it should
-	 * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
-	 * because there may already exist in the registry the true IBeanTypeProxy, and that one should be used instead.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param typeName
-	 * @return expression proxy that is hooked up and will notify when resolved. It can be called at any time. The resolution will occur at this point in the
-	 * execution stack, but since it will not interfere with the stack this is OK, other than it could throw a ClassNotFoundException on the
-	 * execution.
-	 * 
-	 * @since 1.1.0
-	 */
-	public final IProxyBeanType createBeanTypeExpressionProxy(String typeName) {
-		IBeanTypeExpressionProxy proxy = (IBeanTypeExpressionProxy) allocateExpressionProxy(BEANTYPE_EXPRESSION_PROXY);
-		proxy.setTypeName(typeName);
-		// This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
-		pushBeanTypeToProxy(proxy);
-		return proxy;
-	}
-
-	/**
-	 * Called by registries to create an expression proxy for a method. It is not in the interface because it should
-	 * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
-	 * because there may already exist in the registry the true IMethodProxy, and that one should be used instead.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param declaringType
-	 * @param methodName
-	 * @param parameterTypes parameter types or <code>null</code> if no parameter types.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public final IProxyMethod createMethodExpressionProxy(IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
-		ExpressionProxy proxy = allocateExpressionProxy(METHOD_EXPRESSION_PROXY);
-		// This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
-		pushMethodToProxy(proxy, declaringType, methodName, parameterTypes);
-		return (IProxyMethod) proxy;
-	}
-	
-	/**
-	 * Called by registries to create an expression proxy for a field. It is not in the interface because it should
-	 * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
-	 * because there may already exist in the registry the true IFieldProxy, and that one should be used instead.
-	 * <p>
-	 * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
-	 * 
-	 * @param declaringType
-	 * @param fieldName
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public final IProxyField createFieldExpressionProxy(IProxyBeanType declaringType, String fieldName) {
-		ExpressionProxy proxy = allocateExpressionProxy(FIELD_EXPRESSION_PROXY);
-		// This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
-		pushFieldToProxy(proxy, declaringType, fieldName);
-		return (IProxyField) proxy;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createProxyReassignmentExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	public final void createProxyReassignmentExpression(ForExpression forExpression, ExpressionProxy proxy) throws IllegalStateException, IllegalArgumentException {
-		try {
-			checkForExpression(forExpression);
-			if (!proxy.isValidForReassignment())
-				throw new IllegalArgumentException("Invalid expression type for reassignment:"+proxy.toString());
-			push(proxy);
-			push(InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION);
-
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
-			processExpression(); // See if previous expression is ready for processing.
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-		
-	protected static final int NORMAL_EXPRESSION_PROXY = 0;
-	protected static final int BEANTYPE_EXPRESSION_PROXY = 1;
-	protected static final int METHOD_EXPRESSION_PROXY = 2;
-	protected static final int FIELD_EXPRESSION_PROXY = 3;
-	/**
-	 * Allocate a new ExpressionProxy
-	 * @return new ExpressionProxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final ExpressionProxy allocateExpressionProxy(int proxyType) {
-		if (expressionProxies == null)
-			expressionProxies = new ArrayList();
-		// It is very important that this always creates a proxy id that is greater than all previous. This is
-		// so that it can be assured that proxies will be resolved in order of creation.
-		// Currently this is done here by using expressionProxies.size().
-		ExpressionProxy proxy = createExpressionProxy(proxyType, expressionProxies.size());
-		expressionProxies.add(proxy);
-		return proxy;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createFieldAccess(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyField, boolean)
-	 */
-	public final void createFieldAccess(ForExpression forExpression, IProxyField fieldProxy, boolean hasReceiver) throws IllegalStateException {
-		pushFieldAccess(forExpression, fieldProxy, hasReceiver);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createMethodInvocation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyMethod, boolean, int)
-	 */
-	public final void createMethodInvocation(ForExpression forExpression, IProxyMethod methodProxy, boolean hasReceiver, int argumentCount) throws IllegalArgumentException,
-			IllegalStateException {
-		pushMethodInvocation(forExpression, methodProxy, hasReceiver, argumentCount);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleFieldAccess(org.eclipse.jem.internal.proxy.core.IProxyField, org.eclipse.jem.internal.proxy.core.IProxy)
-	 */
-	public final ExpressionProxy createSimpleFieldAccess(IProxyField field, IProxy receiver) throws IllegalStateException {
-		ExpressionProxy result = createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
-		createFieldAccess(ForExpression.ASSIGNMENT_RIGHT, field, receiver != null);
-		if (receiver != null)
-			createProxyExpression(ForExpression.FIELD_RECEIVER, receiver);
-		return result;
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleFieldSet(org.eclipse.jem.internal.proxy.core.IProxyField, org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.IProxy, boolean)
-	 */
-	public final ExpressionProxy createSimpleFieldSet(IProxyField field, IProxy receiver, IProxy value, boolean wantResult) throws IllegalStateException {
-		ExpressionProxy result = null;
-		ForExpression forExpression = ForExpression.ROOTEXPRESSION;
-		if (wantResult) {
-			result = createProxyAssignmentExpression(forExpression);
-			forExpression = ForExpression.ASSIGNMENT_RIGHT;			
-		}		
-		createAssignmentExpression(forExpression);
-		createFieldAccess(ForExpression.ASSIGNMENT_LEFT, field, receiver != null);
-		if (receiver != null)
-			createProxyExpression(ForExpression.FIELD_RECEIVER, receiver);
-		createProxyExpression(ForExpression.ASSIGNMENT_RIGHT, value);
-		return result;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleMethodInvoke(org.eclipse.jem.internal.proxy.core.IMethodProxy, org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.IProxy[], boolean)
-	 */
-	public final ExpressionProxy createSimpleMethodInvoke(IProxyMethod method, IProxy receiver, IProxy[] arguments, boolean wantResult)
-			throws IllegalStateException {
-		ForExpression nextExpression = ForExpression.ROOTEXPRESSION;
-		ExpressionProxy result = null;
-		if (wantResult) {
-			result = createProxyAssignmentExpression(nextExpression);
-			nextExpression = ForExpression.ASSIGNMENT_RIGHT;
-		}
-		createMethodInvocation(nextExpression, method, receiver != null, arguments != null ? arguments.length : 0);
-		if (receiver != null)
-			createProxyExpression(ForExpression.METHOD_RECEIVER, receiver);
-		if (arguments != null) {
-			for (int i = 0; i < arguments.length; i++) {
-				createProxyExpression(ForExpression.METHOD_ARGUMENT, arguments[i]);
-			}
-		}
-		return result;
-	}
-	
-	private int tryNumber = -1;	// Current try number. This is always incrementing.
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTry()
-	 */
-	public final void createTry() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION); // Set up so that when reached we can process the TRY_END that we've pushed data for later in this method.
-			pushForExpression(TRYEND_EXPRESSION); // Must get a try end before we can process it.
-			pushForExpression(TRYCATCH_EXPRESSION); // Must get a catch/finally clause (or try end, which knows how to handle this).
-			pushForExpression(ForExpression.ROOTEXPRESSION); // Expecting root expressions for the try clause.
-
-			pushTryBeginToProxy(++tryNumber);
-			push(new Integer(tryNumber));
-			push(InternalExpressionTypes.TRY_END_EXPRESSION);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryCatchClause(org.eclipse.jem.internal.proxy.core.IProxyBeanType, boolean)
-	 */
-	public final ExpressionProxy createTryCatchClause(IProxyBeanType exceptionType, boolean wantExceptionReturned)
-			throws IllegalStateException {
-		return pushTryCatch(exceptionType, wantExceptionReturned);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryCatchClause(java.lang.String, boolean)
-	 */
-	public final ExpressionProxy createTryCatchClause(String exceptionType, boolean wantExceptionReturned)
-		throws IllegalStateException {
-		return pushTryCatch(getProxyBeanType(exceptionType), wantExceptionReturned);
-	}
-
-	/**
-	 * @param exceptionType
-	 * @param wantExceptionReturned
-	 * @return
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	private ExpressionProxy pushTryCatch(IProxyBeanType exceptionType, boolean wantExceptionReturned) throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
-			pushForExpression(TRYCATCH_EXPRESSION); // Set up for a following catch/finally clause.
-			pushForExpression(ForExpression.ROOTEXPRESSION); // Root expressions are next for the catch clause.
-
-			int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
-			ExpressionProxy ep = null;
-			if (wantExceptionReturned)
-				ep = allocateExpressionProxy(NORMAL_EXPRESSION_PROXY);
-			pushTryCatchClauseToProxy(tryNumber, exceptionType, ep);
-
-			processExpression();
-			return ep;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryEnd()
-	 */
-	public final void createTryEnd() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			if (peekForExpression(TRYCATCH_EXPRESSION))
-				checkForExpression(TRYCATCH_EXPRESSION); // This may of been next if no finally clause was added. If a finally clause was added this would not be here.
-			checkForExpression(TRYEND_EXPRESSION); // And this needs to be after that to be valid.
-
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryFinallyClause()
-	 */
-	public final void createTryFinallyClause() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
-			pushForExpression(ForExpression.ROOTEXPRESSION); // Root expressions are next for the finally clause.
-
-			int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
-			pushTryFinallyClauseToProxy(tryNumber);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createRethrow()
-	 */
-	public final void createRethrow() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			popForExpression(); // Remove the root expression since try or previous catch clause is done.
-			checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
-			// It is in a valid state, so put the catch and root back on so that things work correctly.
-			pushForExpression(TRYCATCH_EXPRESSION);
-			pushForExpression(ForExpression.ROOTEXPRESSION); 
-
-			int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
-			pushRethrowToProxy(tryNumber);
-			processExpression();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IExpression#createThrow()
-	 */
-	public final void createThrow() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			push(InternalExpressionTypes.THROW_EXPRESSION);
-			pushForExpression(PROCESS_EXPRESSION);
-			pushForExpression(ForExpression.THROW_OPERAND); // The next expression must be for the throw value.
-			processExpression(); 
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	
-	public final int mark() throws IllegalStateException {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			++highestMarkID;
-			currentMarkEntry = new MarkEntry();
-			currentMarkEntry.markID = highestMarkID;
-			currentMarkEntry.controlStackPos = controlStack.size() - 1;
-			currentMarkEntry.nextExpressionStackPos = nextForExpressionStackPos;
-			currentMarkEntry.expressionProxiesPos = expressionProxies != null ? expressionProxies.size() - 1 : -1;
-			if (markEntries == null)
-				markEntries = new ArrayList(5);
-			markEntries.add(currentMarkEntry);
-			pushMarkToProxy(highestMarkID);
-			return highestMarkID;
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-	
-	public void endMark(int markNumber) throws IllegalStateException {
-		if (isValid()) {
-			// Can only do a valid end mark if we are at root. If not at root, we fall through and treat as invalid.
-			if (peekForExpression(ForExpression.ROOTEXPRESSION)) {
-				checkForExpression(ForExpression.ROOTEXPRESSION);	// Now remove it if it should be removed. 
-				// If the current mark number is not the same as the incoming mark number, we have improper nesting.
-				if (currentMarkEntry == null || currentMarkEntry.markID != markNumber)
-					throwInvalidMarkNesting();	// We have improper nesting.
-				// We are popping the current mark. Since we are valid, just move up one in the mark stack.
-				MarkEntry me = (MarkEntry) markEntries.remove(markEntries.size()-1);
-				if (!markEntries.isEmpty())
-					currentMarkEntry = (MarkEntry) markEntries.get(markEntries.size()-1);
-				else
-					currentMarkEntry = null;
-				pushEndmarkToProxy(markNumber, false);
-				if (me.controlStackPos != controlStack.size()-1 || me.nextExpressionStackPos != nextForExpressionStackPos)
-					throwInvalidMarkNesting();	// The stacks should be back to the same size at this point for a valid end mark.
-				return;
-			}
-		} 
-		
-		// It was invalid, or became invalid.
-		if (markEntries == null)
-			throwInvalidMarkNesting();	// We have no marks, so this is an invalid end mark.
-		
-		// We are invalid, need to pop to the given markNumber.
-		// Starting from the end we search back to find the entry for the given mark number. We do it
-		// from the end because it is more likely to be closer to the end than to the beginning.
-		for (int i = markEntries.size()-1; i >=0; i--) {
-			MarkEntry me = (MarkEntry) markEntries.get(i);
-			if (me.markID == markNumber) {
-				// Found it.
-				// Trim the control stack down to the size at time of mark. (No easy way to do this other than repeated remove's.
-				// We do it backwards to eliminate repeated shuffling of entries.
-				for (int j = controlStack.size()-1; j > me.controlStackPos; j--) {
-					controlStack.remove(j);
-				}
-				
-				// Trim the expression stack. This is simple, just reset the next entry pointer.
-				nextForExpressionStackPos = me.nextExpressionStackPos;
-				
-				if (expressionProxies != null) {
-					// Now we need to mark all of the expression proxies that occured after the mark as
-					// not resolved (since someone may be listening), and remove them, and reuse the proxies.
-					for (int j = expressionProxies.size()-1; j > me.expressionProxiesPos; j--) {
-						ExpressionProxy proxy = (ExpressionProxy) expressionProxies.remove(j);
-						if (proxy != null && proxy.hasListeners())
-							fireProxyNotResolved(proxy);
-					}
-				}
-				
-				// Now that we know it is valid, we want to remove all of the mark entries above it in the stack
-				// since those are now invalid. We couldn't remove them as we were searching for the entry because
-				// if the entry wasn't found we didn't want to wipe out the probably valid ones.
-				for (int j = markEntries.size()-1; j >= i; j--) {
-					markEntries.remove(j);
-				}
-				
-				if (!markEntries.isEmpty())
-					currentMarkEntry = (MarkEntry) markEntries.get(markEntries.size()-1);
-				else
-					currentMarkEntry = null;					
-				pushEndmarkToProxy(markNumber, true);
-				expressionValid = true;
-				return;
-			} 
-		}
-		throwInvalidMarkNesting();	// The mark number wasn't found, so this is an invalid end mark.
-	}
-	
-	/**
-	 * Begin the transfer of the expression to another thread.
-	 * <p>
-	 * This is used when the expression needs to continue to be built up, but it needs
-	 * to be done on a different thread. The reason for doing something special other
-	 * than just using it on the other thread is that some proxy registries connections are
-	 * tied through the thread. If you switched to another thread the connections would not
-	 * be properly set up.
-	 * This is not on the IExpression interface because even though it is API, it is tricky
-	 * to use and so not exposed to everyone. Users can legitimately cast to Expression and 
-	 * use this as API for advanced use. 
-	 * <p>
-	 * You must be at ForExpression.ROOT_EXPRESSION.
-	 * <p>
-	 * This is used to begin the transfer. It puts it into a state ready for the transfer. Calling this
-	 * method will cause a synchronization of the expression up to the current level. This means
-	 * that it will not return until the expression has been completely processed in the proxy registry
-	 * up to this point. Typically the connection is a pipe where the instructions are just pushed onto
-	 * it and the caller is not held up waiting for the registry to process it. 
-	 * <p>
-	 * Then when the other thread is done, it will call beginTransferThread itself to signal that it is done
-	 * and that the old thread can pick it up. Then the old thread will call transferThread to pick up processing.
-	 * <p>
-	 * It will be:
-	 * <pre><code>
-	 *   ... expression stuff ...
-	 *   expression.beginTransferThread()
-	 *   ... do what is necessary to get to the other thread ...
-	 *   ... on other thread:
-	 *   expression.transferThread();
-	 *   try {
-	 *     ... do your expression stuff on this thread ...
-	 *   } finally {
-	 *     expression.beginTransferThread(); // This is to return it to old thread.
-	 *   }
-	 *   ... tell old thread to pick up ...
-	 *   ... back on old thread:
-	 *   expression.transferThread();
-	 *   ... do more expression stuff ...
-	 *   expression.invokeExpression();
-	 * </code></pre>
-	 * 
-	 * @throws IllegalStateException
-	 * @throws ThrowableProxy Thrown if there was an exception with the remote vm during this request.
-	 * @since 1.1.0
-	 */
-	public final void beginTransferThread() throws IllegalStateException, ThrowableProxy {
-		try {
-			checkForExpression(ForExpression.ROOTEXPRESSION);
-			pushForExpression(THREADTRANSFER_EXPRESSION);
-			pushBeginTransferThreadToProxy();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}
-	}
-		
-	/**
-	 * Transfer the expression to the current thread.
-	 * <p>
-	 * This is called to actually transfer to the current thread. It must be the next call against
-	 * the expression after the beginTransferThread, but on the new thread.
-	 * <p>
-	 * This is not on the IExpression interface because even though it is API, it is tricky
-	 * to use and so not exposed to everyone. Users can legitimately cast to Expression and 
-	 * use this as API for advanced use. 
-	 * @see Expression#beginTransferThread() for a full explanation.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public final void transferThread() throws IllegalStateException {
-		try {
-			checkForExpression(THREADTRANSFER_EXPRESSION);
-			pushTransferThreadToProxy();
-		} catch (RuntimeException e) {
-			markInvalid();
-			throw e;
-		}		
-	}
-	
-	
-	/**
-	 * Get the IProxyBeanType for the type string sent in.
-	 * @param type
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IProxyBeanType getProxyBeanType(String type) {
-		return getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy(this, type);
-	}
-	
-	/**
-	 * Create the expression proxy subclass that is applicable for this kind of processor. 
-	 * @param proxyType type of proxy. {@link Expression#NORMAL_EXPRESSION_PROXY
-	 * @param proxyID the id of the new expression proxy.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract ExpressionProxy createExpressionProxy(int proxyType, int proxyID);
-	
-	/**
-	 * Push this proxy to the other side. It will simply take the proxy and push it onto
-	 * its evaluation stack. It will be treated as the result of an expression. It's just 
-	 * that the expression was evaluatable on this side (since it is already a proxy).
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushToProxy(IProxy proxy);
-
-	/**
-	 * Tell the other side we are complete. This will always be called after expression evaluation, or
-	 * if expression was prematurely closed.
-	 * <p>
-	 * <b>Note:</b> The implementation must be able to handle multiple invocations, where the first call is a valid close and any
-	 * subsequent call should be ignored.
-	 * 
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void closeProxy();
-	
-	/**
-	 * Do invoke. This should simply make sure everything is done and throw any pending errors.
-	 * <p>
-	 * <b>Note:</b> The expression proxies MUST be resolved (callbacks called) in the order they are found in the expressionProxies list. This
-	 * is so that the contract is followed that resolution notifications will occur in the order of creation.
-	 * 
-	 * @param proxycount Number of Expression Proxies that need a callback.
-	 * @param list of expression proxies. If proxycount > 0, then process the non-null entries in the list. They will be of type ExpressionProxy.
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException;
-	
-	/**
-	 * Pull the top expression value from the evaluation stack. It will also under
-	 * the covers call closeProxy.  It also must process the expression proxy callbacks. It must do the expression proxy callbacks first, and then
-	 * process the result value. If an error had occured sometime during processing, it should still process the proxy callbacks before throwing
-	 * an exception.
-	 * <p>
-	 * <b>Note:</b> The expression proxies MUST be resolved (callbacks called) in the order they are found in the expressionProxies list. This
-	 * is so that the contract is followed that resolution notifications will occur in the order of creation. Also <b>REQUIRED</b> is that
-	 * the entire list must be processed of proxies must be processed by this call. It cannot do some or none.
-	 * 
-	 * @param proxycount Number of Expression Proxies that need a callback.
-	 * @param list of expression proxies. If proxycount > 0, then process the non-null entries in the list. They will be of type ExpressionProxy.
-	 * @return The top level evaluation stack value.
-	 * @throws ThrowableProxy
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException;
-	
-	/**
-	 * Push to proxy the cast expression. The expression to use will be on the top of its evaluation stack.
-	 * The result of the cast expression will be placed onto the evaluation stack.
-	 *  
-	 * @param type Cast type. 
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushCastToProxy(IProxyBeanType type);
-
-	/**
-	 * Push to proxy the instanceof expression. The expression to use will be on the top of its evaluation stack.
-	 * The result of the instanceof expression will be placed onto the evaluation stack.
-	 *  
-	 * @param type Instanceof type.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushInstanceofToProxy(IProxyBeanType type);
-	
-	/**
-	 * Push to proxy the infix operation. This is called on the completion of each operand of the expression.
-	 * So it will be called a minimum of two times.
-	 * 
-	 * @param operator The operator.
-	 * @param operandType The operand type. left, other, or last.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType);
-	
-	/**
-	 * Push to proxy the prefix expression. The expression to use will be on top of its evaluation stack.
-	 * The result of the prefix operation will be placed onto the evaluation stack.
-	 * 
-	 * @param operator 
-	 * 
-	 * @see IExpressionConstants#PRE_MINUS
-	 * @since 1.0.0
-	 */
-	protected abstract void pushPrefixToProxy(PrefixOperator operator);	
-
-	
-	/**
-	 * Push to proxy the array access. The result will be placed onto the evaluation stack.
-	 * 
-	 * @param indexCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushArrayAccessToProxy(int indexCount);
-	
-	/**
-	 * Push to proxy the array creation. The result will be placed onto the evaluation stack.
-	 * @param type The array type. 
-	 * @param dimensionCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount);
-	
-	/**
-	 * Push to proxy the array initializer. The resulting array will be placed onto the evaluation stack.
-	 * @param type The array type. (must be an array type).
-	 * @param stripDimCount the number of dimensions that must be stripped from the array type. This is needed
-	 * because the first array initializer needs to be for the component type of the array (array minus one dimension), and
-	 * each initializer after that needs one more dimension stripped off. But since we are working with possible expression
-	 * proxies for "type", we can't create the appropriate component types of the array. So we need to tell the
-	 * processor how many dims to strip from the original type (which is what is sent in on every initializer push, the original type).
-	 * @param expressionCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushArrayInitializerToProxy(IProxyBeanType type, int stripDimCount, int expressionCount);
-	
-	/**
-	 * Push to proxy the class instance creation. The resulting class instance will be placed onto the evaluation stack.
-	 * 
-	 * @param type Class type. 
-	 * @param argumentCount The number of arguments.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount);
-	
-	/**
-	 * Push to proxy the type receiver. The resulting class will be placed onto the evaluation stack, along with it also
-	 * being the expression type.
-	 * @param type Class type. 
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushTypeReceiverToProxy(IProxyBeanType type);
-
-	/**
-	 * Push to proxy the field access. The result value will be placed onto the evaluation stack.
-	 * @param field The name of the field if string, or an IFieldProxy.
-	 * @param hasReceiver Has receiver flag.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushFieldAccessToProxy(Object field, boolean hasReceiver);
-	
-	/**
-	 * Push to proxy the method invocation. The result value will be placed onto the evaluation stack.
-	 * 
-	 * @param method String for method name or IProxyMethod
-	 * @param hasReceiver
-	 * @param argCount
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount);
-	
-	/**
-	 * Push to proxy the conditional expression. This will be called on each part of expression. The expression type
-	 * will be the current part (e.g. test, true, false).
-	 * 
-	 * @param expressionType The expression type.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected abstract void pushConditionalToProxy(InternalConditionalOperandType expressionType);
-	
-	/**
-	 * Push to the proxy the expression proxy. Whatever the last expression value is will be assigned to the ExpressionProxy.
-	 * 
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushAssignmentToProxy(ExpressionProxy proxy);
-	
-	/**
-	 * Push the assignment expression. The operands are already on the stack.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushAssignmentToProxy();
-
-	
-	/**
-	 * Push the begin block expression. 
-	 * @param blockNumber 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBlockBeginToProxy(int blockNumber);
-	
-	/**
-	 * Push the end block expression.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBlockEndToProxy(int blockNumber);
-
-	/**
-	 * Push the break block expression.
-	 * @param blockNumber
-	 * 
-	 * @since 1.1.0
-	 *
-	 */
-	protected abstract void pushBlockBreakToProxy(int blockNumber);
-	
-	/**
-	 * Push the begin try expression. 
-	 * @param tryNumber 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryBeginToProxy(int tryNumber);
-
-	/**
-	 * Push the catch clause to proxy.
-	 * @param tryNumber
-	 * @param exceptionType 
-	 * @param ep ExpressionProxy to be assigned with the exception or <code>null</code> if exception is not to be assigned.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep);
-
-	/**
-	 * Push the finally clause to proxy.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryFinallyClauseToProxy(int tryNumber);
-
-	/**
-	 * Push try end to proxy.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTryEndToProxy(int tryNumber);
-	
-	/**
-	 * Push the throw of the exception to proxy.
-	 * @param exception
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushThrowToProxy();
-	
-	/**
-	 * Push a rethrow to proxy.
-	 * @param tryNumber
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushRethrowToProxy(int tryNumber);
-
-	/**
-	 * Push the BeanType Expression proxy to be resolved on the execution side.
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy);
-	
-	/**
-	 * Push the Method Expression proxy to be resolved on the execution side.
-	 * @param proxy
-	 * @param declaringType
-	 * @param methodName
-	 * @param parameterTypes parameter types or <code>null</code> if no parameters.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes);
-
-	/**
-	 * Push the Field Expression Proxy to be resolved on the execution side.
-	 * @param proxy
-	 * @param declaringType
-	 * @param fieldName
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String fieldName);
-	
-	/**
-	 * Push the If test condition to proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushIfTestToProxy();
-	
-	/**
-	 * Push a true or else clause to proxy.
-	 * @param clauseType
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushIfElseToProxy(InternalIfElseOperandType clauseType);
-	
-	/**
-	 * Push to proxy a new instance using an initialization string.
-	 * @param initializationString
-	 * @param resultType
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType);
-	
-	/**
-	 * Push the mark id to proxy.
-	 * 
-	 * @param markID
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushMarkToProxy(int markID);
-	
-	/**
-	 * Push the end mark id to proxy.
-	 * 
-	 * @param markID
-	 * @param restore <code>true</code> if this is a restore due to error, <code>false</code> if this is just a normal end mark.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushEndmarkToProxy(int markID, boolean restore);
-	
-	/**
-	 * Push the begin transfer thread to proxy.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushBeginTransferThreadToProxy() throws ThrowableProxy;
-	
-	/**
-	 * Push the actual transfer to the current thread to proxy.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract void pushTransferThreadToProxy();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
deleted file mode 100644
index 9b816ab..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
+++ /dev/null
@@ -1,339 +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 Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ExpressionProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.EventObject;
-import java.util.logging.Level;
- 
-
-/**
- * This is a proxy for an IExpression evaluation value. It is used as a place holder proxy value for result of an expression, and
- * then the value can be used in a later expression, or at the end, it can callback and return a proxy in the IDE 
- * side in a callback for usage later on outside of the IExpression.
- * <p>
- * After receiving the resolved event, listeners should not hold onto the ExpressionProxy because it would then be invalid. At that
- * point they should instead hold onto the resolved bean proxy.
- * 
- * @see org.eclipse.jem.internal.proxy.core.IExpression#assignExpressionProxy()
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createExpressionProxyExpression(int, ExpressionProxy)
- * @since 1.1.0
- */
-public class ExpressionProxy implements IProxy {
-
-	/**
-	 * The event object for the resolved event of the proxy listener.
-	 * <p>
-	 * The source will be the ExpressionProxy that is being resolved.
-	 * @since 1.1.0
-	 */
-	public static class ProxyEvent extends EventObject {
-		
-		private final IBeanProxy proxy;
-
-		/**
-		 * @param source the expression proxy for the event.
-		 * @param proxy the bean proxy the expression proxy (source) resolved to.
-		 * 
-		 * @since 1.1.0
-		 */
-		public ProxyEvent(ExpressionProxy source, IBeanProxy proxy) {
-			super(source);
-			this.proxy = proxy;
-		}
-		
-		/**
-		 * Construct the event with no proxy. Used for not resolved and void.
-		 * @param source
-		 * 
-		 * @since 1.1.0
-		 */
-		public ProxyEvent(ExpressionProxy source) {
-			this(source, null);
-		}
-		
-		/**
-		 * Get the proxy value that the expression proxy (source) resolved to.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public IBeanProxy getProxy() {
-			return proxy;
-		}
-	}
-	
-	/**
-	 * Listener for expression proxy events.
-	 * 
-	 * @since 1.1.0
-	 */
-	public interface ProxyListener {
-		/**
-		 * The expression proxy has been resolved. The event contains the resolved proxy.
-		 * At this point, any listeners should no longer hold onto the ExpressionProxy
-		 * because it is now invalid. They should hold onto the resolved bean proxy instead.
-		 * 
-		 * @param event
-		 * 
-		 * @since 1.1.0
-		 */
-		public void proxyResolved(ProxyEvent event);
-		
-		/**
-		 * This is called for ExpressionProxies that have a callback listener, but the proxy 
-		 * was never resolved. This means that the expression that assigns to the proxy was
-		 * not executed. In this case the event does not have a bean proxy in it.
-		 * 
-		 * @param event
-		 * 
-		 * @since 1.1.0
-		 */
-		public void proxyNotResolved(ProxyEvent event);
-		
-		/**
-		 * This is called for ExpressionProxies that were assigned to an expression that
-		 * had a <code>VOID</code> return type. This is usually for method invocations that
-		 * have a void return type. In this case the event does not have a bean proxy in it.
-		 * @param event
-		 * 
-		 * @since 1.1.0
-		 */
-		public void proxyVoid(ProxyEvent event);
-	}
-	
-	/**
-	 * An implementation of ProxyListener that does nothing. It can be
-	 * used as a superclass for individual listeners that are only interested
-	 * in some of the events.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static class ProxyAdapter implements ProxyListener {
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyNotResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
-		 */
-		public void proxyNotResolved(ProxyEvent event) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
-		 */
-		public void proxyResolved(ProxyEvent event) {
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyVoid(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
-		 */
-		public void proxyVoid(ProxyEvent event) {
-		}
-	}
-	
-	final private int proxyID;
-	final private int proxyType;
-	private ListenerList listenerList;
-	private Expression expression;
-	
-	/**
-	 * Create with the given proxy id.
-	 * @param proxyid
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy(int proxyid, int proxyType, Expression expression) {
-		this.proxyID = proxyid;
-		this.proxyType = proxyType;
-		this.expression = expression;
-	}
-	
-	/**
-	 * Get the expression this proxy is for. 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public Expression getExpression() {
-		return expression;
-	}
-	
-	/**
-	 * Used internally in expression to get the proxy type. 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final int getProxyType() {
-		return proxyType;
-	}
-	
-	/**
-	 * Return the proxy id.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public final int getProxyID() {
-		return proxyID;
-	}
-	
-	/**
-	 * Add a listener. If listener already added, it has no effect.
-	 * @param listener
-	 * 
-	 * @since 1.1.0
-	 */
-	public void addProxyListener(ProxyListener listener) {
-		if (listenerList == null)
-			listenerList = new ListenerList();
-		listenerList.add(listener);
-	}
-	
-	/**
-	 * Remove a listener. If listener not already added, then no error.
-	 * @param listener
-	 * 
-	 * @since 1.1.0
-	 */
-	public void removeProxyListener(ProxyListener listener) {
-		if (listenerList != null)
-			listenerList.remove(listener);
-	}
-	
-	/**
-	 * Used by internal subclasses or Expression to know if anyone is listening.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected final boolean hasListeners() {
-		return listenerList != null && !listenerList.isEmpty();
-	}
-	
-	/**
-	 * The proxy has been fired (one of the events has occurred). Subclasses should clean
-	 * up and not hold onto anything that would be expensive in case the proxy is still
-	 * held onto be someone. For example the default clears the listener list.
-	 * <p>
-	 * <b>Note:</b> Subclasses must call super.dispose().
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void dispose() {
-		listenerList = null;
-		expression = null;
-	}
-	
-	/**
-	 * Used by internal subclasses  or by Expression to fire the resolved event. Once fired all listeners are removed.
-	 * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
-	 * prevents listeners from being held on to if any one accidently still holds the proxy.
-	 * @param proxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireResolved(IBeanProxy proxy) {
-		if (hasListeners()) {
-			ProxyEvent event = new ProxyEvent(this, proxy);
-			Object[] listeners = listenerList.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				try {
-					((ProxyListener) listeners[i]).proxyResolved(event);
-				} catch (RuntimeException e) {
-					ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}
-			}
-		}
-		dispose();
-	}
-	
-	/**
-	 * Used by internal subclasses or by Expression to fire the not resolved event. Once fired all listeners are removed.
-	 * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
-	 * prevents listeners from being held on to if any one accidently still holds the proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireNotResolved() {
-		if (hasListeners()) {
-			ProxyEvent event = new ProxyEvent(this);
-			Object[] listeners = listenerList.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				try {
-					((ProxyListener) listeners[i]).proxyNotResolved(event);
-				} catch (RuntimeException e) {
-					ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}
-				
-			}
-		}
-		dispose();
-	}
-	
-	/**
-	 * Used by internal subclasses or by Expression to fire the void resolved event. Once fired all listeners are removed.
-	 * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
-	 * prevents listeners from being held on to if any one accidently still holds the proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fireVoidResolved() {
-		if (hasListeners()) {
-			ProxyEvent event = new ProxyEvent(this);
-			Object[] listeners = listenerList.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				try {
-					((ProxyListener) listeners[i]).proxyVoid(event);
-				} catch (RuntimeException e) {
-					ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-				}
-				
-			}
-		}
-		dispose();
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return true;
-	}
-	
-	/**
-	 * Is this proxy valid for reassignment. By default only if the type is NORMAL_EXPRESSION_PROXY.
-	 * Subclasses may override and return true in their cases.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isValidForReassignment() {
-		return getProxyType() == Expression.NORMAL_EXPRESSION_PROXY;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString()+": "+getProxyID();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java
deleted file mode 100644
index 6094aba..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.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.jem.internal.proxy.core;
-/*
- *  $RCSfile: IAccessibleObjectProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-/**
- * Proxy for an AccessibleObject.
- * 
- * @since 1.0.0 
- */ 
-public interface IAccessibleObjectProxy extends IBeanProxy {
-	
-	/**
-	 * Is the proxy accessible or not?
-	 * 
-	 * @return <code>true</code> if accessible.
-	 */
-	public boolean isAccessible() throws ThrowableProxy;
-	
-	/**
-	 * Set the accessible flag on the proxy.
-	 * 
-	 * @param flag <code>true</code> if accessible.
-	 * @throws ThrowableProxy
-	 */
-	public void setAccessible(boolean flag) throws ThrowableProxy;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java
deleted file mode 100644
index 1afb1c5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IArrayBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Proxy wrappering an array.
- */
-public interface IArrayBeanProxy extends IBeanProxy {
-	/**
-	 * Get the object at the specified index.
-	 */
-	IBeanProxy get(int index) throws ThrowableProxy;
-
-	IBeanProxy getCatchThrowableException(int index);
-	
-	/**
-	 * Get the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	IBeanProxy get(int [] indexes) throws ThrowableProxy; 
-	
-	/**
-	 * Get a snapshot of the array. It will return an array of proxies of the
-	 * complete first dimension of the array. This is useful if you need
-	 * to be working with more than one entry of the array. You can save
-	 * accesses to the vm by doing this. 
-	 * <p>
-	 * NOTE: This is a snapshot. It will not see changes to the array.
-	 * If an entry is set into the returned array of proxies, this will
-	 * not be reflected into the real array. Also any changes in the
-	 * contents of the first dimension of the real array will not
-	 * be reflected into this returned array of proxies. The proxies
-	 * returned are real proxies, so any changes to them will be reflected
-	 * back and forth. Treat this as an array copy to a new array.
-	 * 
-	 * @return array of proxies of the first dimension of the array.
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.1.0
-	 */
-	IBeanProxy[] getSnapshot() throws ThrowableProxy;
-	
-	/**
-	 * Set the object at the specified index.
-	 */
-	void set(IBeanProxy value, int index) throws ThrowableProxy;
-	
-	/**
-	 * Set the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	void set(IBeanProxy value, int [] indexes) throws ThrowableProxy;	 
-	
-	/**
-	 * Get the length of the first dimension of this array.
-	 * If there are multi-dimensions, you must get the appropriate
-	 * dimension from the get method to see the size of that dimension.
-	 *
-	 * e.g.
-	 *    int [3] returns 3
-	 *    int [3][2] returns 3
-	 *
-	 *    ((IArrayBeanProxy) get(1)).getLength() returns 2
-	 *    Since arrays do not have to be homogenous, there could
-	 *    be a different length array for each of the arrays 
-	 *    returned from the first dimension, the returned length
-	 *    from get(2) and get(3) could result in a different value
-	 *    from get(1).
-	 */
-	int getLength();
-
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java
deleted file mode 100644
index aef3580..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IArrayBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * A Proxy for an array type.
- */
-
-public interface IArrayBeanTypeProxy extends IBeanTypeProxy {
-	/**
-	 * getComponentType: Get the component type of this array.
-	 * e.g. (new Object[3]).getClass().getComponentType() will
-	 * return "java.lang.Object".
-	 * and (new Object[3][2][1]).getClass().getComponentType() will
-	 * return "Object[][]";
-	 */
-	public IBeanTypeProxy getComponentType();
-	/**
-	 * Return the final type, i.e. the final non-array type.
-	 * i.e. int[][] will return int.
-	 */
-	public IBeanTypeProxy getFinalComponentType();	
-	/**
-	 * Return the number of dimensions for this type.
-	 * i.e. int [][] will return 2.
-	 */
-	public int getDimensions();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java
deleted file mode 100644
index bbdda08..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-/**
- * Bean Proxy interface. This is the
- * root interface for any bean proxy instance.
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public interface IBeanProxy extends IProxy {
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject);
-
-/**
- * Test for identity among this bean proxy and the other bean proxy.
- * For some proxy systems, this may be redundent and you can be assured
- * that if the objects being proxied are identical you will receive the
- * same proxy for both. However, other implementations may not have this
- * condition. Therefor this method was created.
- * 
- * There is one restriction, constants may not necessarily be identical.
- * For instance, in some implementations, the Boolean proxy (i.e. an instance of class Boolean) is a constant, i.e. 
- * it cannot be changed. In those cases a new proxy may be created for each
- * access and so they will not be considered to be identical. In those cases false will be returned.
- * But in other implementations a new proxy will not be created and so sameAs will return true. 
- * 
- * Primitives will return true if just equal because in Java primitives are identical if the same value.
- * 
- * @param aBeanProxy
- * @return true if they are identical (i.e. ==) and not just equals.
- */
-public boolean sameAs(IBeanProxy aBeanProxy);
-  
-/**
- * Return the registry this proxy was created with.
- */
-public ProxyFactoryRegistry getProxyFactoryRegistry();
-/**
- * Return the proxied class of the bean
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public IBeanTypeProxy getTypeProxy();
-
-/**
- * Return a string representation of the bean itself
- * This could be done by finding the toString() method by a findMethod()
- * on the type proxy, etc... but toString() is so ubiquitous that it is
- * explicitly declared on the IBeanProxy interface
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public String toBeanString();
-/**
- * Is this bean still valid? It could be invalid because it
- * was specifically released but someone is still holding onto it.
- */
-public boolean isValid();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java
deleted file mode 100644
index 0565715..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IBeanProxyFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Bean Proxy Factory for creating bean proxies.
- * Creation methods are actually package protected.
- * All creation is done through the IBeanTypeProxy.
- * Specific factories may have helper methods that
- * allow creation of specific types, such as the
- * standard factory allows creation of Boolean, int's, etc.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IBeanProxyFactory {
-	/**
-	 * The factory is being terminated.
-	 * <p>
-	 * It should clean up its resources.
-	 * It should not reference any other factory because they could of
-	 * already been terminated.
-	 * <p>
-	 * For example, if it is holding onto IREMBeanProxy's, it doesn't
-	 * need to call release on them except if they are constants because
-	 * the BeanProxyFactory has all non-constant bean proxies registered
-	 * and will call the release itself.
-	 * <p>
-	 * Note: This is not meant to be called by users. It will be called internally by the proxy registry when necessary.
-	 * 
-	 * @param wait <code>true</code> should wait for completion, <code>false</code> don't necessarily wait. False is just
-	 * a suggestion. The factory may not permit not waiting. True must be honoured and it must wait.
-	 * 
-	 * @since 1.0.2
-	 */
-	public void terminateFactory(boolean wait); 
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java
deleted file mode 100644
index 2726d05..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java
+++ /dev/null
@@ -1,32 +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: IBeanTypeExpressionProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * An internal interface for the registries to create the appropriate beantype expression proxy.
- * Not to be implemented or referenced by customers.
- * @since 1.1.0
- */
-public interface IBeanTypeExpressionProxy extends IProxyBeanType {
-
-	/**
-	 * Allow the expression to set the type name.
-	 * @param typeName
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setTypeName(String typeName);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java
deleted file mode 100644
index 596b688..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java
+++ /dev/null
@@ -1,318 +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
- *******************************************************************************/
-/*
- *  $RCSfile: IBeanTypeProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-
-/**
- * A proxy for a BeanType (i.e. Java type/class). Creation date: (12/3/99 11:38:06 AM)
- * 
- * @author: Joe Winchester
- */
-public interface IBeanTypeProxy extends IBeanProxy, IProxyBeanType {
-	
-	/**
-	 * Find the most compatible constructor (out of the declared constructors). This means it will
-	 * find either an exact match or an override that is compatible, e.g. X(Object j) is returned when looking with arg type of "java.lang.String".
-	 * @param argumentTypes array of arg types or <code>null</code> if none. (In case of null, this is the default ctor, so just use that).
-	 * @return
-	 * @throws NoSuchMethodException
-	 * @throws AmbiguousMethodException
-	 * 
-	 * @since 1.1.0
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws AmbiguousMethodException, NoSuchMethodException;
-	
-	/**
-	 * Find the most compatible public method, including inheritied. This means it will
-	 * find either an exact match or an override that is compatible, e.g. xyz(Object j) is returned when looking with arg type of "java.lang.String".
-	 * @param methodName
-	 * @param argumentTypes array of arg types or <code>null</code> if none. (In case of null, just use getMethod(String methodName) since only one is compatible then.
-	 * @return
-	 * @throws AmbiguousMethodException
-	 * @throws NoSuchMethodException
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes)  throws AmbiguousMethodException, NoSuchMethodException;
-
-	/**
-	 * Return the constructor proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames);
-
-	/**
-	 * Return the constructor proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes);
-	
-	/**
-	 * Return an array of public constructors for this class. 
-	 * 
-	 * @return an array of constructor proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IConstructorProxy[] getConstructors();
-
-	/**
-	 * Return the declared constructor proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames);
-
-	/**
-	 * Return the declared constructor proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes);
-
-	/**
-	 * Return an array of declared constructors for this class. 
-	 * 
-	 * @return an array of constructor proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IConstructorProxy[] getDeclaredConstructors();
-
-	/**
-	 * Return the array of field proxies.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IFieldProxy[] getFields();
-
-	/**
-	 * Return the array of declared field proxies.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IFieldProxy[] getDeclaredFields();
-
-	/**
-	 * Return the fieldproxy on the receiver with the specified name Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IFieldProxy getFieldProxy(String fieldName);
-
-	/**
-	 * Return the declared fieldproxy on the receiver with the specified name
-	 */
-	public IFieldProxy getDeclaredFieldProxy(String fieldName);
-
-	/**
-	 * Return the method proxy on the receiver with the specified name and no arguments.
-	 * 
-	 * @param methodName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName);
-
-	/**
-	 * Return the method proxy on the receiver with the qualified class names as string arguments
-	 * 
-	 * @param methodName
-	 * @param argumentClassNames
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames);
-
-	/**
-	 * Return the method proxy on the receiver with the specified name and one argument
-	 * 
-	 * @param methodName
-	 * @param argumentClassName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentClassName);
-
-	/**
-	 * Return the method proxy on the receiver with the beanTypes as arguments
-	 * 
-	 * @param methodName
-	 * @param argumentTypes
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes);
-
-	/**
-	 * Return an array of public methods for this class. 
-	 * 
-	 * @return an array of method proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy[] getMethods();
-
-	/**
-	 * Return the declared method proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames);
-
-	/**
-	 * Return the declared method proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes);
-
-	/**
-	 * Return an array of declared methods for this class. 
-	 * 
-	 * @return an array of method proxies or <code>null</code> if an error.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IMethodProxy[] getDeclaredMethods();
-
-	/**
-	 * Return the invokable on the receiver with the specified name and no arguments.
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName);
-
-	/**
-	 * Return the method proxy on the receiver with the qualified class names as string arguments
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @param argumentClassNames
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName, String[] argumentClassNames);
-
-	/**
-	 * Return the method proxy on the receiver with the specified name and one argument
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @param argumentClassName
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName, String argumentClassName);
-
-	/**
-	 * Return the method proxy on the receiver with the beanTypes as arguments
-	 * <p>
-	 * The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param methodName
-	 * @param argumentTypes
-	 * @return 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes);
-	
-	/**
-	 * Return the constructor proxy on the receiver with no arguments Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IConstructorProxy getNullConstructorProxy();
-
-	/**
-	 * Answer the type proxy for the superclass Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy();
-
-	/**
-	 * Answer the name of the type we are proxying This is the fully qualified name. For arrays it will return the format: [Lclassname; Creation date:
-	 * (12/3/99 2:25:07 PM)
-	 */
-	public String getTypeName();
-
-	/**
-	 * Answer the formal format type name. For normal classes, this just the same as getTypeName(), but for arrays, it is of the format classname[]
-	 */
-	public String getFormalTypeName();
-
-	/**
-	 * Answer a boolean as to whether we are an array type.
-	 */
-	public boolean isArray();
-
-	/**
-	 * Answer a boolean as to whether we are a type or an interface Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public boolean isInterface();
-
-	/**
-	 * Answer a boolean as to whether we are a primitive or not.
-	 */
-	public boolean isPrimitive();
-
-	/**
-	 * Answer a boolean as to whether we are a kind of the argument We can either be it, inherit from it, or implement it
-	 */
-	public boolean isKindOf(IBeanTypeProxy aBeanProxyType);
-
-	/**
-	 * Return a new instance Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy;
-
-	/**
-	 * Return a new instance of this type using the initialization string to create the proxy. ClassCastException is thrown if the initstring doesn't
-	 * result in an object compatible with this type. InstantiationException is thrown when the initialization string cannot be parsed correctly.
-	 * Creation date: (12/3/99 2:25:07 PM)
-	 */
-	public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException;
-
-	/**
-	 * Return the exception message that happened when trying to find this bean type. Class not found is not such an exception. In that case the bean
-	 * type will be returned as a null instead. An example of such is an initialization error during loading the class, i.e. it was found but some
-	 * static failed to initialize.
-	 * 
-	 * Return null if there is no initialization error.
-	 */
-	public String getInitializationError();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java
deleted file mode 100644
index 769314d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IBeanTypeProxyFactory.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Factory for creating BeanTypeProxy's.
- * This is a common tag interface so that
- * the factory can be registered. But each
- * VM requires a different interface that
- * extends this interface. That extended
- * interface is what must be implemented in
- * each VM.
- * Creation date: (12/3/99 2:26:00 PM)
- * @author: Joe Winchester
- */
-public interface IBeanTypeProxyFactory extends IBeanProxyFactory {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java
deleted file mode 100644
index 3e1610e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IBooleanBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Optimized implementation that should be used for Boolean proxies that
- * allows the IDE VM to get the boolean value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface IBooleanBeanProxy extends IBeanProxy {
-/**
- * Return the proxied boolean as a boolean that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-boolean booleanValue();
-Boolean getBooleanValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java
deleted file mode 100644
index c95e775..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java
+++ /dev/null
@@ -1,152 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: ICallback.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.io.InputStream;
-
-/**
- * Users will create a callback of this interface
- * and register it with the factory. Then when ever
- * the callback occurs, this callback will be called
- * with data from the proxy. It can return a value too.
- *
- * Or an InputStream can be returned to supply the data.
- *  
- * @since 1.0.0
- */
-public interface ICallback {
-
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * <p>
-	 * The value returned must either be an
-	 * IBeanProxy or IBeanProxy[]. It is typed
-	 * to Object to allow either one, but it
-	 * will be checked, and if it isn't, then
-	 * null will be returned instead to the
-	 * caller.
-	 * 
-	 * @param msgID
-	 * @param parm The beanproxy - will not be null
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public Object calledBack(int msgID, IBeanProxy parm);
-
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The parms will be an array of IBeanProxys,
-	 * or an entry could be another array of IBeanProxys,
-	 * or null if null was sent to callBackWithParms.
-	 * The final component of any entry will be an
-	 * IBeanProxy. It is up to the developers to
-	 * agree on the format of the parms.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * <p>
-	 * The value returned must either be an
-	 * IBeanProxy or IBeanProxy[]. It is typed
-	 * to Object to allow either one, but it
-	 * will be checked, and if it isn't, then
-	 * null will be returned instead to the
-	 * caller.
-	 * 
-	 * @param msgID
-	 * @param parms
-	 * @return
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.ICallbackHandler#callbackWithParms(int, int, Object[])
-	 * @since 1.0.0
-	 */
-	public Object calledBack(int msgID, Object[] parms);
-	
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The parm will be an object. This occurs
-	 * if remote vm just wanted to send some objects.
-	 * They will not be proxies. It is recommended
-	 * that this be used only for small items. For
-	 * anything large, the callbackStream should be
-	 * used instead.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * <p>
-	 * The value returned must either be an
-	 * IBeanProxy or IBeanProxy[]. It is typed
-	 * to Object to allow either one, but it
-	 * will be checked, and if it isn't, then
-	 * null will be returned instead to the
-	 * caller.
-	 * 
-	 * @param msgID
-	 * @param parm The parm or <code>null</code> if null was sent.
-	 * @return
-	 * 
-	 * @see ICallback#calledBackStream(int, InputStream)
-	 * @since 1.0.0
-	 */
-	public Object calledBack(int msgID, Object parm);
-
-	/**
-	 * This is the entry point of the callback.
-	 * It will be called whenever the callback stream
-	 * occurred. It will be on its own thread.
-	 * A particular thread cannot be requested.
-	 * <p>
-	 * The callback should continue to read from the InputStream
-	 * until it returns -1 indicating no more data. The stream can
-	 * be closed. In that case the next time the remote vm wants to
-	 * send data it will first check that the stream has not been closed.
-	 * If it has, it will raise an exception on that side.
-	 * <p>
-	 * The implementation MUST return. This is 
-	 * because the callback will not be completed
-	 * until it is returned, and the process will
-	 * not continue on the remote vm until it is
-	 * returned.
-	 * 
-	 * @param msgID
-	 * @param is
-	 * 
-	 * @since 1.0.0
-	 */
-	public void calledBackStream(int msgID, InputStream is);	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java
deleted file mode 100644
index 2b2b16d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ICallbackRegistry.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-/**
- * This is the registry for handling callbacks.
- * It is used to register and deregister callbacks.
- *
- * Callbacks are split into two parts:
- * 1) CallbackProxy. This is any proxy that implements the
- *    interface ICallback. (Or the
- *    equivalent one if not standard remote vm). This is the
- *    object which will actually submit the callback on the remote
- *    vm. For example, any kind of listener. It would implement
- *    both the ICallback and the appropriate listener interface.
- *    Then when it gets called as a listener, it will redirect the
- *    call to the remote vm callback handler to submit it to the
- *    proxy side.
- * 2) Callback. This is on this side and is the object that will
- *    be notified of the callback and will execute at that time.
- *
- */
-
-public interface ICallbackRegistry {
-	
-	/**
-	 * Register this callback proxy and this callback.
-	 *
-	 * The process is to:
-	 * 1) Create the callbackProxy and the callback
-	 * 2) register these with registerCallback
-	 * 3) Now connect the callbackProxy so that it will start notifying.
-	 *    For example, if it is a normal listener, at this time do the
-	 *    addListener call to add the callbackProxy to the appropriate object.
-	 *    You don't want it to start notifying before registering it.
-	 *    (Though it won't hust it, it will just return null).
-	 */
-	public void registerCallback(IBeanProxy callbackProxy, ICallback cb);
-	
-	/**
-	 * Same as {@link ICallbackRegistry#registerCallback(IBeanProxy, ICallback) registerCallback} except that
-	 * it is deferred off into an expression.
-	 *  
-	 * @param callbackProxy
-	 * @param cb
-	 * @param expression
-	 * 
-	 * @since 1.1.0
-	 */
-	public void registerCallback(IProxy callbackProxy, ICallback cb, IExpression expression);
-	
-	/**
-	 * Deregister the callback proxy. This will remove it from the
-	 * registry and release the callback.
-	 *
-	 * The process is to:
-	 * 1) Stop the proxy from listening so it no notifies. This is usually
-	 *    removeListener on the remote vm. You don't want it notifying
-	 *    after it deregister (though it won't hurt it, it will just return null).
-	 * 2) deregister it.
-	 */
-	public void deregisterCallback(IBeanProxy callbackProxy);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java
deleted file mode 100644
index a51d7cd..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.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.jem.internal.proxy.core;
-/*
- *  $RCSfile: ICharacterBeanProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Optimized implementation that should be used for character proxies that
- * allows the IDE VM to get the character value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface ICharacterBeanProxy extends IBeanProxy, INumberBeanProxy {
-/**
- * Return the proxied character as a char that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-char charValue();
-/**
- * Return the proxied character as a Character that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-Character characterValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java
deleted file mode 100644
index 3024d05..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java
+++ /dev/null
@@ -1,178 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: IConfigurationContributionController.java,v $
- *  $Revision: 1.8 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.osgi.framework.Bundle;
-;
-/**
- * Controls contribution to the configuration. This allows the classpath
- * to be modified in an acceptable manner, so that duplicates aren't in
- * the path, or adding a project to the path in an acceptable way.
- * 
- * If only deleting or moving entries from the classpath, that can be done directly
- * to the classpath list passed in. Adding entries needs to go through this
- * controller.
- * 
- * This is meant to be implemented by developers of proxy launch configurations.
- * 
- * @version 	1.0
- * @author
- */
-public interface IConfigurationContributionController {
-	
-	/**
-	 * Append to the user classpath.
-	 */
-	public static final int APPEND_USER_CLASSPATH = 0;
-	
-	/**
-	 * Prepend to the user classpath. This will stick it in position 0. If
-	 * another prepend comes along, it will go in pos 0 and this one will move to 1.
-	 */
-	public static final int PREPEND_USER_CLASSPATH = 1;
-	
-
-	/**
-	 * Append to the boot classpath.
-	 */
-	public static final int APPEND_BOOT_CLASSPATH = 2;
-
-	/**
-	 * Prepend to the boot classpath.
-	 */
-	public static final int PREPEND_BOOT_CLASSPATH = 3;
-	
-	/**
-	 * Append a folder to the java.library.path (for things like
-	 * dll's). This should result in a folder only.
-	 * The nlsLocalize flag contribute via plugin will be
-	 * ignored for this type flag. 
-	 */
-	public static final int APPEND_JAVA_LIBRARY_PATH = 4;
-	
-	/**
-	 * Get the java project that we are contributing for.
-	 * 
-	 * @return javaproject, may be <code>null</code>
-	 * 
-	 * @since 1.0.0
-	 */
-	public IJavaProject getJavaProject();
-		
-	/**
-	 * Add a project to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param project
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeProject(IProject project) throws CoreException;
-	
-	/**
-	 * Add an external file/folder to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpath
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @deprecated use contributeClasspath(URL, int) instead.
-	 * @see #contributeClasspath(URL, int)
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(String classpath, int typeFlag);
-	
-	/**
-	 * Add an external file/folder to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpathURL
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(URL classpathURL, int typeFlag);	
-	
-	/**
-	 * Add an external files/folders to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpaths
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @deprecated use contributeClasspath(URL[], int) instead.
-	 * @see #contributeClasspath(URL[], int)
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(String[] classpaths, int typeFlag);	
-
-	/**
-	 * Add an external files/folders to the classpath. The type flag tells where to add it.
-	 * 
-	 * @param classpathURLs
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(URL[] classpathURLs, int typeFlag);	
-	
-	/**
-	 * Add a file/folder from a plugin in the running Eclipse to the classpath. The type flag tells where to add it.
-	 * In development mode it will find the bin class files instead if proxy.jars is setup correctly.
-	 * <p>
-	 * If nlsLocalize is <code>true</code>, then it will also search through the fragments in this manner:
-	 * (Note: if <code>false</code> it will still search in the fragments, but it will only return the first file found that matches.
-	 * <p>
-	 * To find the files in the fragments that are in the runtime path (i.e. libraries), it will need to use a suffix,
-	 * This is because the JDT will get confused if a runtime jar in a fragment has the same name
-	 * as a runtime jar in the main plugin. So we will use the following search pattern:
-	 * 
-	 * 1) Find in the plugin and all of the fragments those that match the name exactly
-	 * 2) Find in all of the fragments, in their runtime path (<library> stmt), those that match the name 
-	 *    but have a suffix the same as the uniqueid of the fragment (preceeded by a period). This is so that it can be easily
-	 *    found but yet be unique in the entire list of fragments. For example if looking for "runtime/xyz.jar"
-	 *    and we have fragment "a.b.c.d.frag", then in the runtime path we will look for the file
-	 *    "runtime/xyz.a.b.c.d.frag.jar".
-	 * <p>
-	 * If the files in the fragments are not in the fragments library path then it can have the same name as in the plugin.
-	 * <p>
-	 * This is useful for nls where the nls for the filename will be in one or more of the fragments of the plugin.	 	 
-	 * 
-	 * @param bundle The bundle it can be found in.
-	 * @param relativePath Path to file/folder relative to bundle root. If it is <code>APPEND_JAVA_LIBRARY_PATH</code>, it should be folder and nlsLocalize will be ignored.
-	 * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
-	 * @param nlsLocalize The usual value should be <code>false</code>. Use <code>true</code> if should look through fragments to gather them all as described in this methods description.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(Bundle bundle, String relativePath, int typeFlag, boolean nlsLocalize);	
-	
-	/**
-	 * Same as contributeClasspath(Bundle, String, int, boolean) except an IPath can be used as the relative path.
-	 * 
-	 * @param bundle
-	 * @param relativePath
-	 * @param typeFlag
-	 * @param nlsLocalize
-	 * 
-	 * @see #contributeClasspath(Bundle, String, int, boolean)
-	 * @since 1.0.0
-	 */
-	public void contributeClasspath(Bundle bundle, IPath relativePath, int typeFlag, boolean nlsLocalize);	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java
deleted file mode 100644
index c717615..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IConfigurationContributionInfo.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.IJavaProject;
- 
-/**
- * This interface will be passed to the IConfigurationContributor initialize method. It has info
- * that may be needed by the contributor. It may be saved for later use, but if classpaths have changed,
- * it won't be kept up to date.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- * 
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(IConfigurationContributionInfo)
- * @since 1.0.0
- */
-public interface IConfigurationContributionInfo {
-	/**
-	 * Get the java project that we are contributing for.
-	 * 
-	 * @return javaproject, may be <code>null</code>
-	 * 
-	 * @since 1.0.0
-	 */
-	public IJavaProject getJavaProject();
-	
-	/**
-	 * Return the map of containers (the key) that are found in the classpath. This is useful for determining
-	 * if the container impliments a contributor interface.
-	 * <p>
-	 * Value will <code>Boolean</code> and will be true if container was visible to top-level project.
-	 * 
-	 * @return Map of containers. Keys of type IClasspathContainer. Empty if launch not in a project.
-	 * 
-	 * @see org.eclipse.jdt.core.IClasspathContainer
-	 * @since 1.0.0
-	 */
-	public Map getContainers();
-	
-	/**
-	 * Return the map of container ids (the key) that are found in the classpath.
-	 * <p>
-	 * Value will <code>Boolean</code> and will be true if container id was visible to top-level project.
-	 * 
-	 * @return map of container ids. Keys of type String. Empty if launch not in a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Map getContainerIds();
-	
-	/**
-	 * Return the map of plugin ids (the key) that are found in the classpath.
-	 * <p>
-	 * Value will <code>Boolean</code> and will be true if plugin was visible to top-level project.
-	 * 
-	 * @return map of plugin ids. Key of type String. Empty if launch not in a project.
-	 * 
-	 * @since 1.0.0
-	 */
-	public Map getPluginIds();	
-	
-	/**
-	 * Return the map of project paths (the key) that are found in the classpath. The top-level project
-	 * will NOT be in this list since it is assumed to be visible to itself.
-	 * <p>
-	 * Value will <code>Boolean</code> and will be true if project was visible to top-level project.
-	 * 
-	 * @return map of project paths. Key of type <code>IPath</code>. Empty if launch not in a project.
-	 * 
-	 * @see org.eclipse.core.runtime.IPath
-	 * @since 1.0.0
-	 */
-	public Map getProjectPaths();	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java
deleted file mode 100644
index 254cd1e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java
+++ /dev/null
@@ -1,76 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: IConfigurationContributor.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-
-/**
- * This interface is used to contribute to the configuration that will be
- * used to start a proxy registry. 
- * 
- * @since 1.0.0
- */
-public interface IConfigurationContributor {
-	
-	/**
-	 * Called first before any of the other calls. This can be used to do any internal initializations
-	 * required by the other calls. That way the other calls can have the order changed as the implementation
-	 * requires.
-	 * <p>
-	 * NOTE: For those who nest configuration contributors (i.e. within an implementation of a contributor, more
-	 * contributors are discovered) then it is imperitive that when those contributors are discovered that this method
-	 * be called on them too. This is necessary so the contract with contributors can be followed. It is best if the
-	 * discoveries are actually done in the initialize method itself so that it can pass the launch info right there.
-	 * 
-	 * @param info info contains things like containers visible, etc.
-	 * 
-	 * @see IConfigurationContributionInfo
-	 * @since 1.0.0
-	 */
-	public void initialize(IConfigurationContributionInfo info);
-	
-	/**
-	 * Contribute to the classpath. The controller is used to do the actual contribution.
-	 * 
-	 * @param controller
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException;
-
-	/**
-	 * Contribute updates to the configuration. It will be called before the launch has started.
-	 * 
-	 * @param config
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) throws CoreException;
-	
-	/**
-	 * Contribute to the registry (or interact with the remote vm) after the registry has been
-	 * created.
-	 * 
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public void contributeToRegistry(ProxyFactoryRegistry registry);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java
deleted file mode 100644
index c7bc36a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
- *  $RCSfile: IConstructorProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-/**
- * This is a proxy that allows a constructor to exist in the target VM
- * and be referenced in the IDE VM
- * Creation date: (1/17/00 1:21:52 PM)
- * @author: Joe Winchester
- */
-public interface IConstructorProxy extends IAccessibleObjectProxy {
-/**
- * Return a new instance with no creation arguments,
- * i.e. for a null constructor
- * Creation date: (1/17/00 1:22:11 PM)
- */
-IBeanProxy newInstance() throws ThrowableProxy;
-/**
- * Return a new instance with the specified creation arguments
- * Creation date: (1/17/00 1:22:11 PM)
- */
-IBeanProxy newInstance(IBeanProxy[] creationArguments) throws ThrowableProxy;
-
-IBeanProxy newInstanceCatchThrowableExceptions();
-IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] creationArguments);
-
-IBeanTypeProxy[] getParameterTypes();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java
deleted file mode 100644
index 56c1264..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IDimensionBeanProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-
-/**
- * Interface to a Dimension bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IDimensionBeanProxy extends IBeanProxy {
-	public int getHeight();
-	public int getWidth();
-	public void setHeight(int height);
-	public void setWidth(int width);
-	public void setSize(int width, int height);
-	public void setSize(IDimensionBeanProxy dim);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java
deleted file mode 100644
index 8710c05..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java
+++ /dev/null
@@ -1,943 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IExpression.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/16 19:11:23 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.IExpressionConstants;
-import org.eclipse.jem.internal.proxy.initParser.tree.NoExpressionValueException;
- 
-/**
- * This is an expression. It will be evaluated on the other side. The difference between an
- * expression and using IMethodProxy's, IConstructorProxy's, etc. is the granularity. The proxies
- * are one round-trip to the other side for each access or execution. The expression builds them up
- * and will execute them all at once on the other side. Another difference is that the reflection
- * will be done on the other side too. For instance when invoking a method, the method name is
- * passed into the expression as a string then reflected and then invoked, while with method
- * proxies, the string is used to find the proxy on the other side, and then a later round-trip
- * will be used to invoke it.
- * <p>
- * Also an expression is a one-time use object. It can't be reused a second time. A new one must be
- * built up again.
- * <p>
- * We are not using separate instances of expressions, and types of expressions, because we don't
- * want to build up many objects (in a form of an expression tree) that will then be thrown away
- * (one for each expression in the nested list of expressions). We just build the command list as
- * we build the expression.
- * <p>
- * To use, you call the IStandardBeanProxyFactory's createExpression method. An IExpression is
- * returned. From there you will start creating the contents of the expression. And then you will
- * finally either getExpressionValue() to get the final value of the expression, or use
- * invokeExpression() to just execute the expression(s). If you use getExpressionValue(), there can
- * only be one root expression. If you use invokeExpression there can be more than one root
- * expression, and they will all be executed.
- * <p>
- * Since sequence is so important, it will be tested and if anything is done out of order an
- * IllegalStateException will be thrown.
- * <p>
- * Each time an expression is created, one argument passed in will be <code>forExpression</code> flag.
- * This is a set of constants used as a clue for what expression this expression is being created.
- * This is for a sanity check on the state. For example, when creating the array expression for an
- * array access, the ARRAYACCESS_ARRAY flag is passed in. This way if the current expression on the
- * stack is not for an array access waiting for the array expression, an IllegalStateException will be thrown.
- * Without this flag, it would be easy to accidently create the wrong expression at the wrong time.
- * Once such an error occurs, this IExpression will no longer be valid. IllegalStateException will be thrown
- * for any type of access.
- * <p>
- * It is guarenteed that the entire stack of commands will be sent without stopping except for IllegalStateException
- * due to out of order expressions.
- * <p>
- * <b>Note:</b> This interface is not meant to be neither instantiated nor implemented by customers.
- * It is the interface into the expression processing. It is to be instantiated through the createExpression request.
- * The {@link org.eclipse.jem.internal.proxy.core.Expression} class is available as API. It is not meant to
- * be instantiated by customers, but customers can take the IExpression and cast to Expression for some advanced
- * API.
- *  
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createExpression()
- * @see java.lang.IllegalStateException
- * @since 1.0.0
- */
-public interface IExpression extends IExpressionConstants {
-	
-	/**
-	 * Return the registry this expression is working against.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public ProxyFactoryRegistry getRegistry();
-	
-	/**
-	 * Invoke the expression(s). If there is more than one root expression, it will invoke them
-	 * in the order created. If the expression stack is not complete, then <code>IllegalStateException</code>
-	 * will be thrown.
-	 * 
-	 * @throws ThrowableProxy
-	 * @throws IllegalStateException
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void invokeExpression() throws ThrowableProxy, NoExpressionValueException, IllegalStateException;
-	
-	/**
-	 * Return whether the expression is valid. It would be invalid if any of the create... calls had thrown an
-	 * exception or if the expression has already been evaluated (invoked or getExpressionValue()).
-	 * 
-	 * @return <code>true</code> if expression is valid, <code>false</code> if there had been some error, or if the expression has already been evaluated.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isValid();
-	
-	/**
-	 * Close the expression. This needs to be called if for some reason {@link IExpression#invokeExpression()} or {@link IExpression#getExpressionValue()}
-	 * were not called. It is not an error to always call this after these calls. It will not have any problems with the expression already
-	 * being closed. invoke and getvalue automatically call close for you. If you don't call close in case of an error, the resources
-	 * for the expression will not be freed up. 
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	public void close();
-	
-	/**
-	 * Invoke the root expression and return the value of the expression. If the expression stack
-	 * is not complete, or if there is more than one root expression, then <code>IllegalStateException</code>
-	 * will be thrown.
-	 * 
-	 * @return The value of the root expression. 
-	 * 
-	 * @throws ThrowableProxy
-	 * @throws IllegalStateException
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	public IBeanProxy getExpressionValue() throws ThrowableProxy, NoExpressionValueException, IllegalStateException;
-			
-	/**
-	 * Create an Array Access (e.g. x[3]).
-	 * This must be followed by create expressions for:
-	 * <pre>
-	 *  <code>ARRAYACCESS_ARRAY</code>
-	 *  <code>ARRAYACCESS_INDEX</code> an indexCount times. 
-	 * </pre>
-	 * <p>
-	 * So the array access must be followed by 1+indexCount expressions.
-	 * 
-	 * @param forExpression This is for what expression this expression is being created.
-	 * @param indexCount The number of index expressions that will be created.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayAccess(ForExpression forExpression, int indexCount) throws IllegalStateException;
-	
-	/**
-	 * Create an Array Creation (e.g. <code>new int[3]</code> or <code>new int[3][]</code> or <code>new int[] {3, 4}</code>).
-	 * If <code>dimensionExpressionCount</code> is zero, then there must be an initializer. This is because
-	 * if there are any dimension expressions, then initializers are invalid and visa-versa.
-	 * <p>
-	 * The dimensionExpressionCount is for how many dimensions have an expression in them. For instance,
-	 * <code>new int[3]</code> will have a dimensionExpressionCount of 1. While
-	 * <code>new int[3][]</code> will also have count of 1. And finally
-	 * <code>new int []</code> will have a count of 0.
-	 * <p>
-	 * This must be followed by create expressions for:
-	 * <pre>
-	 *  <code>ARRAYCREATION_DIMENSION</code> a dimensionExpressionCount times, 
-	 *  or an <code>createArrayInitializer()</code> if dimension count is 0.
-	 * </pre>
-	 *  
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format. It must also include the correct number of  <code>[]</code> at the end.
-	 * @param dimensionExpressionCount
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayCreation(ForExpression forExpression, String type, int dimensionExpressionCount) throws IllegalStateException;
-
-	/**
-	 * Create an Array Creation (e.g. <code>new int[3]</code> or <code>new int[3][]</code> or <code>new int[] {3, 4}</code>).
-	 * If <code>dimensionExpressionCount</code> is zero, then there must be an initializer. This is because
-	 * if there are any dimension expressions, then initializers are invalid and visa-versa.
-	 * <p>
-	 * The dimensionExpressionCount is for how many dimensions have an expression in them. For instance,
-	 * <ol>
-	 * <li><code>new int[3]</code> will have a dimensionExpressionCount of 1. While
-	 * <li><code>new int[3][]</code> will also have count of 1. And finally
-	 * <li><code>new int []</code> will have a count of 0.
-	 * </ol>
-	 * The expressions that follow if dimensionExpressionCount is not zero must evaluate to be compatible to an int type (i.e. byte, char, short, or int).
-	 * Each expression will be used to create an array for that dimension of that size. For example <code>new int[3][]</code> will have an
-	 * dimension expression that evaluates to "3", and so it will create an array int[3][].
-	 * <p>
-	 * This must be followed by create expressions for:
-	 * 	dimensionExpressionCount times an: <code>ARRAYCREATION_DIMENSION</code>
-	 *  or an createArrayInitializer if dimension count is 0.
-	 *  
-	 * @param forExpression
-	 * @param type This is the type. This must be the actual type with the correct total number of dimensions (e.g. "java.lang.Object[][]").
-	 * @param dimensionExpressionCount number of int valued expressions that follow that give the size for each dimension.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount) throws IllegalStateException;
-	
-	/**
-	 * Create an array initializer. (e.g. <code>{2,3}</code>).
-	 * This one is unusual in that there is no forExpression. That is because array initializers are only valid in
-	 * certain places. And so if called when not expected, this is an IllegalStateException.
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	expressionCount times an: <code>ARRAYINITIALIZER_EXPRESSION</code>
-	 * 		except if the expression is another array initializer. That is valid and doesn't have a forExpression,
-	 * 		but it does count as one of the expressionCounts.
-	 * 
-	 * @param expressionCount Number of expressions, may be 0.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createArrayInitializer(int expressionCount) throws IllegalStateException;
-		
-	/**
-	 * Create a cast expression (e.g. <code>(short)10</code> or <code>(java.lang.String) "asd"</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>CAST_EXPRESSION</code> 
-	 *  
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createCastExpression(ForExpression forExpression, String type) throws IllegalStateException;
-
-	/**
-	 * Create a cast expression (e.g. <code>(short)10</code> or <code>(java.lang.String) "asd"</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>CAST_EXPRESSION</code> 
-	 *  
-	 * @param forExpression
-	 * @param type This is the type.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createCastExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException;
-		
-	/**
-	 * Create a new class instance expression (e.g. <code>new java.lang.Integer(5)</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	argumentCount times an: <code>CLASSINSTANCECREATION_ARGUMENT</code>
-	 * 
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @param argumentCount
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createClassInstanceCreation(ForExpression forExpression, String type, int argumentCount) throws IllegalStateException;
-
-	/**
-	 * Create a new class instance expression (e.g. <code>new java.lang.Integer(5)</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	argumentCount times an: <code>CLASSINSTANCECREATION_ARGUMENT</code>
-	 * 
-	 * @param forExpression
-	 * @param type This is the type.
-	 * @param argumentCount
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount) throws IllegalStateException;
-	
-	/**
-	 * Create a conditional expression (e.g. <code>x != 3 ? 4 : 5</code>)
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>CONDITIONAL_CONDITION</code>
-	 * 	<code>CONDITIONAL_TRUE</code>
-	 * 	<code>CONDITIONAL_FALSE</code>	
-	 * 
-	 * @param forExpression
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createConditionalExpression(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create a field access (e.g. <code>java.awt.Color.red</code>)
-	 * <p>
-	 * Note: At this time we require a receiver. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * 	<code>FIELD_RECEIVER</code> if hasReceiver is <code>true</code>
-	 * 
-	 * @param forExpression
-	 * @param fieldName The name of the field.
-	 * @param hasReceiver Has a receiver flag. Currently this must always be true. This is because can't tell what class to look into for the field without a receiver.
-	 * @throws IllegalArgumentException
-	 * @throws IllegalStateException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createFieldAccess(ForExpression forExpression, String fieldName, boolean hasReceiver) throws IllegalArgumentException, IllegalStateException;
-
-	/**
-	 * Create a field access (e.g. <code>java.awt.Color.red</code>)
-	 * <p>
-	 * Note: At this time we require a receiver for non-static access. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpressions for:
-	 * <pre>
-	 * 	<code>FIELD_RECEIVER</code> if hasReceiver is <code>true</code>
-	 * </pre>
-	 * 
-	 * @param forExpression
-	 * @param fieldProxy The field proxy for the field.
-	 * @param hasReceiver Has a receiver flag.
-	 * @throws IllegalStateException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createFieldAccess(ForExpression forExpression, IProxyField fieldProxy, boolean hasReceiver) throws IllegalStateException;
-
-	/**
-	 * Create an if/else stmt. Since this is a statment, there is no ForExpression. ROOT_EXPRESSION must be the next expression type.
-	 * <p<
-	 * This must be followed by createExpressions for:
-	 * <pre>
-	 *   <code>IF_CONDITION</code> The if test, must return boolean.
-	 *   <code>IF_TRUE</code> The if condition is true clause. The clause may be an expression, or a block.
-	 *   <code>IF_ELSE</code>  if hasElseClause is <code>true</code>. The else clause. The clause may be an expression, or a block.
-	 * </pre>
-	 * 
-	 * @param hasElseClause
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createIfElse(boolean hasElseClause) throws IllegalStateException;
-	
-	/**
-	 * Create an infix expression (e.g. <code>3 + 4</code> or <code>3 + 4 + 5</code>).
-	 * <p>
-	 * If there are more than 2 operands (all with the same operator) then for convienence all of
-	 * the expression can be done in one expression than requiring several, one for each operator.
-	 * If they are different operators, then different expressions will be required.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>INFIX_LEFT</code>
-	 * 	<code>INFIX_RIGHT</code>
-	 * 	extendedOperandCount times an: <code>INFIX_EXTENDED</code>
-	 * </pre>
-	 * 
-	 * @param forExpression
-	 * @param operator The operator.
-	 * @param extendedOperandCount The number of extended operands. May be zero.
-	 * @throws IllegalStateException
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.IExpressionConstants#IN_AND
-	 * @since 1.0.0
-	 */
-	public void createInfixExpression(ForExpression forExpression, InfixOperator operator, int extendedOperandCount) throws IllegalStateException;
-	
-	/**
-	 * Create an instanceof expression (e.g. <code>x instanceof java.lang.String</code>
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>INSTANCEOF_VALUE</code>
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createInstanceofExpression(ForExpression forExpression, String type) throws IllegalStateException;
-	
-	/**
-	 * Create an instanceof expression (e.g. <code>x instanceof java.lang.String</code>
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>INSTANCEOF_VALUE</code>
-	 * @param forExpression
-	 * @param type This is the type.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createInstanceofExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException;
-	
-	/**
-	 * Create a method invocation expression (e.g. <code>java.lang.String.valueOf(10)</code>).
-	 * When using a string the method invoked will be the one most compatible with the arguments sent. 
-	 * This allows overloading a method to occur when coming in from a parse tree, since the parse tree
-	 * doesn't know the exact method to use.
-	 * <p>
-	 * Note: At this time we require a receiver. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>METHOD_RECEIVER</code>
-	 * 	argumentCounts times expressions for: <code>METHOD_ARGUMENT</code>
-	 * 
-	 * @param forExpression
-	 * @param name The name of the method
-	 * @param hasReceiver Has a receiver flag. Currently this must always be true.
-	 * @param argumentCount Count of number of arguments. May be zero.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createMethodInvocation(ForExpression forExpression, String name, boolean hasReceiver, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * Create a method invocation expression (e.g. <code>java.lang.String.valueOf(10)</code>)
-	 * <p>
-	 * Note: At this time we require a receiver. In the future it may be possible to not have one, but
-	 * for that we need a <code>this</code> object to know who the receiver implicitly is.
-	 * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>METHOD_RECEIVER</code>
-	 * 	argumentCounts times expressions for: <code>METHOD_ARGUMENT</code>
-	 * 
-	 * @param forExpression
-	 * @param methodProxy The proxy of the method
-	 * @param hasReceiver Has a receiver flag. Currently this must always be true.
-	 * @param argumentCount Count of number of arguments. May be zero.
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException
-	 * 
-	 * @see IExpression#createTypeReceiver(String)
-	 * @since 1.0.0
-	 */
-	public void createMethodInvocation(ForExpression forExpression, IProxyMethod methodProxy, boolean hasReceiver, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-
-	/**
-	 * Create a prefix expression (e.g. <code>!flag</code> or <code>-(3+4)</code>).
-	 * If you are just trying to create a signed numeric literal, just use the createPrimitiveLiteral passing in a
-	 * negative value. You don't need to use prefix expression for that.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>PREFIX_OPERAND</code>
-	 * </pre>
-	 * @param forExpression
-	 * @param operator The operator. The values come from IExpressionConstants, the prefix constants.
-	 * @throws IllegalStateException
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.common.IExpressionConstants#PRE_PLUS
-	 * @since 1.0.0
-	 */
-	public void createPrefixExpression(ForExpression forExpression, PrefixOperator operator) throws IllegalStateException;
-	
-	/**
-	 * Create a reference to <code>null</code>.
-	 * 
-	 * @param forExpression
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createNull(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create a type literal (e.g. <code>java.lang.String.class</code>). This is used when the type is being used as value itself, not
-	 * as a receiver for a field or method or constructor or instanceof. Like as an argument to a method.
-	 * <p>
-	 * Note: If you want a type literal to be an IProxyBeanType, just use {@link IExpression#createProxyExpression(ForExpression, IProxy)} and pass in the
-	 * IProxyBeanType.
-	 * 
-	 * @param forExpression
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createTypeLiteral(ForExpression forExpression, String type) throws IllegalStateException;
-	
-	/**
-	 * Create a type receiver. This is where a type is used as the receiver of a field access or a method invocation.
-	 * (e.g. <code>java.lang.String.valueOf(10)</code>). For this the "java.lang.String" IBeanTypeProxy is the type receiver.
-	 * <p>
-	 * This is unusual in that there is no forExpression. It isn't needed because these are only valid
-	 * in certain situations (method or field receiver) and if used anywhere else it is an error.
-	 * 
-	 * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createTypeReceiver(String type) throws IllegalStateException;
-
-	/**
-	 * Create a type receiver. This is where a type is used as the receiver of a field access or a method invocation.
-	 * (e.g. <code>java.lang.String.valueOf(10)</code>). For this the "java.lang.String" IProxyBeanType is the type receiver.
-	 * <p>
-	 * This is unusual in that there is no forExpression. It isn't needed because these are only valid
-	 * in certain situations (method or field receiver) and if used anywhere else it is an error.
-	 * 
-	 * @param type This is the type proxy.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createTypeReceiver(IProxyBeanType type) throws IllegalStateException;
-	
-	/**
-	 * Create a boolean primitive literal (e.g. <code>true</code>).
-	 * 
-	 * @param forExpression
-	 * @param value The boolean value for the literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, boolean value) throws IllegalStateException;
-	
-	/**
-	 * Create a character literal (e.g. <code>'a'</code> or <code>'\n'</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The character value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, char value) throws IllegalStateException;
-
-	/**
-	 * Create a byte literal (e.g. <code>(byte)10</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The byte value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, byte value) throws IllegalStateException;
-
-	/**
-	 * Create a double literal (e.g. <code>10d</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The double value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, double value) throws IllegalStateException;
-
-	/**
-	 * Create a float literal (e.g. <code>10f</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The float value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, float value) throws IllegalStateException;
-	
-	/**
-	 * Create a int literal (e.g. <code>100000</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The int value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, int value) throws IllegalStateException;
-	
-	/**
-	 * Create a long literal (e.g. <code>10l</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The long value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, long value) throws IllegalStateException;
-	
-	/**
-	 * Create a short literal (e.g. <code>(short)10</code>)
-	 * 
-	 * @param forExpression
-	 * @param value The short value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createPrimitiveLiteral(ForExpression forExpression, short value) throws IllegalStateException;
-	
-	/**
-	 * Create a string literal (e.g. <code>"asdf"</code>). The value is the actual string, with escapes already
-	 * translated into the true character values.
-	 *  
-	 * @param forExpression
-	 * @param value The string value for this literal.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createStringLiteral(ForExpression forExpression, String value) throws IllegalStateException;
-	
-	/**
-	 * Create an expression that has an existing bean proxy as its value.
-	 * 
-	 * @param forExpression This is for what expression this expression is being created.
-	 * @param proxy The proxy that should be used as a value, either a bean proxy or an expression proxy.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void createProxyExpression(ForExpression forExpression, IProxy proxy) throws IllegalStateException;
-		
-	/**
-	 * Create an assignment expression between a VariableReference and an expression. The left operand must be a variable reference (e.g. FieldAccess or
-	 * ArrayAccess). The right operand may be any expression that results in a value.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 *  <code>ASSIGNMENT_LEFT</code>
-	 * 	<code>ASSIGNMENT_RIGHT</code>
-	 * </pre>
-	 * @param forExpression
-	 * @throws ThrowableProxy
-	 * @throws IllegalStateException
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createAssignmentExpression(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create an assignment expression (e.g. x = 3+4) where x will be assigned to the ExpressionProxy. 
-	 * It may be used later on as a value in {@link IExpression#createExpressionProxyExpression(int, ExpressionProxy)}.
-	 * Or if callbacks were added, the callbacks would be called to return the true IBeanProxy value of the expression proxy when the complete
-	 * IExpression has been evaluated. The value of the assignment expression (e.g. x) will be passed on into the next expression.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>ASSIGNMENT_RIGHT</code>
-	 * </pre>
-	 * <p>
-	 * <b>Note:</b> It is guarenteed as part of the contract that expression proxies will be notified through the listeners of the final state in the
-	 * order the expression proxies were created. 
-	 * @param forExpression This is for what expression this expression is being created.
-	 * @return a proxy to the expression value. 
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createProxyAssignmentExpression(ForExpression forExpression) throws IllegalStateException;
-	
-	/**
-	 * Create a reassignment expression. This is like the original proxy assignment except that instead of returning a new proxy, it
-	 * reassigns the new value to the existing proxy. This cannot be used on IBeanTypeExpressionProxy's. That is because
-	 * they are controlled by the registry and severe errors would occur if they were reassigned.
-	 * <p>
-	 * <pre>
-	 * This must be followed by createExpressions for:
-	 * 	<code>ASSIGNMENT_RIGHT</code>
-	 * </pre>
-	 * <p>
-	 * <b>Note:</b> Since we are not creating a new proxy, the notification on the callbacks will be in the original order of proxies. This
-	 * does not change the notification position of this proxy.
-	 * 
-	 * @param forExpression
-	 * @param proxy
-	 * @throws IllegalStateException
-	 * @throws IllegalArgumentException if the expression proxy is for a BeanType instead of just a standard expression proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createProxyReassignmentExpression(ForExpression forExpression, ExpressionProxy proxy) throws IllegalStateException, IllegalArgumentException;
-	
-	/**
-	 * A simple method invocation. This is a helper to make it easier for a simple method invoke. It uses only the 
-	 * method proxy (not a string to look it up), it uses a IBeanProxy receiver (not a complicated expression), and the
-	 * arguments are a mixture of IBeanProxies and ExpressionProxies. Also it can be called only when the next
-	 * expression must be a RootExpression.
-	 * 
-	 * @param method methodproxy of the method
-	 * @param receiver the receiver proxy or <code>null</code> if a static method
-	 * @param arguments array of arguments, where each element can only be either <code>null</code> for a null argument, <code>IProxy</code>. The array can be <code>null</code> if no arguments.
-	 * @param wantResult <code>true</code> if you want an ExpressionProxy back, otherwise it will return <code>null</code>. For performance reasons, only use <code>true</code> if you really need the expression proxy.
-	 * @return expression proxy if "wantResult" was true, else <code>null</code>.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createSimpleMethodInvoke(IProxyMethod method, IProxy receiver, IProxy[] arguments, boolean wantResult) throws IllegalStateException;
-
-	/**
-	 * A simple field access. This is a helper to make it easier for a simple field access. It uses only the 
-	 * field proxy (not a string to look it up), and the bean proxy that is the receiver. Also it can be called only when the next
-	 * expression must be a RootExpression. It doesn't allow complicated field access, such as <code>fielda.fieldb.fieldc</code>.
-	 * Since this is a field access, it will always return an ExpressionProxy. It doesn't make sense to have a simple field access
-	 * that doesn't return one.
-	 * 
-	 * @param field field proxy of the field.
-	 * @param receiver the receiver proxy. It may be <code>null</code> for static fields.
-	 * @return expression proxy to the result of the access.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createSimpleFieldAccess(IProxyField field, IProxy receiver) throws IllegalStateException;
-
-	/**
-	 * A simple field set. This is a helper to make it easier for a simple field access. It uses only the 
-	 * field proxy (not a string to look it up), and the bean proxy that is the receiver. Also it can be called only when the next
-	 * expression must be a RootExpression. It doesn't allow complicated field access setting, such as <code>fielda.fieldb.fieldc = 3</code>.
-	 * 
-	 * @param field field proxy of the field.
-	 * @param receiver the receiver proxy. It may be <code>null</code> if this is a static field.
-	 * @param value the value proxy to set it to or <code>null</code> if set to null value.
-	 * @param wantResult <code>true</code> if you want an ExpressionProxy back, otherwise it will return <code>null</code>. For performance reasons, only use <code>true</code> if you really need the expression proxy.
-	 * @return expression proxy if "wantResult" was true, else <code>null</code>.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createSimpleFieldSet(IProxyField field, IProxy receiver, IProxy value, boolean wantResult) throws IllegalStateException;
-
-	/**
-	 * Begin a block. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * Eventually {@link Expression#createBlockEnd()} must be called. You should use this pattern:
-	 * <pre><code>
-	 * exp.createBeginBlock();
-	 * try {
-	 *   exp.create something else.
-	 *   ...
-	 * } finally {
-	 *   exp.createEndBlock();
-	 * }
-	 * </code></pre>
-	 * 
-	 * @return blocknumber for the block just opened. Can be used in {@link Expression#createBlockBreak(int)}.
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public int createBlockBegin() throws IllegalStateException;
-	
-	/**
-	 * Does a break for the specified block number. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * @param blockNumber
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createBlockBreak(int blockNumber) throws IllegalStateException;
-
-	/**
-	 * End a block. It will always end the inner most block that currently is on the stack. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * @throws IllegalStateException
-	 * 
-	 * @see Expression#createBlockBegin()
-	 * @since 1.1.0
-	 */
-	public void createBlockEnd() throws IllegalStateException;
-	
-	/**
-	 * Create a try/catch statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * There must be at least one catch or finally clause before try end or this is invalid.
-	 * <p>
-	 * This should be executed in the following way:
-	 * <pre><code>
-	 * exp.createTry();
-	 * try {
-	 *   ... create other exceptions ...
-	 *   ... create catch/finally clauses as needed.
-	 * } finally {
-	 *   if (exp.isValid())
-	 *     exp.createTryEnd();
-	 * }
-	 * </code></pre>
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createTry() throws IllegalStateException;
-	
-
-	/**
-	 * Create a catch clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * Using this you can get just the exception as a proxy and/or execute some expressions as part of the catch clause.
-	 * <p>
-	 * This can be followed by RootExpressions, or another catch, or a finally, or a try end.
-	 *  
-	 * @param exceptionType the type of the exception to catch on.
-	 * @param wantExceptionReturned <code>true</code> if you want an expression proxy for the exception.
-	 * @return the ExpressionProxy for the exception if <code>wantExceptionReturned</code> is <code>true</code>, <code>null</code> otherwise.
-	 * 
-	 * @throws IllegalStateException
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createTryCatchClause(IProxyBeanType exceptionType, boolean wantExceptionReturned) throws IllegalStateException;;
-
-	/**
-	 * Create a catch clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * Using this you can get just the exception as a proxy and/or execute some expressions as part of the catch clause.
-	 * <p>
-	 * This can be followed by RootExpressions, or another catch, or a finally, or a try end.
-	 *  
-	 * @param exceptionType the type of the exception to catch on.
-	 * @param wantExceptionReturned <code>true</code> if you want an expression proxy for the exception.
-	 * @return the ExpressionProxy for the exception if <code>wantExceptionReturned</code> is <code>true</code>, <code>null</code> otherwise.
-	 * 
-	 * @throws IllegalStateException
-	 * @since 1.1.0
-	 */
-	public ExpressionProxy createTryCatchClause(String exceptionType, boolean wantExceptionReturned) throws IllegalStateException;;
-
-	/**
-	 * Create a finally clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * There must be no more catch clauses for the try statement after this finally clause.
-	 * 
-	 * @throws IllegalStateException
-	 * @since 1.1.0
-	 */
-	public void createTryFinallyClause() throws IllegalStateException;;
-	
-	/**
-	 * Create the end of the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * There must be no more catch/finally clauses after this except if a new try statement is started.
-	 * 
-	 * @throws IllegalStateException
-	 * @since 1.1.0
-	 */
-	public void createTryEnd() throws IllegalStateException;;
-	
-	/**
-	 * Create a throw. No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * The next expression is the exception to be thrown.
-	 * <p>
-	 * This must be followed by createExpression for:
-	 * 	<code>THROW_OPERAND</code>
-	 *  
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createThrow() throws IllegalStateException;
-	
-	/**
-	 * Create a rethrow. This must be within a catch clause or there is an error.
-	 * <p> 
-	 * This is a shortcut for:
-	 * <pre><code>
-	 * try {
-	 *   .. do something ..
-	 * } catch (AnException e) {
-	 *   .. do something ..
-	 *   throw e;
-	 * }
-	 * </code></pre>
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void createRethrow() throws IllegalStateException;
-
-	
-	/**
-	 * Mark the expression stack so that if there are IllegalStateExceptions errors that would make the
-	 * expression invalid, you can restore back to this mark point and the expression will now be valid
-	 * again and at the state it was when mark was created. All marks must be ended, and at the same nesting
-	 * level.
-	 * <p>
-	 * No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * <p>
-	 * It must be used in conjunction with endMark. You must use <code>mark;try/finally{endMark;}</code> because
-	 * the mark/endMark must match up. 
-	 * <pre><code>
-	 * int mark = expression.mark();
-	 * try {
-	 *   expression.create ...
-	 * } catch (IllegalStateException e) {
-	 *   process the error.
-	 * } finally {
-	 *   expression.endMark(mark); // After this, the expression will be valid again.
-	 * }
-	 * </code></pre>
-	 * <p>
-	 * However, the following code would be invalid nesting, and will throw an IllegalStateException on the createTryEnd. This is because
-	 * we tried to end the Try statement within the mark. This is invalid because if we let it go through it would
-	 * of popped the stack and when we got to the endMark the stack would of been popped past it and it could not
-	 * be restored to the same state as it was at the time of the mark. The try would of already been ended.
-	 * <pre><code>
-	 * expression.createTry();
-	 * int mark = expression.mark();
-	 * try {
-	 *   expression.create ...
-	 *   expression.createTryEnd();
-	 * } catch (IllegalStateException e) {
-	 *   process the error. The expression is now invalid.
-	 * } finally {
-	 *   expression.endMark(mark); // After this, the expression will be valid again, if it had gone invalid.
-	 * }
-	 * </code></pre>
-	 * <p>
-	 * If not at RootExpression at time of mark() request, an IllegalStateException will be thrown.
-	 * @return mark number, this number will be used in the cooresponding endMark.
-	 * @throws IllegalStateException
-	 * 
-	 * @see IExpression#endMark(int)
-	 * @since 1.1.0
-	 */
-	public int mark() throws IllegalStateException;
-	
-	/**
-	 * The end mark for a mark. 
-	 * <p>
-	 * No need for a forExpression because it must currently be at ROOTEXPRESSION.
-	 * @param markNumber
-	 * @throws IllegalStateException
-	 * 
-	 * @see IExpression#mark()
-	 * @since 1.1.0
-	 */
-	public void endMark(int markNumber) throws IllegalStateException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java
deleted file mode 100644
index d6e9967..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.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.jem.internal.proxy.core;
-/*
- *  $RCSfile: IFieldProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-/**
- * A Proxy to a field that allows the field value to be retrieved and set
- * This allows target VM proxying of the field and is analagous to the java.lang.Reflect.Field
- * in the same way IMethodProxy is analagous to java.lang.Reflect.Method
- * Creation date: (1/17/00 12:17:52 PM)
- * @author: Joe Winchester
- */
-public interface IFieldProxy extends IAccessibleObjectProxy, IProxyField {
-/**
- * Return the type of the field.
- */
-IBeanTypeProxy getFieldType();
-
-/**
- * Return the value of us on the subject argument.
- * If the field is a primitive type, the return proxy
- * will be of the primitive type too.  
- * Creation date: (1/17/00 12:28:48 PM)
- */
-IBeanProxy get(IBeanProxy aSubject) throws ThrowableProxy;
-
-/**
- * Set the argument as the field value on the subject
- * Creation date: (1/17/00 12:28:48 PM)
- */
-void set(IBeanProxy aSubject, IBeanProxy argument) throws ThrowableProxy;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java
deleted file mode 100644
index 7d5eeb9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IIntegerBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Interface to an integer bean proxy.
- * We originally had only an Integer proxy,
- * so the use of it was throughout the system.
- * We are now supporting Number instead, but
- * because there were so many places using int,
- * we've left it in.
- * Creation date: (2/6/00 8:52:42 AM)
- * @author: Joe Winchester
- */
-public interface IIntegerBeanProxy extends INumberBeanProxy {
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java
deleted file mode 100644
index 1de2291..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IInvokable.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:45 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * Interface for invoking method calls on the vm.
- * IMethodProxy implements it for when you have a method proxy available,
- * but you can also get a straight invokable which will get the
- * proxy on the vm at the time of execution.
- * <p>
- * The method proxy factory can be used to return either method
- * proxies when the invokable will be used over and over, and
- * it can return IInvokable's when it is one shot deal. Though even
- * when one-shot deal it can be used over and over. There is just overhead because the 
- * method is looked up each time. So a reasonable compromise would be if
- * using it infrequently or use closely together once or twice it is better
- * to use a Invokable instead of a method proxy.
- * @since 1.0.0
- */
-public interface IInvokable {
-
-	/**
-	 * Invoke us on the subject
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy;
-
-	/**
-	 * Invoke us on the subject with the specified argument
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invoke(IBeanProxy subject, IBeanProxy argument) throws ThrowableProxy;
-
-	/**
-	 * Invoke us on the subject with the specified arguments
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] arguments) throws ThrowableProxy;
-
-	/**
-	 * Invoke us on the subject, however catch all exceptions
-	 * Only to be used when you don't want ThrowableExceptions. This should
-	 * not be the normal way to invoke.
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject);
-
-	/**
-	 * Invoke us on the subject with the specified argument, however catch all exceptions
-	 * Only to be used when you don't want ThrowableExceptions. This should
-	 * not be the normal way to invoke.
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy argument);
-
-	/**
-	 * Invoke us on the subject with the specified arguments, however catch all exceptions
-	 * Only to be used when you don't want ThrowableExceptions. This should
-	 * not be the normal way to invoke.
-	 * Creation date: (12/3/99 11:37:12 AM)
-	 * @author Joe Winchester
-	 */
-	IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] arguments);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java
deleted file mode 100644
index 7fd5bb6..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java
+++ /dev/null
@@ -1,52 +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
- *******************************************************************************/
-/*
- *  $RCSfile: IMethodProxy.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * Interface for Method Proxies Creation date: (12/3/99 11:36:29 AM)
- * 
- * @author: Joe Winchester
- */
-public interface IMethodProxy extends IAccessibleObjectProxy, IInvokable, IProxyMethod {
-
-	/**
-	 * Answer the class the method is defined in. Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	IBeanTypeProxy getClassType();
-
-	/**
-	 * Answer the name of the method Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	String getName();
-
-	/**
-	 * Answer the parameter types of the method Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	IBeanTypeProxy[] getParameterTypes();
-
-	/**
-	 * Answer the return type of the method Creation date: (12/3/99 11:37:12 AM)
-	 * 
-	 * @author Joe Winchester
-	 */
-	IBeanTypeProxy getReturnType();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java
deleted file mode 100644
index 5d41541..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.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
- *******************************************************************************/
-/*
- *  $RCSfile: IMethodProxyFactory.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * Factory for creating method proxies.
- * 
- * The factory exists for use, but generally it is better to go through the bean type proxy to get a method proxy. This is useful for setting up a
- * bunch of method proxies in initialization routines so you don't need to have a bean type proxy for each.
- * 
- * Creation date: (12/3/99 6:21:52 PM)
- * 
- * @author: Joe Winchester
- */
-public interface IMethodProxyFactory extends IBeanProxyFactory {
-
-	/**
-	 * Return a method proxy for the specified name, arguments from the class.
-	 * 
-	 * @param className
-	 * @param methodName
-	 * @param parameterTypes
-	 *            parameter type names or <code>null</code> for parameterTypes means no parameters.
-	 * @return a method proxy or null if can't be found. 
-	 * @since 1.0.0
-	 */
-	IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes);
-	
-	/**
-	 * Return an IProxyMethod for the specified name, arguments from the given class.
-	 * @param expression
-	 * @param className
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes);
-
-	/**
-	 * Return an IProxyField for the specified name, arguments from the given class.
-	 * @param expression
-	 * @param className
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	IProxyField getFieldProxy(IExpression expression, String className, String fieldName);
-
-	
-	/**
-	 * Return an invokable for the specified name, arguments from the class. The method proxy is not retrieved. Instead the method will be looked up
-	 * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
-	 * be retrieved instead.
-	 * <p>
-	 * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
-	 * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
-	 * <p>
-	 * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
-	 * 
-	 * @param className
-	 * @param methodName
-	 * @param parameterTypes
-	 *            parameter type names or <code>null</code> for parameterTypes means no parameters.
-	 * @return an invokable 
-	 * @since 1.0.0
-	 */
-	IInvokable getInvokable(String className, String methodName, String[] parameterTypes);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java
deleted file mode 100644
index 5b541ca..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: INumberBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Interface to an integer bean proxy.
- * Creation date: (2/6/00 8:52:42 AM)
- * @author: Joe Winchester
- */
-public interface INumberBeanProxy extends IBeanProxy {
-/**
- * Return the primitive byte value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-byte byteValue();
-/**
- * Return the primitive double value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-double doubleValue();
-/**
- * Return the primitive float value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-float floatValue();
-/**
- * Return the primitive int value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-int intValue();
-/**
- * Return the primitive long value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-long longValue();
-/**
- * Return the value as a Number.
- * Creation date: (2/6/00 8:52:59 AM)
- */
-Number numberValue();
-/**
- * Return the primitive short value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-short shortValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java
deleted file mode 100644
index 4233c6a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IPDEContributeClasspath.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-
-
-/**
- * Contribute to classpath PDE entries that are needed for a launch.
- * <p> 
- * Use the <code>INSTANCE()</code> to access the contributor. If the value
- * is <code>null</code>, then PDE is not available.
- * 
- * @since 1.0.2
- */
-public interface IPDEContributeClasspath {
-	
-	public static IPDEContributeClasspath INSTANCE = PDEContributeClasspathInstance.getInstance();
-
-	/**
-	 * Return the classpath contributions for the plugins in the given project.
-	 * <p>
-	 * This will add in the libraries from any fragments of any plugin that this
-	 * project references, either directly or indirectly through other plugins.
-	 * <p>
-	 * It is used by launches to get the fragment libraries since these are not
-	 * added by default to the classpath for a project by PDE. That is because they
-	 * aren't needed for compilation purposes, but they are needed for running.
-	 * 
-	 * @param controller the controller to contribute to.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.2
-	 */
-	public abstract void getPDEContributions(IConfigurationContributionController controller) throws CoreException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java
deleted file mode 100644
index 9b6c7c5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IPointBeanProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-/**
- * Interface to a Point bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IPointBeanProxy extends IBeanProxy {
-	public int getX();
-	public int getY();
-	public void setX(int x);
-	public void setY(int y);
-	public void setLocation(int x, int y);
-	public void setLocation(IPointBeanProxy point);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java
deleted file mode 100644
index be45338..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java
+++ /dev/null
@@ -1,40 +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 Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * A common interface for proxies. It is used by the expression processor to easily distinquish between
- * a proxy and an Expression proxy. 
- * @since 1.1.0
- */
-public interface IProxy {
-	
-	/**
-	 * Is this a bean proxy (including all of the subinterfaces of it, like IMethodProxy).
-	 * @return <code>true</code> if this is a bean proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isBeanProxy();
-
-	/**
-	 * Is this an expression proxy.
-	 * @return <code>true</code> if this is an expression proxy.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isExpressionProxy();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java
deleted file mode 100644
index cecb136..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java
+++ /dev/null
@@ -1,71 +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: IProxyBeanType.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * This interface is for IBeanTypeProxy's and BeanTypeExpressionProxy's so that we can lazily
- * get the beantype proxy and have the expression process it when needed.
- * 
- * @since 1.1.0
- */
-public interface IProxyBeanType extends IProxy {
-
-	/**
-	 * Answer the name of the type we are proxying This is the fully qualified name. For arrays it will return the format: [Lclassname; 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public String getTypeName();
-	
-	/**
-	 * Get the IProxyMethod for the method from this beantype. It may be either a resolved method proxy (if already resolved) or
-	 * it may be an ExpressionProxy if not yet resolved.
-	 * 
-	 * @param expression
-	 * @param methodName
-	 * @param parameterTypes array of parameter types or <code>null</code> if no parameters.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes);
-	
-	/**
-	 * Get the IProxyMethod for the method from this beantype. It may be either a resolved method proxy (if already resolved) or
-	 * it may be an ExpressionProxy if not yet resolved.
-	 * 
-	 * @param expression
-	 * @param methodName
-	 * @param parameterTypes array of parameter types or <code>null</code> if no parameters.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes);
-	
-	/**
-	 * Get the IProxyyField for the field from this beantype. It may be either a resolved field proxy (if already resolved) or
-	 * it may be an ExpressionProxy if not yet resolved.
-	 * 
-	 * @param expression
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String fieldName);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
deleted file mode 100644
index 3d64cc3..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IProxyConstants.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-/**
- * Constants used with the plugin xml.
- * 
- * @since 1.0.0
- */
-public interface IProxyConstants {
-	
-	/**
-	 * Launch group id for proxy launch configurations.
-	 */	
-	public static final String ID_PROXY_LAUNCH_GROUP = "org.eclipse.jem.proxy";
-	
-	/**
-	 * Launch configuration type for local proxy. It is local in that it is on the same machine, but a different
-	 * VM then the one running the IDE. 
-	 * 
-	 * It here because this is the default config type when no launch config specified for a project.
-	 */
-	public static final String LOCAL_LAUNCH_TYPE = "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType";
-	
-	/**
-	 * Attribute on Proxy Launch Configuration:
-	 * 
-	 * Key used in Launch Configuration for attaching AWT/Swing to the registry. This means simply
-	 * that AWT/Swing should be treated as being in the registry or not. It doesn't actually prevent
-	 * them from being there.
-	 *
-	 * The default value for this attribute is "true", so it should be set only to "false".
-	 */
-	public static final String ATTRIBUTE_AWT_SWING = "org.eclipse.jem.proxy.AWT/Swing";
-	
-	/**
-	 * Attribute on Proxy Launch Configuration:
-	 * 
-	 * Key used in Launch Configuration for the contributors and returning the registry. After retrieving key,
-	 * go back to ProxyLaunchSupport to retrieve the contributors. And it uses it to return the registry.
-	 * 
-	 * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
-	 * It is here only because external developer's launch configurations will need to be able to access this.
-	 */
-	public static final String ATTRIBUTE_LAUNCH_KEY = "org.eclipse.jem.proxy.LaunchKey";
-	
-	/**
-	 * Attribute on Proxy Launch Configuration:
-	 *  
-	 * VM title used for the launch registry.
-	 * 
-	 * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
-	 * It is here only because external developer's launch configurations will need to be able to access this.
-	 */
-	public static final String ATTRIBUTE_VM_TITLE = "org.eclipse.jem.proxy.vmtitle";
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java
deleted file mode 100644
index 24ef953..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IProxyField.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * This interface is for IFieldProxy's and FieldExpressionProxy's so that we can lazily
- * get the field proxy and have the expression process it when needed.
- * @since 1.1.0
- */
-public interface IProxyField extends IProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java
deleted file mode 100644
index 2268869..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.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: IProxyMethod.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
- 
-
-/**
- * This interface is for IMethodProxy's and MethodExpressionProxy's so that we can lazily
- * get the method proxy and have the expression process it when needed.
- * 
- * @since 1.1.0
- */
-public interface IProxyMethod extends IProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java
deleted file mode 100644
index 257ff06..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IRectangleBeanProxy.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-/**
- * Interface to a Rectangle bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IRectangleBeanProxy extends IBeanProxy {
-	public int getX();
-	public int getY();
-	public void setX(int x);
-	public void setY(int y);
-	public void setLocation(int x, int y);
-	public void setLocation(IPointBeanProxy point);
-	
-	public int getHeight();
-	public int getWidth();
-	public void setHeight(int height);
-	public void setWidth(int width);
-	public void setSize(int width, int height);
-	public void setSize(IDimensionBeanProxy dim);
-	
-	public void setBounds(int x, int y, int width, int height);
-	public void setBounds(IRectangleBeanProxy rect);	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java
deleted file mode 100644
index 7ae9cd9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java
+++ /dev/null
@@ -1,187 +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.jem.internal.proxy.core;
-
-
-/*
- *  $RCSfile: IStandardBeanProxyFactory.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * The Standard base bean proxy factory.
- * This is the Interface that the desktop will talk
- * to.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IStandardBeanProxyFactory extends IBeanProxyFactory {
-/**
- * Return a new bean proxy for the primitive integer argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IIntegerBeanProxy createBeanProxyWith(int aPrimitiveInteger);
-/**
- * Return a new bean proxy for the primitive character argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public ICharacterBeanProxy createBeanProxyWith(char aPrimitiveCharacter);
-/**
- * Return a new bean proxy for the primitive byte argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(byte aPrimitiveByte);
-/**
- * Return a new bean proxy for the primitive short argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(short aPrimitiveShort);
-/**
- * Return a new bean proxy for the primitive long argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(long aPrimitiveLong);
-/**
- * Return a new bean proxy for the primitive float argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(float aPrimitiveFloat);
-/**
- * Return a new bean proxy for the primitive double argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(double aPrimitiveDouble);
-/**
- * Return a new bean proxy for the Boolean argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IBooleanBeanProxy createBeanProxyWith(Boolean aBoolean);
-/**
- * Return a new bean proxy for the Integer argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IIntegerBeanProxy createBeanProxyWith(Integer anInteger);
-/**
- * Return a new bean proxy for the Character argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public ICharacterBeanProxy createBeanProxyWith(Character aCharacter);
-/**
- * Return a new bean proxy for the Number argument, can handle any of the numbers.
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(Number aNumber);
-/**
- * Return a new bean proxy for the string argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IStringBeanProxy createBeanProxyWith(String aString);
-
-/**
- * Convert the non-primitive proxy to a primitive proxy, if it
- * of one of the wrapper types. If not, then just return the proxy as is.
- * <p>
- * I.E. BooleanClassProxy will convert to BooleanTypeProxy, but ObjectClassProxy will just return unchanged.
- * @param nonPrimitiveProxy
- * @return either the primitive proxy that nonPrimitive wrappers, or the non-primitive if not a wrapper type.
- * 
- * @since 1.0.0
- */
-public IBeanProxy convertToPrimitiveBeanProxy(IBeanProxy nonPrimitiveProxy);
-/**
- * Return a new bean proxy for the boolean argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IBooleanBeanProxy createBeanProxyWith(boolean aBoolean);
-/**
- * Create an array bean proxy.
- *
- *   - (int, new int[2] {3, 4}) will create:
- *      int [3] [4]
- *
- *   - (int[], new int[1] {1})
- *      int [1]
- *
- *   - (int[], new int[2] {2,3})
- *      int [2] [3]
- * 
- *
- *   - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
- *      int [0]...
- *     or
- *     (int[][]..., null) or (int[][]..., new int[0])
- *      int[0][]...
- *     This is because an array instance with no specified dimensions is not valid. 
- *
- *   - (int[][], new int[1] {3})
- *      int[3][]
- */
-public IArrayBeanProxy  createBeanProxyWith(IBeanTypeProxy type, int[] dimensions) throws ThrowableProxy;
-/**
- * Create a one-dimensional array. 
- * The result will be the same as calling 
- *   createBeanProxyWith(IBeanTypeProxy type, new int[1] {x})
- * where 'x' is the value passed in as the dimension.
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int dimension) throws ThrowableProxy;
-
-/**
- * Create a bean proxy from an initialization string. 
- * <p>
- * It is not recommended that this method be commonly used. That is because no type checking will be performed
- * on the result. Whatever it evaluates to be will be what it is. It is useful for the rare cases where the desired
- * result type is not known.
- * <p>
- * It is recommended instead to use the newInstance(initString) method on the appropriate IBeanTypeProxy so that the
- * result can be type-checked to make sure the string evaluates to something of that type.
- * 
- * @param initializationString
- * @return
- * @throws ThrowableProxy
- * @throws InstantiationException
- * @throws ClassCastException
- * 
- * @since 1.0.0
- */
-public IBeanProxy createBeanProxyFrom(String initializationString) throws ThrowableProxy, InstantiationException, ClassCastException;
-
-/**
- * Release the proxy. In the case of Remote VM, this means
- * it will remove the proxy on the client side, and remove
- * the reference to the real object on the server side. On the server
- * side the real object may not go away because something else could
- * be holding onto it, but it won't be held simply because the client
- * is holding onto it.
- */
-public void releaseProxy(IBeanProxy proxy);
-
-/**
- * Create an expression.
- * @return The expression.
- * 
- * @since 1.0.0
- */
-public IExpression createExpression();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java
deleted file mode 100644
index c6d7ddb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IStandardBeanTypeProxyFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.util.Set;
-/**
- * The standard bean type proxy factory.
- * This is the Interface that the desktop will talk
- * to, the one that is returned when getCurrent() is called.
- * Creation date: (3/10/00 11:00:50 AM)
- * @author: Richard Lee Kulp
- */
-public interface IStandardBeanTypeProxyFactory extends IBeanProxyFactory {
-	
-/**
- * Used by other registered bean type proxy factories to
- * register their bean type proxies with the standard factory
- * so that it will be cached there. 
- * <p><b>Note:</b> This is not meant to be called by customers. It is here for the usage
- * of registry extensions.
- * @param aBeanTypeProxy
- * @param permanent indicates that beantype will never be released,
- * not even if explicit request is made.
- * 
- * @since 1.1.0
- */
-void registerBeanTypeProxy(IBeanTypeProxy aBeanTypeProxy, boolean permanent);
-
-/**
- * Used by other registered bean type proxy factories to
- * register their proxy bean type with the standard factory
- * so that it will be cached there. 
- * <p><b>Note:</b> This is not meant to be called by customers. It is here for the usage
- * of registry extensions.
- * @param aBeanTypeProxy
- * @param permanent indicates that beantype will never be released,
- * not even if explicit request is made.
- * 
- * @since 1.1.0
- */
-void registerBeanTypeProxy(IProxyBeanType aBeanTypeProxy, boolean permanent);
-
-/**
- * Return the beanType proxy for the given class name.
- * It must be fully qualified. And for arrays it can handle
- * either the jni type ([Ljava.lang.Object;) or the Java EMF Model
- * formal type (java.lang.Object[]).
- */
-IBeanTypeProxy getBeanTypeProxy(String className);
-
-/**
- * Get the beantype proxy suitable for an expression.
- * 
- * @param expression
- * @param typeName
- * @return
- * 
- * @since 1.1.0
- */
-IProxyBeanType getBeanTypeProxy(IExpression expression, String typeName);
-
-/**
- * Return an Array type proxy for the given class name of
- * the specified dimensions. This is a helper method. The
- * same result can be gotton from getBeanTypeProxy.
- * e.g.
- *      getBeanTypeProxy("java.lang.Object", 3)
- *    is the same as:
- *      getBeanTypeProxy("[[[Ljava.lang.Object;")
- *
- *    They both result in a type of:
- *      Object [][][]
- * 
- *    or if using the JNI format (proxy format)
- *      getBeanTypeProxy("[Ljava.langObject;", 3)
- *    becomes
- *      Object [][][][] 
- * 
- *    or if using the standard java format (as in actual code)
- *      getBeanTypeProxy("java.langObject[];", 3)
- *    becomes
- *      Object [][][][]
- */
-IBeanTypeProxy getBeanTypeProxy(String componentClassName, int dimensions);
-
-/**
- * Return an Array type proxy for the given class name of
- * the specified dimensions. This is a helper method. The
- * same result can be gotton from getBeanTypeProxy.
- * e.g.
- *      getBeanTypeProxy("java.lang.Object", 3)
- *    is the same as:
- *      getBeanTypeProxy("[[[Ljava.lang.Object;")
- *
- *    They both result in a type of:
- *      Object [][][]
- * 
- *    or if using the JNI format (proxy format)
- *      getBeanTypeProxy("[Ljava.langObject;", 3)
- *    becomes
- *      Object [][][][] 
- * 
- *    or if using the standard java format (as in actual code)
- *      getBeanTypeProxy("java.langObject[];", 3)
- *    becomes
- *      Object [][][][]
- * 
- * @param expression
- * @param componentClassName
- * @param dimensions
- * @return
- * 
- * @since 1.1.0
- */
-IProxyBeanType getBeanTypeProxy(IExpression expression, String componentClassName, int dimensions);
-
-/**
- * Test if a specific bean type has been registered. Don't access and create
- * if it isn't currently registered.
- */
-boolean isBeanTypeRegistered(String className);
-
-/**
- * Registered types. Return a set of strings that are the registered classes.
- * This Set isn't synchronized, there may be changes while accessing it.
- */
-Set registeredTypes();
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. This method sets whether list should be maintained or not.
- * If set to false, the list will be empty. The default is false.
- * 
- * @param maintain
- */
-void setMaintainNotFoundTypes(boolean maintain);
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. This method returns whether list should be maintained or not.
- * If false, the list will be empty. The default is false.
- * 
- * @return maintaining not found types.
- */
-boolean isMaintainNotFoundTypes();
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. 
- *
- * @param className Classname to search for to see if ever not found.
- * @return true if the bean type had been searched for but was not found. If not maintaining, then result will be false.
- */
-boolean isBeanTypeNotFound(String className);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java
deleted file mode 100644
index eb5fb6e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IStringBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-/**
- * Optimized implementation that should be used for string proxies that
- * allows the IDE VM to get the string value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface IStringBeanProxy extends IBeanProxy {
-/**
- * Return the proxied string as a string that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-String stringValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java
deleted file mode 100644
index 423154f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IUIRunner.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
- 
-
-/**
- * Interface that doesn't require UI. The implementation will. This will
- * only be used if within UI environment.
- * 
- * <package-protected> because should only be used within here.
- * 
- * @since 1.0.0
- */
-interface IUIRunner {
-	/**
-	 * Handle the build. If not in UI thread, just call back to ProxyLaunchSupport
-	 * to handle the build. If on UI thread, then use the IProgressService to do it.
-	 * This will keep the UI from "locking", though it will be disabled it won't deadlock.
-	 * 
-	 * @param pm
-	 * 
-	 * @since 1.0.0
-	 */
-	public void handleBuild(IProgressMonitor pm) throws CoreException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java
deleted file mode 100644
index c4837de..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
- *  $RCSfile: IteratorBeanProxyWrapper.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Iterator proxy.
- * It provides the iterator methods to interface to
- * the proxy.
- */
-
-public class IteratorBeanProxyWrapper {
-	protected final IBeanProxy fIterator;
-	protected final JavaStandardBeanProxyConstants fConstants;
-	
-	/**
-	 * Construct with the collection.
-	 */
-	public IteratorBeanProxyWrapper(IBeanProxy anIteratorProxy) {
-		if (!anIteratorProxy.getTypeProxy().isKindOf(anIteratorProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.Iterator"))) //$NON-NLS-1$
-			throw new ClassCastException(MessageFormat.format(ProxyMessages.getString(ProxyMessages.CLASSCAST_INCORRECTTYPE), new Object[] {anIteratorProxy.getTypeProxy().getTypeName(), "java.util.Iterator"})); //$NON-NLS-1$
-		else
-			fIterator = anIteratorProxy;
-			
-		fConstants = JavaStandardBeanProxyConstants.getConstants(anIteratorProxy.getProxyFactoryRegistry());
-	}
-	
-	/**
-	 * Answer the iterator proxy that this is wrappering.
-	 */
-	public IBeanProxy getBeanProxy() {
-		return fIterator;
-	}
-
-	/**
-	 * equals - Pass it on to the proxy to handle this.
-	 */
-	public boolean equals(Object object) {
-		return fIterator.equals(object);
-	}
-	
-	/**
-	 * hashCode - Pass it on to the proxy to handle this.
-	 */
-	public int hashCode() {
-		return fIterator.hashCode();
-	}
-	
-	/**
-	 * Iterator accessors
-	 */
-	public boolean hasNext() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getIteratorHasNext().invoke(fIterator)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return false;
-		}			
-	}
-	public IBeanProxy next() throws ThrowableProxy {
-		return fConstants.getIteratorNext().invoke(fIterator);
-	}	
-	public void remove() throws ThrowableProxy {
-		fConstants.getIteratorRemove().invoke(fIterator);
-	}	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java
deleted file mode 100644
index fb7b400..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: JavaStandardBeanProxyConstants.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-/**
- * Standard Proxy constants.
- *
- * Use the static accessor method (getConstants()) to get the appropriate 
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * There are some standard utility functions too.
- *
- * NOTE: Since everything in here just proxies, there is
- *       no need to have them separated by VM. That is why
- *       this in the Proxy package.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class JavaStandardBeanProxyConstants {
-	public static final Object REGISTRY_KEY = new Object();
-		
-	final IBeanTypeProxy fCollectionType;
-	final IBeanTypeProxy fListType;
-	final IBeanTypeProxy fIteratorType;
-	final IBeanTypeProxy fListIteratorType;
-	final IBeanTypeProxy fEnumerationType;	
-	final IBeanTypeProxy fSystemType;
-	final IBeanTypeProxy fStringType;
-	
-	IMethodProxy fCollectionAdd, fCollectionAddAll, fCollectionClear, fCollectionContains,
-		fCollectionContainsAll, fCollectionIsEmpty, fCollectionIterator, fCollectionRemove,
-		fCollectionRemoveAll, fCollectionRetainAll, fCollectionSize, fCollectionToArray,
-		fCollectionToArrayWithArray;
-		
-	IMethodProxy fListAddWithInt, fListAddAllWithInt, fListGet, fListIndexOf, fListLastIndexOf,
-		fListListIterator, fListListIteratorWithInt, fListRemoveInt, 
-		fListSet, fListSubList;
-		
-	IMethodProxy fIteratorHasNext, fIteratorNext, fIteratorRemove;
-
-	IMethodProxy fListIteratorAdd, fListIteratorHasPrevious, fListIteratorNextIndex, fListIteratorPrevious,
-		fListIteratorPreviousIndex, fListIteratorRemove, fListIteratorSet;
-		
-	IMethodProxy fEnumerationHasMoreElements, fEnumerationNextElement;
-	
-	IMethodProxy fSystemArraycopy;
-
-/**
- * Get the constants instance for the specified registry.
- */
-public static JavaStandardBeanProxyConstants getConstants(ProxyFactoryRegistry registry) {
-	JavaStandardBeanProxyConstants constants = (JavaStandardBeanProxyConstants) registry.getConstants(REGISTRY_KEY);
-	if (constants == null)
-		registry.registerConstants(REGISTRY_KEY, constants = new JavaStandardBeanProxyConstants(registry));	
-	return constants;
-}
-
-
-/**
- * IDEJavaBeanConstants constructor comment.
- */
-private JavaStandardBeanProxyConstants(ProxyFactoryRegistry registry) {
-	super();
-	
-	IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-	fCollectionType = typeFactory.getBeanTypeProxy("java.util.Collection");//$NON-NLS-1$
-	fListType = typeFactory.getBeanTypeProxy("java.util.List"); //$NON-NLS-1$
-	fIteratorType = typeFactory.getBeanTypeProxy("java.util.Iterator"); //$NON-NLS-1$
-	fListIteratorType = typeFactory.getBeanTypeProxy("java.util.ListIterator"); //$NON-NLS-1$
-	fEnumerationType = typeFactory.getBeanTypeProxy("java.util.Enumeration");	 //$NON-NLS-1$
-	fSystemType = typeFactory.getBeanTypeProxy("java.lang.System"); //$NON-NLS-1$
-	fStringType = typeFactory.getBeanTypeProxy("java.lang.String"); //$NON-NLS-1$
-}
-
-public IBeanTypeProxy getStringType() {
-	return fStringType;
-}
-
-/**
- * Collection method accessors
- */
-public IMethodProxy getCollectionAdd() {
-	if (fCollectionAdd == null)
-		fCollectionAdd = fCollectionType.getMethodProxy("add", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionAdd;
-}
-	
-public IMethodProxy getCollectionAddAll(){
-	if (fCollectionAddAll == null)
-		fCollectionAddAll = fCollectionType.getMethodProxy("addAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionAddAll;
-}
-
-public IMethodProxy getCollectionClear() {
-	if (fCollectionClear == null)
-		fCollectionClear = fCollectionType.getMethodProxy("clear"); //$NON-NLS-1$
-	return fCollectionClear;
-}
-
-public IMethodProxy getCollectionContains() {
-	if (fCollectionContains == null)
-		fCollectionContains = fCollectionType.getMethodProxy("contains", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionContains;
-}
-	
-public IMethodProxy getCollectionContainsAll() {
-	if (fCollectionContainsAll == null)
-		fCollectionContainsAll = fCollectionType.getMethodProxy("containsAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionContainsAll;
-}
-
-public IMethodProxy getCollectionIsEmpty() {
-	if (fCollectionIsEmpty == null)
-		fCollectionIsEmpty = fCollectionType.getMethodProxy("isEmpty"); //$NON-NLS-1$
-	return fCollectionIsEmpty;
-}
-
-public IMethodProxy getCollectionIterator() {
-	if (fCollectionIterator == null)
-		fCollectionIterator = fCollectionType.getMethodProxy("iterator"); //$NON-NLS-1$
-	return fCollectionIterator;
-}
-
-public IMethodProxy getCollectionRemove() {
-	if (fCollectionRemove == null)
-		fCollectionRemove = fCollectionType.getMethodProxy("remove", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionRemove;
-}
-
-public IMethodProxy getCollectionRemoveAll() {
-	if (fCollectionRemoveAll == null)
-		fCollectionRemoveAll = fCollectionType.getMethodProxy("removeAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionRemoveAll;
-}
-
-public IMethodProxy getCollectionRetainAll() {
-	if (fCollectionRetainAll == null)
-		fCollectionRetainAll = fCollectionType.getMethodProxy("retainAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionRetainAll;
-}
-
-public IMethodProxy getCollectionSize()  {
-	if (fCollectionSize == null)
-		fCollectionSize = fCollectionType.getMethodProxy("size"); //$NON-NLS-1$
-	return fCollectionSize;
-}
-
-public IMethodProxy getCollectionToArray() {
-	if (fCollectionToArray == null)
-		fCollectionToArray = fCollectionType.getMethodProxy("toArray"); //$NON-NLS-1$
-	return fCollectionToArray;
-}
-
-public IMethodProxy getCollectionToArrayWithArray() {
-	if (fCollectionToArrayWithArray == null)
-		fCollectionToArrayWithArray = fCollectionType.getMethodProxy("toArray", "[Ljava.lang.Object;"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fCollectionToArrayWithArray;
-}
-
-/**
- * Iterator accessors
- */
-
-public IMethodProxy getIteratorHasNext() {
-	if (fIteratorHasNext == null)
-		fIteratorHasNext = fIteratorType.getMethodProxy("hasNext"); //$NON-NLS-1$
-	return fIteratorHasNext;
-}
-
-public IMethodProxy getIteratorNext() {
-	if (fIteratorNext == null)
-		fIteratorNext = fIteratorType.getMethodProxy("next"); //$NON-NLS-1$
-	return fIteratorNext;
-}
-
-public IMethodProxy getIteratorRemove() {
-	if (fIteratorRemove == null)
-		fIteratorRemove = fIteratorType.getMethodProxy("remove"); //$NON-NLS-1$
-	return fIteratorRemove;
-}
-
-/**
- * Listaccessors
- */
-
-public IMethodProxy getListAddWithInt() {
-	if (fListAddWithInt == null)
-		fListAddWithInt = fListType.getMethodProxy("add", new String[] {"int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListAddWithInt;
-}
-
-public IMethodProxy getListAddAllWithInt() {
-	if (fListAddAllWithInt == null)
-		fListAddAllWithInt = fListType.getMethodProxy("addAll", new String[] {"int", "java.util.Collection"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListAddAllWithInt;
-}
-
-public IMethodProxy getListGet() {
-	if (fListGet == null)
-		fListGet = fListType.getMethodProxy("get", "int"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListGet;
-}
-
-public IMethodProxy getListIndexOf() {
-	if (fListIndexOf == null)
-		fListIndexOf = fListType.getMethodProxy("indexOf", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListIndexOf;
-}
-
-public IMethodProxy getListLastIndexOf() {
-	if (fListLastIndexOf == null)
-		fListLastIndexOf = fListType.getMethodProxy("lastIndexOf", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListLastIndexOf;
-}
-
-public IMethodProxy getListListIterator() {
-	if (fListListIterator == null)
-		fListListIterator = fListType.getMethodProxy("listIterator"); //$NON-NLS-1$
-	return fListListIterator;
-}
-
-public IMethodProxy getListListIteratorWithInt() {
-	if (fListListIteratorWithInt == null)
-		fListListIteratorWithInt = fListType.getMethodProxy("listIterator", "int"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListListIteratorWithInt;
-}
-
-public IMethodProxy getListRemoveInt() {
-	if (fListRemoveInt == null)
-		fListRemoveInt = fListType.getMethodProxy("remove", "int"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListRemoveInt;
-}
-
-public IMethodProxy getListSet() {
-	if (fListSet == null)
-		fListSet = fListType.getMethodProxy("set", new String[] {"int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListSet;
-}
-
-public IMethodProxy getListSubList() {
-	if (fListSubList == null)
-		fListSubList = fListType.getMethodProxy("subList", new String[] {"int", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fListSubList;
-}
-
-/**
- * ListIterator accessors
- */
- 
-public IMethodProxy getListIteratorAdd() {
-	if (fListIteratorAdd == null)
-		fListIteratorAdd = fListIteratorType.getMethodProxy("add", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListIteratorAdd;
-}
-
-public IMethodProxy getListIteratorHasPrevious() {
-	if (fListIteratorHasPrevious == null)
-		fListIteratorHasPrevious = fListIteratorType.getMethodProxy("hasPrevious"); //$NON-NLS-1$
-	return fListIteratorHasPrevious;
-}
-
-public IMethodProxy getListIteratorNextIndex() {
-	if (fListIteratorNextIndex == null)
-		fListIteratorNextIndex = fListIteratorType.getMethodProxy("nextIndex"); //$NON-NLS-1$
-	return fListIteratorNextIndex;
-}
-
-public IMethodProxy getListIteratorPrevious() {
-	if (fListIteratorPrevious == null)
-		fListIteratorPrevious = fListIteratorType.getMethodProxy("previous"); //$NON-NLS-1$
-	return fListIteratorPrevious;
-}
-
-public IMethodProxy getListIteratorPreviousIndex() {
-	if (fListIteratorPreviousIndex == null)
-		fListIteratorPreviousIndex = fListIteratorType.getMethodProxy("previousIndex"); //$NON-NLS-1$
-	return fListIteratorPreviousIndex;
-}
-
-public IMethodProxy getListIteratorSet() {
-	if (fListIteratorSet == null)
-		fListIteratorSet = fListIteratorType.getMethodProxy("set", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
-	return fListIteratorSet;
-}
-
-public IMethodProxy getListIteratorRemove() {
-	if (fListIteratorRemove == null)
-		fListIteratorRemove = fListIteratorType.getMethodProxy("remove"); //$NON-NLS-1$
-	return fListIteratorRemove;
-}
-
-protected IMethodProxy getSystemArraycopy() {
-	if (fSystemArraycopy == null)
-		fSystemArraycopy = fSystemType.getMethodProxy("arraycopy", new String[] {"java.lang.Object", "int", "java.lang.Object", "int", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-	return fSystemArraycopy;
-}
-
-/**
- * Enumeration accessors
- */
-public IMethodProxy getEnumerationHasMoreElements() {
-	if (fEnumerationHasMoreElements == null)
-		fEnumerationHasMoreElements = fEnumerationType.getMethodProxy("hasMoreElements"); //$NON-NLS-1$
-	return fEnumerationHasMoreElements;
-}
-
-public IMethodProxy getEnumerationNextElement() {
-	if (fEnumerationNextElement == null)
-		fEnumerationNextElement = fEnumerationType.getMethodProxy("nextElement"); //$NON-NLS-1$
-	return fEnumerationNextElement;
-}
-
-/**
- * Utility function to copy an array.
- */
-public void arraycopy(IBeanProxy src, int srcPosition, IBeanProxy dest, int destPosition, int length) throws ThrowableProxy {
-	IStandardBeanProxyFactory factory = src.getProxyFactoryRegistry().getBeanProxyFactory();
-	IBeanProxy[] args = new IBeanProxy[] {
-		src,
-		factory.createBeanProxyWith(srcPosition),
-		dest,
-		factory.createBeanProxyWith(destPosition),
-		factory.createBeanProxyWith(length)		
-	};
-	
-	getSystemArraycopy().invoke(null, args);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java
deleted file mode 100644
index c7d1ca2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java
+++ /dev/null
@@ -1,111 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: ListBeanProxyWrapper.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Collection proxy.
- * It provides the collection methods to interface to
- * the proxy.
- */
-
-public class ListBeanProxyWrapper extends CollectionBeanProxyWrapper {
-	/**
-	 * Construct with the List.
-	 */
-	public ListBeanProxyWrapper(IBeanProxy aListProxy) {
-		super(aListProxy);
-		
-		if (!aListProxy.getTypeProxy().isKindOf(aListProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.List"))) //$NON-NLS-1$
-			throw new ClassCastException(MessageFormat.format(ProxyMessages.getString(ProxyMessages.CLASSCAST_INCORRECTTYPE), new Object[] {aListProxy.getTypeProxy().getTypeName(), "java.util.List"})); //$NON-NLS-1$
-	}
-	
-	
-	/**
-	 * List accessors
-	 */
-	public void add(int index, IBeanProxy object) throws ThrowableProxy {
-		fConstants.getListAddWithInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), object});
-	}
-	public boolean addAll(int index, IBeanProxy aCollection) throws ThrowableProxy {
-		return ((IBooleanBeanProxy) fConstants.getListAddAllWithInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), aCollection})).booleanValue();
-	}
-	public IBeanProxy get(int index) throws ThrowableProxy {
-		return fConstants.getListGet().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
-	}
-	public int indexOf(IBeanProxy object) {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListIndexOf().invoke(fCollection, object)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return -1;
-		}			
-	}
-	public int lastIndexOf(IBeanProxy object) {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListLastIndexOf().invoke(fCollection, object)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return -1;
-		}			
-	}
-	public ListIteratorBeanProxyWrapper listIterator() {
-		try {
-			IBeanProxy itr = fConstants.getListListIterator().invoke(fCollection);
-			if (itr != null)
-				return new ListIteratorBeanProxyWrapper(itr);
-			else
-				return null;
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return null;
-		}			
-	}
-	public ListIteratorBeanProxyWrapper listIterator(int index) {
-		try {
-			IBeanProxy itr = fConstants.getListListIteratorWithInt().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
-			if (itr != null)
-				return new ListIteratorBeanProxyWrapper(itr);
-			else
-				return null;
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return null;
-		}			
-	}
-	public IBeanProxy remove(int index, IBeanProxy object) throws ThrowableProxy {
-		return fConstants.getListSet().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
-	}
-	public IBeanProxy set(int index, IBeanProxy object) throws ThrowableProxy {
-		return fConstants.getListRemoveInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), object});
-	}											
-	public ListBeanProxyWrapper subList(int fromIndex, int toIndex) throws ThrowableProxy {
-		IBeanProxy list = fConstants.getListSubList().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(fromIndex), fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(toIndex)});
-		if (list != null)
-			return new ListBeanProxyWrapper(list);
-		else
-			return null;		
-	}
-												
-		
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java
deleted file mode 100644
index a738597..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
- *  $RCSfile: ListIteratorBeanProxyWrapper.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:53:46 $ 
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.ListIterator proxy.
- * It provides the ListIterator methods to interface to
- * the proxy.
- */
-
-public class ListIteratorBeanProxyWrapper extends IteratorBeanProxyWrapper {
-
-	/**
-	 * Construct with the ListIterator.
-	 */
-	public ListIteratorBeanProxyWrapper(IBeanProxy anIteratorProxy) {
-		super(anIteratorProxy);
-		
-		if (!anIteratorProxy.getTypeProxy().isKindOf(anIteratorProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.ListIterator"))) //$NON-NLS-1$
-			throw new ClassCastException(MessageFormat.format(ProxyMessages.getString(ProxyMessages.CLASSCAST_INCORRECTTYPE), new Object[] {anIteratorProxy.getTypeProxy().getTypeName(), "java.util.ListIterator"})); //$NON-NLS-1$
-	}
-	
-	
-	/**
-	 * ListIterator accessors
-	 */
-	public void add(IBeanProxy object) throws ThrowableProxy {
-		fConstants.getListIteratorAdd().invoke(fIterator, object);
-	}
-	public boolean hasPrevious() {
-		try {
-			return ((IBooleanBeanProxy) fConstants.getListIteratorHasPrevious().invoke(fIterator)).booleanValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return false;
-		}			
-	}
-	public int nextIndex() {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListIteratorNextIndex().invoke(fIterator)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return -1;
-		}			
-	}			
-	public IBeanProxy previous() throws ThrowableProxy {
-		return fConstants.getListIteratorPrevious().invoke(fIterator);
-	}
-	public int previousIndex() {
-		try {
-			return ((IIntegerBeanProxy) fConstants.getListIteratorPreviousIndex().invoke(fIterator)).intValue();
-		} catch (ThrowableProxy e) {
-			// This shouldn't occur, so just log it.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString(ProxyMessages.UNEXPECTED_EXCEPTION), e));
-			return -1;
-		}
-	}
-	public void remove() throws ThrowableProxy {
-		fConstants.getListIteratorRemove().invoke(fIterator);
-	}
-	public void set(IBeanProxy object) throws ThrowableProxy {
-		fConstants.getListIteratorSet().invoke(fIterator, object);
-	}				
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java
deleted file mode 100644
index 5511b35..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c)   2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ListenerList.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * This class is used to maintain a list of listeners, and
- * is used in the implementations of several classes within jem
- * which allow you to register listeners of various kinds.
- * It is a fairly lightweight object, occupying minimal space when
- * no listeners are registered.
- * <p>
- * Note that the <code>add</code> method checks for and eliminates 
- * duplicates based on identity (not equality).  Likewise, the
- * <code>remove</code> method compares based on identity.
- * </p>
- * <p>
- * Use the <code>getListeners</code> method when notifying listeners.
- * Note that no garbage is created if no listeners are registered.
- * The recommended code sequence for notifying all registered listeners
- * of say, <code>FooListener.eventHappened</code>, is:
- * <pre>
- * Object[] listeners = myListenerList.getListeners();
- * for (int i = 0; i < listeners.length; ++i) {
- *    ((FooListener) listeners[i]).eventHappened(event);
- * }
- * </pre>
- * </p>
- */
-
-public class ListenerList {
-
-	/**
-	 * The initial capacity of the list. Always >= 1.
-	 */
-	private int capacity;
-
-	/**
-	 * The current number of listeners.
-	 * Maintains invariant: 0 <= size <= listeners.length.
-	 */
-	private int size;
-
-	/**
-	 * The list of listeners.  Initially <code>null</code> but initialized
-	 * to an array of size capacity the first time a listener is added.
-	 * Maintains invariant: listeners != null IFF size != 0
-	 */
-	private Object[] listeners = null;
-
-	/**
-	 * The empty array singleton instance, returned by getListeners()
-	 * when size == 0.
-	 */
-	private static final Object[] EmptyArray = new Object[0];
-
-	/**
-	 * Creates a listener list with an initial capacity of 1.
-	 */
-	public ListenerList() {
-		this(1);
-	}
-
-	/**
-	 * Creates a listener list with the given initial capacity.
-	 *
-	 * @param capacity the number of listeners which this list can initially accept 
-	 *    without growing its internal representation; must be at least 1
-	 */
-	public ListenerList(int capacity) {
-		if (!(capacity >= 1))
-			throw new IllegalArgumentException();
-		this.capacity = capacity;
-	}
-
-	/**
-	 * Adds the given listener to this list. Has no effect if an identical listener
-	 * is already registered.
-	 *
-	 * @param listener the listener
-	 */
-	public void add(Object listener) {
-		if (listener == null)
-			throw new IllegalArgumentException();
-		if (size == 0) {
-			listeners = new Object[capacity];
-		} else {
-			// check for duplicates using identity
-			for (int i = 0; i < size; ++i) {
-				if (listeners[i] == listener) {
-					return;
-				}
-			}
-			// grow array if necessary
-			if (size == listeners.length) {
-				System.arraycopy(
-					listeners,
-					0,
-					listeners = new Object[size * 2 + 1],
-					0,
-					size);
-			}
-		}
-		listeners[size++] = listener;
-	}
-
-	/**
-	 * Removes all listeners from this list.
-	 */
-	public void clear() {
-		size = 0;
-		listeners = null;
-	}
-
-	/**
-	 * Returns an array containing all the registered listeners,
-	 * in the order in which they were added.
-	 * <p>
-	 * The resulting array is unaffected by subsequent adds or removes.
-	 * If there are no listeners registered, the result is an empty array
-	 * singleton instance (no garbage is created).
-	 * Use this method when notifying listeners, so that any modifications
-	 * to the listener list during the notification will have no effect on the
-	 * notification itself.
-	 * </p>
-	 *
-	 * @return the list of registered listeners
-	 */
-	public Object[] getListeners() {
-		if (size == 0)
-			return EmptyArray;
-		Object[] result = new Object[size];
-		System.arraycopy(listeners, 0, result, 0, size);
-		return result;
-	}
-
-	/**
-	 * Returns whether this listener list is empty.
-	 *
-	 * @return <code>true</code> if there are no registered listeners, and
-	 *   <code>false</code> otherwise
-	 */
-	public boolean isEmpty() {
-		return size == 0;
-	}
-
-	/**
-	 * Removes the given listener from this list. Has no effect if an identical
-	 * listener was not already registered.
-	 *
-	 * @param listener the listener
-	 */
-	public void remove(Object listener) {
-		if (listener == null)
-			throw new IllegalArgumentException();
-		for (int i = 0; i < size; ++i) {
-			if (listeners[i] == listener) {
-				if (size == 1) {
-					listeners = null;
-					size = 0;
-				} else {
-					System.arraycopy(
-						listeners,
-						i + 1,
-						listeners,
-						i,
-						--size - i);
-					listeners[size] = null;
-				}
-				return;
-			}
-		}
-	}
-
-	/**
-	 * Returns the number of registered listeners.
-	 *
-	 * @return the number of registered listeners
-	 */
-	public int size() {
-		return size;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java
deleted file mode 100644
index e1be81d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java
+++ /dev/null
@@ -1,72 +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: MapJNITypes.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
- 
-
-/**
- * This is a public class to map between JNI and normal format (e.g. "[Ljava.lang.String;" to "java.lang.String[]") and back again.
- * This is for arrays, non-arrays will be left alone since they are already correct.
- * @since 1.1.0
- */
-public class MapJNITypes {
-
-	/**
-	 * Convert the formal type name to the JNI format.
-	 * @param formalTypeName
-	 * @return JNI format
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getJNITypeName(String formalTypeName) {
-		return MapTypes.getJNIFormatName(formalTypeName);
-	}
-	
-	/**
-	 * Convert the JNI format to the formal type name.
-	 * @param jniTypeName
-	 * @return formal type name or "" if not valid.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getFormalTypeName(String jniTypeName) {
-		return MapTypes.getFormalTypeName(jniTypeName);
-	}
-	
-	/**
-	 * Return whether the formal type name is for a primitive or not.
-	 * @param formalType
-	 * @return <code>true</code> if for a primitive.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static boolean isFormalTypePrimitive(String formalType) {
-		return MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(formalType) != null;
-	}
-	
-	/**
-	 * Convert the formal type name, with the given number of dimensions,
-	 * to an array JNI type.
-	 * @param finalComponent final component name, should not be an array type.
-	 * @param dimensions number of dimensions for the array.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getJNITypeName(String finalComponent, int dimensions) {
-		return MapTypes.getJNITypeName(finalComponent, dimensions);
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java
deleted file mode 100644
index b89cd9e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PDEContributeClasspath.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.*;
-
- 
-
-/**
- * Contribute to classpath PDE entries that are needed for a launch.
- * <p>
- * This is a special class that should not be referenced directly from code. Reference it through the
- * interface that it implements. 
- * 
- * @see org.eclipse.jem.internal.proxy.core.IPDEContributeClasspath
- * @since 1.0.2
- */
-class PDEContributeClasspath implements IPDEContributeClasspath {
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IPDEContributeClasspath#getPDEContributions(org.eclipse.core.resources.IProject)
-	 */
-	public void getPDEContributions(IConfigurationContributionController controller) throws CoreException {
-		Map plugins = new HashMap();
-		ProxyPlugin.getPlugin().findPlugins(plugins, true, true, controller.getJavaProject());
-		if (!plugins.isEmpty()) {
-			Collection pluginIds = plugins.keySet();
-			PluginModelManager modelManager = PDECore.getDefault().getModelManager();
-			IFragmentModel[] fragments = modelManager.getFragments();
-			for (int i = 0; i < fragments.length; i++) {
-				IFragment fragment = fragments[i].getFragment();
-				if (pluginIds.contains(fragment.getPluginId())) {
-					// We'll do a cheat for now and assume fragment is for same version of plugin. PDECore actually
-					// checks the version of the fragment against the version of the plugin to see they are for each
-					// other, but we'll just assume they are for now. Change this later if we actually do run into this case.
-					IResource resource = fragment.getModel().getUnderlyingResource();
-					if (resource != null) {
-						IProject fragProject = resource.getProject();
-						if (fragProject.hasNature(JavaCore.NATURE_ID)) {
-							controller.contributeProject(fragProject);
-						}
-						continue;
-					}
-
-					IPluginLibrary[] libraries = fragment.getLibraries();
-					for (int j = 0; j < libraries.length; j++) {
-						IPluginLibrary library = libraries[j];
-						String name = library.getName();
-						String expandedName = ClasspathUtilCore.expandLibraryName(name);
-
-						IPluginModelBase model = library.getPluginModel();
-						URL url = getPath(model, expandedName);
-						if (url != null)
-							controller.contributeClasspath(url, IConfigurationContributionController.APPEND_USER_CLASSPATH);
-					}
-				}
-			}
-		}
-		
-		return;
-	}
-	
-	private URL getPath(IPluginModelBase model, String libraryName) {
-		try {
-			IResource resource = model.getUnderlyingResource();
-			if (resource != null) {
-				IResource jarFile = resource.getProject().findMember(libraryName);
-				if (jarFile != null)
-					return jarFile.getFullPath().toFile().toURL();
-			} else {
-				File file = new File(model.getInstallLocation(), libraryName);
-				if (file.exists())
-					return file.toURL();
-			}
-		} catch (MalformedURLException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-		}
-		return null;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
deleted file mode 100644
index 997675e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PDEContributeClasspathInstance.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.Platform;
-
- 
-
-/**
- * Accessor to the IPDEContributeClasspath instance to use.
- * <pacakge-protected> because only IPDEContributeClasspath should access it.
- * 
- * @since 1.0.2
- */
-class PDEContributeClasspathInstance {
-
-	/**
-	 * Get the instance to use. 
-	 * @return the instance to use or <code>null</code> if PDE not available.
-	 * 
-	 * @since 1.0.2
-	 */
-	public static IPDEContributeClasspath getInstance() {
-		if (Platform.getBundle("org.eclipse.pde.core") != null) {
-			try {
-				Class pdeClass = Class.forName("org.eclipse.jem.internal.proxy.core.PDEContributeClasspath");
-				return (IPDEContributeClasspath) pdeClass.newInstance();
-			} catch (ClassNotFoundException e) {
-				// PDE not available, this is ok.
-			} catch (InstantiationException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e.getCause(), Level.WARNING);
-			} catch (IllegalAccessException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java
deleted file mode 100644
index 4d0906b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PDEProcessForPlugin.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 17:35:24 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.pde.core.plugin.*;
-import org.eclipse.pde.internal.core.PDECore;
- 
-
-/*
- * Used for PDE Processing for the Proxy Plugin class. It will be optionally loaded
- * if PDE plugin is installed. This allows usage in an installation that doesn't have
- * PDE installed.
- * 
- * @since 1.0.2
- */
-class PDEProcessForPlugin implements ProxyPlugin.IPDEProcessForPlugin {
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.ProxyPlugin.IPDEProcessForPlugin#processPlugin(org.eclipse.jdt.core.IJavaProject, java.util.Map, boolean, boolean)
-	 */
-	public void findPlugins(IJavaProject project, Map pluginIds, boolean visible, boolean first) {
-		IPluginModelBase m = PDECore.getDefault().getModelManager().findModel(project.getProject());
-		if (m instanceof IPluginModel) {
-			// it is a plugin, process it.
-			IPlugin plugin = ((IPluginModel) m).getPlugin();			
-			if (pluginIds.containsKey(plugin.getId()))
-				return;	// already processed it
-			pluginIds.put(plugin.getId(), first || visible ? Boolean.TRUE : Boolean.FALSE);			
-			expandPlugin(plugin, pluginIds, visible, first);
-		}
-		return;
-	}
-	
-	private void expandPlugin(IPlugin plugin, Map pluginIds, boolean visible, boolean first) {
-		IPluginImport[] imports = plugin.getImports();
-		for (int i = 0; i < imports.length; i++) {
-			IPluginImport pi = imports[i];
-			Boolean piValue = (Boolean) pluginIds.get(pi.getId());
-			boolean importVisible = first || (visible && pi.isReexported());
-			if (piValue != null && (!importVisible || piValue.booleanValue()))
-				continue;	// we already processed it, this time not visible, or this time visible and was previously visible.
-			// Now either first time, or it was there before, but now visible, but this time it is visible.
-			// We want it to become visible in that case. 
-			pluginIds.put(pi.getId(), importVisible ? Boolean.TRUE : Boolean.FALSE);			
-			IPlugin pb = PDECore.getDefault().findPlugin(pi.getId(),
-				pi.getVersion(),
-				pi.getMatch());
-			if (pb != null)
-				expandPlugin(pb, pluginIds, importVisible, false);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
deleted file mode 100644
index 312a255..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
+++ /dev/null
@@ -1,359 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: ProxyFactoryRegistry.java,v $
- *  $Revision: 1.9 $  $Date: 2005/04/20 18:50:13 $ 
- */
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jem.util.TimerTests;
-
-/**
- * Registry of proxy factories on a per-VM basis.
- * There can be multiple VM's, this would be required by the
- * desktop because more than one project could be open, and each
- * would require their own VM because the classpaths would be different.
- * This class may be subclassed to provide more factories for a particular
- * VM. 
- * Creation date: (3/13/00 10:48:10 AM)
- * @author: Richard Lee Kulp
- */
-public abstract class ProxyFactoryRegistry {
-	
-	protected boolean fIsValid = true;	// The registry is valid until terminated.
-	protected ListenerList registryListeners = new ListenerList();
-	
-	/**
-	 * IRegistryListener
-	 * Listen for the registry being terminated.
-	 */
-	public interface IRegistryListener {
-		/**
-		 * Method registryTerminated.
-		 * 
-		 * The registry has been terminated. When this is called the registry
-		 * is no longer valid. It should not be assumed any calls can be made
-		 * to the registry.
-		 * 
-		 * @param registry
-		 */
-		public void registryTerminated(ProxyFactoryRegistry registry);
-	}
-		
-
-	// Factory registration IS NOT a dynamic registration. Once registered for a VM or an instance
-	// they should not be changed. This is because references are cached in other objects.
-	// The VM associated with this Registry shouldn't exited and restarted because
-	// the cached object will then have invalid references to no longer existing objects.
-	// If the VM needs to be restarted, then all proxies need to be tossed.
-	
-	//
-	// Individual ProxyFactoryRegistry, applies to a particular VM.
-	//
-
-	// ***************************
-	//
-	// IBeanProxyFactory Registry
-	//
-	
-	// The standard bean  proxy factory, the one the desktop will use for packages that have not
-	// been extended and registered by customization developers.
-	protected IStandardBeanProxyFactory fCurrentStandardBeanProxyFactory;
-
-	// The directory of registered extension factories, typically registered by package.
-	final protected Hashtable fRegisteredExtensionBeanProxyFactories = new Hashtable();
-
-	// ***************************
-	//
-	// IBeanTypeProxyFactory Registry
-	//
-	
-	// The standard bean type proxy factory, the one the desktop will use for packages that have not
-	// been extended and registered by customization developers.
-	protected IStandardBeanTypeProxyFactory fCurrentStandardBeanTypeProxyFactory;
-
-	// The directory of registered extension factories, typically registered by package.
-	final protected Hashtable fRegisteredExtensionBeanTypeProxyFactories = new Hashtable();
-	
-
-	// ***************************
-	//
-	// Other factories
-	//
-		
-	protected IMethodProxyFactory fMethodProxyFactory = null;	// Method Proxy Factory
-
-	// ***************************
-	//
-	// Constants Registry. Different extensions can store
-	// objects by key as a registry of constants.
-	// For example, java.awt extension will store an object
-	// which has some pre-fetched method proxies stored in it so
-	// that they don't need to be continually recreated.
-	//
-	// This feature should be used with care, so that
-	// only proxies that really need to be cached should
-	// be cached.
-	//
-	// Don't store proxies to live beans in here because
-	// those will be created and destroyed over and over,
-	// and the instance in this cache will get stale.
-	// Should only store things like often used method
-	// proxies that once created are rarely changed.
-	//
-	// Since the proxies can be on any VM, you should have
-	// an interface defining what's available in your
-	// constants entry, and access it through that.
-
-	protected final Hashtable fRegisteredConstants = new Hashtable();		
-
-	/**
-	 * ProxyFactoryRegistry constructor comment.
-	 */
-	public ProxyFactoryRegistry() {
-		super();
-	}
-	
-	/**
-	 * Method addRegistryListener.
-	 * @param listener
-	 */
-	public void addRegistryListener(IRegistryListener listener) {
-		registryListeners.add(listener);
-	}
-	
-	/**
-	 * Method removeRegistryListener.
-	 * @param listener
-	 */
-	public void removeRegistryListener(IRegistryListener listener) {
-		registryListeners.remove(listener);
-	}
-	
-	protected void fireRegistryTerminated() {
-		if (!registryListeners.isEmpty()) {
-			Object[] list = registryListeners.getListeners();
-			for (int i = 0; i < list.length; i++) {
-				((IRegistryListener) list[i]).registryTerminated(this);
-			}
-		}
-	}
-	
-	/**
-	 Return the current factory to be used for creating IBeanProxy instances
-	 */
-	public IStandardBeanProxyFactory getBeanProxyFactory() {
-		if (fCurrentStandardBeanProxyFactory == null) {
-			throw new RuntimeException(ProxyMessages.getString(ProxyMessages.PROXYFACTORY_NOBEANPROXY));//$NON-NLS-1$
-		}
-		return fCurrentStandardBeanProxyFactory;
-	}
-	/**
-	 Return the current registered bean proxy factory to be used for creating IBeanProxy instances
-	 */
-	public IBeanProxyFactory getBeanProxyFactoryExtension(String packageName) {
-		return (IBeanProxyFactory)fRegisteredExtensionBeanProxyFactories.get(packageName);
-	}
-	
-	/**
-	 Return the current factory to be used for creating IBeanTypeProxy instances
-	 */
-	public IStandardBeanTypeProxyFactory getBeanTypeProxyFactory() {
-		if (fCurrentStandardBeanTypeProxyFactory == null) {
-			throw new RuntimeException(ProxyMessages.getString(ProxyMessages.PROXYFACTORY_NOBEANTYPEPROXY));//$NON-NLS-1$
-		}
-		return fCurrentStandardBeanTypeProxyFactory;
-	}
-	/**
-	 Return the current registered bean type proxy factory to be used for creating IBeanTypeProxy instances
-	 */
-	public IBeanTypeProxyFactory getBeanTypeProxyFactoryExtension(String packageName) {
-		return (IBeanTypeProxyFactory)fRegisteredExtensionBeanTypeProxyFactories.get(packageName);
-	}
-	/**
-	 * Return the requested constants entry
-	 */
-	public Object getConstants(Object key) {
-		return fRegisteredConstants.get(key);
-	}
-	/**
-	 * Return the MethodProxyFactory for this VM.
-	 * Creation date: (3/13/00 10:54:59 AM)
-	 * @return org.eclipse.jem.internal.proxy.core.IMethodProxyFactory
-	 */
-	public IMethodProxyFactory getMethodProxyFactory() {
-		return fMethodProxyFactory;
-	}
-	
-	
-	/**
-	 Register the current registered bean proxy factory to be used for creating IBeanProxy instances
-	 */
-	public void registerBeanProxyFactory(IStandardBeanProxyFactory aStandardFactory) {
-		fCurrentStandardBeanProxyFactory = aStandardFactory;
-	}
-	/**
-	 Register a factory to be used for creating IBeanProxy instances
-	 */
-	public void registerBeanProxyFactory(String packageName, IBeanProxyFactory aFactory) {
-		fRegisteredExtensionBeanProxyFactories.put(packageName, aFactory);
-	}
-	
-	/**
-	 Register the current registered bean type proxy factory to be used for creating IBeanTypeProxy instances
-	 */
-	public void registerBeanTypeProxyFactory(IStandardBeanTypeProxyFactory aStandardFactory) {
-		fCurrentStandardBeanTypeProxyFactory = aStandardFactory;
-	}
-	/**
-	 Register a factory to be used for creating IBeanTypeProxy instances
-	 */
-	public void registerBeanTypeProxyFactory(String packageName, IBeanTypeProxyFactory aFactory) {
-		fRegisteredExtensionBeanTypeProxyFactories.put(packageName, aFactory);
-	}
-	/**
-	 * Set the requested constants entry for this VM.
-	 */
-	public void registerConstants(Object key, Object constant) {
-		fRegisteredConstants.put(key, constant);
-	}
-    
-    /**
-     * Remove the constants for the given key.
-     * @param key
-     * 
-     * @since 1.1.0
-     */
-    public void deregisterConstants(Object key) {
-        fRegisteredConstants.remove(key);
-    }
-	/**
-	 * Set the Method Proxy Factory for this VM.
-	 * Creation date: (3/13/00 10:58:19 AM)
-	 */
-	public void registerMethodProxyFactory(IMethodProxyFactory newMethodProxyFactory) {
-		fMethodProxyFactory = newMethodProxyFactory;
-	}
-	/**
-	 * Release the proxy, no longer needed.
-	 * This is a helper method to easily access the release from the bean proxy factory.
-	 */
-	public void releaseProxy(IBeanProxy proxy) {
-		// To simply things if release is called when the factory is down (invalid), then just
-		// go on because the proxy is already released.
-		if (fCurrentStandardBeanProxyFactory != null)
-			fCurrentStandardBeanProxyFactory.releaseProxy(proxy);
-	} 
-
-	/**
-	 * Is this a valid registry, i.e. is it not terminated.
-	 */
-	public boolean isValid() {
-		return fIsValid;
-	}
-	
-	/**
-	 * Terminate the registry without waiting.
-	 * <p>
-	 * Terminate the registry, but don't necessarily wait for it.
-	 *
-	 * @see #terminateRegistry(boolean)
-	 * @since 1.0.0
-	 */
-	public final void terminateRegistry() {
-		terminateRegistry(false);
-	}
-		
-	/**
-	 * Terminate the registry.
-	 * <p>
-	 * This will go through each factory and terminate it, and
-	 * let the subclass terminate. It will then remove all of the factories so that
-	 * if there are any proxies still hanging around they won't hold onto everything,
-	 * just the this registry will be held onto.
-	 *<p>
-	 * Note during termination, the factories should not reference any other factory.
-	 * It can assume that the factories will take care of themselves and they should
-	 * only release their resources.
-	 * <p>
-	 * The constants registry will not be terminated because they aren't factories.
-	 * However, they will be cleared (no longer referenced) from here so that they
-	 * can be GC'd.
-	 * 
-	 * @param wait <code>true</code> to wait for complete termination, <code>false</code> to kick off termination but return ASAP.
-	 * @since 1.0.2
-	 */
-	public final void terminateRegistry(boolean wait) {
-		if (!fIsValid)
-			return;	// Already or are already terminating. Don't do it again and don't notify again.
-		fIsValid = false;
-		if (fCurrentStandardBeanTypeProxyFactory != null) {
-//			TimerTests.basicTest.startStep("Terminate Bean Type Factory");
-			fCurrentStandardBeanTypeProxyFactory.terminateFactory(wait);
-//			TimerTests.basicTest.stopStep("Terminate Bean Type Factory");
-			fCurrentStandardBeanTypeProxyFactory = null;
-		}
-		if (fCurrentStandardBeanProxyFactory != null) {
-			fCurrentStandardBeanProxyFactory.terminateFactory(wait);
-			fCurrentStandardBeanProxyFactory = null;
-		}
-		if (fMethodProxyFactory != null) {
-			fMethodProxyFactory.terminateFactory(wait);
-			fMethodProxyFactory = null;
-		}
-		
-		Iterator itr = fRegisteredExtensionBeanTypeProxyFactories.values().iterator();
-		while (itr.hasNext()) {
-			((IBeanProxyFactory) itr.next()).terminateFactory(wait);
-		}
-		fRegisteredExtensionBeanTypeProxyFactories.clear();
-		
-		itr = fRegisteredExtensionBeanProxyFactories.values().iterator();
-		while (itr.hasNext()) {
-			((IBeanProxyFactory) itr.next()).terminateFactory(wait);
-		}
-		fRegisteredExtensionBeanProxyFactories.clear();
-		
-		fRegisteredConstants.clear();
-		
-		TimerTests.basicTest.startStep("Registry Terminated");
-		registryTerminated(wait);
-		TimerTests.basicTest.stopStep("Registry Terminated");
-		
-//		TimerTests.basicTest.startStep("Registry Terminated Notification");
-		fireRegistryTerminated();	// Let everyone know that we are gone. This is fired even if wait is false because at this point in time the registry is invalid.
-//		TimerTests.basicTest.stopStep("Registry Terminated Notification");
-	}
-	
-
-	/**
-	 * Terminate the Registry. 
-	 * <p>
-	 * It is up to each registry to determine what this means.
-	 * <p>
-	 * The wait parm is a suggestion if it is <code>false</code>, but it must be honoured if <code>true</code>
-	 * 
-	 * @param wait wait for registry to terminate flag.
-	 * 
-	 * @since 1.0.2
-	 */
-	protected abstract void registryTerminated(boolean wait);
-	
-	/**
-	 * Get the callback registry.
-	 */
-	public abstract ICallbackRegistry getCallbackRegistry();
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
deleted file mode 100644
index df36db4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
+++ /dev/null
@@ -1,751 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ProxyLaunchSupport.java,v $
- *  $Revision: 1.22 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.util.PerformanceMonitorUtil;
-import org.eclipse.jem.util.TimerTests;
-
- 
-/**
- * This is the used to launch the proxy registries.
- * This is a static helper class, it is not meant to be instantiated.
- * 
- * @since 1.0.0
- */
-public class ProxyLaunchSupport {
-	
-	// The key for the persisten property is in ProxyPlugin so that it can set it on startup without
-	// causing this class to be initialized. We don't want this class initialized until the very last
-	// moment when needed. This is because it needs UI to be active when initialized to query some 
-	// values and if ProxyPlugin.start() causes this class to initialize, it may be too soon.
-	//
-	// If a project's persistent property is set with this value, that means there is at least one
-	// launch configuration with this project, but none are selected as the default. This is here
-	// so that we can check in the object contribution that if not set then don't show the menu
-	// item at all. This is to clean up the popup menu so not so cluttered.
-	// If the property is trully not set, then there is no default and there are no configurations for it.
-	public static final String NOT_SET = "...not..set..";	  //$NON-NLS-1$
-		
-	public static final String EXPRESSION_TRACING = "/debug/traceexpressions";	// Trace IExpressions.
-	
-	/**
-	 * Timer threshold for indicating any expressions that took longer than this.
-	 * If not set, then threshold will default to 100ms.
-	 * It will only be used if traceexpressions is true.
-	 */
-	public static final String EXPRESSION_TRACEING_TIMER_THRESHOLD = "/debug/traceexpressionstimethreshold";	
-	
-	/*
-	 * Registry of launch key to LaunchInfo classes.
-	 */
-	private static Map LAUNCH_INFO = new HashMap(2);
-
-	/**
-	 * Public only for access by other launch delegates to set up if they go outside of ProxyLaunchSupport,
-	 * e.g. IDE proxy. Must not be used for any purpose.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static class LaunchSupportIConfigurationContributionInfo implements IConfigurationContributionInfo {
-		/* (non-Javadoc)
-		 * Map of containers (IClasspathContainer) found in classpath (including required projects).
-		 * This is for each project found. If there was a container in more than one project with the
-		 * id, this set will contain the container from each such project. They are not considered the
-		 * same because they come from a different project.
-		 * <p>
-		 * The key will be the containers, and the value will be a <code>Boolean</code>, where true means it
-		 * is visible to the top-level project.
-		 * <p>
-		 * This is used for determining if a project's container implements the desired contributor.
-		 * 
-		 * Will be empty if no project sent in to launch configuration.
-		 * 
-		 * @see org.eclipse.jdt.core.IClasspathContainer
-		 */
-		public Map containers = Collections.EMPTY_MAP;
-		
-		/* (non-Javadoc)
-		 * Map of unique container id strings found in classpath (including required projects).
-		 * If a container with the same id was found in more than one project, only one id will
-		 * be in this set since they are the same.
-		 * <p>
-		 * The key will be the container ids, and the value will be a <code>Boolean</code>, where true means it
-		 * is visible to the top-level project.
-		 * 
-		 * Will be empty if no project sent in to launch configuration.
-		 */
-		public Map containerIds = Collections.EMPTY_MAP;
-		
-		/* (non-Javadoc)
-		 * Set of unique plugin id strings found in classpath (including required projects).
-		 * If a required plugin with the same id was found in more than one project, only one id will
-		 * be in this set since they are the same.
-		 * <p>
-		 * The key will be the plugin ids, and the value will be a <code>Boolean</code>, where true means it
-		 * is visible to the top-level project.
-		 * 
-		 * Will be empty if no project sent in to launch configuration.
-		 */		
-		public Map pluginIds = Collections.EMPTY_MAP;;
-		
-		/* (non-Javadoc)
-		 * Map of unique projects found in classpath (including required projects), but not including top-level project.
-		 * <p>
-		 * The key will be the <code>IPath</code> for the project, and the value will be a <code>Boolean</code>, where true means it
-		 * is visible to the top-level project.
-		 * 
-		 * Will be <code>null</code> if no project sent in to launch configuration.
-		 */		
-		public Map projectPaths;
-		
-		/* (non-Javadoc)
-		 * Java project for this launch. <code>null</code> if not for a project.
-		 */
-		public IJavaProject javaProject;
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getContainerIds()
-		 */
-		public Map getContainerIds() {
-			return containerIds;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getContainers()
-		 */
-		public Map getContainers() {
-			return containers;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getJavaProject()
-		 */
-		public IJavaProject getJavaProject() {
-			return javaProject;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getPluginIds()
-		 */
-		public Map getPluginIds() {
-			return pluginIds;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getProjectPaths()
-		 */
-		public Map getProjectPaths() {
-			return projectPaths;
-		}
-		
-	}
-	
-	/**
-	 * LaunchInfo for a launch. Stored by key and retrievable by the key.
-	 * This is only passed to launch delegates. It should not be passed on to
-	 * others, though the IConfigurationContributionInfo may be.
-	 * 
-	 * <p>
-	 * This class is not intended to be subclassed by clients.
-	 * </p>
-	 * 
-	 * @see ProxyLaunchSupport#getInfo(String)
-	 * @see IConfigurationContributionInfo
-	 * @since 1.0.0
-	 */
-	public static class LaunchInfo {
-		/**
-		 * Contributors for this launch
-		 */
-		public IConfigurationContributor[] contributors;
-		
-		/**
-		 * The registry returned from the launch. The launch needs to set this before it returns.
-		 */
-		public ProxyFactoryRegistry resultRegistry;
-		
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getJavaProject()
-		 */
-		public IJavaProject getJavaProject() {
-			return configInfo.getJavaProject();
-		}		
-		
-		/**
-		 * Return the IConfigurationContributionInfo for this launch.
-		 * @return
-		 * 
-		 * @since 1.0.0
-		 */
-		public IConfigurationContributionInfo getConfigInfo() {
-			return configInfo;
-		}
-		
-		protected IConfigurationContributionInfo configInfo;
-		
-	}
-	
-	/**
-	 * Start an implementation using the default config for the given project.
-	 * <p> 
-	 * This will wait for build. If you
-	 * know the build has been suspended by your thread, then you must use the other method that takes a waitForThread
-	 * boolean, and you must pass in false. Otherwise it will deadlock.
-	 * 
-	 * @param project The project. It must be a java project, and it cannot be <code>null</code>.
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param pm
-	 * @return The created registry.
-	 * @throws CoreException
-	 * 
-	 * @see ProxyLaunchSupport#startImplementation(IProject, String, IConfigurationContributor[], boolean, IProgressMonitor)
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-			IProject project,
-			String vmTitle,
-			IConfigurationContributor[] aContribs,
-			IProgressMonitor pm)
-				throws CoreException {
-		return startImplementation(project, vmTitle, aContribs, true, pm);
-	}
-	
-	/**
-	 * Start an implementation using the default config for the given project.
-	 * <p> 
-	 * If you know the build has been suspended by your thread, then you must use call this with false for waitForThread. Otherwise it will deadlock.
-	 * 
-	 * @param project The project. It must be a java project, and it cannot be <code>null</code>.
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param waitForBuild wait for the build. If caller knows that the build has been suspended by this thread, then it must call this with false. Otherwise a deadlock will occur.
-	 * @param pm
-	 * @return The created registry.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-			IProject project,
-			String vmTitle,
-			IConfigurationContributor[] aContribs,
-			boolean waitForBuild, 
-			IProgressMonitor pm)
-				throws CoreException {
-		// First find the appropriate launch configuration to use for this project.
-		// The process is:
-		//	1) See if the project's persistent property has a setting for "proxyLaunchConfiguration", if it does,
-		//		get the configuration of that name and create a working copy of it.
-		//	2) If not, then get the "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
-		//		and create a new instance working copy.
-
-		IJavaProject javaProject = JavaCore.create(project);
-		if (javaProject == null) {
-			throw new CoreException(
-					new Status(
-							IStatus.WARNING,
-							ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
-							0,
-							MessageFormat.format(
-									ProxyMessages.getString(ProxyMessages.NOT_JAVA_PROJECT),
-									new Object[] { project.getName()}),
-							null));
-		}
-
-		// First if specific set.
-		String launchName = project.getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION);
-		ILaunchConfiguration config = null;		
-		if (launchName != null && !NOT_SET.equals(launchName)) {
-			ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
-			for (int i = 0; i < configs.length; i++) {
-				if (configs[i].getName().equals(launchName)) {
-					config = configs[i];
-					break;
-				}
-			}
-			if (config == null || !config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(project.getName())) { //$NON-NLS-1$
-				project.setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, (String) null);	// Config not found, or for a different project, so no longer the default.
-				config = null;
-			}
-		}
-		
-		if (config == null) {
-			ILaunchConfigurationWorkingCopy configwc = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(IProxyConstants.LOCAL_LAUNCH_TYPE).newInstance(null, DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom("LocalProxy_"+project.getName())); //$NON-NLS-1$
-			configwc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getName()); 
-			config = configwc;
-		}
-		
-		return startImplementation(config, vmTitle, aContribs, waitForBuild, pm);
-	}
-	
-	/**
-	 * Launch a registry using the given configuration.
-	 * <p> 
-	 * This will wait for build. If you
-	 * know the build has been suspended by your thread, then you must use the other method that takes a waitForThread
-	 * boolean, and you must pass in false. Otherwise it will deadlock.
-	 *
-	 * @param config 
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param pm
-	 * @return The registry from this configuration.
-	 * @throws CoreException
-	 * 
-	 * @see ProxyLaunchSupport#startImplementation(ILaunchConfiguration, String, IConfigurationContributor[], boolean, IProgressMonitor)
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-			ILaunchConfiguration config,
-			String vmTitle,
-			IConfigurationContributor[] aContribs,
-			IProgressMonitor pm)
-			throws CoreException {
-		return startImplementation(config, vmTitle, aContribs, true, pm);
-	}
-
-	/**
-	 * Launch a registry using the given configuration.
-	 * <p> 
-	 * If you know the build has been suspended by your thread, then you must use you must pass in false for waitForThread. Otherwise it will deadlock.
-	 *
-	 * @param config
-	 * @param vmTitle title for VM. It may be <code>null</code>.
-	 * @param aContribs The contributions array. It may be <code>null</code>.
-	 * @param waitForBuild wait for the build. If caller knows that the build has been suspended by this thread, then it must call this with false. Otherwise a deadlock will occur.
-	 * @param pm
-	 * @return The registry from this configuration.
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ProxyFactoryRegistry startImplementation(
-				ILaunchConfiguration config,
-				String vmTitle,
-				IConfigurationContributor[] aContribs,
-				boolean waitForBuild,
-				IProgressMonitor pm)
-				throws CoreException {
-
-		if (pm == null)
-			pm = new NullProgressMonitor();
-		String stepId = "Pre-launch VM ( " + vmTitle + " )";
-		TimerTests.basicTest.startStep(stepId);
-		if (vmTitle.equals("Beaninfo"))
-			PerformanceMonitorUtil.getMonitor().snapshot(125);
-		final ILaunchConfigurationWorkingCopy configwc = config.getWorkingCopy();
-		
-		pm.beginTask("", 400);
-		pm.subTask(ProxyMessages.getString("ProxyLaunch"));	//$NON-NLS-1$
-		if (waitForBuild) {
-			// See if build needed or waiting or inprogress, if so, wait for it to complete. We've
-			// decided too difficult to determine if build would affect us or not, so just wait.		
-			if (UI_RUNNER != null)
-				UI_RUNNER.handleBuild(new SubProgressMonitor(pm, 100));
-			else
-				runBuild(new SubProgressMonitor(pm, 100));
-			
-			if (pm.isCanceled())
-				return null;
-		}
-				
-		if (aContribs != null) {
-			IConfigurationContributor[] newContribs = new IConfigurationContributor[aContribs.length+1];
-			System.arraycopy(aContribs, 0, newContribs, 1, aContribs.length);
-			newContribs[0] = new ProxyContributor();
-			aContribs = newContribs;
-		} else
-			aContribs = new IConfigurationContributor[] {new ProxyContributor()};
-
-		String launchKey = String.valueOf(System.currentTimeMillis());
-		LaunchInfo launchInfo = new LaunchInfo();
-		synchronized (ProxyLaunchSupport.class) {
-			while (LAUNCH_INFO.containsKey(launchKey)) {
-				launchKey += 'a'; // Just add something on to make it unique.
-			}
-			LAUNCH_INFO.put(launchKey, launchInfo);
-		}
-		
-		String projectName = configwc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
-		aContribs = fillInLaunchInfo(aContribs, launchInfo, projectName);
-		
-		try {		
-			configwc.setAttribute(IProxyConstants.ATTRIBUTE_LAUNCH_KEY, launchKey);
-			if (vmTitle != null && vmTitle.length()>0)
-				configwc.setAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, vmTitle);
-			
-			if (ATTR_PRIVATE != null)
-				configwc.setAttribute(ATTR_PRIVATE, true);			
-			
-			// Let contributors modify the configuration.
-			final IConfigurationContributor[] contribs = aContribs;
-			final LaunchInfo linfo = launchInfo;
-			for (int i = 0; i < contribs.length; i++) {
-				// First run the initialize.
-				// Run in safe mode so that anything happens we don't go away.
-				final int ii = i;
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contribs[ii].initialize(linfo.getConfigInfo());
-					}
-				});
-
-				// Now run the contribute to configuration.
-				// Run in safe mode so that anything happens we don't go away.
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contribs[ii].contributeToConfiguration(configwc);
-					}
-				});
-			}
-			pm.worked(100);
-			
-			configwc.launch(ILaunchManager.RUN_MODE, new SubProgressMonitor(pm, 100));
-			
-			final ProxyFactoryRegistry reg = launchInfo.resultRegistry;
-			if (!pm.isCanceled() && reg == null)
-				throw new CoreException(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.getString("ProxyLaunchSupport.RegistryCouldNotStartForSomeReason_WARN_"), null)); //$NON-NLS-1$
-			if (pm.isCanceled()) {
-				if (reg != null)
-					reg.terminateRegistry();
-				return null;
-			}
-//			TimerTests.basicTest.startStep("contribute to registry");
-			for (int i = 0; i < contribs.length; i++) {
-				final int ii = i;
-				// Run in safe mode so that anything happens we don't go away.
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-//						String stepid = "contribute to registry for " + contribs[ii].getClass();
-//						TimerTests.basicTest.startStep(stepid);
-						contribs[ii].contributeToRegistry(reg);
-//						TimerTests.basicTest.stopStep(stepid);
-					}
-				});
-			}
-//			TimerTests.basicTest.stopStep("contribute to registry");
-		} finally {
-			// Clean up and return.
-			LAUNCH_INFO.remove(launchKey);
-		}	
-		
-		pm.done();
-		if (vmTitle.equals("Beaninfo"))
-			PerformanceMonitorUtil.getMonitor().snapshot(126);
-		TimerTests.basicTest.stopStep(stepId);
-		return launchInfo.resultRegistry;
-	}
-	
-	/**
-	 * Create a default IConfigurationContributionInfo for the given project. This is useful info even when not launching a
-	 * vm.
-	 * 
-	 * @param javaProject
-	 * @return new contrib info.
-	 * @throws JavaModelException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static IConfigurationContributionInfo createDefaultConfigurationContributionInfo(IJavaProject javaProject) throws JavaModelException {
-		LaunchSupportIConfigurationContributionInfo configInfo = new LaunchSupportIConfigurationContributionInfo();
-		configInfo.javaProject = javaProject;
-		configInfo.containerIds = new HashMap(5);
-		configInfo.containers = new HashMap(5);
-		configInfo.pluginIds = new HashMap(5);
-		configInfo.projectPaths = new HashMap(5);
-		ProxyPlugin.getPlugin().getIDsFound(javaProject, configInfo.containerIds, configInfo.containers, configInfo.pluginIds, configInfo.projectPaths);
-		return configInfo;
-
-	}
-	/**
-	 * Fill in the launch info config info and contribs. The contribs sent in may be expanded due to extension
-	 * points and a new one created. Either the expanded copy or the original (if no change) will be stored in
-	 * the launchinfo and returned from this call.
-	 * 
-	 * @param aContribs
-	 * @param launchInfo
-	 * @param projectName
-	 * @return a modified aContribs if any change was made to it.
-	 * @throws JavaModelException
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static IConfigurationContributor[] fillInLaunchInfo(IConfigurationContributor[] aContribs, LaunchInfo launchInfo, String projectName) throws JavaModelException, CoreException {
-		if (projectName != null) {
-			projectName = projectName.trim();
-			if (projectName.length() > 0) {
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-				IJavaProject javaProject = JavaCore.create(project);
-				if (javaProject != null && javaProject.exists()) {
-					launchInfo.configInfo = createDefaultConfigurationContributionInfo(javaProject);
-					if (!launchInfo.configInfo.getContainerIds().isEmpty() || !launchInfo.configInfo.getContainers().isEmpty() || !launchInfo.configInfo.getPluginIds().isEmpty()) {
-						List computedContributors = new ArrayList(launchInfo.configInfo.getContainerIds().size()+launchInfo.configInfo.getContainers().size()+launchInfo.configInfo.getPluginIds().size());
-						// Note: We don't care about the visibility business here. For contributors to proxy it means
-						// some classes in the projects/plugins/etc. need configuration whether they are visible or not.
-						// This is because even though not visible, some other visible class may instantiate it. So it
-						// needs the configuration.
-						// First handle explicit classpath containers that implement IConfigurationContributor
-						for (Iterator iter = launchInfo.configInfo.getContainers().keySet().iterator(); iter.hasNext();) {
-							IClasspathContainer container = (IClasspathContainer) iter.next();
-							if (container instanceof IConfigurationContributor)
-								computedContributors.add(container);
-						}
-						
-						// Second add in contributors that exist for a container id.
-						for (Iterator iter = launchInfo.configInfo.getContainerIds().keySet().iterator(); iter.hasNext();) {
-							String containerid = (String) iter.next();
-							IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getContainerConfigurations(containerid);
-							if (contributors != null)
-								for (int i = 0; i < contributors.length; i++) {
-									Object contributor = contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
-									if (contributor instanceof IConfigurationContributor)
-										computedContributors.add(contributor);
-								}
-						}
-						
-						// Finally add in contributors that exist for a plugin id.
-						for (Iterator iter = launchInfo.configInfo.getPluginIds().keySet().iterator(); iter.hasNext();) {
-							String pluginId = (String) iter.next();
-							IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getPluginConfigurations(pluginId);
-							if (contributors != null)
-								for (int i = 0; i < contributors.length; i++) {
-									Object contributor = contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
-									if (contributor instanceof IConfigurationContributor)
-										computedContributors.add(contributor);
-								}
-						}
-						
-						// Now turn into array
-						if (!computedContributors.isEmpty()) {
-							IConfigurationContributor[] newContribs = new IConfigurationContributor[aContribs.length+computedContributors.size()];
-							System.arraycopy(aContribs, 0, newContribs, 0, aContribs.length);
-							IConfigurationContributor[] cContribs = (IConfigurationContributor[]) computedContributors.toArray(new IConfigurationContributor[computedContributors.size()]);
-							System.arraycopy(cContribs, 0, newContribs, aContribs.length, cContribs.length);
-							aContribs = newContribs;
-						}
-					}
-				}
-			}
-		}
-		
-		launchInfo.contributors = aContribs;
-		return aContribs;
-	}
-
-	/*
-	 * Run the build. If the original launch was in the UI thread, this will
-	 * be called under control of an IProgressService so that it is in a separate
-	 * thread and the UI will remain responsive (in that either a busy cursor comes
-	 * up or eventually a progress dialog).
-	 * If the pm is canceled, this will just return, but the caller must check if the pm is canceled.
-	 * 
-	 * <package-protected> so that only the UI handler will access it.
-	 */
-	static void runBuild(IProgressMonitor pm) throws CoreException {
-		boolean autobuilding = ResourcesPlugin.getWorkspace().isAutoBuilding();
-		if (!autobuilding) {
-			try {
-				// We are not autobuilding. So kick off a build right here and
-				// wait for it. (If we already within a build on this thread, then this
-				// will return immediately without building. We will take that risk. If
-				// some other thread is building, we will wait for it finish before we
-				// can get it and do our build.
-				ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, pm); 
-			} catch (OperationCanceledException e) {
-				// The pm is already marked canceled, so caller can check that instead.
-			} 
-		} else {
-			pm.beginTask("", 200); //$NON-NLS-1$
-			IJobManager jobManager = Platform.getJobManager();
-			Job currentJob = jobManager.currentJob();
-			if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) { 
-				if (jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD).length > 0 || jobManager.find(ResourcesPlugin.FAMILY_MANUAL_BUILD).length >0) {
-					// We are not within a build job. If we were, then we don't do the build. We will take
-					// that risk. The problem is that if within the build, we can't wait for it to finish because
-					// we would stop the thread and so the build would not complete.
-					pm.subTask(ProxyMessages.getString("ProxyWaitForBuild")); //$NON-NLS-1$
-					try {
-						while (true) {
-							try {
-								jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, new SubProgressMonitor(pm, 100));
-								jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, new SubProgressMonitor(pm, 100));
-								break;
-							} catch (InterruptedException e) {
-							}
-						}
-					} catch (OperationCanceledException e) {
-					}
-				}
-			} 
-			pm.done();
-		}
-	}
-	
-	
-	/*
-	 * This prevents the launch from being shown. However these constants are in UI component, and we don't
-	 * want to pre-req that. So we will get them reflectively instead.
-	 * public but only so that launch delegate can get to it.
-	 */
-	public static String ATTR_PRIVATE;
-	private static IUIRunner UI_RUNNER = null;
-
-	static {
-		ATTR_PRIVATE = null;
-		try {
-			// See if we have a UI bundle and it is active. If it exists but is not active,
-			// then we won't do anything. If we were running a UI application, it should already
-			// of been active before we got here.
-			Bundle uiBundle = Platform.getBundle("org.eclipse.ui");	//$NON-NLS-1$
-			if (uiBundle != null && uiBundle.getState() == Bundle.ACTIVE) {
-				try {
-					// We have a UI bundle, so we can load our UIRunner class and it will load fine.
-					UI_RUNNER = (IUIRunner) Class.forName("org.eclipse.jem.internal.proxy.core.UIRunner").newInstance(); //$NON-NLS-1$
-				} catch (InstantiationException e1) {
-					ProxyPlugin.getPlugin().getLogger().log(e1, Level.WARNING);
-				}
-				
-				// So that we can run headless (w/o ui), need to do class forName for debugui contants
-				Bundle debuguiBundle = Platform.getBundle("org.eclipse.debug.ui"); //$NON-NLS-1$
-				if (debuguiBundle != null && debuguiBundle.getState() == Bundle.ACTIVE) {
-					Class debugUIConstants = debuguiBundle.loadClass("org.eclipse.debug.ui.IDebugUIConstants"); //$NON-NLS-1$
-					ATTR_PRIVATE = (String) debugUIConstants.getField("ATTR_PRIVATE").get(null); //$NON-NLS-1$
-				}
-			}			
-		} catch (SecurityException e) {
-		} catch (ClassNotFoundException e) {
-		} catch (NoSuchFieldException e) {
-		} catch (IllegalArgumentException e) {
-		} catch (IllegalAccessException e) {
-		}
-	}	
-
-	/* (non-Javadoc)
-	 * Only referenced by launch delegates. public because they are in other packages,
-	 * or even external developers packages. Not meant to be generally available.
-	 * 
-	 * This is needed because we can't pass the generic info into a launch configuration
-	 * because a launch configuration can't take objects. Only can take strings and numbers.  
-	 */
-	public static synchronized LaunchInfo getInfo(String key) {
-		return (LaunchInfo) LAUNCH_INFO.get(key);
-	}
-	
-	/**
-	 * Convert the string path into a valid url.
-	 * @param path
-	 * @return the url or <code>null</code> if not convertable (i.e. not well-formed).
-	 * 
-	 * @since 1.0.0
-	 */
-	public static URL convertStringPathToURL(String path) {
-		try {
-			return path != null ? new File(path).toURL() : null;
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Convert the string paths into a valid urls.
-	 * 
-	 * @param paths
-	 * @return the urls or <code>null</code> if paths is null. Any path not convertable (i.e. not well-formed) will not be in the final list.
-	 * So this means the result length may be smaller than the paths length.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static URL[] convertStringPathsToURL(String[] paths) {
-		if (paths != null) {
-			URL[] result = new URL[paths.length];
-			int nextURL = 0;
-			for (int i = 0; i < paths.length; i++) {
-				URL url = convertStringPathToURL(paths[i]);
-				if (url != null)
-					result[nextURL++] = url;   
-			}
-			if (nextURL == 0)
-				return null;	// None were found.
-			
-			if (nextURL != result.length) {
-				URL[] nr = new URL[nextURL];
-				System.arraycopy(result, 0, nr, 0, nr.length);
-				result = nr;
-			}
-			return result;
-		} else
-			return null;
-	}
-
-	/**
-	 * Convert the urls to string array. It is assumed the urls are in file protocol. 
-	 * @param urls
-	 * @return string paths or <code>null</code> if urls is <code>null</code>. Any <code>null</code> entry of urls will result in 
-	 * a corresponding <code>null</code> in the strings.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static String[] convertURLsToStrings(URL[] urls) {
-		if (urls != null) {
-			String[] strings = new String[urls.length];
-			for (int i = 0; i < urls.length; i++) {
-				strings[i] = urls[i] != null ? urls[i].getFile() : null;
-			}
-			return strings;
-		} else
-			return null;
-	}
-
-	/* (non-Javadoc)
-	 * Local contributor used to make sure that certain jars are in the path.
-	 * 
-	 * @since 1.0.0
-	 */
-	static class ProxyContributor extends ConfigurationContributorAdapter {
-		public void contributeClasspaths(IConfigurationContributionController controller) {
-			// Add the required jars to the end of the classpath.
-			controller.contributeClasspath(ProxyPlugin.getPlugin().getBundle(), "proxycommon.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, false);	//$NON-NLS-1$
-			controller.contributeClasspath(ProxyPlugin.getPlugin().getBundle(), "initparser.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, true);	//$NON-NLS-1$			
-		}
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java
deleted file mode 100644
index 073460b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ProxyMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:53:45 $ 
- */
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class ProxyMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.core.messages";	//$NON-NLS-1$
-
-	// Keys for messages/strings within the resource bundle.
-	static public final String
-		CLASSCAST_INCORRECTTYPE = "ClassCast_EXC_.IncorrectType", //$NON-NLS-1$
-		UNEXPECTED_EXCEPTION = "UnexpectedException_EXC_", //$NON-NLS-1$
-		PROXYFACTORY_NOBEANPROXY = "ProxyFactory_EXC_.NoBeanProxyFactory", //$NON-NLS-1$
-		PROXYFACTORY_NOBEANTYPEPROXY = "ProxyFactory_EXC_.NoBeanTypeProxyFactory", //$NON-NLS-1$
-		NOT_JAVA_PROJECT = "Not_Java_Project_WARN_", //$NON-NLS-1$
-		NO_VM = "No_VM_WARN_", //$NON-NLS-1$
-		NO_IMPLEMENTATION = "No_Implementation_WARN_"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private ProxyMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
deleted file mode 100644
index 72801a5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
+++ /dev/null
@@ -1,1088 +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.jem.internal.proxy.core;
-/*
- *  $RCSfile: ProxyPlugin.java,v $
- *  $Revision: 1.49 $  $Date: 2005/04/22 14:33:08 $ 
- */
-
-
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.osgi.service.resolver.BundleSpecification;
-import org.osgi.framework.*;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class ProxyPlugin extends Plugin {
-	
-	/**
-	 * This interface is for a listener that needs to know if this plugin (ProxyPlugin) is being shutdown. 
-	 * It is needed because there are some extensions that get added dynamically that need to know when the
-	 * plugin is being shutdown. Can't use new bundle listener for this because it notifies AFTER shutdown.
-	 * 
-	 * @since 1.0.0
-	 */
-	public interface IProxyPluginShutdownListener {
-		/**
-		 * ProxyPlugin is in shutdown.
-		 * 
-		 * @since 1.0.0
-		 */
-		public void shutdown();
-	}
-	
-	private static ProxyPlugin PROXY_PLUGIN = null;
-	public static final String PREFERENCES_VM_NOVERIFY_KEY = "JEM_PREFERENCES_VM_NOVERIFY_KEY"; // Key for NOVERIFY option of VM
-	public static final String PDE_NATURE_ID = "org.eclipse.pde.PluginNature" ;
-		
-	// If this is set to true, then in development mode and it will try for proxy jars in directories.
-	private boolean devMode;
-	
-	private ListenerList shutdownListeners;
-
-	public ProxyPlugin() {
-		super();
-		PROXY_PLUGIN = this;
-		devMode = Platform.inDevelopmentMode();  	
-	}
-
-	/**
-	 * Access the singleton
-	 * @return the singleton plugin
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ProxyPlugin getPlugin() {
-		return PROXY_PLUGIN;
-	}
-	
-	private Logger logger;
-	public Logger getLogger() {
-		if (logger == null)
-			logger = EclipseLogger.getEclipseLogger(this);
-		return logger;
-	}	
-
-	/**
-	 * This will take the bundle and file name and make it local and return that
-	 * fully qualified. It will look in fragments, but only returns first found. If there can be multiples use
-	 * the one for bundles and it fragments.
-	 * <p>
-	 * If we are in development and it will pick it up from the path
-	 * that is listed in the proxy.jars file located in the bundle passed in. This allows development code to be
-	 * used in place of the actual runtime jars. If the runtime jars are found,
-	 * they will be used.
-	 * <p>
-	 * For example if looking for file runtime/xyz.jar in bundle abc, then in bundle directory for abc,
-	 * there should be a file called proxy.jars. This should only be in development, this file should not
-	 * be distributed for production. It would be distributed in the SDK environment when testing is desired.
-	 * <p>
-	 * The format of the file is:
-	 * 	runtimefile=/projectname/builddirectory
-	 * <p>
-	 * For this to work when the actual jar is not found, the Eclipse must of been started in 
-	 * dev mode (i.e. the bundle location will be a project within the developer Eclipse. That way
-	 * we can go up one level for the current install location and assume the above projectname
-	 * will be found relative to the directory.
-	 * <p>
-	 * For the above example:
-	 * 	runtime/xyz.jar=/xyzproject/bin
-	 * <p>
-	 * It will return "." if file can't be found. It means nothing but it won't cause jvm to crash.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return the path to the file or <code>"."</code> if not found.
-	 * 
-	 * @since 1.0.0
-	 */
-	public String localizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
-		URL url = urlLocalizeFromBundleOnly(bundle, filenameWithinBundle);
-		return url != null ? getFileFromURL(url) : "."; //$NON-NLS-1$
-	}
-	public String localizeFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		URL url = urlLocalizeFromBundleAndFragments(bundle, filenameWithinBundle);
-		return url != null ? getFileFromURL(url) : "."; //$NON-NLS-1$
-	}
-	
-	/**
-	 * Just like localizeFromBundle except it will return an array of Strings. It will look for the filename
-	 * within the bundle and any fragments of the bundle. If none are found, an empty array will be returned.
-	 * <p>
-	 * To find the files in the fragments that are in the runtime path (i.e. libraries), it will need to use a suffix,
-	 * This is because the JDT will get confused if a runtime jar in a fragment has the same name
-	 * as a runtime jar in the main bundle.
-	 * NOTE: This is obsolete. JDT no longer has this problem. So we can find libraries in fragments that have the
-	 * same file path. 
-	 * <p>
-	 * So we will use the following search pattern:
-	 * <ol>
-	 * <li>Find in all of the fragments those that match the name exactly in the same paths if paths are supplied.</li>
-	 * <li>Find in all of the fragments, in their runtime path (library stmt), those that match the name 
-	 *    but have a suffix the same as the uniqueid of the fragment (preceeded by a period). This is so that it can be easily
-	 *    found but yet be unique in the entire list of fragments. For example if looking for "runtime/xyz.jar"
-	 *    and we have fragment "a.b.c.d.frag", then in the runtime path we will look for the file
-	 *    "runtime/xyz.a.b.c.d.frag.jar". Note: This is obsolete. Still here only for possible old code. Will go 
-	 *    away in future.</li>
-	 * <p>
-	 * If the files in the fragments are not in the fragments library path then it can have the same name. NOTE: Obsolete,
-	 * JDT can now handle same name.
-	 * <p>
-	 * This is useful for nls where the nls for the filename will be in one or more of the fragments of the plugin.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public String[] localizeAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		URL[] urls = urlLocalizeAllFromBundleAndFragments(bundle, filenameWithinBundle);
-		String[] result = new String[urls.length];
-		for (int i = 0; i < urls.length; i++) {
-			result[i] = getFileFromURL(urls[i]);
-		}
-		return result;
-	}
-	
-	private static String getFileFromURL(URL url) {
-		// We need to do this in a device independent way. The URL will always put a leading '/' in the
-		// file part of the URL, but on Windows we need to have this '/' removed. Some JRE's don't understand it.
-		return new File(url.getFile()).getAbsolutePath();
-
-	}
-
-	public URL urlLocalizeFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		return urlLocalizeFromBundleAndFragments(bundle, new Path(filenameWithinBundle));
-	}
-	public URL urlLocalizeFromBundleAndFragments(Bundle bundle, IPath filenameWithinBundle) {
-		try {
-			URL pvm = Platform.find(bundle, filenameWithinBundle);
-			if (pvm != null)
-				return Platform.asLocalURL(pvm);
-		} catch (IOException e) {
-		}
-		if (devMode) {
-			URL[] urls = findDevAllFromBundleAndFragments(bundle, filenameWithinBundle.toString());
-			if (urls.length > 0)
-				return urls[0];
-			else
-				return null;
-		} else
-			return null;
-	}
-	
-	/**
-	 * Like <code>localizeFromBundleAndFragments</code> except it returns URL's instead.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @see ProxyPlugin#localizeFromBundleAndFragments(Bundle, String)
-	 * @since 1.0.0
-	 */
-	public URL[] urlLocalizeAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		return urlLocalizeAllBundleAndFragments(bundle, Platform.getFragments(bundle), filenameWithinBundle);
-	}
-	public URL[] urlLocalizeAllFromBundleAndFragments(Bundle bundle, IPath filenameWithinBundle) {
-		return urlLocalizeAllBundleAndFragments(bundle, Platform.getFragments(bundle), filenameWithinBundle.toString());
-	}
-	
-	/**
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @param fragments
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	private URL[] urlLocalizeAllBundleAndFragments(Bundle bundle, Bundle[] fragments, String filenameWithinBundle) {
-
-		ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
-		URL url = internalUrlLocalizeFromBundleOnly(bundle, filenameWithinBundle);
-		if (url != null)
-			urls.add(url);
-		if (fragments != null) {
-			for (int i = 0; i < fragments.length; i++) {
-				Bundle fragment = fragments[i];
-				url = internalUrlLocalizeFromBundleOnly(fragment, filenameWithinBundle);
-				if (url != null)
-					urls.add(url);
-			}
-		}
-		return (URL[]) urls.toArray(new URL[urls.size()]);
-	}
-
-	private static final String PROXYJARS = "proxy.jars";	//$NON-NLS-1$
-	
-	/**
-	 * @see ProxyPlugin#localizeFromBundle(Bundle, String)
-	 * 
-	 * This is just a helper to return a url instead.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public URL urlLocalizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
-		// If the filenameWithinBundle begins with one of these special characters,
-		// it might be in a fragment.
-		if (filenameWithinBundle.charAt(0) == '$'
-				&& (filenameWithinBundle.regionMatches(true, 0, "$nl$", 0, "$nl$".length())
-						|| filenameWithinBundle.regionMatches(true, 0, "$os$", 0, "$os$".length()) || filenameWithinBundle.regionMatches(true, 0,
-						"$ws$", 0, "$ws$".length())))
-			return urlLocalizeFromBundleAndFragments(bundle, filenameWithinBundle);
-		try {
-			URL pvm = new URL(bundle.getEntry("/"), filenameWithinBundle);
-			pvm = verifyFound(Platform.asLocalURL(pvm));
-			if (pvm != null)
-				return pvm;
-		} catch (IOException e) {
-		}
-		return findDev(bundle, filenameWithinBundle);
-
-	}
-	
-	protected URL internalUrlLocalizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
-		try {
-			URL pvm = bundle.getEntry(filenameWithinBundle);
-			if (pvm != null)
-				return Platform.asLocalURL(pvm);
-		} catch (IOException e) {
-		}
-		return findDev(bundle, filenameWithinBundle);		
-		
-	}	
-	
-	private URL verifyFound(URL pvm) throws IOException {
-		if (devMode) {
-			// Need to test if found in devmode. Otherwise we will just assume it is found. If not found on remote and moved to cache, an IOException would be thrown.
-			if (pvm != null) {
-				InputStream ios = null;
-				try {
-					ios = pvm.openStream();
-					if (ios != null)
-						return pvm; // Found it, so return it.
-				} finally {
-					if (ios != null)
-						ios.close();
-				}
-			}
-		} else
-			return pvm;
-		return null;
-	}
-
-	/**
-	 * @see ProxyPlugin#localizeFromBundle(bundle, String)
-	 * 
-	 * This is just a helper to return a url instead.
-	 * 
-	 * @param bundle
-	 * @param filenameWithinBundle
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public URL urlLocalizeFromBundleOnly(Bundle bundle, IPath filenameWithinBundle) {					
-		return urlLocalizeFromBundleOnly(bundle, filenameWithinBundle.toString());
-	}
-	
-	private URL findDev(Bundle bundle, String filenameWithinBundle) {
-		if (devMode) {
-			// Got this far and in dev mode means it wasn't found, so we'll try for development style.
-			// It is assumed that in dev mode, we are running with the IDE as local and any 
-			// build outputs will be local so local file protocol will be returned
-			// from Platform.resolve(). We won't be running in dev mode with our entireplugin being in a jar,
-			// or on a separate system.
-			try {
-				URL pvm = bundle.getEntry(PROXYJARS);
-				if (pvm != null) {
-					InputStream ios = null;
-					try {
-						ios = pvm.openStream();
-						Properties props = new Properties();
-						props.load(ios);
-						String pathString = props.getProperty(filenameWithinBundle.toString());
-						if (pathString != null) {
-							URL url = Platform.resolve(bundle.getEntry("/"));	// It is assumed that if in debug mode, then this plugin is an imported plugin within the developement workspace.
-							if (url.getProtocol().equals("file")) {
-								File file = new File(url.getFile()).getParentFile();	// This gets us to workspace root of development workspace.
-								file = new File(file, pathString);
-								return file.toURL();
-							}
-						}
-					} finally {
-						if (ios != null)
-							ios.close();
-					}
-				}
-			} catch (IOException e) {
-			}
-		}
-		
-		return null;
-
-	}
-	private URL[] findDevAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
-		Bundle [] fragments = Platform.getFragments(bundle);
-		ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
-		URL url = findDev(bundle, filenameWithinBundle);
-		if (url != null)
-			urls.add(url);
-		if (fragments != null) {
-			for (int i = 0; i < fragments.length; i++) {
-				Bundle fragment = fragments[i];
-				url = findDev(fragment, filenameWithinBundle);
-				if (url != null)
-					urls.add(url);
-			}
-		}
-		return (URL[]) urls.toArray(new URL[urls.size()]);
-	}	
-	/**
-	 * A helper to order the plugins into pre-req order. 
-	 * If A eventually depends on B, then B will be ahead of A in the
-	 * list of plugins. (I.e. B is a pre-req somewhere of A).
-	 *  
-	 * @param bundlesToOrder - Bundles of interest. The results will have these in thiee correct order.
-	 * @return An array of the Bundlers in there order from no prereqs in set to the leaves.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static Bundle[] orderPlugins(final Set bundlesToOrder) {
-		Map prereqsMap = new HashMap(bundlesToOrder.size()*3);
-		int ndx = bundlesToOrder.size();
-		Bundle[] result = new Bundle[ndx];
-		Map dependents = getDependentCounts(false, bundlesToOrder, prereqsMap);	// We want the inactive ones too. That way have complete order. They can be ignored later if necessary.
-		// keep iterating until all have been visited. This will actually find them in reverse order from what we
-		// want, i.e. it will find the leaves first. So we will build result array in reverse order.
-		while (!dependents.isEmpty()) {
-			// loop over the dependents list.  For each entry, if there are no dependents, visit
-			// the bundle and remove it from the list.  Make a copy of the keys so we don't end up
-			// with concurrent accesses (since we are deleting the values as we go)
-			Iterator ib = dependents.entrySet().iterator();
-			while (ib.hasNext()) {
-				Map.Entry entry = (Map.Entry) ib.next();
-				Bundle bundle = (Bundle) entry.getKey() ;
-				int[] count = (int[]) entry.getValue();
-				if (count != null && count[0] <= 0) {
-					if (bundlesToOrder.contains(bundle)) {
-						result[--ndx] = bundle;
-						if (ndx == 0)
-							return result;	// We've ordered all that we care about. Anything left over is unimportant.
-					}
-					ib.remove();
-					// decrement the dependent count for all of the prerequisites.
-					Bundle[] requires = getPrereqs(bundle, prereqsMap);
-					for (int j = 0; j < requires.length; j++) {
-						Bundle prereq = requires[j];
-						int[] countPrereq = (int[]) dependents.get(prereq);
-						if (countPrereq != null)
-							--countPrereq[0];
-					}
-				}
-			}
-		}		
-		return result;
-	}
-	
-	/**
-	 * Get all of the prereqs for this bundle, all of the way down to the root.
-	 * They will be in top-down depth-first order. There won't be duplicates. They will show up
-	 * only once the first time they are found.
-	 * 
-	 * @param bundle
-	 * @return list of all pre-reqs.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static List getAllPrereqs(Bundle bundle) {
-		List prereqs = new ArrayList();
-		getAllPrereqs(bundle, prereqs, new HashMap());
-		return prereqs;
-	}
-	
-	private static void getAllPrereqs(Bundle bundle, List prereqs, Map prereqsMap) {
-		Bundle[] prs = getPrereqs(bundle, prereqsMap);
-		for (int i = 0; i < prs.length; i++) {
-			Bundle pre = prs[i];
-			if (prereqsMap.containsKey(pre))
-				continue;	// Already processed this one once.
-			prereqs.add(pre);	// Add to the list of pre-reqs accumulated so far.
-			getAllPrereqs(pre, prereqs, prereqsMap);
-		}
-	}
-	
-	private static Bundle[] getPrereqs(Bundle bundle, Map prereqsMap) {
-		Bundle[] prereqs = (Bundle[]) prereqsMap.get(bundle);
-		if (prereqs == null) {
-			prereqs = getPrereqs(bundle);
-			prereqsMap.put(bundle, prereqs);
-		}
-		return prereqs;
-	}
-	
-	public static Bundle[] getPrereqs(Bundle bundle) {
-		Bundle[] l = (Bundle[]) pluginRequiredMap.get(bundle.getSymbolicName());
-		if (l == null) {
-			BundleSpecification specs[] = Platform.getPlatformAdmin().getState(false).getBundle(bundle.getBundleId()).getRequiredBundles();
-			ArrayList bundles = new ArrayList(specs.length);
-			for (int i = 0; i < specs.length; i++) {
-				Bundle b = Platform.getBundle(specs[i].getName());
-				if (b != null)
-					bundles.add(b);
-			}
-			l = (Bundle[]) bundles.toArray(new Bundle[bundles.size()]);
-			pluginRequiredMap.put(bundle.getSymbolicName(), l);
-		}
-		return l;
-	}
-	
-	private static Map getDependentCounts(boolean activeOnly, Set startingSet, Map prereqsMap) {
-		Map dependents = new HashMap(startingSet.size());
-		// build a table of all dependent counts.  The table is keyed by descriptor and
-		// the value the integer number of dependent plugins.
-		List processNow = new ArrayList(startingSet);
-		List processNext = new ArrayList(processNow.size());
-		if (!processNow.isEmpty()) {
-			// Go through the first time from the starting set to get an entry into the list.
-			// If there is an entry, then it won't be marked for processNext. Only new entries
-			// are added to processNext in the following loop.
-			int pnSize = processNow.size();
-			for (int i = 0; i < pnSize; i++) {
-				Bundle bundle = (Bundle) processNow.get(i);
-				if (activeOnly && bundle.getState() != Bundle.ACTIVE)
-					continue;
-				// ensure there is an entry for this descriptor (otherwise it will not be visited)
-				int[] entry = (int[]) dependents.get(bundle);
-				if (entry == null)
-					dependents.put(bundle, new int[1]);
-			}
-		}
-		
-		// Now process the processNow to find the requireds, increment them, and add to processNext if never found before.
-		while (!processNow.isEmpty()) {
-			processNext.clear();
-			int pnSize = processNow.size();
-			for (int i = 0; i < pnSize; i++) {
-				Bundle bundle = (Bundle) processNow.get(i);
-				if (activeOnly && bundle.getState() != Bundle.ACTIVE)
-					continue;			
-				Bundle[] requires = getPrereqs(bundle, prereqsMap);
-				for (int j = 0; j < requires.length; j++) {
-					Bundle prereq = requires[j];
-					if (prereq == null || activeOnly
-							&& bundle.getState() != Bundle.ACTIVE)
-						continue;
-					int[] entry = (int[]) dependents.get(prereq);
-					if (entry == null) {
-						dependents.put(prereq, new int[]{1});
-						processNext.add(prereq); // Never processed before, so we add it to the next process loop.
-					} else
-						++entry[0];
-				}
-			}
-			
-			// Now swap the lists so that we processNext will be now and visa-versa.
-			List t = processNext;
-			processNext = processNow;
-			processNow = t;
-		}
-		return dependents;
-	}
-		
-	/**
-	 * Add a shutdown listener
-	 * @param listener
-	 * 
-	 * @since 1.0.0
-	 */
-	public void addProxyShutdownListener(IProxyPluginShutdownListener listener) {
-		if (shutdownListeners == null)
-			shutdownListeners = new ListenerList();
-		shutdownListeners.add(listener);
-	}
-
-	/**
-	 * Remove a shutdown listener
-	 * @param listener
-	 * 
-	 * @since 1.0.0
-	 */
-	public void removeProxyShutdownListener(IProxyPluginShutdownListener listener) {
-		if (shutdownListeners != null)
-			shutdownListeners.remove(listener);
-	}
-	
-	private ILaunchConfigurationListener launchListener = new ILaunchConfigurationListener() {
-		public void launchConfigurationAdded(ILaunchConfiguration configuration) {
-			try {
-				if (!configuration.isWorkingCopy() && IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configuration.getCategory()))
-					startCleanupJob();
-			} catch (Exception e) {
-			}
-		}
-
-		public void launchConfigurationChanged(ILaunchConfiguration configuration) {
-			try {
-				if (!configuration.isWorkingCopy() && IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configuration.getCategory()))
-					startCleanupJob();
-			} catch (Exception e) {
-			}
-		}
-
-		public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
-			try {
-				// On delete you can't tell the category or anything because all of that info has already removed.
-				if (!configuration.isWorkingCopy())
-					startCleanupJob();
-			} catch (Exception e) {
-			}
-		}
-	};
-	
-	private Job cleanupJob = new Job(ProxyMessages.getString("ProxyPlugin.CleanupDefaultProxyLaunchConfigurations")) { //$NON-NLS-1$
-		{
-			setSystem(true);	// So it doesn't show up in progress monitor. No need to interrupt user.
-			setPriority(Job.SHORT);	// A quick running job.
-		}
-		protected IStatus run(IProgressMonitor monitor) {
-			synchronized (this) {
-				if (monitor.isCanceled())
-					return Status.CANCEL_STATUS;
-			}
-			// all we want to do is find out if any launch configurations (from proxy launch group) exist for
-			// a project. If they don't, then unset the project's property. If they do, and the property is not
-			// set, then set it to NOT_SET to indicate not set, but there are some configs for it.
-			// We just gather the project names that have launch configurations.
-			try {
-				Set projectNames = new HashSet();
-				ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
-				for (int i = 0; i < configs.length; i++) {
-					if (IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configs[i].getCategory())
-						&& (ProxyLaunchSupport.ATTR_PRIVATE == null || !configs[i].getAttribute(ProxyLaunchSupport.ATTR_PRIVATE, false)))
-						projectNames.add(configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""));
-				}
-
-				IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
-				IJavaElement[] children = model.getChildren();
-				int cancelCount = 10;
-				for (int j = 0; j < children.length; j++) {
-					if (children[j].getElementType() == IJavaElement.JAVA_PROJECT) {
-						if (--cancelCount <= 0)
-							synchronized (this) {
-								cancelCount = 10;	// Rest for next set of ten.
-								// Checking on every 10 projects because they may be many projects, while only few configs.
-								// This way it will stop sooner.
-								if (monitor.isCanceled())
-									return Status.CANCEL_STATUS;
-							}						
-						IProject p = ((IJavaProject) children[j]).getProject();
-						if (projectNames.contains(p.getName())) {
-							// This project has a launch config. If it has a setting, then do nothing, else need to put on not set. 
-							if (p.getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION) == null)
-								p.getProject().setPersistentProperty(
-									ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION,
-									ProxyLaunchSupport.NOT_SET);
-						} else {
-							// This project has no launch configs. Remove any setting if it exists.
-							p.setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, (String) null);
-						}
-					}
-				}
-				return Status.OK_STATUS;
-			} catch (CoreException e) {
-				return e.getStatus();
-			}
-		}
-	};
-	
-	private void startCleanupJob() {
-		cleanupJob.cancel();	// Stop what we are doing.
-		cleanupJob.schedule(1000l);	// Schedule to start in one second.
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(final BundleContext context) throws Exception {
-		super.start(context);
-		DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(launchListener);
-		context.addBundleListener(new BundleListener() {
-			public void bundleChanged(BundleEvent event) {
-				if (event.getBundle() != ProxyPlugin.this.getBundle())
-					return;	// Not of interest to us.
-				switch (event.getType()) {
-					case BundleEvent.STARTED:
-						context.removeBundleListener(this);	// Since we don't care anymore
-						startCleanupJob();
-						break;
-					case BundleEvent.STOPPED:
-					case BundleEvent.UNINSTALLED:
-					case BundleEvent.UNRESOLVED:
-						context.removeBundleListener(this);	// We stopped before we started, so remove ourselves.
-						break;
-				}
-			}
-		});
-		getPluginPreferences().setDefault(PREFERENCES_VM_NOVERIFY_KEY, true);
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// Handle case where debug plugin shuts down before we do since order not guarenteed.
-		if (DebugPlugin.getDefault() != null)
-			DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(launchListener);
-		cleanupJob.cancel();	// Stop what we are doing.		
-		if (shutdownListeners != null) {
-			Object[] listeners = shutdownListeners.getListeners();
-			for (int i = 0; i < listeners.length; i++) {
-				((IProxyPluginShutdownListener) listeners[i]).shutdown();
-			}
-		}		
-		super.stop(context);
-	}
-	
-	public static final String PI_CONFIGURATION_CONTRIBUTION_EXTENSION_POINT = "org.eclipse.jem.proxy.contributors"; //$NON-NLS-1$
-	public static final String PI_CONTAINER = "container"; //$NON-NLS-1$
-	public static final String PI_PLUGIN = "plugin"; //$NON-NLS-1$
-	public static final String PI_CLASS = "class"; //$NON-NLS-1$
-	public static final Map pluginRequiredMap = new HashMap(50);
-	
-	/*
-	 * Map of container id's to their ordered array of contribution config elements.
-	 */
-	protected Map containerToContributions = null;
-	/*
-	 * Map of plugin id's to their ordered array of contribution config elements.
-	 */
-	protected Map pluginToContributions = null;
-
-	/**
-	 * These are public only so that jem.ui can access this constant. Not meant to be accessed by others.
-	 */
-	public static final QualifiedName PROPERTY_LAUNCH_CONFIGURATION = new QualifiedName("org.eclipse.jem.proxy", "proxyLaunchConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
-	
-	/**
-	 * Return the plugin ordered array of configuration elements for the given container, or <code>null</code> if not contributed.
-	 * 
-	 * @param containerid
-	 * @return Array of configuration elements or <code>null</code> if this container has no contributions.
-	 * 
-	 * @since 1.0.0
-	 */
-	public synchronized IConfigurationElement[] getContainerConfigurations(String containerid) {
-		if (containerToContributions == null)
-			processProxyContributionExtensionPoint();
-		return (IConfigurationElement[]) containerToContributions.get(containerid);
-	}
-
-	/**
-	 * Return the plugin ordered array of configuration elements for the given plugin, or <code>null</code> if not contributed.
-	 * 
-	 * @param pluginid
-	 * @return Array of configuration elements or <code>null</code> if this plugin has no contributions.
-	 * 
-	 * @since 1.0.0
-	 */
-	public synchronized IConfigurationElement[] getPluginConfigurations(String pluginid) {
-		if (pluginToContributions == null)
-			processProxyContributionExtensionPoint();
-		return (IConfigurationElement[]) pluginToContributions.get(pluginid);
-	}
-	
-	protected synchronized void processProxyContributionExtensionPoint() {
-		ContributorExtensionPointInfo info = processContributionExtensionPoint(PI_CONFIGURATION_CONTRIBUTION_EXTENSION_POINT);
-		containerToContributions = info.containerToContributions;
-		pluginToContributions = info.pluginToContributions;
-	}
-	
-	
-	/**
-	 * Result form processContributionExtensionPoint.
-	 * 
-	 * @see ProxyPlugin#processContributionExtensionPoint(String)
-	 * @since 1.0.0
-	 */
-	public static class ContributorExtensionPointInfo {
-		/**
-		 * Map of container ids (String) to contributions (IConfigurationElement[]) that was found with that id. For each container,
-		 * the contributions will be listed in plugin prereq order.
-		 */
-		public Map containerToContributions;
-		
-		/**
-		 * Map of plugin ids (String) to contributions (IConfigurationElement[]) that was found with that id. For each plugin,
-		 * the contributions will be listed in plugin prereq order.
-		 */
-		public Map pluginToContributions;
-	}
-
-	/**
-	 * Process the extension point looking contributors. It will find entries that have the "container" or "plugin" attributes
-	 * set on them.
-	 * 
-	 * @param extensionPoint fully-qualified extension point id, including plugin id of the extension point.
-	 * @return the contributor info record.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ContributorExtensionPointInfo processContributionExtensionPoint(String extensionPoint) {	
-		// We are processing this once because it is accessed often (once per vm per project).
-		// This can add up so we get it together once here.
-		IExtensionPoint extp = Platform.getExtensionRegistry().getExtensionPoint(extensionPoint);
-		ContributorExtensionPointInfo result = new ContributorExtensionPointInfo();
-		if (extp == null) {
-			result.containerToContributions = Collections.EMPTY_MAP;
-			result.pluginToContributions = Collections.EMPTY_MAP;
-			return result;
-		}
-		
-		IExtension[] extensions = extp.getExtensions();
-		// Need to be in plugin order so that first ones processed have no dependencies on others.
-		HashMap bundlesToExtensions = new HashMap(extensions.length);
-		for (int i = 0; i < extensions.length; i++) {
-			Bundle bundle = Platform.getBundle(extensions[i].getNamespace());
-			IExtension[] ext = (IExtension[]) bundlesToExtensions.get(bundle);
-			if (ext == null)
-				bundlesToExtensions.put(bundle, new IExtension[] {extensions[i]});
-			else {
-				// More than one extension defined in this plugin.
-				IExtension[] newExt = new IExtension[ext.length + 1];
-				System.arraycopy(ext, 0, newExt, 0, ext.length);
-				newExt[newExt.length-1] = extensions[i];
-				bundlesToExtensions.put(bundle, newExt);
-			}
-		}
-		
-		// Now order them so we process in required order.
-		// If it is the first time, we are about to find out many inter-dependencies
-		// notify the cache on a start/end of a transaction so that updates (if new
-		// dependencies) are updated only once
-		Bundle[] ordered = ProxyPlugin.orderPlugins(bundlesToExtensions.keySet());
-		result.containerToContributions = new HashMap(ordered.length);
-		result.pluginToContributions = new HashMap(ordered.length);
-		for (int i = 0; i < ordered.length; i++) {
-			IExtension[] exts = (IExtension[]) bundlesToExtensions.get(ordered[i]);
-			for (int j = 0; j < exts.length; j++) {
-				IConfigurationElement[] configs = exts[j].getConfigurationElements();
-				// Technically we expect the config elements to have a name of "contributor", but since that
-				// is all that can be there, we will ignore it. The content is what is important.
-				for (int k = 0; k < configs.length; k++) {
-					String container = configs[k].getAttributeAsIs(PI_CONTAINER);
-					if (container != null) {
-						List contributions = (List) result.containerToContributions.get(container);
-						if (contributions == null) {
-							contributions = new ArrayList(1);
-							result.containerToContributions.put(container, contributions);
-						}
-						contributions.add(configs[k]);
-					}
-					String plugin = configs[k].getAttributeAsIs(PI_PLUGIN);
-					if (plugin != null) {
-						List contributions = (List) result.pluginToContributions.get(plugin);
-						if (contributions == null) {
-							contributions = new ArrayList(1);
-							result.pluginToContributions.put(plugin, contributions);
-						}
-						contributions.add(configs[k]);
-					}
-				}
-			} 
-		}
-		
-		// Now go through and turn all of the contribution lists into arrays.
-		for (Iterator iter = result.containerToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
-		}
-		for (Iterator iter = result.pluginToContributions.entrySet().iterator(); iter.hasNext();) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
-		}
-
-		return result;
-	}
-	
-	/**
-	 * For the given java project, return the maps of container paths and plugins found. The keys will be of type as specified for the parms
-	 * while the value will be Boolean, true if it was visible, and false if it wasn't.
-	 * For example if <code>/SWT_CONTAINER/subpath1</code> is found in the projects path (or from required projects), then
-	 * the container id will be added to the map. They come from the raw classpath entries of the projects.
-	 *
-	 * @param jproject
-	 * @param containerIds This map will be filled in with container ids as keys (type is <code>java.lang.String</code>) that are found in the projects build path. The value will be a Boolean, true if this container id was visible to the project (i.e. was in the project or was exported from a required project).
-	 * @param containers This map will be filled in with classpath containers as keys found in the projects build path. The value will be a Boolean as in container ids map.
-	 * @param pluginIds This map will be filled in with plugin ids as keys (type is <code>java.lang.String</code>) that are found in the projects build path. The value will be a Boolean as in container ids map.
-	 * @param projects This map will be filled in with project paths (except the top project) as keys (type is <code>org.eclipse.core.runtime.IPath</code>) that are found in the projects build path. The value will be a Boolean as in container ids map.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void getIDsFound(IJavaProject jproject, Map containerIds, Map containers, Map pluginIds, Map projects) throws JavaModelException {		
-		IPath projectPath = jproject.getProject().getFullPath();
-		projects.put(projectPath, Boolean.TRUE);		
-		expandProject(projectPath, containerIds, containers, pluginIds, projects, true, true);
-		projects.remove(projectPath);	// Don't need to include itself now, was needed for testing so if ciruclar we don't get into a loop.
-	}
-	
-	/*
-	 * The passed in visible flag tells if this project is visible and its contents are visible if they are exported.
-	 * Only exception is if first is true, then all contents are visible to the top level project.
-	 */
-	private void expandProject(IPath projectPath, Map containerIds, Map containers, Map pluginIds, Map projects, boolean visible, boolean first) throws JavaModelException {
-		IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(projectPath.lastSegment());
-		if (res == null)
-			return;	// Not exist so don't delve into it.
-		IJavaProject project = (IJavaProject)JavaCore.create(res);
-		if (project == null || !project.exists() || !project.getProject().isOpen())
-			return;	// Not exist as a java project or not open, so don't delve into it.
-
-		IClasspathEntry[] entries = project.getRawClasspath();
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			Boolean currentFlag = null;	// Current setting value.
-			boolean newFlag;	// The new setting value. 
-			switch (entry.getEntryKind()) {
-				case IClasspathEntry.CPE_PROJECT:
-					// Force true if already true, or this is the first project, or this project is visible and the entry is exported. These override a previous false.
-					currentFlag = (Boolean) projects.get(entry.getPath());
-					newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
-					if (currentFlag == null || currentFlag.booleanValue() != newFlag)
-						projects.put(entry.getPath(),  newFlag ? Boolean.TRUE : Boolean.FALSE );
-					if (currentFlag == null)
-						expandProject(entry.getPath(), containerIds, containers, pluginIds, projects, visible && entry.isExported(), false);
-					break;
-				case IClasspathEntry.CPE_CONTAINER:
-					if (!first && "org.eclipse.jdt.launching.JRE_CONTAINER".equals(entry.getPath().segment(0)))
-						break;	// The first project determines the JRE, so any subsequent ones can be ignored.
-					currentFlag = (Boolean) containerIds.get(entry.getPath().segment(0));
-					newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());					
-					if (currentFlag == null || currentFlag.booleanValue() != newFlag)					
-						containerIds.put(entry.getPath().segment(0), newFlag ? Boolean.TRUE : Boolean.FALSE );					
-
-					IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
-					// Force true if already true, or this is the first project, or this project is visible and the entry is exported. These override a previous false.
-					currentFlag = (Boolean) containers.get(container);
-					newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
-					if (currentFlag == null || currentFlag.booleanValue() != newFlag)					
-						containers.put(container,  newFlag ? Boolean.TRUE : Boolean.FALSE );
-					break;
-				case IClasspathEntry.CPE_VARIABLE:
-					// We only care about JRE_LIB. If we have that, then we will treat it as JRE_CONTAINER. Only
-					// care about first project too, because the first project is the one that determines the JRE type.
-					if (first && "JRE_LIB".equals(entry.getPath().segment(0))) { //$NON-NLS-1$
-						currentFlag = (Boolean) containerIds.get("org.eclipse.jdt.launching.JRE_CONTAINER");	//$NON-NLS-1$
-						if (currentFlag == null || !currentFlag.booleanValue())						
-							containerIds.put("org.eclipse.jdt.launching.JRE_CONTAINER", Boolean.TRUE); //$NON-NLS-1$
-					}
-					break;
-				default:
-					break;
-			}
-		}		
-		
-		findPlugins(pluginIds, visible, first, project);
-	}
-	
-	/**
-	 * Find the plugins that the given project references, either directly or indirectly.
-	 * <p>
-	 * The map will be of plugin ids to a Boolean. If the boolean is <code>BooleanTRUE</code>,
-	 * then the plugin is visible to the given project. the visible and first flags
-	 * will modify this. If first is true, then all direct plugins will be visible,
-	 * else only exported plugins will be visible. If visible is false and first is false, then it doesn't matter, all of the
-	 * plugins will not be visible. 
-	 * <p>
-	 * Visible means that classes in the plugin can be referenced directly from code. Not visible
-	 * means that they can only be referenced from some other plugin in the list. In other words,
-	 * visible ones can be directly referenced, but invisible ones can only be referenced from
-	 * plugins that can see it.
-	 * <p>
-	 * For most uses, first and visible should be true. Then it will treat the project as the toplevel
-	 * project and will return true for those that are visible to it, either directly or indirectly.
-	 * These flags were added for more special cases where may be calling on a project that is deeper
-	 * down in the classpath were visibilty has already been decided.
-	 * <p>
-	 * Note: PDE must be installed for this to return anything, otherwise it will leave
-	 * the map alone.
-	 * 
-	 * @param pluginIds map of pluginIds->Boolean(TRUE is visible)
-	 * @param visible <code>true</code> means this project is visible, so any plugins visible to it will be visible, else none will be visible.
-	 * @param first <code>true</code> if this is the top project of interest. This means that all plugins within the project are visible. Else only exported projects will be visible.
-	 * @param project project to start looking from
-	 * 
-	 * @since 1.0.2
-	 */
-	public void findPlugins(Map pluginIds, boolean visible, boolean first, IJavaProject project) {
-		try {
-			// To prevent unnecessary loading of the PDE plugin, find the plugins only if this project is a PDE plugin project.
-			if (isPDEProject(project)) {
-				IPDEProcessForPlugin pdeprocess = getPDEProcessForPlugin();
-				if (pdeprocess != null)
-					pdeprocess.findPlugins(project, pluginIds, visible, first); // expand the plugins for this project, if any.
-			}
-		} catch (CoreException e) {
-		}
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * 
-	 * @return true if this is a Plugin project or false if not
-	 * @throws CoreException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static boolean isPDEProject(IJavaProject project) throws CoreException {
-		return project.getProject().hasNature(PDE_NATURE_ID);
-	}
-
-
-	/*
-	 * Interface for processing Plugins. Used when PDE plugin is present in the installation. 
-	 * 
-	 * @since 1.0.2
-	 */
-	interface IPDEProcessForPlugin {
-
-		/*
-		 * Go through the project and find all of the plugins it references, either directly or through
-		 * the referenced plugins, and mark them as visible or not.
-		 */
-		public abstract void findPlugins(IJavaProject project, Map pluginIds, boolean visible, boolean first);
-	}
-	
-	/*
-	 * Try to get the pde process for plugin. If already tried once and not found, then forget it.
-	 * <package-protected> because PDEContributeClasspath needs it too.
-	 */
-	private IPDEProcessForPlugin pdeProcessForPlugin;
-	private boolean triedPDEProcess;
-	IPDEProcessForPlugin getPDEProcessForPlugin() {
-		if (!triedPDEProcess) {
-			triedPDEProcess = true;
-			if (Platform.getBundle("org.eclipse.pde.core") != null) {
-				try {
-					Class classPDEProcess = Class.forName("org.eclipse.jem.internal.proxy.core.PDEProcessForPlugin");
-					pdeProcessForPlugin = (IPDEProcessForPlugin) classPDEProcess.newInstance();
-				} catch (ClassNotFoundException e) {
-					// Not found, do nothing.
-				} catch (InstantiationException e) {
-					getLogger().log(e, Level.WARNING);
-				} catch (IllegalAccessException e) {
-					getLogger().log(e, Level.WARNING);
-				}
-			}
-		}
-		return pdeProcessForPlugin;
-	}
-	
-	/**
-	 * This tries to find a jar in the bundle specified, and the attached source using the
-	 * PDE source location extension point. The jar must exist for source to be attachable.
-	 * The source must be in the standard PDE source plugin. I.e. it must be in a directory
-	 * of the name "bundlename_bundleversion", and in the same path from there as in the
-	 * jar, plus the name must be "jarnamesrc.zip".
-	 * <p>
-	 * The returned URL's will not be Platform.resolve(). They will be in form returned from
-	 * Platform.find().
-	 * 
-	 * @param bundle bundle to search, will search fragments too.
-	 * @param filepath filepath from the root of the bundle/fragment where the jar will be found. 
-	 * @return two URL's. [0] is the URL to the jar, <code>null</code> if not found, [2] is the URL to the source zip, <code>null</code> if not found.
-	 * 
-	 * @since 1.0.0
-	 */
-	public URL[] findPluginJarAndAttachedSource(Bundle bundle, IPath filepath) {
-		// This is a bit kludgy, but the algorithm is to find the file first, and then get the root url of the bundle/fragment
-		// that matches the found file. This will be used to calculate the name of the directory under the source. From there
-		// all of the source extensions will be searched for the source zip file.
-		// This is assuming that find returns a url where the file part of the url is a standard path and doesn't have
-		// things like special chars to indicate within a jar. That would appear when it is resolved, but I think that the
-		// unresolved ones from find are typically "jarbundle://nnn/path" or something like that. This is a gray area.
-		URL jarURL = Platform.find(bundle, filepath);
-		if (jarURL == null)
-			return new URL[2];
-		
-		// Found it, so let's try to find which bundle/fragment it was found in.
-		String jarString = jarURL.toExternalForm();
-		// First the bundle itself.
-		String installLoc = bundle.getEntry("/").toExternalForm();
-		URL sourceURL = null;
-		if (jarString.startsWith(installLoc))
-			sourceURL = getSrcFrom(bundle, installLoc, jarString);
-		else {
-			// Now look in the fragments.
-			Bundle[] frags = Platform.getFragments(bundle);
-			for (int i = 0; i < frags.length; i++) {
-				installLoc = frags[i].getEntry("/").toExternalForm();
-				if (jarString.startsWith(installLoc)) {
-					sourceURL = getSrcFrom(frags[i], installLoc, jarString);
-					break;
-				}
-			}
-		}
-		return new URL[] {jarURL, sourceURL};
-	}
-	
-	private URL getSrcFrom(Bundle bundle, String installLoc, String jarString) {
-		// format of path in a PDE source plugin is (under the "src" directory from the extension point),
-		// "bundlename_bundleversion/pathOfJar/jarnamesrc.zip". However there is no way to know
-		// which extension has the source in it, so we need to search them all.
-		
-		IPath srcPath = new Path(bundle.getSymbolicName()+"_"+ (String) bundle.getHeaders("").get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ $NON-NLS-2$
-		srcPath = srcPath.append(new Path(jarString.substring(installLoc.length())));
-		if (srcPath.segmentCount() < 2)
-			return null;	// Something is not right. No jar name.
-		srcPath = srcPath.removeFileExtension();	// Remove the .jar.
-		String jarName = srcPath.lastSegment();	// This should be the jar name.
-		srcPath = srcPath.removeLastSegments(1).append(jarName+"src.zip");
-		
-		// Now look through all of the src extensions. Can't tell if the extension is from a fragment or a bundle, so we need to
-		// use Platform.find() to look in the bundle and fragment. So we may get a dup search if there is a fragment source 
-		// (for example platform source and win32 platform source (which is a fragment of platform source).
-		IConfigurationElement[] ces = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.pde.core.source");
-		for (int i = 0; i < ces.length; i++) {
-			IPath srcsrch = new Path(ces[i].getAttributeAsIs("path")).append(srcPath);
-			Bundle srcBundle = Platform.getBundle(ces[i].getDeclaringExtension().getNamespace());
-			URL srcUrl = Platform.find(srcBundle, srcsrch);
-			if (srcUrl != null) {
-				return srcUrl;
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java
deleted file mode 100644
index 38af2fa..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jem.internal.proxy.core;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ThrowableProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-/**
- * This is a proxy wrapper for an exception being thrown on the
- * remove VM. The standard exception methods refer to this proxy.
- * To refer to the proxied exception itself, the methods defined
- * in here would be used.
- */
-public abstract class ThrowableProxy extends java.lang.Exception implements IBeanProxy {
-   /**
-    * Constructs an <code>Exception</code> with no specified detail message. 
-    */
-   public ThrowableProxy() {
-		super();
-   }
-
-	/**
-	 * @param message
-	 * @param cause
-	 * 
-	 * @since 1.1.0
-	 */
-	protected ThrowableProxy(String message, Throwable cause) {
-		super(message, cause);
-	}
-	/**
-	 * @param cause
-	 * 
-	 * @since 1.1.0
-	 */
-	protected ThrowableProxy(Throwable cause) {
-		super(cause);
-	}
-   /**
-    * Constructs an <code>Exception</code> with the specified detail message. 
-    *
-    * @param   s   the detail message.
-    */
-   public ThrowableProxy(String s) {
-		super(s);
-   }
-	
-	
-	public abstract String getProxyLocalizedMessage();
-	public abstract String getProxyMessage();
-	public abstract void printProxyStackTrace(java.io.PrintWriter writer);
-	public abstract void printProxyStackTrace(java.io.PrintStream stream);
-	public abstract void printProxyStackTrace();
-
-	public String toString() {
-		return super.toString() + "Proxy: " + toBeanString();	//$NON-NLS1$ - toString's aren't nls'ed. //$NON-NLS-1$
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java
deleted file mode 100644
index d3da4c9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: UIRunner.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:53:46 $ 
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
- 
-
-/**
- * The actual implementation of IUIRunner to run the build under
- * IProgressService control if in the UI thread.
- * 
- * <package-protected> because should only be used within here.
- * 
- * @since 1.0.0
- */
-class UIRunner implements IUIRunner {
-	
-	/*
-	 * Special class that takes a progress monitor 1 and only handles isCanceled from it,
-	 * but everything else is forwarded to progress monitor 2. This allows the pm that
-	 * is sent into handleBuild to signal a cancel even though the progress service
-	 * sends in its own pm. 
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class UIRunnerProgressMonitor extends ProgressMonitorWrapper {
-		private IProgressMonitor pmcancel;
-		
-		public UIRunnerProgressMonitor(IProgressMonitor pmcancel, IProgressMonitor pmmain) {
-			super(pmmain);
-			this.pmcancel = pmcancel;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled()
-		 */
-		public boolean isCanceled() {
-			return pmcancel.isCanceled() || super.isCanceled();
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean)
-		 */
-		public void setCanceled(boolean value) {
-			super.setCanceled(value);
-			pmcancel.setCanceled(value);	// Cancel it too now.
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IUIRunner#handleBuild(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void handleBuild(final IProgressMonitor pm) throws CoreException {
-		if (!PlatformUI.isWorkbenchRunning() || Display.getCurrent() == null) {
-			ProxyLaunchSupport.runBuild(pm);
-		} else {
-			pm.beginTask("", 100); //$NON-NLS-1$
-			try {
-				PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						IProgressMonitor uipm = new UIRunnerProgressMonitor(pm, monitor); 
-						try {
-							ProxyLaunchSupport.runBuild(uipm);
-						} catch (CoreException e) {
-							throw new InvocationTargetException(e);
-						}
-						if (uipm.isCanceled()) {
-							pm.setCanceled(true);	// Make sure that cancel got through (could of come from monitor instead).
-							throw new InterruptedException();
-						}
-					}
-				});
-			} catch (InvocationTargetException e) {
-				if (e.getCause() instanceof CoreException)
-					throw (CoreException) e.getCause();
-				ProxyPlugin.getPlugin().getLogger().log(e.getCause(), Level.WARNING);
-			} catch (InterruptedException e) {
-				// It was canceled, launch will be canceled too. pm is already marked canceled and caller can check that
-			}
-			pm.done();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
deleted file mode 100644
index df25b76..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties,v $
-# $Revision: 1.8 $  $Date: 2005/05/11 19:01:12 $
-#
-
-
-
-#
-# Exception Messages. All of these messages are the text of an java exception.
-#
-UnexpectedException_EXC_                                    = IWAV0064E Unexpected exception thrown.
-
-# {0} and {1} are java classes (e.g. java.lang.Object)
-ClassCast_EXC_.IncorrectType                                = IWAV0065E "{0}" is neither a subclass of, nor does it implement, class "{1}".
-
-# Standard Bean Proxy Factory and Standard Bean Type Proxy Factory are terms in beaninfo. They are the 
-# standard (i.e. base) factories for beans or bean types. Bean types are java classes.
-ProxyFactory_EXC_.NoBeanProxyFactory                        = IWAV0066E No Standard Bean Proxy Factory has been set.
-ProxyFactory_EXC_.NoBeanTypeProxyFactory                    = IWAV0067E No Standard Bean Type Proxy Factory has been set.
-
-
-# {0} is the title of a project.
-Not_Java_Project_WARN_                                      = IWAV0068W Project "{0}" is not a java project.
-No_VM_WARN_                                                 = IWAV0069W Project "{0}" has no Java JRE defined to use to run programs within this project.
-No_Implementation_WARN_                                     = IWAV0070W Cannot find a proxy implementation to use for project "{0}."
-
-ProxyLaunch                                                 = Launching Local Proxy VM
-ProxyWaitForBuild                                           = Waiting for build to complete
-Expression.InInvalidStateDueTo_EXC_                         = IWAV0162E Expression is in invalid state due to "{0}"
-Expression.InInvalidState_EXC_                              = IWAV0163E Expression is in invalid state
-Expression.TypeSentInInvalidOrder_EXC_                      = IWAV0164E Expression type sent in invalid order, received: {0}, expected {1}.
-Expression.ArrayTypeNotAnArray_EXC_                         = IWAV0165E ArrayType "{0}" is not an array.
-Expression.CannotHandleNoReceiveOnFieldAccess_EXC_          = IWAV0166E Access by field name ({0}) (not by proxy) requires a receiver.
-Expression.MethodsNeedReceiver_EXC_                         = IWAV0167E Access by method name ({0}) (not by proxy) requires a receiver.
-Expression.InvalidMarkNesting                               = IWAV0168E Improper nesting of mark statements in Expression. Tried to pop or endMark to before current mark. Tried to go past Mark# {0}.
-ProxyPlugin.CleanupDefaultProxyLaunchConfigurations         = Clean up default proxy launch configurations.
-ProxyLaunchSupport.RegistryCouldNotStartForSomeReason_WARN_ = IWAV0168W Registry could not be started for some reason.
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java
deleted file mode 100644
index a268d2d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java
+++ /dev/null
@@ -1,27 +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: AmbiguousMethodException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:54:34 $ 
- */
-package org.eclipse.jem.internal.proxy.common;
- 
-
-/**
- * Ambiguous Method Exception. I.E. There is more than one that could be used.
- */
-public class AmbiguousMethodException extends Exception {
-	public AmbiguousMethodException() {
-	}
-	public AmbiguousMethodException(String msg) {
-		super(msg);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java
deleted file mode 100644
index 5cfd05b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jem.internal.proxy.common;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: CommandException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:54:34 $ 
- */
-/**
- * An error occurred during command processing.
- *
- */
-
-public class CommandException extends Exception {
-	protected final Object fExceptionData;
-	
-	public CommandException() {
-		fExceptionData = null;
-	}
-	
-	public CommandException(Object data) {
-		fExceptionData = data;
-	}
-	
-	public CommandException(String msg, Object data) {
-		super(msg);
-		fExceptionData = data;
-	}	
-	
-	public Object getExceptionData() {
-		return fExceptionData;
-	}
-	
-	public boolean isRecoverable() {
-		return false;	// By default Command Exceptions are not recoverable.
-	}	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java
deleted file mode 100644
index 984d93f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jem.internal.proxy.common;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ICallback.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:54:34 $ 
- */
-
-/**
- * This interface is to be implemented by any callback.
- * The callback will use the IVMServer passed in to
- * get callback handlers, and the id passed in is
- * to be passed to these handlers.
- */
-public interface ICallback {
-	
-	/**
-	 * Initialize the callback
-	 */
-	public void initializeCallback(IVMServer vmServer, int callbackID);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java
deleted file mode 100644
index 8a449ba..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java
+++ /dev/null
@@ -1,97 +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.jem.internal.proxy.common;
-/*
- *  $RCSfile: ICallbackHandler.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-/**
- * This is the interface for a callback handler.
- * Users will talk to this interface to perform 
- * callbacks.
- */
-public interface ICallbackHandler {
-
-	/**
-	 * Callback, but send the parm as an object, ie. it must
-	 * be nothing but constants, e.g. String, Integer, or an
-	 * array of constants. Constants should not be things like
-	 * regular objects. This is because only standard java.lang
-	 * type constants can be assured to be available on the other
-	 * client. Also you don't want to send big objects. It must
-	 * be constants that don't need to be sent back for any reason
-	 * since their identity will be lost in the transfer.
-	 * <p>
-	 * This should be used if there are no parms (i.e. it is null).
-	 * <p>
-	 * To send big objects, use the callback stream.
-	 * 
-	 * @param callbackID
-	 * @param msgID
-	 * @param parm
-	 * @return
-	 * @throws CommandException
-	 * 
-	 * @see IVMServer#requestStream(int, int)
-	 * @since 1.0.0
-	 */
-	public Object callbackAsConstants(int callbackID, int msgID, Object parm) throws CommandException;
-
-	/**
-	 * Callback to registered client.
-	 * <p>
-	 *  The parms can be <code>null</code> if no parms, or it is an array of parms.
-	 * The parms
-	 *    will be turned into proxies on the client vm. So the callback
-	 *    will recieve an array of proxies to the values in the parms.
-	 *    If any of the entries in the array is itself an array, a
-	 *    proxy to the array will be created and sent. The array itself
-	 *    will not be sent.
-	 * <p>
-	 *    If an array entry should go across as an array of proxies and
-	 *    not as one proxy to an array, then the entry needs to be an
-	 *    instance of {@link ICallbackHandler.TransmitableArray transmitableArray}. This will flag
-	 *    that it should transmit the entire entry as proxies. This should
-	 *    be used sparingly, only if there isn't much data in the array and
-	 *    all of the array would be used on the client. That way transmitting
-	 *    the entire array will be faster than accessing individual components.
-	 *
-	 * @param callbackID The id of the callback. This will be given
-	 *    to the callback when it is created, and it must pass
-	 *    on to the handler. That way it is know which callback
-	 *    to call on the client.
-	 * @param msgID The id of the message for the callback. This is an
-	 *    agreed upon id of the developers of the callback on both
-	 *    sides.
-	 * @param parms Null if no parms, or an array of objects to send to the client vm. See the comments 
-	 * above for a complete description of the parameter.
-	 * 
-	 * @see ICallbackHandler.TransmitableArray
-	 */
-	public Object callbackWithParms(int callbackID, int msgID, Object[] parms) throws CommandException;
-
-	/**
-	 * Array wrapper that turns an array for parameters into a transmittable array.
-	 * 
-	 * @see ICallbackHandler#callbackWithParms(int, int, Object[])
-	 * @since 1.1.0
-	 */
-	public static class TransmitableArray {
-		protected final Object[] fArray;
-		public TransmitableArray(Object[] array) {
-			fArray = array;
-		}
-		public Object[] getArray() {
-			return fArray;
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java
deleted file mode 100644
index 4bfebac..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java
+++ /dev/null
@@ -1,28 +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
- *******************************************************************************/
-/*
- *  $RCSfile: ICallbackRunnable.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:54:34 $ 
- */
-package org.eclipse.jem.internal.proxy.common;
-
-/**
- * Users would implement this as a runnable to 
- * send a callback request.
- */
-public interface ICallbackRunnable {
-	
-	/**
-	 * The actual run code.
-	 */
-	public Object run(ICallbackHandler handler) throws CommandException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java
deleted file mode 100644
index 51e7845..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.jem.internal.proxy.common;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ICommandException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:54:34 $ 
- */
-
-
-public class ICommandException {
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java
deleted file mode 100644
index faeb884..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jem.internal.proxy.common;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IVMServer.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:54:34 $ 
- */
-
-import java.io.OutputStream;
-/**
- * This is the interface for accessing the 
- * VM  Server. It will be given to an
- * ICallback so that the callback can access
- * the server to request a callback.
- */
-public interface IVMServer {
-	
-	
-	/**
-	 * Process a callback. The runnable contains the
-	 * actual code.
-	 */
-	public Object doCallback(ICallbackRunnable runnable) throws CommandException;
-	
-	/**
-	 * Request a stream for writing a lot of data (suggested for larger
-	 * than several thousand bytes). The connection will be assigned
-	 * to this stream until the stream is closed.
-	 */
-	public OutputStream requestStream(int callbackID, int msgID) throws CommandException;
-
-	
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
deleted file mode 100644
index b59e9d7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: MapTypes.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.common;
-
-import java.util.HashMap;
- 
-
-/**
- * This is used for mapping between JNI format and non-JNI format. It also has the
- * maps for primitives.
- * @since 1.0.0
- */
-public class MapTypes {
-
-	public final static HashMap MAP_SHORTSIG_TO_TYPE = new HashMap(8);
-	public final static HashMap MAP_TYPENAME_TO_SHORTSIG = new HashMap(8);
-	static {
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("B", Byte.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("C", Character.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("D", Double.TYPE);		 //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("F", Float.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("I", Integer.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("J", Long.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("S", Short.TYPE); //$NON-NLS-1$
-		MapTypes.MAP_SHORTSIG_TO_TYPE.put("Z", Boolean.TYPE); //$NON-NLS-1$
-		
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("byte","B"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("char","C"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("double","D"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("float","F"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("int","I"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("long","J"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("short","S"); //$NON-NLS-1$ //$NON-NLS-2$
-		MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("boolean","Z"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	
-
-	/**
-	 * Convert formal type name for an array (i.e. java.lang.Object[]
-	 * to the jni format (i.e. [Ljava.lang.Object;)
-	 * This is used when a name is passed in from the IDE side.
-	 * The VM side uses the jni format, and all of proxy uses the jni format.
-	 * 
-	 * @param classname
-	 * @return string jni form of name.
-	 * 
-	 * @since 1.0.0
-	 */
-	public static String getJNIFormatName(String classname) {
-		if (classname.length() == 0 || !classname.endsWith("]")) //$NON-NLS-1$
-			return classname;	// Not an array,or invalid
-		
-		StringBuffer jni = new StringBuffer(classname.length());
-		int firstOpenBracket = classname.indexOf('[');
-		int ob = firstOpenBracket;
-		while (ob > -1) {
-			int cb = classname.indexOf(']', ob);
-			if (cb == -1)
-				break;
-			jni.append('[');
-			ob = classname.indexOf('[', cb);
-		}
-		
-		String finalType = classname.substring(0, firstOpenBracket).trim();
-		if (finalType != null) {
-			String shortSig = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(finalType);
-			if (shortSig == null) {
-				jni.append('L');
-				jni.append(finalType);
-				jni.append(';');
-			} else {
-				jni.append(shortSig);
-			}
-		}
-		
-		return jni.toString();
-	}
-	
-	/**
-	 * This converts from the JNI format to the formal typename.
-	 * 
-	 * @param jniName
-	 * @return formal typename
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getFormalTypeName(String jniName) {
-		if (jniName.charAt(0) == '[') {
-			// It is an array
-			int dims = jniName.lastIndexOf('[')+1;	// Number of dimensions
-			int startType = dims+1;
-			StringBuffer fName = new StringBuffer(jniName.length()+(2*dims)); 
-			if (jniName.charAt(dims) == 'L')
-				fName.append(jniName.substring(startType, jniName.length()-1));	// For "Ljava.lang.String;" return "java.lang.String"
-			else if (jniName.length() == startType+1) {
-				// Possible primitive
-				Class type = (Class) MAP_SHORTSIG_TO_TYPE.get(jniName.substring(startType, startType));
-				if (type != null) {
-					fName.append(type.getName());
-				} else
-					return "";	// Invalid if no 'L' and not a primitive.
-			} else
-				return "";	// Invalid, must be either a primitive or 'L' type.
-			while(dims-- > 0) {
-				fName.append("[]");
-			}
-			return fName.toString();
-		} else if (jniName.length() == 1) {
-			// Possible primitive.
-			Class type = (Class) MAP_SHORTSIG_TO_TYPE.get(jniName);
-			if (type != null) {
-				return type.getName();
-			}
-		}
-		
-		// If got here then just a name as is.
-		return jniName;
-	}
-	
-	/**
-	 * Convert the formal type name, with the given number of dimensions,
-	 * to an array JNI type.
-	 * @param finalComponent final component name, should not be an array type.
-	 * @param dimensions number of dimensions for the array.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public static String getJNITypeName(String finalComponent, int dimensions) {
-		StringBuffer jni = new StringBuffer(finalComponent.length()+dimensions+2);
-		while (dimensions-- > 0) {
-			jni.append('[');
-		}
-		
-		String shortSig = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(finalComponent);
-		if (shortSig == null) {
-			jni.append('L');
-			jni.append(finalComponent);
-			jni.append(';');
-		} else {
-			jni.append(shortSig);
-		}
-		
-		return jni.toString();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java
deleted file mode 100644
index df678ee..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java
+++ /dev/null
@@ -1,218 +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.jem.internal.proxy.common;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This is a class to do message/constructor work. 
- * Specifically to find the most appropriate method.
- */
-public class MethodHelper {
-	
-	/*
-	 * The class that is used to represent Null class type.
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class NULL_CLASS {
-	}
-	
-	public static final Class NULL_TYPE = NULL_CLASS.class;
-	
-	static final ArrayList sPrimitivesOrder;
-	static final int sCharPos;
-	
-	static {
-		sPrimitivesOrder = new ArrayList(6);
-		sPrimitivesOrder.add(Byte.TYPE);
-		sPrimitivesOrder.add(Short.TYPE);
-		sPrimitivesOrder.add(Integer.TYPE);
-		sPrimitivesOrder.add(Long.TYPE);
-		sPrimitivesOrder.add(Float.TYPE);
-		sPrimitivesOrder.add(Double.TYPE);
-
-		// char can be treated like a short for purposes of ordering.
-		sCharPos = sPrimitivesOrder.indexOf(Short.TYPE);
-	}
-	
-	/**
-	 * Return whether the type2 can be assigned to type1 in
-	 * method argument conversion.
-	 */
-	public static boolean isAssignableFrom(Class type1, Class type2) {
-		if (type1 == type2)
-			return true;	// They're the same, so assignable.
-		if (type1.isPrimitive()) {
-			if (type2.isPrimitive()) {
-				if (type1 == Boolean.TYPE || type2 == Boolean.TYPE)
-					return false;	// Since not equal and one is boolean and the other isn't, not assignable
-				int type1Pos = (type1 != Character.TYPE) ? sPrimitivesOrder.indexOf(type1) : sCharPos;
-				int type2Pos = (type2 != Character.TYPE) ? sPrimitivesOrder.indexOf(type2) : sCharPos;
-				return type1Pos > type2Pos;	// It can be widened if type1 is higher in the order
-			}
-			return false;	// primitive to non-primitive, not assignable.
-		} else
-			if (type2 == NULL_TYPE)
-				return true;	// NULL_TYPE represents null for us, and null can be assigned to any object
-			else		
-				return type1.isAssignableFrom(type2);	// Can type2 be assigned to type1
-	}
-	
-	
-	/**
-	 * Every entry in Array2 can be assigned to the corresponding entry in Array1.
-	 */
-	public static boolean isAssignableFrom(Class[] types1, Class[] types2) {
-		if (types1.length != types2.length)
-			return false;	// Not the same size, so not compatible.
-		for (int i=0; i<types1.length; i++) {
-			if (!isAssignableFrom(types1[i], types2[i]))
-				return false;
-		}
-		return true;	// All are assignable
-	}
-	
-	/**
-	 * Return the index of the most compatible method/constructor from the lists passed in.
-	 * MethodsList: List of methods (if null then this is for constructors)
-	 * ParmsList: List of parms for each method (each entry will be Class[]).
-	 */
-	private static int findMostCompatible(List methods, List parms, String ambiguousName) throws AmbiguousMethodException {
-		// The algorithm used is from the Java Language Specification 15.12.2.2
-		// Find the maximally specific ones
-		// This is defined as the one that is more specific then all of the rest.
-		// If there are duplicates parms that are maximally specific, then it doesn't matter which choosen
-		// because when invoked the JVM will make sure the right thing is done.
-		// 
-		Class[][] parmsCopy = (Class[][]) parms.toArray(new Class[parms.size()][]);
-		int size = parmsCopy.length;
-		// For each entry see if it is maximally specific, i.e. it is more specific then all of the others.
-nextMethod:	for (int i=0; i<size; i++) {
-			// For ctors we don't need to test the declaring class because it will always be the same class.
-			Class dclClassi = methods != null ? ((Method) methods.get(i)).getDeclaringClass() : null;
-			Class[] parmsi = parmsCopy[i];
-			for (int j=0; j<size; j++) {
-				if (i == j)
-					continue;
-				// Methodi is more specific if
-				//   a) Methodi declaring class is assignable to Methodj declaring class
-				//   b) Methodi parms are assignable to Methodj parms
-				//
-				// First see if Methodi is more specific, if it is
-				// then throw out Methodj and continue
-				// If Methodi is not compatible to Methodj, go to the next method for i. Methodi is not the most specific
-				// Something else is either more specific or none are ma
-				if (dclClassi != null) {
-					// Step a
-					if (!isAssignableFrom(((Method) methods.get(j)).getDeclaringClass(), dclClassi))
-						continue nextMethod;	// Methodi is not more specific than Methodj, so try next i.
-				}
-				
-				// Step b
-				Class[] parmsj = parmsCopy[j];
-				if (!isAssignableFrom(parmsj, parmsi)) {
-					// Methodi is not more specific than Methodj, so go to next i.
-					continue nextMethod;
-				}
-			}
-			return i;	// Methodi is more specific than all of the other ones.
-		}
-
-		throw new AmbiguousMethodException(ambiguousName);	// There was not one more specific than all of the others.
-	}
-	
-	/**
-	 * Find the most compatible method for the given arguments.
-	 */
-	public static Method findCompatibleMethod(Class receiver, String methodName, Class[] arguments) throws NoSuchMethodException, AmbiguousMethodException {
-		try {
-			Method mthd = receiver.getMethod(methodName, arguments);
-			return mthd;	// Found exact match
-		} catch (NoSuchMethodException exc) {
-			if (arguments != null) {
-				// Need to find most compatible one.
-				Method mthds[] = receiver.getMethods();
-				ArrayList parmsList = new ArrayList(mthds.length); // The parm list from each compatible method.
-				ArrayList mthdsList = new ArrayList(mthds.length); // The list of compatible methods, same order as the parms above.
-				for (int i = 0; i < mthds.length; i++) {
-					Method mthd = mthds[i];
-					if (!mthd.getName().equals(methodName))
-						continue; // Not compatible, not same name
-					Class[] parms = mthd.getParameterTypes();
-					if (!isAssignableFrom(parms, arguments))
-						continue; // Not compatible, parms
-					// It is compatible with the requested method
-					parmsList.add(parms);
-					mthdsList.add(mthd);
-				}
-
-				// Now have list of compatible methods.
-				if (parmsList.size() == 0)
-					throw exc; // None found, so rethrow the exception
-				if (parmsList.size() == 1)
-					return (Method) mthdsList.get(0); // Only one, so return it
-
-				// Now find the most compatible method
-				int mostCompatible = findMostCompatible(mthdsList, parmsList, methodName);
-				return (Method) mthdsList.get(mostCompatible);
-			} else
-				throw exc; // None found, so rethrow the exception
-		}
-	}
-	
-	/**
-	 * Find the most compatible constructor for the given arguments.
-	 */
-	public static Constructor findCompatibleConstructor(Class receiver, Class[] arguments) throws NoSuchMethodException, AmbiguousMethodException {
-		try {
-			java.lang.reflect.Constructor ctor = receiver.getDeclaredConstructor(arguments);
-			ctor.setAccessible(true);	// We allow all access, let ide and compiler handle security.
-			return ctor;	// Found exact match
-		} catch (NoSuchMethodException exc) {
-			if (arguments != null) {
-				// Need to find most compatible one.
-				java.lang.reflect.Constructor ctors[] = receiver.getDeclaredConstructors();
-				ArrayList parmsList = new ArrayList(ctors.length); // The parm list from each compatible method.
-				ArrayList ctorsList = new ArrayList(ctors.length); // The list of compatible methods, same order as the parms above.
-				for (int i = 0; i < ctors.length; i++) {
-					java.lang.reflect.Constructor ctor = ctors[i];
-					Class[] parms = ctor.getParameterTypes();
-					if (!isAssignableFrom(parms, arguments))
-						continue; // Not compatible, parms
-					// It is compatible with the requested method
-					parmsList.add(parms);
-					ctorsList.add(ctor);
-				}
-
-				// Now have list of compatible methods.
-				if (parmsList.size() == 0)
-					throw exc; // None found, so rethrow the exception
-				if (parmsList.size() == 1) {
-					java.lang.reflect.Constructor ctor = (java.lang.reflect.Constructor) ctorsList.get(0); // Only one, so return it
-					ctor.setAccessible(true); // We allow all access, let ide and compilor handle security.
-					return ctor;
-				}
-
-				// Now find the most compatible ctor
-				int mostCompatible = findMostCompatible(null, parmsList, receiver.getName());
-				java.lang.reflect.Constructor ctor = (java.lang.reflect.Constructor) ctorsList.get(mostCompatible);
-				ctor.setAccessible(true); // We allow all access, let ide and compilor handle security.
-				return ctor;
-			} else
-				throw exc; // None found, so rethrow the exception
-		}
-	}	
-				
-		
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java
deleted file mode 100644
index 2631d13..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java
+++ /dev/null
@@ -1,96 +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: BeanProxyValueSender.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.core.ThrowableProxy;
- 
-/**
- * Useful in REM to get the array of BeanProxyValues.
- * 
- * @since 1.1.0
- */
-public class BeanProxyValueSender implements Commands.ValueSender {
-	protected int index = 0;
-	protected Object[] array;
-	private Exception exception;
-	private final REMStandardBeanProxyFactory factory;
-	
-	/**
-	 * See if there was an exception thrown during reading.
-	 * 
-	 * @return an exception or <code>null</code> if no exception.
-	 * 
-	 * @since 1.1.0
-	 */
-	public Exception getException() {
-		return exception;
-	}
-		
-	public BeanProxyValueSender(REMStandardBeanProxyFactory factory) {
-		this.factory = factory;
-	}
-	public BeanProxyValueSender(REMStandardBeanProxyFactory factory, Commands.ValueObject arrayHeader) {
-		this(factory);
-		initialize(arrayHeader);
-	}
-	
-	public void initialize(Commands.ValueObject arrayHeader) {
-		index = 0;
-		// The array type doesn't matter, it will be an array of objects.
-		// The values will either be IBeanProxies or an array, or constants.
-		array = new Object[arrayHeader.anInt];
-	}
-	
-	public void clear() {
-		array = null;
-		index = 0;
-	}
-	
-	public Object[] getArray() {
-		return array;
-	}
-				
-	// A new value is being sent to the array
-	// NOTE: It is important that this has been called within a transaction.
-	public void sendValue(Commands.ValueObject value) {
-		try {
-			array[index++] = factory.getBeanProxy(value);	// Add it to the array
-		} catch (ThrowableProxy e) {
-			// We can't stop it right away because we can't send exception on, however,
-			// we can log it and save the exception.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			exception = e;			
-		} catch (CommandException e) {
-			// We can't stop it right away because we can't send exception on, however,
-			// we can log it and save the exception.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			exception = e;
-		}
-	}
-				
-	// The next entry is an array too!
-	public Commands.ValueSender nestedArray(Commands.ValueObject arrayHeader) {
-		BeanProxyValueSender sender = new BeanProxyValueSender(factory, arrayHeader);
-		// Take the newly created array and put it into the current array.
-		array[index++] = sender.getArray();
-		return sender;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java
deleted file mode 100644
index f780e7e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java
+++ /dev/null
@@ -1,365 +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
- *******************************************************************************/
-/*
- *  $RCSfile: DebugModeHelper.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:56:10 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-/**
- * This is a helper for debug mode. It allows access to
- * the workbench, if available, or AWT, if available, for
- * the debug prompts. It uses reflection so that nothing is
- * forced to be loaded or pre-reqd. That way it can run headless.
- */
-
-class DebugModeHelper {
-	boolean awt = false;
-	boolean console = false;
-	boolean setup = false;
-	java.io.InputStreamReader inReader = null;
-	
-	// Workbench reflections
-	Object display = null;	
-	Constructor cMB = null;
-	Field fAppModel = null;
-	Method fasync = null;
-	Method fsync = null;	
-	Method fSetText = null;
-	Method fSetMessage = null;
-	Method fOpen = null;
-	Method fGetWorkbench = null;
-	Class cSWT = null;
-		
-	
-	// AWT Reflections
-	Class cMessageDialog = null;
-	Method fDoit = null;
-	
-	protected void setupType() {
-		if (setup)
-			return;
-			
-		setup = true;
-		
-		// See if use system console instead. If false or not set, then try to query usage.	 		
-	 	console = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.IO_CONSOLE)); //$NON-NLS-1$
-	 	if (console)
-	 		return;
-		
-		try {		 		
-		 	// See if PlatformUI plugin available.
-		 	Bundle uiBundle = Platform.getBundle("org.eclipse.ui"); //$NON-NLS-1$
-		 	if (uiBundle == null) {
-		 		setupAWT();	// UI not available, try through AWT.
-		 		return;
-		 	}
-	
-	 		// Setup Eclipse
-		 	Class cPlatformUI = uiBundle.loadClass("org.eclipse.ui.PlatformUI"); //$NON-NLS-1$
-		 	Method isWBRunning = cPlatformUI.getMethod("isWorkbenchRunning", null); //$NON-NLS-1$
-		 	if (!((Boolean) isWBRunning.invoke(null, null)).booleanValue()) {
-		 		setupAWT();	// UI not available, try through AWT.
-		 		return;
-		 	}
-		 	
-		 	fGetWorkbench = cPlatformUI.getMethod("getWorkbench", null); //$NON-NLS-1$
-		 	Object w = fGetWorkbench.invoke(null, null);
-
-			if (w != null) {
-	 			Class cDisplay = uiBundle.loadClass("org.eclipse.swt.widgets.Display"); //$NON-NLS-1$
-	 			Method fGetCurrent = cDisplay.getMethod("getCurrent", null); //$NON-NLS-1$
-	 			Method fGetDefault = cDisplay.getMethod("getDefault", null);	 			 //$NON-NLS-1$
-	 			fasync = cDisplay.getMethod("asyncExec", new Class[] {Runnable.class}); //$NON-NLS-1$
-	 			fsync = cDisplay.getMethod("syncExec", new Class[] {Runnable.class}); //$NON-NLS-1$
-	 			
-	 			// Get the display
-	 			display = fGetCurrent.invoke(null, null);
-	 			if (display == null)
-	 				display = fGetDefault.invoke(null, null);
-			}
-			
-			if (display != null) { 	
-	 			Class cShell = uiBundle.loadClass("org.eclipse.swt.widgets.Shell"); //$NON-NLS-1$
-	 			Class cMessageBox = uiBundle.loadClass("org.eclipse.swt.widgets.MessageBox"); //$NON-NLS-1$
-	 			cMB = cMessageBox.getConstructor(new Class[] {cShell, Integer.TYPE});
-
-				fSetText = cMessageBox.getMethod("setText", new Class[] {String.class}); //$NON-NLS-1$
-				fSetMessage = cMessageBox.getMethod("setMessage", new Class[] {String.class});				 //$NON-NLS-1$
-				fOpen = cMessageBox.getMethod("open", null);		 		 //$NON-NLS-1$				
-		 			
-	 			cSWT = uiBundle.loadClass("org.eclipse.swt.SWT"); //$NON-NLS-1$
-	 			fAppModel = cSWT.getField("APPLICATION_MODAL"); //$NON-NLS-1$
-		 	} else {
-		 		setupAWT();	// UI not available, try through AWT.
-		 	}
-		} catch (NoSuchMethodException e) {
-		} catch (ClassNotFoundException e) {
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		} catch (NoSuchFieldException e) {
-		}
-		
-		return;		 			 		
-		 			
-	}	
-
-	protected void setupAWT() {
-	 		
-	 	// See if AWT is available.
-	 	try {
-		 	cMessageDialog = Class.forName("org.eclipse.jem.internal.proxy.remote.MessageDialog"); //$NON-NLS-1$
-		 	fDoit = cMessageDialog.getMethod("doit", new Class[] {String.class, String.class, String.class, String.class}); //$NON-NLS-1$
-		 	awt = true;
-		 	return;
-	 	} catch (ClassNotFoundException e) {
-	 	} catch (NoSuchMethodException e) {
-	 	}
- 		console = true;	// No AWT either, i.e. true headless environment
-	} 	
-	
-	public boolean debugMode(final String name) {
-	 	boolean debugMode = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.DEBUG_VM)); //$NON-NLS-1$
-	 	if (!debugMode)
-	 		return debugMode;
-	 		
-	 	setupType();
-
-		// See if use system console instead. If false or not set, then try to query usage.	 		
-	 	if (console)
-	 		return debugModeConsole(name);
-	 		
-	 	if (awt)
-	 		return debugModeAWT(name);
-		
-		try {		 		
- 			final Field fYes = cSWT.getField("YES"); //$NON-NLS-1$
- 			Field fNo = cSWT.getField("NO"); //$NON-NLS-1$
- 			Field fIcon = cSWT.getField("ICON_QUESTION"); //$NON-NLS-1$
-	 			
- 			final int style = fYes.getInt(null) | fNo.getInt(null) | fIcon.getInt(null) | fAppModel.getInt(null);	 			
- 			final boolean[] db = new boolean[1];
-
-			fsync.invoke(display, new Object[] { new Runnable() {
-				/**
-				 * @see java.lang.Runnable#run()
-				 */
-				public void run() {
-					try {
-						Object shell = getActiveShell();
-						Object mb = cMB.newInstance(new Object[] {shell, new Integer(style)});					
-						fSetText.invoke(mb, new Object[] {"Debug RemoteVM?"}); //$NON-NLS-1$
-						fSetMessage.invoke(mb, new Object[] {"Do you want to start the remote vm ("+name+") in debug mode?"});	// Not NLS'd because this is for internal developers only //$NON-NLS-1$ //$NON-NLS-2$
-							
-						db[0] = fYes.get(null).equals(fOpen.invoke(mb, null));
-					} catch (InstantiationException e) {
-					} catch (IllegalAccessException e) {
-					} catch (InvocationTargetException e) {
-					}
-				}
-			}});
-		 	return db[0];
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		} catch (NoSuchFieldException e) {
-		}
-		
-		return debugModeAWT(name);
- 	}
- 	
-
-	/*
-	 * This must be called from within the display thread.
-	 */
-	protected Object getActiveShell() {
-	 	Object shell = null;		
-		try {
-			Object w = fGetWorkbench.invoke(null, null);
-			Object ww = null;
-			if (w != null) {
-			 	Class cWorkbench = w.getClass();
-			 	Method getWorkbenchWindow = cWorkbench.getMethod("getActiveWorkbenchWindow", null); //$NON-NLS-1$
-				ww = getWorkbenchWindow.invoke(w, null);
-			}
-			if (ww != null) {
-				Class cWorkbenchWindow = ww.getClass();
-				Method getShell = cWorkbenchWindow.getMethod("getShell", null); //$NON-NLS-1$
-				shell = getShell.invoke(ww, null);
-			}
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		} catch (NoSuchMethodException e) {
-		}
-	 	
-	 	return shell;
-	}	
-		 	
-	protected boolean debugModeAWT(String name) {
-	 		
-	 	// See if AWT is available.
-	 	try {
-		 	Integer r = (Integer) fDoit.invoke(null, new Object[] {"Debug RemoteVM?", "Do you want to start the remote vm ("+name+") in debug mode?", "Yes", "No"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		 	return r.intValue() == 1;	// i.e. button1 or "yes" was hit.
-	 	} catch (IllegalAccessException e) {
-	 	} catch (InvocationTargetException e) {
-	 	}
-	 	
- 		return false;	// No AWT either, i.e. headless environment, shouldn't of gotton here.
-	} 	
-	
-	protected boolean debugModeConsole(String name) {
-	 		
-	 	// Debug through the console
- 		inReader = new java.io.InputStreamReader(System.in);
- 		System.out.println("Do you want to start the remote vm ("+name+") in debug mode? (Enter Y or N):"); //$NON-NLS-1$ //$NON-NLS-2$
- 		char r = ' ';
- 		try {
- 			r = Character.toLowerCase((char) inReader.read());
- 			// Need to flush the input reader now.
- 			while (inReader.ready())
- 				inReader.read();
-		 	return r == 'y';	// i.e. "y" was entered.	 			
- 		} catch (java.io.IOException e) {
- 		}
-	 	
- 		return false;	// Error reading, so no debugging.
-	} 
- 	
- 	/**
- 	 * Return true if continue debugging.
- 	 */
-	public boolean promptPort(final int dport) {
- 		if (awt)
- 			return promptPortAWT(dport);
- 		else if (console)
- 			return promptPortConsole(dport);
- 			
- 		try {	
-			final Field fOK = cSWT.getField("OK"); //$NON-NLS-1$
-			Field fCancel = cSWT.getField("CANCEL"); //$NON-NLS-1$
-			Field fIcon = cSWT.getField("ICON_WORKING"); //$NON-NLS-1$
-	 			
-			final int style = fOK.getInt(null) | fCancel.getInt(null) | fIcon.getInt(null) | fAppModel.getInt(null);
-
-			final boolean[] ok = new boolean[1];
-			fsync.invoke(display, new Object[] { new Runnable() {	
-				/**
-				 * @see java.lang.Runnable#run()
-				 */
-				public void run() {
-					try {
-						Object shell = getActiveShell();
-						Object mb = cMB.newInstance(new Object[] {shell, new Integer(style)});					
-						fSetText.invoke(mb, new Object[] {"Connect Debugger to RemoteVM!"}); //$NON-NLS-1$
-						fSetMessage.invoke(mb, new Object[] {"You must now attach the debugger to port number "+dport+". Press OK when the debugger is attached. The program will not continue properly without the debugger being attached. Press Cancel if you could not connect the debugger. This will still cause an error, but it will clean up better."});	// Not NLS'd because this is for internal developers only //$NON-NLS-1$ //$NON-NLS-2$
-						ok[0] = fOK.get(null).equals(fOpen.invoke(mb, null));
-					} catch (InstantiationException e) {
-					} catch (IllegalAccessException e) {
-					} catch (InvocationTargetException e) {
-					}
-				}
-			}});			
-			return ok[0];
- 		} catch (NoSuchFieldException e) {
- 		} catch (InvocationTargetException e) {
- 		} catch (IllegalAccessException e) {
- 		}
- 		return false;
-	}	 	
- 	
-	protected boolean promptPortAWT(int dport) {
-		try {
-		 	Integer r = (Integer) fDoit.invoke(null, new Object[] {"Connect Debugger to RemoteVM!", "You must now attach the debugger to port number "+dport+". Press OK when the debugger is attached. The program will not continue properly without the debugger being attached. Press Cancel if you could not connect the debugger. This will still cause an error, but it will clean up better.", "OK", "Cancel"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		 	return r.intValue() == 1;	// i.e. button1 or "OK" was hit.
-		} catch (InvocationTargetException e) {
-		} catch (IllegalAccessException e) {
-		}
- 		
-		return false;
-	}
-		 	
- 	protected boolean promptPortConsole(int dport) {
-		System.out.println("You must now attach the debugger to port number "+dport+". Enter 'y' when the debugger is attached. The program will not continue properly without the debugger being attached. Press 'n' if you could not connect the debugger. This will still cause an error, but it will clean up better. Enter 'y' or 'n':"); //$NON-NLS-1$ //$NON-NLS-2$
-		char r = ' ';
-		try {
-			r = Character.toLowerCase((char) inReader.read());
- 			while (inReader.ready())
- 				inReader.read();
-			return r == 'y';	// i.e. "y" was entered, go on
-		} catch (java.io.IOException e) {
-		}
- 		
-		return false;
-	}
-	
-	/**
-	 * Display an error msg. There will only be an OK button.
-	 * This will always display, debug mode won't be looked at.
-	 * This is for errors. This will be displayed async, so this
-	 * may return before the msg has been displayed and answered,
-	 * but since the only response is OK, it doesn't really matter.
-	 */
-	public void displayErrorMessage(final String title, final String msg) {
-		setupType();
-		if (console)
-			displayErrorMessageConsole(title, msg);
-		else if (awt)
-			displayErrorMessageAWT(title, msg);
-		else {
-			try { // This needs to be done in display thread.
-				Field fOK = cSWT.getField("OK"); //$NON-NLS-1$
-				Field fIcon = cSWT.getField("ICON_ERROR"); //$NON-NLS-1$
-
-				final int style = fOK.getInt(null) | fIcon.getInt(null) | fAppModel.getInt(null);
-				fasync.invoke(display, new Object[] { new Runnable() {
-						/**
-						 * @see java.lang.Runnable#run()
-						 */
-						public void run() { try { Object shell = getActiveShell();
-								Object mb = cMB.newInstance(new Object[] { shell, new Integer(style)});
-
-								fSetText.invoke(mb, new Object[] { title });
-								fSetMessage.invoke(mb, new Object[] { msg });
-								fOpen.invoke(mb, null);
-							} catch (InstantiationException e) {
-							} catch (IllegalAccessException e) {
-							} catch (InvocationTargetException e) {
-							}
-						}
-					}
-				});
-			} catch (NoSuchFieldException e) {
-			} catch (InvocationTargetException e) {
-			} catch (IllegalAccessException e) {
-			}
-		}
-	}	
-	
- 	protected void displayErrorMessageConsole(String title, String msg) {
-		System.out.println("Error: " + title); //$NON-NLS-1$
-		System.out.println("       " + msg); //$NON-NLS-1$
-	}
-	
-	protected void displayErrorMessageAWT(String title, String msg) {
-		try {
-		 	fDoit.invoke(null, new Object[] {title, msg, ProxyRemoteMessages.getString("OK_7"), null}); //$NON-NLS-1$
-		} catch (InvocationTargetException e) {
-		} catch (IllegalAccessException e) {
-		}
-	}		
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java
deleted file mode 100644
index 6163bc9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IREMBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * A Remote VM proxy. All IBeanProxy implementations
- * for the Remote VM must also implement this interface.
- * This is necessary for proper functioning.
- *
- * NOTE: This is an internal interface to the Remote VM Proxy.
- * It MUST not be used outside of the proxy factory family.
- */
-
-public interface IREMBeanProxy extends IBeanProxy {
-	/**
-	 * Return the ID of this proxy
-	 */
-	public Integer getID();
-	
-	/**
-	 * Proxy is about to be released, MUST mark it invalid.
-	 * This is required. Resources can also be cleaned up
-	 * if they are being held and need to be cleaned up.
-	 *
-	 * NOTE: This method will only be called when the proxy
-	 * is explicitly released. If it is simply garbage collected,
-	 * then this method will not be called. Simple garbage collection
-	 * means that no one is referencing this proxy. The proxy factory
-	 * will know what id this proxy was referencing and will release it
-	 * on the server at GC time.
-	 *
-	 * If there are resources
-	 * that absolutely must be released, then the finalize method
-	 * should be implemented to do the clean up. However, try not
-	 * to have this be the case. Finalize methods add overhead that is
-	 * usually better not to have. The better way is for any users
-	 * that get this kind of proxy object know to call release on
-	 * ProxyFactoryRegistry to release it before garbage collection.	 
-	 */
-	public void release();
-	
-	/**
-	 * Render this bean for transport to the server into a Commands.ValueObject.
-	 * For example, a string may put a string. An id type may put out the id.
-	 */
-	public void renderBean(Commands.ValueObject renderInto);
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java
deleted file mode 100644
index bac6f7b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IREMBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * All bean type proxies in remote vm must implement this interface.
- *
- * NOTE: This is an internal interface to the Remote VM Proxy.
- * It MUST not be used outside of the proxy factory family. 
- */
-public interface IREMBeanTypeProxy extends IBeanTypeProxy, IREMBeanProxy {
-	
-/**
- * Create a new bean proxy with the specified id.
- */
-public IREMBeanProxy newBeanProxy(Integer anID);
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract);
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java
deleted file mode 100644
index b81805d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IREMBeanTypeProxyFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Interface for Remote VM Bean Type Proxy Factories.
- * All extension factories for Remote VM must implement this interface.
- */
-
-public interface IREMBeanTypeProxyFactory extends IBeanTypeProxyFactory {
-/**
- * Return a bean type proxy for the class name.
- * Return null if the extension factory doesn't handle this class.
- * Don't register any proxies returned, they will automatically be registered.
- * This should only return bean type proxies where the factory can determine
- * everything it needs, such as supertype and classID.
- * NOTE: This is implemented for the usage of the
- *       standard BeanType proxy factory. It should
- *       NOT be called by anyone else. They should
- *       go through the IStandardBeanTypeFactory
- *       instead. The standard bean type factory
- *       will call this method on the appropriate
- *       extension when it needs to.
- *
- * Creation date: (12/3/99 2:26:12 PM)
- */
-public IREMBeanTypeProxy getExtensionBeanTypeProxy(String typeName);	
-
-/**
- * Return a bean type proxy for the class name.
- * Return null if the extension factory doesn't handle this class.
- * Don't register any proxies returned, they will automatically be registered.
- * This should only return bean type proxies where the factory can determine
- * everything it needs, such as supertype and classID.
- * NOTE: This is implemented for the usage of the
- *       standard BeanType proxy factory. It should
- *       NOT be called by anyone else. They should
- *       go through the IStandardBeanTypeFactory
- *       instead. The standard bean type factory
- *       will call this method on the appropriate
- *       extension when it needs to.
- 
- * @param typeName
- * @param expression
- * @return
- * 
- * @since 1.1.0
- */
-public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression);
-
-/**
- * Return a bean type proxy for the class id and class name.
- * Return null if the extension factory doesn't handle this class. 
- * Don't register any proxies returned, they will automatically be registered. 
- * This will be called in the case that a new class id was returned
- * from the server that we don't have registered yet. Implementers will
- * created a proxy out of the name and the id and return it.
- * The supertype will be passed in so that the extension factory doesn't need to
- * try to find it.
- * NOTE: This is implemented for the usage of the
- *       standard BeanType proxy factory. It should
- *       NOT be called by anyone else. They should
- *       go through the IStandardBeanTypeFactory
- *       instead. The standard bean type factory
- *       will call this method on the appropriate
- *       extension when it needs to.
- *
- * Creation date: (12/3/99 2:26:12 PM)
- */
-public IREMBeanTypeProxy getExtensionBeanTypeProxy(String typeName, Integer classID, IBeanTypeProxy superType);	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java
deleted file mode 100644
index 3dea82f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java
+++ /dev/null
@@ -1,106 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: IREMConnection.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Interface for the Remote VM Connection object.
- */
-
-public interface IREMConnection {
-	
-	/**
-	 * Did this construct correctly.
-	 * This is needed because an exception could be thrown in the ctor and
-	 * that's not a good thing to do.
-	 */
-	public boolean isConnected();
-	
-	/**
-	 * Terminate the server.
-	 * WARNING: This is only here so that factory can to it. Termination should ONLY
-	 * be done by the Factory not any one else. 
-	 */
-	public void terminateServer();
-			
-	/**
-	 * Close the connection.
-	 */
-	public void close();
-	
-	/**
-	 * Get the class information. Null return if not found.
-	 */
-	public Commands.GetClassReturn getClass(String className) throws CommandException;
-
-	/**
-	 * Get the class information from the id. 
-	 */
-	 public Commands.GetClassIDReturn getClassFromID(int classID) throws CommandException;
-
-	
-
-	/**
-	 * Get object data from an id.
-	 */	
-	public void getObjectData(int objectID, Commands.ValueObject valueReturn) throws CommandException;
-		
-	/**
-	 * Get a new instance using the initialization string.
-	 */
-	public void getNewInstance(int classID, String initString, Commands.ValueObject newInstance) throws CommandException;
-		
-	/**
-	 * Invoke the get array contents command.
-	 * @param arrayID
-	 * @param returnValue
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void getArrayContents(int arrayID, Commands.ValueObject returnValue) throws CommandException;
-	
-	/**
-	 * Invoke the method call.
-	 * The parms valueObject must represent an Object[] (either through ARRAY_IDS or OBJECT)
-	 */	
-	public void invokeMethod(int methodID, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException;
-
-	/**
-	 * Invoke the method call with method passed.
-	 * The parms valueObject must represent an Object[] (either through ARRAY_IDS or OBJECT)
-	 */	
-	public void invokeMethod(Commands.ValueObject classType, String methodName, Commands.ValueObject parmTypes, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException;
-
-	/**
-	 * Release the id. It is no longer needed on the client.
-	 */
-	public void releaseID(int id);
-	
-	/**
-	 * Read array values as BeanProxies into valueSender.
-	 * @param returnValue
-	 * @param valueSender
-	 * @param allowFlag <code>true</code> to allow FLAG values, <code>false</code> if not allow flag values.
-	 * 
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void readProxyArrayValues(Commands.ValueObject returnValue, Commands.ValueSender valueSender, boolean allowFlag) throws CommandException;
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java
deleted file mode 100644
index 5cd6ad5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IREMConstantBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-/**
- * Tag interface to indicate this proxy is a constant proxy, i.e. there
- * is no bean on the server representing this (e.g. Strings and Integers).
- */
-
-public interface IREMConstantBeanProxy extends IREMBeanProxy {
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java
deleted file mode 100644
index eab5860..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IREMConstantBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * This interface is used for any BeanType that represents a constant type bean.
- * These are types that are immutable and a copy of the actual value is kept here
- * in the client and not stored as an object id.
- */
-
-public interface IREMConstantBeanTypeProxy extends IBeanTypeProxy {
-	
-	/**
-	 * Create a new bean proxy the ValueObject passed in.
-	 */
-	public IBeanProxy newBeanProxy(Commands.ValueObject value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java
deleted file mode 100644
index 16c61d3..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IREMExpressionConnection.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/16 19:11:23 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.io.IOException;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
- 
-/**
- * Additional function on a connection for expression tree processing.
- * Connections returned (IREMConnections) will always also implement IREMExpressionConnection,
- * but they are separated so that expression functions don't pollute the regular
- * connection interface with added commands that shouldn't be called except
- * when processing an expression. If they were called out of order, big problems
- * can occur.
- * <p>
- * To use, simply cast the IREMConnection to be an IREMExpressionConnection.
- * 
- * @since 1.0.0
- */
-public interface IREMExpressionConnection extends IREMConnection {
-	
-	/**
-	 * Start expression processing.
-	 * @param expressionID 
-	 * 
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void startExpressionProcessing(int expressionID) throws IOException;
-	
-	/**
-	 * Transfer the expression. This tells the remote vm to stop processing on the
-	 * given connection and return the expression processing controller for the expression.
-	 * 
-	 * @param expressionID
-	 * @param expController
-	 * @throws IOException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void transferExpression(int expressionID, Commands.ValueObject expController) throws CommandException;
-	
-	/**
-	 * Resume the expression on this connection.
-	 * @param expressionID
-	 * @param expController expression processor controller to use for the expression on this new connection.
-	 * @throws CommandException 
-	 * 
-	 * @since 1.1.0
-	 */
-	public void resumeExpression(int expressionID, Commands.ValueObject expController) throws CommandException;
-	
-	/**
-	 * Push an expression command. This is the common portion of the
-	 * subcommand. The actual data of the command will be separately done.
-	 * @param expressionID 
-	 * @param subcommand The subcommand being sent. From IInternalExpressionConstants.
-	 * 
-	 * @throws IOException
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.initParser.tree.IInternalExpressionConstants#PUSH_TO_PROXY_EXPRESSION
-	 * @since 1.0.0
-	 */
-	public void pushExpressionCommand(int expressionID, byte subcommand) throws IOException;
-	
-	/**
-	 * Push the value object to the remote side.
-	 * 
-	 * @param valueObject
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushValueObject(Commands.ValueObject valueObject) throws CommandException;
-
-	/**
-	 * Push just the single byte to the remote side.
-	 * @param abyte
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushByte(byte abyte) throws IOException;
-	
-	/**
-	 * Push just the single int to the remote side.
-	 * 
-	 * @param anInt
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushInt(int anInt) throws IOException;
-	
-	
-	/**
-	 * Push just the singe string to the remote side.
-	 * 
-	 * @param aString
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushString(String aString) throws IOException;
-	
-	/**
-	 * Push just the bool to the remote side.
-	 * @param aBool
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pushBoolean(boolean aBool) throws IOException;
-	
-	/**
-	 * Get the final value. It must be called after processing the proxy id resolutions even for sync (so that we can get
-	 * any thrown errors).
-	 * 
-	 * @param result
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public void getFinalValue(Commands.ValueObject result) throws CommandException;
-	
-	/**
-	 * Send the pull value command, with the proxyids of intereset. If an error
-	 * occurs, command exception is thrown. 
-	 * <p>
-	 * After the pull value call, if no errors, the proxyids must be read, and then getFinalValue call must be sent.
-	 * @param expressionID
-	 * @param proxyids expression proxyids that request feedback or <code>null</code> if no proxy ids.
-	 * @param sender sender to use to process the returned proxy ids, or <code>null</code> if expecting no proxy resolutions.
-	 * 
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void pullValue(int expressionID, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException;
-	
-	/**
-	 * Send the sync command, with the proxyids of intereset. If an error
-	 * occurs, command exception is thrown.
-	 * <p>
-	 * After the sync call, if no errors, the returned proxyids must be processed and then the final endValue call must be sent.
-	 * 
-	 * @param expressionID 
-	 * @param proxyids expression proxyids that request feedback or <code>null</code> if no proxy ids.
-	 * @param sender sender to use to process the proxy id resolutions, or <code>null</code> if expecting no proxy ids.
-	 * 
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void sync(int expressionID, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException;	
-	
-	/**
-	 * Stop expression processing.
-	 * @param expressionID 
-	 * 
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public void stopExpressionProcessing(int expressionID) throws IOException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java
deleted file mode 100644
index dbf9fe6..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IREMMethodProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This interface for REMMethodProxy allows the invokation where
- * the parms are a mixture of constant objects (i.e. can be sent
- * as values to the client) and IBeanProxies. It is only to be
- * used by other factories that want to invoke methods where
- * some of the parms are constants so that there is no need
- * create IBeanProxies for them, e.g. String. This should be
- * used with extreme care.
- */
-
-public interface IREMMethodProxy extends IMethodProxy, IREMBeanProxy {
-	public IBeanProxy invokeWithParms(IBeanProxy subject, Object[] parms) throws ThrowableProxy;
-	
-		
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java
deleted file mode 100644
index effdba4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IREMSpecialBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * This is a special interface for allowing abstract
- * types to create the correct subclass types.
- * Only ones that use REMAnAbstractBeanTypeProxy
- * should implement this.
- */
-public interface IREMSpecialBeanTypeProxy {
-	
-	/**
-	 * Called by REMAnAbstractBeanTypeProxy to create a subclass of it.
-	 * This allows correct types to be created depending upon the
-	 * main super type.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
deleted file mode 100644
index f62bf49..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: LocalFileConfigurationContributorController.java,v $
- *  $Revision: 1.9 $  $Date: 2005/04/06 22:28:02 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
- 
-/**
- * This version works with local files being added to the classpath, and the classpath is strings.
- * 
- * @since 1.0.0
- */
-public class LocalFileConfigurationContributorController implements IConfigurationContributionController {
-	
-	private URL[] classpathInfo;
-	private URL[][] bootpathInfo;
-	private List classpath;
-	private List prependBootpath;
-	private List appendBootpath;
-	private List javaLibraryPath;
-	private ProxyLaunchSupport.LaunchInfo launchInfo;
-	
-	public LocalFileConfigurationContributorController(URL[] classpathInfo, URL[][] bootpathInfo, ProxyLaunchSupport.LaunchInfo launchInfo) {
-		this.classpathInfo = classpathInfo;
-		this.bootpathInfo = bootpathInfo;
-		this.launchInfo = launchInfo;
-	}
-	
-	public URL[] getFinalClasspath() {
-		if (classpath == null)
-			return classpathInfo;
-		else
-			return (URL[]) classpath.toArray(new URL[classpath.size()]);
-	}
-
-	public URL[] getFinalPrependBootpath() {
-		if (prependBootpath == null)
-			return bootpathInfo[0];
-		else
-			return (URL[]) prependBootpath.toArray(new URL[prependBootpath.size()]);
-	}
-	
-	public URL[] getFinalAppendBootpath() {
-		if (appendBootpath == null)
-			return bootpathInfo[2];
-		else
-			return (URL[]) prependBootpath.toArray(new URL[appendBootpath.size()]);
-	}	
-
-	public List getFinalJavaLibraryPath() {
-		if (javaLibraryPath == null)
-			return Collections.EMPTY_LIST;
-		else
-			return javaLibraryPath;
-	}
-	
-	protected List getClasspath() {
-		if (classpath == null) {
-			classpath = new ArrayList(classpathInfo.length);
-			addAll(classpath, classpathInfo, -1);
-		}
-		return classpath;
-	}
-	
-	protected List getPrependBootpath() {
-		if (prependBootpath == null) {
-			if (bootpathInfo[0] != null) {
-				prependBootpath = new ArrayList(bootpathInfo[0].length);
-				addAll(prependBootpath, bootpathInfo[0], -1);
-			} else
-				prependBootpath = new ArrayList(1);
-		}
-		return prependBootpath;
-	}
-	
-	protected List getAppendBootpath() {
-		if (appendBootpath == null) {
-			if (bootpathInfo[2] != null) {
-				appendBootpath = new ArrayList(bootpathInfo[2].length);
-				addAll(appendBootpath, bootpathInfo[2], -1);
-			} else
-				appendBootpath = new ArrayList(1);
-		}
-		return appendBootpath;
-	}	
-	
-	protected List getJavaLibraryPath() {
-		if (javaLibraryPath == null) {
-			javaLibraryPath = new ArrayList(3);
-		}
-		return javaLibraryPath;
-	}
-	
-	protected void addAll(List toList, Object[] array, int loc) {
-		for (int i = 0; i < array.length; i++) {
-			// Need a dup check, sometimes dups come in especially during development
-			if (toList.contains(array[i]))
-				continue;
-			if (loc == -1)
-				toList.add(array[i]);
-			else
-				toList.add(loc++, array[i]);
-		}
-	}
-	
-	protected void addLocations(List toList, IRuntimeClasspathEntry[] entries) {
-		for (int i = 0; i < entries.length; i++) {
-			IRuntimeClasspathEntry entry = entries[i];
-			URL location = ProxyLaunchSupport.convertStringPathToURL(entry.getLocation());
-			if (location != null && !toList.contains(location))
-				toList.add(location);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#getJavaProject()
-	 */
-	public IJavaProject getJavaProject() {
-		return launchInfo.getJavaProject();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeProject(org.eclipse.core.resources.IProject)
-	 */
-	public void contributeProject(IProject project) throws CoreException {
-		IJavaProject jproject = JavaCore.create(project);
-		IRuntimeClasspathEntry[] projPath = JavaRuntime.computeUnresolvedRuntimeClasspath(jproject);
-		boolean jreContainerFound= false;
-		for (int i = 0; i < projPath.length; i++) {
-			IRuntimeClasspathEntry entry= projPath[i];
-			if (entry.getClasspathProperty() == IRuntimeClasspathEntry.BOOTSTRAP_CLASSES || entry.getClasspathProperty() == IRuntimeClasspathEntry.STANDARD_CLASSES) {
-				int entryKind= entry.getClasspathEntry().getEntryKind();
-				String segment0= entry.getPath().segment(0);
-				if (entryKind == IClasspathEntry.CPE_CONTAINER && JavaRuntime.JRE_CONTAINER.equals(segment0)
-						|| entryKind == IClasspathEntry.CPE_VARIABLE && JavaRuntime.JRELIB_VARIABLE.equals(segment0)) {
-					jreContainerFound= true;
-				} else {
-					if (jreContainerFound)
-						addLocations(getAppendBootpath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
-					else
-						addLocations(getPrependBootpath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
-				}
-			} else {
-				addLocations(getClasspath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
-			}
-		}			
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.lang.String, int)
-	 */
-	public void contributeClasspath(String classpath, int typeFlag) {
-		contributeClasspath(ProxyLaunchSupport.convertStringPathToURL(classpath), typeFlag);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.net.URL, int)
-	 */
-	public void contributeClasspath(URL classpathURL, int typeFlag) {
-		if (classpathURL == null)
-			return;
-		switch (typeFlag) {
-			case PREPEND_BOOT_CLASSPATH:
-				if (!getPrependBootpath().contains(classpathURL))
-					getPrependBootpath().add(classpathURL);
-				break;
-			case PREPEND_USER_CLASSPATH:
-				if (!getClasspath().contains(classpathURL))
-					getClasspath().add(0, classpathURL);
-				break;
-			case APPEND_USER_CLASSPATH:
-				if (!getClasspath().contains(classpathURL))					
-					getClasspath().add(classpathURL);
-				break;				
-			case APPEND_BOOT_CLASSPATH:
-				if (!getAppendBootpath().contains(classpathURL))					
-					getAppendBootpath().add(classpathURL);
-				break;
-			case APPEND_JAVA_LIBRARY_PATH:
-				if (!getJavaLibraryPath().contains(classpathURL))					
-					getJavaLibraryPath().add(classpathURL);
-				break;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(org.osgi.framework.Bundle, java.lang.String, int, boolean)
-	 */
-	public void contributeClasspath(Bundle bundle, String relativePath, int typeFlag, boolean nlsLocalize) {
-		// If not nls localize, or if it is java library path, then just find the one in the plugin/fragment and add it.
-		if (nlsLocalize)
-			contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(bundle, relativePath), typeFlag);
-		else if (typeFlag == IConfigurationContributionController.APPEND_JAVA_LIBRARY_PATH) {
-			URL contribution = ProxyPlugin.getPlugin().urlLocalizeFromBundleAndFragments(bundle, relativePath);
-			if (contribution == null) {
-				// PDE is not here to help us extract that @#$ dll
-			    JEMUtilPlugin.getLogger().log("No free lunch!");
-			}
-			contributeClasspath(contribution, typeFlag);
-		}
-		else
-			contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeFromBundleOnly(bundle, relativePath), typeFlag);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(org.osgi.framework.Bundle, org.eclipse.core.runtime.IPath, int, boolean)
-	 */
-	public void contributeClasspath(Bundle bundle, IPath relativePath, int typeFlag, boolean nlsLocalize) {
-		// If not nls localize, or if it is java library path, then just find the one in the plugin/fragment and add it.
-		if (nlsLocalize)
-			contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(bundle, relativePath), typeFlag);
-		else if (typeFlag == IConfigurationContributionController.APPEND_JAVA_LIBRARY_PATH)
-			contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeFromBundleAndFragments(bundle, relativePath), typeFlag);
-		else
-			contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeFromBundleOnly(bundle, relativePath), typeFlag);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.lang.String[], int)
-	 */
-	public void contributeClasspath(String[] classpaths, int typeFlag) {
-		contributeClasspath(ProxyLaunchSupport.convertStringPathsToURL(classpaths), typeFlag);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.net.URL[], int)
-	 */
-	public void contributeClasspath(URL[] classpathURLs, int typeFlag) {
-		if (classpathURLs == null)
-			return;
-		switch (typeFlag) {
-			case PREPEND_BOOT_CLASSPATH:
-				addAll(getPrependBootpath(), classpathURLs, -1);
-				break;
-			case PREPEND_USER_CLASSPATH:
-				addAll(getClasspath(), classpathURLs, 0);
-				break;
-			case APPEND_USER_CLASSPATH:
-				addAll(getClasspath(), classpathURLs, -1);
-				break;				
-			case APPEND_BOOT_CLASSPATH:
-				addAll(getAppendBootpath(), classpathURLs, -1);
-				break;
-			case APPEND_JAVA_LIBRARY_PATH:
-				addAll(getJavaLibraryPath(), classpathURLs, -1);
-				break;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
deleted file mode 100644
index b0eca3b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
+++ /dev/null
@@ -1,489 +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
- *******************************************************************************/
-/*
- * $RCSfile: LocalProxyLaunchDelegate.java,v $ $Revision: 1.23 $ $Date: 2005/05/13 21:11:21 $
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.*;
-import java.net.ConnectException;
-import java.net.Socket;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.Map;
-import java.util.Random;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.model.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.*;
-
-import org.eclipse.jem.internal.proxy.common.remote.ExpressionCommands;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.remote.awt.REMRegisterAWT;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Launch Delegate for launching Local (i.e. remote vm is on local system). Here "remote" means the
- * registry is not in the IDE but in a separate VM, and "local" means that is in on the local
- * physical machine and not on a separate machine.
- * 
- * @since 1.0.0
- */
-public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration,
-	 *      java.lang.String, org.eclipse.debug.core.ILaunch,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor pm) throws CoreException {
-
-		String launchKey = configuration.getAttribute(IProxyConstants.ATTRIBUTE_LAUNCH_KEY, (String) null);
-		if (launchKey == null)
-			abort(ProxyRemoteMessages.getString("ProxyRemoteNoLaunchKey"), null, 0); //$NON-NLS-1$
-
-		// In Eclipse, even if private, a launch will show up in the debug process tree and in the console viewer.
-		// To be absolutely private, we need to remove the launch which has already been added.
-		if (ProxyLaunchSupport.ATTR_PRIVATE != null && configuration.getAttribute(ProxyLaunchSupport.ATTR_PRIVATE, false)) 
-			DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);		
-		if (pm == null) {
-			pm = new NullProgressMonitor();
-		}
-
-		IJavaProject project = getJavaProject(configuration);
-		String name = configuration.getAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, (String) null);
-		if (name == null)
-			name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMName"), new Object[] { project != null ? project.getProject().getName() : "" }); //$NON-NLS-1$
-		else
-			name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMNameWithComment"), new Object[] { project != null ? project.getProject().getName() : "", name }); //$NON-NLS-1$
-
-		String stepId = "Launch VM ( " + name + " )";
-		TimerTests.basicTest.startStep(stepId);
-		// Problem with launch, can't have double-quotes in vmName.
-		if (name.indexOf('"') != -1)
-			name = name.replace('"', '\'');
-
-		pm.beginTask("", 500); //$NON-NLS-1$
-		pm.subTask(MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteLaunchVM"), new Object[] { name })); //$NON-NLS-1$
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-
-		IVMInstall vm = verifyVMInstall(configuration);
-
-		IVMRunner runner = vm.getVMRunner(mode);
-		if (runner == null) {
-			abort(MessageFormat.format(ProxyRemoteMessages.getString("Proxy_NoRunner_ERROR_"), new Object[] { name }), null, 0); //$NON-NLS-1$
-		}
-
-		File workingDir = verifyWorkingDirectory(configuration);
-		String workingDirName = null;
-		if (workingDir != null) {
-			workingDirName = workingDir.getAbsolutePath();
-		}
-
-		// Environment variables
-		String[] envp = DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-
-		// Program & VM args
-		String pgmArgs = getProgramArguments(configuration);
-		String vmArgs = getVMArguments(configuration);
-		ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-
-		// VM-specific attributes
-		Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-
-		pm.worked(100);
-		
-		// Now let's get the classpaths created through the contributors.
-		URL[] classpath = ProxyLaunchSupport.convertStringPathsToURL(getClasspath(configuration));
-		String[][] bootpathInfoStrings = getBootpathExt(vmAttributesMap);
-		URL[][] bootpathInfo = new URL[][]{
-				ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[0]),
-				ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[1]),
-				ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[2]),
-		};
-		ProxyLaunchSupport.LaunchInfo launchInfo = ProxyLaunchSupport.getInfo(launchKey);
-		final IConfigurationContributor[] contributors = launchInfo.contributors;
-		final LocalFileConfigurationContributorController controller =
-			new LocalFileConfigurationContributorController(classpath, bootpathInfo, launchInfo);
-		if (contributors != null) {		
-			for (int i = 0; i < contributors.length; i++) {
-				// Run in safe mode so that anything happens we don't go away.
-				final int ii = i;
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contributors[ii].contributeClasspaths(controller);
-					}
-				});
-			}
-		}
-
-		// Add in the required ones by the Proxy support. These are hard-coded since they are
-		// required.
-		ProxyRemoteUtil.updateClassPaths(controller);
-		addInFragmentLibraries(controller);
-
-		classpath = controller.getFinalClasspath();
-		if (bootpathInfo[0] != controller.getFinalPrependBootpath()) {
-		    if (vmAttributesMap == null)
-		        vmAttributesMap = new HashMap(2);
-		    vmAttributesMap.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND, ProxyLaunchSupport.convertURLsToStrings(bootpathInfo[0]));
-		}
-		if (bootpathInfo[2] != controller.getFinalAppendBootpath()) {
-		    if (vmAttributesMap == null)
-		        vmAttributesMap = new HashMap(2);
-		    vmAttributesMap.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND, ProxyLaunchSupport.convertURLsToStrings(bootpathInfo[2]));
-		}
-
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-		pm.worked(100);
-
-		// Create VM config
-		VMRunnerConfiguration runConfig =
-			new VMRunnerConfiguration("org.eclipse.jem.internal.proxy.vm.remote.RemoteVMApplication", ProxyLaunchSupport.convertURLsToStrings(classpath)); //$NON-NLS-1$
-
-		REMProxyFactoryRegistry registry = new REMProxyFactoryRegistry(ProxyRemoteUtil.getRegistryController(), name);
-		Integer registryKey = registry.getRegistryKey();
-
-		Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-		if (bufSize == null)
-			bufSize = new Integer(16000);
-
-		int masterServerPort = ProxyRemoteUtil.getRegistryController().getMasterSocketPort();
-
-		// See if debug mode is requested.
-		DebugModeHelper dh = new DebugModeHelper();
-		boolean debugMode = dh.debugMode(name);
-		boolean useNoverify = ProxyPlugin.getPlugin().getPluginPreferences().getBoolean(ProxyPlugin.PREFERENCES_VM_NOVERIFY_KEY);
-
-		String[] evmArgs = execArgs.getVMArgumentsArray();
-//TODO: this is a temporary solution for the fact that spaces
-//      are not allowed in the libPath
-		for (int i = 0; i < evmArgs.length; i++) {
-			if (evmArgs[i].startsWith("-Djava.library.path")) {
-				StringBuffer b = new StringBuffer(evmArgs[i]);
-				int idx=b.indexOf("%20");
-				while (idx>=0) {
-					b.replace(idx,idx+3," ");
-					idx=b.indexOf("%20");
-				}
-				evmArgs[i]=b.toString();
-			}			
-		}
-		
-		int extraArgs = 4;	// Number of extra standard args added (if number changes below, this must change)
-		if (debugMode)
-			extraArgs+=4;	// Number of extra args added for debug mode (if number changes below, this must change).
-		if(useNoverify)
-			extraArgs++; // An extra arg added for '-noverify' flag (if number changes below, this must change).
-		
-		boolean useExpressionTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING));
-		long expressionTracingThreshold = -1;
-		if (useExpressionTracing) {
-			extraArgs++;
-			String thresholdString = Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACEING_TIMER_THRESHOLD);
-			if (thresholdString != null) {
-				try {
-					expressionTracingThreshold = Long.valueOf(thresholdString).longValue();
-					extraArgs++;
-				} catch (NumberFormatException e) {
-				}
-			}
-		}
-		
-		List javaLibPaths = controller.getFinalJavaLibraryPath();
-		int existingLibpaths = -1;
-		if (!javaLibPaths.isEmpty()) {
-			// first need to see if java lib path also specified in standard args by someone configuring the configuration by hand.
-			for (int i = 0; i < evmArgs.length; i++) {
-				if (evmArgs[i].startsWith("-Djava.library.path")) { //$NON-NLS-1$
-					// We found one already here, save the spot so we update it later.
-					existingLibpaths = i;
-					break;
-				}
-			}
-			if (existingLibpaths == -1)
-				++extraArgs;	// Need to have room for one more.
-		}
-		
-		String[] cvmArgs = new String[evmArgs.length + extraArgs];
-		System.arraycopy(evmArgs, 0, cvmArgs, extraArgs, evmArgs.length);	// Put existing into new list at the end.		
-		
-		int cvmArgsCount=0;
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.registryKey=" + registryKey; //$NON-NLS-1$
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.masterPort=" + String.valueOf(masterServerPort); //$NON-NLS-1$
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.bufsize=" + bufSize; //$NON-NLS-1$
-		cvmArgs[cvmArgsCount++] = "-Dproxyvm.servername=" + name; //$NON-NLS-1$
-		
-		if(useNoverify)
-			cvmArgs[cvmArgsCount++] = "-noverify"; //$NON-NLS-1$
-		
-		if (useExpressionTracing) {
-			cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE+"=true";
-			if (expressionTracingThreshold != -1)
-				cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD+'='+String.valueOf(expressionTracingThreshold);
-		}
-
-		// If in debug mode, we need to find a port for it to use.
-		int dport = -1;
-		if (debugMode) {
-			dport = findUnusedLocalPort("localhost", 5000, 15000, new int[0]); //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Djava.compiler=NONE"; //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Xdebug"; //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Xnoagent"; //$NON-NLS-1$
-			cvmArgs[cvmArgsCount++] = "-Xrunjdwp:transport=dt_socket,server=y,address=" + dport; //$NON-NLS-1$
-		}
-		
-		if (!javaLibPaths.isEmpty()) {
-			StringBuffer appendTo = null;
-			if (existingLibpaths != -1) {
-				appendTo = new StringBuffer(evmArgs[existingLibpaths]); 
-				appendTo.append(File.pathSeparatorChar);	// Plus a separator so we can append
-			} else 
-				appendTo = new StringBuffer("-Djava.library.path="); //$NON-NLS-1$
-			String [] libPaths = ProxyLaunchSupport.convertURLsToStrings((URL[]) javaLibPaths.toArray(new URL[javaLibPaths.size()]));
-			for (int i = 0; i < libPaths.length; i++) {
-				if (i != 0)
-					appendTo.append(File.pathSeparator);
-				appendTo.append(libPaths[i]);
-			}
-			if (existingLibpaths != -1)
-				cvmArgs[extraArgs+existingLibpaths] = appendTo.toString();
-			else
-				cvmArgs[extraArgs-1] = appendTo.toString();
-		}
-
-		runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
-		runConfig.setEnvironment(envp);
-		runConfig.setVMArguments(cvmArgs);
-		runConfig.setWorkingDirectory(workingDirName);
-		runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
-		// Bootpath
-		runConfig.setBootClassPath(getBootpath(configuration));
-
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-		pm.worked(100);
-
-		// set the default source locator if required
-		setDefaultSourceLocator(launch, configuration);
-
-		// Launch the configuration - 1 unit of work
-		runner.run(runConfig, launch, new SubProgressMonitor(pm, 100));
-
-		// check for cancellation
-		if (pm.isCanceled())
-			return;
-
-		IProcess[] processes = launch.getProcesses();
-		IProcess process = processes[0]; // There is only one.
-		// Check if it is already terminated. If it is, then there was a bad error, so just
-		// print out the results from it.
-		if (process.isTerminated()) {
-			IStreamsProxy stProxy = process.getStreamsProxy();
-			// Using a printWriter for println capability, but it needs to be on another
-			// writer, which will be string
-			java.io.StringWriter s = new java.io.StringWriter();
-			java.io.PrintWriter w = new java.io.PrintWriter(s);
-
-			w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED));
-			w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED_LINE1));
-			w.println(stProxy.getErrorStreamMonitor().getContents());
-			w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED_LINE2));
-			w.println(stProxy.getOutputStreamMonitor().getContents());
-			w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED_LINE3));
-			w.close();
-
-			String msg = MessageFormat.format(ProxyRemoteMessages.getString("Proxy_Terminated_too_soon_ERROR_"), new Object[] { name }); //$NON-NLS-1$
-			dh.displayErrorMessage(ProxyRemoteMessages.getString("Proxy_Error_Title"), msg); //$NON-NLS-1$
-			throw new CoreException(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
-		} else {
-			final String traceName = name;
-			IStreamsProxy fStreamsProxy = process.getStreamsProxy();
-
-			/**
-			 * StreamListener. Should not be created if ProxyPlugin logger is not logging the requested level.
-			 * 
-			 * @since 1.1.0
-			 */
-			class StreamListener implements IStreamListener {
-				String tracePrefix;
-				Level level;
-				Job printJob;	// Job to try to gather printing together.
-				Logger logger;
-				StringBuffer gatheredText = new StringBuffer(100);
-				{
-					logger = ProxyPlugin.getPlugin().getLogger();
-					printJob = new Job("") {
-
-						protected IStatus run(IProgressMonitor monitor) {
-							monitor.beginTask("Print remote vm trace output", 1);
-							while(true) {
-								String output = null;
-								synchronized (gatheredText) {
-									if (gatheredText.length() <= tracePrefix.length())
-										break;	// We've reached the end, no more to print.
-									output = gatheredText.toString();
-									gatheredText.setLength(tracePrefix.length());	// Reset the length to the prefix.
-								}
-								logger.log(output, level);
-							}
-							monitor.done();
-							return Status.OK_STATUS;
-						}
-					};
-					printJob.setPriority(Job.SHORT);
-					printJob.setSystem(true);
-				}
-				
-				public StreamListener(String type, Level level, Logger logger) {
-					tracePrefix = traceName + ':' + type + '>' + System.getProperty("line.separator");
-					gatheredText.append(tracePrefix);
-					this.level = level;
-					this.logger = logger;
-				}
-
-				public void streamAppended(String newText, IStreamMonitor monitor) {
-					synchronized(gatheredText) {
-						gatheredText.append(newText);
-					}
-					printJob.schedule(100L);	// Wait tenth of second to gather as much as can together.
-				}
-			};
-
-			Logger logger = ProxyPlugin.getPlugin().getLogger();
-			if (logger.isLoggingLevel(Level.WARNING)) {
-				// Always listen to System.err output if we are at least logging warnings.
-				IStreamMonitor monitor = fStreamsProxy.getErrorStreamMonitor();
-				if (monitor != null)
-					monitor.addListener(new StreamListener("err", Level.WARNING, logger)); //$NON-NLS-1$
-			}
-
-			// If debug trace is requested, then attach trace listener for System.out
-			// Expression tracing requires debug trace too because it prints to sysout. However, it requesting expressionTracing, change logging level to INFO,
-			// we want them to show if this true. It is confusing to also have to change logging level in .options file.
-			if (useExpressionTracing)
-				if (!logger.isLoggingLevel(Level.INFO))
-					logger.setLevel(Level.INFO);
-			if (useExpressionTracing || "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyRemoteUtil.DEBUG_VM_TRACEOUT))) { //$NON-NLS-1$
-				// Want to trace the output of the remote vm's. And we are logging at least level info.
-				if (logger.isLoggingLevel(Level.INFO)) {
-					IStreamMonitor monitor = fStreamsProxy.getOutputStreamMonitor();
-					if (monitor != null)
-						monitor.addListener(new StreamListener("out", Level.INFO, logger)); //$NON-NLS-1$							
-				}							
-			}
-		}
-
-		// If in debug mode, tester must start debugger before going on.
-		if (debugMode) {
-			if (!dh.promptPort(dport)) {
-				process.terminate();
-				throw new CoreException(
-					new Status(
-						IStatus.WARNING,
-						ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
-						0,
-						"Debugger attach canceled", //$NON-NLS-1$
-						null));
-			}
-		}
-
-		// Now set up the registry.
-		registry.initializeRegistry(process);
-		new REMStandardBeanTypeProxyFactory(registry);
-		new REMStandardBeanProxyFactory(registry);
-		new REMMethodProxyFactory(registry);
-
-		if (debugMode || REMProxyFactoryRegistry.fGlobalNoTimeouts)
-			registry.fNoTimeouts = true;
-		if (configuration.getAttribute(IProxyConstants.ATTRIBUTE_AWT_SWING, true))
-			REMRegisterAWT.registerAWT(registry);
-
-		launchInfo.resultRegistry = registry;
-
-		pm.done();
-		TimerTests.basicTest.stopStep(stepId);
-	}
-
-	/**
-	 * @param controller
-	 * @throws CoreException
-	 * 
-	 * @since 1.0.2
-	 */
-	private void addInFragmentLibraries(IConfigurationContributionController controller) throws CoreException {
-		IPDEContributeClasspath instance = IPDEContributeClasspath.INSTANCE;
-		if (instance != null) {
-			instance.getPDEContributions(controller);
-		}
-	}
-
-	// Utilities to find the free port
-	private static final Random fgRandom = new Random(System.currentTimeMillis());
-
-	private static int findUnusedLocalPort(String host, int searchFrom, int searchTo, int[] exclude) {
-		for (int i = 0; i < 10; i++) {
-			int port = 0;
-			newport : while (true) {
-				port = getRandomPort(searchFrom, searchTo);
-				if (exclude != null)
-					for (int e = 0; e < exclude.length; e++)
-						if (port == exclude[e])
-							continue newport;
-				break;
-			}
-			try {
-				new Socket(host, port);
-			} catch (ConnectException e) {
-				return port;
-			} catch (IOException e) {
-			}
-		}
-		return -1;
-	}
-
-	private static int getRandomPort(int low, int high) {
-		return (int) (fgRandom.nextFloat() * (high - low)) + low;
-	}
-	
-	private String[][] getBootpathExt(Map vmMap) {
-	    String[][] ext = new String[3][];
-	    if (vmMap != null) {
-		    ext[0] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND);
-		    ext[1] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH);
-		    ext[2] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND);
-	    }
-	    return ext;
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java
deleted file mode 100644
index cf44429..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java
+++ /dev/null
@@ -1,325 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: MessageDialog.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import java.awt.*;
-/**
- * This is an AWT message dialog. It will only be used
- * if not running in the workbench by the debug mode helper.
- * It won't be loaded unless AWT is available, so it can be
- * distributed without causing problems on systems that
- * don't have AWT because it won't be loaded in that case.
- */
-class MessageDialog extends Dialog {
-	private java.awt.Panel ivjContentsPane = null;
-	IvjEventHandler ivjEventHandler = new IvjEventHandler();
-	private java.awt.TextArea ivjTextArea1 = null;
-	private java.awt.Button ivjButton1 = null;
-	public int result = 2;	// Nothing hit is the same as button 2.
-	private java.awt.Button ivjButton2 = null;
-
-class IvjEventHandler implements java.awt.event.ActionListener, java.awt.event.WindowListener {
-		public void actionPerformed(java.awt.event.ActionEvent e) {
-			if (e.getSource() == MessageDialog.this.getButton1()) 
-				connEtoC2(e);
-			if (e.getSource() == MessageDialog.this.getButton2()) 
-				connEtoC3(e);
-		};
-		public void windowActivated(java.awt.event.WindowEvent e) {};
-		public void windowClosed(java.awt.event.WindowEvent e) {};
-		public void windowClosing(java.awt.event.WindowEvent e) {
-			if (e.getSource() == MessageDialog.this) 
-				connEtoC1(e);
-		};
-		public void windowDeactivated(java.awt.event.WindowEvent e) {};
-		public void windowDeiconified(java.awt.event.WindowEvent e) {};
-		public void windowIconified(java.awt.event.WindowEvent e) {};
-		public void windowOpened(java.awt.event.WindowEvent e) {};
-	};
-/**
- * MessageDialog constructor comment.
- * @param owner java.awt.Frame
- * @param title java.lang.String
- * @param modal boolean
- */
-public MessageDialog(Frame owner, String title, boolean modal, String msg, String button1, String button2) {
-	super(owner, title, modal);
-
-	initialize();
-	getTextArea1().setText(msg);
-	getButton1().setLabel(button1);
-	if (button2 != null)
-		getButton2().setLabel(button2);
-	else {
-		// We only want one button, so remove button2
-		getContentsPane().remove(getButton2());
-	}
-	
-}
-/**
- * Comment
- */
-public void button1_ActionPerformed() {
-	result = 1;
-	setVisible(false);
-	return;
-}
-/**
- * Comment
- */
-public void button2_ActionPerformed() {
-	result = 2;
-	setVisible(false);
-	return;
-}
-/**
- * connEtoC1:  (MessageDialog.window.windowClosing(java.awt.event.WindowEvent) --> MessageDialog.dispose()V)
- * @param arg1 java.awt.event.WindowEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC1(java.awt.event.WindowEvent arg1) {
-	try {
-		// user code begin {1}
-		// user code end
-		this.dispose();
-		// user code begin {2}
-		// user code end
-	} catch (java.lang.Throwable ivjExc) {
-		// user code begin {3}
-		// user code end
-		handleException(ivjExc);
-	}
-}
-/**
- * connEtoC2:  (Button1.action.actionPerformed(java.awt.event.ActionEvent) --> MessageDialog.button1_ActionPerformed()V)
- * @param arg1 java.awt.event.ActionEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC2(java.awt.event.ActionEvent arg1) {
-	try {
-		// user code begin {1}
-		// user code end
-		this.button1_ActionPerformed();
-		// user code begin {2}
-		// user code end
-	} catch (java.lang.Throwable ivjExc) {
-		// user code begin {3}
-		// user code end
-		handleException(ivjExc);
-	}
-}
-/**
- * connEtoC3:  (Button2.action.actionPerformed(java.awt.event.ActionEvent) --> MessageDialog.button2_ActionPerformed()V)
- * @param arg1 java.awt.event.ActionEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC3(java.awt.event.ActionEvent arg1) {
-	try {
-		// user code begin {1}
-		// user code end
-		this.button2_ActionPerformed();
-		// user code begin {2}
-		// user code end
-	} catch (java.lang.Throwable ivjExc) {
-		// user code begin {3}
-		// user code end
-		handleException(ivjExc);
-	}
-}
-/**
- * Display dialog.
- * @param args java.lang.String[]
- */
-public static int doit(String title, String message, String button1, String button2) {
-	try {
-		Frame f = new java.awt.Frame(title);
-		f.setVisible(true);
-		// Need to massage the method since AWT doesn't have wordwrap. This is for left to right only.
-		String msg = message;
-		if (message.length() > 95) {
-			msg = ""; //$NON-NLS-1$
-nextSeg:	while (message.length() > 95) {
-				// Too wide, wrapping should be done. This is just a rough guess.
-				for (int i=95; 0<=i; i--) {
-					if (message.charAt(i) == ' ') {
-						// Break here.
-						msg = msg + message.substring(0, i) + '\n';
-						if (i+1 < message.length())
-							message = message.substring(i+1);
-						else
-							message = ""; //$NON-NLS-1$
-						continue nextSeg;
-					}
-				}
-				// If we got here, then there weren't any spaces in the first 80, so look right for first space.
-				for (int i=96; i<message.length(); i++) {
-					if (message.charAt(i) == ' ') {
-						// Break here
-						msg = msg + message.substring(0, i) + '\n';
-						if (i+1 < message.length())
-							message = message.substring(i+1);
-						else
-							message = ""; //$NON-NLS-1$
-						continue nextSeg;
-					}
-				}
-			}
-			msg += message;	// Now put on whatever is left.
-		}
-		MessageDialog aMessageDialog = new MessageDialog(f,title,true, msg, button1, button2);
-		aMessageDialog.pack();
-		aMessageDialog.getToolkit().beep();
-		aMessageDialog.setVisible(true);
-		f.dispose();
-		aMessageDialog.dispose();
-
-		return aMessageDialog.result;
-	} catch (Throwable exception) {
-	}
-
-	return 2;
-}
-/**
- * Return the Button1 property value.
- * @return java.awt.Button
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Button getButton1() {
-	if (ivjButton1 == null) {
-		try {
-			ivjButton1 = new java.awt.Button();
-			ivjButton1.setName("Button1"); //$NON-NLS-1$
-			ivjButton1.setLabel("Button1"); //$NON-NLS-1$
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjButton1;
-}
-/**
- * Return the Button2 property value.
- * @return java.awt.Button
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Button getButton2() {
-	if (ivjButton2 == null) {
-		try {
-			ivjButton2 = new java.awt.Button();
-			ivjButton2.setName("Button2"); //$NON-NLS-1$
-			ivjButton2.setLabel("Button2"); //$NON-NLS-1$
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjButton2;
-}
-/**
- * Return the ContentsPane property value.
- * @return java.awt.Panel
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Panel getContentsPane() {
-	if (ivjContentsPane == null) {
-		try {
-			ivjContentsPane = new java.awt.Panel();
-			ivjContentsPane.setName("ContentsPane"); //$NON-NLS-1$
-			ivjContentsPane.setLayout(new java.awt.FlowLayout());
-			getContentsPane().add(getTextArea1(), getTextArea1().getName());
-			getContentsPane().add(getButton1(), getButton1().getName());
-			getContentsPane().add(getButton2(), getButton2().getName());
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjContentsPane;
-}
-/**
- * Return the TextArea1 property value.
- * @return java.awt.TextArea
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.TextArea getTextArea1() {
-	if (ivjTextArea1 == null) {
-		try {
-			ivjTextArea1 = new TextArea();
-			ivjTextArea1.setName("TextArea1"); //$NON-NLS-1$
-			ivjTextArea1.setText("TextArea1"); //$NON-NLS-1$
-			ivjTextArea1.setRows(20);
-			ivjTextArea1.setColumns(100);
-			ivjTextArea1.setEditable(false);
-			// user code begin {1}
-			// user code end
-		} catch (java.lang.Throwable ivjExc) {
-			// user code begin {2}
-			// user code end
-			handleException(ivjExc);
-		}
-	}
-	return ivjTextArea1;
-}
-/**
- * Called whenever the part throws an exception.
- * @param exception java.lang.Throwable
- */
-private void handleException(java.lang.Throwable exception) {
-
-	/* Uncomment the following lines to print uncaught exceptions to stdout */
-	// ProxyPlugin.getPlugin().getMsgLogger().write(Level.WARNING,"--------- UNCAUGHT EXCEPTION ---------");
-	// ProxyPlugin.getPlugin().getMsgLogger().write(Level.WARNING,exception);
-}
-/**
- * Initializes connections
- * @exception java.lang.Exception The exception description.
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void initConnections() throws java.lang.Exception {
-	// user code begin {1}
-	// user code end
-	this.addWindowListener(ivjEventHandler);
-	getButton1().addActionListener(ivjEventHandler);
-	getButton2().addActionListener(ivjEventHandler);
-}
-/**
- * Initialize the class.
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void initialize() {
-	try {
-		// user code begin {1}
-		// user code end
-		setName("MessageDialog"); //$NON-NLS-1$
-		setLayout(new java.awt.BorderLayout());
-		setSize(426, 240);
-		add(getContentsPane(), "Center"); //$NON-NLS-1$
-		initConnections();
-	} catch (java.lang.Throwable ivjExc) {
-		handleException(ivjExc);
-	}
-	// user code begin {2}
-	// user code end
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java
deleted file mode 100644
index bfec035..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ProxyRemoteMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class ProxyRemoteMessages {
-
-	private static final String BUNDLE_NAME =
-		"org.eclipse.jem.internal.proxy.remote.messages";	//$NON-NLS-1$
-	public final static String 
-		ERROR_NO_OUTPUT_FOLDER = "NO_OUTPUT_FOLDER_EXC_", //$NON-NLS-1$
-		
-		VM_TERMINATED = "VM_TERMINATED_INFO_", //$NON-NLS-1$
-		VM_TERMINATED_LINE1 = "VM_TERMINATED_LINE1", //$NON-NLS-1$
-		VM_TERMINATED_LINE2 = "VM_TERMINATED_LINE2",		 //$NON-NLS-1$
-		VM_TERMINATED_LINE3 = "VM_TERMINATED_LINE3", //$NON-NLS-1$
-		
-		REMOTE_VM_TRACE_HEADER = "REMOTE_VM_TRACE_INFO_", //$NON-NLS-1$
-		REMOVE_VM_LOCAL_TRACE_HEADER = "REMOTE_VM_LOCAL_TRACE_INFO_"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private ProxyRemoteMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java
deleted file mode 100644
index 47ce3ff..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java
+++ /dev/null
@@ -1,60 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: ProxyRemoteUtil.java,v $
- *  $Revision: 1.10 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionController;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-
-public class ProxyRemoteUtil {
-
-	// Debug options
-	public static final String DEBUG_VM = "/remote/debug/debugvm", // Bring up debugger on remote vm's. //$NON-NLS-1$
-		IO_CONSOLE = "/remote/debug/ioconsole", // IO Through console (system in and out) for asking questions. //$NON-NLS-1$
-		DEBUG_VM_TRACEOUT = "/remote/debug/vmtraceout", // Trace the output from the remote vm's. //$NON-NLS-1$
-		NO_TIMEOUTS = "/remote/debug/notimeouts";	// No socket timeouts when talking to remote vm. Turn this on when doing callback testing. Not needed otherwise. //$NON-NLS-1$
-	
-	private static REMRegistryController pluginRegistryController;
-	
-	/**
-	 * Return the registry controller.
-	 */
-	public synchronized static REMRegistryController getRegistryController() {
-		return pluginRegistryController != null ? pluginRegistryController : (pluginRegistryController = new REMRegistryController());
-	}
-	
-	/**
-	 * Method to update any class paths with any
-	 * paths that need to be added to a VM. In this case, it is
-	 * the remotevm.jar and the remotecommon.jar that need to be added. The first jar contains
-	 * the code necessary to run the remote vm and listen for commands. The second jar contains
-	 * the common code that is required to be shared on both the IDE side and remote side. It
-	 * is the interface code so that they both talk the same language.
-	 * support.
-	 */
-	public static void updateClassPaths(IConfigurationContributionController controller) {
-		Bundle proxyBundle = ProxyPlugin.getPlugin().getBundle();
-		// Need to have our jars at the beginning. (Struts causes a problem because 
-		// they have a jar (commons-fileupload.jar) that if when searching for a class and
-		// this jar is reached, it causes the class loader to barf. Our jars used to be at
-		// the end, and so it found the fileupload jar first and no remote vm could be started
-		// because of this.
-		controller.contributeClasspath(proxyBundle, "remotecommon.jar", IConfigurationContributionController.PREPEND_USER_CLASSPATH, false); //$NON-NLS-1$
-		controller.contributeClasspath(proxyBundle, "vm/remotevm.jar", IConfigurationContributionController.PREPEND_USER_CLASSPATH, false); //$NON-NLS-1$		
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java
deleted file mode 100644
index 3469485..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java
+++ /dev/null
@@ -1,134 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMAbstractBeanProxy.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-/**
- * An abstract base class of IREMBeanProxy that doesn't
- * have the bean type stored in it. The subclasses will
- * supply it. It does however have an ID because it does
- * exist over on the remote VM.
- */
-public abstract class REMAbstractBeanProxy implements IREMBeanProxy {
-	protected final REMProxyFactoryRegistry fFactory;
-	private Integer fID;
-	
-	/**
-	 * Set the bean we are proxying.  We are a proxy for a bean running on the remote VM. 
-	 */
-	protected REMAbstractBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID){
-		fFactory = aRegistry;
-		fID = anID;
-	}
-	
-	/**
-	 * equals: Equal if:
-	 *         1) This proxy == (identity) to the other object
-	 *         2) Else if other is an IBeanProxy and not a constant one, then if
-	 *            equals on the server.
-	 *         3) If this is a constant proxy and the other is too or is a constant
-	 *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
-	 */
-	public boolean equals(Object anObject) {
-		if (super.equals(anObject))
-			return true;	// Identity
-		if (anObject instanceof IBeanProxy && !(anObject instanceof IREMConstantBeanProxy) && fFactory.isValid() && ((IBeanProxy) anObject).getProxyFactoryRegistry() == fFactory)
-			try {
-				// The other is a bean proxy and is not a constant one, let the server do the check.
-				return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectEquals().invoke(this, (IBeanProxy) anObject)).booleanValue();
-			} catch (ThrowableProxy e) {
-			}
-		return false;
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return this == aBeanProxy;	// We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
-	}
-		
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fFactory;
-	}
-	
-	/**
-	 * Get ID. An internal method to be used only within the ProxyFactory family.
-	 */
-	public Integer getID() {
-		return fID;
-	}
-	
-	/**
-	 * isValid.
-	 */
-	public boolean isValid() {
-		return fID != null;
-	}
-	
-	/**
-	 * Proxy is about to be released, MUST mark it invalid.
-	 * This is required. Resources can also be cleaned up
-	 * if they are being held and need to be cleaned up.
-	 *
-	 * NOTE: This method will only be called when the proxy
-	 * is explicitly released. If it is simply garbage collected,
-	 * then this method will not be called. Simple garbage collection
-	 * means that no one is referencing this proxy. The proxy factory
-	 * will know what id this proxy was referencing and will release it
-	 * on the server at GC time.
-	 *
-	 * If there are resources
-	 * that absolutely must be released, then the finalize method
-	 * should be implemented to do the clean up. However, try not
-	 * to have this be the case. Finalize methods add overhead that is
-	 * usually better not to have. The better way is for any users
-	 * that get this kind of proxy object know to call release on
-	 * ProxyFactoryRegistry to release it before garbage collection.	 
-	 */
-	public void release() {
-		fID = null;
-	}
-			
-	/**
-	 * Return the toString of the actual bean on the remote side.
-	 */
-	public String toBeanString() {
-		IStringBeanProxy string = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectToString().invokeCatchThrowableExceptions(this);
-		return (string != null) ? string.stringValue() : null;
-	}
-	
-	/**
-	 * Render the bean proxy into the value field.
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.setObjectID(isValid() ? getID().intValue() : Commands.VOID);	// No longer exists, so send over null.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
deleted file mode 100644
index dd803ea..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
+++ /dev/null
@@ -1,698 +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
- *******************************************************************************/
-/*
- *  $RCSfile: REMAbstractBeanTypeProxy.java,v $
- *  $Revision: 1.12 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-
-/**
- * This implementation of IBeanTypeProxy is for where the Bean is on a different VM then the IDE
- * 
- * Creation date: (12/3/99 12:29:26 PM)
- * 
- * @author: Joe Winchester
- */
-public abstract class REMAbstractBeanTypeProxy implements IREMBeanTypeProxy {
-
-	private Integer fID;
-
-	protected final REMProxyFactoryRegistry fRegistry;
-
-	protected final String fClassname; // This is cached here so that we don't need to go over the line to get it.
-
-	private IBeanTypeProxy fSuperType; // This is cached so as not to have to go over the line for it.
-
-	/**
-	 * Create with a registry and a class. It is protected so that only subclasses and the factory with this REM package can call it.
-	 */
-	protected REMAbstractBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		fRegistry = aRegistry;
-		fID = anID;
-		fClassname = aClassname;
-		fSuperType = aSuperType;
-	}
-
-	/**
-	 * equals: Equal if: 1) This proxy == (identity) to the other object This is all that is needed for BeanTypes because we know these are classes,
-	 * there is only one per class, and Class equals is true only for identity.
-	 */
-	public boolean equals(Object anObject) {
-		return super.equals(anObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return this == aBeanProxy; // We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#getID()
-	 */
-	public Integer getID() {
-		return fID;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
-	 */
-	public boolean isValid() {
-		return fID != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#release()
-	 */
-	public void release() {
-		// Clear the id and supertype (supertype is cleared so that
-		// it won't hold onto it and will let the supertype be GC'd
-		// if necessary.
-
-		fID = null;
-		fSuperType = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		// Turn class names into array of BeanTypes.
-		IBeanTypeProxy[] argTypes = null;
-		if (argumentClassNames != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
-			argTypes = new IBeanTypeProxy[argumentClassNames.length];
-			for (int i = 0; i < argumentClassNames.length; i++) {
-				IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
-				if (type == null)
-					return null; // Couldn't find the type.
-			}
-		}
-
-		return getConstructorProxy(argTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassConstructor();
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : // Get Ctor has
-																																   // only one parm,
-																																   // the array of
-																																   // parm types.
-				null;
-
-		try {
-			return (IConstructorProxy) getCtorMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getConstructors() {
-
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassConstructors();
-
-		try {
-			IArrayBeanProxy ctors = (IArrayBeanProxy) getCtorMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = ctors.getSnapshot();
-			IConstructorProxy[] ctorproxies = new IConstructorProxy[proxies.length];
-			System.arraycopy(proxies, 0, ctorproxies, 0, proxies.length);
-			return ctorproxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		// Turn class names into array of BeanTypes.
-		IBeanTypeProxy[] argTypes = null;
-		if (argumentClassNames != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
-			argTypes = new IBeanTypeProxy[argumentClassNames.length];
-			for (int i = 0; i < argumentClassNames.length; i++) {
-				IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
-				if (type == null)
-					return null; // Couldn't find the type.
-			}
-		}
-
-		return getDeclaredConstructorProxy(argTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getDeclaredClassConstructor();
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : // Get Ctor has
-																																   // only one parm,
-																																   // the array of
-																																   // parm types.
-				null;
-
-		try {
-			return (IConstructorProxy) getCtorMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getDeclaredClassConstructors();
-
-		try {
-			IArrayBeanProxy ctors = (IArrayBeanProxy) getCtorMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = ctors.getSnapshot();
-			IConstructorProxy[] ctorproxies = new IConstructorProxy[proxies.length];
-			System.arraycopy(proxies, 0, ctorproxies, 0, proxies.length);
-			return ctorproxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getFields() {
-
-		IREMMethodProxy getFieldsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetFields();
-
-		try {
-			IArrayBeanProxy fields = (IArrayBeanProxy) getFieldsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = fields.getSnapshot();
-			IFieldProxy[] fieldProxies = new IFieldProxy[proxies.length];
-			System.arraycopy(proxies, 0, fieldProxies, 0, proxies.length);
-			return fieldProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-
-		IREMMethodProxy getDeclaredFieldsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetDeclaredFields();
-
-		try {
-			IArrayBeanProxy fields = (IArrayBeanProxy) getDeclaredFieldsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = fields.getSnapshot();
-			IFieldProxy[] fieldProxies = new IFieldProxy[proxies.length];
-			System.arraycopy(proxies, 0, fieldProxies, 0, proxies.length);
-			return fieldProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getDeclaredFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getDeclaredFieldProxy(String fieldName) {
-		return (IFieldProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetDeclaredField().invokeCatchThrowableExceptions(this,
-				fRegistry.getBeanProxyFactory().createBeanProxyWith(fieldName));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getFieldProxy(String fieldName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getFieldProxy(this,fieldName);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-		REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-		return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getFieldProxy(expression, this, fieldName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getMethods() {
-
-		IREMMethodProxy getMethodsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassMethods();
-
-		try {
-			IArrayBeanProxy methods = (IArrayBeanProxy) getMethodsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = methods.getSnapshot();
-			IMethodProxy[] methodProxies = new IMethodProxy[proxies.length];
-			System.arraycopy(proxies, 0, methodProxies, 0, proxies.length);
-			return methodProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-
-		IREMMethodProxy getDeclaredMethodsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassDeclaredMethods();
-
-		try {
-			IArrayBeanProxy methods = (IArrayBeanProxy) getDeclaredMethodsMethod.invokeWithParms(this, null);
-			IBeanProxy[] proxies = methods.getSnapshot();
-			IMethodProxy[] methodProxies = new IMethodProxy[proxies.length];
-			System.arraycopy(proxies, 0, methodProxies, 0, proxies.length);
-			return methodProxies;
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,(String[])null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,argumentClassNames);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
-		REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-		return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-		REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-		return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,new String[] {argumentQualifiedTypeName});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,argumentTypes);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-
-		// Turn class names into array of BeanTypes.
-		IBeanTypeProxy[] argTypes = null;
-		if (argumentClassNames != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
-			argTypes = new IBeanTypeProxy[argumentClassNames.length];
-			for (int i = 0; i < argumentClassNames.length; i++) {
-				IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
-				if (type == null)
-					return null; // Couldn't find the type.
-			}
-		}
-
-		return getDeclaredMethodProxy(methodName, argTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		IREMMethodProxy getDeclaredMethodMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassDeclaredMethod();
-		IBeanProxy nameProxy = fRegistry.getBeanProxyFactory().createBeanProxyWith(methodName);
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { nameProxy, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {nameProxy, null};
-
-		try {
-			return (IMethodProxy) getDeclaredMethodMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			fRegistry.releaseProxy(e);
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,(String[])null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,argumentClassNames);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName, String argumentQualifiedTypeName) {
-		return getInvokable(methodName, new String[] { argumentQualifiedTypeName});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,argumentTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
-	 */
-	public IConstructorProxy getNullConstructorProxy() {
-		return getConstructorProxy((IBeanTypeProxy[]) null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getProxyFactoryRegistry()
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fRegistry;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy() {
-		return fSuperType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
-	 */
-	public String getTypeName() {
-		return fClassname;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
-	 */
-	public boolean isArray() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
-	 */
-	public boolean isInterface() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
-	 */
-	public boolean isPrimitive() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
-	 */
-	public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
-		return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassIsAssignableFrom().invokeCatchThrowableExceptions(
-				aBeanProxyType, this)).booleanValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
-	 */
-	public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-		try {
-			return ((REMStandardBeanProxyFactory) fRegistry.getBeanProxyFactory()).createBeanProxy(this, initializationString);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString() + "(" + getTypeName() + ")"; //$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).classClass;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
-	 */
-	public String toBeanString() {
-		return getTypeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy {
-		return ((REMStandardBeanProxyFactory) fRegistry.getBeanProxyFactory()).createBeanProxy(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#renderBean(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.setObjectID(getID().intValue());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		return getTypeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
-	 */
-	public String getInitializationError() {
-		return null; // By default none have an initialization error. There is a special instance for init errors.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException {
-		if (isInterface())
-			return null; // Interfaces don't have ctor's.
-
-		IREMMethodProxy findCompatibleMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getFindCompatibleConstructorMethod();
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { this, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {this, null};
-
-		try {
-			return (IConstructorProxy) findCompatibleMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			try {
-				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException")))
-					throw new NoSuchMethodException(e.getProxyLocalizedMessage());
-				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException")))
-					throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				return null;
-			} finally {
-				fRegistry.releaseProxy(e);
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException {
-
-		IREMMethodProxy findCompatibleMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getFindCompatibleMethodMethod();
-		IBeanProxy methodNameProxy = fRegistry.getBeanProxyFactory().createBeanProxyWith(methodName);
-
-		// Create the argument array
-		Object[] getParms = (argumentTypes != null) ? new Object[] { this, methodNameProxy, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {this, methodNameProxy, null};
-
-		try {
-			return (IMethodProxy) findCompatibleMethod.invokeWithParms(this, getParms);
-		} catch (ThrowableProxy e) {
-			try {
-				if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException")))
-					throw new NoSuchMethodException(e.getProxyLocalizedMessage());
-				else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException")))
-					throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				return null;
-			} finally {
-				fRegistry.releaseProxy(e);
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java
deleted file mode 100644
index 397d861..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMAbstractNumberBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Abstract class for any of the number bean type subclasses.
- * NOTE: This does not represent the beantype Number. It is a
- * class that provides functions for Number subclass beantypes.
- * The Number beantype itself is simply a REMBeanTypeProxy since
- * Number is abstract and has no necessary extra function.
- * Creation date: (08/31/00 11:49:12 AM)
- * @author: Administrator
- */
-public abstract class REMAbstractNumberBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
-protected REMAbstractNumberBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-	super(aRegistry, anID, aClassname, aSuperType);
-}
-/**
- * Helper to create a bean proxy
- * protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-protected abstract INumberBeanProxy createNumberBeanProxy(Number aNumber);
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the Number types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the Number types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Each beantype will return a default value (usually a value of 0).
- */
-public abstract IBeanProxy newInstance() throws ThrowableProxy;
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java
deleted file mode 100644
index 605f5bb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: REMAccessibleObjectProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy;
-import org.eclipse.jem.internal.proxy.core.ThrowableProxy;
- 
-/**
- * AccessibleObject Proxy.
- * 
- * @since 1.0.0
- */
-public class REMAccessibleObjectProxy extends REMAbstractBeanProxy implements IAccessibleObjectProxy {
-
-	protected REMAccessibleObjectProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#isAccessible()
-	 */
-	public boolean isAccessible() throws ThrowableProxy {
-		return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getAccessibleIsAccessible().invoke(this)).booleanValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#setAccessible(boolean)
-	 */
-	public void setAccessible(boolean flag) throws ThrowableProxy {
-		REMStandardBeanProxyConstants.getConstants(fFactory).getAccessibleSetAccessible().invoke(this, fFactory.getBeanProxyFactory().createBeanProxyWith(flag));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).accessibleType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java
deleted file mode 100644
index cebdd4a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMAnAbstractBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This is a proxy for an abstract bean type. I.e. you can't create a new instance of it.
- * It can be used as a general abstract type. It will pass newBeanTypeForClass unto
- * the main super type passed in.
- */
- 
-public class REMAnAbstractBeanTypeProxy extends REMAbstractBeanTypeProxy {
-
-	protected IREMSpecialBeanTypeProxy fMainSuperType;	// The type that this was created from so that
-							// any non-abstract subclasses can create the correct
-							// type of beantype proxy.
-					
-	public REMAnAbstractBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType, IREMSpecialBeanTypeProxy aType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-		fMainSuperType = aType;
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 *
-	 * For all of the abstract types, this is an invalid operation. 
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		throw new UnsupportedOperationException();
-	}	
-	
-	/**
-	 * Note: Since new instances of abstract classes can never be done,
-	 * this function is not supported.
-	 */
-	public IBeanProxy newInstance() { 
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return fMainSuperType.newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-	
-	/**
-	 * release - BeanType is about to be released.
-	 * Clear the fMainSupertype (supertype is cleared so that
-	 * it won't hold onto it and will let the supertype be GC'd
-	 * if necessary.
-	 */
-	public void release() {
-		fMainSuperType = null;
-		super.release();
-	}					
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java
deleted file mode 100644
index 2d5cc55..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java
+++ /dev/null
@@ -1,253 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMArrayBeanProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.lang.reflect.Array;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.CommandErrorException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE VM version of the Array proxy
- */
-
-public final class REMArrayBeanProxy extends REMBeanProxy implements IArrayBeanProxy {
-	private int fLength = -1;
-	
-	REMArrayBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {
-		super(aRegistry, anID, aType);
-	}
-
-
-	/**
-	 * Get the object at the specified index.
-	 */
-	public IBeanProxy get(int index) throws ThrowableProxy {
-		// Format of getter parms is: (Object (array), int (index)).
-		Object[] parms = new Object[] {this, new Integer(index)};
-		// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-		// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-		IBeanTypeProxy compType = ((IArrayBeanTypeProxy) getTypeProxy()).getComponentType();
-		if (!compType.isPrimitive()) {
-			// Use standard getter.
-			return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGet()).invokeWithParms(null, parms);
-		} else {
-			// Use the correct primitive getter.
-			int id = ((IREMBeanProxy) compType).getID().intValue();
-			switch (id) {
-				case Commands.BYTE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetByte()).invokeWithParms(null, parms);
-				case Commands.BOOLEAN_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetBoolean()).invokeWithParms(null, parms);
-				case Commands.CHARACTER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetChar()).invokeWithParms(null, parms);
-				case Commands.DOUBLE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetDouble()).invokeWithParms(null, parms);
-				case Commands.FLOAT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetFloat()).invokeWithParms(null, parms);
-				case Commands.INTEGER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetInt()).invokeWithParms(null, parms);
-				case Commands.LONG_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetLong()).invokeWithParms(null, parms);
-				case Commands.SHORT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetShort()).invokeWithParms(null, parms);
-			}
-		}
-		
-		return null;
-	}
-
-	/**
-	 * Get the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	public IBeanProxy get(int [] indexes) throws ThrowableProxy {
-		// Format of getter parms is: (Object (array), int[] (indexes)).
-		Object[] parms = new Object[] {this, indexes};
-		// If the component type at the specified dimension is primitive, we need to use the correct getter so that a valid value is returned,
-		// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-		int dims = ((IArrayBeanTypeProxy) getTypeProxy()).getDimensions();
-		if (dims < indexes.length)
-			throw new IllegalArgumentException();	// Too many dimensions
-		IBeanTypeProxy finalCompType = ((IArrayBeanTypeProxy) getTypeProxy()).getFinalComponentType();			
-		if (dims == indexes.length && finalCompType.isPrimitive()) {
-			// Use the correct primitive getter because we are accessing the final component and it is primitive.
-			int id = ((IREMBeanProxy) finalCompType).getID().intValue();
-			switch (id) {
-				case Commands.BYTE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetByte()).invokeWithParms(null, parms);
-				case Commands.BOOLEAN_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetBoolean()).invokeWithParms(null, parms);
-				case Commands.CHARACTER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetChar()).invokeWithParms(null, parms);
-				case Commands.DOUBLE_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetDouble()).invokeWithParms(null, parms);
-				case Commands.FLOAT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetFloat()).invokeWithParms(null, parms);
-				case Commands.INTEGER_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetInt()).invokeWithParms(null, parms);
-				case Commands.LONG_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetLong()).invokeWithParms(null, parms);
-				case Commands.SHORT_TYPE:
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetShort()).invokeWithParms(null, parms);
-			}
-		} else {
-			// It is not the final component, or it is not primitive, use the standard accessor.
-			return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGet()).invokeWithParms(null, parms);
-		}
-		
-		return null;
-	}
-	
-	/**
-	 * Set the object at the specified index.
-	 */
-	public void set(IBeanProxy value, int index) throws ThrowableProxy {
-		// Format of setter parms is: (Object (array), int (index), Object (value)).
-		Object[] parms = new Object[] {this, new Integer(index), value};
-		((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArraySet()).invokeWithParms(null, parms);
-	}
-		
-	/**
-	 * Set the object at the specified multi-dimensional index.
-	 * The array must be at least the number of dimensions specified,
-	 * and each index along the way must exist.
-	 * The number of dimensions can't be greater than the number
-	 * of dimensions of the real object.
-	 */
-	public void set(IBeanProxy value, int [] indexes) throws ThrowableProxy {
-		// Format of setter parms is: (Object (array), int[] (indexes), Object (value)).
-		Object[] parms = new Object[] {this, indexes, value};
-		((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperSet()).invokeWithParms(null, parms);
-	}
-	
-	/**
-	 * Get the length of the first dimension of this array.
-	 * If there are multi-dimensions, you must get the appropriate
-	 * dimension from the get method to see the size of that dimension.
-	 *
-	 * e.g.
-	 *    int [3] returns 3
-	 *    int [3][2] returns 3
-	 *
-	 *    ((IArrayBeanProxy) get(1)).getLength() returns 2
-	 *    Since arrays do not have to be homogenous, there could
-	 *    be a different length array for each of the arrays 
-	 *    returned from the first dimension, the returned length
-	 *    from get(2) and get(3) could result in a different value
-	 *    from get(1).
-	 */
-	public int getLength() {
-		if (fLength == -1) {
-			// It hasn't yet been quiered.
-			fLength = ((IIntegerBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetLength().invokeCatchThrowableExceptions(null, this)).intValue();
-		}
-		return fLength;
-	}	
-	
-	public IBeanProxy getCatchThrowableException(int index){
-		try {
-			return get(index);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));		 //$NON-NLS-1$
-			fFactory.releaseProxy(e);	// Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}		
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IArrayBeanProxy#getSnapshot()
-	 */
-	public IBeanProxy[] getSnapshot() throws ThrowableProxy {
-		IREMConnection connect = fFactory.getFreeConnection();
-		REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory();
-		proxyFactory.startTransaction(); // This is definately a transaction, so start it.
-		try {
-			Commands.ValueObject returnValue = new Commands.ValueObject();
-			try {
-				try {
-					connect.getArrayContents(getID().intValue(), returnValue);
-					return processReturnValue(connect, returnValue);
-				} catch (CommandErrorException e) {
-					proxyFactory.processErrorReturn(e);
-				}
-			} catch (CommandException e) {
-				if (!e.isRecoverable()) {
-					// Close the connection and try again.
-					fFactory.closeConnection(connect);
-					connect = null;
-					connect = fFactory.getFreeConnection();
-					try {
-						connect.getArrayContents(getID().intValue(), returnValue);
-						return processReturnValue(connect, returnValue);
-					} catch (CommandException eAgain) {
-						// Failed again. Just close and print trace.
-						fFactory.closeConnection(connect);
-						connect = null;
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-						return null;
-					}
-				} else {
-					// A recoverable error, print trace and return
-					ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-					return null;
-				}
-			}
-		} finally {
-			proxyFactory.stopTransaction();
-			if (connect != null)
-				fFactory.returnConnection(connect);
-		}
-		return null;
-	}
-
-
-	/*
-	 * @param returnValue
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	private IBeanProxy[] processReturnValue(IREMConnection connection, ValueObject returnValue) throws CommandException, ThrowableProxy {
-		// It is an array containing IDs, as it normally would be.
-		// However it will become IBeanProxy[]. That is because if ID's
-		// they must be proxies over here.
-		BeanProxyValueSender valueSender = new BeanProxyValueSender((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory(), returnValue);
-		connection.readProxyArrayValues(returnValue, valueSender, false);
-		Exception e = valueSender.getException();
-		if (e != null) {
-			if (e instanceof ThrowableProxy)
-				throw (ThrowableProxy) e;
-			else
-				throw (CommandException) e;
-		}
-		Object vals = valueSender.getArray();
-		IBeanProxy[] proxyArray = new IBeanProxy[Array.getLength(vals)];
-		System.arraycopy(vals, 0, proxyArray, 0, proxyArray.length);
-		return proxyArray;
-	}
-	
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java
deleted file mode 100644
index b58f40e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,340 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMArrayBeanTypeProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Array Type Proxy for the IDE VM.
- *
- * The class is final because array's are special and shouldn't have
- * any subclasses since the factory would never call it.
- */
-
-public final class REMArrayBeanTypeProxy extends REMAbstractBeanTypeProxy implements IArrayBeanTypeProxy {
-	
-	/**
-	 * Create with a registry and a class. It is package so that only 
-	 * the factory with this IDE package can call it.
-	 */
-	protected REMArrayBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy objectType) {
-		super(aRegistry, anID, aClassname, objectType);
-	}
-	/**
-	 * This is an array type!
-	 */
-	public boolean isArray() {
-		return true;
-	}
-	/**
-	 * Return the final component type.
-	 */
-	public IBeanTypeProxy getFinalComponentType() {
-		// Component type is strip off all '[' and return class name (if we ever add classLoader support, this won't work).
-		// However, if the type is a primitive we need to go through the change table).
-		int typeStart = getTypeName().lastIndexOf('[')+1;
-		if (getTypeName().charAt(typeStart) == 'L') {
-			// It is a class.
-			// Strip off up to the 'L', and the trailing ';'. That is the class name.
-			return fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(typeStart+1, getTypeName().length()-1));
-		} else {
-			// It is a type. Need to map it.
-			Class aType = (Class) MapTypes.MAP_SHORTSIG_TO_TYPE.get(getTypeName().substring(typeStart, typeStart+1));
-			return aType != null ? fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(aType.getName()) : null;
-		}
-	}
-	
-	/**
-	 * Return the component type.
-	 */
-	public IBeanTypeProxy getComponentType() {
-		// Component type is strip off first '[' and return class name (if we ever add classLoader support, this won't work).
-		// However, if the type is a primitive we need to go through the change table).
-		if (getTypeName().charAt(1) != '[') {
-			// It is a one dimensional array, just send to getFinalComponentType to figure out the type.
-			return getFinalComponentType();
-		} else {
-			// It is a multi-dimensional array. Just strip off one '[' and send that to the bean type factory.
-			return fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(1));
-		}
-	}
-	/**
-	 * Return the number of dimensions.
-	 */
-	public int getDimensions() {
-		return getTypeName().lastIndexOf('[')+1;
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified object
-	 * Use the constructor that allows the type proxy to be set as well as the bean
-	 * because we are the type and by setting it now we might avoid it being lookup for in the
-	 * factory the first time it is asked for.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		return new REMArrayBeanProxy(fRegistry, anID, this);
-	}
-	
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * Arrays can't be subclassed.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the null ctor proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */		
-	public IConstructorProxy getNullConstructorProxy() {	
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getConstructors() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}	
-	
-	/**
-	 * Return a proxy to the field for the target VM being the same as the REM
-	 * For all of the array types, this is an invalid operation.	 
-	 */	
-	public IFieldProxy getFieldProxy(String fieldName) {	
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getFields() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy[] getMethods() {
-		throw new UnsupportedOperationException();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-		throw new UnsupportedOperationException();
-	}
-
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}	
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */	
-	public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the array types, this is an invalid operation.	 
-	 */		
-	public IMethodProxy getMethodProxy(String methodName) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Create an array bean proxy.
-	 *
-	 *   - (int, new int[2] {3, 4}) will create:
-	 *      int [3] [4]
-	 *
-	 *   - (int[], new int[1] {1})
-	 *      int [1]
-	 *
-	 *   - (int[], new int[2] {2,3})
-	 *      int [2] [3]
-	 * 
-	 *
-	 *   - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
-	 *      int [0]
-	 *     (int[][], null) or (int[][], new int[0])
-	 *      int[0][]
-	 *     This is because an array instance with no dimensions specified is not valid. 
-	 *
-	 *   - (int[][], new int[1] {3})
-	 *      int[3][]
-	 *
-	 * It is package protected so that only the REM Factory can call it.
-	 */
-	REMArrayBeanProxy  createBeanProxyWith(int[] dimensions) throws ThrowableProxy {
-		// If the dimensions is null or zero length, then create the
-		// array as a 0 sized array one dimensional array.
-		if (dimensions == null || dimensions.length == 0)
-			return createBeanProxyWith(new int[] {0});
-			
-		// Remove from this type the number of dimensions specified
-		// coming in, up to but no further than the final component.
-		// From here we can then use the appropriate java.lang.reflect.Array
-		// method to create the array.
-		IBeanTypeProxy compType = null;	// The type of array to create (it may be different number of dimensions).
-		int numDims = getDimensions();
-		if (numDims <= dimensions.length)
-			compType = getFinalComponentType();	// There are the same or more requested dimensions, so use final component type
-		else {
-			// There are fewer requested dimensions, so strip off that many
-			String compClass = getTypeName().substring(dimensions.length);
-			compType = fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(compClass);
-		}
-		
-		if (dimensions.length == 1) {
-			// Use the one dimension call
-			Object[] parms = new Object[] {compType, new Integer(dimensions[0])};
-			return (REMArrayBeanProxy) ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getArrayNewInstanceOneDimension()).invokeWithParms(null, parms);
-		} else {
-			// Use the multi dimension call
-			Object[] parms = new Object[] {compType, dimensions};
-			return (REMArrayBeanProxy) ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getArrayNewInstanceMultiDimension()).invokeWithParms(null, parms);
-		}
-	}
-		
-	/**
-	 * @see IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		String name = getTypeName();
-		int dims = name.lastIndexOf('[') + 1;
-		String type = getFinalComponentType().getTypeName();
-		StringBuffer formalType = new StringBuffer(type.length()+("[]".length()*dims)); //$NON-NLS-1$
-		formalType.append(type);
-		for (int i=0; i<dims; i++)
-			formalType.append("[]"); //$NON-NLS-1$
-		return formalType.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java
deleted file mode 100644
index 67fa54a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Standard implementation of IREMBeanProxy
- */
-
-public class REMBeanProxy extends REMAbstractBeanProxy {
-	private IBeanTypeProxy fType;
-
-	protected REMBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType){
-		super(aRegistry, anID);
-		fType = aType;
-	}
-	
-	public IBeanTypeProxy getTypeProxy() {
-		return fType;
-	}
-	
-	public void release() {
-		fType = null;
-		super.release();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java
deleted file mode 100644
index e3bf644..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Default implementation for a BeanTypeProxy. This is what is used
- * for regular default beans and beantypes when no special beans or bean types are needed.
- */
-public class REMBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-
-	/**
-	 * Create with a registry and a class. It is protected so that only subclasses
-	 * and the factory with this REM package can call it.
-	 */
-	public REMBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-	}
-
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-
-	/**
-	 * The special method to handle subclassing from an abstract).
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
-		if (!anAbstract) 
-			return new REMBeanTypeProxy(fRegistry, anID, aClassname, superType);
-		else
-			return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID){
-	
-		return new REMBeanProxy(fRegistry, anID, this);
-	
-	}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java
deleted file mode 100644
index bc48025..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBigDecimalBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.math.BigDecimal;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for BigDecimals.
- */
-class REMBigDecimalBeanProxy extends REMNumberBeanProxy {
-
-REMBigDecimalBeanProxy(REMProxyFactoryRegistry aRegistry, BigDecimal aBigDecimal) {
-	super(aRegistry, aBigDecimal);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).bigDecimalClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(numberValue(), ((IREMBeanTypeProxy) getTypeProxy()).getID().intValue());
-}	
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java
deleted file mode 100644
index a101cc1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBigDecimalBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigDecimal;
-/**
- * Remote Implementation of IBeanTypeProxy for BigDecimal.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMBigDecimalBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final static BigDecimal zeroValue = new BigDecimal(0D);
-
-REMBigDecimalBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.BIG_DECIMAL_CLASS), BigDecimal.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMBigDecimalBeanProxy(aRegistry, zeroValue);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigDecimalBeanProxy(BigDecimal aBigDecimal) {
-	return (!zeroValue.equals(aBigDecimal)) ?
-		new REMBigDecimalBeanProxy(fRegistry, aBigDecimal) : zeroProxy;
-}
-
-/**
- * Generic way to create an BigDecimal proxy, however, the Number must be a BigDecimal.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createBigDecimalBeanProxy((BigDecimal) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBigDecimalBeanProxy((BigDecimal) value.anObject);
-}	
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java
deleted file mode 100644
index 59f881e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBigIntegerBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigInteger;
-/**
- * Remote Proxy for BigIntegers.
- */
-class REMBigIntegerBeanProxy extends REMNumberBeanProxy {
-
-REMBigIntegerBeanProxy(REMProxyFactoryRegistry aRegistry, BigInteger aBigInteger) {
-	super(aRegistry, aBigInteger);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).bigIntegerClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(numberValue(), ((IREMBeanTypeProxy) getTypeProxy()).getID().intValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java
deleted file mode 100644
index 935501a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBigIntegerBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigInteger;
-/**
- * Remote Implementation of IBeanTypeProxy for BigInteger.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMBigIntegerBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final static BigInteger zeroValue = new BigInteger("0"); //$NON-NLS-1$
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMBigIntegerBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.BIG_INTEGER_CLASS), BigInteger.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMBigIntegerBeanProxy(aRegistry, zeroValue);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigIntegerBeanProxy(BigInteger aBigInteger) {
-	return (!zeroValue.equals(aBigInteger)) ?
-		new REMBigIntegerBeanProxy(fRegistry, aBigInteger) : zeroProxy;
-}
-
-/**
- * Generic way to create an BigInteger proxy, however, the Number must be a BigInteger.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createBigIntegerBeanProxy((BigInteger) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBigIntegerBeanProxy((BigInteger) value.anObject);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java
deleted file mode 100644
index 33eb87c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBooleanClassBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBooleanBeanProxy for Boolean.class.
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-final class REMBooleanClassBeanProxy extends REMConstantBeanProxy implements IBooleanBeanProxy {
-	private final Boolean fBooleanValue;
-
-/**
- * Store the boolean value so that we can return the booleanValue faster
- * without the need for going across the line. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-REMBooleanClassBeanProxy(REMProxyFactoryRegistry aRegistry, Boolean value) {
-	super(aRegistry);
-	fBooleanValue = value;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMBooleanClassBeanProxy)
-		return fBooleanValue.booleanValue() == ((REMBooleanClassBeanProxy) anObject).booleanValue();
-	if (anObject instanceof Boolean)
-		return fBooleanValue.booleanValue() == ((Boolean) anObject).booleanValue();
-	return false;
-}
-
-/**
- * Return the boolean value
- */
-public boolean booleanValue() {
-	return fBooleanValue.booleanValue();
-}
-/**
- * Return the java.lang.Boolean value
- */
-public Boolean getBooleanValue() {
-	return fBooleanValue;
-}
-
-/**
- * Return the toString of the bean itself.
- */
-public String toBeanString() {
-	return fBooleanValue.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).booleanClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fBooleanValue);
-}
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java
deleted file mode 100644
index c3a513c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBooleanClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Boolean BeanType Proxy for Boolean.class. 
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMBooleanClassBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
-	// Cache these instances. Since the BeanType proxies are cached also, only one instance
-	// of true/false will be in system.
-	protected final IBooleanBeanProxy trueProxy;
-	protected final IBooleanBeanProxy falseProxy;
-/**
- * REMBooleanBeanTypeProxy constructor comment.
- */
-protected REMBooleanClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
-	super(aRegistry, new Integer(Commands.BOOLEAN_CLASS), Boolean.class.getName(), objectType);
-	
-	trueProxy = new REMBooleanClassBeanProxy( fRegistry, Boolean.TRUE);
-	falseProxy = new REMBooleanClassBeanProxy( fRegistry, Boolean.FALSE);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-IBooleanBeanProxy createBooleanBeanProxy(Boolean aBoolean) {
-	return aBoolean.booleanValue() ? trueProxy : falseProxy;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Boolean doesn't have a default ctor, so the standard way won't work.
- * Return the falseProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return falseProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBooleanBeanProxy(value.aBool ? Boolean.TRUE : Boolean.FALSE);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java
deleted file mode 100644
index f12f499..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBooleanTypeBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of IBooleanBeanProxy for Boolean.TYPE.
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-final class REMBooleanTypeBeanProxy extends REMConstantBeanProxy implements IBooleanBeanProxy {
-	private final boolean fBoolean;
-
-/**
- * Store the boolean value so that we can return the booleanValue faster
- * without the need for going across the line. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-REMBooleanTypeBeanProxy(REMProxyFactoryRegistry aRegistry, boolean value) {
-	super(aRegistry);
-	fBoolean = value;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMBooleanTypeBeanProxy)
-		return fBoolean == ((REMBooleanTypeBeanProxy) anObject).booleanValue();
-	if (anObject instanceof Boolean)
-		return fBoolean == ((Boolean) anObject).booleanValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMBooleanTypeBeanProxy)
-		return fBoolean == ((REMBooleanTypeBeanProxy) aBeanProxy).booleanValue();
-	return false;
-}
-
-/**
- * Return the boolean value
- */
-public boolean booleanValue() {
-	return fBoolean;
-}
-/**
- * Return the java.lang.Boolean value
- */
-public Boolean getBooleanValue() {
-	return fBoolean ? Boolean.TRUE : Boolean.FALSE;
-}
-
-/**
- * Return the toString of the bean itself.
- */
-public String toBeanString() {
-	return fBoolean ? Boolean.TRUE.toString() : Boolean.FALSE.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).booleanType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fBoolean);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java
deleted file mode 100644
index f7ae771..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMBooleanTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Boolean BeanType Proxy for Boolean.TYPE
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMBooleanTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-
-	// Cache these instances. Since the BeanType proxies are cached also, only one instance
-	// of true/false will be in system.
-	protected final IBooleanBeanProxy trueProxy;
-	protected final IBooleanBeanProxy falseProxy;
-/**
- * REMBooleanBeanTypeProxy constructor comment.
- */
-protected REMBooleanTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.BOOLEAN_TYPE), Boolean.TYPE.getName());
-	
-	trueProxy = new REMBooleanTypeBeanProxy( fRegistry, true);
-	falseProxy = new REMBooleanTypeBeanProxy( fRegistry, false);	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-IBooleanBeanProxy createBooleanBeanProxy(boolean aBoolean) {
-	return aBoolean ? trueProxy : falseProxy;
-}
-
-
-/**
- * newInstance method. boolean is a primitive, so the standard way won't work.
- * Return the falseProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return falseProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createBooleanBeanProxy(value.aBool);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java
deleted file mode 100644
index 9a6e1cb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMByteClassBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Remote Proxy for Byte.class.
- */
-class REMByteClassBeanProxy extends REMNumberBeanProxy {
-
-REMByteClassBeanProxy(REMProxyFactoryRegistry aRegistry, Byte aByte) {
-	super(aRegistry, aByte);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).byteClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Byte) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java
deleted file mode 100644
index 12d770d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMByteClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Byte.class. 
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMByteClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMByteClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.BYTE_CLASS), Byte.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)0));	
-	oneProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)1));
-	twoProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)2));
-	threeProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)3));		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createByteBeanProxy(Byte aByte) {
-	switch(aByte.byteValue()) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMByteClassBeanProxy(fRegistry, aByte);
-	}
-}
-
-/**
- * Generic way to create an Integer proxy, however, the Number must be an Integer.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createByteBeanProxy((Byte) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createByteBeanProxy(new Byte(value.aByte));
-}	
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java
deleted file mode 100644
index 3bf96ab..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMByteTypeBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for Byte.TYPE.
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMByteTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final byte fByte;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMByteTypeBeanProxy(REMProxyFactoryRegistry aRegistry, byte aByte) {
-	super(aRegistry);
-	fByte = aByte;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMByteTypeBeanProxy)
-		return fByte == ((REMByteTypeBeanProxy) anObject).byteValue();
-	if (anObject instanceof Byte)
-		return fByte == ((Byte) anObject).byteValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMByteTypeBeanProxy)
-		return fByte == ((REMByteTypeBeanProxy) aBeanProxy).byteValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return fByte;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fByte;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fByte;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fByte;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fByte;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Byte(fByte);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return fByte;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fByte);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).byteType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fByte);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java
deleted file mode 100644
index a89404d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMByteTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Byte.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMByteTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMByteTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.BYTE_TYPE), Byte.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMByteTypeBeanProxy(aRegistry, (byte)0);	
-	oneProxy = new REMByteTypeBeanProxy(aRegistry, (byte)1);
-	twoProxy = new REMByteTypeBeanProxy(aRegistry, (byte)2);
-	threeProxy = new REMByteTypeBeanProxy(aRegistry, (byte)3);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createByteBeanProxy(byte aByte) {
-	switch(aByte) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMByteTypeBeanProxy(fRegistry, aByte);
-	}
-}
-
-/**
- * newInstance method. byte is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}	
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createByteBeanProxy(value.aByte);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (byte) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of byte to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	byte aByte;
-	if (trim.startsWith("(byte)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(byte)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aByte = v.byteValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aByte = Byte.decode(trim).byteValue();	// See if valid byte format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aByte);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
deleted file mode 100644
index 9d46eaa..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
+++ /dev/null
@@ -1,146 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMCallbackInputStream.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-import java.io.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.IOCommandException;
-/**
- * This is the inputstream used to return a lot of data from
- * the server.
- */
-
-public class REMCallbackInputStream extends InputStream {
-	
-	protected DataInputStream fIn;
-	protected DataOutputStream fOut;
-	protected byte[] fBuffer;
-	protected int fNextByte = 0;
-	protected int fLastByte = 0;
-	
-	public REMCallbackInputStream(DataInputStream in, DataOutputStream out) {
-		fIn = in;
-		fOut = out;
-		
-		Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-		if (bufSize == null)
-			bufSize = new Integer(16000);		
-		fBuffer = new byte[bufSize.intValue()];
-	}
-	
-	protected void clearStream() {
-		fIn = null;
-		fOut = null;
-		fBuffer = null;
-	}
-	
-	protected void fillBuffer() throws IOException {
-		if (fIn == null)
-			throw new InterruptedIOException();
-		try {
-			if (fLastByte != -1) {
-				fLastByte = Commands.readBytes(fIn, fBuffer);
-				if (fLastByte != -1)
-					fNextByte = 0;
-				else {
-					fNextByte = -1;
-				}
-			}	
-		} catch (CommandException e) {
-			try {
-				close(false);
-			} catch (IOException e1) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e1));	// Error during close, just log it.
-			}
-			throw new IOCommandException(e);
-		}
-	}
-			
-	public int read() throws IOException {
-		if (fNextByte >= fLastByte) {
-			fillBuffer();
-		}
-		if (fLastByte == -1)
-			return -1;	// We've previously reached the end.		
-		
-		return fBuffer[fNextByte++] & 0xFF;	// So that it is in range 0 to 255.
-	}
-	
-	public int read(byte b[], int off, int len) throws IOException {
-		if (b == null) {
-			throw new NullPointerException();
-		} else if ((off < 0) || (off > b.length) || (len < 0) ||
-			((off + len) > b.length) || ((off + len) < 0)) {
-			throw new IndexOutOfBoundsException();
-		} else if (len == 0) {
-			return 0;
-		}
-		
-		int read = 0;
-		while (len > 0) {
-			if (fNextByte >= fLastByte)
-				fillBuffer();
-			if (fLastByte == -1)
-				return read != 0 ? read : -1;	// No more, return amount read, or if none read, then -1
-			int move = fLastByte - fNextByte;
-			if (move > len)
-				move = len;
-			System.arraycopy(fBuffer, fNextByte, b, off, move);
-			read += move;
-			fNextByte += move;
-			off += move;
-			len -= move;
-		}
-		
-		return read;
-	}
-			
-	public int available() throws IOException {
-		return fLastByte != -1 ? fLastByte - fNextByte : 0;
-	}
-	
-	public void close() throws IOException {
-		close(true);
-	}
-	
-	protected void close(boolean wait) throws IOException {
-		if (fOut == null)
-			return;	// Already closed.
-		try {
-			fOut.writeByte(Commands.CALLBACK_STREAM_TERMINATE);
-			fOut.flush();
-			fOut = null;	// So that we know we closed already if error occurs during in read() below.
-			if (wait) {
-				// Need to read until End of stream because we need to flush out the
-				// stream so that next time we use this connection we start fresh.
-				// If the server has already finished writing, we will read until then.
-				// If the server has not yet finished writing, when it reads the terminate
-				// request it will send an end of stream marker for us to read. But either
-				// way we can't leave until we've read everything from the stream.
-				
-				// If called with no wait, then we are closing hard and will be closing the socket too.
-				while (read() != -1) {
-				}
-			}
-		} finally {
-			clearStream();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java
deleted file mode 100644
index 487b3b2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java
+++ /dev/null
@@ -1,191 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMCallbackRegistry.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.net.Socket;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-/**
- * This registry will handle callbacks.
- * It is package protected because no one
- * should access it outside.
- */
-class REMCallbackRegistry implements ICallbackRegistry {
-	final REMProxyFactoryRegistry fFactory;
-	final String fNamePostfix;
-	List fThreads = Collections.synchronizedList(new LinkedList());	// List of active callback threads.	
-	
-	Map fIdToCallback = new HashMap(5);	// ID to Callback map.
-	Map fCallbackProxyToId = new HashMap(5);	// Callback to ID map. This will also hold onto the callback proxies so that they don't get GC'd while the callback is registered.
-		
-	IREMMethodProxy fInitializeCallback;
-	IREMBeanProxy fRemoteServer;
-	
-	boolean registryOpen = true;
-	
-	public REMCallbackRegistry(String name, REMProxyFactoryRegistry aFactory) {
-	
-		fFactory = aFactory;
-		fNamePostfix = name;
-		
-		// Now register common proxies.
-		REMStandardBeanTypeProxyFactory typeFactory = (REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory();
-		IREMBeanTypeProxy vmserverType = new REMInterfaceBeanTypeProxy(fFactory, new Integer(Commands.IVMSERVER_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.IVMServer"); //$NON-NLS-1$
-		IREMBeanTypeProxy callbackType = new REMInterfaceBeanTypeProxy(fFactory, new Integer(Commands.ICALLBACK_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.ICallback"); //$NON-NLS-1$
-		IREMBeanTypeProxy serverType = typeFactory.objectClass.newBeanTypeForClass(new Integer(Commands.REMOTEVMSERVER_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.RemoteVMServerThread", false); //$NON-NLS-1$
-	
-		fInitializeCallback = (IREMMethodProxy) ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).methodType.newBeanProxy(new Integer(Commands.INITIALIZECALLBACK_METHOD_ID));
-		
-		fRemoteServer = serverType.newBeanProxy(new Integer(Commands.REMOTESERVER_ID));
-
-		((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory()).registerProxy(vmserverType);
-		((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory()).registerProxy(callbackType);
-		((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory()).registerProxy(fInitializeCallback);
-		((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory()).registerProxy(fRemoteServer);		
-		
-	}
-	
-	
-	public boolean createCallback(Socket incoming) {
-		if (registryOpen) {
-			Thread st = new REMCallbackThread(incoming, this, "Callback Thread-"+fNamePostfix, fFactory, fFactory.fNoTimeouts); //$NON-NLS-1$
-			fThreads.add(st);
-			st.start();
-			return true;
-		} else
-			return false;
-	}
-	
-	/**
-	 * Use this to request a shutdown. If the server is already shutdown, this will return false.
-	 */
-	public boolean requestShutdown() {		
-		if (registryOpen)
-			shutdown();
-		else
-			return false;
-		return true;
-	}
-	
-	/**
-	 * Remove a thread from the list.
-	 */
-	public void removeCallbackThread(REMCallbackThread thread) {
-		fThreads.remove(thread);
-	}
-	
-	private void shutdown() {
-		
-		// Go through each thread and ask it to close. Make a copy of the list so that we
-		// won't get into deadlocks.
-		REMCallbackThread[] threadsArray = (REMCallbackThread[]) fThreads.toArray(new REMCallbackThread[fThreads.size()]);
-		for (int i=0; i<threadsArray.length; i++) {
-			// This is a harsh way to shut a connection down, but there's no
-			// other way I know of to interrupt the read on a socket.
-			threadsArray[i].close();
-		}
-			
-		// Now that they've been told to close, wait on each one to finish.
-		for (int i=0; i<threadsArray.length; i++)
-			try {
-				threadsArray[i].join(10000);	// Wait ten seconds, if longer, just go on to next one.
-			} catch (InterruptedException e) {
-			}
-			
-		fThreads.clear();
-		fIdToCallback.clear();
-		fCallbackProxyToId.clear();
-		fInitializeCallback = null;
-		fRemoteServer = null;
-			
-	}		
-	
-	public ICallback getRegisteredCallback(int id) {
-		synchronized(fIdToCallback)	{	
-			return (ICallback) fIdToCallback.get(new Integer(id));
-		}
-	}
-		
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IBeanProxy, org.eclipse.jem.internal.proxy.core.ICallback)
-	 */
-	public void registerCallback(IBeanProxy callbackProxy, ICallback cb) {
-		synchronized(fIdToCallback) {
-			fIdToCallback.put(((IREMBeanProxy) callbackProxy).getID(), cb);
-			fCallbackProxyToId.put(callbackProxy, ((IREMBeanProxy) callbackProxy).getID());
-			fInitializeCallback.invokeCatchThrowableExceptions(callbackProxy, new IBeanProxy[] {fRemoteServer, fFactory.getBeanProxyFactory().createBeanProxyWith(((IREMBeanProxy) callbackProxy).getID().intValue())});
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.ICallback, org.eclipse.jem.internal.proxy.core.IExpression)
-	 */
-	public void registerCallback(IProxy callbackProxy, final ICallback cb, IExpression expression) {
-		final Integer id;
-		if (callbackProxy.isBeanProxy()) {
-			id = ((IREMBeanProxy) callbackProxy).getID();
-			synchronized(fIdToCallback) {
-				fIdToCallback.put(id, cb);
-				fCallbackProxyToId.put(callbackProxy, id);
-			}
-		} else {
-			id = new Integer(callbackProxy.hashCode());
-			synchronized (fIdToCallback) {
-				fIdToCallback.put(id, cb);	// This is so that it is registered in case callback is invoked from remote vm during expression processing.
-			}
-			((ExpressionProxy) callbackProxy).addProxyListener(new ExpressionProxy.ProxyListener() {
-				public void proxyResolved(ProxyEvent event) {
-					synchronized(fIdToCallback) {
-						fCallbackProxyToId.put(event.getProxy(), id);
-					}
-				}
-				
-				public void proxyNotResolved(ProxyEvent event) {
-					// Failed, so remove registration completely.
-					synchronized (fIdToCallback) {
-						fIdToCallback.remove(id);
-					}
-				}
-				
-				public void proxyVoid(ProxyEvent event) {
-					// Failed, so remove registration completely.
-					synchronized (fIdToCallback) {
-						fIdToCallback.remove(id);
-					}
-				}
-				
-			});
-		}
-		expression.createSimpleMethodInvoke(fInitializeCallback, callbackProxy, new IProxy[] {fRemoteServer, fFactory.getBeanProxyFactory().createBeanProxyWith(id.intValue())}, false);
-	}
-	
-	/**
-	 * The public interface for deregistering callbacks.
-	 */
-	public void deregisterCallback(IBeanProxy callbackProxy) {
-		synchronized(fIdToCallback)	{
-			Integer id = (Integer) fCallbackProxyToId.remove(callbackProxy);
-			fIdToCallback.remove(id);
-		}
-	}
-	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java
deleted file mode 100644
index f37e4eb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java
+++ /dev/null
@@ -1,327 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMCallbackThread.java,v $
- *  $Revision: 1.14 $  $Date: 2005/05/16 19:11:23 $ 
- */
-
-import java.io.*;
-import java.net.Socket;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This thread handles the actual callback.
- * It is package protected because no one else should access it.
- */
-class REMCallbackThread extends Thread {
-	final REMConnection fConnection;	// A connection to use
-	final REMCallbackRegistry fServer;
-	final REMStandardBeanProxyFactory fFactory;
-	final REMStandardBeanTypeProxyFactory fTypeFactory;
-	final REMProxyFactoryRegistry registry;
-	protected boolean shuttingDown;
-	protected boolean inTransaction;	// Is this thread currently participating in a transaction, (i.e. reading/writing), if so then we can't use it for another transaction.
-	
-
-	/**
-	 * Is this callback thread currently participating in a transaction (reading/writing). If so then it can't be used for an
-	 * independent new transaction. In other words you can't write/read data using this callback thread's
-	 * connection because it is being used by someone else expecting to have exclusive read/write on this connection.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean inTransaction() {
-		return inTransaction;
-	}
-	
-	/**
-	 * Set whether this callback thread is in a transaction or not. If it is in a transaction it cannot be used
-	 * for an independent new transaction. In other words you can't write/read data using this callback thread's
-	 * connection because it is being used by someone else expecting to have exclusive read/write on this connection.
-	 * @param inTransaction
-	 * 
-	 * @since 1.1.0
-	 */
-	public void setIntransaction(boolean inTransaction) {
-		this.inTransaction = inTransaction;
-	}
-	
-	// Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
-	// wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
-	// in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
-	static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3");	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	
-	public REMCallbackThread(Socket socket, REMCallbackRegistry server, String name, REMProxyFactoryRegistry registry, boolean noTimeouts) {
-		super(name);
-		
-		fConnection = new REMConnection(socket, true);	// No timeouts since this is a server thread.
-		this.registry = registry;
-		fServer = server;
-		fFactory = (REMStandardBeanProxyFactory) registry.getBeanProxyFactory();
-		fTypeFactory = (REMStandardBeanTypeProxyFactory) registry.getBeanTypeProxyFactory();		
-	}
-	
-	/**
-	 * Request the thread to close down.
-	 */
-	public void close() {
-		try {
-			shuttingDown = true;	// So that if this is a forced close then it will know not to print error msgs.
-			if (fConnection.fSocket != null)
-				fConnection.fSocket.close();
-		} catch (Exception e) {
-		}
-	}
-	
-	
-	/*
-	 * Return the IREMConnection associated with this callback. Used by
-	 * the connection server to return this connection for any requests 
-	 * made on this thread.
-	 * <package-protected> so that only remote proxy can access.
-	 */
-	IREMConnection getConnection() {
-		return fConnection;
-	}
-	
-	public void run() {
-
-		DataInputStream in = fConnection.in;
-		DataOutputStream out = fConnection.out;	
-		InputStream ins = null;	
-		boolean shutdown = false;
-		Commands.ValueObject valueObject = new Commands.ValueObject();	// Working value object so not continually recreated.
-		BeanProxyValueSender valueSender = new BeanProxyValueSender(this.fFactory);	// Working valuesender so not continually recreated. 
-		try {
-			boolean doLoop = true;
-
-			/**
-			 * Note: In the cases below you will see a lot of finally clauses that null variables out.
-			 * This is because this is a long running loop, and variables declared within blocks are not
-			 * garbage collected until the method is terminated, so these variables once set would never
-			 * be GC'd. The nulling at the end of the case makes sure that any of those objects set are
-			 * now available for garbage collection when necessary.
-			 */		
-			while(doLoop) {
-				byte cmd = 0;
-				try {
-					if (LINUX_1_3)
-						fConnection.fSocket.setSoTimeout(1000);	// Linux 1.3 bug, see static LINUX_1_3 above
-					cmd = in.readByte();
-					if (LINUX_1_3)
-						fConnection.fSocket.setSoTimeout(0);	// Linux 1.3 bug, see static LINUX_1_3 above
-				} catch (InterruptedIOException e) {
-					continue;	// Timed out, try again
-				}
-					
-				switch (cmd) {
-					case Commands.QUIT_CONNECTION:				
-						doLoop = false;	
-						break;	// Close this connection
-						
-					case Commands.TERMINATE_SERVER:
-						doLoop = false;		
-						shutdown = true;	// Shutdown everything
-						break;
-						
-					case Commands.CALLBACK:
-						int callID = in.readInt();	// The id of the registered callback to call.
-						int msgID = in.readInt();	// The id of the message to call.
-						Object parm = null;
-						Object result = null;
-						ICallback cb = null;
-						try {
-							// The register callback handler will know how to handle the parm,
-							// it will know if it is an array of proxies, or an object of some kind.
-							fFactory.startTransaction();	// Start a transaction.
-							setIntransaction(true);	// Also tell ourselves that we are in a transaction.
-							boolean isProxies = true;							
-							try {
-								Commands.readValue(in, valueObject);
-								if (valueObject.type == Commands.ARRAY_IDS) {
-									// It is an array containing IDs, as it normally would be.
-									// However it will become IBeanProxy[]. That is because if ID's
-									// they must be proxies over here.
-									valueSender.initialize(valueObject);
-									Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-									if (valueSender.getException() != null) {
-										close();	// Something wrong, close the thread so next time we get a new one.
-									}
-									parm = valueSender.getArray();
-								} else {
-									// It is object or null. It could be an array of objects, or one object.
-									isProxies = false;
-									parm = valueObject.getAsObject();
-								}
-							} finally {
-								setIntransaction(false);
-								fFactory.stopTransaction();
-							}
-							// Now perform the callback.
-							cb = fServer.getRegisteredCallback(callID);
-							if (cb != null) {
-								// Callback still registered. If proxies, then if first entry is just a proxy,
-								// then we are sending only one. A convienence factor for callbacks.
-								// If not a single entry of IBeanProxy, then send whole array.
-								try {
-									if (isProxies)
-										if (((Object[]) parm).length == 1 && (((Object[]) parm)[0] == null || ((Object[]) parm)[0] instanceof IBeanProxy))
-											result = cb.calledBack(msgID, (IBeanProxy) ((Object[]) parm)[0]);
-										else
-											result = cb.calledBack(msgID, (Object[]) parm);
-									else
-										result = cb.calledBack(msgID, parm);
-									// We only accept null, IREMBeanProxies, and Object[], where
-									// contents of Object[] are bean proxies.
-									valueObject.set();
-									if (result instanceof IREMBeanProxy)
-										 ((IREMBeanProxy) result).renderBean(valueObject);
-									else if (result instanceof Object[]) {
-										class Retriever implements Commands.ValueRetrieve {
-											int index = 0;
-											Object[] array;
-											Commands.ValueObject worker = new Commands.ValueObject();
-
-											public Retriever(Object[] anArray) {
-												array = anArray;
-											}
-
-											public Commands.ValueObject nextValue() {
-												Object retParm = array[index++];
-												if (retParm != null)
-													if (retParm instanceof IREMBeanProxy)
-														 ((IREMBeanProxy) retParm).renderBean(worker);
-													else if (retParm instanceof TransmitableArray) {
-														// It is another array, create a new
-														// retriever.
-														worker.setArrayIDS(
-															new Retriever(((TransmitableArray) retParm).array),
-															((TransmitableArray) retParm).array.length,
-															((TransmitableArray) retParm).componentTypeID);
-													} else {
-														// It's an object. Need to get bean
-														// type so that we can send it.
-														IREMBeanProxy type =
-															(IREMBeanProxy) fTypeFactory.getBeanTypeProxy(retParm.getClass().getName());
-														if (type == null)
-															throw new IllegalArgumentException();
-														int classID = type.getID().intValue();
-														worker.setAsObject(retParm, classID);
-													}
-												else
-													worker.set();
-												return worker; 
-											}
-										};
-
-										valueObject.setArrayIDS(
-											new Retriever((Object[]) result),
-											((Object[]) result).length,
-											Commands.OBJECT_CLASS);
-									}
-									
-									Commands.sendCallbackDoneCommand(out, valueObject, Commands.NO_ERROR);
-								} catch (RuntimeException e) {
-									// Something happened, turn it into an error object
-									// to send back.
-									valueObject.set(e.getLocalizedMessage());
-									Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_RUNTIME_EXCEPTION);
-									ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO);	// Just log it, but assume safe enough to just go back and wait for next callback request.
-								}
-							} else {
-								valueObject.set();
-								Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_NOT_REGISTERED);	// Send error msg back to indicate we weren't registered.								
-							}
-						} finally {
-							parm = null;	// Clear out for GC to work
-							result = null;
-							cb = null;
-							valueObject.set();
-							valueSender.clear();
-						}
-						break;
-						
-					case Commands.CALLBACK_STREAM:
-						// A request for a stream
-						callID = in.readInt();	// The id of the registered callback to call.
-						msgID = in.readInt();	// The id of the message to call.
-						cb = null;
-						try {
-							// Now perform the callback.
-							cb = fServer.getRegisteredCallback(callID);
-							if (cb != null) {
-								// Callback still registered
-								valueObject.set();								
-								Commands.sendCallbackDoneCommand(out, valueObject, Commands.NO_ERROR);	// Send null to let it know we've accepted the stream
-								ins = new REMCallbackInputStream(in, out);
-								try {
-									cb.calledBackStream(msgID, ins);
-								} finally {
-									try {
-										ins.close();	// Make sure it's closed.
-									} catch (IOException e) {
-										// Exception while closing, just log it and then mark to end the loop so we close connection too.
-										doLoop = false;
-										ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "In REMCallbackThread", e)); //$NON-NLS-1$										
-									}
-								}
-							} else {
-								valueObject.set();
-								Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_NOT_REGISTERED);	// Send error msg back to indicate we weren't registered.								
-							}
-						} finally {
-							cb = null;	// Clear out for GC to work
-							ins = null;
-							valueObject.set();							
-						}
-						break;																	
-						
-					default:
-						// Unknown command. We don't know how long the command is, so we need to close the connection.
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "REMCallback: Invalid cmd sent="+cmd, null)); //$NON-NLS-1$
-						doLoop = false;						
-						break;
-				}
-			}
-		} catch (EOFException e) {
-			// This is ok. It means that the connection on the other side was terminated.
-			// So just accept this and go down.
-		} catch (Throwable e) {
-			if (!shuttingDown)
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "In REMCallbackThread", e)); //$NON-NLS-1$
-		} finally {
-			if (in != null)
-				try {
-					in.close();
-				} catch (Exception e) {
-				}
-			if (out != null)
-				try {
-					out.close();
-				} catch (Exception e) {
-				}
-			close();
-		}		
-		fServer.removeCallbackThread(this);
-		if (shutdown)
-			fServer.requestShutdown();
-	}	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java
deleted file mode 100644
index 11f8cda..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java
+++ /dev/null
@@ -1,150 +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.jem.internal.proxy.remote;
-/*
- * $RCSfile: REMCharacterClassBeanProxy.java,v $ $Revision: 1.5 $ $Date: 2005/05/11 22:41:24 $
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * IDE Implementation of ICharacterBeanProxy for the Character class. Creation date: (2/6/00
- * 9:02:54 AM) @author: Joe Winchester
- */
-final class REMCharacterClassBeanProxy extends REMConstantBeanProxy implements ICharacterBeanProxy {
-	protected Character fCharValue;
-
-	/**
-	 * As well as storing the bean store the char value so that we can return the charValue faster
-	 * without the need for repeated re-casting. It is package protected because it is created in
-	 * special way, so no one else should create these.
-	 * 
-	 * @param aBean
-	 *            java.lang.Object
-	 */
-	REMCharacterClassBeanProxy(REMProxyFactoryRegistry aRegistry, Character value) {
-		super(aRegistry);
-		fCharValue = value;
-	}
-
-	/**
-	 * equals: Equal if: 1) This proxy == (identity) to the other object 2) Else if other is an
-	 * IBeanProxy and not a constant one, then if equals on the server. 3) If this is a constant
-	 * proxy and the other is too or is a constant value (e.g. IStringBeanProxy.equals(String),
-	 * then true if values are equals.
-	 */
-	public boolean equals(Object anObject) {
-		if (this == anObject)
-			return true; // Identity
-		if (anObject instanceof REMCharacterClassBeanProxy)
-			return fCharValue.charValue() == ((REMCharacterClassBeanProxy) anObject).charValue();
-		if (anObject instanceof Character)
-			return fCharValue.charValue() == ((Character) anObject).charValue();
-		return false;
-	}
-
-	/**
-	 * Return the char value
-	 */
-	public char charValue() {
-		return fCharValue.charValue();
-	}
-	/**
-	 * Return the java.lang.Character value
-	 */
-	public Character characterValue() {
-		return fCharValue;
-	}
-
-	/**
-	 * Answer the toString() of the value.
-	 */
-	public String toBeanString() {
-		return fCharValue.toString();
-	}
-
-	/**
-	 * Get the beantype
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).characterClass;
-	}
-
-	/**
-	 * Render the bean into value object.
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.set(fCharValue);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
-	 */
-	public byte byteValue() {
-		return (byte) fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
-	 */
-	public double doubleValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
-	 */
-	public float floatValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#intValue()
-	 */
-	public int intValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
-	 */
-	public long longValue() {
-		return fCharValue.charValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
-	 */
-	public Number numberValue() {
-		return new Integer(charValue()); // Kludge.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
-	 */
-	public short shortValue() {
-		return (short) fCharValue.charValue();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java
deleted file mode 100644
index 231336a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMCharacterClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Character BeanType Proxy for Character.class.
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMCharacterClassBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-	final REMCharacterClassBeanProxy nilProxy;	// Value of '\0'
-
-REMCharacterClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
-	super(aRegistry, new Integer(Commands.CHARACTER_CLASS), Character.class.getName(), objectType);
-	
-	nilProxy = new REMCharacterClassBeanProxy(aRegistry, new Character('\0'));
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-ICharacterBeanProxy createCharacterBeanProxy(Character aCharacter) {
-	return (aCharacter.charValue() != '\0') ?
-		new REMCharacterClassBeanProxy(fRegistry, aCharacter) : nilProxy;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Character doesn't have a default ctor, so the standard way won't work.
- * Return the nilProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return nilProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createCharacterBeanProxy(new Character(value.aChar));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java
deleted file mode 100644
index 9fddf2d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java
+++ /dev/null
@@ -1,155 +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.jem.internal.proxy.remote;
-/*
- * $RCSfile: REMCharacterTypeBeanProxy.java,v $ $Revision: 1.5 $ $Date: 2005/05/11 22:41:24 $
- */
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote implementation of ICharacterBeanProxy. Creation date: (2/6/00 9:02:54 AM) @author: Joe
- * Winchester
- */
-final class REMCharacterTypeBeanProxy extends REMConstantBeanProxy implements ICharacterBeanProxy {
-	protected char fChar;
-
-	REMCharacterTypeBeanProxy(REMProxyFactoryRegistry aRegistry, char value) {
-		super(aRegistry);
-		fChar = value;
-	}
-
-	/**
-	 * equals: Equal if: 1) This proxy == (identity) to the other object 2) Else if other is an
-	 * IBeanProxy and not a constant one, then if equals on the server. 3) If this is a constant
-	 * proxy and the other is too or is a constant value (e.g. IStringBeanProxy.equals(String),
-	 * then true if values are equals.
-	 */
-	public boolean equals(Object anObject) {
-		if (this == anObject)
-			return true; // Identity
-		if (anObject instanceof REMCharacterTypeBeanProxy)
-			return fChar == ((REMCharacterTypeBeanProxy) anObject).charValue();
-		if (anObject instanceof Character)
-			return fChar == ((Character) anObject).charValue();
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		if (this == aBeanProxy)
-			return true; // Identity
-		if (aBeanProxy instanceof REMCharacterTypeBeanProxy)
-			return fChar == ((REMCharacterTypeBeanProxy) aBeanProxy).charValue();
-		return false;
-	}
-
-	/**
-	 * Return the char value
-	 */
-	public char charValue() {
-		return fChar;
-	}
-	/**
-	 * Return the java.lang.Character value
-	 */
-	public Character characterValue() {
-		return new Character(fChar);
-	}
-
-	/**
-	 * Answer the toString() of the value.
-	 */
-	public String toBeanString() {
-		return String.valueOf(fChar);
-	}
-
-	/**
-	 * Get the beantype
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).charType;
-	}
-
-	/**
-	 * Render the bean into value object.
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.set(fChar);
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
-	 */
-	public byte byteValue() {
-		return (byte) fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
-	 */
-	public double doubleValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
-	 */
-	public float floatValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#intValue()
-	 */
-	public int intValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
-	 */
-	public long longValue() {
-		return fChar;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
-	 */
-	public Number numberValue() {
-		return new Integer(fChar); // Kludge
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
-	 */
-	public short shortValue() {
-		return (short) fChar;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java
deleted file mode 100644
index 0f6f5e8..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMCharacterTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Character.TYPE BeanType Proxy.
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMCharacterTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-
-	final REMCharacterTypeBeanProxy nilProxy;	// Value of '\0'
-/**
- * REMCharacterBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMCharacterTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.CHARACTER_TYPE), Character.TYPE.getName());
-	
-	nilProxy = new REMCharacterTypeBeanProxy(aRegistry, '\0');
-}
-
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-ICharacterBeanProxy createCharacterBeanProxy(char aCharacter) {
-	return new REMCharacterTypeBeanProxy(fRegistry, aCharacter);
-}
-
-/**
- * newInstance method. Character doesn't have a default ctor, so the standard way won't work.
- * Return the nilProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return nilProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createCharacterBeanProxy(value.aChar);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java
deleted file mode 100644
index e32e0ad..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * This is a bean type for the Class object. It is needed so that
- * when a new object id comes in that represents a class, it will
- * go through this bean type to create it. We need to do something
- * special so that the correct bean type object is created.
- */
-
-final class REMClassBeanTypeProxy extends REMAbstractBeanTypeProxy {
-
-
-REMClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
-	super(aRegistry, new Integer(Commands.CLASS_CLASS), Class.class.getName(), objectType);
-}
-
-/**
- * Note: Since new instances of Class are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Class are never done through a initialization strings,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: Since the Class type is final, this function isn't supported.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * In this case it means we need a new IBeanProxyType. We will let the 
- * Beantype factory handle this since it knows how to get the information
- * for a specific id.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).createBeanTypeProxy(anID);
-}
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
deleted file mode 100644
index 5fc40be..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
+++ /dev/null
@@ -1,342 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMConnection.java,v $
- *  $Revision: 1.17 $  $Date: 2005/05/16 19:11:23 $ 
- */
-
-
-import java.io.*;
-import java.net.Socket;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.*;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.util.TimerTests;
-/**
- * The default implementation of the connection.
- *
- * It uses the property "proxyvm.bufsize" to determine the buffer size to use. If not specified, it uses the system default
- */
-public class REMConnection implements IREMConnection, IREMExpressionConnection {
-	
-	public final static String INVOKE_STEP = "Invoke";
-	public final static String INVOKE_METHOD_STEP = "Invoke Method";
-	protected Socket fSocket = null;
-	protected DataInputStream in = null;
-	protected DataOutputStream out = null;
-	private static final int TIME_OUT = 1000 * 30;	// Wait up to half minute before timeout.
-	
-	public REMConnection(Socket socket, boolean noTimeouts) {
-		try {
-			fSocket = socket;
-			fSocket.setSoLinger(true, 10);	// Wait 10 seconds if necessary for the final stuff to go out after closing.
-			if (!noTimeouts)
-				fSocket.setSoTimeout(TIME_OUT);	// Timeout period
-			Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-			if (bufSize == null)
-				bufSize = new Integer(16000);
-			out = new DataOutputStream(new BufferedOutputStream(fSocket.getOutputStream(), bufSize.intValue()));	// It didn't take the hint, so we will buffer it.
-			in = new DataInputStream(new BufferedInputStream(fSocket.getInputStream(), bufSize.intValue()));	// It didn't take the hint, so we will buffer it.
-		} catch (IOException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-			
-			if (out != null)
-				try {
-					out.close();
-				} catch (IOException e2) {
-				}
-			if (in != null)
-				try {
-					in.close();
-				} catch (IOException e3) {
-				}
-			try {
-				fSocket.close();
-			} catch (IOException e4) {
-			}
-			fSocket = null;
-			in = null;
-			out = null;
-		}
-	}
-	
-	/**
-	 * Did this construct correctly.
-	 * This is needed because an exception could be thrown in the ctor and
-	 * that's not a good thing to do.
-	 */
-	public boolean isConnected() {
-		return fSocket != null;
-	}
-	
-	/**
-	 * Terminate the server. 
-	 */
-	public void terminateServer() {
-		if (isConnected()) {
-			try {
-				Commands.sendTerminateCommand(out);
-			} catch (IOException e) {
-			}
-			close();
-		}
-	}
-	
-	/**
-	 * Close the connection.
-	 */
-	public void close() {
-		if (isConnected()) {
-			try {
-				Commands.sendQuitCommand(out);
-			} catch (IOException e) {
-			} finally {
-				try {
-					out.close();
-				} catch (IOException e2) {
-				}
-				try {
-					in.close();
-				} catch (IOException e3) {
-				}
-				try {
-					fSocket.close();
-				} catch (IOException e4) {
-				}
-			}
-			fSocket = null;
-			in = null;
-			out = null;
-		}
-	}
-		
-					
-	/**
-	 * Return the class information.
-	 */
-	public GetClassReturn getClass(String className) throws CommandException {
-		if (isConnected())
-			try {
-				// It's simple, just pass onto Commands.
-				return Commands.sendGetClassCommand(out, in, className);
-			} catch (CommandErrorException e) {
-				if (e.getErrorCode() != Commands.GET_CLASS_NOT_FOUND)
-					throw e;	// Not class not found, send it on
-			}			
-		return null;	// Not found, so return null				
-	}
-	
-	
-	/**
-	 * Return the class information given an ID.
-	 */
-	public GetClassIDReturn getClassFromID(int classID) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			return Commands.sendGetClassFromIDCommand(out, in, classID);
-		}
-		return null;	// Not found, so return null		
-	}	
-	
-	/**
-	 * Get the object data from an id.
-	 */
-	public void getObjectData(int classID, Commands.ValueObject valueReturn) throws CommandException {
-		if (isConnected()) {
-			// Just pass onto Commands.
-			Commands.sendGetObjectData(out, in, classID, valueReturn);
-		} else
-			valueReturn.set();	// Set it to null since we aren't connected.
-	}	
-
-	/**
-	 * Get a new instance using an init string
-	 */
-	public void getNewInstance(int classID, String initString, Commands.ValueObject newInstance) throws CommandException {
-		if (isConnected()) {
-			// Just pass onto Commands.
-			Commands.sendNewInstance(out, in, classID, initString, newInstance);
-		} else
-			newInstance.set();	// Set it to null since we aren't connected.
-	}
-	
-	/**
-	 * Release the id.
-	 */
-	public void releaseID(int id){
-		if (isConnected())
-			try {
-				// Just pass onto Commands.
-				Commands.releaseObjectCommand(out, id);
-			} catch (IOException e) {
-				// Don't care it didn't work
-			}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#getArrayContents(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void getArrayContents(int arrayID, Commands.ValueObject returnValue) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			Commands.sendGetArrayContentsCommand(out, in, arrayID, returnValue);
-		}			
-	}
-	
-	/**
-	 * Invoke the method call
-	 */	
-	public void invokeMethod(int methodID, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			TimerTests.basicTest.startCumulativeStep(INVOKE_METHOD_STEP);
-			Commands.sendInvokeMethodCommand(out, in, methodID, invokeOn, parms, returnValue);
-			TimerTests.basicTest.stopCumulativeStep(INVOKE_METHOD_STEP);
-		}			
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#invokeMethod(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, java.lang.String, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void invokeMethod(ValueObject classType, String methodName, ValueObject parmTypes, ValueObject invokeOn, ValueObject parms,
-			ValueObject returnValue) throws CommandException {
-		if (isConnected()) {
-			// It's simple, just pass onto Commands.
-			TimerTests.basicTest.startCumulativeStep(INVOKE_STEP);
-			Commands.sendInvokeMethodCommand(out, in, classType, methodName, parmTypes, invokeOn, parms, returnValue);
-			TimerTests.basicTest.stopCumulativeStep(INVOKE_STEP);
-		}			
-	}
-	
-	/* ************************************************************
-	 * Put the Expression processing commands here.
-	 * 
-	 * ************************************************************/
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#startExpressionProcessing()
-	 */
-	public void startExpressionProcessing(int expressionID) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendStartExpressionProcessingCommand(expressionID, out);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushExpressionCommand(byte)
-	 */
-	public void pushExpressionCommand(int expressionID, byte subcommand) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendExpressionCommand(expressionID, out, subcommand);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#stopExpressionProcessing()
-	 */
-	public void stopExpressionProcessing(int expressionID) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendEndExpressionProcessingCommand(expressionID, out);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushValueObject(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void pushValueObject(ValueObject valueObject) throws CommandException {
-		if (isConnected())
-			Commands.writeValue(out, valueObject, false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushByte(byte)
-	 */
-	public void pushByte(byte abyte) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendByte(out, abyte);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushInt(int)
-	 */
-	public void pushInt(int anInt) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendInt(out, anInt);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushString(java.lang.String)
-	 */
-	public void pushString(String aString) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendString(out, aString);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushBoolean(boolean)
-	 */
-	public void pushBoolean(boolean aBool) throws IOException {
-		if (isConnected())
-			ExpressionCommands.sendBoolean(out, aBool);
-	}
-
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#getFinalValue(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void getFinalValue(ValueObject result) throws CommandException {
-		if (isConnected())
-			Commands.readBackValue(in, result, Commands.NO_TYPE_CHECK);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pullValue(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void pullValue(int expressionID, ValueObject proxyids, ValueSender sender) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendPullValueCommand(expressionID, out, in, proxyids, sender);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#sync(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void sync(int expressionID, ValueObject proxyids, ValueSender sender) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendSyncCommand(expressionID, out, in, proxyids, sender);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#readProxyArrayValues(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueSender, boolean)
-	 */
-	public void readProxyArrayValues(Commands.ValueObject returnValue, Commands.ValueSender valueSender, boolean allowFlag) throws CommandException {
-		if (isConnected())
-			Commands.readArray(in, returnValue.anInt, valueSender, returnValue, allowFlag);
-	}
-
-	public void transferExpression(int expressionID, ValueObject expController) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendTransferExpressionCommand(expressionID, out, in, expController);
-	}
-
-	public void resumeExpression(int expressionID, ValueObject expController) throws CommandException {
-		if (isConnected())
-			ExpressionCommands.sendResumeExpressionCommand(expressionID, out, expController);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java
deleted file mode 100644
index 5a04a28..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java
+++ /dev/null
@@ -1,100 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMConstantBeanProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-/**
- * This is a base for bean proxies that are constants and
- * do not have an object on the remote VM side. They are
- * shipped back and forth by value.
- */
-
-public abstract class REMConstantBeanProxy implements IREMConstantBeanProxy {
-	protected final REMProxyFactoryRegistry fFactory;
-	private final static Integer ID = new Integer(Commands.NOT_AN_ID);
-	
-	protected REMConstantBeanProxy(REMProxyFactoryRegistry aFactory) {
-		fFactory = aFactory;
-	}
-	/**
-	 * Return the registry this proxy was created with.
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fFactory;
-	}
-	
-	/**
-	 * equals: Equal if:
-	 *         1) This proxy == (identity) to the other object
-	 *         2) Else if other is an IBeanProxy and not a constant one, then if
-	 *            equals on the server.
-	 *         3) If this is a constant proxy and the other is too or is a constant
-	 *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
-	 * This is abstract because each type needs to do a unique test for equality.
-	 */
-	public abstract boolean equals(Object anObject);
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		// We can't be assured that there are not non-identical constants that are actually identical.
-		// This is because for constants we do not know the id of the original. That is not sent across from the vm.		
-		return this == aBeanProxy;	
-	}	
-	
-	/**
-	 * Return the ID of this proxy.
-	 * Constants have no id's, so we return -1.
-	 */
-	public Integer getID() {
-		return ID;
-	}
-	
-	/**
-	 * isValid. Constant ones are always valid unless the registry is terminated, except if an
-	 * override releases resources. In that case the overriding
-	 * subclass should also override isValid() to return false
-	 * if release() was called.
-	 */
-	public boolean isValid() {
-		return fFactory.isValid();
-	}
-	
-	/**
-	 * release. Constant ones don't need to typically be released, however
-	 * if an override does do something to release, then it MUST also
-	 * override isValid() to return false.
-	 */
-	public void release() {
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java
deleted file mode 100644
index be4a841..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMConstructorProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Proxy for a constructor.
- */
-
-final class REMConstructorProxy extends REMAccessibleObjectProxy implements IConstructorProxy {
-
-	REMConstructorProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	/**
-	 * Using this constructor (assuming it takes no arguments) create a new instance.
-	 * Exception will be raised if this constructor takes arguments.
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy {
-		return newInstance(null);
-	}
-
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).ctorType;
-	}
-
-	/**
-	 * Using this constructor (with the arguments) create a new instance.
-	 * Exception will be raised if arguments don't match the constructor.
-	 */
-	public IBeanProxy newInstance(IBeanProxy[] creationArguments) throws ThrowableProxy {
-		IREMMethodProxy newInstanceMethod =
-			(IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getConstructorNewInstance();
-
-		// Constructor.newInstance takes one parm (Object[]) where [0] is an Object[] of the arguments to the constructor.
-		Object[] parms = null;
-		if (creationArguments != null)
-			parms = new Object[] { new TransmitableArray(Commands.OBJECT_CLASS, creationArguments)};
-
-		return newInstanceMethod.invokeWithParms(this, parms);
-	}
-	public IBeanProxy newInstanceCatchThrowableExceptions() {
-		try {
-			return newInstance();
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-	public IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] args) {
-		try {
-			return newInstance(args);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-	
-	private IBeanTypeProxy[] fParameterTypes;
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConstructorProxy#getParameterTypes()
-	 */
-	public synchronized IBeanTypeProxy[] getParameterTypes() {
-		if (fParameterTypes == null) {
-			IArrayBeanProxy parmTypes = (IArrayBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory)
-					.getConstructorParameterTypesMessage().invokeCatchThrowableExceptions(this);
-			if (parmTypes == null)
-				fParameterTypes = new IBeanTypeProxy[0]; // There was some error, only way null is returned
-			else {
-				int len = parmTypes.getLength();
-				fParameterTypes = new IBeanTypeProxy[len];
-				for (int i = 0; i < len; i++)
-					try {
-						fParameterTypes[i] = (IBeanTypeProxy) parmTypes.get(i);
-					} catch (ThrowableProxy e) {
-					}
-				fFactory.releaseProxy(parmTypes); // Don't need the array on the server anymore.
-			}
-		}
-
-		return fParameterTypes;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java
deleted file mode 100644
index 760007f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMConstructorTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMConstructorTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMConstructorTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
-	super(aRegistry, new Integer(Commands.CONSTRUCTOR_CLASS), java.lang.reflect.Constructor.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
-	return new REMConstructorProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java
deleted file mode 100644
index d06300c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMDoubleClassBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Double.class.
- */
-class REMDoubleClassBeanProxy extends REMNumberBeanProxy {
-
-REMDoubleClassBeanProxy(REMProxyFactoryRegistry aRegistry, Double aDouble) {
-	super(aRegistry, aDouble);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).doubleClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Double) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java
deleted file mode 100644
index 25420b2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMDoubleClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Double.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMDoubleClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMDoubleClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.DOUBLE_CLASS), Double.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMDoubleClassBeanProxy(aRegistry, new Double(0D));	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createDoubleBeanProxy(Double aDouble) {
-	return (aDouble.doubleValue() != 0D) ?
-		new REMDoubleClassBeanProxy(fRegistry, aDouble) : zeroProxy;
-}
-
-/**
- * Generic way to create an Double proxy, however, the Number must be a Double.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createDoubleBeanProxy((Double) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createDoubleBeanProxy(new Double(value.aDouble));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java
deleted file mode 100644
index f86bb1a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMDoubleTypeBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberProxy for the primitive "double".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMDoubleTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final double fDouble;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMDoubleTypeBeanProxy(REMProxyFactoryRegistry aRegistry, double aDouble) {
-	super(aRegistry);
-	fDouble = aDouble;
-}
-
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMDoubleTypeBeanProxy)
-		return fDouble == ((REMDoubleTypeBeanProxy) anObject).doubleValue();
-	if (anObject instanceof Double)
-		return fDouble == ((Double) anObject).doubleValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMDoubleTypeBeanProxy)
-		return fDouble == ((REMDoubleTypeBeanProxy) aBeanProxy).doubleValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fDouble;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fDouble;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return (float) fDouble;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return (int) fDouble;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return (long) fDouble;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Double(fDouble);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fDouble;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fDouble);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).doubleType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fDouble);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java
deleted file mode 100644
index d7d56d2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMDoubleTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Double.TYPE
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMDoubleTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMDoubleTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.DOUBLE_TYPE), Double.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMDoubleTypeBeanProxy(aRegistry, 0D);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createDoubleBeanProxy(double aDouble) {
-	return (aDouble != 0D) ?
-		new REMDoubleTypeBeanProxy(fRegistry, aDouble) : zeroProxy;
-}
-
-/**
- * newInstance method. double is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-	
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createDoubleBeanProxy(value.aDouble);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (double) validNumber - number can be any number because (double) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of double to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	double aDouble;
-	if (trim.startsWith("(double)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(double)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aDouble = v.doubleValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aDouble = Double.valueOf(initializationString).doubleValue();	// See if valid double format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aDouble);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
deleted file mode 100644
index 9cdba3f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
+++ /dev/null
@@ -1,1796 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: REMExpression.java,v $
- *  $Revision: 1.9 $  $Date: 2005/05/16 19:11:23 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.io.*;
-import java.util.*;
-import java.util.Iterator;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
- 
-/**
- * The Remote proxy version of Expression.
- * 
- * @since 1.0.0
- */
-public class REMExpression extends Expression {
-
-	private IREMExpressionConnection connection;
-	private boolean closed;	// Are we closed.
-	
-	protected Commands.ValueObject workerValue;	// A worker object so that we don't need to keep creating one and throwing it away.
-	
-	protected Map beanTypeCache;	// Use to cache pending BeanTypes. Used in conjunction with REMStandardBeanTypeFactory.
-	protected Map methodsCache;	// Use to cache pending expression method proxies. Used in conjunction with REMProxyConsants.
-	protected Map fieldsCache;	// Use to cache pending expression field proxies. Used in conjunction with REMProxyConsants.
-	
-	/*
-	 * This is very special list. It tries to eliminate unneeded traffic. For example a mark immediately followed by an endmark does
-	 * not need to be sent. Many expressions can look like: mark, endmark, endtransaction. This is a do nothing and we don't want
-	 * to create a connection to just send this. So this list is used to queue up these and remove them too when found as not needed.
-	 * 
-	 *  However, this is very tricky because all pushToProxy transactions that actually do something MUST call the processPending() method 
-	 *  first to make sure any pending transactions are submitted. Because once a real type transaction, such as assignment occurs, any
-	 *  pending transaction is a valid transaction, and no longer a do-nothing transaction.
-	 *  
-	 *  Each transaction type uses a subclass of PendingTransaction to be an entry on the list.
-	 *  
-	 *  The pendings currently supported are:
-	 *  mark/endmark
-	 *  try/catch/endtry
-	 *  block/endblock
-	 *  
-	 *  See each individual transaction type to see how it is handled.
-	 */
-	protected List pendingTransactions;
-	
-	/**
-	 * PendingTransaction entry.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected abstract static class PendingTransaction {
-		
-		/**
-		 * The transaction is now being pushed. The implementation should
-		 * actually do the push.
-		 * 
-		 * @param remExpression The REMExpression for this transaction.
-		 * 
-		 * @since 1.1.0
-		 */
-		public abstract void pushTransaction(REMExpression remExpression);
-	}
-	
-	/**
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public REMExpression(REMProxyFactoryRegistry registry) {
-		super(registry);
-	}
-	
-	/**
-	 * Return the expression id for this REMExpression. This id is used on the remote vm to
-	 * identify who the request is for.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected int getREMExpressionID() {
-		return this.hashCode();
-	}
-	/**
-	 * Get the pending transactions list.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected List getPendingTransactions() {
-		if (pendingTransactions == null)
-			pendingTransactions = new ArrayList();
-		return pendingTransactions;
-	}
-	
-	// Use this flag when debugging to test if errors are due to improper pending processing.
-	// If true they will be treated as if not pending and will be executed immediately.
-	private static final boolean EXECUTE_PENDING_IMMEDIATELY = false;
-	protected void addPendingTransaction(PendingTransaction pending) {
-		if (!EXECUTE_PENDING_IMMEDIATELY)
-			getPendingTransactions().add(pending);
-		else
-			pending.pushTransaction(this);
-	}
-
-	private boolean sentData;	// Flag to indicate if we have sent anything yet to the remote vm. This is used for the pending optimizations.
-	
-	/**
-	 * Have we sent any data in this transaction yet.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected boolean haveSentData() {
-		return sentData;
-	}
-	
-	/**
-	 * @return Returns the connection.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IREMExpressionConnection getConnection() {
-		if (connection == null) {
-			if (!sentData)
-				getREMBeanProxyFactory().startTransaction();	// This is the first time we send data, so start transaction.
-			
-			sentData = true;	// If we are getting a transaction, that means we are sending data.
-			connection = (IREMExpressionConnection) getREMRegistry().getFreeConnection();
-			// This will actually not be stopped until closeproxy. There could be a slight problem if the expression is never closed.
-			// But that shouldn't happen. This is to prevent any proxy that was released during the execution but was used by
-			// the expression from being released on the remote vm until after the expression is finished.
-			try {
-				if (workerValue == null)
-					workerValue = new Commands.ValueObject();
-				if (expressionProcesserController == null)
-					connection.startExpressionProcessing(getREMExpressionID());	// It is a new expression.
-				else {
-					fillProxy(expressionProcesserController, workerValue);
-					connection.resumeExpression(getREMExpressionID(), workerValue);
-					expressionProcesserController = null;
-				}
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				throwIllegalStateException(IO_EXCEPTION_MSG);
-			} catch (CommandException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					connection.close();
-					connection = null;
-				}
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}	
-		}
-		return connection;
-	}
-
-	/**
-	 * General IOException occurred msg.
-	 */
-	protected static final String IO_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.IOExceptionSeeLog_INFO_"); //$NON-NLS-1$
-	
-	protected static final String COMMAND_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.CommandExceptionSeeLog_INFO_"); //$NON-NLS-1$
-	
-	/**
-	 * Throw an an illegal state exception if some general error, in particular an I/O or Command Exception
-	 * occurred so that callers know there is something wrong.
-	 * 
-	 * @param msg
-	 * @throws IllegalStateException
-	 * 
-	 * @since 1.0.0
-	 */
-	protected void throwIllegalStateException(String msg) throws IllegalStateException {
-		throw new IllegalStateException(msg);
-	}
-	
-	/**
-	 * Return the registry as a REMProxyFactoryRegistry
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final REMProxyFactoryRegistry getREMRegistry() {
-		return (REMProxyFactoryRegistry) registry;
-	}
-	
-	/**
-	 * Return the bean proxy factory as a REMStandardBeanProxyFactory.
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected final REMStandardBeanProxyFactory getREMBeanProxyFactory() {
-		return (REMStandardBeanProxyFactory) beanProxyFactory;
-	}
-
-	/**
-	 * Process any pending transactions.
-	 * <p>
-	 * <b>Note: </b>It is required that all non-pending-participating transactions must
-	 * call this method first to make sure pending transactions are sent. If this is
-	 * not done, there will be errors in the expression.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void processPendingTransactions() {
-		if (pendingTransactions != null && !pendingTransactions.isEmpty()) {
-			try {
-				for (int i = 0; i < pendingTransactions.size(); i++) {
-					((PendingTransaction) pendingTransactions.get(i)).pushTransaction(this);
-				}
-			} finally {
-				pendingTransactions.clear();
-			}
-		}
-	}
-	
-	/**
-	 * Get the pending entry from top. If top is 1, then get top entry (i.e. last one added), 2 is next one. 
-	 * @param fromTop
-	 * @return entry requested, or <code>null</code> if no such entry.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected PendingTransaction getPendingEntryFromTop(int fromTop) {
-		if (pendingTransactions != null && pendingTransactions.size() >= fromTop) {
-			return (PendingTransaction) pendingTransactions.get(pendingTransactions.size()-fromTop);
-		} else
-			return null;
-	}
-	
-	/**
-	 * Pop up the top entry from the pending transactions queue.
-	 * @param fromTop how many entries to pop from the pending transaction list.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void popPendingEntry(int fromTop) {
-		if (pendingTransactions != null)
-			if (pendingTransactions.size() > fromTop) {
-				while(fromTop-- >0)
-					pendingTransactions.remove(pendingTransactions.size()-1);
-			} else
-				pendingTransactions.clear();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushToProxy(org.eclipse.jem.internal.proxy.core.IProxy)
-	 */
-	protected void pushToProxy(IProxy proxy) {
-		if (proxy == null || proxy.isBeanProxy())
-			pushToProxy((IBeanProxy) proxy);
-		else
-			pushToExpressionProxy((ExpressionProxy) proxy);
-	}
-	
-	private void pushToProxy(IBeanProxy proxy) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push proxy command is:
-			//	PushExpressionCommand(push to proxy) followed by:
-			//		ValueObject containing the rendered proxy.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_TO_PROXY_EXPRESSION_VALUE);
-			if (proxy == null)
-				workerValue.set();
-			else
-				((IREMBeanProxy) proxy).renderBean(workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#closeProxy()
-	 */
-	protected void closeProxy() {
-		if (!closed) {
-			try {
-				if (connection != null && connection.isConnected()) {
-					try {
-							connection.stopExpressionProcessing(getREMExpressionID());
-					} catch (IOException e) {
-						connection.close();
-						ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO);
-						// Not throwing an illegal state here because we don't care, other than logging and not 
-						// returning the connection to the registry that there was an error on close.
-					} finally {
-						getREMRegistry().returnConnection(connection);
-					}
-				}
-			} finally {
-				closed = true;
-				if (sentData)
-					getREMBeanProxyFactory().stopTransaction();	// Resume proxy releases. We've sent data at least once.
-			}
-		}
-		methodsCache = null;
-		fieldsCache = null;
-		beanTypeCache = null;
-		pendingTransactions = null;
-		connection = null;
-	}
-	
-	private static final Object VOIDTYPE = new Object();	// A void type was sent in expression proxy resolution.
-	private static final Object NOTRESOLVED = new Object();	// A not resolved type was sent in expression proxy resolution.
-	
-	/*
-	 * Get the sender to use for pulling the expression proxy resolutions.
-	 */
-	private BeanProxyValueSender getExpressionProxiesSender() {
-		return new BeanProxyValueSender(getREMBeanProxyFactory()) {
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jem.internal.proxy.remote.BeanProxyValueSender#sendValue(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-			 */
-			public void sendValue(ValueObject value) {
-				if (value.getType() == Commands.FLAG) {
-					switch (value.anInt) {
-						case ExpressionCommands.EXPRESSIONPROXY_NOTRESOLVED:
-							array[index++] = NOTRESOLVED;
-							break;
-						case ExpressionCommands.EXPRESSIONPROXY_VOIDTYPE:
-							array[index++] = VOIDTYPE;
-							break;
-						default:
-							// Shouldn't happen.
-							break;
-					}
-				} else
-					super.sendValue(value);
-			}
-		};
-	}
-		
-	/*
-	 * Process the pulled expression proxy resolutions.
-	 */
-	private void processpulledExpressionProxies(List expressionProxies, BeanProxyValueSender sender) {
-
-		// It is expected that each entry will coorespond to the next non-null expression proxy and will be the bean proxy or one of the special
-		// types.
-		int len = expressionProxies.size();
-		int j = 0;
-		Object[] resolveds = sender.getArray();
-		for (int i = 0; i < len; i++) {
-			ExpressionProxy ep = (ExpressionProxy) expressionProxies.get(i);
-			if (ep != null) {
-				Object resolved = resolveds[j++];
-				if (resolved == NOTRESOLVED)
-					fireProxyNotResolved(ep);
-				else if (resolved == VOIDTYPE)
-					fireProxyVoid(ep);
-				else
-					fireProxyResolved(ep, (IBeanProxy) resolved);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pullProxyValue(int, java.util.List)
-	 */
-	protected IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
-		if (!haveSentData()) {
-			markAllProxiesNotResolved(expressionProxies);
-			return null;	// We haven't pushed any commands, so there is nothing to do. Don't create a connection for this.
-		}
-		// If there are any pending transactions at this point in time, there is no need to send them. They would be do nothings anyway.
-		
-		boolean processedExpressionProxies = false;
-		IREMExpressionConnection connection = getConnection();
-		markInTransaction();
-		try {
-			Commands.ValueObject proxyids = null;
-			BeanProxyValueSender sender = null;
-			if (proxycount > 0) {
-				proxyids = createExpressionProxiesValueObject(proxycount, expressionProxies);
-				sender = getExpressionProxiesSender();
-			}
-			
-			connection.pullValue(getREMExpressionID(), proxyids, sender);
-			// If we got this far, then if there are proxies, we need to process these too.
-			if (proxycount > 0)
-				processpulledExpressionProxies(expressionProxies, sender);
-			processedExpressionProxies =true;
-			connection.getFinalValue(workerValue);	// Get the returned value.
-			return getREMBeanProxyFactory().getBeanProxy(workerValue);
-		} catch (CommandErrorException e) {
-			try {
-				if (e.getErrorCode() == ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION) {
-					// Need to turn it into a Throwable.
-					ThrowableProxy t = null;
-					try {
-						getREMBeanProxyFactory().getBeanProxy(e.getValue());	// This will cause a throw to occur, but we don't want it going out, we want to capture it.
-					} catch (ThrowableProxy e1) {
-						t = e1;
-					}
-					throw new REMNoExpressionValueException(t);
-				}
-				getREMBeanProxyFactory().processErrorReturn(e);
-			} catch (CommandException e1) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					connection.close();
-					throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			}
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		} finally {
-			markEndTransaction();
-			if (!processedExpressionProxies)
-				markAllProxiesNotResolved(expressionProxies);	// We failed before we could process the expression proxies. So mark all as not resolved.
-		}
-		return null;
-	}
-	
-	/**
-	 * This is called by commands that write some data and will be reading data back immediately 
-	 * (i.e. pull value and invoke expression). If we are on a callback thread and have the 
-	 * used the connection from the callback thread, we need to tell the callback thread that
-	 * it is in a transaction. This is needed because while reading data back there are
-	 * sometimes calls back to the vm to get beantype data for new classes. This would 
-	 * normally be through a new connection so that it doesn't get stuck in the middle of the
-	 * data being sent back. But when running on a callback the same connection is used. So it
-	 * would stick data in the middle of the return stream of data. To prevent this we need
-	 * to tell the callback thread that it is in a transaction during this call so that any
-	 * such new connection requests will get a new connection.
-	 * <p>
-	 * markEndTransaction must be called in ALL cases, such use try/finally.
-	 * 
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void markInTransaction() {
-		Thread thread = Thread.currentThread();
-		if (thread instanceof REMCallbackThread) {
-			// We are in a callback, and the callback connection is our connection, tell the callback that it is in transaction.
-			REMCallbackThread callbackThread = (REMCallbackThread) thread;
-			if (callbackThread.getConnection() == connection) {
-				callbackThread.setIntransaction(true);
-			}
-		}
-	}
-	
-	/**
-	 * Mark end of transaction.
-	 * 
-	 * @see REMExpression#markInTransaction()
-	 * @since 1.1.0
-	 */
-	protected void markEndTransaction() {
-		Thread thread = Thread.currentThread();
-		if (thread instanceof REMCallbackThread) {
-			// We are in a callback, and the callback connection is our connection, tell the callback that it is in transaction.
-			REMCallbackThread callbackThread = (REMCallbackThread) thread;
-			if (callbackThread.getConnection() == connection) {
-				callbackThread.setIntransaction(false);
-			}
-		}		
-	}
-
-	/**
-	 * @param expressionProxies
-	 * 
-	 * @since 1.1.0
-	 */
-	private Commands.ValueObject createExpressionProxiesValueObject(int actualCount, List expressionProxies) {
-		class ExpressionProxyRetriever implements Commands.ValueRetrieve {
-			Iterator expressionProxiesItr;
-			Commands.ValueObject worker = new Commands.ValueObject();
-
-			public ExpressionProxyRetriever(List expressionProxies) {
-				this.expressionProxiesItr = expressionProxies.iterator();
-			}
-
-			public Commands.ValueObject nextValue() {
-				worker.set(-1);
-				while (expressionProxiesItr.hasNext()) {
-					Object parm = expressionProxiesItr.next();
-					if (parm != null) {
-						worker.set(((ExpressionProxy) parm).getProxyID());
-						break;
-					}
-				} 
-				return worker;
-			}
-		};
-
-		workerValue.setArrayIDS(new ExpressionProxyRetriever(expressionProxies), actualCount, Commands.INT);
-		return workerValue;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushCastToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushCastToProxy(IProxyBeanType type) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push cast to proxy command is:
-			//	PushExpressionCommand(push cast to proxy) followed by:
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CAST_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();			
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/**
-	 * Push the proxy bean type in the format depending on expression proxy or beantype proxy.
-	 * @param type
-	 * @throws IOException
-	 * 
-	 * @since 1.1.0
-	 */
-	protected void fillProxy(IProxy type, Commands.ValueObject value) throws IOException {
-		//		ValueObject containing the rendered bean type proxy if IBeanTypeProxy or int (for expression proxy id) if expression proxy.
-		if (type.isBeanProxy()) {
-			((IREMBeanProxy) type).renderBean(value);
-		} else {
-			ExpressionProxy ep = (ExpressionProxy) type;
-			value.set(ep.getProxyID());
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInstanceofToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushInstanceofToProxy(IProxyBeanType type) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push instanceof to proxy command is:
-			//	PushExpressionCommand(push instanceof to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the String representing the name of class.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInfixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InfixOperator, int)
-	 */
-	protected void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push infix to proxy command is:
-			//	PushExpressionCommand(push infix to proxy) followed by:
-			//		byte: operator
-			//		byte: operandType
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.INFIX_EXPRESSION_VALUE);
-			connection.pushByte((byte) operator.getValue());
-			connection.pushByte((byte) operandType.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}		
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushPrefixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
-	 */
-	protected void pushPrefixToProxy(PrefixOperator operator) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push prefix to proxy command is:
-			//	PushExpressionCommand(push prefix to proxy) followed by:
-			//		byte: operator
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PREFIX_EXPRESSION_VALUE);
-			connection.pushByte((byte) operator.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayAccessToProxy(int)
-	 */
-	protected void pushArrayAccessToProxy(int indexCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push array access to proxy command is:
-			//	PushExpressionCommand(push array acces to proxy) followed by:
-			//		int: indexCount
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE);
-			connection.pushInt(indexCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	protected void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push array creation to proxy command is:
-			//	PushExpressionCommand(push array creation to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the expression proxy.
-			//		int: dimension count
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushInt(dimensionCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	protected void pushArrayInitializerToProxy(IProxyBeanType type, int stripCount, int expressionCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push array initializer to proxy command is:
-			//	PushExpressionCommand(push array initializer to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or expression proxy.
-			//		int: strip count
-			//		int: expression count
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushInt(stripCount);
-			connection.pushInt(expressionCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushClassInstanceCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	protected void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push class instance creation to proxy command is:
-			//	PushExpressionCommand(push class instance creation to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the expression proxy
-			//		int: argument count
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushInt(argumentCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTypeReceiverToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */ 
-	protected void pushTypeReceiverToProxy(IProxyBeanType type) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push type receiver to proxy command is:
-			//	PushExpressionCommand(push type receiver to proxy) followed by:
-			//		ValueObject containing the rendered bean type proxy or the expression proxy.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.TYPERECEIVER_EXPRESSION_VALUE);
-			fillProxy(type, workerValue);
-			connection.pushValueObject(workerValue);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldAccessToProxy(java.lang.String, boolean)
-	 */
-	protected void pushFieldAccessToProxy(Object field, boolean hasReceiver) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push field access to proxy command is:
-			//	PushExpressionCommand(push field access to proxy) followed by:
-			//		Commands.Value: fieldName or IProxyField
-			//		boolean: hasReceiver
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE);
-			if (field instanceof String) {
-				workerValue.set((String) field);
-			} else {
-				fillProxy((IProxy) field, workerValue);
-			}
-			connection.pushValueObject(workerValue);
-			connection.pushBoolean(hasReceiver);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodInvocationToProxy(java.lang.String, boolean, int)
-	 */
-	protected void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push method invocation to proxy command is:
-			//	PushExpressionCommand(push method invocation to proxy) followed by:
-			//		Commands.ValueObject: methodName or IMethodProxy
-			//		boolean: hasReceiver
-			//		int: argCount
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.METHOD_EXPRESSION_VALUE);
-			if (method instanceof String) {
-				workerValue.set((String) method);
-			} else {
-				fillProxy((IProxy) method, workerValue);
-			}
-			connection.pushValueObject(workerValue);
-			connection.pushBoolean(hasReceiver);
-			connection.pushInt(argCount);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushConditionalToProxy(int)
-	 */
-	protected void pushConditionalToProxy(InternalConditionalOperandType expressionType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push conditional to proxy command is:
-			//	PushExpressionCommand(push conditional to proxy) followed by:
-			//		byte: expression type
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE);
-			connection.pushByte((byte) expressionType.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/*
-	 * A special one that takes the ThrowableProxy for no expression value and 
-	 * wrappers it prints its stack trace instead, but still makes it a subclass
-	 * of NoExpressionValueException.
-	 * 
-	 * @since 1.1.0
-	 */
-	private static class REMNoExpressionValueException extends NoExpressionValueException {
-		public REMNoExpressionValueException(ThrowableProxy e) {
-			super(e);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#getLocalizedMessage()
-		 */
-		public String getLocalizedMessage() {
-			return ((ThrowableProxy) getCause()).getProxyLocalizedMessage();
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#getMessage()
-		 */
-		public String getMessage() {
-			return ((ThrowableProxy) getCause()).getProxyMessage();
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#printStackTrace()
-		 */
-		public void printStackTrace() {
-			getCause().printStackTrace();
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
-		 */
-		public void printStackTrace(PrintStream s) {
-			getCause().printStackTrace(s);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
-		 */
-		public void printStackTrace(PrintWriter s) {
-			getCause().printStackTrace(s);
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInvoke(int, java.util.List)
-	 */
-	protected void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
-		if (!haveSentData()) {
-			markAllProxiesNotResolved(expressionProxies);
-			return;	// We haven't pushed any commands, so there is nothing to do. Don't create a connection for this.
-		}
-		// If at this point there are pending transactions, there is no need to send them because they would all be do-nothings.
-		
-		boolean processedExpressionProxies = false;
-		IREMExpressionConnection connection = getConnection();
-		markInTransaction();
-		try {
-			Commands.ValueObject proxyids = null;
-			BeanProxyValueSender sender = null;
-			if (proxycount > 0) {
-				proxyids = createExpressionProxiesValueObject(proxycount, expressionProxies);
-				sender = getExpressionProxiesSender();
-			}
-
-			connection.sync(getREMExpressionID(), proxyids, sender);
-			
-			// If we got this far, then if there are proxies, we need to process these too.
-			if (proxycount > 0)
-				processpulledExpressionProxies(expressionProxies, sender);
-			processedExpressionProxies = true;
-			connection.getFinalValue(workerValue);	// We don't care what it is, we just need to see if there is an error.
-		} catch (CommandErrorException e) {
-			try {
-				if (e.getErrorCode() == ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION) {
-					// Need to turn it into a Throwable.
-					ThrowableProxy t = null;
-					try {
-						getREMBeanProxyFactory().getBeanProxy(e.getValue());	// This will cause a throw to occur, but we don't want it going out, we want to capture it.
-					} catch (ThrowableProxy e1) {
-						t = e1;
-					}
-					throw new REMNoExpressionValueException(t);
-				}
-				getREMBeanProxyFactory().processErrorReturn(e);
-			} catch (CommandException e1) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					connection.close();
-					throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			}
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		} finally {
-			markEndTransaction();
-			if (!processedExpressionProxies)
-				markAllProxiesNotResolved(expressionProxies);	// We failed before we could process the expression proxies. So mark all as not resolved.
-		}
-	}
-
-	private static class REMBeanTypeExpressionProxy extends ExpressionProxy implements IBeanTypeExpressionProxy {
-		
-		private String typeName;
-		
-		/**
-		 * @param proxyid
-		 * 
-		 * @since 1.1.0
-		 */
-		private REMBeanTypeExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, BEANTYPE_EXPRESSION_PROXY, expression);
-		}
-		
-		public void setTypeName(String typeName) {
-			this.typeName = typeName;
-		}
-		
-		public String getTypeName() {
-			return typeName;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
-		 */
-		public String toString() {
-			return super.toString()+" - "+getTypeName();
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-		 */
-		public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
-			REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-			return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-		 */
-		public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-			REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-			return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-		 */
-		public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-			REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
-			return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getFieldProxy(expression, this, fieldName);
-		}
-	}
-	
-	private static class REMMethodExpressionProxy extends ExpressionProxy implements IProxyMethod {
-		
-			/**
-		 * @param proxyid
-		 * @param proxyType
-		 * @param expression
-		 * 
-		 * @since 1.1.0
-		 */
-		private REMMethodExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, METHOD_EXPRESSION_PROXY, expression);
-		}
-	}
-	
-	private static class REMFieldExpressionProxy extends ExpressionProxy implements IProxyField {
-		
-			/**
-		 * @param proxyid
-		 * @param proxyType
-		 * @param expression
-		 * 
-		 * @since 1.1.0
-		 */
-		private REMFieldExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, FIELD_EXPRESSION_PROXY, expression);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#createExpressionProxy(int)
-	 */
-	protected ExpressionProxy createExpressionProxy(int proxyType, int proxyID) {
-		switch (proxyType) {
-			case NORMAL_EXPRESSION_PROXY:
-			default:
-				return new ExpressionProxy(proxyID, NORMAL_EXPRESSION_PROXY, this);
-			
-			case BEANTYPE_EXPRESSION_PROXY:
-				return new REMBeanTypeExpressionProxy(proxyID, this);
-				
-			case METHOD_EXPRESSION_PROXY:
-				return new REMMethodExpressionProxy(proxyID, this);
-				
-			case FIELD_EXPRESSION_PROXY:
-				return new REMFieldExpressionProxy(proxyID, this);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	protected void pushAssignmentToProxy(ExpressionProxy proxy) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push assignment to proxy command is:
-			//	PushExpressionCommand(push assignment to proxy) followed by:
-			//		int: proxy id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy()
-	 */
-	protected void pushAssignmentToProxy() {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of the push assignment command is:
-			//   PushAssignmentCommand.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte) InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-	
-
-	private void pushToExpressionProxy(ExpressionProxy proxy) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to expression proxy command is:
-			//	PushExpressionCommand(push expression proxy to proxy) followed by:
-			//		int: proxy id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-
-	}
-	
-	private static class BlockBegin extends PendingTransaction {
-		public int blockNumber;
-		
-		public BlockBegin(int blockNumber) {
-			this.blockNumber = blockNumber;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to block begin proxy command is:
-				//	PushExpressionCommand(push block begin proxy to proxy) followed by:
-				//		int: block id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_BEGIN_EXPRESSION_VALUE);
-				connection.pushInt(blockNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}			
-		}
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBeginToProxy(int)
-	 */
-	protected void pushBlockBeginToProxy(int blockNumber) {
-		addPendingTransaction(new BlockBegin(blockNumber));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockEndToProxy(int)
-	 */
-	protected void pushBlockEndToProxy(int blockNumber) {
-		// See if the top pending transactions is BreakBlock(blockNumber). If it is then the BreakBlock can be thrown away.
-		PendingTransaction topEntry = getPendingEntryFromTop(1);
-		if (topEntry instanceof BlockBreak && ((BlockBreak) topEntry).blockNumber == blockNumber) {
-			popPendingEntry(1);
-			topEntry = getPendingEntryFromTop(1);
-		}
-		// See if the top pending transaction is now BeginBlock(blockNumber). If it is, then this transaction and the block begin
-		// can be thrown away because they are an empty block.
-		if (topEntry instanceof BlockBegin && ((BlockBegin) topEntry).blockNumber == blockNumber) {
-			popPendingEntry(1);
-			return;
-		}
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to block end proxy command is:
-			//	PushExpressionCommand(push block end proxy to proxy) followed by:
-			//		int: block id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE);
-			connection.pushInt(blockNumber);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-	
-	private static class BlockBreak extends PendingTransaction {
-		public int blockNumber;
-		
-		public BlockBreak(int blockNumber) {
-			this.blockNumber = blockNumber;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to block break proxy command is:
-				//	PushExpressionCommand(push block break proxy to proxy) followed by:
-				//		int: block id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_BREAK_EXPRESSION_VALUE);
-				connection.pushInt(blockNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBreakToProxy(int)
-	 */
-	protected void pushBlockBreakToProxy(int blockNumber) {
-		// Even if there is no pending block begin for this block, we will pend the break.
-		// This is so that if the break occurred just before the block end, then it can be ignored.
-		addPendingTransaction(new BlockBreak(blockNumber));
-	}
-
-	private static class TryBegin extends PendingTransaction {
-
-		public final int tryNumber;
-		
-		public TryBegin(int tryNumber) {
-			this.tryNumber = tryNumber;
-			
-		}
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to try begin proxy command is:
-				//	PushExpressionCommand(push try begin to proxy) followed by:
-				//		int: try id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_BEGIN_EXPRESSION_VALUE);
-				connection.pushInt(tryNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryBeginToProxy(int)
-	 */
-	protected void pushTryBeginToProxy(int tryNumber) {
-		addPendingTransaction(new TryBegin(tryNumber));
-	}
-
-	private static class TryCatch extends PendingTransaction {
-
-		public final int tryNumber;
-		private final IProxyBeanType exceptionType;
-		private final ExpressionProxy ep;
-
-		public TryCatch(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
-			this.tryNumber = tryNumber;
-			this.exceptionType = exceptionType;
-			this.ep = ep;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to try begin proxy command is:
-				//	PushExpressionCommand(push try begin to proxy) followed by:
-				//		int: try id
-				//		object: expression type (as beantype or as expression proxy)
-				//		int: proxy id or (-1 if null).
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_CATCH_EXPRESSION_VALUE);
-				connection.pushInt(tryNumber);
-				remExpression.fillProxy(exceptionType, remExpression.workerValue);
-				connection.pushValueObject(remExpression.workerValue);
-				if (ep != null)
-					connection.pushInt(ep.getProxyID());
-				else
-					connection.pushInt(-1);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			} catch (CommandException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				if (!e.isRecoverable()) {
-					connection.close();
-					remExpression.throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			}
-		}
-		
-	}
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryCatchClauseToProxy(int, org.eclipse.jem.internal.proxy.core.IProxyBeanType, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	protected void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
-		addPendingTransaction(new TryCatch(tryNumber, exceptionType, ep));
-	}
-
-	private static class TryFinally extends PendingTransaction {
-		
-		public final int tryNumber;
-
-		public TryFinally(int tryNumber) {
-			this.tryNumber = tryNumber;
-			
-		}
-
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push to try begin proxy command is:
-				//	PushExpressionCommand(push try finally to proxy) followed by:
-				//		int: try id
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_FINALLY_EXPRESSION_VALUE);
-				connection.pushInt(tryNumber);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}
-		
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryFinallyClauseToProxy(int)
-	 */
-	protected void pushTryFinallyClauseToProxy(int tryNumber) {
-		addPendingTransaction(new TryFinally(tryNumber));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryEndToProxy(int)
-	 */
-	protected void pushTryEndToProxy(int tryNumber) {
-		// This is a little tricky. We need to find if there is nothing but try/catch/finally for this tryNumber on the pending
-		// transactions up to the try begin, if there is nothing else, then we can throw the entire try away. That
-		// means there was no code at all in any of the try/catch/finally blocks.
-		int fromTop = 0;
-		while (true) {
-			PendingTransaction topEntry = getPendingEntryFromTop(++fromTop);
-			if (topEntry instanceof TryFinally) {
-				if (((TryFinally) topEntry).tryNumber != tryNumber)
-					break;	// We met a finally that wasn't ours, so entire try group must be sent.
-			} else if (topEntry instanceof TryCatch) {
-				if (((TryCatch) topEntry).tryNumber != tryNumber)
-					break;	// We met a catch that wasn't ours, so entire try group must be sent.
-			} else if (topEntry instanceof TryBegin) {
-				if (((TryBegin) topEntry).tryNumber == tryNumber) {
-					// We've met our try begin, and nothing but empty catch/finally in between, so the entire group can be thrown away
-					popPendingEntry(fromTop);
-					return;
-				} else
-					break;	// We've hit a try begin that wasn't ours, so the entire try group must be sent.	
-			} else
-				break;	// We've hit something other than our try group, so process everything.
-		}
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to try begin proxy command is:
-			//	PushExpressionCommand(push try end to proxy) followed by:
-			//		int: try id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.TRY_END_EXPRESSION_VALUE);
-			connection.pushInt(tryNumber);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushThrowToProxy()
-	 */
-	protected void pushThrowToProxy() {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to try begin proxy command is:
-			//	PushExpressionCommand(push throw to proxy)
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.THROW_EXPRESSION_VALUE);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushRethrowToProxy(int)
-	 */
-	protected void pushRethrowToProxy(int tryNumber) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to rethow proxy command is:
-			//	PushExpressionCommand(push rethrow to proxy)
-			//		int: try id
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.RETHROW_EXPRESSION_VALUE);
-			connection.pushInt(tryNumber);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBeanTypeToProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeExpressionProxy)
-	 */
-	protected void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy) {
-		// Push beantype to proxy is sent out of sequence without respect to where in expression we are,
-		// so no need to handle pending transactions at this point. They would not affect the result
-		// of this call.
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to beanType proxy command is:
-			//	PushExpressionCommand(push bean type expression proxy)
-			//		int: proxy id
-			//		string: typename
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE);
-			REMBeanTypeExpressionProxy ep = (REMBeanTypeExpressionProxy) proxy;
-			connection.pushInt(ep.getProxyID());
-			connection.pushString(ep.getTypeName());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	protected void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
-		// Push method to proxy is sent out of sequence without respect to where in expression we are,
-		// so no need to handle pending transactions at this point. They would not affect the result
-		// of this call.
-
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to method proxy command is:
-			//	PushExpressionCommand(push method type expression proxy)
-			//		int: proxy id
-			//		ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
-			//		string: method name
-			//		int: number of parameter types
-			//		ValueObject(s): containing the rendered bean type proxy or the expression proxy for the parameter types.
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-			fillProxy(declaringType, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushString(methodName);
-			if (parameterTypes == null || parameterTypes.length == 0)
-				connection.pushInt(0);
-			else {
-				connection.pushInt(parameterTypes.length);
-				for (int i = 0; i < parameterTypes.length; i++) {
-					fillProxy(parameterTypes[i], workerValue);
-					connection.pushValueObject(workerValue);					
-				}
-			}
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String)
-	 */
-	protected void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String fieldName) {
-		// Push field to proxy is sent out of sequence without respect to where in expression we are,
-		// so no need to handle pending transactions at this point. They would not affect the result
-		// of this call.
-
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push to field proxy command is:
-			//	PushExpressionCommand(push field type expression proxy)
-			//		int: proxy id
-			//		ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
-			//		string: field name
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE);
-			connection.pushInt(proxy.getProxyID());
-			fillProxy(declaringType, workerValue);
-			connection.pushValueObject(workerValue);
-			connection.pushString(fieldName);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-	
-	/**
-	 * Get the map of IProxyMethods for a beantype. Meant to be used only in conjunction with REMProxyConstants.
-	 * It is here so the REMProxyConstants can store pending proxies per expression.
-	 * 
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public Map getMethods(IProxyBeanType beanType) {
-		if (methodsCache == null)
-			methodsCache = new HashMap();
-		Map methods = (Map) methodsCache.get(beanType.getTypeName());
-		if(methods == null){
-			methods = new HashMap(20);
-			methodsCache.put(beanType.getTypeName(),methods);
-		}
-		return methods;	
-	}
-	
-	/**
-	 * Get the map of IProxyFields for a beantype. Meant to be used only in conjunction with REMProxyConstants.
-	 * It is here so the REMProxyConstants can store pending proxies per expression.
-	 * 
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public Map getFields(IProxyBeanType beanType) {
-		if (fieldsCache == null)
-			fieldsCache = new HashMap();
-		Map fields = (Map) fieldsCache.get(beanType.getTypeName());
-		if(fields == null){
-			fields = new HashMap(20);
-			fieldsCache.put(beanType.getTypeName(),fields);
-		}
-		return fields;	
-	}
-	
-	/**
-	 * Get the map of IProxyBeanTypes for a beantype name. Meant to be used only in conjunction with REMSgtandardBeanTypeFactory.
-	 * It is here so the REMStandardBeanTypeFactory can store pending proxies per expression.
-	 * 
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyBeanType getBeanType(String beanTypeName) {
-		if (beanTypeCache == null)
-			beanTypeCache = new HashMap();
-		return (IProxyBeanType) beanTypeCache.get(beanTypeName);
-	}
-	
-	/**
-	 * Add the beantype expression proxy to the map of bean type expression proxies. Used in conjunction with REMStandardBeanTypeFactory.
-	 * It is here so the REMStandardBeanTypeFactory can store pending proxies per expression.
-	 * @param beanTypeName
-	 * @param beantype
-	 * 
-	 * @since 1.1.0
-	 */
-	public void addBeanType(String beanTypeName, IProxyBeanType beantype) {
-		beanTypeCache.put(beanTypeName, beantype);
-	}
-	
-	/**
-	 * Remove the beantype expression proxy from the map. This is called because there was a rollback due to an endmark.
-	 * @param beanTypeName
-	 * 
-	 * @since 1.1.0
-	 */
-	public void removeBeanType(String beanTypeName) {
-		beanTypeCache.remove(beanTypeName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfTestToProxy()
-	 */
-	protected void pushIfTestToProxy() {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push if test to proxy command is:
-			//	PushExpressionCommand(push if test to proxy)
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfElseToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InternalIfElseOperandType)
-	 */
-	protected void pushIfElseToProxy(InternalIfElseOperandType clauseType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push conditional to proxy command is:
-			//	PushExpressionCommand(push if/else clause to proxy) followed by:
-			//		byte: clause type
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE);
-			connection.pushByte((byte) clauseType.getValue());
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushNewInstanceToProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType) {
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push new instance from initstring to proxy command is:
-			//	PushExpressionCommand(push new instance to proxy) followed by:
-			//		string: init string
-			//		ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.NEW_INSTANCE_VALUE);
-			connection.pushString(initializationString);
-			fillProxy(resultType, workerValue);
-			connection.pushValueObject(workerValue);			
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			if (!e.isRecoverable()) {
-				connection.close();
-				throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-			}			
-		}
-	}
-
-	private static class Mark extends PendingTransaction {
-		public int markID;
-		
-		public Mark(int markID) {
-			this.markID = markID;
-		}
-		
-		public void pushTransaction(REMExpression remExpression) {
-			IREMExpressionConnection connection = remExpression.getConnection();
-			try {
-				// Format of push mark to proxy command is:
-				//	PushExpressionCommand(push mark to proxy) followed by:
-				//		int: markID
-				connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.MARK_VALUE);
-				connection.pushInt(markID);
-			} catch (IOException e) {
-				connection.close();
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				remExpression.markInvalid(e.getLocalizedMessage());
-				remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
-			}
-		}
-		
-	}
-	
-	protected void pushMarkToProxy(int markID) {
-		addPendingTransaction(new Mark(markID));
-	}
-
-	protected void pushEndmarkToProxy(int markID, boolean restore) {
-		// See if the top pending transaction is now Mark(markID). If it is, then this transaction and the mark begin
-		// can be thrown away because they are an empty block.
-		PendingTransaction topEntry = getPendingEntryFromTop(1);
-		if (topEntry instanceof Mark && ((Mark) topEntry).markID == markID) {
-			popPendingEntry(1);
-			return;
-		}
-		processPendingTransactions();
-		IREMExpressionConnection connection = getConnection();
-		try {
-			// Format of push end mark to proxy command is:
-			//	PushExpressionCommand(push end mark to proxy) followed by:
-			//		int: markID
-			//		boolean: restore
-			connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ENDMARK_VALUE);
-			connection.pushInt(markID);
-			connection.pushBoolean(restore);
-		} catch (IOException e) {
-			connection.close();
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			markInvalid(e.getLocalizedMessage());
-			throwIllegalStateException(IO_EXCEPTION_MSG);
-		}
-	}
-
-	// This is the expression processor controller used to transfer.
-	// This is the guy that maintains continuity of the transaction as
-	// it is passed from one connection to another.
-	protected IBeanProxy expressionProcesserController;	
-	protected void pushBeginTransferThreadToProxy() throws ThrowableProxy {
-		// If the controller is not null, that means we had already requested a transfer
-		// but had not used it in this thread so there is no need to do anything. It
-		// will be handled when switching back to the other thread.
-		// If the connection is null, no need to do anything since there is no connection
-		// to transfer.
-		if (connection != null && expressionProcesserController == null) {
-			IREMExpressionConnection connection = getConnection();
-			markInTransaction();
-			try {
-				workerValue.set();
-				connection.transferExpression(getREMExpressionID(), workerValue);
-				expressionProcesserController = getREMBeanProxyFactory().getBeanProxy(workerValue);
-				getREMRegistry().returnConnection(connection);
-				this.connection = null;
-			} catch (CommandException e) {
-				ProxyPlugin.getPlugin().getLogger().log(e);
-				if (!e.isRecoverable()) {
-					connection.close();
-					throwIllegalStateException(COMMAND_EXCEPTION_MSG);
-				}			
-			} finally {
-				markEndTransaction();
-			}
-		}
-	}
-
-	protected void pushTransferThreadToProxy() {
-		// Don't need to do anything. The next time we need to push data across, we will get a connection and the getConnection()
-		// will hook up the expression processor controller for us. This way if nothing happens in this thread then we won't
-		// waste communication time on it.
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java
deleted file mode 100644
index 51c9ec5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java
+++ /dev/null
@@ -1,106 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMFieldProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-final class REMFieldProxy extends REMAccessibleObjectProxy implements IFieldProxy {
-	private IBeanTypeProxy fFieldType;
-
-	REMFieldProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	/**
-	 * Return the type of the field.
-	 */
-	public IBeanTypeProxy getFieldType() {
-		if (fFieldType == null)
-			fFieldType =
-				(IBeanTypeProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetType().invokeCatchThrowableExceptions(
-					this);
-
-		return fFieldType;
-	}
-
-	/**
-	 * Release the proxy, i.e. mark it invalid.
-	 */
-	public void release() {
-		fFieldType = null;
-		super.release();
-	}
-
-	/**
-	 * Get the value of this field from the subject
-	 */
-	public IBeanProxy get(IBeanProxy subject) throws ThrowableProxy {
-		// Format of getter parms is: (Object (subject)).
-		// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-		// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-		IBeanTypeProxy fieldType = getFieldType();
-		if (!fieldType.isPrimitive()) {
-			// Use standard getter.
-			return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGet()).invoke(this, subject);
-		} else {
-			// Use the correct primitive getter.
-			int id = ((IREMBeanProxy) fieldType).getID().intValue();
-			switch (id) {
-				case Commands.BYTE_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetByte()).invoke(this, subject);
-				case Commands.BOOLEAN_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetBoolean()).invoke(
-						this,
-						subject);
-				case Commands.CHARACTER_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetChar()).invoke(this, subject);
-				case Commands.DOUBLE_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetDouble()).invoke(
-						this,
-						subject);
-				case Commands.FLOAT_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetFloat()).invoke(
-						this,
-						subject);
-				case Commands.INTEGER_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetInt()).invoke(this, subject);
-				case Commands.LONG_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetLong()).invoke(this, subject);
-				case Commands.SHORT_TYPE :
-					return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetShort()).invoke(
-						this,
-						subject);
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Set the value of this field in this subject to this value.
-	 */
-	public void set(IBeanProxy subject, IBeanProxy value) throws ThrowableProxy {
-		REMStandardBeanProxyConstants.getConstants(fFactory).getFieldSet().invoke(this, new IBeanProxy[] { subject, value });
-	}
-
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).fieldType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java
deleted file mode 100644
index b2ad41a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMFieldTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMFieldTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMFieldTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
-	super(aRegistry, new Integer(Commands.FIELD_CLASS), java.lang.reflect.Field.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
-	return new REMFieldProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java
deleted file mode 100644
index 705fdf7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMFloatClassBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote proxy implementation of INumberBeanProxy for Float.class
- */
-class REMFloatClassBeanProxy extends REMNumberBeanProxy {
-
-REMFloatClassBeanProxy(REMProxyFactoryRegistry aRegistry, Float aFloat) {
-	super(aRegistry, aFloat);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).floatClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Float) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java
deleted file mode 100644
index 150304f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMFloatClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypePRoxy for Float.class
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMFloatClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMFloatClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.FLOAT_CLASS), Float.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMFloatClassBeanProxy(aRegistry, new Float(0F));	
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createFloatBeanProxy(Float aFloat) {
-	return (aFloat.floatValue() != 0F) ?
-		new REMFloatClassBeanProxy(fRegistry, aFloat) : zeroProxy;
-}
-
-/**
- * Generic way to create an Float proxy, however, the Number must be a Float.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createFloatBeanProxy((Float) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createFloatBeanProxy(new Float(value.aFloat));
-}	
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java
deleted file mode 100644
index 76307da..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMFloatTypeBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "float".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMFloatTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final float fFloat;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMFloatTypeBeanProxy(REMProxyFactoryRegistry aRegistry, float aFloat) {
-	super(aRegistry);
-	fFloat = aFloat;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMFloatTypeBeanProxy)
-		return fFloat == ((REMFloatTypeBeanProxy) anObject).floatValue();
-	if (anObject instanceof Double)
-		return fFloat == ((Float) anObject).floatValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMFloatTypeBeanProxy)
-		return fFloat == ((REMFloatTypeBeanProxy) aBeanProxy).floatValue();
-	return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fFloat;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fFloat;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fFloat;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return (int) fFloat;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return (long) fFloat;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Float(fFloat);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fFloat;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fFloat);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).floatType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fFloat);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java
deleted file mode 100644
index 2603d2f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMFloatTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Float.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMFloatTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMFloatTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.FLOAT_TYPE), Float.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMFloatTypeBeanProxy(aRegistry, 0F);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createFloatBeanProxy(float aFloat) {
-	return (aFloat != 0F) ?
-		new REMFloatTypeBeanProxy(fRegistry, aFloat) : zeroProxy;
-}
-
-/**
- * newInstance method. float is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createFloatBeanProxy(value.aFloat);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (float) validNumber - number can be any number because (float) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of float to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	float aFloat;
-	if (trim.startsWith("(float)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(float)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aFloat = v.floatValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aFloat = Float.valueOf(initializationString).floatValue();	// See if valid float format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aFloat);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java
deleted file mode 100644
index ba76e0d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java
+++ /dev/null
@@ -1,467 +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
- *******************************************************************************/
-/*
- *  $RCSfile: REMInitErrorBeanTypeProxy.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/11 19:01:12 $ 
- */package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * A special bean type proxy. It is for those bean types that had an instantiation error while being initialized. It is so we have the message. All
- * other actions against it will fail.
- * 
- * @author richkulp
- */
-public class REMInitErrorBeanTypeProxy implements IREMBeanTypeProxy {
-
-	protected final String initializationError;
-
-	protected final REMProxyFactoryRegistry registry;
-
-	protected final String classname;
-
-	/**
-	 * Constructor for REMInitErrorBeanTypeProxy.
-	 */
-	public REMInitErrorBeanTypeProxy(REMProxyFactoryRegistry registry, String initializationError, String classname) {
-		super();
-		this.registry = registry;
-		this.initializationError = initializationError;
-		this.classname = classname;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxy#newBeanProxy(java.lang.Integer)
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxy#newBeanTypeForClass(java.lang.Integer, java.lang.String, boolean)
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getConstructors() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getFields() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getFieldProxy(String fieldName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getDeclaredFieldProxy(java.lang.String)
-	 */
-	public IFieldProxy getDeclaredFieldProxy(String fieldName) {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getMethods() {
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-		return null;
-	}
-
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentClassName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
-	 */
-	public IConstructorProxy getNullConstructorProxy() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getProxyFactoryRegistry()
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return registry;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
-	 */
-	public String getTypeName() {
-		return classname;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		return getTypeName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
-	 */
-	public boolean isArray() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
-	 */
-	public boolean isInterface() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
-	 */
-	public boolean isPrimitive() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
-	 */
-	public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
-	 */
-	public IBeanProxy newInstance() throws ThrowableProxy {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
-	 */
-	public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
-	 */
-	public String getInitializationError() {
-		return initializationError;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#getID()
-	 */
-	public Integer getID() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#release()
-	 */
-	public void release() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#renderBean(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
-	 */
-	public void renderBean(Commands.ValueObject renderInto) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
-	 */
-	public String toBeanString() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
-	 */
-	public boolean isValid() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return this == aBeanProxy; // This is place holder anyway. So only identical if same proxy.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName, String argumentClassName) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName) {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameters) {
-		return null;	// Since this guy is invalid, we can't return a method.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java
deleted file mode 100644
index bbd1efc..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMIntegerClassBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Integers. Since Integers were first implemented
- * in the VCE, and because they are often referenced, we've created
- * a subclass to handle them. That way we wouldn't need to change
- * everyone that was using the IIntegerProxy interface.
- * Creation date: (08/31/00 11:28:48 AM)
- * @author: Administrator
- */
-class REMIntegerClassBeanProxy extends REMNumberBeanProxy implements IIntegerBeanProxy {
-
-REMIntegerClassBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anInteger) {
-	super(aRegistry, anInteger);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).integerClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Integer) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java
deleted file mode 100644
index 1616a6c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMIntegerClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of INumberBeanProxy for Integer.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMIntegerClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final IIntegerBeanProxy zeroProxy;
-	private final IIntegerBeanProxy oneProxy;
-	private final IIntegerBeanProxy twoProxy;
-	private final IIntegerBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMIntegerClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.INTEGER_CLASS), Integer.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(0));	
-	oneProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(1));
-	twoProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(2));
-	threeProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(3));
-		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IIntegerBeanProxy createIntegerBeanProxy(Integer anInteger) {
-	switch(anInteger.intValue()) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMIntegerClassBeanProxy(fRegistry, anInteger);
-	}
-}
-
-/**
- * Generic way to create an Integer proxy, however, the Number must be an Integer.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createIntegerBeanProxy((Integer) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createIntegerBeanProxy(new Integer(value.anInt));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java
deleted file mode 100644
index c0990bb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMIntegerTypeBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of IIntegerBeanProxy for the primitive "int".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMIntegerTypeBeanProxy extends REMConstantBeanProxy implements IIntegerBeanProxy {
-	private final int fInt;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMIntegerTypeBeanProxy(REMProxyFactoryRegistry aRegistry, int anInt) {
-	super(aRegistry);
-	fInt = anInt;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMIntegerTypeBeanProxy)
-		return fInt == ((REMIntegerTypeBeanProxy) anObject).intValue();
-	if (anObject instanceof Integer)
-		return fInt == ((Integer) anObject).intValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMIntegerTypeBeanProxy)
-		return fInt == ((REMIntegerTypeBeanProxy) aBeanProxy).intValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fInt;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fInt;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fInt;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fInt;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fInt;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Integer(fInt);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fInt;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fInt);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).intType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fInt);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java
deleted file mode 100644
index 9a3b23a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMIntegerTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Integer.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMIntegerTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final IIntegerBeanProxy zeroProxy;
-	private final IIntegerBeanProxy oneProxy;
-	private final IIntegerBeanProxy twoProxy;
-	private final IIntegerBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMIntegerTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.INTEGER_TYPE), Integer.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMIntegerTypeBeanProxy(aRegistry, 0);	
-	oneProxy = new REMIntegerTypeBeanProxy(aRegistry, 1);
-	twoProxy = new REMIntegerTypeBeanProxy(aRegistry, 2);
-	threeProxy = new REMIntegerTypeBeanProxy(aRegistry, 3);
-		
-}
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache to see if the value is being held before creating a new one
- */
-IIntegerBeanProxy createIntegerBeanProxy(int anInt) {
-
-	switch(anInt) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMIntegerTypeBeanProxy(fRegistry, anInt);
-	}
-}
-
-/**
- * newInstance method. integer is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createIntegerBeanProxy(value.anInt);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (int) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of int to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	int anInt;
-	if (trim.startsWith("(int)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(int)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			anInt = v.intValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			anInt = Integer.decode(trim).intValue();	// See if valid int format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(anInt);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java
deleted file mode 100644
index 74f1366..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMInterfaceBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Default beantype proxy for an interface.
- */
-
-public class REMInterfaceBeanTypeProxy extends REMAbstractBeanTypeProxy {
-	
-	protected REMInterfaceBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname) {
-		super(aRegistry, anID, aClassname, null);
-	}
-	
-	/** 
-	 * Interfaces are interfaces.
-	 */
-	public boolean isInterface() {
-		return true;
-	}
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 *
-	 * For all of the interface types, this is an invalid operation. 
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * For all of the interface types, you can't create a newBeanType for subclasses since
-	 * interface aren't subclassable, only extendable.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstact) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Note: Since new instances of interfaces can never be done,
-	 * this function is not supported.
-	 */
-	public IBeanProxy newInstance() { 
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newInstance(initializationString) is valid because it can be used to create
-	 * an instance of an implementation of the interface.
-	 */
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java
deleted file mode 100644
index 9f5945c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: REMInvokable.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IInvokable;
- 
-
-/**
- * Remote Invokable. This invokes on the remote vm, but it doesn't use a method proxy. Instead
- * it sends the information to get the method to the remote vm along with the parms. That way
- * it will do the lookup on the remote vm and we don't have the overhead of two calls, one to
- * get the methodproxy and the other to actually do the invoke. This should typically be used
- * only for infrequent calls so that cache of the method proxy is not needed.
- * 
- * @since 1.0.0
- */
-class REMInvokable implements IInvokable {
-
-	protected final IREMBeanTypeProxy beanType;	// Beantype to get method from.
-	protected final String methodName;	// Method name
-	protected final IBeanTypeProxy[] methodArgTypes;	// Argument types (or null if no arguments).
-	protected final REMProxyFactoryRegistry factory;	// Factory for this invokable
-	
-	
-	REMInvokable(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] methodArgTypes) {
-		this.beanType = beanType;
-		this.methodName = methodName;
-		this.methodArgTypes = methodArgTypes;
-		this.factory = (REMProxyFactoryRegistry) beanType.getProxyFactoryRegistry();
-	}
-	
-	public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
-		return invoke(subject, (IBeanProxy[]) null);
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] parms) throws ThrowableProxy {
-		return invokeWithParms(subject, parms);
-	}
-
-	/**
-	 * The internal method that allows mixture of constants (e.g. String) with bean proxies.
-	 * A parm value can be a REMMethodProxy.ParmArray. This means this parm is an array that
-	 * needs to have a ValueRetriever created for it. This is used if the array has ID's in
-	 * it and is not an existing array on the server or all constant values.
-	 *
-	 * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
-	 *       It should still work, but it could be asking for them in the middle of the request
-	 *       if they are not first gotton.
-	 *
-	 */
-	public IBeanProxy invokeWithParms(IBeanProxy subject, final Object[] parms) throws ThrowableProxy {
-		IREMConnection connect = factory.getFreeConnection();
-		REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) factory.getBeanProxyFactory();
-		proxyFactory.startTransaction(); // This is definately a transaction, so start it.
-		try {
-			// First need to send the method info.
-			Commands.ValueObject classValue = new Commands.ValueObject();
-			beanType.renderBean(classValue);
-			
-			Commands.ValueObject parmTypesValue = new Commands.ValueObject();
-			if (methodArgTypes != null) {
-				class Retriever implements Commands.ValueRetrieve {
-					int index = 0;
-					Object[] array;
-					Commands.ValueObject worker = new Commands.ValueObject();
-
-					public Retriever(Object[] anArray) {
-						array = anArray;
-					}
-
-					public Commands.ValueObject nextValue() {
-						Object parm = array[index++];
-						((IREMBeanTypeProxy) parm).renderBean(worker);
-						return worker;
-					}
-				};
-
-				parmTypesValue.setArrayIDS(new Retriever(methodArgTypes), methodArgTypes.length, Commands.CLASS_CLASS); // Create Class[].
-			}
-			
-			
-			// Now we start building the actual invocation.
-			
-			Commands.ValueObject subjectValue = new Commands.ValueObject();
-			if (subject != null)
-				 ((IREMBeanProxy) subject).renderBean(subjectValue);
-
-			Commands.ValueObject parmsValue = new Commands.ValueObject();
-
-			if (parms != null) {
-				// Have a local definition of the retriever so that the retriever can create
-				// another one of itself if necessary.
-				final IStandardBeanTypeProxyFactory typeFactory = factory.getBeanTypeProxyFactory();
-
-				class Retriever implements Commands.ValueRetrieve {
-					int index = 0;
-					Object[] array;
-					Commands.ValueObject worker = new Commands.ValueObject();
-
-					public Retriever(Object[] anArray) {
-						array = anArray;
-					}
-
-					public Commands.ValueObject nextValue() {
-						Object parm = array[index++];
-						if (parm != null)
-							if (parm instanceof IREMBeanProxy)
-								 ((IREMBeanProxy) parm).renderBean(worker);
-							else if (parm instanceof TransmitableArray) {
-								// It is another array, create a new retriever.
-								worker.setArrayIDS(
-									new Retriever(((TransmitableArray) parm).array),
-									((TransmitableArray) parm).array.length,
-									((TransmitableArray) parm).componentTypeID);
-							} else {
-								// It's an object. Need to get bean type so that we can send it.
-								IREMBeanProxy type = (IREMBeanProxy) typeFactory.getBeanTypeProxy(parm.getClass().getName());
-								if (type == null)
-									throw new IllegalArgumentException();
-								int classID = type.getID().intValue();
-								worker.setAsObject(parm, classID);
-							}
-						else
-							worker.set();
-						return worker; 
-					}
-				};
-
-				parmsValue.setArrayIDS(new Retriever(parms), parms.length, Commands.OBJECT_CLASS); // Create Object[].
-			}
-
-			Commands.ValueObject returnValue = new Commands.ValueObject();
-			try {
-				invoke(connect, proxyFactory, classValue, parmTypesValue, subjectValue, parmsValue, returnValue);
-				return proxyFactory.getBeanProxy(returnValue);
-			} catch (CommandException e) {
-				if (!e.isRecoverable()) {
-					// Close the connection and try again.
-					factory.closeConnection(connect);
-					connect = null;
-					connect = factory.getFreeConnection();
-					try {
-						invoke(connect, proxyFactory, classValue, parmTypesValue, subjectValue, parmsValue, returnValue);
-						return proxyFactory.getBeanProxy(returnValue);
-					} catch (CommandException eAgain) {
-						// Failed again. Just close and print trace.
-						factory.closeConnection(connect);
-						connect = null;
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-						return null;
-					}
-				} else {
-					// A recoverable error, print trace and return
-					ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-					return null;
-				}
-			}
-		} finally {
-			proxyFactory.stopTransaction();
-			if (connect != null)
-				factory.returnConnection(connect);
-		}
-	}
-
-private void invoke(
-		IREMConnection connect,
-		REMStandardBeanProxyFactory proxyFactory,
-		Commands.ValueObject classTypeValue,
-		Commands.ValueObject parmTypesValue,
-		Commands.ValueObject subjectValue,
-		Commands.ValueObject parmsValue,
-		Commands.ValueObject returnValue)
-		throws ThrowableProxy, CommandException {
-		try {
-			connect.invokeMethod(classTypeValue, methodName, parmTypesValue, subjectValue, parmsValue, returnValue);
-		} catch (CommandErrorException e) {
-			proxyFactory.processErrorReturn(e);
-		}
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy parm) throws ThrowableProxy {
-		return invoke(subject, new IBeanProxy[] { parm });
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
-		try {
-			return invoke(subject);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] parms) {
-		try {
-			return invoke(subject, parms);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy parm) {
-		try {
-			return invoke(subject, parm);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java
deleted file mode 100644
index 12def07..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMLongClassBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Long.class.
- */
-class REMLongClassBeanProxy extends REMNumberBeanProxy {
-
-REMLongClassBeanProxy(REMProxyFactoryRegistry aRegistry, Long aLong) {
-	super(aRegistry, aLong);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).longClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Long) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java
deleted file mode 100644
index 7848eee..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMLongClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy Long.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMLongClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMLongClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.LONG_CLASS), Long.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMLongClassBeanProxy(aRegistry, new Long(0));	
-	oneProxy = new REMLongClassBeanProxy(aRegistry, new Long(1));
-	twoProxy = new REMLongClassBeanProxy(aRegistry, new Long(2));
-	threeProxy = new REMLongClassBeanProxy(aRegistry, new Long(3));		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createLongBeanProxy(Long aLong) {
-	if (aLong.longValue() >= 0 && aLong.longValue() < 4) {
-		// Switch statements don't work with longs.
-		switch(aLong.intValue()) {
-			case 0: return zeroProxy;
-			case 1: return oneProxy ;
-			case 2: return twoProxy ;
-			case 3: return threeProxy ;
-		}
-	} 
-	return new REMLongClassBeanProxy(fRegistry, aLong);
-}
-
-/**
- * Generic way to create a Long proxy, however, the Number must be a Long.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createLongBeanProxy((Long) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createLongBeanProxy(new Long(value.aLong));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java
deleted file mode 100644
index bbe5720..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMLongTypeBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "long".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMLongTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final long fLong;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMLongTypeBeanProxy(REMProxyFactoryRegistry aRegistry, long aLong) {
-	super(aRegistry);
-	fLong = aLong;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMLongTypeBeanProxy)
-		return fLong == ((REMLongTypeBeanProxy) anObject).longValue();
-	if (anObject instanceof Long)
-		return fLong == ((Long) anObject).longValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMLongTypeBeanProxy)
-		return fLong == ((REMLongTypeBeanProxy) aBeanProxy).longValue();
-	return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fLong;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fLong;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fLong;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return (int) fLong;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fLong;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Long(fLong);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return (short) fLong;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fLong);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).longType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fLong);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java
deleted file mode 100644
index 5a7e2a0..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMLongTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Long.TYPE/
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMLongTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMLongTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.LONG_TYPE), Long.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMLongTypeBeanProxy(aRegistry, 0);	
-	oneProxy = new REMLongTypeBeanProxy(aRegistry, 1);
-	twoProxy = new REMLongTypeBeanProxy(aRegistry, 2);
-	threeProxy = new REMLongTypeBeanProxy(aRegistry, 3);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createLongBeanProxy(long aLong) {
-	if (aLong >= 0 && aLong < 4) {
-		// Switch statements don't work with longs.
-		switch((int) aLong) {
-			case 0: return zeroProxy;
-			case 1: return oneProxy ;
-			case 2: return twoProxy ;
-			case 3: return threeProxy ;
-		}
-	} 
-	return new REMLongTypeBeanProxy(fRegistry, aLong);
-}
-
-/**
- * newInstance method. long is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}	
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createLongBeanProxy(value.aLong);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (long) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of long to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);
-	long aLong;
-	if (trim.startsWith("(long)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(long)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aLong = v.longValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		if (trim.charAt(trim.length()-1) == 'L' || trim.charAt(trim.length()-1) == 'l')
-			trim = trim.substring(0, trim.length()-1);
-		try {
-			aLong = Long.decode(trim).longValue();	// See if valid long format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aLong);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
deleted file mode 100644
index 24a3078..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
+++ /dev/null
@@ -1,172 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMMasterServerThread.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Master Server thread for the Remote VMs.
- * 
- * It responds to the remote vm requests to this IDE.
- * 
- * It is package-protected because only ProxyRemotePluguin should access it.
- * @author richkulp
- */
-class REMMasterServerThread extends Thread {
-	
-	protected ServerSocket masterServerSocket;
-	protected REMRegistryController registryController;
-	protected boolean shuttingDown = false;
-	
-	// Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
-	// wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
-	// in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
-	static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3");	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	
-	
-	public REMMasterServerThread(REMRegistryController registryController) {
-		super("Remote Proxy Master Server Thread");	//$NON-NLS-1$
-		this.registryController = registryController;
-		
-		try {
-			masterServerSocket = new ServerSocket(0, 50, InetAddress.getByName("localhost"));	// Any available port //$NON-NLS-1$
-			if (LINUX_1_3)
-				masterServerSocket.setSoTimeout(1000);	// Linux 1.3 bug, see comment on LINUX_1_3
-		} catch (SocketException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket.
-		} catch (IOException e) {				
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	// This is bad. Should be no exceptions creating a socket.
-		}			
-	}
-
-	public ServerSocket getMasterSocket() {
-		return masterServerSocket;
-	}
-	
-	/**
-	 * @see java.lang.Thread#run()
-	 */
-	public void run() {
-		try {
-			while (masterServerSocket != null) {
-				Socket incoming = null;
-				try {
-					incoming = masterServerSocket.accept();
-				} catch (InterruptedIOException e) {
-					continue; // Timeout, try again
-				} catch (NullPointerException e) {
-					continue;	// In Linux 1.3 case masterServerSocket could of gone null between loop test and try block.
-				}
-				boolean close = false;	// process request will tell if socket should be closed. it may be passed onto callback thread instead.
-				try {
-					close = processRequest(incoming);
-				} finally {
-					if (close) {
-						try {
-						incoming.close();
-					} catch (IOException e) {
-					}
-				}
-}
-				incoming = null;
-			}
-		} catch (Exception e) {
-			if (!shuttingDown)
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		}
-		
-		shutdown();	// Either a bad exception or we were closed. Either way is shutdown.
-	}
-	
-	/**
-	 * Use this to request a shutdown.
-	 */
-	public void requestShutdown() {		
-		if (masterServerSocket == null)
-			return;
-		// Closing the server socket should cause a break.
-		try {
-			shuttingDown = true;
-			masterServerSocket.close();
-		} catch (Exception e) {
-		}
-		return;
-	}	
-	
-	protected boolean processRequest(Socket remote) throws IOException {
-		DataInputStream	in = new DataInputStream(remote.getInputStream());
-		DataOutputStream out = new DataOutputStream(remote.getOutputStream());
-		boolean  close = true;	// flag indicating socket not given over to callback. Don't close the socket when done because callback has it.
-		try {
-			byte cmd = in.readByte();
-			switch (cmd) {
-				case Commands.ALIVE:
-					int registryID = in.readInt();
-					out.writeBoolean(registryController.getRegistry(new Integer(registryID)) != null);	// Return if registry still alive
-					out.flush();
-					break;
-					
-				case Commands.REMOTE_STARTED:
-					registryID = in.readInt();
-					int remoteServerPort = in.readInt();
-					REMProxyFactoryRegistry registry = registryController.getRegistry(new Integer(registryID));
-					if (registry != null) {
-						registry.setServerPort(remoteServerPort);
-						out.writeBoolean(true);
-					} else
-						out.writeBoolean(false);	// No registry
-					out.flush();
-					break;
-					
-				case Commands.ATTACH_CALLBACK:
-					registryID = in.readInt();
-					registry = registryController.getRegistry(new Integer(registryID));
-					if (registry != null) {
-						close = !((REMCallbackRegistry) registry.getCallbackRegistry()).createCallback(remote);	// close if failed, don't close if good.
-						out.writeBoolean(!close);	// if not close, then return it worked.
-					} else
-						out.writeBoolean(false);
-					out.flush();
-					break;
-			}
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));	
-		} finally {
-			if (close) {
-				try {
-					in.close();
-				} catch (IOException e) {
-				}
-				try {
-					out.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-		return close;
-	}
-	
-	private void shutdown() {
-		requestShutdown();
-		masterServerSocket = null;		
-	}		
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java
deleted file mode 100644
index f343a04..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java
+++ /dev/null
@@ -1,268 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMMethodProxy.java,v $
- *  $Revision: 1.10 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-/**
- * Remote VM implementation of the MethodProxy
- */
-
-final class REMMethodProxy extends REMAccessibleObjectProxy implements IREMMethodProxy {
-
-	private IBeanTypeProxy fDeclaringType;
-	private String fMethodName;
-	private IBeanTypeProxy[] fParameterTypes;
-	private IBeanTypeProxy fReturnType;
-
-	REMMethodProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
-		super(aRegistry, anID);
-	}
-
-	public IBeanTypeProxy getClassType() {
-		if (fDeclaringType == null)
-			fDeclaringType =
-				(IBeanTypeProxy) REMStandardBeanProxyConstants
-					.getConstants(fFactory)
-					.getMethodDeclaringClassMessage()
-					.invokeCatchThrowableExceptions(
-					this);
-		return fDeclaringType;
-	}
-
-	public String getName() {
-		if (fMethodName == null) {
-			IStringBeanProxy proxy =
-				(IStringBeanProxy) REMStandardBeanProxyConstants
-					.getConstants(fFactory)
-					.getMethodMethodNameMessage()
-					.invokeCatchThrowableExceptions(
-					this);
-			if (proxy != null)
-				fMethodName = proxy.stringValue();
-			else
-				fMethodName = ""; //$NON-NLS-1$
-		}
-		return fMethodName;
-	}
-
-	public synchronized IBeanTypeProxy[] getParameterTypes() {
-		if (fParameterTypes == null) {
-			IArrayBeanProxy parmTypes = (IArrayBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory)
-					.getMethodParameterTypesMessage().invokeCatchThrowableExceptions(this);
-			if (parmTypes == null)
-				fParameterTypes = new IBeanTypeProxy[0]; // There was some error, only way null is returned
-			else {
-				int len = parmTypes.getLength();
-				fParameterTypes = new IBeanTypeProxy[len];
-				for (int i = 0; i < len; i++)
-					try {
-						fParameterTypes[i] = (IBeanTypeProxy) parmTypes.get(i);
-					} catch (ThrowableProxy e) {
-					}
-				fFactory.releaseProxy(parmTypes); // Don't need the array on the server anymore.
-			}
-		}
-
-		return fParameterTypes;
-	}
-
-	public IBeanTypeProxy getReturnType() {
-		if (fReturnType == null)
-			fReturnType =
-				(IBeanTypeProxy) REMStandardBeanProxyConstants
-					.getConstants(fFactory)
-					.getMethodReturnTypeMessage()
-					.invokeCatchThrowableExceptions(
-					this);
-		return fReturnType;
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
-		return invoke(subject, (IBeanProxy[]) null);
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] parms) throws ThrowableProxy {
-		return invokeWithParms(subject, parms);
-	}
-
-	/**
-	 * The internal method that allows mixture of constants (e.g. String) with bean proxies.
-	 * A parm value can be a REMMethodProxy.ParmArray. This means this parm is an array that
-	 * needs to have a ValueRetriever created for it. This is used if the array has ID's in
-	 * it and is not an existing array on the server or all constant values.
-	 *
-	 * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
-	 *       It should still work, but it could be asking for them in the middle of the request
-	 *       if they are not first gotton.
-	 *
-	 * NOTE: This is in IREMMethodProxy only so that other REM proxy implementations can access it.
-	 */
-
-	public IBeanProxy invokeWithParms(IBeanProxy subject, final Object[] parms) throws ThrowableProxy {
-		IREMConnection connect = fFactory.getFreeConnection();
-		REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory();
-		proxyFactory.startTransaction(); // This is definately a transaction, so start it.
-		try {
-			Commands.ValueObject subjectValue = new Commands.ValueObject();
-			if (subject != null)
-				 ((IREMBeanProxy) subject).renderBean(subjectValue);
-
-			Commands.ValueObject parmsValue = new Commands.ValueObject();
-
-			if (parms != null) {
-				// Have a local definition of the retriever so that the retriever can create
-				// another one of itself if necessary.
-				final IStandardBeanTypeProxyFactory typeFactory = fFactory.getBeanTypeProxyFactory();
-
-				class Retriever implements Commands.ValueRetrieve {
-					int index = 0;
-					Object[] array;
-					Commands.ValueObject worker = new Commands.ValueObject();
-
-					public Retriever(Object[] anArray) {
-						array = anArray;
-					}
-
-					public Commands.ValueObject nextValue() {
-						Object parm = array[index++];
-						if (parm != null)
-							if (parm instanceof IREMBeanProxy)
-								 ((IREMBeanProxy) parm).renderBean(worker);
-							else if (parm instanceof TransmitableArray) {
-								// It is another array, create a new retriever.
-								worker.setArrayIDS(
-									new Retriever(((TransmitableArray) parm).array),
-									((TransmitableArray) parm).array.length,
-									((TransmitableArray) parm).componentTypeID);
-							} else {
-								// It's an object. Need to get bean type so that we can send it.
-								IREMBeanProxy type = (IREMBeanProxy) typeFactory.getBeanTypeProxy(parm.getClass().getName());
-								if (type == null)
-									throw new IllegalArgumentException();
-								int classID = type.getID().intValue();
-								worker.setAsObject(parm, classID);
-							}
-						else
-							worker.set();
-						return worker; 
-					}
-				};
-
-				parmsValue.setArrayIDS(new Retriever(parms), parms.length, Commands.OBJECT_CLASS); // Create Object[].
-			}
-
-			Commands.ValueObject returnValue = new Commands.ValueObject();
-			try {
-				invoke(connect, proxyFactory, subjectValue, parmsValue, returnValue);
-				return proxyFactory.getBeanProxy(returnValue);
-			} catch (CommandException e) {
-				if (!e.isRecoverable()) {
-					// Close the connection and try again.
-					fFactory.closeConnection(connect);
-					connect = null;
-					connect = fFactory.getFreeConnection();
-					try {
-						invoke(connect, proxyFactory, subjectValue, parmsValue, returnValue);
-						return proxyFactory.getBeanProxy(returnValue);
-					} catch (CommandException eAgain) {
-						// Failed again. Just close and print trace.
-						fFactory.closeConnection(connect);
-						connect = null;
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-						return null;
-					}
-				} else {
-					// A recoverable error, print trace and return
-					ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-					return null;
-				}
-			}
-		} finally {
-			proxyFactory.stopTransaction();
-			if (connect != null)
-				fFactory.returnConnection(connect);
-		}
-	}
-
-private void invoke(
-		IREMConnection connect,
-		REMStandardBeanProxyFactory proxyFactory,
-		Commands.ValueObject subjectValue,
-		Commands.ValueObject parmsValue,
-		Commands.ValueObject returnValue)
-		throws ThrowableProxy, CommandException {
-		try {
-			connect.invokeMethod(getID().intValue(), subjectValue, parmsValue, returnValue);
-		} catch (CommandErrorException e) {
-			proxyFactory.processErrorReturn(e);
-		}
-	}
-
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy parm) throws ThrowableProxy {
-		return invoke(subject, new IBeanProxy[] { parm });
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
-		try {
-			return invoke(subject);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] parms) {
-		try {
-			return invoke(subject, parms);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy parm) {
-		try {
-			return invoke(subject, parm);
-		} catch (ThrowableProxy e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
-			return null;
-		}
-	}
-
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).methodType;
-	}
-
-	/**
-	 * The bean is being released, clear out the fields so they can be GC'd if necessary.
-	 * Usually only big objects and proxy fields need to be cleared.
-	 */
-	public void release() {
-		fDeclaringType = null;
-		fParameterTypes = null;
-		fReturnType = null;
-		super.release();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java
deleted file mode 100644
index 75bdc5f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java
+++ /dev/null
@@ -1,305 +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
- *******************************************************************************/
-/*
- *  $RCSfile: REMMethodProxyFactory.java,v $
- *  $Revision: 1.9 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.lang.reflect.AccessibleObject;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-
-/**
- * Factory for creating method proxies. Creation date: (12/3/99 6:29:40 PM)
- * 
- * @author: Joe Winchester
- */
-public class REMMethodProxyFactory implements IMethodProxyFactory {
-
-	final protected REMProxyFactoryRegistry fFactoryRegistry;
-
-	// Cached copy of a few typical method type proxies.
-	IREMBeanTypeProxy accessibleType;
-
-	REMMethodTypeProxy methodType;
-
-	REMFieldTypeProxy fieldType;
-
-	REMConstructorTypeProxy ctorType;
-
-	REMMethodProxy getMethodProxy;
-
-	REMMethodProxyFactory(REMProxyFactoryRegistry aRegistry) {
-		fFactoryRegistry = aRegistry;
-		aRegistry.registerMethodProxyFactory(this);
-		REMStandardBeanTypeProxyFactory typeFactory = (REMStandardBeanTypeProxyFactory) aRegistry.getBeanTypeProxyFactory();
-
-		accessibleType = typeFactory.objectClass.newBeanTypeForClass(new Integer(Commands.ACCESSIBLEOBJECT_CLASS), AccessibleObject.class.getName(),
-				false);
-		methodType = new REMMethodTypeProxy(aRegistry, accessibleType);
-		fieldType = new REMFieldTypeProxy(aRegistry, accessibleType);
-		ctorType = new REMConstructorTypeProxy(aRegistry, accessibleType);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(accessibleType, true);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(methodType, true);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(fieldType, true);
-		aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(ctorType, true);
-
-		getMethodProxy = (REMMethodProxy) methodType.newBeanProxy(new Integer(Commands.GET_METHOD_ID));
-		((REMStandardBeanProxyFactory) aRegistry.getBeanProxyFactory()).registerProxy(getMethodProxy);
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes) {
-		IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IBeanTypeProxy clsProxy = typeFactory.getBeanTypeProxy(className);
-		if (clsProxy == null)
-			return null;
-		// This will redirect to the beantype, which will go through the method cache.
-		return clsProxy.getMethodProxy(methodName, parameterTypes);
-	}
-	
-	/**
-	 * A helper method to get the method proxy for the expression. This is used by registries and beantype proxies. It will go through
-	 * the method cache to make sure we get only one.
-	 * 
-	 * @param expression
-	 * @param aBeanTypeProxy
-	 * @param methodName
-	 * @param parmTypes
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String methodName, IProxyBeanType[] parmTypes){
-		return ((REMStandardBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(expression, aBeanTypeProxy, methodName, parmTypes);
-	}
-	
-	/**
-	 * A helper method to get the field proxy for the expression. This is used by registries and beantype proxies. It will go through
-	 * the method cache to make sure we get only one.
-	 * @param expression
-	 * @param aBeanTypeProxy
-	 * @param fieldName
-	 * 
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyField getFieldProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String fieldName){
-		return ((REMStandardBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactory()).proxyConstants.getFieldProxy(expression, aBeanTypeProxy, fieldName);
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String className, String fieldName) {
-		// We are getting the class resolved through the expression. Might as well because it probably will
-		// be needed again and this way when the expression is finished it will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
-		return beanType.getFieldProxy(expression, fieldName);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes) {
-		// We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
-		// be needed again and this way when the expression is finished they will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
-		IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
-		return beanType.getMethodProxy(expression, methodName, parmTypes);
-	}
-	
-	/**
-	 * Helper method for BeanTypes and proxy Beantypes. So they don't need to have common code to convert string to proxy bean type.
-	 * @param expression
-	 * @param classType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType classType, String methodName, String[] parameterTypes) {
-		// We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
-		// be needed again and this way when the expression is finished they will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
-		return classType.getMethodProxy(expression, methodName, parmTypes);
-	}
-
-	/**
-	 * @param expression
-	 * @param parameterTypes
-	 * @param beanTypeProxyFactory
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IProxyBeanType[] getParameterTypes(IExpression expression, String[] parameterTypes, IStandardBeanTypeProxyFactory beanTypeProxyFactory) {
-		IProxyBeanType[] parmTypes;
-		if (parameterTypes == null || parameterTypes.length == 0)
-			parmTypes = null;
-		else {
-			parmTypes = new IProxyBeanType[parameterTypes.length];
-			for (int i = 0; i < parameterTypes.length; i++) {
-				parmTypes[i] = beanTypeProxyFactory.getBeanTypeProxy(expression, parameterTypes[i]);
-			}
-		}
-		return parmTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getInvokable(java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String className, String methodName, String[] parameterTypes) {
-		IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-		IBeanTypeProxy clsProxy = typeFactory.getBeanTypeProxy(className);
-		if (clsProxy == null)
-			return null;
-		return clsProxy.getInvokable(methodName, parameterTypes);
-	}
-
-	/**
-	 * Get the method id from the remote system and create the method proxy.
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 * 
-	 * @param beanType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(IREMBeanTypeProxy beanType, String methodName, String[] parameterTypes) {
-		// First convert the parameter types into IBeanTypeProxy[].
-		IREMBeanTypeProxy[] types = null;
-		if (parameterTypes != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-			types = new IREMBeanTypeProxy[parameterTypes.length];
-			for (int i = 0; i < parameterTypes.length; i++) {
-				IBeanTypeProxy type = types[i] = (IREMBeanTypeProxy) typeFactory.getBeanTypeProxy(parameterTypes[i]);
-				if (type == null)
-					return null; // One of the parm types doesn't exist.
-			}
-		}
-
-		return getInvokable(beanType, methodName, types);		
-	}
-	
-	/**
-	 * Get the method id from the remote system and create the method proxy.
-	 * This does not go through the method cache. It goes direct to the remote vm.
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 */
-	public IMethodProxy getMethodProxy(IREMBeanTypeProxy beanType, String methodName, String[] parameterTypes) {
-		// First convert the parameter types into IBeanTypeProxy[].
-		IBeanTypeProxy[] types = null;
-		if (parameterTypes != null) {
-			IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
-			types = new IBeanTypeProxy[parameterTypes.length];
-			for (int i = 0; i < parameterTypes.length; i++) {
-				IBeanTypeProxy type = types[i] = typeFactory.getBeanTypeProxy(parameterTypes[i]);
-				if (type == null)
-					return null; // One of the parm types doesn't exist.
-			}
-		}
-
-		return getMethodProxy(beanType, methodName, types);
-	}
-
-	
-	/**
-	 * Get the invokable. 
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 * @param beanType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public IInvokable getInvokable(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] parameterTypes) {
-		return new REMInvokable(beanType, methodName, parameterTypes);
-	}
-	
-	/**
-	 * Get the method id from the remote system and create the method proxy.
-	 * <p>
-	 * This does not go through the method cache. It goes direct to the remote vm.
-	 * 
-	 * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
-	 */
-	public IMethodProxy getMethodProxy(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] parameterTypes) {
-		// The parms to getMethod are:
-		// parm[0] = String - method name
-		// parm[1] = Class[] - Parameter Classes.
-		Object[] parms = new Object[] { methodName, parameterTypes != null ? (new TransmitableArray(Commands.CLASS_CLASS, parameterTypes)) : null};
-		IBeanProxy result = null;
-		try {
-			result = getMethodProxy.invokeWithParms(beanType, parms);
-			return (IMethodProxy) result;
-		} catch (ThrowableProxy e) {
-			fFactoryRegistry.releaseProxy(e); // Since it's not needed, get rid of now instead of GC time.
-			return null;
-		} catch (ClassCastException e) {
-			// Some trace msgs because we keep getting into a mode after awhile (though not reproducible) that returns non-method proxies and we need
-			// more info.
-			StringBuffer buf = new StringBuffer("Method requested is \"" + methodName + "("); //$NON-NLS-1$	//$NON-NLS-2$
-			for (int i = 0; i < parameterTypes.length; i++) {
-				if (i > 0)
-					buf.append(','); //$NON-NLS-1$
-				buf.append(parameterTypes[i].getTypeName());
-			}
-			buf.append(")\""); //$NON-NLS-1$
-			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, buf.toString(), null));
-			try {
-				if (result != null) {
-					ProxyPlugin.getPlugin().getLogger().log(
-							new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0,
-									"ClassCastException of result. Return type is \"" + result.getTypeProxy().getTypeName() + "\"\n" + //$NON-NLS-1$	//$NON-NLS-2$
-											"Return type bean type proxy class=\"" + result.getTypeProxy().getClass().getName() + "\"\n" + //$NON-NLS-1$	//$NON-NLS-2$
-											"GetMethodProxy valid=" + getMethodProxy.isValid() + "\n" + //$NON-NLS-1$	//$NON-NLS-2$
-											"GetMethodProxy real name is \"" + getMethodProxy.getName() + "\"\n", null)); //$NON-NLS-1$	//$NON-NLS-2$			
-				}
-			} catch (Exception e2) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e2)); //$NON-NLS-1$
-			}
-			throw e; // Rethrow it.
-		}
-	}
-
-	/*
-	 * Terminate the factory. Don't need to do anything because of the proxies being held onto are registered any will be cleaned up themselves.
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java
deleted file mode 100644
index 5e74f6d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMMethodTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMMethodTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMMethodTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
-	super(aRegistry, new Integer(Commands.METHOD_CLASS), java.lang.reflect.Method.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
-	return new REMMethodProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() { 
-	throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
-	throw new UnsupportedOperationException();
-}		
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java
deleted file mode 100644
index 268ac32..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMNumberBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Remote Implementation of INumberBeanProxy for any Number (i.e. the non-primitives)
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-abstract class REMNumberBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final Number fNumberValue;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMNumberBeanProxy(REMProxyFactoryRegistry aRegistry, Number aNumber) {
-	super(aRegistry);
-	fNumberValue = aNumber;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMNumberBeanProxy)
-		return fNumberValue.equals(((REMNumberBeanProxy) anObject).numberValue());
-	if (anObject instanceof Number)
-		return fNumberValue.equals(anObject);
-	return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return fNumberValue.byteValue();
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fNumberValue.doubleValue();
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fNumberValue.floatValue();
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fNumberValue.intValue();
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fNumberValue.longValue();
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return fNumberValue;
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return fNumberValue.shortValue();
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return fNumberValue.toString();
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java
deleted file mode 100644
index ca8b7df..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMPrimitiveBeanTypeProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Primitive BeanType Proxies
- */
-public abstract class REMPrimitiveBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy  {
-	
-	protected REMPrimitiveBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname) {
-		super(aRegistry, anID, aClassname, null);
-	}
-	
-	/**
-	 * Return whether this is the primitive Byte.TYPE or Byte.class
-	 */
-	public boolean isPrimitive() {
-		return true;
-	}
-	
-	/**
-	 * Return the null ctor proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */		
-	public IConstructorProxy getNullConstructorProxy() {	
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {	
-		throw new UnsupportedOperationException();
-	}	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getFields() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 * 
-	 * For all of the primitive types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the field for the target VM being the same as the REM
-	 * For all of the primitive types, this is an invalid operation.
-	 */	
-	public IFieldProxy getFieldProxy(String fieldName) {	
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-		
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */	
-	public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments.
-	 * For all of the primitive types, this is an invalid operation.	 
-	 */		
-	public IMethodProxy getMethodProxy(String methodName) {	
-		throw new UnsupportedOperationException();
-	}
-	
-	
-	/**
-	 * Create a new bean proxy with the specified id.
-	 *
-	 * For all of the primitive types, this is an invalid operation. They are created
-	 * explicitly through the appropriate create method.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer anID) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * For all of the primitive types, they aren't classes, so you can't create a newBeanType 
-	 * for subclasses.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		throw new UnsupportedOperationException();
-	}
-	
-	/**
-	 * release - BeanType is about to be released.
-	 * primitives don't need to be released, they don't hold onto any ids or resources.
-	 */
-	public void release() {
-	}
-	
-	/**
-	 * Have a string that should represent a number.
-	 * See if it ends in a type letter, if so parse as such.
-	 * See if there is an 'E' in it, then parse as a double.
-	 * If neither condition, then try parse as long, if that 
-	 * fails try as double.
-	 */
-	protected static Number parseString(String v) {
-		if (v.length() == 0)
-			return null;
-		char last = v.charAt(v.length()-1);
-		try {
-			switch (last) {
-				case 'd':
-				case 'D':
-					return Double.valueOf(v);
-				case 'f':
-				case 'F':
-					return Float.valueOf(v);
-				case 'l':
-				case 'L':
-					return Long.decode(v.substring(0, v.length()-1));
-			}
-		} catch (NumberFormatException e) {
-			return null;
-		}
-		
-		try {
-			return Long.decode(v);
-		} catch (NumberFormatException e) {
-			try {
-				return Double.valueOf(v);
-			} catch (NumberFormatException e1) {
-				return null;
-			}
-		}
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
deleted file mode 100644
index bff0693..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
+++ /dev/null
@@ -1,679 +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: REMProxyConstants.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.util.*;
-import java.util.Map.Entry;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-
-
-
-/**
- * MethodProxyConstants is a cache of IMethodProxies to avoid repeated lookup
- * and thereby avoid the relatively expensive java.lang.reflect calls to repeatedly
- * lookup method by name
- * 
- * @since 1.1.0
- */
-public class REMProxyConstants {
-
-	private Map methodsCache = new HashMap(80);
-	private Map invokablesCache = new HashMap(80);	
-	private Map fieldsCache = new HashMap(80);
-	
-	private REMProxyFactoryRegistry registry;
-	
-	public REMProxyConstants(REMProxyFactoryRegistry registry) {
-		this.registry = registry;
-	}
-	
-	/*
-	 * Used as the key to the methodCache and invokablesCache when there are parms.
-	 * It allows the parms to be either strings or IBeanTypeProxies without the
-	 * overhead of creating complicated strings.
-	 * 
-	 * It will compare method name and each individual parm name without fluffing
-	 * up a string and building it up.
-	 * 
-	 * For no parm methods, just the name of the method as a string will be the key.
-	 * 
-	 * @since 1.1.0
-	 */
-	private abstract static class MethodKey {
-		public String methodName;
-		public MethodKey(String methodName) {
-			this.methodName = methodName;
-		}
-				
-		protected abstract boolean compareParms(IProxyBeanType[] parms);
-		protected abstract boolean compareParms(String[] parms);
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
-		public int hashCode() {
-			return methodName.hashCode();
-		}
-	}
-	
-	private static class MethodKeyStringParms extends MethodKey {
-		public String[] parmNames;
-		
-		public MethodKeyStringParms(String methodName, String[] parmNames) {
-			super(methodName);
-			this.parmNames = parmNames;
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			try {
-				return ((MethodKey) obj).compareParms(parmNames);
-			} catch (ClassCastException e) {
-				return false;
-			}
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
-		 */
-		public int hashCode() {
-			int h = super.hashCode();
-			for (int i = 0; i < parmNames.length; i++) {
-				h += parmNames[i].hashCode();
-			}
-			return h;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-		 */
-		protected boolean compareParms(IProxyBeanType[] parms) {
-			if (parms.length != parmNames.length)
-				return false;
-			for (int i = 0; i < parms.length; i++) {
-				if (!parms[i].getTypeName().equals(parmNames[i]))
-					return false;
-			}
-			return true;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
-		 */
-		protected boolean compareParms(String[] parms) {
-			return Arrays.equals(parms, parmNames);
-		}
-	}
-	
-	private static class MethodKeyProxyParms extends MethodKey {
-		public IProxyBeanType[] parmTypes;
-		
-		public MethodKeyProxyParms(String methodName, IProxyBeanType[] parmTypes) {
-			super(methodName);
-			this.parmTypes = parmTypes;
-		}
-		
-		public Object toMethodKeyStringParms() {
-			String[] parms = new String[parmTypes.length];
-			for (int i = 0; i < parmTypes.length; i++) {
-				parms[i] = parmTypes[i].getTypeName();
-			}
-			return new MethodKeyStringParms(methodName, parms);
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			try {
-				return ((MethodKey) obj).compareParms(parmTypes);
-			} catch (ClassCastException e) {
-				return false;
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
-		 */
-		public int hashCode() {
-			int h = super.hashCode();
-			for (int i = 0; i < parmTypes.length; i++) {
-				h += parmTypes[i].getTypeName().hashCode();
-			}
-			return h;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-		 */
-		protected boolean compareParms(String[] parms) {
-			if (parms.length != parmTypes.length)
-				return false;
-			for (int i = 0; i < parms.length; i++) {
-				if (!parmTypes[i].getTypeName().equals(parms[i]))
-					return false;
-			}
-			return true;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
-		 */
-		protected boolean compareParms(IProxyBeanType[] parms) {
-			if (parms.length != parmTypes.length)
-				return false;
-			for (int i = 0; i < parms.length; i++) {
-				if (!parmTypes[i].getTypeName().equals(parms[i].getTypeName()))
-					return false;
-			}
-			return true;
-		}		
-	}
-		
-	static int REMMETHODCOUNT = 0;
-	static int UNIQUEMETHODCOUNT = 0;	
-	static int REMINVOKABLECOUNT = 0;
-	static int UNIQUEINVOKABLECOUNT = 0;
-	static int INVOKEINVOKECOUNT = 0;
-	static int METHODPROXYINVOKECOUNT = 0;
-	static int REMFIELDCOUNT = 0;
-	static int UNIQUEFIELDCOUNT = 0;
-	static int REMCONSTRUCTORCALLED = 0;
-	static HashMap METHODCOUNTMAP;
-	static HashMap FIELDCOUNTMAP;	 
-	static HashMap FIELDSETCOUNTMAP;
-	static boolean GATHER_COUNTS;
-	
-	/**
-	 * Set if counts should be gathered.
-	 * 
-	 * @param gatherCounts
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void setGatherCounts(boolean gatherCounts) {
-		if (gatherCounts != GATHER_COUNTS) {
-			reset();
-			if (gatherCounts) {
-				if (METHODCOUNTMAP == null) {
-					METHODCOUNTMAP = new HashMap();
-					FIELDCOUNTMAP = new HashMap();
-					FIELDSETCOUNTMAP = new HashMap();
-				}
-			}
-			GATHER_COUNTS = gatherCounts;
-		}
-	}
-	
-	
-	public static void reset(){
-		REMMETHODCOUNT = UNIQUEMETHODCOUNT = REMINVOKABLECOUNT = UNIQUEINVOKABLECOUNT = REMCONSTRUCTORCALLED = METHODPROXYINVOKECOUNT = INVOKEINVOKECOUNT = REMFIELDCOUNT = UNIQUEFIELDCOUNT = 0;
-		if (GATHER_COUNTS) {
-			METHODCOUNTMAP.clear();
-			FIELDCOUNTMAP.clear();
-			FIELDSETCOUNTMAP.clear();
-		}
-	}
-	
-	public static void println(){
-		
-		if (GATHER_COUNTS) {
-			System.out.println("--------------------------------------------------");
-			System.out.println("Method proxies invokes = " + METHODPROXYINVOKECOUNT);
-			System.out.println("Invoke invokes = " + INVOKEINVOKECOUNT);
-			System.out.println("..................................................");
-			System.out.println("Methods retrieved = " + REMMETHODCOUNT + "(" + UNIQUEMETHODCOUNT + ")");
-			System.out.println("Invokes retrieved = " + REMINVOKABLECOUNT + "(" + UNIQUEINVOKABLECOUNT + ")");
-			System.out.println("Fields retrieved = " + REMFIELDCOUNT + "(" + UNIQUEFIELDCOUNT + ")");
-			System.out.println("Constructor calls = " + REMCONSTRUCTORCALLED);
-			System.out.println("--------------------------------------------------");
-			System.out.println("-Count of methods invoked-------------------------");
-			System.out.println("--------------------------------------------------");
-
-			// Collate the methods called
-			Iterator entries = METHODCOUNTMAP.entrySet().iterator();
-			while (entries.hasNext()) {
-				Map.Entry entry = (Entry) entries.next();
-				REMMethodProxy methodProxy = (REMMethodProxy) entry.getKey();
-				System.out.println(methodProxy.getClassType().getTypeName() + "," + methodProxy.getName() + "," + entry.getValue());
-			}
-
-			System.out.println("--------------------------------------------------");
-			System.out.println("-Count of fields get called ----------------------");
-			System.out.println("--------------------------------------------------");
-
-			// Collate the fields accessed
-			entries = FIELDCOUNTMAP.entrySet().iterator();
-			while (entries.hasNext()) {
-				Map.Entry entry = (Entry) entries.next();
-				REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
-				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue());
-			}
-
-			System.out.println("--------------------------------------------------");
-			System.out.println("-Count of fields set called ----------------------");
-			System.out.println("--------------------------------------------------");
-
-			// Collate the fields set
-			entries = FIELDSETCOUNTMAP.entrySet().iterator();
-			while (entries.hasNext()) {
-				Map.Entry entry = (Entry) entries.next();
-				REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
-				System.out.println(fieldProxy.toBeanString() + "," + entry.getValue());
-			} 
-		}
-		
-	}
-	
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no methods
- */ 
-	public IMethodProxy getMethodProxy(IBeanTypeProxy aBeanTypeProxy, String methodName, String[] parmTypes){
-		if (!registry.isValid())
-			return null;
-
-		REMMETHODCOUNT++;
-		Map methods;
-		Object key;
-		synchronized (this) {
-			// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-			methods = getMethods(aBeanTypeProxy);
-
-			// The syntax of the key is methodName(parmType1,parmType2)
-			if (parmTypes == null || parmTypes.length == 0) {
-				key = methodName;
-			} else {
-				key = new MethodKeyStringParms(methodName, parmTypes);
-			}
-
-			IMethodProxy result = (IMethodProxy) methods.get(key);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEMETHODCOUNT++;
-		// Get the method proxy and cache this before returning it
-		// Get the method proxy and cache this before returning it
-		REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) registry.getMethodProxyFactory();
-		IMethodProxy result = proxyFactory.getMethodProxy((IREMBeanTypeProxy)aBeanTypeProxy,methodName,parmTypes);
-		synchronized (this) {
-			// Get it again to make sure it hasn't changed due to a race condition. We don't sync for the getMethodProxy because that goes to the remote vm and could deadlock.
-			IMethodProxy mValue = (IMethodProxy) methods.get(key);
-			if (mValue != null && mValue != result) {
-				registry.releaseProxy(result); // Don't need the result now, got it through a race condition.
-				return mValue; // We have a real value now.
-			}
-			methods.put(key, result);
-		}		
-		return result;				
-	}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd methods
- */
-private Map getMethods(IProxyBeanType aBeanTypeProxy) {
-	Map methods = (Map) methodsCache.get(aBeanTypeProxy.getTypeName());
-	if(methods == null){
-		methods = new HashMap(20);
-		methodsCache.put(aBeanTypeProxy.getTypeName(),methods);
-	}
-	return methods;
-}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd invokables
- */
-private Map getInvokables(IBeanTypeProxy aBeanTypeProxy) {
-	Map invokables = (Map) invokablesCache.get(aBeanTypeProxy);
-	if(invokables == null){
-		invokables = new HashMap(20);
-		invokablesCache.put(aBeanTypeProxy,invokables);
-	}
-	return invokables;
-}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd fields
- */
-private Map getFields(IProxyBeanType aBeanTypeProxy) {
-	Map fields = (Map) fieldsCache.get(aBeanTypeProxy.getTypeName());
-	if(fields == null){
-		fields = new HashMap(20);
-		fieldsCache.put(aBeanTypeProxy.getTypeName(),fields);
-	}
-	return fields;
-}
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no arguments
- */ 
-	public IInvokable getInvokable(IBeanTypeProxy aBeanTypeProxy, String invokableName, String[] parmTypeNames){
-		
-		REMINVOKABLECOUNT++;
-		// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-		Map invokables = getInvokables(aBeanTypeProxy);	
-		
-		Object key = null; 
-		if(parmTypeNames == null || parmTypeNames.length == 0){
-			key = invokableName;
-		} else {
-			key = new MethodKeyStringParms(invokableName, parmTypeNames);
-		}			
-		
-		IInvokable result = (IInvokable) invokables.get(key);
-		if(result != null) return result;
-		
-		UNIQUEINVOKABLECOUNT++;
-		// Get the method proxy and cache this before returning it
-		// Get the method proxy and cache this before returning it
-		REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) aBeanTypeProxy.getProxyFactoryRegistry().getMethodProxyFactory();
-		result = proxyFactory.getInvokable((IREMBeanTypeProxy)aBeanTypeProxy,invokableName,parmTypeNames);
-		invokables.put(key,result);		
-		return result;				
-				
-	}
-	/**
-	 * @param aBeanTypeProxy = BeanTypeProxy for the method
-	 * @param methodName = methodName to be looked for
-	 * @param parmTypes = array of IBeanTypeProxy types for the method arguments, null if no arguments
-	 */ 
-		public IInvokable getInvokable(IBeanTypeProxy aBeanTypeProxy, String invokableName, IBeanTypeProxy[] parmTypes){
-			
-			REMINVOKABLECOUNT++;
-			// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-			Map invokables = getInvokables(aBeanTypeProxy);	
-			
-			Object key = null; 
-			if(parmTypes == null || parmTypes.length == 0){
-				key = invokableName;
-			} else {
-				key = new MethodKeyProxyParms(invokableName, parmTypes);
-			}			
-			
-			IInvokable result = (IInvokable) invokables.get(key);
-			if(result != null) return result;
-			
-			UNIQUEINVOKABLECOUNT++;
-			// Get the method proxy and cache this before returning it
-			// Get the method proxy and cache this before returning it
-			REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) aBeanTypeProxy.getProxyFactoryRegistry().getMethodProxyFactory();
-			result = proxyFactory.getInvokable((IREMBeanTypeProxy)aBeanTypeProxy,invokableName,parmTypes);
-			invokables.put(key,result);		
-			return result;				
-					
-		}	
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no methods
- */ 
-	public IMethodProxy getMethodProxy(IBeanTypeProxy aBeanTypeProxy, String methodName, IBeanTypeProxy[] parmTypes){
-		if (!registry.isValid())
-			return null;
-		
-		REMMETHODCOUNT++;		
-		// The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
-		Map methods;
-		Object key;
-		synchronized (this) {
-			methods = getMethods(aBeanTypeProxy);
-
-			key = null;
-			if (parmTypes == null || parmTypes.length == 0) {
-				key = methodName;
-			} else {
-				key = new MethodKeyProxyParms(methodName, parmTypes);
-			}
-
-			IMethodProxy result = (IMethodProxy) methods.get(key);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEMETHODCOUNT++;
-		// Get the method proxy and cache this before returning it
-		// Get the method proxy and cache this before returning it
-		REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) registry.getMethodProxyFactory();
-		IMethodProxy result = proxyFactory.getMethodProxy((IREMBeanTypeProxy)aBeanTypeProxy,methodName,parmTypes);
-		synchronized (this) {
-			// Get it again to make sure it hasn't changed due to a race condition. We don't sync for the getMethodProxy because that goes to the remote vm and could deadlock.
-			IMethodProxy mValue = (IMethodProxy) methods.get(key);
-			if (mValue != null && mValue != result) {
-				registry.releaseProxy(result); // Don't need result now, got it already through a race condition.
-				return mValue; // We have a real value now.
-			}
-			methods.put(key, result);
-		}		
-
-		return result;				
-	}
-
-	/**
-	 * Return the proxy method for the method through the expression. 
-	 * @param expression
-	 * @param aBeanTypeProxy
-	 * @param methodName
-	 * @param parmTypes
-	 * @return either the IMethodProxy if already resolved or an ExpressionProxy if not yet resolved.
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String methodName, IProxyBeanType[] parmTypes){
-		if (!registry.isValid())
-			return null;
-		
-		REMMETHODCOUNT++;	
-		Map methods;
-		Map epMethods;
-		Object key;
-		boolean isKey;
-		synchronized (this) {
-			// The classCache map is keyed by the BeanTypeProxy name and holds a further map of cache'd methods
-			methods = getMethods(aBeanTypeProxy);
-
-			if (parmTypes == null || parmTypes.length == 0) {
-				key = methodName;
-				isKey = false;
-			} else {
-				key = new MethodKeyProxyParms(methodName, parmTypes);
-				isKey = true;
-			}
-
-			IProxyMethod result = (IProxyMethod) methods.get(key);
-			if (result != null)
-				return result;
-			
-			// See if stored in the expression.
-			epMethods = ((REMExpression) expression).getMethods(aBeanTypeProxy);
-			result = (IProxyMethod) epMethods.get(key);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEMETHODCOUNT++;
-		// Get the method expression proxy and cache this before returning it
-		IProxyMethod result = ((Expression) expression).createMethodExpressionProxy(aBeanTypeProxy,methodName,parmTypes);
-		epMethods.put(key, result);
-		final Object epKey = key;
-		final Map rMethods = methods; 
-		final Map fepMethods = epMethods;
-		final boolean isKeyType = isKey;
-		((ExpressionProxy) result).addProxyListener(new ExpressionProxy.ProxyAdapter() {
-			public void proxyResolved(ProxyEvent event) {
-				synchronized (REMProxyConstants.this) {
-					if (rMethods.containsKey(epKey))
-						return;	// We already have a true method proxy in there. A race condition occurred.
-					
-					// Now put this resolved guy into the methods.
-					// We don't want the key to contain expression proxies in the final map, so if it is a key type
-					// we will turn it into a string type key.
-					Object key;
-					if (isKeyType) {
-						key = ((MethodKeyProxyParms) epKey).toMethodKeyStringParms();	// So that we don't put a ket that contains expression proxy parm types into the main map.
-					} else
-						key = epKey;
-					
-					rMethods.put(key, event.getProxy());
-				}
-			}
-			
-			public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
-				synchronized (REMProxyConstants.this) {
-					fepMethods.remove(epKey);
-				}
-				}
-			
-		});
-		return result;				
-	}
-
-	/**
-	 * @param proxy
-	 */
-	static void methodInvoked(REMMethodProxy proxy) {
-	
-		if (GATHER_COUNTS) {
-			Integer count = (Integer) METHODCOUNTMAP.get(proxy);
-			if (count == null) {
-				METHODCOUNTMAP.put(proxy, new Integer(1));
-			} else {
-				METHODCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
-			}
-		}
-	}
-
-	static void fieldGetInvoked(IBeanProxy proxy) {
-
-		if (GATHER_COUNTS) {
-			Integer count = (Integer) FIELDCOUNTMAP.get(proxy);
-			if (count == null) {
-				FIELDCOUNTMAP.put(proxy, new Integer(1));
-			} else {
-				FIELDCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
-			} 
-		}		
-	}
-
-	static void fieldSetInvoked(IBeanProxy proxy, IBeanProxy value) {
-
-		if (GATHER_COUNTS) {
-			Integer count = (Integer) FIELDSETCOUNTMAP.get(proxy);
-			if (count == null) {
-				FIELDSETCOUNTMAP.put(proxy, new Integer(1));
-			} else {
-				FIELDSETCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
-			} 
-		}				
-	}
-
-	/**
-	 * @param proxy for the BeanType of the field
-	 * @param fieldName of the field, e.g. (java.awt.Dimension, width) for the "width" field on Dimension
-	 * @return The field proxy that is cache'd for performance
-	 */
-	public IFieldProxy getFieldProxy(REMAbstractBeanTypeProxy aBeanTypeProxy, String fieldName) {
-		if (!registry.isValid())
-			return null;
-		
-		REMFIELDCOUNT++;
-		Map fields;
-		synchronized (this) {
-			// The field map is keyed by the BeanTypeProxy and holds a further map of cache'd fields
-			fields = getFields(aBeanTypeProxy);	
-				
-			// Lookup the cache'd Field proxy
-			IFieldProxy result = (IFieldProxy) fields.get(fieldName);
-			if (result != null)
-				return result;
-		}
-		
-		UNIQUEFIELDCOUNT++;
-		IFieldProxy result = (IFieldProxy) REMStandardBeanProxyConstants.getConstants(aBeanTypeProxy.getProxyFactoryRegistry()).getClassGetField().invokeCatchThrowableExceptions(
-				aBeanTypeProxy,
-				registry.getBeanProxyFactory().createBeanProxyWith(fieldName));	
-		synchronized (this) {
-			IFieldProxy fValue = (IFieldProxy) fields.get(fieldName);
-			if (fValue != null) {
-				registry.releaseProxy(result);	// Don't need it now. A race had put another one in.
-				return fValue;
-			}
-			fields.put(fieldName,result);
-		}
-		return result;				
-	}
-	
-	public IProxyField getFieldProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, final String fieldName){
-		if (!registry.isValid())
-			return null;
-		
-		REMFIELDCOUNT++;
-		Map fields;
-		Map epFields;
-		synchronized (this) {
-			// The classCache map is keyed by the BeanTypeProxy name and holds a further map of cache'd methods
-			fields = getFields(aBeanTypeProxy);	
-		
-			IProxyField result = (IProxyField) fields.get(fieldName);
-			if (result != null)
-				return result;
-			
-			// See if stored in the expression.
-			epFields = ((REMExpression) expression).getFields(aBeanTypeProxy);
-			result = (IProxyField) epFields.get(fieldName);
-			if (result != null)
-				return result;			
-		}
-		
-		UNIQUEFIELDCOUNT++;
-		// Get the field expression proxy and cache this before returning it
-		IProxyField result = ((REMExpression) expression).createFieldExpressionProxy(aBeanTypeProxy, fieldName);
-		epFields.put(fieldName, result);
-		final Map fpFields = fields;
-		final Map fepFields = epFields;
-		((ExpressionProxy) result).addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
-			public void proxyResolved(ProxyEvent event) {
-				synchronized (REMProxyConstants.this) {
-					if (fpFields.containsKey(fieldName))
-						return;	// Already set to resolved value by someone else.
-					fpFields.put(fieldName, event.getProxy());
-				}
-			}
-			 public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
-				 synchronized (REMProxyConstants.this) {
-					 fepFields.remove(fieldName);
-				}
-			 }
-		});
-		
-		return result;				
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
deleted file mode 100644
index ff41049..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
+++ /dev/null
@@ -1,448 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMProxyFactoryRegistry.java,v $
- *  $Revision: 1.17 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import java.io.IOException;
-import java.net.Socket;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamsProxy;
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This is the factory registry to use for Remote VM.
- * It adds to the standard registry, connection specific information.
- *
- * This will always hold onto one connection open until termination is requested.
- * That way while the IDE is up, the remove vm won't time out.
- */
-
-public class REMProxyFactoryRegistry extends ProxyFactoryRegistry {
-	protected int fServerPort = 0;	// The server port to use when making connections.
-	protected REMCallbackRegistry fCallbackServer;	// The callback server thread for this remote vm.
-	protected Stack fConnectionPool = new Stack();	// Stack of free connections.
-	protected static int NUMBER_FREE_CONNECTIONS = 5;	// Number of free connections to keep open.
-	protected IProcess fProcess;	// The process that is the server. If null and fServerPort is not zero, 
-									// then this registry is in test mode
-									// and the server is in same the process.
-	protected String fName;
-	protected int fCallbackServerPort;
-	protected Integer fRegistryKey;
-	protected REMRegistryController fRegistryController;
-	
-	// Package protected because only the ProxyVMStarter should set this flag. It would set it if
-	// working with a debugger because we don't how long it will be to respond to requests when 
-	// someone is working with a debugger.
-	boolean fNoTimeouts = false;
-	
-	// This is set via the static setGlobalNoTimeouts() method. It is here so that
-	// when debugging callbacks, but not debugging remote vm, that no timeouts for any registry will occur.
-	// Or it can be set through the debug .options flag.
-	static boolean fGlobalNoTimeouts = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.NO_TIMEOUTS)); //$NON-NLS-1$;
-	
-	/**
-	 * Typicall set through the "expression" evaluation of the debugger.
-	 * @param noTimeouts
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void setGlobalNoTimeouts(boolean noTimeouts) {
-		fGlobalNoTimeouts = noTimeouts;
-	}
-	
-	// An internal thread that locks and waits for the remote vm to register itself. 
-	private WaitForRegistrationThread waitRegistrationThread;
-	
-	private class WaitForRegistrationThread extends Thread {
-		public WaitForRegistrationThread() {
-			super("Wait for remote vm registration thread"); //$NON-NLS-1$
-		}
-		
-		/**
-		 * @see java.lang.Thread#run()
-		 */
-		public void run() {
-			// Wait for registration. Put it into a thread so this
-			// can occur while other stuff goes on. It locks the fConnectionPool
-			// until done so that the first request for a connection by anyone
-			// else will wait until this thread is finished. 
-			
-			synchronized(fConnectionPool) {
-				synchronized(REMProxyFactoryRegistry.this) {
-					// Notify the main thread that we have the 
-					// connection pool locked.
-					REMProxyFactoryRegistry.this.notifyAll();
-				}
-				synchronized (this) {
-					// sync on self so that it can be notified when finally receive the registration
-					long stopTime = System.currentTimeMillis()+60000;
-					while (waitRegistrationThread != null && (fNoTimeouts || System.currentTimeMillis() < stopTime)) {
-						try {
-							Thread.currentThread().wait(60000);
-						} catch (InterruptedException e) {
-						}
-					}
-				}
-			}
-			
-			waitRegistrationThread = null;	// No longer exists.				
-		}
-	}
-
-	
-	public REMProxyFactoryRegistry(REMRegistryController registryController, String name) {
-		fRegistryController = registryController;		
-		fRegistryKey = fRegistryController.registerRegistry(this);	// Register the registry with the plugin.		
-		fName = name;		
-		
-		// Get the waitRegistrationThread started before we actually launch remote vm so
-		// that it is waiting when the callback comes in.
-		synchronized (this) {
-			waitRegistrationThread = new WaitForRegistrationThread();
-			waitRegistrationThread.start();
-			
-			// Now we will wait until the registration callback has been done. The thread will
-			// signal us when that is done. This is so that we don't continue on and let
-			// a work connection be requested before we even got a chance to start waiting
-			// for the registration.
-			while(true) {
-				try {
-					wait();
-					break;
-				} catch (InterruptedException e) {
-				}
-			};		
-		}		
-	}
-	
-	public Integer getRegistryKey() {
-		return fRegistryKey;
-	}
-	
-	public void initializeRegistry(IProcess process) {
-		fProcess = process;
-		processListener = new IDebugEventSetListener() {
-			/**
-			 * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-			 */
-			public void handleDebugEvents(DebugEvent[] events) {
-				for (int i = 0; i < events.length; i++) {
-					DebugEvent e = events[i];
-					if (e.getSource() == fProcess && e.getKind() == DebugEvent.TERMINATE) {
-						// We terminating too soon. Pop up a msg.
-						IStreamsProxy stProxy = fProcess.getStreamsProxy();
-						java.io.StringWriter s = new java.io.StringWriter();
-						java.io.PrintWriter w = new java.io.PrintWriter(s);
-		
-						String msg = MessageFormat.format(ProxyRemoteMessages.getString("Proxy_Terminated_too_soon_ERROR_"), new Object[] {fName}); //$NON-NLS-1$
-						w.println(msg);						
-						w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED));
-						w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED_LINE1));
-						w.println(stProxy.getErrorStreamMonitor().getContents());
-						w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED_LINE2));
-						w.println(stProxy.getOutputStreamMonitor().getContents());
-						w.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.VM_TERMINATED_LINE3));
-						w.close();
-		
-						DebugModeHelper dh = new DebugModeHelper();
-						dh.displayErrorMessage(ProxyRemoteMessages.getString("Proxy_Error_Title"), msg); //$NON-NLS-1$
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
-						processListener = null;
-						DebugPlugin.getDefault().removeDebugEventListener(this);						
-						terminateRegistry();
-						break;
-					}
-				}
-			}
-		};
-		
-		DebugPlugin.getDefault().addDebugEventListener(processListener);
-	}
-	
-	private IDebugEventSetListener processListener = null;
-	
-	/**
-	 * Get the CallbackRegistry
-	 */
-	public ICallbackRegistry getCallbackRegistry() {
-		if (fCallbackServer == null)
-			fCallbackServer = new REMCallbackRegistry(fName, this);
-		return fCallbackServer;
-	}
-	
-	private static class TerminateProcess extends Job {
-		private IProcess process;
-		
-		public TerminateProcess(IProcess process) {
-			super("Terminate the remote vm process.");	
-			this.process = process;
-		}
-		
-		
-		/* (non-Javadoc)
-		 * @see java.lang.Thread#run()
-		 */
-		public IStatus run(IProgressMonitor mon) {
-			try {
-				// There is no join on a process available, so we will have to
-				// busy wait. Give it 10 seconds in 1/10 second intervals.
-				for (int i=0; !process.isTerminated() && i<100; i++) {
-					try {
-						Thread.sleep(100);							
-					} catch (InterruptedException e) {
-					}
-				}
-				if (!process.isTerminated()) {
-					process.terminate();
-				} 
-			} catch (DebugException e) {
-			}
-			return Status.OK_STATUS;
-		}
-	}
-	
-	protected void registryTerminated(boolean wait) {
-		if (processListener != null) {
-			// Remove listener cause we are now going to terminate process and don't want premature terminate notice.
-			// Sometimes in shutdown we are called and the debug plugin may of already been shutdown. In that case the db
-			// will be null and there is nothing remove listener from.
-			DebugPlugin db = DebugPlugin.getDefault();
-			if (db != null)
-				db.removeDebugEventListener(processListener);
-			processListener = null;
-		}
-		
-		Job tjob = null;
-		if (fServerPort != 0) {
-			if (waitRegistrationThread != null) {
-				synchronized (waitRegistrationThread) {
-					// Still waiting. close it out.
-					WaitForRegistrationThread wThread = waitRegistrationThread;
-					waitRegistrationThread = null;
-					wThread.notifyAll();
-				}
-			}
-					
-			IREMConnection closeCon = null;	// The connection we will use to close the remote vm.
-			synchronized(fConnectionPool) {
-				// Now we walk through all of the free connections and close them properly.
-				Iterator itr = fConnectionPool.iterator();
-				if (itr.hasNext())
-					closeCon = (IREMConnection) itr.next();
-				while (itr.hasNext()) {
-					IREMConnection con = (IREMConnection) itr.next();
-					con.close();
-				}
-			}
-				
-			// Now we terminate the server.
-			if (closeCon == null)
-				try {
-					closeCon = getFreeConnection();	// There weren't any free connections, so get a new one so that we can close it.
-				} catch (IllegalStateException e) {
-					// Do nothing, don't want to stop termination just because we can't get a connection.
-				}
-			if (closeCon != null) {
-				closeCon.terminateServer();	// We got a connection to terminate (process may of terminated early, so we would not have a conn then).
-			}
-			fConnectionPool.clear();
-			fServerPort = 0;
-			
-			if (fProcess != null) {
-				tjob = new TerminateProcess(fProcess);
-				tjob.setSystem(true);
-				tjob.schedule();
-				fProcess = null;
-			}
-		}
-	
-		if (fCallbackServer != null) {
-			fCallbackServer.requestShutdown();
-			fCallbackServer = null;				
-		}
-		
-		fConnectionPool.clear();
-		fRegistryController.deregisterRegistry(fRegistryKey);	// De-register this registry.
-		
-		if (wait && tjob != null) {
-			try {
-				tjob.join();
-			} catch (InterruptedException e) {
-				// It timed out, so we'll just go on.
-			}
-		}
-	}
-			
-	/**
-	 * Return the server port number.
-	 */
-	public int getServerPort() {
-		return fServerPort;
-	}
-	
-	/*
-	 * set the server port.
-	 */
-	void setServerPort(int serverport) {
-		fServerPort = serverport;
-		if (waitRegistrationThread != null) {
-				synchronized (waitRegistrationThread) {
-					// Close it out, we are now registered
-					WaitForRegistrationThread wThread = waitRegistrationThread;
-					waitRegistrationThread = null;
-					wThread.notifyAll();
-				}
-		}
-	}
-	
-	/**
-	 * Get a free connection
-	 * @return
-	 * @throws IllegalStateException - Thrown if a connection cannot be created.
-	 * 
-	 * @since 1.0.0
-	 */
-	public IREMConnection getFreeConnection() throws IllegalStateException {
-		Thread thread = Thread.currentThread();
-		if (thread instanceof REMCallbackThread) {
-			// The current thread is a call back thread, so just reuse the connection.
-			// But this thread could actually be trying to access another registry.
-			// So if this thread is for this registry, use it, if not for this registry, create a new connection.
-			// But if for this registry AND is already in a transaction, we need a fresh connection.
-			REMCallbackThread callbackThread = (REMCallbackThread) thread;
-			if (callbackThread.registry == this && !callbackThread.inTransaction()) {
-				// This way any calls out to the remote vm will be on same thread as callback caller
-				// on remote vm because that thread is waiting on this connection for commands.
-				IREMConnection c = (callbackThread).getConnection();
-				if (c.isConnected())
-					return c;
-				else
-					throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CallbackConnectionNotWorking_EXC_")); //$NON-NLS-1$
-			}
-		}
-		synchronized(fConnectionPool) {
-			if (!fConnectionPool.isEmpty())
-				return (IREMConnection) fConnectionPool.pop();
-			// else we need to allocate one.			
-			return createConnection();
-		}
-	}
-	
-
-	/**
-	 * Make a new connection.
-	 * @return
-	 * @throws IllegalStateException - Thrown if connection cannot be created.
-	 * 
-	 * @since 1.0.0
-	 */
-	protected IREMConnection createConnection() throws IllegalStateException {
-		// If we have a server port, then the server is probably open. If we don't then there is no server.
-		if (fServerPort != 0) {
-			// We are putting it off into a thread because there are no timeout capabilities on getting a socket.
-			// So we need to allow for that.
-			final Socket[] scArray = new Socket[1];
-			final boolean[] waiting = new boolean[] {true};
-			Thread doIt = new Thread(new Runnable() {
-				public void run() {
-					try {
-						Socket sc = new Socket("localhost", fServerPort); //$NON-NLS-1$
-						synchronized (this) {
-							if (waiting[0])
-								scArray[0] = sc;
-							else
-								sc.close();	// We are no longer waiting on this thread so close the socket since no one will use it.
-						}
-					} catch (IOException e) {
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-					}
-				}
-			});
-			
-			doIt.start();
-			while (true) {
-				try {
-					doIt.join(!fNoTimeouts ? 60000 : 0);
-					synchronized (doIt) {
-						waiting[0] = false;	// To let it know we are no longer waiting
-					}
-					break;
-				} catch (InterruptedException e) {
-				}
-			}
-			
-			if (scArray[0] == null)  {
-				// Log where we are at so we can know where it was we down.
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.ConnectionCreationFailed_INFO_"))));	//$NON-NLS-1$ //$NON-NLS-2$
-				throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_"));	// Couldn't get one, probably server is down. //$NON-NLS-1$
-			}
-
-			REMConnection connection = new REMConnection(scArray[0], fNoTimeouts);
-			if (connection.isConnected())
-				return connection;
-				
-			// Failed, close the socket. 
-			try {
-				scArray[0].close();
-			} catch (IOException e) {
-			}
-		} else
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "No Server to retrieve a connection.", null));	///$NON-NLS-1$
-		
-		throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_")); //$NON-NLS-1$
-	}
-		 
-	/**
-	 * Free the connection
-	 */
-	public void returnConnection(IREMConnection connection) {
-		if (connection.isConnected()) {
-			Thread thread = Thread.currentThread();
-			if (!(thread instanceof REMCallbackThread) || ((REMCallbackThread) thread).getConnection() != connection) {
-				// We are not a callback thread, or we are but the connection is not for the thread, then the connection
-				// can be returned.
-				synchronized (fConnectionPool) {
-					if (fConnectionPool.size() < NUMBER_FREE_CONNECTIONS)
-						fConnectionPool.push(connection);
-					else
-						connection.close();	// We don't need to maintain more than five free connections.
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Release this connection. This means close it out.
-	 */
-	public void closeConnection(IREMConnection connection) {
-		connection.close();
-	}
-	
-	
-	public int connectionCount() {
-		synchronized (fConnectionPool) {
-			return fConnectionPool.size();
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java
deleted file mode 100644
index 1cb2612..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java
+++ /dev/null
@@ -1,175 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMRegistryController.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-/**
- * This class is a controller for all of the registries.
- * @author richkulp
- */
-public class REMRegistryController {
-	
-	private Map fActiveRegistries = new HashMap();	// Access to this must be sync(REMRegistryController)
-	private static final long CLEANUP_INTERVAL = 60000l;	// The interval between clean up job execution.
-	
-	// Thread to clean up GC'd proxies. Runs as a daemon at the lowest priority
-	private Job processQueueJob= new Job(ProxyRemoteMessages.getString("CleanupJob.title")) { //$NON-NLS-1$
-		public IStatus run(IProgressMonitor m) {
-				REMProxyFactoryRegistry[] registries = null;
-				synchronized (REMRegistryController.this) {
-					// This list may be updated by others, so we need to make a copy
-					// or else we could get a failure.
-					registries = 
-						(REMProxyFactoryRegistry[]) fActiveRegistries.values().toArray(
-							new REMProxyFactoryRegistry[fActiveRegistries.size()]);
-				}
-				for (int i = 0; i < registries.length; i++) {
-					try {
-						((REMStandardBeanProxyFactory) registries[i].getBeanProxyFactory()).processQueue();					
-					} catch (RuntimeException e) {
-						// When debugging, getBeanProxyFactory can throw exception because it hasn't been initialized
-						// yet when the thread wakes up, though the registry has been registered. It has to do with it 
-						// can take significant time for the user to start up the debugger, and during that time this
-						// thread could kick in.
-					}
-				}
-			synchronized(this) {
-				if (!m.isCanceled())
-					this.schedule(CLEANUP_INTERVAL);	// Schedule to start again in one minute.
-			}
-			return Status.OK_STATUS;
-		}
-
-	}; //$NON-NLS-1$	
-	
-	public REMRegistryController() {
-
-		ProxyPlugin.getPlugin().addProxyShutdownListener(new ProxyPlugin.IProxyPluginShutdownListener() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.jem.internal.proxy.core.ProxyPlugin.IProxyPluginShutdownListener#shutdown()
-			 */
-			public void shutdown() {
-				REMRegistryController.this.shutdown();
-			}
-		});
-
-		masterThread = new REMMasterServerThread(this);
-		masterThread.start();
-
-		processQueueJob.setSystem(true);	// So that it won't show processing in process view. Not of interest to general users.
-		processQueueJob.setPriority(Job.SHORT);
-		processQueueJob.schedule(CLEANUP_INTERVAL);
-
-	}
-	
-	/*
-	 * Add registry to list of active. Return a unique number to be the key.
-	 * Package-protected so that only locals can access it.
-	 */
-	synchronized Integer registerRegistry(REMProxyFactoryRegistry registry) {
-			
-		Integer hashcode = new Integer(registry.hashCode());		
-		while (true) {
-			REMProxyFactoryRegistry existing = (REMProxyFactoryRegistry) fActiveRegistries.get(hashcode);
-			if (existing == null)
-				break;	// Not yet registered, use use the hashcode
-			else if (existing != registry)
-				hashcode = new Integer(hashcode.intValue()+1);						
-			else
-				return hashcode;	// Same guy, use the hashcode.
-		}
-		
-		fActiveRegistries.put(hashcode, registry);
-		return hashcode;
-	}
-	
-	/*
-	 * deregister the registry.
-	 */
-	synchronized void deregisterRegistry(Integer key) {
-		fActiveRegistries.remove(key);
-	}
-	
-	/*
-	 * Return the registry for the given key
-	 */
-	synchronized REMProxyFactoryRegistry getRegistry(Integer key) {
-		return (REMProxyFactoryRegistry) fActiveRegistries.get(key);
-	}
-	
-	/**
-	 * Master server thread. Handles keep-alive requests and register remote server threads.
-	 * It will be created when needed.
-	 */
-	protected REMMasterServerThread masterThread;
-
-	/*
-	 * Shuts down this plug-in and discards all plug-in state.
-	 *
-	 * In this case, terminate all of the active registries so that they can be shutdown.
-	 * Don't want them hanging around after termination of the desktop.
-	 */
-	void shutdown() {
-		
-		synchronized(processQueueJob) {
-			processQueueJob.cancel();
-		}
-			
-		REMProxyFactoryRegistry[] registries = null;
-		synchronized (this) {
-			// This list will be updated in the terminateRegistry, so we need to make a copy
-			// or else we get a failure.
-			registries = 
-				(REMProxyFactoryRegistry[]) fActiveRegistries.values().toArray(
-					new REMProxyFactoryRegistry[fActiveRegistries.size()]);
-		}
-		for (int i = 0; i < registries.length; i++)
-			registries[i].terminateRegistry();
-			
-		if (masterThread != null) {
-			try {
-				masterThread.requestShutdown();
-				masterThread.join(20000);	// Wait 20 seconds for everything to go down.
-				masterThread = null;				
-			} catch (InterruptedException e) {
-			}
-		}
-		
-		try {
-			processQueueJob.join();
-		} catch(InterruptedException e) {
-		}
-		
-	}
-	
-	/**
-	 * Return the master socket port number.
-	 */
-	public int getMasterSocketPort() {
-		return masterThread != null ? masterThread.getMasterSocket().getLocalPort() : -1;
-	}	
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java
deleted file mode 100644
index b34f27d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMShortClassBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Short.class.
- */
-class REMShortClassBeanProxy extends REMNumberBeanProxy {
-
-REMShortClassBeanProxy(REMProxyFactoryRegistry aRegistry, Short aShort) {
-	super(aRegistry, aShort);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).shortClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set((Short) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java
deleted file mode 100644
index ece16a7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMShortClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Short.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMShortClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMShortClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
-	super(aRegistry, new Integer(Commands.SHORT_CLASS), Short.class.getName(), numberType);
-	
-	// Create the cached values
-	zeroProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)0));	
-	oneProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)1));
-	twoProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)2));
-	threeProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)3));		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createShortBeanProxy(Short aShort) {
-	switch(aShort.shortValue()) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMShortClassBeanProxy(fRegistry, aShort);
-	}
-}
-
-/**
- * Generic way to create a Short proxy, however, the Number must be a Short.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	return createShortBeanProxy((Short) aNumber);
-}	
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createShortBeanProxy(new Short(value.aShort));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java
deleted file mode 100644
index b25a8e5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMShortTypeBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "short".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMShortTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
-	private final short fShort;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMShortTypeBeanProxy(REMProxyFactoryRegistry aRegistry, short aShort) {
-	super(aRegistry);
-	fShort = aShort;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof REMShortTypeBeanProxy)
-		return fShort == ((REMShortTypeBeanProxy) anObject).shortValue();
-	if (anObject instanceof Short)
-		return fShort == ((Short) anObject).shortValue();
-	return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
-	if (this == aBeanProxy)
-		return true;	// Identity
-	if (aBeanProxy instanceof REMShortTypeBeanProxy)
-		return fShort == ((REMShortTypeBeanProxy) aBeanProxy).shortValue();
-	return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return (byte) fShort;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fShort;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fShort;
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fShort;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fShort;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return new Short(fShort);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return fShort;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return String.valueOf(fShort);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).shortType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fShort);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java
deleted file mode 100644
index d019ae9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMShortTypeBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Short.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMShortTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final INumberBeanProxy zeroProxy;
-	private final INumberBeanProxy oneProxy;
-	private final INumberBeanProxy twoProxy;
-	private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMShortTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.SHORT_TYPE), Short.TYPE.getName());
-	
-	// Create the cached values
-	zeroProxy = new REMShortTypeBeanProxy(aRegistry, (short) 0);	
-	oneProxy = new REMShortTypeBeanProxy(aRegistry, (short) 1);
-	twoProxy = new REMShortTypeBeanProxy(aRegistry, (short) 2);
-	threeProxy = new REMShortTypeBeanProxy(aRegistry, (short) 3);		
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createShortBeanProxy(short aShort) {
-	switch(aShort) {
-		case 0: return zeroProxy;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new REMShortTypeBeanProxy(fRegistry, aShort);
-	}
-}
-
-/**
- * newInstance method. short is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return zeroProxy;
-}	
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createShortBeanProxy(value.aShort);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm 
- * to process it.
- *
- * The pattern it can accept is:
- * 	1) (short) validNumber - number can be any number because (byte) explicitly casts it down.
- *	2) validNumber
- * It will use the decode function of short to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	String trim = initializationString.trim();
-	if (trim.length() == 0)
-		return super.newInstance(initializationString);	
-	short aShort;
-	if (trim.startsWith("(short)")) { //$NON-NLS-1$
-		Number v = parseString(trim.substring("(short)".length()).trim()); //$NON-NLS-1$
-		if (v != null)
-			aShort = v.shortValue();
-		else
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-	} else {
-		try {
-			aShort = Short.decode(trim).shortValue();	// See if valid short format.
-		} catch (NumberFormatException e) {
-			return super.newInstance(initializationString);	// Can't decode it, let full parser handle it.
-		}
-	}
-
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aShort);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
deleted file mode 100644
index 4d2df21..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
+++ /dev/null
@@ -1,508 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMStandardBeanProxyConstants.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IMethodProxy;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-/**
- * REM Standard Proxy constants.
- *
- * Use the static accessor method (getConstants()) to get the appropriate 
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * There are some standard utility functions too.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class REMStandardBeanProxyConstants {
-	public static final Object REGISTRY_KEY = new Object();
-		
-	private final ProxyFactoryRegistry fRegistry;
-	
-	private IMethodProxy fClassNewInstance;
-	private IMethodProxy fClassGetField;
-	private IMethodProxy fClassGetDeclaredField;
-	private IMethodProxy fClassGetDeclaredFields;	
-	private IMethodProxy fClassGetFields;	
-	private IMethodProxy fClassGetConstructor;
-	private IMethodProxy fClassGetConstructors;
-	private IMethodProxy fClassGetDeclaredConstructor;
-	private IMethodProxy fClassGetDeclaredConstructors;
-	private IMethodProxy fClassGetMethods;
-	private IMethodProxy fClassGetDeclaredMethods;
-	private IMethodProxy fClassGetDeclaredMethod;
-	
-	private IMethodProxy fMethodHelperFindCompatibleConstructor;
-	private IMethodProxy fMethodHelperFindCompatibleMethod;
-	
-	private IMethodProxy fClassIsAssignableFrom;
-	
-	private IMethodProxy fObjectToString;
-	private IMethodProxy fObjectEquals;
-	
-	private IMethodProxy fThrowableLocalizedMessage;
-	private IMethodProxy fThrowableMessage;
-	
-	private IMethodProxy fMethodDeclaringClassMessage;
-	private IMethodProxy fMethodMethodNameMessage;
-	private IMethodProxy fMethodParameterTypesMessage;
-	private IMethodProxy fMethodReturnTypeMessage;
-	
-	private IMethodProxy fAccessibleIsAccessible;
-	private IMethodProxy fAccessibleSetAccessible;
-	
-	private IMethodProxy fFieldGet;
-	private IMethodProxy fFieldGetType;
-	private IMethodProxy fFieldGetByte;
-	private IMethodProxy fFieldGetBoolean;
-	private IMethodProxy fFieldGetChar;
-	private IMethodProxy fFieldGetDouble;
-	private IMethodProxy fFieldGetFloat;
-	private IMethodProxy fFieldGetInt;
-	private IMethodProxy fFieldGetShort;
-	private IMethodProxy fFieldGetLong;	
-	private IMethodProxy fFieldSet;
-	
-	private IMethodProxy fConstructorNewInstance;	
-	private IMethodProxy fConstructorParameterTypesMessage;
-	
-	private IMethodProxy fArrayNewInstanceOneDimension;
-	private IMethodProxy fArrayNewInstanceMultiDimensions;
-	private IMethodProxy fArrayGetLength;
-	private IMethodProxy fArrayGet;
-	private IMethodProxy fArrayGetByte;
-	private IMethodProxy fArrayGetBoolean;
-	private IMethodProxy fArrayGetChar;
-	private IMethodProxy fArrayGetDouble;
-	private IMethodProxy fArrayGetFloat;
-	private IMethodProxy fArrayGetInt;
-	private IMethodProxy fArrayGetShort;
-	private IMethodProxy fArrayGetLong;	
-	private IMethodProxy fArraySet;	
-	
-	private IMethodProxy fArrayHelperGet;
-	private IMethodProxy fArrayHelperGetByte;
-	private IMethodProxy fArrayHelperGetBoolean;
-	private IMethodProxy fArrayHelperGetChar;
-	private IMethodProxy fArrayHelperGetDouble;
-	private IMethodProxy fArrayHelperGetFloat;
-	private IMethodProxy fArrayHelperGetInt;
-	private IMethodProxy fArrayHelperGetShort;
-	private IMethodProxy fArrayHelperGetLong;	
-	private IMethodProxy fArrayHelperSet;			
-	
-/**
- * Get the constants instance for the specified registry.
- */
-public static REMStandardBeanProxyConstants getConstants(ProxyFactoryRegistry registry) {
-	REMStandardBeanProxyConstants constants = (REMStandardBeanProxyConstants) registry.getConstants(REGISTRY_KEY);
-	if (constants == null)
-		registry.registerConstants(REGISTRY_KEY, constants = new REMStandardBeanProxyConstants(registry));	
-	return constants;
-}
-
-
-private REMStandardBeanProxyConstants(ProxyFactoryRegistry registry) {
-	super();
-	fRegistry = registry;
-}
-
-public IMethodProxy getClassNewInstance() {
-	// We actually need a special new instance because we want to be able to access outside of security. For our purposes security doesn't matter for construction.
-	if (fClassNewInstance == null)
-		fClassNewInstance = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ClassHelper", "newInstance", new String[] {"java.lang.Class"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassNewInstance;
-}
-
-public IMethodProxy getClassGetField() {
-	if (fClassGetField == null)
-		fClassGetField = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getField", new String[] {"java.lang.String"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassGetField;
-}
-
-public IMethodProxy getClassConstructor() {
-	if (fClassGetConstructor == null)
-		fClassGetConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getConstructor", new String[] {"[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassGetConstructor;
-}
-
-public IMethodProxy getClassConstructors() {
-	if (fClassGetConstructors == null)
-		fClassGetConstructors = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getConstructors", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fClassGetConstructors;
-}
-
-public IMethodProxy getDeclaredClassConstructor() {
-	if (fClassGetDeclaredConstructor == null)
-		fClassGetDeclaredConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredConstructor", new String[] {"[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassGetDeclaredConstructor;
-}
-
-public IMethodProxy getDeclaredClassConstructors() {
-	if (fClassGetDeclaredConstructors == null)
-		fClassGetDeclaredConstructors = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredConstructors", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fClassGetDeclaredConstructors;
-}
-
-public IMethodProxy getClassIsAssignableFrom() {
-	if (fClassIsAssignableFrom == null)
-		fClassIsAssignableFrom = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "isAssignableFrom", new String[] {"java.lang.Class"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassIsAssignableFrom;
-}
-
-public IMethodProxy getObjectToString() {
-	if (fObjectToString == null)
-		fObjectToString = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Object", "toString", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fObjectToString;
-}
-
-public IMethodProxy getObjectEquals() {
-	if (fObjectEquals == null)
-		fObjectEquals = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Object", "equals", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fObjectEquals;
-}
-public IMethodProxy getThrowableLocalizedMessage() {
-	if (fThrowableLocalizedMessage == null)
-		fThrowableLocalizedMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Throwable", "getLocalizedMessage", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fThrowableLocalizedMessage;
-}
-
-public IMethodProxy getThrowableMessage() {
-	if (fThrowableMessage == null)
-		fThrowableMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Throwable", "getMessage", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fThrowableMessage;
-}
-
-public IMethodProxy getMethodDeclaringClassMessage() {
-	if (fMethodDeclaringClassMessage == null)
-		fMethodDeclaringClassMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getDeclaringClass", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodDeclaringClassMessage;
-}
-
-public IMethodProxy getMethodMethodNameMessage() {
-	if (fMethodMethodNameMessage == null)
-		fMethodMethodNameMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getName", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodMethodNameMessage;
-}	
-
-public IMethodProxy getMethodParameterTypesMessage() {
-	if (fMethodParameterTypesMessage == null)
-		fMethodParameterTypesMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getParameterTypes", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodParameterTypesMessage;
-}
-
-public IMethodProxy getMethodReturnTypeMessage() {
-	if (fMethodReturnTypeMessage == null)
-		fMethodReturnTypeMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getReturnType", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fMethodReturnTypeMessage;
-}
-
-public IMethodProxy getAccessibleIsAccessible() {
-	if (fAccessibleIsAccessible == null)
-		fAccessibleIsAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "isAccessible", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fAccessibleIsAccessible;
-}
-
-public IMethodProxy getAccessibleSetAccessible() {
-	if (fAccessibleSetAccessible == null)
-		fAccessibleSetAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "setAccessible", new String[] {"boolean"}); //$NON-NLS-1$ //$NON-NLS-2$
-	return fAccessibleSetAccessible;
-}
-
-public IMethodProxy getFieldGetType() {
-	if (fFieldGetType == null)
-		fFieldGetType = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getType", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fFieldGetType;
-}
-
-public IMethodProxy getFieldGet() {
-	if (fFieldGet == null)
-		fFieldGet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "get", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGet;
-}
-
-public IMethodProxy getFieldGetByte() {
-	if (fFieldGetByte == null)
-		fFieldGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getByte", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetByte;
-}
-
-public IMethodProxy getFieldGetBoolean() {
-	if (fFieldGetBoolean == null)
-		fFieldGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getBoolean", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetBoolean;
-}
-
-public IMethodProxy getFieldGetChar() {
-	if (fFieldGetChar == null)
-		fFieldGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getChar", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetChar;
-}
-
-public IMethodProxy getFieldGetDouble() {
-	if (fFieldGetDouble == null)
-		fFieldGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getDouble", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetDouble;
-}
-
-public IMethodProxy getFieldGetFloat() {
-	if (fFieldGetFloat == null)
-		fFieldGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getFloat", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetFloat;
-}
-
-public IMethodProxy getFieldGetInt() {
-	if (fFieldGetInt == null)
-		fFieldGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getInt", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetInt;
-}
-
-public IMethodProxy getFieldGetLong() {
-	if (fFieldGetLong == null)
-		fFieldGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getLong", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetLong;
-}
-
-public IMethodProxy getFieldGetShort() {
-	if (fFieldGetShort == null)
-		fFieldGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getShort", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fFieldGetShort;
-}
-
-public IMethodProxy getFieldSet() {
-	if (fFieldSet == null)
-		fFieldSet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "set", new String[] {"java.lang.Object", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fFieldSet;
-}
-
-public IMethodProxy getConstructorNewInstance() {
-	if (fConstructorNewInstance == null)
-		fConstructorNewInstance = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Constructor", "newInstance", new String[] {"[Ljava.lang.Object;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fConstructorNewInstance;
-}
-
-public IMethodProxy getConstructorParameterTypesMessage() {
-	if (fConstructorParameterTypesMessage == null)
-		fConstructorParameterTypesMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Constructor", "getParameterTypes", null); //$NON-NLS-1$ //$NON-NLS-2$
-	return fConstructorParameterTypesMessage;
-}
-
-public IMethodProxy getArrayNewInstanceOneDimension() {
-	if (fArrayNewInstanceOneDimension == null)
-		fArrayNewInstanceOneDimension = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "newInstance", new String[] {"java.lang.Class", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayNewInstanceOneDimension;
-}
-
-public IMethodProxy getArrayNewInstanceMultiDimension() {
-	if (fArrayNewInstanceMultiDimensions == null)
-		fArrayNewInstanceMultiDimensions = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "newInstance", new String[] {"java.lang.Class", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayNewInstanceMultiDimensions;
-}
-
-public IMethodProxy getArrayGetLength() {
-	if (fArrayGetLength == null)
-		fArrayGetLength = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getLength", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fArrayGetLength;
-}
-
-public IMethodProxy getArrayGet() {
-	if (fArrayGet == null)
-		fArrayGet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "get", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGet;
-}
-
-public IMethodProxy getArrayGetByte() {
-	if (fArrayGetByte == null)
-		fArrayGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getByte", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetByte;
-}
-
-public IMethodProxy getArrayGetBoolean() {
-	if (fArrayGetBoolean == null)
-		fArrayGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getBoolean", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetBoolean;
-}
-
-public IMethodProxy getArrayGetChar() {
-	if (fArrayGetChar == null)
-		fArrayGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getChar", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetChar;
-}
-
-public IMethodProxy getArrayGetDouble() {
-	if (fArrayGetDouble == null)
-		fArrayGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getDouble", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetDouble;
-}
-
-public IMethodProxy getArrayGetFloat() {
-	if (fArrayGetFloat == null)
-		fArrayGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getFloat", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetFloat;
-}
-
-public IMethodProxy getArrayGetInt() {
-	if (fArrayGetInt == null)
-		fArrayGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getInt", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetInt;
-}
-
-public IMethodProxy getArrayGetLong() {
-	if (fArrayGetLong == null)
-		fArrayGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getLong", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetLong;
-}
-
-public IMethodProxy getArrayGetShort() {
-	if (fArrayGetShort == null)
-		fArrayGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getShort", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayGetShort;
-}
-
-public IMethodProxy getArraySet() {
-	if (fArraySet == null)
-		fArraySet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "set", new String[] {"java.lang.Object", "int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	return fArraySet;
-}
-
-public IMethodProxy getArrayHelperGet() {
-	if (fArrayHelperGet == null)
-		fArrayHelperGet = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "get", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGet;
-}
-
-public IMethodProxy getArrayHelperGetByte() {
-	if (fArrayHelperGetByte == null)
-		fArrayHelperGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getByte", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetByte;
-}
-
-public IMethodProxy getArrayHelperGetBoolean() {
-	if (fArrayHelperGetBoolean == null)
-		fArrayHelperGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getBoolean", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetBoolean;
-}
-
-public IMethodProxy getArrayHelperGetChar() {
-	if (fArrayHelperGetChar == null)
-		fArrayHelperGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getChar", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetChar;
-}
-
-public IMethodProxy getArrayHelperGetDouble() {
-	if (fArrayHelperGetDouble == null)
-		fArrayHelperGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getDouble", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetDouble;
-}
-
-public IMethodProxy getArrayHelperGetFloat() {
-	if (fArrayHelperGetFloat == null)
-		fArrayHelperGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getFloat", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetFloat;
-}
-
-public IMethodProxy getArrayHelperGetInt() {
-	if (fArrayHelperGetInt == null)
-		fArrayHelperGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getInt", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetInt;
-}
-
-public IMethodProxy getArrayHelperGetLong() {
-	if (fArrayHelperGetLong == null)
-		fArrayHelperGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getLong", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetLong;
-}
-
-public IMethodProxy getArrayHelperGetShort() {
-	if (fArrayHelperGetShort == null)
-		fArrayHelperGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getShort", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fArrayHelperGetShort;
-}
-
-public IMethodProxy getArrayHelperSet() {
-	if (fArrayHelperSet == null)
-		fArrayHelperSet = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "set", new String[] {"java.lang.Object", "[I", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	return fArrayHelperSet;
-}
-
-
-public IMethodProxy getClassGetDeclaredField() {
-
-	if (fClassGetDeclaredField == null)
-			fClassGetDeclaredField = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredField", new String[] {"java.lang.String"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	return fClassGetDeclaredField;
-}
-
-public IMethodProxy getClassGetDeclaredFields() {
-
-	if (fClassGetDeclaredFields == null)
-			fClassGetDeclaredFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredFields", null); //$NON-NLS-1$
-	return fClassGetDeclaredFields;
-}
-public IMethodProxy getClassGetFields() {
-
-	if (fClassGetFields == null)
-			fClassGetFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getFields", null); //$NON-NLS-1$
-	return fClassGetFields;
-}
-
-
-/**
- * @return
- * 
- * @since 1.1.0
- */
-public IMethodProxy getClassMethods() {
-	if (fClassGetMethods == null)
-		fClassGetMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getMethods", null); //$NON-NLS-1$
-	return fClassGetMethods;
-}
-
-/**
- * @return
- * 
- * @since 1.1.0
- */
-public IMethodProxy getClassDeclaredMethods() {
-	if (fClassGetDeclaredMethods == null)
-		fClassGetDeclaredMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredMethods", null); //$NON-NLS-1$
-	return fClassGetDeclaredMethods;
-}
-
-public IMethodProxy getClassDeclaredMethod() {
-	if (fClassGetDeclaredMethod == null)
-		fClassGetDeclaredMethod = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredMethod", new String[] {"java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fClassGetDeclaredMethod;
-}
-
-public IMethodProxy getFindCompatibleConstructorMethod() {
-	if (fMethodHelperFindCompatibleConstructor == null)
-		fMethodHelperFindCompatibleConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.common.MethodHelper", "findCompatibleConstructor", new String[] {"java.lang.Class", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fMethodHelperFindCompatibleConstructor;
-}
-
-public IMethodProxy getFindCompatibleMethodMethod() {
-	if (fMethodHelperFindCompatibleMethod == null)
-		fMethodHelperFindCompatibleMethod = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.common.MethodHelper", "findCompatibleMethod", new String[] {"java.lang.Class", "java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	return fMethodHelperFindCompatibleMethod;
-}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java
deleted file mode 100644
index 3713eab..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java
+++ /dev/null
@@ -1,844 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMStandardBeanProxyFactory.java,v $
- *  $Revision: 1.11 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.CommandErrorException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * The Remote VM Standard Bean Proxy Factory.
- * Creation date: (12/3/99 12:01:45 PM)
- * @author: Joe Winchester
- */
-public final class REMStandardBeanProxyFactory implements IStandardBeanProxyFactory {
-	protected final REMProxyFactoryRegistry fRegistry;
-	protected final REMStandardBeanTypeProxyFactory fBeanTypeProxyFactory;	// Convenience field.
-
-	
-	// We need a map for mapping object id's to the proxy. The entry will actually be
-	// a REMStandardBeanProxyFactory.WeakProxyReference. This is so that the
-	// proxy will not be held tightly by this map and can be GC'd if not referenced.
-	// Periodically, the reference queue will be processed to remove any of the
-	// entries that have been GC'd and the server will be told that it can release
-	// the ID on its side.
-	//
-	// This map will be used as synchronize object also for access to it.
-	//
-	// There will be a low priority job that will occasionally process the GC'd objects
-	// and remove them from the queue and the remote vm. It will not remove during lockedTransactions.
-	//
-	// NOTE: Certain proxies never get added to the map. They are the
-	// standard types/class (i.e. null, byte, int, long, short, double, float, byte, string). These
-	// always have the value saved in the proxy so that it can be retrieved without going back
-	// to the server. 
-	private final HashMap fIDToProxiesMap = new HashMap(1000);	// Map ID's to proxies. The proxies have their id's so we don't need a reverse map
-	private int transactionLockCount = 0;	// Count of transactions that have locked access. It is changed under sync control of fIDToProxies map.
-	
-	/**
-	 * The Weak reference used for the id to proxies map for the proxy
-	 * so that we can clean it up when the proxy has been garbage collected.
-	 *
-	 * It is important that all changes to the ProxyRef are done through sync on fIDToProxiesMap.
-	 */
-	private static class ProxyRef extends java.lang.ref.WeakReference {
-		private Integer id;	// We need the id because this reference will be on the value side
-					// and not the key side of the map, so we need to know the key
-					// so that the object can be removed from the map.
-					//
-					// If the ID is null, then this means this entry has been processed
-					// in some way and should not be released or removed from the table.
-		private int useCnt = 1;	// Usage/Ref count. Needed so that we don't get rid of too soon. Since we don't
-					// create a ProxyRef without a usage, we start it off with one. It will be incremented
-					// then on retrievals when needed by users outside of the remote factories themselves.
-					// It won't be physically released until either GC got rid of it, or it goes to 0 or less
-					// on a release request.
-					
-		public ProxyRef(Integer anID, Object proxy, java.lang.ref.ReferenceQueue q) {
-			super(proxy, q);
-			id = anID;
-		}
-		
-		public Integer getID() {
-			return id;
-		}
-		
-		public void clear() {
-			super.clear();
-			id = null;
-		}
-		
-		public synchronized int useCnt() {
-			return useCnt;
-		}
-		
-		public synchronized void incrUseCnt() {
-			useCnt++;
-		}
-		
-		public synchronized int decrUseCnt() {
-			if (--useCnt < 0)
-				useCnt = 0;
-			return useCnt;
-		}
-	}
-	
-	/* Reference queue for cleared Proxies */
-	private java.lang.ref.ReferenceQueue queue = new java.lang.ref.ReferenceQueue();	
-	
-	/**
-	 * Process the entries on the id to proxies map that have been garbage collected.
-	 * It is package-protected because only REMRegistryController should call it.
-	 */
-	void processQueue() {
-		ProxyRef pr;	
-		while (true) {
-			if (Thread.interrupted())
-				return;	// Maybe going down.	(This actually a kludge because the thread happens to be the master thread from the registry controller).
-				
-			synchronized (fIDToProxiesMap) {
-				if (queue == null || transactionLockCount > 0)
-					break;	// Either no queue (we are cleaning up) or in a transaction, stop processing and retry on next time slice.
-				if ((pr = (ProxyRef) queue.poll()) != null) {				
-					if (pr.getID() != null) {
-						// It hasn't been processed by some other means.				
-						fIDToProxiesMap.remove(pr.getID());						
-						releaseID(pr.getID().intValue());
-					}
-				} else
-					break;	// There are no more waiting, so leave.
-			}
-		}
-	}
-	
-	
-/**
- * REMBeanProxyFactory constructor comment.
- *
- * Note: It assumes the beantype factory has already been registered.
- */
-REMStandardBeanProxyFactory(REMProxyFactoryRegistry aRegistry) {
-	fRegistry = aRegistry;
-	aRegistry.registerBeanProxyFactory(this);
-	fBeanTypeProxyFactory = (REMStandardBeanTypeProxyFactory) aRegistry.getBeanTypeProxyFactory();
-	fBeanTypeProxyFactory.initialize(this);	// Now we're ready for the beantype factory to be initialized.
-	
-}
-
-
-/**
- * Register a collection of Proxies
- */
-public void registerProxies(Collection proxies) {
-	synchronized(fIDToProxiesMap) {
-		Iterator itr = proxies.iterator();
-		while (itr.hasNext()) {
-			IREMBeanProxy proxy = (IREMBeanProxy) itr.next();
-			if (proxy instanceof IBeanTypeProxy || !(proxy.getTypeProxy() instanceof IREMConstantBeanTypeProxy)) {
-				ProxyRef oldRef = (ProxyRef) fIDToProxiesMap.put(proxy.getID(), new ProxyRef(proxy.getID(), proxy, queue));
-				if (oldRef != null) {
-					// We've replaced it with a new one, so we will clear out the ref so that it won't later try to remove itself
-					oldRef.clear();
-				}
-			}
-		}		
-	}
-}
-
-/**
- * Register a single proxy
- */
-public void registerProxy(IREMBeanProxy proxy) {
-	if (proxy instanceof IBeanTypeProxy || !(proxy.getTypeProxy() instanceof IREMConstantBeanTypeProxy))
-		synchronized(fIDToProxiesMap) {
-			ProxyRef oldRef = (ProxyRef) fIDToProxiesMap.put(proxy.getID(), new ProxyRef(proxy.getID(), proxy, queue));
-			if (oldRef != null) {
-				// We've replaced it with a new one, so we will clear out the ref so that it won't later try to remove itself
-				oldRef.clear();
-			}							
-		}
-}
-
-/**
- * Release a proxy because no longer needed.
- */
-public void releaseProxy(IBeanProxy proxy) {
-	if (!proxy.isValid())
-		return;
-	if (proxy instanceof IBeanTypeProxy && !fBeanTypeProxyFactory.releaseProxy((IBeanTypeProxy) proxy))
-		return;	// BeanType and type factory won't allow release of it.
-	Integer id = ((IREMBeanProxy) proxy).getID();
-	synchronized(fIDToProxiesMap) {			
-		// Synced in here so that we will remove it before some one else from a different thread may try
-		// to access it again.
-		if (id.intValue() != Commands.NOT_AN_ID) {
-			ProxyRef ref = (ProxyRef) fIDToProxiesMap.get(id);
-			if (ref == null || ref.decrUseCnt() <= 0) {
-				// No usage, so do actual release.
-				fIDToProxiesMap.remove(id);
-				((IREMBeanProxy) proxy).release();
-				if (ref != null)
-					ref.enqueue();	// Queue it up so that on next release cycle it will go away.
-			} 
-		} else {
-			((IREMBeanProxy) proxy).release();			
-		}
-	}
-}
-
-/**
- * Release a specific ID. This is used in case an ID has been sent
- * but we couldn't proxy it. In that case we only have an ID. It is
- * also used when a proxy has been released explicitly or through GC.
- * In that case it has already been de-registered.
- */
-private void releaseID(int anID) {
-	try {
-		IREMConnection connect = fRegistry.getFreeConnection();
-		try {
-			connect.releaseID(anID);
-		} finally {
-			fRegistry.returnConnection(connect);
-		}
-	} catch (IllegalStateException e) {
-		// Couldn't get connection, don't bother with a release.
-	}
-}
-
-/**
- * For the Remote Factory we will create an REMBeanProxy using the null constructor
- * Package protected so only REMBeanTypeProxies can create instances.
- */
- 
-IBeanProxy createBeanProxy(IREMBeanTypeProxy aTypeProxy) throws ThrowableProxy {
-	return REMStandardBeanProxyConstants.getConstants(fRegistry).getClassNewInstance().invoke(null, aTypeProxy);
-}
-
-/**
- * For the Remote Factory we will create a REMBeanProxy using the initializationString.
- * Package protected so only REMBeanTypeProxies can create instances. 
- */
-IBeanProxy createBeanProxy(IREMBeanTypeProxy aTypeProxy, String initializationString)
-	throws ThrowableProxy, CommandException, ClassCastException, InstantiationException, IllegalStateException {
-	IREMConnection connect = fRegistry.getFreeConnection();
-	startTransaction();
-	// Starting a transaction, we will be getting id's back and need to get data in a separate step, so we need to group it in a transaction.
-	try {
-		Commands.ValueObject newInstanceData = null;
-		try {
-			newInstanceData = getNewInstanceData(aTypeProxy, initializationString, connect);
-		} catch (CommandErrorException e) {
-			switch (e.getErrorCode()) {
-				case Commands.CLASS_CAST_EXCEPTION:
-					// The result was not of the correct type.
-					throw new ClassCastException(
-						MessageFormat.format(ProxyRemoteMessages.getString("Classcast_EXC_"), new Object[] {extractFirstLine(initializationString), aTypeProxy.getTypeName()})); //$NON-NLS-1$
-				case Commands.CANNOT_EVALUATE_STRING:
-					// Want to log the exception that caused it to not evaluate.
-					// Don't need to log this side, just log the RemoteVM side of the trace.
-					java.io.StringWriter s = new java.io.StringWriter();
-					java.io.PrintWriter w = new java.io.PrintWriter(s);
-					((ThrowableProxy) e.getErrorObject()).printProxyStackTrace(w);
-					ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
-					throw new InstantiationException(
-						MessageFormat.format(ProxyRemoteMessages.getString("Instantiate_EXC_"), new Object[] {extractFirstLine(initializationString)})); //$NON-NLS-1$
-				default:
-					throw e; //$NON-NLS-1$
-			}
-		} catch (CommandException e) {
-			if (e.isRecoverable()) {
-				ProxyPlugin.getPlugin().getLogger().log( 
-					new Status(
-						IStatus.WARNING,
-						ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
-						0,
-						"", //$NON-NLS-1$
-						e));
-			} else {
-				// It failed in the command, try again.
-				fRegistry.closeConnection(connect);
-				connect = null;
-				connect = fRegistry.getFreeConnection();
-				try {
-					newInstanceData = getNewInstanceData(aTypeProxy, initializationString, connect);
-				} catch (CommandException eAgain) {
-					// It failed again. Close this connection and don't let it be returned.
-					fRegistry.closeConnection(connect);
-					connect = null; // This is so that it won't be returned.
-				}
-			}
-		} finally {
-			if (connect != null)
-				fRegistry.returnConnection(connect);
-		}
-
-		if (newInstanceData != null)
-			return getBeanProxy(newInstanceData); // Turn it into a proxy
-	} finally {
-		stopTransaction();	// Now we can release the transaction.
-	}
-
-return null;
-}
-
-private String extractFirstLine(String initString) {
-	// Need to extract the first line for the messageFormat not to barf.
-	int cr = initString.indexOf('\r');
-	int lf = initString.indexOf('\n');	
-	if (cr != -1 || lf != -1) {
-		if (cr == -1 || (lf != -1 && lf < cr))
-			return initString.substring(0, lf);
-		else
-			return initString.substring(0, cr);
-	} else
-		return initString;
-}
-	
-	
-/**
- * actually create it using a passed in connection. This allows retry capability.
- *
- * This will send the request over to the connection.
- *
- * If we get an OBJECT back, then the beantypeproxy that the classID in the
- * value points to must be of type IREMConstantBeanTypeProxy so that we can
- * send this new object to the correct beantype to create the correct proxy.
- *
- * If we get an OBJECT_ID back, then the beantypeproxy that the classID in
- * the value points to must be able to handle creating a proxy of that type. 
- */
-private Commands.ValueObject getNewInstanceData(IREMBeanTypeProxy aTypeProxy, String initializationString, IREMConnection connect) throws ThrowableProxy, CommandException {	
-	try {
-		Commands.ValueObject newInstanceData = new Commands.ValueObject();
-		connect.getNewInstance(aTypeProxy.getID().intValue(), initializationString, newInstanceData);
-		return newInstanceData;
-	} catch (CommandErrorException e) {
-		// TBD - Needs to handle error of not evaluatable and send over to the compilor.
-		processErrorReturn(e);	// Process this
-	}
-	return null;
-}
-
-/**
- * actually create it using a passed in connection. This allows retry capability.
- */
-private void getObjectInstanceData(IREMConnection connect, int objectID, Commands.ValueObject valueReturn) throws ThrowableProxy, CommandException {	
-	try {
-		connect.getObjectData(objectID, valueReturn);
-	} catch (CommandErrorException e) {
-		processErrorReturn(e);	// Process this
-	}
-}
-
-/**
- * Get a bean proxy from the value object passed in. If not yet created, create one.
- * NOTE: NULL type actually returns a true null. This is so that if people are casting
- * the returned proxy to a specific type (e.g IIntegerBeanProxy), then they won't get
- * a ClassCastException, they will get a null. This is easier for them to handle.
- * 
- * NOTE: This is public ONLY so that extension factories can create correct types of
- * proxies in consistent manner from a value object. 
- * 
- * It is important that this is called
- * from within a transaction only because otherwise the value could have invalid data
- * by the time we try to get the data out of it.
- */
-public IBeanProxy getBeanProxy(Commands.ValueObject value) throws ThrowableProxy, CommandException {
-	switch (value.type) {
-		// Null result.
-		case (byte) Commands.VOID_TYPE:
-			return null;
-		// A constant object was received.
-		case Commands.OBJECT:
-			IREMConstantBeanTypeProxy constantBeanType = null;
-			try {
-				constantBeanType = (IREMConstantBeanTypeProxy) getBeanType(value.classID);
-				if (constantBeanType == null)
-					return null;	// Cannot find the type to create it.
-			} catch (ClassCastException e) {
-				// It wasn't a constant type, so we can't create it. Return null.
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-				return null;
-			}
-			
-			return constantBeanType.newBeanProxy(value);
-		
-		// An existing object_id was returned, the object should exist. If it doesn't
-		// then submit the info command to try to recreate it correctly.
-		case Commands.OBJECT_ID:
-			Integer objectID = new Integer(value.objectID);
-			IBeanProxy proxy = retrieveProxy(objectID, true);
-			if (proxy != null)
-				return proxy;
-
-			// Not found, need to try to recreate it.
-			IREMConnection connect = fRegistry.getFreeConnection();
-			try {
-				getObjectInstanceData(connect, value.objectID, value); // Go and get the data
-			} catch (CommandErrorException e) {
-				if (e.isRecoverable()) {
-					ProxyPlugin.getPlugin().getLogger().log(
-						new Status(
-							IStatus.WARNING,
-							ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
-							0,
-							"", //$NON-NLS-1$
-							e));
-					return null;
-				} else {
-					// Try one more time.
-					fRegistry.closeConnection(connect);
-					connect = null;
-					connect = fRegistry.getFreeConnection();
-					try {
-						getObjectInstanceData(connect, value.objectID, value); // Go and get the data
-					} catch (CommandErrorException eAgain) {
-						fRegistry.closeConnection(connect);
-						connect = null;
-						throw eAgain;
-					}
-				}
-			} finally {
-				if (connect != null)
-					fRegistry.returnConnection(connect);
-			}
-
-			return getBeanProxy(value); // Now process it to create the new data.
-			
-		// An new object id. Need to get the class type and let it create it.
-		case Commands.NEW_OBJECT_ID:
-			try {
-				IREMBeanTypeProxy newBeanType = getBeanType(value.classID);
-				IREMBeanProxy newProxy = newBeanType.newBeanProxy(new Integer(value.objectID));
-				if (newProxy != null)
-					registerProxy(newProxy);
-				return newProxy;
-			} catch (CommandException e) {
-				// The server has created a new object, but we couldn't create/register a proxy for it.
-				// We need to release it so that the server can get rid of it. Otherwise it would hang
-				// around over there forever.
-				releaseID(value.objectID);
-				throw e;				
-			} catch (RuntimeException e) {
-				// The server has created a new object, but we couldn't create/register a proxy for it.
-				// We need to release it so that the server can get rid of it. Otherwise it would hang
-				// around over there forever.
-				releaseID(value.objectID);
-				throw e;
-			}			
-			
-		// An exception was thrown, create the ThrowableProxy and then throw it.
-		case Commands.THROW:
-			IREMBeanProxy newThrowProxy	= null;
-			try {
-				IREMBeanTypeProxy newThrowType = newThrowType = getBeanType(value.classID);
-				newThrowProxy = newThrowType.newBeanProxy(new Integer(value.objectID));
-				if (newThrowProxy != null)
-					registerProxy(newThrowProxy);
-			} catch (CommandException e) {
-				// The server has created a new object, but we couldn't create/register a proxy for it.
-				// We need to release it so that the server can get rid of it. Otherwise it would hang
-				// around over there forever.
-				releaseID(value.objectID);
-				throw e;				
-			} catch (RuntimeException e) {
-				// The server has created a new object, but we couldn't create/register a proxy for it.
-				// We need to release it so that the server can get rid of it. Otherwise it would hang
-				// around over there forever.
-				releaseID(value.objectID);
-				throw e;
-			}				
-			// It really should be a throwable, but if not, just return it.
-			if (newThrowProxy instanceof ThrowableProxy)
-				throw (ThrowableProxy) newThrowProxy;
-			else
-				return newThrowProxy;		
-		
-		// It is one of the standard kinds, which are Constant types
-		default:
-			IREMConstantBeanTypeProxy standardBeanType = null;
-			try {
-				standardBeanType = (IREMConstantBeanTypeProxy) getBeanType(value.type);
-				if (standardBeanType == null)
-					return null;	// Cannot find the type to create it.
-			} catch (ClassCastException e) {
-				// It wasn't a standard type, so we can't create it. Return null.
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-				return null;
-			}
-			return standardBeanType.newBeanProxy(value);
-	}						
-}
-
-/**
- * Process the error exception. Get the data from it and turn it into proxy data.
- * If it is a THROW, then it will throw the Throwable instead. 
- *
- * NOTE: It is public ONLY so that extension factories can process errors in
- * an consistent manner. 
- * 
- * It is important that this be called only within a transaction.
- */
-public void processErrorReturn(CommandErrorException e) throws CommandException, ThrowableProxy {
-	int code = e.getErrorCode();
-	Object data = null;
-	if (code == Commands.THROWABLE_SENT)
-		data = getBeanProxy(e.getValue());	// It is Throw sent, so let the throw from getBeanProxy continue on out. (But as a safety, we still try to get the data.
-	else {
-		try {
-			data = getBeanProxy(e.getValue());
-		} catch (ThrowableProxy t) {
-			// But we want to keep throwables in this case. They are just data for the command error.
-			data = t;
-		}
-	}
-	throw new CommandErrorException(MessageFormat.format(ProxyRemoteMessages.getString("RemoteCmd_EXC_"), new Object[] {new Integer(code)}), code, e.getValue(), data);	// Create a new one and throw it containing the proxied data. //$NON-NLS-1$
-}
-	 
-
-/**
- * Get a beantype where the id passed in is the classID of the beantype.
- * If not found, then go get it loaded. If it can't be found, then we will
- * release the id because it means we have an id from the server, but we
- * can't create a proxy for it, so don't keep the server holding it.
- * NOTE: This is public ONLY so that extension factories can create correct types
- * in a consistent manner from the id.
- * 
- * It is important that this be called only from within a transaction. 
- */
-public IREMBeanTypeProxy getBeanType(int id) throws CommandException {
-	IREMBeanTypeProxy beanType = null;
-	try {
-		Integer classID = new Integer(id);
-		beanType = (IREMBeanTypeProxy) retrieveProxy(classID, false);
-		if (beanType == null)
-			beanType = fBeanTypeProxyFactory.createBeanTypeProxy(classID);	// We don't have it, need to go to the factory so that it can go query what it needs
-		if (beanType == null)
-			return null;	// Cannot find the type to create it.
-	} catch (ClassCastException e) {
-		// It wasn't a bean type, so we can't create it. Return null.
-		ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-	} finally {
-		if (beanType == null)
-			releaseID(id);	// Couldn't create a proxy, so release the id.
-	}
-	return beanType;
-}
-
-
-/**
- * Return a proxy wrapping the primitive integer
- */
-public IIntegerBeanProxy createBeanProxyWith(int aPrimitiveInteger) {
-
-	return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(aPrimitiveInteger);
-}
-
-/**
- * Return a proxy wrapping the primitive byte
- */
-public INumberBeanProxy createBeanProxyWith(byte aPrimitiveByte) {
-
-	return fBeanTypeProxyFactory.byteType.createByteBeanProxy(aPrimitiveByte);
-}
-
-/**
- * Return a proxy wrapping the primitive char
- */
-public ICharacterBeanProxy createBeanProxyWith(char aPrimitiveChar) {
-
-	return fBeanTypeProxyFactory.charType.createCharacterBeanProxy(aPrimitiveChar);
-}
-
-/**
- * Return a proxy wrapping the primitive short
- */
-public INumberBeanProxy createBeanProxyWith(short aPrimitiveShort) {
-
-	return fBeanTypeProxyFactory.shortType.createShortBeanProxy(aPrimitiveShort);
-}
-
-/**
- * Return a proxy wrapping the primitive long
- */
-public INumberBeanProxy createBeanProxyWith(long aPrimitiveLong) {
-
-	return fBeanTypeProxyFactory.longType.createLongBeanProxy(aPrimitiveLong);
-}
-/**
- * Return a proxy wrapping the primitive double
- */
-public INumberBeanProxy createBeanProxyWith(double aPrimitiveDouble) {
-
-	return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(aPrimitiveDouble);
-}
-/**
- * Return a proxy wrapping the primitive float
- */
-public INumberBeanProxy createBeanProxyWith(float aPrimitiveFloat) {
-
-	return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(aPrimitiveFloat);
-}
-
-/**
- * createBeanProxyWith method comment.
- */
-public IBooleanBeanProxy createBeanProxyWith(Boolean aBoolean) {
-	return fBeanTypeProxyFactory.booleanClass.createBooleanBeanProxy(aBoolean);
-}
-/**
- * Return a proxy that wraps the Integer argument
- */
-public IIntegerBeanProxy createBeanProxyWith(Integer anInteger) {
-
-	return fBeanTypeProxyFactory.integerClass.createIntegerBeanProxy(anInteger);
-}
-/**
- * createBeanProxyWith method comment.
- */
-public INumberBeanProxy createBeanProxyWith(Number aNumber) {
-	REMAbstractNumberBeanTypeProxy type = (REMAbstractNumberBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(aNumber.getClass().getName());
-	return type.createNumberBeanProxy(aNumber);
-}
-/**
- * Return a proxy for the argument
- */
-public IStringBeanProxy createBeanProxyWith(String aString) {
-
-	return fBeanTypeProxyFactory.stringClass.createStringBeanProxy(aString);
-
-}
-/**
- * Return a proxy for the argument
- */
-public ICharacterBeanProxy createBeanProxyWith(Character aCharacter) {
-
-	return fBeanTypeProxyFactory.characterClass.createCharacterBeanProxy(aCharacter);
-
-}
-/**
- * createBeanProxyWith method comment.
- */
-public IBooleanBeanProxy createBeanProxyWith(boolean aPrimitiveBoolean) {
-	return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(aPrimitiveBoolean);
-}
-
-/**
- * Create an array bean proxy.
- *
- *   - (int, new int[2] {3, 4}) will create:
- *      int [3] [4]
- *
- *   - (int[], new int[1] {1})
- *      int [1]
- *
- *   - (int[], new int[2] {2,3})
- *      int [2] [3]
- * 
- *
- *   - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
- *      int [0]...
- *     or
- *     (int[][]..., null) or (int[][]..., new int[0])
- *      int[0][]...
- *     This is because an array instance with no specified dimensions is not valid. 
- *
- *   - (int[][], new int[1] {3})
- *      int[3][]
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int[] dimensions) throws ThrowableProxy {
-	if (type.isArray())
-		return ((REMArrayBeanTypeProxy) type).createBeanProxyWith(dimensions);	// Already an array type, just pass it on.
-	else {
-		// It is not an array type, so we need to get an array of this type and dimensions.
-		REMArrayBeanTypeProxy arrayType = (REMArrayBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(type.getTypeName(), dimensions.length);
-		return arrayType.createBeanProxyWith(dimensions);
-	}
-}
-/**
- * Create a one-dimensional array. 
- * The result will be the same as calling 
- *   createBeanProxyWith(IBeanTypeProxy type, new int[1] {x})
- * where 'x' is the value passed in as the dimension.
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int dimension) throws ThrowableProxy {
-	return createBeanProxyWith(type, new int[] {dimension});
-}
-
-/**
- * Retrieve the proxy from the mapping table. Handle already GC'd.
- * If this returns null, it is important that the caller tries to recreate
- * it since the id is still valid on the server.
- */
-private IBeanProxy retrieveProxy(Integer objectID, boolean incrementUseCnt) {
-	synchronized (fIDToProxiesMap) {
-		ProxyRef ref = (ProxyRef) fIDToProxiesMap.get(objectID);
-		if (ref != null) {
-			Object bp = ref.get();			
-			if (ref.isEnqueued() || bp == null) {
-				// It's waiting to be removed, or has been removed. i.e. GC'd, so just remove it from the map, next processQueue will remove it from the queue.
-				fIDToProxiesMap.remove(objectID);
-				ref.clear();		// This is so that when the processQueue see's it, 
-							// it won't send a release request to the server 
-							// since it will be recreated when this method returns.
-				return null;
-			} else {
-				if (incrementUseCnt)
-					ref.incrUseCnt();
-				return (IBeanProxy) bp;
-			}	
-		} else
-			return null;
-	}
-}
-
-/**
- * Start Transaction: During the time between start/stop transaction,
- * proxies will not be cleaned up. This prevents the case of a two step
- * transaction where the returned ID from the remote vm is for a proxy
- * that is about to be cleaned up, and then having that proxy disappear
- * when going for the data for it.
- * 
- * Note: It is IMPERITIVE that the start/stop is used in the following way:
- *     factory.startTransaction();
- *     try {
- *         do your stuff...
- *     } finally {
- *         factory.stopTransaction();
- *     }
- * 
- * This way it can never accidently leave it in a locked state.
- */
-public	void startTransaction()  {
-	synchronized (fIDToProxiesMap) {
-		transactionLockCount++;
-	}
-}
-
-public boolean inTransaction() {
-	synchronized (fIDToProxiesMap) {
-		return transactionLockCount != 0;
-	}
-}
-
-/**
- * Stop Transaction: During the time between start/stop transaction,
- * proxies will not be cleaned up. This prevents the case of a two step
- * transaction where the returned ID from the remote vm is for a proxy
- * that is about to be cleaned up, and then having that proxy disappear
- * when going for the data for it.
- * 
- * Note: It is IMPERITIVE that the start/stop is used in the following way:
- *     factory.startTransaction();
- *     try {
- *         do your stuff...
- *     } finally {
- *         factory.stopTransaction();
- *     }
- * 
- * This way it can never accidently leave it in a locked state.
- */
-public	void stopTransaction()  {
-	synchronized (fIDToProxiesMap) {
-		if (--transactionLockCount < 0)
-			transactionLockCount = 0;	// Shouldn't occur, but just in case.
-	}
-}
-
-/**
- * Terminate the factory. If this is being terminated, then the server is being terminated too.
- * So just go through all of the proxies and release them, but don't send any notification to
- * the server since the server is subsequently just going to throw them away when it terminates.
- * <p>
- * This can't run async, so wait is a suggestion here.
- */
-public void terminateFactory(boolean wait) {
-	synchronized (fIDToProxiesMap) {
-		Iterator itr = fIDToProxiesMap.values().iterator();
-		while (itr.hasNext()) {
-			ProxyRef ref = (ProxyRef) itr.next();
-			if (ref != null) {
-				Object bp = ref.get();
-				// If not cleaned up and not enqueued, release it.
-				if (bp != null && !ref.isEnqueued())
-					((IREMBeanProxy) bp).release();
-			}
-		}
-		
-		fIDToProxiesMap.clear();
-		queue = null;	// Don't bother processing the queue, don't need to now.
-	}
-}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createExpression()
-	 */
-	public IExpression createExpression() {
-		return new REMExpression(this.fRegistry);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createBeanProxyFrom(java.lang.String)
-	 */
-	public IBeanProxy createBeanProxyFrom(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-		try {
-			return createBeanProxy(fBeanTypeProxyFactory.voidType, initializationString);
-		} catch (CommandException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$		}
-		}
-		return null;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#convertToPrimitiveBeanProxy(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public IBeanProxy convertToPrimitiveBeanProxy(IBeanProxy nonPrimitiveProxy) {
-		if (nonPrimitiveProxy == null)
-			return null;
-		if (!nonPrimitiveProxy.isValid())
-			return nonPrimitiveProxy;
-		IREMBeanTypeProxy type = (IREMBeanTypeProxy) nonPrimitiveProxy.getTypeProxy();
-		// Step into the internals. The ID is a constant int, so we can use a switch stmt.
-		switch (type.getID().intValue()) {
-			case Commands.BOOLEAN_CLASS:
-				return this.createBeanProxyWith(((IBooleanBeanProxy) nonPrimitiveProxy).booleanValue());
-			case Commands.BYTE_CLASS:
-				return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).byteValue());
-			case Commands.CHARACTER_CLASS:
-				return this.createBeanProxyWith(((ICharacterBeanProxy) nonPrimitiveProxy).charValue());
-			case Commands.DOUBLE_CLASS:
-				return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).doubleValue());
-			case Commands.FLOAT_CLASS:
-				return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).floatValue());
-			case Commands.INTEGER_CLASS:
-				return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).intValue());
-			case Commands.LONG_CLASS:
-				return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).longValue());
-			case Commands.SHORT_CLASS:
-				return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).shortValue());
-			default:
-				return nonPrimitiveProxy;
-		}
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java
deleted file mode 100644
index e2b8d20..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,691 +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.jem.internal.proxy.remote;
-
-/*
- *  $RCSfile: REMStandardBeanTypeProxyFactory.java,v $
- *  $Revision: 1.11 $  $Date: 2005/05/16 19:11:23 $ 
- */
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-import org.eclipse.jem.internal.proxy.common.remote.CommandErrorException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * We are a beanTypeProxyFactory for creating REMBeanTypeProxy objects Primitive types as well as common types like String are cached for speed of
- * lookup. We are the standard one that the VCE uses. Creation date: (12/3/99 2:32:48 PM)
- * 
- * @author: Joe Winchester
- */
-public final class REMStandardBeanTypeProxyFactory implements IStandardBeanTypeProxyFactory {
-
-	protected final REMProxyFactoryRegistry fFactoryRegistry;
-
-	protected REMStandardBeanProxyFactory fBeanFactory;
-
-	// Hashtable to cache proxies for classes so they are found on second and subsequent lookups
-	protected Map fBeanProxies = new HashMap(1000);
-
-	// A Cache of bean type proxies that should not ever be released. These are the standard ones
-	// that we create here. They are never released because they wouldn't be correctly re-created
-	// if they were. Also they are standard ones with standard ID's that don't change so they
-	// don't need to be re-created later.
-	protected Set fPermanentProxies = new HashSet(30);
-
-	// Cache of requested but not found bean types. If not maintaining the list, this variable will be null.
-	// The values are strings (classnames in JNI format).
-	protected Set fNotFoundTypes = null;
-
-	// Cached copy of a few typical bean type proxies.
-	REMBeanTypeProxy objectClass;
-
-	REMClassBeanTypeProxy classClass;
-
-	REMVoidBeanTypeProxy voidType;
-
-	REMBooleanTypeBeanTypeProxy booleanType;
-
-	REMBooleanClassBeanTypeProxy booleanClass;
-
-	REMIntegerTypeBeanTypeProxy intType;
-
-	REMIntegerClassBeanTypeProxy integerClass;
-
-	REMByteTypeBeanTypeProxy byteType;
-
-	REMByteClassBeanTypeProxy byteClass;
-
-	REMShortClassBeanTypeProxy shortClass;
-
-	REMShortTypeBeanTypeProxy shortType;
-
-	REMLongClassBeanTypeProxy longClass;
-
-	REMLongTypeBeanTypeProxy longType;
-
-	REMDoubleClassBeanTypeProxy doubleClass;
-
-	REMDoubleTypeBeanTypeProxy doubleType;
-
-	REMFloatClassBeanTypeProxy floatClass;
-
-	REMFloatTypeBeanTypeProxy floatType;
-
-	REMBigDecimalBeanTypeProxy bigDecimalClass;
-
-	REMBigIntegerBeanTypeProxy bigIntegerClass;
-
-	REMCharacterTypeBeanTypeProxy charType;
-
-	REMCharacterClassBeanTypeProxy characterClass;
-
-	REMStringBeanTypeProxy stringClass;
-
-	/**
-	 * Available to all REM beantypes.
-	 */
-	public REMProxyConstants proxyConstants;
-
-	/**
-	 * IDEBeanTypeProxyFactory constructor comment.
-	 */
-	REMStandardBeanTypeProxyFactory(REMProxyFactoryRegistry aRegistry) {
-		fFactoryRegistry = aRegistry;
-		aRegistry.registerBeanTypeProxyFactory(this);
-
-		proxyConstants = new REMProxyConstants(aRegistry);
-
-		// Now initialize the cache.
-		objectClass = new REMBeanTypeProxy(fFactoryRegistry, new Integer(Commands.OBJECT_CLASS), Object.class.getName(), null);
-		classClass = new REMClassBeanTypeProxy(fFactoryRegistry, objectClass);
-		voidType = new REMVoidBeanTypeProxy(fFactoryRegistry);
-		booleanType = new REMBooleanTypeBeanTypeProxy(fFactoryRegistry);
-		booleanClass = new REMBooleanClassBeanTypeProxy(fFactoryRegistry, objectClass);
-		IBeanTypeProxy numberClass = objectClass.newBeanTypeForClass(new Integer(Commands.NUMBER_CLASS), Number.class.getName(), true);
-		intType = new REMIntegerTypeBeanTypeProxy(fFactoryRegistry);
-		integerClass = new REMIntegerClassBeanTypeProxy(fFactoryRegistry, numberClass);
-		byteType = new REMByteTypeBeanTypeProxy(fFactoryRegistry);
-		byteClass = new REMByteClassBeanTypeProxy(fFactoryRegistry, numberClass);
-		shortType = new REMShortTypeBeanTypeProxy(fFactoryRegistry);
-		shortClass = new REMShortClassBeanTypeProxy(fFactoryRegistry, numberClass);
-		longType = new REMLongTypeBeanTypeProxy(fFactoryRegistry);
-		longClass = new REMLongClassBeanTypeProxy(fFactoryRegistry, numberClass);
-		doubleType = new REMDoubleTypeBeanTypeProxy(fFactoryRegistry);
-		doubleClass = new REMDoubleClassBeanTypeProxy(fFactoryRegistry, numberClass);
-		floatType = new REMFloatTypeBeanTypeProxy(fFactoryRegistry);
-		floatClass = new REMFloatClassBeanTypeProxy(fFactoryRegistry, numberClass);
-		bigDecimalClass = new REMBigDecimalBeanTypeProxy(fFactoryRegistry, numberClass);
-		bigIntegerClass = new REMBigIntegerBeanTypeProxy(fFactoryRegistry, numberClass);
-		charType = new REMCharacterTypeBeanTypeProxy(fFactoryRegistry);
-		characterClass = new REMCharacterClassBeanTypeProxy(fFactoryRegistry, objectClass);
-		stringClass = new REMStringBeanTypeProxy(fFactoryRegistry, objectClass);
-		IBeanTypeProxy throwableClass = new REMThrowableBeanTypeProxy(fFactoryRegistry, new Integer(Commands.THROWABLE_CLASS), Throwable.class
-				.getName(), objectClass);
-		IBeanTypeProxy threadClass = objectClass.newBeanTypeForClass(new Integer(Commands.THREAD_CLASS), Thread.class.getName(), false);
-		IBeanTypeProxy expressionProcessorControllerClass = objectClass.newBeanTypeForClass(new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.ExpressionProcesserController", false);
-
-		// Initialize the hashtable with the primitives, their lang equivalents, and also common classes like String
-
-		// Primitives
-		fBeanProxies.put(voidType.getTypeName(), voidType);
-		fBeanProxies.put(intType.getTypeName(), intType);
-		fBeanProxies.put(booleanType.getTypeName(), booleanType);
-		fBeanProxies.put(charType.getTypeName(), charType);
-		fBeanProxies.put(byteType.getTypeName(), byteType);
-		fBeanProxies.put(shortType.getTypeName(), shortType);
-		fBeanProxies.put(longType.getTypeName(), longType);
-		fBeanProxies.put(floatType.getTypeName(), floatType);
-		fBeanProxies.put(doubleType.getTypeName(), doubleType);
-
-		// java.lang primitive peers
-		// Note that special classes are used for some of these which allow the IDE to get the
-		// lang objects from the objects that are holding proxies
-		fBeanProxies.put(integerClass.getTypeName(), integerClass);
-		fBeanProxies.put(booleanClass.getTypeName(), booleanClass);
-		fBeanProxies.put(characterClass.getTypeName(), characterClass);
-		fBeanProxies.put(byteClass.getTypeName(), byteClass);
-		fBeanProxies.put(shortClass.getTypeName(), shortClass);
-		fBeanProxies.put(longClass.getTypeName(), longClass);
-		fBeanProxies.put(floatClass.getTypeName(), floatClass);
-		fBeanProxies.put(doubleClass.getTypeName(), doubleClass);
-		fBeanProxies.put(bigDecimalClass.getTypeName(), bigDecimalClass);
-		fBeanProxies.put(bigIntegerClass.getTypeName(), bigIntegerClass);
-		fBeanProxies.put(stringClass.getTypeName(), stringClass);
-		fBeanProxies.put(throwableClass.getTypeName(), throwableClass);
-		fBeanProxies.put(objectClass.getTypeName(), objectClass);
-		fBeanProxies.put(classClass.getTypeName(), classClass);
-		fBeanProxies.put(numberClass.getTypeName(), numberClass);
-		fBeanProxies.put(threadClass.getTypeName(), threadClass);
-		fBeanProxies.put(expressionProcessorControllerClass.getTypeName(), expressionProcessorControllerClass);
-
-		// Mark these as permanent.
-		fPermanentProxies.addAll(fBeanProxies.values());
-	}
-
-	/**
-	 * Initialize AFTER BeanProxyFactory has been created. This is REQUIRED! NOTE: It is package protected so that only REMStandardBeanProxyFactory
-	 * can call it when ready.
-	 */
-	synchronized void initialize(REMStandardBeanProxyFactory proxyFactory) {
-		fBeanFactory = proxyFactory;
-		fBeanFactory.registerProxies(fBeanProxies.values());
-	}
-
-	/*
-	 * This is called when we know we don't have the class registered, so we need to create the proxy. We have a connection passed in and will reuse
-	 * it as necessary
-	 * 
-	 * It is important that this be called only from within a transaction.
-	 */
-	private synchronized IREMBeanTypeProxy createBeanTypeProxy(String typeName, IREMConnection connection) throws CommandException {
-
-		// We don't have the beantype proxy, so create it.
-		IREMBeanTypeProxy beanTypeProxy = null;
-		Commands.GetClassReturn ret = null;
-		try {
-			ret = getClassReturn(connection, typeName);
-		} catch (ThrowableProxy ep) {
-			// Print out the trace and return proxy with init error.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", ep)); //$NON-NLS-1$
-			IREMBeanTypeProxy proxy = new REMInitErrorBeanTypeProxy(fFactoryRegistry, MessageFormat.format(ProxyRemoteMessages
-					.getString("ExceptionErrorMsg_EXC_"), new Object[] { ep.getTypeProxy().getTypeName(), ep.getProxyLocalizedMessage()}), typeName); //$NON-NLS-1$
-			registerBeanTypeProxy(proxy, false);
-			return proxy;
-		}
-		if (ret == null) {
-			if (fNotFoundTypes != null)
-				fNotFoundTypes.add(typeName);
-			return null; // The class doesn't even exist on the server.
-		}
-
-		if (typeName.charAt(0) != '[') {
-			// It is not an array.
-			IREMBeanTypeProxy superTypeProxy = null;
-			if (!ret.isInterface && ret.superClassname.length() != 0) {
-				// Get the beantype proxy of the superclass.
-				superTypeProxy = getBeanTypeProxy(ret.superClassname, connection);
-			}
-
-			// First check with the factory for the package of the class.
-			// Inner classes have to use the dollar notation since if they didn't we couldn't tell where
-			// the package ended and the class started. This check is here in case the
-			// extension factory can handle this class but needs the id from the server to
-			// create it.
-			int packageIndex = typeName.lastIndexOf('.');
-			if (packageIndex != -1) {
-				String packageName = typeName.substring(0, packageIndex);
-				IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
-				if (packageFactory != null) {
-					beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName, new Integer(ret.classID), superTypeProxy);
-					if (beanTypeProxy != null) {
-						registerBeanTypeProxy(beanTypeProxy, false);
-						return beanTypeProxy;
-					}
-				}
-			}
-
-			if (ret.isInterface) {
-				// Interface never have a super type, so we will create a specific type.
-				beanTypeProxy = new REMInterfaceBeanTypeProxy(fFactoryRegistry, new Integer(ret.classID), typeName);
-			} else {
-				// Ask the supertype
-				// to create a beantype proxy of the same beantype proxy class.
-				// This is so that any subclasses will get the same beantype proxy class
-				// for it if it is special.
-				if (superTypeProxy != null)
-					beanTypeProxy = superTypeProxy.newBeanTypeForClass(new Integer(ret.classID), typeName, ret.isAbstract);
-			}
-		} else
-			beanTypeProxy = new REMArrayBeanTypeProxy(fFactoryRegistry, new Integer(ret.classID), typeName, objectClass);
-
-		// Cache the instance so we can re-use it again
-		if (beanTypeProxy != null)
-			registerBeanTypeProxy(beanTypeProxy, false);
-		return beanTypeProxy;
-	}
-
-	/**
-	 * Using the helper class to find a class by name, then create the proxy.
-	 */
-	public IBeanTypeProxy getBeanTypeProxy(String typeName) {
-		try {
-			return getBeanTypeProxy(MapTypes.getJNIFormatName(typeName), (IREMConnection) null);
-		} catch (CommandException e) {
-			// Try once more (we won't have received recoverable exceptions here, they were already caught and handled)
-			try {
-				return getBeanTypeProxy(typeName, (IREMConnection) null);
-			} catch (CommandException eAgain) {
-				// Failed again.
-				ProxyPlugin.getPlugin().getLogger().log(
-						new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
-	 *      java.lang.String)
-	 */
-	public synchronized IProxyBeanType getBeanTypeProxy(IExpression expression, String typeName) {
-		typeName = MapTypes.getJNIFormatName(typeName);
-		// See whether we already have the proxy for the argument name
-		IProxyBeanType beanTypeProxy = (IProxyBeanType) fBeanProxies.get(typeName);
-		if (beanTypeProxy != null)
-			return beanTypeProxy;
-		
-		// Now see if an expression proxy cached.
-		beanTypeProxy = ((REMExpression) expression).getBeanType(typeName);
-		if (beanTypeProxy != null)
-			return beanTypeProxy;		
-
-		// If not an array, then see if the package extension mechanism can find it.
-		// Do this here so that if it is found in the package extension we won't necessarily create an
-		// extra connection when not needed.
-		if (typeName.charAt(0) != '[') {
-			// It is not an array
-			// First check with the factory for the package of the class.
-			// Inner classes have to use the dollar notation since if they didn't we couldn't tell where
-			// the package ended and the class started.
-			int packageIndex = typeName.lastIndexOf('.');
-			if (packageIndex != -1) {
-				String packageName = typeName.substring(0, packageIndex);
-				IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
-				if (packageFactory != null) {
-					beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName, expression);
-					if (beanTypeProxy != null) {
-						registerBeanTypeProxy(beanTypeProxy, false);
-						return beanTypeProxy;
-					}
-				}
-			}
-		}
-
-		// Need to create the expression proxy for it.
-		beanTypeProxy = ((Expression) expression).createBeanTypeExpressionProxy(typeName);
-		registerBeanTypeProxy(beanTypeProxy, false);
-		return beanTypeProxy;
-
-	}
-
-	/**
-	 * One that internally allows that we already have a connection to work with. If the connection is null, then one will be created.
-	 * 
-	 * It is important that if the connection is not null, then we are in a transaction.
-	 */
-	private synchronized IREMBeanTypeProxy getBeanTypeProxy(String typeName, IREMConnection inConnect) throws CommandException {
-
-		// See whether we already have the proxy for the argument name
-		IProxyBeanType beanTypeProxy = (IProxyBeanType) fBeanProxies.get(typeName);
-		// See if there and resolved, if so, return it. If not resolved, that means we need it NOW
-		// so we must go for it. When finally resolved the original ExpressionProxy will be deregistered and
-		// the resolved beantypeproxy will be in its place.
-		if (beanTypeProxy != null && beanTypeProxy.isBeanProxy()) { return (IREMBeanTypeProxy) beanTypeProxy; }
-
-		// If not an array, then see if the package extension mechanism can find it.
-		// Do this here so that if it is found in the package extension we won't necessarily create an
-		// extra connection when not needed.
-		if (typeName.charAt(0) != '[') {
-			// It is not an array
-			// First check with the factory for the package of the class.
-			// Inner classes have to use the dollar notation since if they didn't we couldn't tell where
-			// the package ended and the class started.
-			int packageIndex = typeName.lastIndexOf('.');
-			if (packageIndex != -1) {
-				String packageName = typeName.substring(0, packageIndex);
-				IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
-				if (packageFactory != null) {
-					beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName);
-					if (beanTypeProxy != null) {
-						registerBeanTypeProxy((IREMBeanTypeProxy) beanTypeProxy, false);
-						return (IREMBeanTypeProxy) beanTypeProxy;
-					}
-				}
-			}
-		}
-
-		IREMConnection connect = inConnect != null ? inConnect : fFactoryRegistry.getFreeConnection();
-		if (inConnect == null)
-			fBeanFactory.startTransaction(); // Start a transation.
-		try {
-			return createBeanTypeProxy(typeName, connect);
-		} catch (CommandException e) {
-			if (inConnect == null) {
-				// Need to close the connection, not return it.
-				fFactoryRegistry.closeConnection(connect);
-				connect = null; // So that it won't be returned.
-			}
-			throw e; // Pass it on up
-		} finally {
-			if (inConnect == null)
-				fBeanFactory.stopTransaction();
-			if (inConnect == null && connect != null)
-				fFactoryRegistry.returnConnection(connect);
-		}
-	}
-
-	/*
-	 * It is important this be called only from within a transaction.
-	 */
-	private Commands.GetClassReturn getClassReturn(IREMConnection connection, String className) throws CommandException, ThrowableProxy {
-		try {
-			return connection.getClass(className);
-		} catch (CommandErrorException e) {
-			fBeanFactory.processErrorReturn(e); // Let proxy factory handle the error return
-		}
-		return null;
-	}
-
-	/**
-	 * Return an Array type proxy for the given class name of the specified dimensions. This is a helper method. The same result can be gotton from
-	 * getBeanTypeProxy. e.g. getBeanTypeProxy("java.lang.Object", 3) is the same as: getBeanTypeProxy("[[[Ljava.lang.Object;")
-	 * 
-	 * They both result in a type of: Object [][][]
-	 * 
-	 * or getBeanTypeProxy("[Ljava.langObject;", 3) becomes Object [][][][]
-	 */
-	public IBeanTypeProxy getBeanTypeProxy(String componentClassName, int dimensions) {
-		return getBeanTypeProxy(getArrayClassName(componentClassName, dimensions));
-	}
-
-	/**
-	 * @param componentClassName
-	 * @param dimensions
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	private String getArrayClassName(String componentClassName, int dimensions) {
-		String jniComponentClassName = MapTypes.getJNIFormatName(componentClassName);
-		String compType = jniComponentClassName;
-		if (jniComponentClassName.charAt(0) != '[') {
-			// We're not already an array, so create correct template.
-			compType = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(jniComponentClassName);
-			if (compType == null) {
-				// It is a class, and not a type.
-				compType = "L" + jniComponentClassName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-
-		// Now create it with the appropriate number of '[' in front.
-		StringBuffer buffer = new StringBuffer(dimensions + compType.length());
-		for (int i = 0; i < dimensions; i++)
-			buffer.append('[');
-		buffer.append(compType);
-		return buffer.toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
-	 *      java.lang.String, int)
-	 */
-	public IProxyBeanType getBeanTypeProxy(IExpression expression, String componentClassName, int dimensions) {
-		return getBeanTypeProxy(expression, getArrayClassName(componentClassName, dimensions));
-	}
-
-	/**
-	 * Get the bean type proxy from a class id. This means that a new class id was sent back from the server that we don't have yet. We need to go ask
-	 * the server for information on this type so that we can create it.
-	 * 
-	 * NOTE: This is package protected so that only the standard bean proxy factory can call it.
-	 * 
-	 * It is important that this has been called within a transaction.
-	 */
-	IREMBeanTypeProxy createBeanTypeProxy(Integer classID) {
-		IREMConnection connect = fFactoryRegistry.getFreeConnection();
-		try {
-			return createBeanTypeProxy(classID, connect);
-		} catch (CommandException e) {
-			if (e.isRecoverable()) {
-				// It is recoverable, print message, keep connection live and return it.
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-			} else {
-				// Try again, close connection, get a new one.
-				fFactoryRegistry.closeConnection(connect);
-				connect = null;
-				connect = fFactoryRegistry.getFreeConnection();
-				try {
-					return createBeanTypeProxy(classID, connect);
-				} catch (CommandException eAgain) {
-					// Failed again. Close connection, don't return it.
-					ProxyPlugin.getPlugin().getLogger().log(
-							new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
-					fFactoryRegistry.closeConnection(connect);
-					connect = null;
-				}
-			}
-		} finally {
-			if (connect != null)
-				fFactoryRegistry.returnConnection(connect);
-		}
-		return null;
-	}
-
-	/*
-	 * One that internally allows that we already have a connection to work with. If the connection is null, then one will be created.
-	 * 
-	 * It is important this be called only from within a transaction.
-	 */
-	private synchronized IREMBeanTypeProxy createBeanTypeProxy(Integer classID, IREMConnection connect) throws CommandException {
-		// We don't have the beantype proxy, so create it.
-		IREMBeanTypeProxy beanTypeProxy = null;
-
-		Commands.GetClassIDReturn ret = null;
-		try {
-			ret = getClassIDReturn(connect, classID);
-		} catch (ThrowableProxy ep) {
-			// Just print out the trace and return proxy not found.
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", ep)); //$NON-NLS-1$
-			return null;
-		}
-
-		// If the signature is that of a class.
-		if (ret.className.charAt(0) != '[') {
-			// It is not an array.
-			IREMBeanTypeProxy superTypeProxy = null;
-			if (!ret.isInterface && ret.superClassname.length() != 0) {
-				// Get the beantype proxy of the superclass.
-				superTypeProxy = getBeanTypeProxy(ret.superClassname, connect);
-			}
-
-			// First check with the factory for the package of the class.
-			// Inner classes have to use the dollar notation since if they didn't we couldn't tell where
-			// the package ended and the class started.
-			int packageIndex = ret.className.lastIndexOf('.');
-			if (packageIndex != -1) {
-				String packageName = ret.className.substring(0, packageIndex);
-				IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
-				if (packageFactory != null) {
-					beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(ret.className, classID, superTypeProxy);
-					if (beanTypeProxy != null) {
-						registerBeanTypeProxy(beanTypeProxy, false);
-						return beanTypeProxy;
-					}
-				}
-			}
-
-			if (ret.isInterface) {
-				// Interface never have a super type, so we will let the object class do it for us.
-				beanTypeProxy = new REMInterfaceBeanTypeProxy(fFactoryRegistry, classID, ret.className);
-			} else {
-				// Ask the beantype proxy of the superclass
-				// to create a beantype proxy of the same beantype proxy class.
-				// This is so that any subclasses will get the same beantype proxy class
-				// for it if it is special.
-				if (superTypeProxy != null)
-					beanTypeProxy = superTypeProxy.newBeanTypeForClass(classID, ret.className, ret.isAbstract);
-			}
-
-			// Cache the instance so we can re-use it again
-			if (beanTypeProxy != null)
-				registerBeanTypeProxy(beanTypeProxy, false);
-			return beanTypeProxy;
-		} else {
-			// It is an array.
-			beanTypeProxy = new REMArrayBeanTypeProxy(fFactoryRegistry, classID, ret.className, objectClass);
-			registerBeanTypeProxy(beanTypeProxy, false);
-			return beanTypeProxy;
-		}
-	}
-
-	/*
-	 * It is important that this be called only from within a transaction.
-	 */
-	private Commands.GetClassIDReturn getClassIDReturn(IREMConnection connection, Integer classID) throws CommandException, ThrowableProxy {
-		try {
-			return connection.getClassFromID(classID.intValue());
-		} catch (CommandErrorException e) {
-			fBeanFactory.processErrorReturn(e); // Let proxy factory handle the error return
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy,
-	 *      boolean)
-	 */
-	public synchronized void registerBeanTypeProxy(IBeanTypeProxy aBeanTypeProxy, boolean permanent) {
-		fBeanProxies.put(aBeanTypeProxy.getTypeName(), aBeanTypeProxy);
-		fBeanFactory.registerProxy((IREMBeanProxy) aBeanTypeProxy);
-		if (permanent)
-			fPermanentProxies.add(aBeanTypeProxy);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType,
-	 *      boolean)
-	 */
-	public void registerBeanTypeProxy(IProxyBeanType aProxyBeanType, final boolean permanent) {
-		if (aProxyBeanType.isBeanProxy())
-			registerBeanTypeProxy((IBeanTypeProxy) aProxyBeanType, permanent); // A regular kind, do regular registration.
-		else {
-			ExpressionProxy beanExpressionProxy = ((ExpressionProxy) aProxyBeanType);
-			final String typeName = aProxyBeanType.getTypeName();
-			((REMExpression) beanExpressionProxy.getExpression()).addBeanType(typeName, aProxyBeanType);
-			beanExpressionProxy.addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
-				public void proxyResolved(ProxyEvent event) {
-					String typeName = ((IProxyBeanType) event.getSource()).getTypeName();
-					synchronized (REMStandardBeanTypeProxyFactory.this) {
-						if (!fBeanProxies.containsKey(typeName)) {
-							// It hasn't been resolved through some other means. So this is good. Actually this should never
-							// occur because upon resolution we've already registered the bean type proxy through the
-							// normal mechanisms. But to be safe, we'll do it here.
-							fBeanProxies.put(typeName, event.getProxy());
-							if (permanent)
-								fPermanentProxies.add(event.getProxy());
-						}
-					}
-				}
-				
-				public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
-					((REMExpression) ((ExpressionProxy) event.getSource()).getExpression()).removeBeanType(typeName);
-				}
-			});
-		}
-
-	}
-
-	/**
-	 * A beantype proxy is asked to be released. We can only release ones that were not in the permanent set that we initialized with. Those in the
-	 * permanent set can't be changed so we can't release them.
-	 * 
-	 * Answer whether it can be released from the server too.
-	 * 
-	 * NOTE: Package protected since only REMStandardBeanProxyFactory should call it.
-	 */
-	boolean releaseProxy(IBeanTypeProxy proxy) {
-		/**
-		 * Currently we won't allow any bean type proxies to be released. We don't have a good strategy for handling that there may be hard refs from
-		 * subtypes. One thought is that beanproxies table should store SoftReferences so that only when space is needed, that any beantype that
-		 * doesn't have a subtype (since subtypes hold a strong ref) or, is in the permanent table (since that is hardref) could be GC'd. Then what
-		 * would happen is on releaseProxy we don't actually release, we change it to a WeakRef so that it would definitely be released on a GC. These
-		 * are complicated arch. and we're not sure if it should be allowed or not. So for now, we don't allow them to be released. if
-		 * (!fPermanentProxies.contains(proxy)) { // We can release it. It is not one of the permanent ones. synchronized(this) {
-		 * fBeanProxies.remove(proxy.getTypeName()); return true; } }
-		 */
-		return false;
-	}
-
-	/*
-	 * Terminate this factory. Since all of the proxies are registered in the proxy factory, there is no need to release them here. There is no need
-	 * to clear out any fields since this factory will not be held onto by anything and so it will be GC'd.
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeRegistered(String)
-	 */
-	public synchronized boolean isBeanTypeRegistered(String className) {
-		return fBeanProxies.containsKey(MapTypes.getJNIFormatName(className));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registeredTypes()
-	 */
-	public Set registeredTypes() {
-		return fBeanProxies.keySet();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeNotFound(String)
-	 */
-	public synchronized boolean isBeanTypeNotFound(String className) {
-		return fNotFoundTypes != null && fNotFoundTypes.contains(MapTypes.getJNIFormatName(className));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isMaintainNotFoundTypes()
-	 */
-	public synchronized boolean isMaintainNotFoundTypes() {
-		return fNotFoundTypes != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#setMaintainNotFoundTypes(boolean)
-	 */
-	public synchronized void setMaintainNotFoundTypes(boolean maintain) {
-		if (maintain) {
-			if (fNotFoundTypes == null)
-				fNotFoundTypes = new HashSet();
-		} else
-			fNotFoundTypes = null;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanProxy.java
deleted file mode 100644
index 93d8eff..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanProxy.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMStringBeanProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Remote VM Implementation of IStringBeanProxy
- * Creation date: (2/6/00 9:02:42 AM)
- * @author: Joe Winchester
- */
-final class REMStringBeanProxy extends REMConstantBeanProxy implements IStringBeanProxy {
-	private final String fString;
-
-/**
- * Store the bean in the string field to save re-casting each time it is asked for.
- * It is package protected because they are created
- * in a special way and no one else should create them.
- */
-REMStringBeanProxy(REMProxyFactoryRegistry aRegistry, String value) {
-	super(aRegistry);
-	fString = value;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof IStringBeanProxy)
-		return fString.equals(((IStringBeanProxy) anObject).stringValue());
-	else
-		return fString.equals(anObject);
-}
-/**
- * Return the cache'd string that is a java.lang.String that the IDE can use
- */
-public String stringValue() {
-	return fString;
-}
-
-/**
- * Return the toString value from the bean.
- */
-public String toBeanString() {
-	return fString.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
-	return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).stringClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
-	value.set(fString);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanTypeProxy.java
deleted file mode 100644
index 7f5e894..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanTypeProxy.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMStringBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Remote Implementation of the BeanType proxy for java.lang.String
- * Creation date: (2/6/00 9:01:23 AM)
- * @author: Joe Winchester
- */
-final class REMStringBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-	// Cache a proxy to an empty string for speed
-	protected final IStringBeanProxy emptyStringProxy;
-/**
- * IDEStringBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMStringBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectTypeProxy) {
-	super(aRegistry, new Integer(Commands.STRING_CLASS), String.class.getName(), objectTypeProxy);
-
-	// Cache a proxy to an empty string for speed
-	emptyStringProxy = new REMStringBeanProxy(aRegistry, "");	//$NON-NLS-1$
-}
-/**
- * Helper to create string beans
- * Package protected because no-one else outside the package should use this, they
- * must go through the API where you look up a factory first.
- */
-IStringBeanProxy createStringBeanProxy(String aString){
-	if ( aString.equals("") ) {//$NON-NLS-1$
-		return emptyStringProxy;
-	} else {
-		return new REMStringBeanProxy(fRegistry, aString);
-	}
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. String has a default ctor, but it results in the emptyStringProxy,
- * so return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return emptyStringProxy;
-}
-
-/**
- * newInstance method comment. Put a short cut in for strings so we don't need to go to the remote
- * vm just to create a string.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
-	if (initializationString.length() <= 1)
-		return super.newInstance(initializationString);	// Not large enough for two quotes, so let default handle it.
-	// Need a quick check that it is only one quoted string. Anything else needs to be passed on up.
-	String s = initializationString.trim();
-	int sl = s.length()-1;	
-	if (s.charAt(0) != '"' || s.charAt(sl) != '"')
-		return super.newInstance(initializationString);	// No leading and trailing quote.
-
-	StringBuffer sb = new StringBuffer(sl);
-	boolean escape = false;		
-	for (int i=1; i<sl; i++) {
-		char c = s.charAt(i);
-		if (c == '\\') {
-			escape = true;
-			continue;
-		}
-		if (!escape && c == '"')
-			return super.newInstance(initializationString);	// Had a quote in the middle without an escape. This means an expression, send on up.
-		escape = false;
-		sb.append(c);
-	}
-	
-	return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(sb.toString());
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return createStringBeanProxy((String) value.anObject);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java
deleted file mode 100644
index dc1df12..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java
+++ /dev/null
@@ -1,208 +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.jem.internal.proxy.remote;
-/*
- *  $RCSfile: REMThrowableBeanProxy.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-/**
- * Exception Proxy for exception on Remote.
- * NOTE: This one is unusual in that it doesn't inherit from
- *       IDEBeanProxy because it needs to be an exception, and
- *       exceptions are not an interface.
- */
-public class REMThrowableBeanProxy extends ThrowableProxy implements IREMBeanProxy {
-
-	private Integer fID;
-	protected final REMProxyFactoryRegistry fFactory;
-	private IBeanTypeProxy fTypeProxy;
-
-	/**
-	 * Set the bean we are proxying.  We are a proxy for a bean running on the remote VM. 
-	 */
-	protected REMThrowableBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType){
-		fFactory = aRegistry;
-		fID = anID;
-		fTypeProxy = aType;
-	}
-	
-	/**
-	 * equals: Equal if:
-	 *         1) This proxy == (identity) to the other object
-	 *         2) Else if other is an IBeanProxy and not a constant one, then if
-	 *            equals on the server.
-	 *         3) If this is a constant proxy and the other is too or is a constant
-	 *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
-	 */
-	public boolean equals(Object anObject) {
-		if (super.equals(anObject))
-			return true;	// Identity
-		if (anObject instanceof IBeanProxy && !(anObject instanceof IREMConstantBeanProxy) && fFactory.isValid() && ((IBeanProxy) anObject).getProxyFactoryRegistry() == fFactory)
-			try {
-				// The other is a bean proxy and is not a constant one, let the server do the check.
-				return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectEquals().invoke(this, (IBeanProxy) anObject)).booleanValue();
-			} catch (ThrowableProxy e) {
-			}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return this == aBeanProxy;	// We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
-	}
-	
-	
-	/**
-	 * Get ID. An internal method to be used only within the ProxyFactory family.
-	 */
-	public Integer getID() {
-		return fID;
-	}
-	
-	/**
-	 * isValid - has this bean been released.
-	 */
-	public boolean isValid() {
-		return fID != null;
-	}
-	
-	/**
-	 * release - The bean is being released.
-	 */
-	public void release() {
-		fID = null;
-		fTypeProxy = null;
-	} 
-		
-	/**
-	 * Return the registry this proxy was created with.
-	 */
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fFactory;
-	}
-	
-	/**
-	 * Return the proxied class of the bean
-	 * Creation date: (12/3/99 11:37:01 AM)
-	 * @author: Joe Winchester
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return fTypeProxy;
-	}
-	
-	/**
-	 * Return the toString of the actual bean on the remote side.
-	 */
-	public String toBeanString() {
-		IStringBeanProxy string = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectToString().invokeCatchThrowableExceptions(this);
-		return (string != null) ? string.stringValue() : null;
-	}
-	
-	public String getProxyLocalizedMessage() {
-		IStringBeanProxy msg = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getThrowableLocalizedMessage().invokeCatchThrowableExceptions(this);
-		return msg != null ? msg.stringValue() : null;
-	}
-	
-	public String getProxyMessage() {
-		IStringBeanProxy msg = (IStringBeanProxy)  REMStandardBeanProxyConstants.getConstants(fFactory).getThrowableMessage().invokeCatchThrowableExceptions(this);
-		return msg != null ? msg.stringValue() : null;
-	}
-	
-	/**
-	 * Temporary way to get the string value of the stacktrace.
-	 */
-	private String getProxyStackTrace() {
-		IMethodProxy tempGetStackTrace = fFactory.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.StackTraceUtility", "printStackTrace", new String[] {"java.lang.Throwable"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		IStringBeanProxy trace = (IStringBeanProxy) tempGetStackTrace.invokeCatchThrowableExceptions(null, this);
-		return trace != null ? trace.stringValue() : ""; //$NON-NLS-1$
-	}
-		
-	public void printProxyStackTrace(java.io.PrintWriter writer) {
-		String trace = getProxyStackTrace();
-		synchronized(writer) {
-			writer.print(trace);
-		}
-	}
-	
-	public void printProxyStackTrace(java.io.PrintStream stream) {
-		String trace = getProxyStackTrace();
-		synchronized(stream) {
-			stream.print(trace);
-		}
-
-	}
-	
-	public void printProxyStackTrace() {
-		String trace = getProxyStackTrace();
-		synchronized(System.err) {
-			System.err.print(trace);
-		}
-	}
-
-
-	/**
-	 * Below are the actual printStackTrace. They are set up to first call
-	 * the proxy trace so that it can show where it occurred on the server,
-	 * and then it will do a super to show where it occurred on this side.
-	 */
-	public void printStackTrace() { 
-		synchronized (System.err) {
-			System.err.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.REMOTE_VM_TRACE_HEADER));
-			printProxyStackTrace();
-			System.err.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.REMOVE_VM_LOCAL_TRACE_HEADER));
-			super.printStackTrace();
-		}
-	}
-
-	public void printStackTrace(java.io.PrintWriter s) { 
-		synchronized (s) {
-			s.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.REMOTE_VM_TRACE_HEADER));
-			printProxyStackTrace(s);
-			s.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.REMOVE_VM_LOCAL_TRACE_HEADER));
-			super.printStackTrace(s);
-		}
-	}
-
-	public void printStackTrace(java.io.PrintStream s) { 
-		synchronized (s) {
-			s.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.REMOTE_VM_TRACE_HEADER));
-			printProxyStackTrace(s);
-			s.println(ProxyRemoteMessages.getString(ProxyRemoteMessages.REMOVE_VM_LOCAL_TRACE_HEADER));
-			super.printStackTrace(s);
-		}
-	}
-
-	/**
-	 * Render the bean into value object.
-	 */
-	public void renderBean(Commands.ValueObject value) {
-		value.setObjectID(getID().intValue());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanTypeProxy.java
deleted file mode 100644
index 3ed1818..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanTypeProxy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMThrowableBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * The Remote implementation of a Throwable bean type.
- */
-public class REMThrowableBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-	
-	protected REMThrowableBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-	}	
-	
-	/**
-	 * Helper to create a bean proxy
-	 * Package protected because everyone should go through the factory API
-	 * that is defined as part of IBeanProxyFactory
-	 */
-	REMThrowableBeanProxy createThrowableBeanProxy(Integer objectID) {
-		return new REMThrowableBeanProxy(fRegistry, objectID, this);
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-
-	/**
-	 * The special method to handle subclassing from an abstract).
-	 */		
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
-		// We can never have an interface of type Throwable since that doesn't exist.
-		if (!anAbstract)
-			return new REMThrowableBeanTypeProxy(fRegistry, anID, aClassname, superType);
-		else
-			return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
-	}
-	
-	/**
-	 * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer objectID) {
-		return createThrowableBeanProxy(objectID);
-	}	
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMVoidBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMVoidBeanTypeProxy.java
deleted file mode 100644
index 66ebbf8..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMVoidBeanTypeProxy.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMVoidBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanTypeProxy for representing the "void" type value, and a value of this type is "null".
- * Creation date: (2/11/00 2:26:47 PM)
- * @author: Richard Lee Kulp
- */
-final class REMVoidBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
-	
-protected REMVoidBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
-	super(aRegistry, new Integer(Commands.VOID_TYPE), Void.TYPE.getName(), null);
-}
-
-/**
- * Return the supertype for us
- * null/void has no superclass.
- * This is required as part of the interface
- */
-public IBeanTypeProxy getSuperBeanTypeProxy() {
-	return null;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For void, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For void is a final class, so you can't create a newBeanType 
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-	throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. void represents "null",
- * so return the null for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
-	return null;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
-	return newInstance();
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanProxy.java
deleted file mode 100644
index 52fa87b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanProxy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMDimensionBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * The REM Bean Proxy for java.awt.Dimension.
- */
-public class REMDimensionBeanProxy extends REMBeanProxy implements IDimensionBeanProxy {
-	
-	protected REMDimensionBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {	
-		super(aRegistry, anID, aType);
-	}
-	
-	public int getHeight() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionHeightFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public int getWidth() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionWidthFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public void setHeight(int height) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionHeightFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(height));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setWidth(int width) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionWidthFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(width));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setSize(int width, int height) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionSetSizeHWProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(width), fFactory.getBeanProxyFactory().createBeanProxyWith(height)});
-	}
-	
-	public void setSize(IDimensionBeanProxy fromDimensionProxy) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionSetSizeDProxy().invokeCatchThrowableExceptions(this, fromDimensionProxy);
-	}	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanTypeProxy.java
deleted file mode 100644
index 0d0544e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMDimensionBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Beantype proxy for java.awt.Dimension
- */
-public class REMDimensionBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-	
-	protected REMDimensionBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-	}
-		
-	/**
-	 * Helper to create a bean proxy
-	 * Package protected because everyone should go through the factory API
-	 * that is defined as part of IBeanProxyFactory
-	 */
-	REMDimensionBeanProxy createDimensionBeanProxy(Integer objectID) {
-		return new REMDimensionBeanProxy(fRegistry, objectID, this);
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-
-	/**
-	 * The special method to handle subclassing from an abstract).
-	 */		
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
-		if (!anAbstract)
-			return new REMDimensionBeanTypeProxy(fRegistry, anID, aClassname, superType);
-		else
-			return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
-	}
-	
-	/**
-	 * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer objectID) {
-		return createDimensionBeanProxy(objectID);
-	}	
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanProxy.java
deleted file mode 100644
index 9cd92d4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanProxy.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMPointBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * The REM Bean Proxy for java.awt.Point.
- */
-public class REMPointBeanProxy extends REMBeanProxy implements IPointBeanProxy {
-	
-	protected REMPointBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {	
-		super(aRegistry, anID, aType);
-	}
-	
-	public int getX() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getPointXFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public int getY() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getPointYFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public void setX(int x) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getPointXFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(x));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setY(int y) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getPointYFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(y));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setLocation(int x, int y) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getPointSetLocationXYProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(x), fFactory.getBeanProxyFactory().createBeanProxyWith(y)});
-	}
-	
-	public void setLocation(IPointBeanProxy fromPointProxy) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getPointSetLocationPProxy().invokeCatchThrowableExceptions(this, fromPointProxy);
-	}	
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanTypeProxy.java
deleted file mode 100644
index 3f777bd..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMPointBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Beantype proxy for java.awt.Dimension
- */
-public class REMPointBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-	
-	protected REMPointBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-	}
-		
-	/**
-	 * Helper to create a bean proxy
-	 * Package protected because everyone should go through the factory API
-	 * that is defined as part of IBeanProxyFactory
-	 */
-	REMPointBeanProxy createPointBeanProxy(Integer objectID) {
-		return new REMPointBeanProxy(fRegistry, objectID, this);
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-
-	/**
-	 * The special method to handle subclassing from an abstract).
-	 */		
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
-		if (!anAbstract)
-			return new REMPointBeanTypeProxy(fRegistry, anID, aClassname, superType);
-		else
-			return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
-	}
-	
-	/**
-	 * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer objectID) {
-		return createPointBeanProxy(objectID);
-	}	
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanProxy.java
deleted file mode 100644
index 0c0f3f4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanProxy.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMRectangleBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * The REM Bean Proxy for java.awt.Rectangle.
- */
-public class REMRectangleBeanProxy extends REMBeanProxy implements IRectangleBeanProxy {
-	
-	protected REMRectangleBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {	
-		super(aRegistry, anID, aType);
-	}
-	
-	public int getX() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleXFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public int getY() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleYFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public void setX(int x) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleXFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(x));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setY(int y) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleYFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(y));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setLocation(int x, int y) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetLocationXYProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(x), fFactory.getBeanProxyFactory().createBeanProxyWith(y)});
-	}
-	
-	public void setLocation(IPointBeanProxy fromPointProxy) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetLocationPProxy().invokeCatchThrowableExceptions(this, fromPointProxy);
-	}
-	
-	
-	public int getHeight() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleHeightFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public int getWidth() {
-		try {
-			IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleWidthFieldProxy().get(this);
-			return h.intValue();
-		} catch (ThrowableProxy e) {
-			return 0;
-		}
-	}
-	
-	public void setHeight(int height) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleHeightFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(height));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setWidth(int width) {
-		try {
-			JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleWidthFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(width));
-		} catch (ThrowableProxy e) {
-		}
-	}
-	
-	public void setSize(int width, int height) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetSizeHWProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(width), fFactory.getBeanProxyFactory().createBeanProxyWith(height)});
-	}
-	
-	public void setSize(IDimensionBeanProxy fromDimensionProxy) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetSizeDProxy().invokeCatchThrowableExceptions(this, fromDimensionProxy);
-	}
-	
-	public void setBounds(int x, int y, int width, int height) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetBoundsXYHWProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(x), fFactory.getBeanProxyFactory().createBeanProxyWith(y), fFactory.getBeanProxyFactory().createBeanProxyWith(width), fFactory.getBeanProxyFactory().createBeanProxyWith(height)});
-	}
-	
-	public void setBounds(IRectangleBeanProxy fromRectangleProxy) {
-		JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetBoundsRProxy().invokeCatchThrowableExceptions(this, fromRectangleProxy);
-	}			
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanTypeProxy.java
deleted file mode 100644
index 5752e58..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMRectangleBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Beantype proxy for java.awt.Dimension
- */
-public class REMRectangleBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-	
-	protected REMRectangleBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
-		super(aRegistry, anID, aClassname, aSuperType);
-	}
-		
-	/**
-	 * Helper to create a bean proxy
-	 * Package protected because everyone should go through the factory API
-	 * that is defined as part of IBeanProxyFactory
-	 */
-	REMRectangleBeanProxy createRectangleBeanProxy(Integer objectID) {
-		return new REMRectangleBeanProxy(fRegistry, objectID, this);
-	}
-	
-	/**
-	 * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
-	 * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
-	 * This is because subclasses, unless explicitly overridden, should use the same kind
-	 * of beantype proxy. This way if anything special is needed for a specific type, then
-	 * that can be done.
-	 *
-	 * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
-	 */
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
-		return newBeanTypeForClass(anID, aClassname, anAbstract, this);
-	}
-
-	/**
-	 * The special method to handle subclassing from an abstract).
-	 */		
-	public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
-		if (!anAbstract)
-			return new REMRectangleBeanTypeProxy(fRegistry, anID, aClassname, superType);
-		else
-			return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
-	}
-	
-	/**
-	 * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
-	 */
-	public IREMBeanProxy newBeanProxy(Integer objectID) {
-		return createRectangleBeanProxy(objectID);
-	}	
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java
deleted file mode 100644
index f32af80..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMRegisterAWT.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.core.IMethodProxy;
-import org.eclipse.jem.internal.proxy.remote.REMProxyFactoryRegistry;
-/**
- * This class is used to register the AWT factories. It is not
- * meant to be called by anyone other than ProxyVMStarter.
- */
-public final class REMRegisterAWT {
-	public static void registerAWT(REMProxyFactoryRegistry registry) {
-		new REMStandardAWTBeanTypeProxyFactory(registry);
-		new REMStandardAWTBeanProxyFactory(registry);
-		
-		// If we are doing AWT, get the AWT event queue going. This is trying to be a time-saver
-		// by having it up right away.
-		IBeanTypeProxy starterBeanType = registry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.vm.remote.AWTStarter");
-		if (starterBeanType != null) {
-			IMethodProxy starter = starterBeanType.getMethodProxy("startAWT");
-			if (starter != null)
-				starter.invokeCatchThrowableExceptions(null);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanProxyFactory.java
deleted file mode 100644
index 9437cc7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanProxyFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMStandardAWTBeanProxyFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:56:10 $ 
- */
-
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Standard AWT Bean Proxy Factory.
- * Package protected because it should not referenced
- * outside of the package other than through the interface.
- */
-class REMStandardAWTBeanProxyFactory implements IStandardAwtBeanProxyFactory {
-
-	final IStandardBeanTypeProxyFactory fBeanTypeFactory;
-	
-	public REMStandardAWTBeanProxyFactory(ProxyFactoryRegistry factory) {
-		factory.registerBeanProxyFactory(IStandardAwtBeanProxyFactory.REGISTRY_KEY, this);
-		fBeanTypeFactory = factory.getBeanTypeProxyFactory();
-	}
-	
-	public IDimensionBeanProxy createDimensionBeanProxyWith(int width, int height){
-		try {
-			return (IDimensionBeanProxy) fBeanTypeFactory.getBeanTypeProxy("java.awt.Dimension").newInstance("new java.awt.Dimension("+width+","+height+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		} catch (ThrowableProxy e) {
-			return null;
-		} catch (InstantiationException e) {
-			return null;	// Shouldn't occur
-		}
-	}
-	
-	public IPointBeanProxy createPointBeanProxyWith(int x, int y){
-		try {
-			return (IPointBeanProxy) fBeanTypeFactory.getBeanTypeProxy("java.awt.Point").newInstance("new java.awt.Point("+x+","+y+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		} catch (ThrowableProxy e) {
-			return null;
-		} catch (InstantiationException e) {
-			return null;	// Shouldn't occur
-		}
-
-	}
-	
-	public IRectangleBeanProxy createBeanProxyWith(int x, int y, int width, int height){
-		try {
-			return (IRectangleBeanProxy) fBeanTypeFactory.getBeanTypeProxy("java.awt.Rectangle").newInstance("new java.awt.Rectangle("+x+","+y+","+width+","+height+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-		} catch (ThrowableProxy e) {
-			return null;
-		} catch (InstantiationException e) {
-			return null;	// Shouldn't occur
-		}
-
-	}
-	
-	/*
-	 * Terminate this factory. Since it doesn't hold onto anything other than the beantype factory,
-	 * and nothing will be holding onto this factory, nothing needs to be done. It will be GC'd.
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanTypeProxyFactory.java
deleted file mode 100644
index 263068d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2001, 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: REMStandardAWTBeanTypeProxyFactory.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.remote.awt;
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.remote.*;
-
-/**
- * BeanType factory standard AWT bean types. This is package protected because it shouldn't be referenced outside the package. It should only be
- * accessed through the interface.
- */
-class REMStandardAWTBeanTypeProxyFactory implements IREMBeanTypeProxyFactory {
-
-	static final String BEAN_TYPE_FACTORY_KEY = "java.awt"; //$NON-NLS-1$
-
-	protected final REMProxyFactoryRegistry fFactoryRegistry;
-
-	REMStandardAWTBeanTypeProxyFactory(REMProxyFactoryRegistry aRegistry) {
-		fFactoryRegistry = aRegistry;
-		fFactoryRegistry.registerBeanTypeProxyFactory(BEAN_TYPE_FACTORY_KEY, this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String)
-	 */
-	public IREMBeanTypeProxy getExtensionBeanTypeProxy(String className) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String, java.lang.Integer,
-	 *      org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
-	 */
-	public IREMBeanTypeProxy getExtensionBeanTypeProxy(String className, Integer classID, IBeanTypeProxy superType) {
-
-		if ("java.awt.Dimension".equals(className)) //$NON-NLS-1$
-			return new REMDimensionBeanTypeProxy(fFactoryRegistry, classID, className, superType);
-		else if ("java.awt.Point".equals(className)) //$NON-NLS-1$
-			return new REMPointBeanTypeProxy(fFactoryRegistry, classID, className, superType);
-		else if ("java.awt.Rectangle".equals(className)) //$NON-NLS-1$
-			return new REMRectangleBeanTypeProxy(fFactoryRegistry, classID, className, superType);
-		else
-			return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String,
-	 *      org.eclipse.jem.internal.proxy.core.IExpression)
-	 */
-	public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression) {
-		return getExtensionBeanTypeProxy(typeName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties
deleted file mode 100644
index 6b2e13d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties,v $
-# $Revision: 1.10 $  $Date: 2005/02/24 21:56:34 $
-#
-
-
-
-# Exception message - {0} is the name of a project within Eclipse.
-NO_OUTPUT_FOLDER_EXC_                                                 = IWAV0071E No output folder for project "{0}."
-
-# These are lines that are placed into a log file listing the outputs from the two different streams.
-VM_TERMINATED_INFO_                                                   = IWAV0072I Remote VM terminated before any commands can be sent. Following are the error and output streams.
-VM_TERMINATED_LINE1                                                   = -- Error Stream --
-VM_TERMINATED_LINE2                                                   = -- Output Stream --
-VM_TERMINATED_LINE3                                                   = -- End of Stream Output --
-
-# These are the headers for two parts of a stack trace of an exception. The first one is the trace from the remote system.
-# The second is the trace from the local system.
-REMOTE_VM_TRACE_INFO_                                                 = IWAV0073I *** RemoteVM Exception - Trace from Remote VM:
-REMOTE_VM_LOCAL_TRACE_INFO_                                           = IWAV0074I *** Local StackTrace:
-
-# In the two below, {0} is a string that is a java creation string, e.g. "new Integer(3)", so they don't participate in translation.
-# In Classcast, {1} is a java type name, e.g. java.lang.Integer.
-Classcast_EXC_                                                        = IWAV0124E "{0}" does not evaluate to an object of type {1}
-Instantiate_EXC_                                                      = IWAV0125E "{0}" is too complicated to be evaluated
-
-# {0} is a number, e.g. 1, 2, ...
-RemoteCmd_EXC_                                                        = IWAV0126E Remote command error {0}
-
-# The following is an exception error where {0} is the name of the class of the exception and {1} is the message from the exception
-# The message {1} has already been localized (if it supplied it localized). It comes from somewhere outside of our project.
-ExceptionErrorMsg_EXC_                                                = IWAV0135E {0}({1})
-OK_7                                                                  = OK
-Proxy_NoRunner_ERROR_                                                 = IWAV0137E Could not find a Run type runner to launch for \"{0}\".
-Proxy_Error_Title                                                     = Error:
-Proxy_Terminated_too_soon_ERROR_                                      = IWAV0138E Remote VM terminated too soon. See .log file for trace of output. For VM \"{0}\".
-# This is a launch name for a given project name ({0}).
-# WARNING for the ProxyRemoteVMName and ProxyRemoteVMNameWithComment do not use double-quote ("). It will cause problems.
-ProxyRemoteVMName                                                     = Project ({0})
-# This is a launch name that has a comment ({0} is project name, {1} is the comment for this project launch)
-ProxyRemoteVMNameWithComment                                          = Project ({0})-{1}
-
-ProxyRemoteNoLaunchKey                                                = Cannot launch local proxy registry. Not launched from valid launcher.
-
-# {0} is the appropriate VMName from the above two entries.
-ProxyRemoteLaunchVM                                                   = Launching remote vm "{0}"
-
-CleanupJob.title                                                      = Remote VM Cleanup GC'd Proxies Job
-
-REMProxyFactoryRegistry.CallbackConnectionNotWorking_EXC_             = IWAV0169E Callback connection is not working.
-REMProxyFactoryRegistry.ConnectionCreationFailed_INFO_                = IWAV0170I Connection creation failed.
-REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_ = IWAV0171E Could not create a socket connection to remote vm.
-REMExpression.IOExceptionSeeLog_INFO_                                 = IWAV0172I I/O Exception occurred. See .log file for details.
-REMExpression.CommandExceptionSeeLog_INFO_                            = IWAV0173I Command Exception occurred. See .log file for details.
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEAccessibleObjectProxy.java
deleted file mode 100644
index 749d574..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEAccessibleObjectProxy.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IDEAccessibleObjectProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:57:26 $ 
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import java.lang.reflect.AccessibleObject;
-
-import org.eclipse.jem.internal.proxy.core.*;
- 
-/**
- * 
- * @since 1.0.0
- */
-public class IDEAccessibleObjectProxy extends IDEBeanProxy implements IAccessibleObjectProxy {
-
-	protected IDEAccessibleObjectProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry) {
-		super(aProxyFactoryRegistry);
-	}
-
-	protected IDEAccessibleObjectProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry, Object anObject) {
-		super(aProxyFactoryRegistry, anObject);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#isAccessible()
-	 */
-	public boolean isAccessible() throws ThrowableProxy {
-		return ((AccessibleObject) getBean()).isAccessible();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#setAccessible(boolean)
-	 */
-	public void setAccessible(boolean flag) throws ThrowableProxy {
-		((AccessibleObject) getBean()).setAccessible(flag);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).accessibleType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java
deleted file mode 100644
index 41df5e8..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java
+++ /dev/null
@@ -1,279 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEArrayBeanProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * IDE VM version of the Array proxy
- */
-
-public final class IDEArrayBeanProxy extends IDEObjectBeanProxy implements IArrayBeanProxy {
-
-	private IDEStandardBeanTypeProxyFactory fBeanTypeProxyFactory;
-	
-IDEArrayBeanProxy(IDEProxyFactoryRegistry aRegistry, Object array,IBeanTypeProxy aType) {
-	super(aRegistry, array ,aType);
-	fBeanTypeProxyFactory = (IDEStandardBeanTypeProxyFactory)aRegistry.getBeanTypeProxyFactory();
-}
-/**
- * Get the object at the specified index.
- */
-public IBeanProxy get(int index) throws ThrowableProxy {
-	// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-	// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-	IBeanTypeProxy compType = ((IArrayBeanTypeProxy) getTypeProxy()).getComponentType();
-	if (!compType.isPrimitive()) {
-		// Use standard getter.
-		Object result = Array.get(fBean,index);
-		if ( result == null ) return null;
-		return ((IDEBeanTypeProxy)fBeanTypeProxyFactory.getBeanTypeProxy(result.getClass())).newBeanProxy(result);
-	} else {
-		// Use the correct primitive getter.
-		int id = ((IDEPrimitiveBeanTypeProxy)compType).getPrimitiveType();
-		switch (id) {
-			case IDEPrimitiveBeanTypeProxy.BYTE:
-				return fBeanTypeProxyFactory.byteType.createByteBeanProxy(Array.getByte(fBean,index));
-			case IDEPrimitiveBeanTypeProxy.BOOLEAN:
-				return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(Array.getBoolean(fBean,index));
-			case IDEPrimitiveBeanTypeProxy.CHAR:
-				return fBeanTypeProxyFactory.charType.createCharBeanProxy(Array.getChar(fBean,index));
-			case IDEPrimitiveBeanTypeProxy.DOUBLE:
-				return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(Array.getDouble(fBean,index));
-			case IDEPrimitiveBeanTypeProxy.FLOAT:
-				return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(Array.getFloat(fBean,index));
-			case IDEPrimitiveBeanTypeProxy.INTEGER:
-				return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(Array.getInt(fBean,index));
-			case IDEPrimitiveBeanTypeProxy.LONG:
-				return fBeanTypeProxyFactory.longType.createLongBeanProxy(Array.getLong(fBean,index));
-			case IDEPrimitiveBeanTypeProxy.SHORT:
-				return fBeanTypeProxyFactory.shortType.createShortBeanProxy(Array.getShort(fBean,index));
-			default :
-				return null; // Shouldn't get here, said it was primitive, but not one we understand				
-		}
-	}		
-}
-/**
- * Get the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
-public IBeanProxy get(int[] indexes) throws ThrowableProxy {
-	if (indexes.length == 1)
-		return get(indexes[0]);
-	int dims = ((IArrayBeanTypeProxy) getTypeProxy()).getDimensions();
-	if (dims < indexes.length)
-		throw new IllegalArgumentException(); // Too many dimensions
-	// Get up to the next to last dimension so that we can do the appropriate final get depending upon primitive or not.
-	Object array = fBean;
-	int lastArrayDim = indexes.length - 1;
-	for (int i = 0; i < lastArrayDim; i++)
-		array = Array.get(array, indexes[i]);
-
-	int index = indexes[lastArrayDim];	// Final array dim to retrieve
-	
-	if (dims == indexes.length) {
-		IBeanTypeProxy finalCompType = ((IArrayBeanTypeProxy) getTypeProxy()).getFinalComponentType();
-		if (finalCompType.isPrimitive()) {
-			// If the component type at the specified dimension is primitive, we need to use the correct getter so that a valid value is returned,
-			// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-			int id = ((IDEPrimitiveBeanTypeProxy) finalCompType).getPrimitiveType();
-			switch (id) {
-				case IDEPrimitiveBeanTypeProxy.BYTE :
-					return fBeanTypeProxyFactory.byteType.createByteBeanProxy(Array.getByte(array, index));
-				case IDEPrimitiveBeanTypeProxy.BOOLEAN :
-					return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(Array.getBoolean(array, index));
-				case IDEPrimitiveBeanTypeProxy.CHAR :
-					return fBeanTypeProxyFactory.charType.createCharBeanProxy(Array.getChar(array, index));
-				case IDEPrimitiveBeanTypeProxy.DOUBLE :
-					return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(Array.getDouble(array, index));
-				case IDEPrimitiveBeanTypeProxy.FLOAT :
-					return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(Array.getFloat(array, index));
-				case IDEPrimitiveBeanTypeProxy.INTEGER :
-					return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(Array.getInt(array, index));
-				case IDEPrimitiveBeanTypeProxy.LONG :
-					return fBeanTypeProxyFactory.longType.createLongBeanProxy(Array.getLong(array, index));
-				case IDEPrimitiveBeanTypeProxy.SHORT :
-					return fBeanTypeProxyFactory.shortType.createShortBeanProxy(Array.getShort(array, index));
-				default :
-					return null; // Shouldn't get here, said it was primitive, but not one we understand
-			}
-		}
-	}
-
-	// Won't be returning a primitive, so use standard accessor
-	Object result = Array.get(array, index);
-	if (result == null)
-		return null;
-	return ((IDEBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(result.getClass())).newBeanProxy(
-		result);
-}
-
-/**
- * Set the object at the specified index.
- */
-public void set(IBeanProxy valueProxy, int index) throws ThrowableProxy {
-	// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-	// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-	Object value = ((IIDEBeanProxy)valueProxy).getBean();
-	Class valueClass = value.getClass();
-	if (!valueClass.isPrimitive()) {
-		// Use standard getter.
-		Array.set(fBean,index,value);
-	} else if (valueClass == Byte.TYPE ) {
-		Array.setByte(fBean,index,((Byte)value).byteValue());
-	} else if (valueClass == Boolean.TYPE ){
-		Array.setBoolean(fBean,index,((Boolean)value).booleanValue());			
-	} else if (valueClass == Character.TYPE) {
-		Array.setChar(fBean,index,((Character)value).charValue());
-	} else if (valueClass == Double.TYPE) {
-		Array.setDouble(fBean,index,((Double)value).doubleValue());
-	} else if (valueClass == Float.TYPE) {
-		Array.setFloat(fBean,index,((Float)value).floatValue());		
-	} else if (valueClass == Integer.TYPE) {
-		Array.setInt(fBean,index,((Integer)value).intValue());		
-	} else if (valueClass == Long.TYPE ) {
-		Array.setLong(fBean,index,((Long)value).longValue());		
-	} else if (valueClass == Short.TYPE ) {
-		Array.setShort(fBean,index,((Short)value).shortValue());		
-	}
-}
-/**
- * Set the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
-public void set(IBeanProxy valueProxy, int[] indexes) throws ThrowableProxy {
-
-	Object subArray = fBean;
-	int upTo = indexes.length - 1;
-	for (int i = 0; i < upTo; i++)
-		subArray = Array.get(subArray, indexes[i]);
-	int index = indexes[upTo];
-
-	// Now set the appropriate value in
-	// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-	// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-	Object value = ((IIDEBeanProxy) valueProxy).getBean();
-	Class valueClass = value.getClass();
-	if (!valueClass.isPrimitive()) {
-		// Use standard getter.
-		Array.set(subArray, index, value);
-	} else if (valueClass == Byte.TYPE) {
-		Array.setByte(subArray, index, ((Byte) value).byteValue());
-	} else if (valueClass == Boolean.TYPE) {
-		Array.setBoolean(subArray, index, ((Boolean) value).booleanValue());
-	} else if (valueClass == Character.TYPE) {
-		Array.setChar(subArray, index, ((Character) value).charValue());
-	} else if (valueClass == Double.TYPE) {
-		Array.setDouble(subArray, index, ((Double) value).doubleValue());
-	} else if (valueClass == Float.TYPE) {
-		Array.setFloat(subArray, index, ((Float) value).floatValue());
-	} else if (valueClass == Integer.TYPE) {
-		Array.setInt(subArray, index, ((Integer) value).intValue());
-	} else if (valueClass == Long.TYPE) {
-		Array.setLong(subArray, index, ((Long) value).longValue());
-	} else if (valueClass == Short.TYPE) {
-		Array.setShort(subArray, index, ((Short) value).shortValue());
-	}
-
-}
-/**
- * Get the length of the first dimension of this array.
- * If there are multi-dimensions, you must get the appropriate
- * dimension from the get method to see the size of that dimension.
- *
- * e.g.
- *    int [3] returns 3
- *    int [3][2] returns 3
- *
- *    ((IArrayBeanProxy) get(1)).getLength() returns 2
- *    Since arrays do not have to be homogenous, there could
- *    be a different length array for each of the arrays 
- *    returned from the first dimension, the returned length
- *    from get(2) and get(3) could result in a different value
- *    from get(1).
- */
-public int getLength() {
-	return Array.getLength(fBean);
-}	
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IArrayBeanProxy#getCatchThrowableException(int)
-	 */
-	public IBeanProxy getCatchThrowableException(int index) {
-		try {
-			return get(index);
-		} catch ( ThrowableProxy exc ) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));			
-			return null;
-		}
-	}
-
-	
-	public IBeanProxy[] getSnapshot() throws ThrowableProxy {
-		// If the component type is primitive, we need to use the correct getter so that a valid value is returned,
-		// if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
-		IBeanTypeProxy compType = ((IArrayBeanTypeProxy) getTypeProxy()).getComponentType();
-		int id = compType.isPrimitive() ? ((IDEPrimitiveBeanTypeProxy)compType).getPrimitiveType() : -1;
-		IBeanProxy[] result = new IBeanProxy[Array.getLength(fBean)];
-		for (int i = 0; i < result.length; i++) {
-			if (id == -1) {
-				// Use standard getter.
-				Object val = Array.get(fBean,i);
-				if ( val != null )
-					result[i] = ((IDEBeanTypeProxy)fBeanTypeProxyFactory.getBeanTypeProxy(val.getClass())).newBeanProxy(val);
-			} else {
-				// Use the correct primitive getter.
-				switch (id) {
-					case IDEPrimitiveBeanTypeProxy.BYTE:
-						result[i] = fBeanTypeProxyFactory.byteType.createByteBeanProxy(Array.getByte(fBean,i));
-						break;
-					case IDEPrimitiveBeanTypeProxy.BOOLEAN:
-						result[i] = fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(Array.getBoolean(fBean,i));
-						break;
-					case IDEPrimitiveBeanTypeProxy.CHAR:
-						result[i] = fBeanTypeProxyFactory.charType.createCharBeanProxy(Array.getChar(fBean,i));
-						break;
-					case IDEPrimitiveBeanTypeProxy.DOUBLE:
-						result[i] = fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(Array.getDouble(fBean,i));
-						break;
-					case IDEPrimitiveBeanTypeProxy.FLOAT:
-						result[i] = fBeanTypeProxyFactory.floatType.createFloatBeanProxy(Array.getFloat(fBean,i));
-						break;
-					case IDEPrimitiveBeanTypeProxy.INTEGER:
-						result[i] = fBeanTypeProxyFactory.intType.createIntegerBeanProxy(Array.getInt(fBean,i));
-						break;
-					case IDEPrimitiveBeanTypeProxy.LONG:
-						result[i] = fBeanTypeProxyFactory.longType.createLongBeanProxy(Array.getLong(fBean,i));
-						break;
-					case IDEPrimitiveBeanTypeProxy.SHORT:
-						result[i] = fBeanTypeProxyFactory.shortType.createShortBeanProxy(Array.getShort(fBean,i));
-						break;
-					default :
-						break; // Shouldn't get here, said it was primitive, but not one we understand				
-				}
-			}		
-		}
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanTypeProxy.java
deleted file mode 100644
index 9d3ec8f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,326 +0,0 @@
-package org.eclipse.jem.internal.proxy.ide;
-
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IDEArrayBeanTypeProxy.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-import java.lang.reflect.*;
-
-/**
- * Array Type Proxy for the IDE VM.
- * 
- * The class is final because array's are special and shouldn't have any subclasses since the factory would never call it.
- */
-
-public final class IDEArrayBeanTypeProxy extends IDEBeanTypeProxy implements IArrayBeanTypeProxy {
-
-	IBeanTypeProxy fFinalComponentType;
-
-	IBeanTypeProxy fComponentType;
-
-	String fTypeName;
-
-	/**
-	 * Create with a registry and a class. It is package so that only the factory with this IDE package can call it.
-	 */
-	IDEArrayBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, String aTypeName, Class aClass) {
-		// The class of an Array is always Object
-		super(aRegistry, aClass);
-		fTypeName = aTypeName;
-	}
-
-	/**
-	 * This is an array type!
-	 */
-	public boolean isArray() {
-		return true;
-	}
-
-	public String getTypeName() {
-		return fTypeName;
-	}
-
-	/**
-	 * Return the final component type.
-	 */
-	public IBeanTypeProxy getFinalComponentType() {
-		if (fFinalComponentType == null) {
-			// Component type is strip off all '[' and return class name (if we ever add classLoader support, this won't work).
-			// However, if the type is a primitive we need to go through the change table).
-			int typeStart = getTypeName().lastIndexOf('[') + 1;
-			if (getTypeName().charAt(typeStart) == 'L') {
-				// It is a class.
-				// Strip off up to the 'L', and the trailing ';'. That is the class name.
-				fFinalComponentType = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(
-						getTypeName().substring(typeStart + 1, getTypeName().length() - 1));
-			} else {
-				// It is a type. Need to map it.
-				Class aType = (Class) IDEStandardBeanTypeProxyFactory.MAP_SHORTSIG_TO_TYPE.get(getTypeName().substring(typeStart, typeStart + 1));
-				fFinalComponentType = aType != null ? fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(aType.getName()) : null;
-			}
-		}
-		return fFinalComponentType;
-	}
-
-	/**
-	 * Return the component type.
-	 */
-	public IBeanTypeProxy getComponentType() {
-		if (fComponentType == null) {
-			// Component type is strip off first '[' and return class name (if we ever add classLoader support, this won't work).
-			// However, if the type is a primitive we need to go through the change table).
-			if (getTypeName().charAt(1) != '[') {
-				// It is a one dimensional array, just send to getFinalComponentType to figure out the type.
-				fComponentType = getFinalComponentType();
-			} else {
-				// It is a multi-dimensional array. Just strip off one '[' and send that to the bean type factory.
-				fComponentType = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(1));
-			}
-		}
-		return fComponentType;
-	}
-
-	/**
-	 * Return the number of dimensions.
-	 */
-	public int getDimensions() {
-		return getTypeName().lastIndexOf('[') + 1;
-	}
-
-	/**
-	 * Return the null ctor proxy for this method with these arguments. For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy getNullConstructorProxy() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getFields() {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String,
-	 *      org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return a proxy to the field for the target VM being the same as the REM For all of the array types, this is an invalid operation.
-	 */
-	public IFieldProxy getFieldProxy(String fieldName) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy getMethodProxy(String methodName) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy[] getMethods() {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * Create an array bean proxy.
-	 *  - (int, new int[2] {3, 4}) will create: int [3] [4]
-	 *  - (int[], new int[1] {1}) int [1]
-	 *  - (int[], new int[2] {2,3}) int [2] [3]
-	 * 
-	 *  - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0]) int [0] (int[][], null) or (int[][], new int[0]) int[0][] This is
-	 * because an array instance with no dimensions specified is not valid.
-	 *  - (int[][], new int[1] {3}) int[3][]
-	 * 
-	 * It is package protected so that only the REM Factory can call it.
-	 */
-	IDEArrayBeanProxy createBeanProxyWith(int[] dimensions) throws ThrowableProxy {
-		// If the dimensions is null or zero length, then create the
-		// array as a 0 sized array one dimensional array.
-		if (dimensions == null || dimensions.length == 0)
-			return createBeanProxyWith(new int[] { 0});
-
-		// Remove from this type the number of dimensions specified
-		// coming in, up to but no further than the final component.
-		// From here we can then use the appropriate java.lang.reflect.Array
-		// method to create the array.
-		IBeanTypeProxy compType = null; // The type of array to create (it may be different number of dimensions).
-		int numDims = getDimensions();
-		if (numDims <= dimensions.length)
-			compType = getFinalComponentType(); // There are the same or more requested dimensions, so use final component type
-		else {
-			// There are fewer requested dimensions, so strip off that many
-			String compClass = getTypeName().substring(dimensions.length);
-			compType = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(compClass);
-		}
-
-		if (dimensions.length == 1) {
-			// Use the one dimension call
-			Object array = Array.newInstance(((IDEBeanTypeProxy) compType).fClass, dimensions[0]);
-			return new IDEArrayBeanProxy(fProxyFactoryRegistry, array, null);
-		} else {
-			// Use the multi dimension call
-			Object array = Array.newInstance(((IDEBeanTypeProxy) compType).fClass, dimensions);
-			return new IDEArrayBeanProxy(fProxyFactoryRegistry, array, null);
-		}
-	}
-
-	/**
-	 * Create a new bean proxy with the specified object
-	 */
-	protected IIDEBeanProxy newBeanProxy(Object anObject) {
-
-		return new IDEArrayBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-	}
-
-	/**
-	 * @see IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		String name = getTypeName();
-		int dims = name.lastIndexOf('[') + 1;
-		String type = getFinalComponentType().getTypeName();
-		StringBuffer formalType = new StringBuffer(type.length() + ("[]".length() * dims)); //$NON-NLS-1$
-		formalType.append(type);
-		for (int i = 0; i < dims; i++)
-			formalType.append("[]"); //$NON-NLS-1$
-		return formalType.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanProxy.java
deleted file mode 100644
index 6e8f886..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanProxy.java
+++ /dev/null
@@ -1,101 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEBeanProxy.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public abstract class IDEBeanProxy implements IBeanProxy, IIDEBeanProxy {
-
-	protected Object fBean;
-	protected final IDEProxyFactoryRegistry fProxyFactoryRegistry;
-
-	protected IDEBeanProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry) {
-		fProxyFactoryRegistry = aProxyFactoryRegistry;
-	}
-	protected IDEBeanProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry, Object anObject) {
-		fProxyFactoryRegistry = aProxyFactoryRegistry;
-		fBean = anObject;
-	}
-	public boolean isValid() {
-		return true;
-	}
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fProxyFactoryRegistry;
-	}
-	/**
-	 * USE with extreme care
-	 */
-	public final Object getBean() {
-		return fBean;
-	}
-	/**
-	 * Return the toString() of the bean
-	 */
-	public String toBeanString() {
-		return (fBean != null ? fBean.toString() : "null"); //$NON-NLS-1$
-	}
-	/**
-	 Append the bean's to string to our own name if we have one
-	 */
-	public String toString() {
-
-		if (fBean == null)
-			return super.toString();
-		else
-			return super.toString() + "(" + fBean.toString() + ")"; //$NON-NLS-2$//$NON-NLS-1$
-
-	}
-	/**
-	 * equals: If there are identical or if they wrapper the same bean. In the IDE VM this
-	 * can happen if bean proxies are created from a Bean, since proxies aren't cached in
-	 * the beanproxy factory, more than one proxy can be created for the same bean.
-	 */
-	public boolean equals(Object obj) {
-		if (super.equals(obj))
-			return true;
-		if (obj instanceof IIDEBeanProxy) {
-			return fBean.equals(((IIDEBeanProxy) obj).getBean());
-		}
-		return false;
-	}
-	
-	public int hashCode() {
-		return 12345 + (getBean() != null ? getBean().hashCode() : 0); 
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		if (this == aBeanProxy)
-			return true;
-		if (aBeanProxy instanceof IIDEBeanProxy)
-			return getBean() == ((IIDEBeanProxy) aBeanProxy).getBean();
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java
deleted file mode 100644
index b17587b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: IDEBeanTypeProxy.java,v $ $Revision: 1.11 $ $Date: 2005/05/11 19:01:12 $
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.core.*;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
-
-	protected IDEProxyFactoryRegistry fProxyFactoryRegistry;
-
-	Class fClass;
-
-	protected IDEBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-		super(aRegistry, aClass);
-		fProxyFactoryRegistry = aRegistry;
-		fClass = aClass;
-	}
-
-	/**
-	 * Get Type Proxy. The type proxy of a BeanType is Class.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).classClass;
-	}
-
-	public Class getTypeClass() {
-		return fClass;
-	}
-
-	public String toBeanString() {
-		return fClass.toString();
-	}
-
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fProxyFactoryRegistry;
-	}
-
-	public String getTypeName() {
-		return fClass.getName();
-	}
-
-	public boolean isKindOf(IBeanTypeProxy aBeanTypeProxy) {
-		return ((IDEBeanTypeProxy) aBeanTypeProxy).fClass.isAssignableFrom(fClass);
-	}
-
-	public boolean isInterface() {
-		return fClass.isInterface();
-	}
-
-	public boolean isPrimitive() {
-		return fClass.isPrimitive();
-	}
-
-	public boolean isArray() {
-		return fClass.isArray();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getMethods() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethods(fClass);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IMethodProxy[] getDeclaredMethods() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredMethods(fClass);
-	}
-
-	/**
-	 * We can use reflection on our class to find the java.reflect.Method instance and create the IDEMethodProxy directly
-	 */
-	public IMethodProxy getMethodProxy(String methodName) {
-
-		try {
-			Method aMethod = fClass.getMethod(methodName, new Class[0]);
-			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(aMethod);
-		} catch (Exception exc) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-		}
-		return null;
-
-	}
-
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(this, methodName, argumentClassNames);
-	}
-
-	public IMethodProxy getMethodProxy(String methodName, String firstArgClass) {
-		return getMethodProxy(methodName, new String[] { firstArgClass});
-	}
-
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] args) {
-		Class[] argClasses = new Class[args.length];
-		for (int i = 0; i < args.length; i++) {
-			argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
-		}
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(fClass, methodName, argClasses);
-	}
-
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredMethodProxy(fClass, methodName, argumentClassNames);
-	}
-
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] args) {
-		Class[] argClasses = null;
-		if (args != null) {
-			argClasses = new Class[args.length];
-			for (int i = 0; i < args.length; i++) {
-				argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
-			}
-		}
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredMethodProxy(fClass, methodName, argClasses);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return getMethodProxy(methodName, argumentTypes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName, String argumentClassName) {
-		return getMethodProxy(methodName, argumentClassName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
-		return getMethodProxy(methodName, argumentClassNames);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
-	 */
-	public IInvokable getInvokable(String methodName) {
-		return getMethodProxy(methodName);
-	}
-
-	public IConstructorProxy getConstructorProxy(String[] argTypeNames) {
-		IBeanTypeProxy[] argClasses = new IBeanTypeProxy[argTypeNames.length];
-		IStandardBeanTypeProxyFactory btFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
-		for (int i = 0; i < argTypeNames.length; i++) {
-			argClasses[i] = btFactory.getBeanTypeProxy(argTypeNames[i]);
-			if (argClasses[i] == null) {
-				ProxyPlugin.getPlugin().getLogger().log(
-						new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - "
-								+ fClass.getName() + " args=" + argTypeNames, null));
-				return null;
-			}
-		}
-		return getConstructorProxy(argClasses);
-	}
-
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] args) {
-		Class[] argClasses = new Class[args.length];
-		for (int i = 0; i < args.length; i++) {
-			argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
-		}
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructorProxy(fClass, argClasses);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getConstructors() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructors(fClass);
-	}
-
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argTypeNames) {
-		IBeanTypeProxy[] argClasses = new IBeanTypeProxy[argTypeNames.length];
-		IStandardBeanTypeProxyFactory btFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
-		for (int i = 0; i < argTypeNames.length; i++) {
-			argClasses[i] = btFactory.getBeanTypeProxy(argTypeNames[i]);
-			if (argClasses[i] == null) {
-				ProxyPlugin.getPlugin().getLogger().log(
-						new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - "
-								+ fClass.getName() + " args=" + argTypeNames, null));
-				return null;
-			}
-		}
-		return getDeclaredConstructorProxy(argClasses);
-	}
-
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] args) {
-		Class[] argClasses = new Class[args.length];
-		for (int i = 0; i < args.length; i++) {
-			argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
-		}
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredConstructorProxy(fClass, argClasses);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IConstructorProxy[] getDeclaredConstructors() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredConstructors(fClass);
-	}
-
-	/**
-	 * Return the supertype for us Use the factory to get it rather than create it directly so that the factory has the chance to cache classes if
-	 * required This is required as part of the interface
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy() {
-
-		if (fClass.isInterface())
-			return null;
-		else
-			return fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(fClass.getSuperclass().getName());
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getFields() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFields(fClass);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
-	 */
-	public IFieldProxy[] getDeclaredFields() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredFields(fClass);
-	}
-
-	public IFieldProxy getFieldProxy(String fieldName) {
-		try {
-			Field field = fClass.getField(fieldName);
-			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFieldProxy(field);
-		} catch (NoSuchFieldException exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName()
-							+ " - " + fieldName, exc));
-			return null;
-		}
-	}
-
-	public IFieldProxy getDeclaredFieldProxy(String fieldName) {
-		try {
-			Field field = fClass.getDeclaredField(fieldName);
-			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFieldProxy(field);
-		} catch (NoSuchFieldException exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName()
-							+ " - " + fieldName, exc));
-			return null;
-		}
-	}
-
-	/**
-	 * Return a proxy to the constructor for the target VM being the same as the IDE We can use the package protected contstructor on
-	 * IDEConstructorProxy
-	 */
-	IConstructorProxy getConstructorProxy(Class[] parameterTypes) {
-
-		Constructor aConstructor = null;
-
-		// Use reflection to try and find a constructor. The argumentClassNames must be converted to classes
-		try {
-			aConstructor = fClass.getConstructor(parameterTypes);
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		}
-		// If we have a constructor return it
-		if (aConstructor != null) {
-			return getNewConstructorProxy(aConstructor);
-		} else {
-			return null;
-		}
-
-	}
-
-	/**
-	 * Factored into its own method so subclass can override
-	 */
-	protected IConstructorProxy getNewConstructorProxy(Constructor aConstructor) {
-
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructorProxy(aConstructor);
-
-	}
-
-	/**
-	 * Return a proxy to the null constructor for the target VM being the same as the IDE We can use the package protected contstructor on
-	 * IDEConstructorProxy
-	 */
-	public IConstructorProxy getNullConstructorProxy() {
-
-		Constructor aConstructor = null;
-
-		// Use reflection to try and find a constructor. The argumentClassNames must be converted to classes
-		try {
-			aConstructor = fClass.getConstructor(null);
-			return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructorProxy(aConstructor);
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-			return null;
-		}
-
-	}
-
-	public IBeanProxy newInstance(String initializationString) {
-		return ((IDEStandardBeanProxyFactory) fProxyFactoryRegistry.getBeanProxyFactory()).createBeanProxy(this, initializationString);
-	}
-
-	public IBeanProxy newInstance() {
-		return ((IDEStandardBeanProxyFactory) fProxyFactoryRegistry.getBeanProxyFactory()).createBeanProxy(this);
-	}
-
-	/**
-	 * Create a new bean proxy with the specified object Use the constructor that allows the type proxy to be set as well as the bean because we are
-	 * the type and by setting it now we might avoid it being lookup for in the factory the first time it is asked for
-	 * 
-	 * NOTE: All subclasses need to override this to return the appropriate IDEBeanProxy.
-	 */
-	protected IIDEBeanProxy newBeanProxy(Object anObject) {
-
-		return new IDEObjectBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-	}
-
-	/**
-	 * Create a subclass beantype proxy.
-	 */
-	public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
-		// Default is just another instance of this same class.
-		return new IDEBeanTypeProxy(fProxyFactoryRegistry, type);
-	}
-
-	/**
-	 * @see IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		return getTypeName();
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
-	 */
-	public String getInitializationError() {
-		return null; // By default none have an initialization error. There is a special instance for init errors.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws AmbiguousMethodException, NoSuchMethodException {
-
-		Class[] argClasses = new Class[argumentTypes.length];
-		for (int i = 0; i < argumentTypes.length; i++) {
-			argClasses[i] = ((IDEBeanTypeProxy) argumentTypes[i]).fClass;
-		}
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getCompatibleConstructor(fClass, argClasses);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String,
-	 *      org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException {
-		Class[] argClasses = new Class[argumentTypes.length];
-		for (int i = 0; i < argumentTypes.length; i++) {
-			argClasses[i] = ((IDEBeanTypeProxy) argumentTypes[i]).fClass;
-		}
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getCompatibleMethod(fClass, methodName, argClasses);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
-		IProxyMethod method = ((IDEExpression) expression).getMethodExpressionProxy(this, methodName, parameterTypes);
-		if (method == null) {
-			// Need to go to the expression and create it.
-			method = ((Expression) expression).createMethodExpressionProxy(this, methodName, parameterTypes);
-		}
-		return method;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-		IProxyField field = ((IDEExpression) expression).getFieldExpressionProxy(this, fieldName);
-		if (field == null) {
-			// Need to go to the expression and create it.
-			field = ((Expression) expression).createFieldExpressionProxy(this, fieldName);
-		}
-		return field;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigDecimalBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigDecimalBeanTypeProxy.java
deleted file mode 100644
index 98bfd6d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigDecimalBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEBigDecimalBeanTypeProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.math.*;
-
-final class IDEBigDecimalBeanTypeProxy extends IDENumberBeanTypeProxy {
-// Some values are cache'd for speed
-IDEBigDecimalBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass,new BigDecimal(0));
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigDecimalBeanProxy(BigDecimal aBigDecimal) {
-	if ( aBigDecimal == null || aBigDecimal.intValue() == 0 ) {
-		return zeroProxy;
-	} else {
-		return new IDENumberBeanProxy(fProxyFactoryRegistry,aBigDecimal,this);
-	}
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigIntegerBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigIntegerBeanTypeProxy.java
deleted file mode 100644
index 39f1b41..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigIntegerBeanTypeProxy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEBigIntegerBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.math.*;
-/**
- * IDE Implementation of IIntegerBeanTypeProxy
- */
-final class IDEBigIntegerBeanTypeProxy extends IDENumberBeanTypeProxy {
-// Some values are cache'd for speed
-IDEBigIntegerBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass, new BigInteger("0")); //$NON-NLS-1$
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigIntegerBeanProxy(BigInteger aBigInteger) {
-	if ( aBigInteger == null || aBigInteger.intValue() == 0 ) {
-		return zeroProxy;
-	} else {
-		return new IDENumberBeanProxy(fProxyFactoryRegistry,aBigInteger,this);
-	}
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanProxy.java
deleted file mode 100644
index b99d714..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEBooleanBeanProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of IBooleanBeanProxy..
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class IDEBooleanBeanProxy extends IDEObjectBeanProxy implements IBooleanBeanProxy {
-	protected Boolean fBooleanValue;
-/**
- * As well as storing the bean store the boolean value so that we can return the booleanValue faster
- * without the need for repeated re-casting. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-IDEBooleanBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
-	super(aRegistry, aBean,aBeanTypeProxy);
-	fBooleanValue = (Boolean)aBean;
-}
-public boolean booleanValue() {
-	return fBooleanValue.booleanValue();
-}
-public Boolean getBooleanValue() {
-	return fBooleanValue;
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanTypeProxy.java
deleted file mode 100644
index 9120251..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanTypeProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 15, 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.jem.internal.proxy.ide;
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-
-/**
- * @author richkulp
- *
- * 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 IDEBooleanBeanTypeProxy extends IDEBooleanBeanProxy {
-
-	/**
-	 * @param aRegistry
-	 * @param aBean
-	 * @param aBeanTypeProxy
-	 */
-	public IDEBooleanBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
-		super(aRegistry, aBean, aBeanTypeProxy);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		return (aBeanProxy instanceof IDEBooleanBeanTypeProxy) ? getBooleanValue() == ((IDEBooleanBeanTypeProxy) aBeanProxy).getBooleanValue() : false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanClassBeanTypeProxy.java
deleted file mode 100644
index dd50703..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanClassBeanTypeProxy.java
+++ /dev/null
@@ -1,49 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEBooleanClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-final public class IDEBooleanClassBeanTypeProxy extends IDEBeanTypeProxy {
-
-	// Cache these instances. Since the BeanType proxies are cached also, only one instance
-	// of true/false will be in system.
-	protected final IDEBooleanBeanProxy trueProxy;
-	protected final IDEBooleanBeanProxy falseProxy;
-
-IDEBooleanClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-
-	super(aRegistry, aClass);
-	trueProxy = new IDEBooleanBeanProxy( fProxyFactoryRegistry, Boolean.TRUE, this );
-	falseProxy = new IDEBooleanBeanProxy( fProxyFactoryRegistry, Boolean.FALSE, this);	
-}
-IBooleanBeanProxy createBooleanBeanProxy(Boolean aBoolean) {
-	if ( aBoolean.booleanValue() ){
-		return trueProxy;
-	} else {
-		return falseProxy;
-	}
-}
-/* Specialized from IDEBeanTypeProxy to ensure IBooleanBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	if ( anObject == null || anObject == Boolean.FALSE ) {
-		return falseProxy;
-	} else {
-		return trueProxy;
-	}
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanTypeBeanTypeProxy.java
deleted file mode 100644
index 792112b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEBooleanTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-final public class IDEBooleanTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-
-	// Cache these instances. Since the BeanType proxies are cached also, only one instance
-	// of true/false will be in system.
-	protected final IDEBooleanBeanProxy trueProxy;
-	protected final IDEBooleanBeanProxy falseProxy;
-
-IDEBooleanTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-
-	super(aRegistry, aClass);
-	trueProxy = new IDEBooleanBeanTypeProxy( fProxyFactoryRegistry, Boolean.TRUE, this );
-	falseProxy = new IDEBooleanBeanTypeProxy( fProxyFactoryRegistry, Boolean.FALSE, this );
-	
-	// TODO Need to go through all of the primitives, separate them out into a separate classes so
-	// that sameAs can work with them correctly. Currently only boolean type will do sameAs correctly.
-	// Should also look into storing the primitive in the proxy instead of creating a new wrapper object
-	// for each for the non-boolean primitives.	
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IBooleanBeanProxy createBooleanBeanProxy(boolean aBoolean) {
-	if ( aBoolean ){
-		return trueProxy;
-	} else {
-		return falseProxy;
-	}
-}
-/* Specialized from IDEBeanTypeProxy to ensure IBooleanBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	return (IIDEBeanProxy)createBooleanBeanProxy( anObject != null ? ((Boolean)anObject).booleanValue() : false );
-
-}
-int getPrimitiveType(){
-	return BOOLEAN;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteClassBeanTypeProxy.java
deleted file mode 100644
index c4fe041..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteClassBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEByteClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Byte BeanType Proxy.
- */
-final class IDEByteClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-		
-protected IDEByteClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass, new Byte((byte)0));
-}
-INumberBeanProxy createByteBeanProxy(Byte aByte){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,aByte,this);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteTypeBeanTypeProxy.java
deleted file mode 100644
index 9b4b3ee..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteTypeBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEByteTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Byte BeanType Proxy.
- */
-final class IDEByteTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEByteTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-}
-INumberBeanProxy createByteBeanProxy(byte aByte){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,new Byte(aByte),this);
-}
-int getPrimitiveType(){
-	return BYTE;
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-	Number n = anObject instanceof Character ? new Byte((byte)((Character) anObject).charValue()) : (Number) anObject;
-	return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java
deleted file mode 100644
index 3dbeb33..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java
+++ /dev/null
@@ -1,148 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDECallbackRegistry.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.io.*;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-public class IDECallbackRegistry implements ICallbackRegistry {
-	
-	IDEVMServer fVMServer;
-	int fNextCallbackID;
-	IDEProxyFactoryRegistry fProxyFactoryRegistry;
-	Map fCallbackIDToCallback = new HashMap(25);
-	Map fBeanProxyToCallbackID = new HashMap(25);
-	Map fCallbackIDToStream = new HashMap(25);
-	private IProxyMethod initializeCallbackMethodProxy;
-	private IProxy vmServerProxy;
-	
-IDECallbackRegistry(IDEProxyFactoryRegistry aRegistry){
-	fProxyFactoryRegistry = aRegistry;
-	fVMServer = new IDEVMServer(this);
-	
-	vmServerProxy = aRegistry.getBeanProxy(fVMServer.getClass(), fVMServer);
-	
-	try {
-		Method initializeCallbackMethod = org.eclipse.jem.internal.proxy.common.ICallback.class.getMethod("initializeCallback", new Class[] {org.eclipse.jem.internal.proxy.common.IVMServer.class, Integer.TYPE});
-		initializeCallbackMethodProxy = (IProxyMethod) aRegistry.getBeanProxy(Method.class, initializeCallbackMethod);
-	} catch (SecurityException e) {
-		e.printStackTrace();
-	} catch (NoSuchMethodException e) {
-		e.printStackTrace();
-	}
-	
-}
-/**
- * Add a callback.  aBeanProxy is running on the target VM and ICallback runs on our VM
- * aBeanProxy will implement ICallback on the target side
- */	
-public void registerCallback(IBeanProxy aBeanProxy, ICallback aCallback){
-
-	// Get a handle to the remote VM callback	
-	org.eclipse.jem.internal.proxy.common.ICallback vmCallback = (org.eclipse.jem.internal.proxy.common.ICallback) ((IIDEBeanProxy)aBeanProxy).getBean(); 
-	fNextCallbackID = fNextCallbackID + 1;
-	int callbackID = fNextCallbackID;
-	vmCallback.initializeCallback(
-		fVMServer,
-		callbackID);
-	Integer callbackIntegerID = new Integer(callbackID);
-	fCallbackIDToCallback.put(callbackIntegerID,aCallback);
-	fBeanProxyToCallbackID.put(aBeanProxy,callbackIntegerID);
-
-}
-
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.ICallback, org.eclipse.jem.internal.proxy.core.IExpression)
- */
-public void registerCallback(IProxy callbackProxy, final ICallback cb, IExpression expression) {
-	final Integer callbackID = new Integer(++fNextCallbackID);
-	fCallbackIDToCallback.put(callbackID, cb);
-	if (callbackProxy.isBeanProxy()) {
-		fBeanProxyToCallbackID.put(callbackProxy, callbackID);		
-	} else {
-		((ExpressionProxy) callbackProxy).addProxyListener(new ExpressionProxy.ProxyAdapter() {
-			public void proxyResolved(ProxyEvent event) {
-				fBeanProxyToCallbackID.put(event.getProxy(), callbackID);		
-			}
-		});
-	}
-	expression.createSimpleMethodInvoke(initializeCallbackMethodProxy, callbackProxy, new IProxy[] {vmServerProxy, fProxyFactoryRegistry.getBeanProxyFactory().createBeanProxyWith(callbackID.intValue())}, false);
-	
-}
-
-OutputStream requestStream(final int aCallbackID, final int aMsgID){
-	final PipedOutputStream result = new PipedOutputStream();
-	PipedInputStream tempStream = null;
-	try {
-		tempStream = new PipedInputStream(result);	
-	} catch ( IOException exc ) {
-		ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-		return null;
-	}
-	final PipedInputStream inputStream = tempStream;
-	Thread streamProcessor = new Thread(){
-		public void run(){
-			ICallback ideCallback = (ICallback)fCallbackIDToCallback.get(new Integer(aCallbackID));
-			if (ideCallback != null) {
-				try {
-					ideCallback.calledBackStream(aMsgID, inputStream);
-				} finally {
-					try {
-						inputStream.close();	// Make sure it's closed.
-					} catch ( IOException  exc ){
-						ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-					}
-				}			
-			}
-		}
-	};
-	streamProcessor.start();
-	return result;	
-}
-
-Object vmCallback(int aCallbackID ,int aMsgID, Object[] parms){
-	// Find the bean proxy that registered with the ID
-	ICallback ideCallback = (ICallback) fCallbackIDToCallback.get(new Integer(aCallbackID));
-	Object callbackResult = null;
-	if ( parms.length == 1 ) {
-		callbackResult = ideCallback.calledBack(aMsgID,(IBeanProxy)parms[0]);
-	} else {
-		callbackResult = ideCallback.calledBack(aMsgID,parms);
-	}
-	return callbackResult;
-}
-
-Object vmCallback(int aCallbackID ,int aMsgID, Object parm){
-	// Find the bean proxy that registered with the ID
-	ICallback ideCallback = (ICallback) fCallbackIDToCallback.get(new Integer(aCallbackID));
-	return ideCallback.calledBack(aMsgID,parm);
-}
-
-public void deregisterCallback(IBeanProxy aBeanProxy){
-	// Remove the callback from both maps.  The actual unregistering of the callback
-	// on the target VM is done separately by the object that added the event handler on the target VM
-	Integer callbackID = (Integer) fBeanProxyToCallbackID.remove(aBeanProxy);
-	fCallbackIDToCallback.remove(callbackID);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharTypeBeanTypeProxy.java
deleted file mode 100644
index 5b32d2f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharTypeBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDECharTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * char BeanType Proxy.
- */
-final class IDECharTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDECharTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-}
-ICharacterBeanProxy createCharBeanProxy(char aChar){
-	return new IDECharacterBeanProxy(fProxyFactoryRegistry,new Character(aChar),this);
-}
-int getPrimitiveType(){
-	return CHAR;
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-	Character c = anObject instanceof Character ? (Character) anObject : new Character((char)((Number) anObject).intValue());
-	return new IDECharacterBeanProxy(fProxyFactoryRegistry, c, this);
-	
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterBeanProxy.java
deleted file mode 100644
index 4f9c754..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterBeanProxy.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- * $RCSfile: IDECharacterBeanProxy.java,v $ $Revision: 1.5 $ $Date: 2005/05/11 22:41:24 $
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of ICharacterBeanBeanProxy..
- */
-class IDECharacterBeanProxy extends IDEObjectBeanProxy implements ICharacterBeanProxy {
-	protected Character fCharacterValue;
-	IDECharacterBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
-		super(aRegistry, aBean, aBeanTypeProxy);
-		fCharacterValue = (Character) aBean;
-	}
-	public char charValue() {
-		return fCharacterValue.charValue();
-	}
-	public Character characterValue() {
-		return fCharacterValue;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IIntegerBeanProxy#intValue()
-	 */
-	public int intValue() {
-		return charValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
-	 */
-	public byte byteValue() {
-		return (byte) charValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
-	 */
-	public double doubleValue() {
-		return charValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
-	 */
-	public float floatValue() {
-		return charValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
-	 */
-	public long longValue() {
-		return charValue();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
-	 */
-	public Number numberValue() {
-		// This is a kludge. Need to new one up.
-		return new Integer(charValue());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
-	 */
-	public short shortValue() {
-		return (short) charValue();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterClassBeanTypeProxy.java
deleted file mode 100644
index 4b93d1e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterClassBeanTypeProxy.java
+++ /dev/null
@@ -1,30 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDECharacterClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Char BeanType Proxy.
- */
-final class IDECharacterClassBeanTypeProxy extends IDEBeanTypeProxy {
-	
-protected IDECharacterClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-}
-ICharacterBeanProxy createCharacterBeanProxy(Character aChar){
-	return new IDECharacterBeanProxy(fProxyFactoryRegistry,aChar,this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEClassBeanTypeProxy.java
deleted file mode 100644
index 3253e1d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEClassBeanTypeProxy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IDEClassBeanTypeProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:26 $ 
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
- 
-/**
- * For java.lang.Class type.
- * @since 1.0.0
- */
-public class IDEClassBeanTypeProxy extends IDEBeanTypeProxy {
-
-	/**
-	 * @param aRegistry
-	 * @param aClass
-	 * 
-	 * @since 1.0.0
-	 */
-	public IDEClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-		super(aRegistry, aClass);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.ide.IDEBeanTypeProxy#newBeanProxy(java.lang.Object)
-	 */
-	protected IIDEBeanProxy newBeanProxy(Object anObject) {
-		return (IIDEBeanProxy) ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy((Class) anObject);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.ide.IDEBeanTypeProxy#newBeanTypeForClass(java.lang.Class)
-	 */
-	public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
-	 */
-	public IBeanProxy newInstance() {
-		throw new UnsupportedOperationException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
-	 */
-	public IBeanProxy newInstance(String initializationString) {
-		throw new UnsupportedOperationException();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java
deleted file mode 100644
index 03fb443..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java
+++ /dev/null
@@ -1,119 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEConstructorProxy.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.lang.reflect.Constructor;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This is an implementation of IConstructorProxy where the target VM is the same as
- * the IDE.  The java.lang.reflect.Constructor instance is held in a field
- */
-class IDEConstructorProxy extends IDEAccessibleObjectProxy implements IConstructorProxy {
-
-	/**
-	 * package protected constructor where the instance of java.lang.reflect.Constructor
-	 * can be passed in directly
-	 */
-	IDEConstructorProxy(IDEProxyFactoryRegistry aRegistry, Constructor aConstructor) {
-		super(aRegistry, aConstructor);
-	}
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).constructorType;
-	}
-
-	/**
-	 * This is factored into a special method so that subclasses can override
-	 * if they wish.
-	 */
-	protected IBeanProxy getNewIDEBeanProxy(Object aBean) {
-
-		return IDEStandardBeanProxyFactory.createBeanProxy(fProxyFactoryRegistry, aBean); // Use local helper method to do this.
-	}
-	/**
-	 * Invoke the constructor and return an IDEBeanProxy with the result
-	 */
-	public IBeanProxy newInstance() {
-
-		// Invoke the constructor
-		try {
-			Object result = ((Constructor) getBean()).newInstance(null);
-			return getNewIDEBeanProxy(result);
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-			return null;
-		}
-
-	}
-	public IBeanProxy newInstanceCatchThrowableExceptions() {
-		return newInstance();
-	}
-	public IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] args) {
-		return newInstance(args);
-	}
-	/**
-	 * Invoke the constructor and return an IDEBeanProxy with the result
-	 */
-	public IBeanProxy newInstance(IBeanProxy[] creationArguments) {
-
-		// Get an array of bean objects from the bean proxy arguments
-		Object result = null;
-		Object[] creationObjects = new Object[creationArguments.length];
-		for (int i = 0; i < creationArguments.length; i++) {
-			// It is possible the arguments are null which is perfectly valid
-			if (creationArguments[i] != null)
-				creationObjects[i] = ((IIDEBeanProxy) creationArguments[i]).getBean();
-		}
-
-		// Invoke the constructor
-		try {
-			result = ((Constructor) getBean()).newInstance(creationObjects);
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		}
-
-		// If we have a non-null result create an IDEBeanProxy and return it
-		if (result != null) {
-			return getNewIDEBeanProxy(result);
-		} else {
-			return null;
-		}
-
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IConstructorProxy#getParameterTypes()
-	 */
-	public IBeanTypeProxy[] getParameterTypes() {
-		Class[] parmClasses = ((Constructor) getBean()).getParameterTypes();
-		IBeanTypeProxy[] parmTypes = new IBeanTypeProxy[parmClasses.length];
-		IDEStandardBeanTypeProxyFactory factory = (IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory();
-		for (int i = 0; i < parmClasses.length; i++) {
-			parmTypes[i] = factory.getBeanTypeProxy(parmClasses[i]);
-		}
-		return parmTypes;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorTypeProxy.java
deleted file mode 100644
index 4e53941..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEConstructorTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-
-/**
- * @version 	1.0
- * @author
- */
-public class IDEConstructorTypeProxy extends IDEBeanTypeProxy {
-	
-	IDEConstructorTypeProxy(IDEProxyFactoryRegistry registry) {
-		super(registry, java.lang.reflect.Constructor.class);
-	}
-
-	/*
-	 * @see IDEBeanTypeProxy#newBeanProxy(Object)
-	 */
-	protected IIDEBeanProxy newBeanProxy(Object anObject) {
-		return new IDEConstructorProxy(fProxyFactoryRegistry, (java.lang.reflect.Constructor) anObject);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleClassBeanTypeProxy.java
deleted file mode 100644
index a30678a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleClassBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEDoubleClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Double BeanType Proxy.
- */
-final class IDEDoubleClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-
-protected IDEDoubleClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass, new Double(0));
-}
-INumberBeanProxy createDoubleBeanProxy(Double aDouble){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,aDouble,this);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleTypeBeanTypeProxy.java
deleted file mode 100644
index f9ee106..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleTypeBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEDoubleTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * double BeanType Proxy.
- */
-final class IDEDoubleTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEDoubleTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-}
-INumberBeanProxy createDoubleBeanProxy(double aDouble){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,new Double(aDouble),this);
-}
-int getPrimitiveType(){
-	return DOUBLE;
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-	Number n = anObject instanceof Character ? new Double(((Character) anObject).charValue()) : (Number) anObject;
-	return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java
deleted file mode 100644
index d2dcc5b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java
+++ /dev/null
@@ -1,1056 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: IDEExpression.java,v $ $Revision: 1.6 $ $Date: 2005/05/16 19:11:23 $
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
-/**
- * IDE expression processing.
- * 
- * @since 1.0.0
- */
-public class IDEExpression extends Expression {
-
-	private final IDEStandardBeanTypeProxyFactory beantypefactory;
-	protected final ExpressionProcesser eproc;
-	{
-		boolean useTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING));
-		long threshold = Long.getLong(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACEING_TIMER_THRESHOLD), -1L).longValue();
-		eproc = new ExpressionProcesser(useTracing, threshold);
-	}
-	
-
-	private void processExpressionError() throws ThrowableProxy, NoExpressionValueException {
-		if (!eproc.noErrors())
-			if (eproc.isNoExpressionValue())
-				throw (NoExpressionValueException) eproc.getErrorThrowable();
-			else {
-				Throwable t = eproc.getErrorThrowable();
-				if (t instanceof ThrowableProxy)
-					throw (ThrowableProxy) t;
-				else
-					throw new IDEThrowableProxy(eproc.getErrorThrowable(), beantypefactory.getBeanTypeProxy(t.getClass()));
-			}
-	}
-	
-	/**
-	 * Create the IDEExpression
-	 * 
-	 * @param registry
-	 * 
-	 * @since 1.0.0
-	 */
-	public IDEExpression(ProxyFactoryRegistry registry) {
-		super(registry);
-		beantypefactory = (IDEStandardBeanTypeProxyFactory) registry.getBeanTypeProxyFactory();
-	}
-
-	protected final IDEProxyFactoryRegistry getIDERegistry() {
-		return (IDEProxyFactoryRegistry) registry;
-	}
-
-	protected final IDEStandardBeanTypeProxyFactory getIDEBeanTypeFactory() {
-		return beantypefactory;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushToProxy(org.eclipse.jem.internal.proxy.core.IProxy)
-	 */
-	protected void pushToProxy(IProxy proxy) {
-		if (proxy == null)
-			eproc.pushExpression(null, MethodHelper.NULL_TYPE);
-		else if (proxy.isBeanProxy())
-			eproc.pushExpression(((IDEBeanProxy) proxy).getBean(), ((IDEBeanTypeProxy) ((IBeanProxy) proxy).getTypeProxy()).getTypeClass());
-		else
-			eproc.pushExpressionProxy(((ExpressionProxy) proxy).getProxyID());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#closeProxy()
-	 */
-	protected void closeProxy() {
-		methodExpressionProxies = fieldExpressionProxies = null;
-		eproc.close();
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pullProxyValue(int, java.util.List)
-	 */
-	protected IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
-		processExtensionProxies(proxycount, expressionProxies);
-		processExpressionError();
-		Object result[] = new Object[2];
-		eproc.pullValue(result);
-		IBeanProxy resultProxy = getIDERegistry().getBeanProxy((Class) result[1], result[0]);
-		return resultProxy;
-	}
-	
-	private void processExtensionProxies(int proxycount, List expressionProxies) {
-		if (proxycount > 0) {
-			int len = expressionProxies.size();
-			Object[] proxyResolution = new Object[2];
-			for (int i = 0; i < len; i++) {
-				ExpressionProxy ep = (ExpressionProxy) expressionProxies.get(i);
-				if (ep != null) {
-					try {
-						eproc.pullExpressionProxyValue(ep.getProxyID(), proxyResolution);
-						if (proxyResolution[1] != Void.TYPE)
-							fireProxyResolved(ep, getIDERegistry().getBeanProxy((Class) proxyResolution[1], proxyResolution[0]));
-						else
-							fireProxyVoid(ep);
-					} catch (NoExpressionValueException e) {
-						fireProxyNotResolved(ep);
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushCastToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushCastToProxy(IProxyBeanType type) {
-		try {
-			eproc.pushCast(getIDEBeanTypeProxy(type).getTypeClass());
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInstanceofToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushInstanceofToProxy(IProxyBeanType type) {
-		try {
-			eproc.pushInstanceof(getIDEBeanTypeProxy(type).getTypeClass());
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-	
-	/**
-	 * Get the BeanType proxy and test if valid. Throw ThrowableProxy if not valid.
-	 * 
-	 * @param type 
-	 * @return 
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.0.0
-	 */
-	protected IDEBeanTypeProxy getIDEBeanTypeProxy(IProxyBeanType type) throws ThrowableProxy {
-		IDEBeanTypeProxy typeProxy;
-		if (type.isExpressionProxy()) {
-			// It should already be resolved at this point.
-			typeProxy = ((IDEBeanTypeExpressionProxy) type).getBeanTypeProxy();
-		} else
-			typeProxy = (IDEBeanTypeProxy) type;
-		if (!typeProxy.isValid()) {
-			throw new IDEThrowableProxy(
-					new Exception(typeProxy.getInitializationError()),
-					getIDEBeanTypeFactory().getBeanTypeProxy(Exception.class));
-		} else
-			return typeProxy;
-	}
-
-	
-	/**
-	 * Get the BeanType proxy and test if valid. Throw ThrowableProxy if not valid.
-	 * @param type
-	 * @return
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IDEBeanTypeProxy getIDEBeanTypeProxy(String type) throws ThrowableProxy {
-		return (IDEBeanTypeProxy) registry.getBeanTypeProxyFactory().getBeanTypeProxy(type);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushPrefixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
-	 */
-	protected void pushPrefixToProxy(PrefixOperator operator) {
-		eproc.pushPrefix(operator);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInfixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InfixOperator, org.eclipse.jem.internal.proxy.initParser.tree.InternalInfixOperandType)
-	 */
-	protected void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType) {
-		eproc.pushInfix(operator, operandType);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayAccessToProxy(int)
-	 */
-	protected void pushArrayAccessToProxy(int indexCount) {
-		eproc.pushArrayAccess(indexCount);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	protected void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount) {
-		try {
-			eproc.pushArrayCreation(getIDEBeanTypeProxy(type).getTypeClass(), dimensionCount);
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-
-	protected void pushArrayInitializerToProxy(IProxyBeanType type, int stripCount, int expressionCount) {
-		try {
-			eproc.pushArrayInitializer(getIDEBeanTypeProxy(type).getTypeClass(), stripCount, expressionCount);
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushClassInstanceCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
-	 */
-	protected void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount) {
-		try {
-			eproc.pushClassInstanceCreation(getIDEBeanTypeProxy(type).getTypeClass(), argumentCount);
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTypeReceiverToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushTypeReceiverToProxy(IProxyBeanType type) {
-		try {
-			Class c = getIDEBeanTypeProxy(type).getTypeClass();
-			eproc.pushExpression(c, c);	// When as a receiver, the type is the same as the receiver. 
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		} catch (RuntimeException e) {
-			eproc.processException(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldAccessToProxy(java.lang.Object, boolean)
-	 */
-	protected void pushFieldAccessToProxy(Object field, boolean hasReceiver) {
-		boolean isString = field instanceof String;
-		try {
-			eproc.pushFieldAccess(isString ? field : getIDEFieldProxy((IProxyField) field).getBean(), isString, hasReceiver);
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodInvocationToProxy(java.lang.Object, boolean, int)
-	 */
-	protected void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount) {
-		boolean isString = method instanceof String;
-		try {
-			eproc.pushMethodInvocation(isString ? method : getIDEMethodProxy((IProxyMethod) method).getBean(), isString, hasReceiver, argCount);
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushConditionalToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InternalConditionalOperandType)
-	 */
-	protected void pushConditionalToProxy(InternalConditionalOperandType expressionType) {
-		eproc.pushConditional(expressionType);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushInvoke()
-	 */
-	protected void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
-		// In the IDE case do nothing. Nothing is pending. But still need to handle proxy resolution.
-		processExtensionProxies(proxycount, expressionProxies);
-		processExpressionError(); 
-	}
-	
-	/**
-	 * This is used as both an ExpressionProxy (i.e. IDE side) and the Expressions expression proxy result on the other side.
-	 * This makes it easier to just use same instance on both sides.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class IDEExpressionProxy extends ExpressionProxy implements InternalExpressionProxy {
-		
-		protected IDEExpressionProxy(int proxyid, int proxyType, Expression expression) {
-			super(proxyid, proxyType, expression);
-		}
-		
-		private Object value;
-		private Class type;
-		private boolean set;
-		
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#dispose()
-		 */
-		protected void dispose() {
-			super.dispose();
-			value = null;
-			type = null;
-			set = false;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getType()
-		 */
-		public Class getType() {
-			return type;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getValue()
-		 */
-		public Object getValue() {
-			return value;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#setProxy(java.lang.Object, java.lang.Class)
-		 */
-		public void setProxy(Object value, Class type) {
-			this.value = value;
-			this.type = type;
-			set = true;
-		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#isSet()
-		 */
-		public boolean isSet() {
-			return set;
-		}
-	}
-	
-	/**
-	 * The Expression proxy for IDE BeanTypes.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class IDEBeanTypeExpressionProxy extends IDEExpressionProxy implements IBeanTypeExpressionProxy {
-		
-		private String typeName;
-		private IDEBeanTypeProxy resolvedProxy;
-
-		/**
-		 * @param proxyid
-		 * 
-		 * @since 1.1.0
-		 */
-		public IDEBeanTypeExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, BEANTYPE_EXPRESSION_PROXY, expression);
-		}
-		
-		/*
-		 *  (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeExpressionProxy#setTypeName(java.lang.String)
-		 */
-		public void setTypeName(String typeName) {
-			this.typeName = typeName;
-		}
-		
-		/*
-		 *  (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getTypeName()
-		 */
-		public String getTypeName() {
-			return typeName;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
-		 */
-		public String toString() {
-			return super.toString()+" - "+getTypeName();
-		}
-
-		/**
-		 * Called by IDEExpression to resolve the beantype.
-		 * @param beantypeProxy
-		 * 
-		 * @since 1.1.0
-		 */
-		void setProxy(IDEBeanTypeProxy beantypeProxy) {
-			this.resolvedProxy = beantypeProxy;
-			setProxy(resolvedProxy.getTypeClass(), Class.class);
-		}
-		
-		/**
-		 * Called by IDEExpression to get the resolved beantype proxy.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		IDEBeanTypeProxy getBeanTypeProxy() {
-			return resolvedProxy;
-		}
-
-		/*
-		 *  (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-		 */
-		public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
-			IProxyMethod method = ((IDEExpression) expression).getMethodExpressionProxy(this, methodName, parameterTypes);
-			if (method == null) {
-				// Need to go to the expression and create it.
-				method = ((Expression) expression).createMethodExpressionProxy(this, methodName, parameterTypes);
-			}
-			return method;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
-		 */
-		public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
-			return ((IDEMethodProxyFactory) expression.getRegistry().getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
-		 */
-		public IProxyField getFieldProxy(IExpression expression, String fieldName) {
-			IProxyField field = ((IDEExpression) expression).getFieldExpressionProxy(this, fieldName);
-			if (field == null) {
-				// Need to go to the expression and create it.
-				field = ((Expression) expression).createFieldExpressionProxy(this, fieldName);
-			}
-			return field;
-		}
-	}
-	
-	/**
-	 * The Expression proxy for IDE BeanTypes.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected static class IDEMethodExpressionProxy extends IDEExpressionProxy implements IProxyMethod {
-		
-		private String methodName;
-		private IDEMethodProxy resolvedProxy;
-		private ThrowableProxy errorThrowable;
-
-		/**
-		 * @param proxyid
-		 * 
-		 * @since 1.1.0
-		 */
-		public IDEMethodExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, METHOD_EXPRESSION_PROXY, expression);
-		}
-		
-		/**
-		 * Set by IDEExpression with the method name.
-		 * @param methodName
-		 * 
-		 * @since 1.1.0
-		 */
-		void setMethodName(String methodName) {
-			this.methodName = methodName;
-		}
-				
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
-		 */
-		public String toString() {
-			return super.toString()+" - "+methodName;
-		}
-
-		/**
-		 * Called by IDEExpression to resolve the beantype.
-		 * @param methodProxy
-		 * 
-		 * @since 1.1.0
-		 */
-		void setProxy(IDEMethodProxy methodProxy) {
-			this.resolvedProxy = methodProxy;
-			setProxy(resolvedProxy.getBean(), Class.class);
-		}
-		
-		/**
-		 * Called by IDEExpression to say there was error in creating the proxy.
-		 * @param errorThrowable
-		 * 
-		 * @since 1.1.0
-		 */
-		void setThrowable(ThrowableProxy errorThrowable) {
-			this.errorThrowable = errorThrowable;
-		}
-		
-		/**
-		 * Called by IDEExpression to get the resolved method proxy.
-		 * @return
-		 * @throws ThrowableProxy
-		 * 
-		 * @since 1.1.0
-		 */
-		IDEMethodProxy getMethodProxy() throws ThrowableProxy {
-			if (errorThrowable != null)
-				throw errorThrowable;
-			return resolvedProxy;
-		}
-	}
-	
-	protected static class IDEFieldExpressionProxy extends IDEExpressionProxy implements IProxyField {
-		
-		private String fieldName;
-		private IDEFieldProxy resolvedProxy;
-		private ThrowableProxy errorThrowable;
-
-		/**
-		 * @param proxyid
-		 * 
-		 * @since 1.1.0
-		 */
-		public IDEFieldExpressionProxy(int proxyid, Expression expression) {
-			super(proxyid, FIELD_EXPRESSION_PROXY, expression);
-		}
-		
-		/**
-		 * Set by IDEExpression with the method name.
-		 * @param fieldName
-		 * 
-		 * @since 1.1.0
-		 */
-		void setField(String fieldName) {
-			this.fieldName = fieldName;
-		}
-				
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
-		 */
-		public String toString() {
-			return super.toString()+" - "+fieldName;
-		}
-
-		/**
-		 * Called by IDEExpression to resolve the beantype.
-		 * @param fieldProxy
-		 * 
-		 * @since 1.1.0
-		 */
-		void setProxy(IDEFieldProxy fieldProxy) {
-			this.resolvedProxy = fieldProxy;
-			setProxy(resolvedProxy.getBean(), Class.class);
-		}
-		
-		/**
-		 * Called by IDEExpression to say there was error in creating the proxy.
-		 * @param errorThrowable
-		 * 
-		 * @since 1.1.0
-		 */
-		void setThrowable(ThrowableProxy errorThrowable) {
-			this.errorThrowable = errorThrowable;
-		}
-		
-		/**
-		 * Called by IDEExpression to get the resolved field proxy.
-		 * @return
-		 * @throws ThrowableProxy
-		 * 
-		 * @since 1.1.0
-		 */
-		IDEFieldProxy getFieldProxy() throws ThrowableProxy {
-			if (errorThrowable != null)
-				throw errorThrowable;
-			return resolvedProxy;
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#createExpressionProxy(int, int)
-	 */
-	protected ExpressionProxy createExpressionProxy(int proxyType, int proxyID) {
-		switch (proxyType) {
-			case NORMAL_EXPRESSION_PROXY:
-			default:
-				return new IDEExpressionProxy(proxyID, NORMAL_EXPRESSION_PROXY, this);
-			
-			case BEANTYPE_EXPRESSION_PROXY:
-				return new IDEBeanTypeExpressionProxy(proxyID, this);
-				
-			case METHOD_EXPRESSION_PROXY:
-				return new IDEMethodExpressionProxy(proxyID, this);
-				
-			case FIELD_EXPRESSION_PROXY:
-				return new IDEFieldExpressionProxy(proxyID, this);
-		}
-		
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	protected void pushAssignmentToProxy(ExpressionProxy proxy) {
-		eproc.pushAssignment((InternalExpressionProxy) proxy);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy()
-	 */
-	protected void pushAssignmentToProxy() {
-		eproc.pushAssignment();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBeginToProxy(int)
-	 */
-	protected void pushBlockBeginToProxy(int blockNumber) {
-		eproc.pushBlockBegin(blockNumber);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockEndToProxy(int)
-	 */
-	protected void pushBlockEndToProxy(int blockNumber) {
-		eproc.pushBlockEnd(blockNumber);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBreakToProxy(int)
-	 */
-	protected void pushBlockBreakToProxy(int blockNumber) {
-		eproc.pushBlockBreak(blockNumber);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryBeginToProxy(int)
-	 */
-	protected void pushTryBeginToProxy(int tryNumber) {
-		eproc.pushTryBegin(tryNumber);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryCatchClauseToProxy(int, org.eclipse.jem.internal.proxy.core.IProxyBeanType, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
-	 */
-	protected void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
-		try {
-			eproc.pushTryCatchClause(tryNumber, getIDEBeanTypeProxy(exceptionType).getTypeClass(), (InternalExpressionProxy) ep);
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryFinallyClauseToProxy(int)
-	 */
-	protected void pushTryFinallyClauseToProxy(int tryNumber) {
-		eproc.pushTryFinallyClause(tryNumber);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryEndToProxy(int)
-	 */
-	protected void pushTryEndToProxy(int tryNumber) {
-		eproc.pushTryEnd(tryNumber);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushThrowToProxy()
-	 */
-	protected void pushThrowToProxy() {
-		eproc.pushThrowException();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushRethrowToProxy(int)
-	 */
-	protected void pushRethrowToProxy(int tryNumber) {
-		eproc.pushTryRethrow(tryNumber);
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushBeanTypeToProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeExpressionProxy)
-	 */
-	protected void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy) {
-		try {
-			IDEBeanTypeExpressionProxy ep = (IDEBeanTypeExpressionProxy) proxy;
-			IDEBeanTypeProxy typeProxy = getIDEBeanTypeProxy(proxy.getTypeName());
-			ep.setProxy(typeProxy);
-			eproc.allocateExpressionProxy(ep);
-			if (!typeProxy.isValid()) {
-				throw new IDEThrowableProxy(
-						new Exception(typeProxy.getInitializationError()),
-						getIDEBeanTypeFactory().getBeanTypeProxy(Exception.class));
-			}
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-	
-	/**
-	 * Get the map of IProxyBeanTypes for a beantype name. Meant to be used only in conjunction with IDEStandardBeanTypeFactory.
-	 * It is here so the IDDEStandardBeanTypeFactory can store pending proxies per expression.
-	 * 
-	 * @param beanType
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyBeanType getBeanType(String beanTypeName) {
-		if (beanTypeCache == null)
-			beanTypeCache = new HashMap();
-		return (IProxyBeanType) beanTypeCache.get(beanTypeName);
-	}
-	
-	/**
-	 * Add the beantype expression proxy to the map of bean type expression proxies. Used in conjunction with IDEStandardBeanTypeFactory.
-	 * It is here so the IDEStandardBeanTypeFactory can store pending proxies per expression.
-	 * @param beanTypeName
-	 * @param beantype
-	 * 
-	 * @since 1.1.0
-	 */
-	public void addBeanType(String beanTypeName, IProxyBeanType beantype) {
-		beanTypeCache.put(beanTypeName, beantype);
-	}
-	
-	/**
-	 * Remove the beantype expression proxy from the map. This is called because there was a rollback due to an endmark.
-	 * @param beanTypeName
-	 * 
-	 * @since 1.1.0
-	 */
-	public void removeBeanType(String beanTypeName) {
-		beanTypeCache.remove(beanTypeName);
-	}
-
-	/**
-	 * Keeping a local map of Method Expression Proxies so that we don't keep recreating them for each request from within this expression.
-	 * The map will be:  declaringTypeName->(Map) methodName or IDEMethodKey -> method expression proxy. 
-	 * @see IDEExpression#pushMethodToProxy(ExpressionProxy, IProxyBeanType, String, IProxyBeanType[]) for the actual implementation. 
-	 */
-	protected Map methodExpressionProxies;
-	
-	/**
-	 * Keeping a local map of Field Expression Proxies so that we don't keep recreating them for each request from within this expression.
-	 * The map will be:  declaringTypeName->(Map) fieldname -> field expression proxy. 
-	 * @see IDEExpression#pushFieldToProxy(ExpressionProxy, IProxyBeanType, String) 
-	 */
-	protected Map fieldExpressionProxies;
-	
-	/**
-	 * Keeping a local map of BeanType expression proxies so that we don't keep recreating them for each request from within this expression.
-	 * The map will be: typename->beanTypeExpressionProxy
-	 */
-	protected Map beanTypeCache;	// Use to cache pending BeanTypes. Used in conjunction with IDEStandardBeanTypeFactory.
-
-	/*
-	 * Used as the key to the methodCache when there are parms.
-	 * It allows the parms to be either IProxyBeanType without the
-	 * overhead of creating complicated strings.
-	 * 
-	 * It will compare method name and each individual parm name without fluffing
-	 * up a string and building it up.
-	 * 
-	 * For no parm methods, just the name of the method as a string will be the key.
-	 * 
-	 * @since 1.1.0
-	 */
-	private static class MethodKey {
-		public String methodName;
-		public IProxyBeanType[] parmTypes;
-		public MethodKey(String methodName, IProxyBeanType[] parmTypes) {
-			this.methodName = methodName;
-			this.parmTypes = parmTypes;
-		}
-				
-				
-		/* (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
-		public boolean equals(Object obj) {
-			if (this == obj)
-				return true;
-			try {
-				return ((MethodKey) obj).compareParms(parmTypes);
-			} catch (ClassCastException e) {
-				return false;
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
-		 */
-		public int hashCode() {
-			int h = methodName.hashCode();;
-			for (int i = 0; i < parmTypes.length; i++) {
-				h += parmTypes[i].getTypeName().hashCode();
-			}
-			return h;
-		}
-				
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
-		 */
-		protected boolean compareParms(IProxyBeanType[] parms) {
-			if (parms.length != parmTypes.length)
-				return false;
-			for (int i = 0; i < parms.length; i++) {
-				if (!parmTypes[i].getTypeName().equals(parms[i].getTypeName()))
-					return false;
-			}
-			return true;
-		}		
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
-	 */
-	protected void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
-		try {
-			final Map methods = getMethods(declaringType);
-			final Object key = getMethodKey(methodName, parameterTypes); 
-			methods.put(key, proxy);
-			proxy.addProxyListener(new ExpressionProxy.ProxyAdapter() {
-			
-				public void proxyNotResolved(ProxyEvent event) {
-					methods.remove(key);	// Back it out. tis could happen due to endmark rollback.
-				}
-			
-			});
-			
-			IDEMethodExpressionProxy ep = (IDEMethodExpressionProxy) proxy;
-			ep.setMethodName(methodName);
-			// We resolve immediately. Any expression proxies should also be resolved at this point too.
-			Class declaringClass = getIDEBeanTypeProxy(declaringType).getTypeClass();
-			Class[] parameterClasses;
-			if (parameterTypes == null || parameterTypes.length == 0)
-				parameterClasses = null;
-			else {
-				parameterClasses = new Class[parameterTypes.length];
-				for (int i = 0; i < parameterClasses.length; i++) {
-					parameterClasses[i] = getIDEBeanTypeProxy(parameterTypes[i]).getTypeClass();
-				}
-			}
-			IDEMethodProxy methodProxy = ((IDEMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(declaringClass, methodName, parameterClasses);
-			if (methodProxy == null) {
-				String parms = "";
-				if (parameterTypes != null || parameterTypes.length > 0) {
-					StringBuffer st = new StringBuffer(100);
-					for (int i = 0; i < parameterClasses.length; i++) {
-						if (i > 0)
-							st.append(',');
-						st.append(parameterTypes[i].getTypeName());
-					}
-					parms = st.toString();
-				}
-				throw new IDEThrowableProxy(new NoSuchMethodException("No method: "+declaringType+'.'+methodName+"("+parms+')'),
-					getIDEBeanTypeFactory().getBeanTypeProxy(NoSuchMethodException.class));
-			}
-			
-			ep.setProxy(methodProxy);
-			eproc.allocateExpressionProxy(ep);
-		} catch (ThrowableProxy e) {
-			((IDEMethodExpressionProxy) proxy).setThrowable(e);	// So we don't recreate throwable all of the time.
-			eproc.processException(e);
-		}		
-	}
-	
-	private Map getMethods(IProxyBeanType classtype) {
-		if (methodExpressionProxies == null)
-			methodExpressionProxies = new HashMap();
-		Map methods = (Map) methodExpressionProxies.get(classtype.getTypeName());
-		if (methods == null)
-			methodExpressionProxies.put(classtype.getTypeName(), methods = new HashMap());
-		return methods;
-	}
-	
-	private Object getMethodKey(String methodName, IProxyBeanType[] parameterTypes) {
-		if (parameterTypes == null || parameterTypes.length == 0)
-			return methodName;
-		else
-			return new MethodKey(methodName, parameterTypes);
-	}
-	
-	private Map getFields(IProxyBeanType classtype) {
-		if (fieldExpressionProxies == null)
-			fieldExpressionProxies = new HashMap();
-		Map fields = (Map) fieldExpressionProxies.get(classtype.getTypeName());
-		if (fields == null)
-			fieldExpressionProxies.put(classtype.getTypeName(), fields = new HashMap());
-		return fields;
-	}
-	
-	/**
-	 * This is used by IDEBeanTypes and IDEBeanTypeExpressionProxy to access any already created Method Expression Proxies.
-	 * 
-	 * @param declaringType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return IProxyMethod or <code>null</code> if not yet created.
-	 * 
-	 * @since 1.1.0
-	 */
-	IProxyMethod getMethodExpressionProxy(IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
-		Map methods = getMethods(declaringType);
-		Object key = getMethodKey(methodName, parameterTypes); 
-		return (IProxyMethod) methods.get(key);
-	}
-	
-	/**
-	 * This is used by IDEBeanTypes and IDEBeanTypeExpressionProxy to access any already created Field Expression Proxies.
-	 * @param declaringType
-	 * @param fieldName
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	IProxyField getFieldExpressionProxy(IProxyBeanType declaringType, String fieldName) {
-		Map fields = getFields(declaringType);
-		return (IProxyField) fields.get(fieldName);
-	}
-	
-	/**
-	 * Get the IDEMethodProxy out of the already resolved Expression Proxy or IDEMethodProxy itself.
-	 * @param method
-	 * @return
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IDEMethodProxy getIDEMethodProxy(IProxyMethod method) throws ThrowableProxy {
-		IDEMethodProxy methodProxy;
-		if (method.isExpressionProxy()) {
-			// It should already be resolved at this point.
-			methodProxy = ((IDEMethodExpressionProxy) method).getMethodProxy();
-		} else
-			methodProxy = (IDEMethodProxy) method;
-		return methodProxy;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String)
-	 */
-	protected void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, final String fieldName) {
-
-		try {
-			final Map fields = getFields(declaringType);
-			fields.put(fieldName, proxy);
-			proxy.addProxyListener(new ExpressionProxy.ProxyAdapter(){
-				public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
-					fields.remove(fieldName);	// this can happen due to an endmark. It could be one of the ones that are rolled back.
-				}
-			});
-			
-			
-			IDEFieldExpressionProxy ep = (IDEFieldExpressionProxy) proxy;
-			// We resolve immediately. Any expression proxies should also be resolved at this point too.
-			IDEFieldProxy fieldProxy = (IDEFieldProxy) getIDEBeanTypeProxy(declaringType).getFieldProxy(fieldName);
-			if (fieldProxy == null) {
-			throw new IDEThrowableProxy(new NoSuchFieldException("No field: "+declaringType+'.'+fieldName),
-					getIDEBeanTypeFactory().getBeanTypeProxy(NoSuchFieldException.class));
-			}
-			
-			ep.setProxy(fieldProxy);
-			eproc.allocateExpressionProxy(ep);
-		} catch (ThrowableProxy e) {
-			((IDEFieldExpressionProxy) proxy).setThrowable(e);	// So we don't recreate throwable all of the time.
-			eproc.processException(e);
-		}		
-
-	}
-	
-	/**
-	 * Get the IDEFieldProxy out of the already resolved Expression Proxy or IDEFieldProxy itself.
-	 * @param field
-	 * @return
-	 * @throws ThrowableProxy
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IDEFieldProxy getIDEFieldProxy(IProxyField field) throws ThrowableProxy {
-		IDEFieldProxy fieldProxy;
-		if (field.isExpressionProxy()) {
-			// It should already be resolved at this point.
-			fieldProxy = ((IDEFieldExpressionProxy) field).getFieldProxy();
-		} else
-			fieldProxy = (IDEFieldProxy) field;
-		return fieldProxy;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfTestToProxy()
-	 */
-	protected void pushIfTestToProxy() {
-		eproc.pushIfElse();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfElseToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InternalIfElseOperandType)
-	 */
-	protected void pushIfElseToProxy(InternalIfElseOperandType clauseType) {
-		eproc.pushIfElse(clauseType);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.Expression#pushNewInstanceToProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
-	 */
-	protected void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType) {
-		try {
-			eproc.pushNewInstanceFromString(initializationString, getIDEBeanTypeProxy(resultType).getTypeClass(), getIDERegistry().fClassLoader);
-		} catch (ThrowableProxy e) {
-			eproc.processException(e);
-		}
-	}
-
-	protected void pushMarkToProxy(int markID) {
-		eproc.pushMark(markID);
-	}
-
-	protected void pushEndmarkToProxy(int markID, boolean restore) {
-		eproc.pushEndmark(markID, restore);
-	}
-
-	protected void pushBeginTransferThreadToProxy() {
-		// For IDE it doesn't matter. Just go ahead and continue processing.
-	}
-
-	protected void pushTransferThreadToProxy() {
-		// For IDE it doesn't matter. Just go ahead and continue processing.
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExtensionBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExtensionBeanTypeProxyFactory.java
deleted file mode 100644
index c4a28ca..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExtensionBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jem.internal.proxy.ide;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IDEExtensionBeanTypeProxyFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public interface IDEExtensionBeanTypeProxyFactory extends IBeanTypeProxyFactory {
-
-public IDEBeanTypeProxy getExtensionBeanTypeProxy(String className);
-
-public IDEBeanTypeProxy getExtensionBeanTypeProxy(String typeName, IBeanTypeProxy superType);	
-
-public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression);
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java
deleted file mode 100644
index 3ab03d1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEFieldProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.lang.reflect.Field;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Implementation of IFieldProxy where the bean vm is the same as the IDE
- * Therefore we hold the instance of a java.lang.reflect.Field in a field
- * directly and have a package protected constructor to set this
- * Creation date: (1/17/00 12:32:24 PM)
- * @author: Joe Winchester
- */
-public class IDEFieldProxy extends IDEAccessibleObjectProxy implements IFieldProxy {
-	protected IBeanTypeProxy fFieldType;
-	/**
-	 * Package protected constructor that takes the field directly
-	 * This is package protected because only classes in the IDE package can construct
-	 * this.  Everyone else must go via the typeProxy
-	 */
-	IDEFieldProxy(IDEProxyFactoryRegistry aRegistry, Field aField) {
-		super(aRegistry, aField);
-	}
-	/**
-	 * Get the value of the field and return it wrapped in a bean proxy
-	 */
-	public IBeanProxy get(IBeanProxy aSubject) {
-
-		Object result = null;
-		// Get the field value and catch any errors	
-		try {
-			result = ((Field) getBean()).get(aSubject != null ? ((IIDEBeanProxy) aSubject).getBean() : null);
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		}
-
-		// If we have a non null result wrap it in an IBeanProxy and return it
-		if (result != null) {
-			return fProxyFactoryRegistry.getBeanProxy(((Field) getBean()).getType(), result);
-		} else {
-			return null;
-		}
-
-	}
-	/**
-	 * Get the beans from both of the proxies and invoke the field set method
-	 * Cast to IDEBeanProxy and use package protected method
-	 */
-	public void set(IBeanProxy aSubject, IBeanProxy argument) {
-
-		// Set the field value and catch any errors	
-		try {
-			((Field) getBean()).set(
-				aSubject != null ? ((IIDEBeanProxy) aSubject).getBean() : null,
-				argument != null ? ((IIDEBeanProxy) argument).getBean() : null);
-		} catch (Exception e) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		}
-	}
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).fieldType;
-	}
-	/**
-	 * Return the type of the field.
-	 */
-	public IBeanTypeProxy getFieldType() {
-		if (fFieldType == null) {
-			fFieldType =
-				((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
-					((Field) getBean()).getType());
-		}
-		return fFieldType;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldTypeProxy.java
deleted file mode 100644
index b69bf9e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldTypeProxy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEFieldTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-/**
- * @version 	1.0
- * @author
- */
-public class IDEFieldTypeProxy extends IDEBeanTypeProxy {
-	
-	IDEFieldTypeProxy(IDEProxyFactoryRegistry registry) {
-		super(registry, java.lang.reflect.Field.class);
-	}
-
-	/*
-	 * @see IDEBeanTypeProxy#newBeanProxy(Object)
-	 */
-	protected IIDEBeanProxy newBeanProxy(Object anObject) {
-		return new IDEFieldProxy(fProxyFactoryRegistry, (java.lang.reflect.Field) anObject);
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatClassBeanTypeProxy.java
deleted file mode 100644
index 97bc3f6..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatClassBeanTypeProxy.java
+++ /dev/null
@@ -1,30 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEFloatClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Float BeanType Proxy.
- */
-final class IDEFloatClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-
-protected IDEFloatClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass, new Float(0));
-}
-INumberBeanProxy createFloatBeanProxy(Float aFloat){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,aFloat,this);
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatTypeBeanTypeProxy.java
deleted file mode 100644
index 7e28d8b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEFloatTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Float BeanType Proxy.
- */
-final class IDEFloatTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEFloatTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-}
-INumberBeanProxy createFloatBeanProxy(float aFloat){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,new Float(aFloat),this);
-}
-int getPrimitiveType(){
-	return FLOAT;
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-	Number n = anObject instanceof Character ? new Float(((Character) anObject).charValue()) : (Number) anObject;
-	return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEInitErrorBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEInitErrorBeanTypeProxy.java
deleted file mode 100644
index 3b04ea9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEInitErrorBeanTypeProxy.java
+++ /dev/null
@@ -1,248 +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.jem.internal.proxy.ide;
-
-/*
- *  $RCSfile: IDEInitErrorBeanTypeProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * @author richkulp
- * 
- * To change this generated comment edit the template variable "typecomment": Window>Preferences>Java>Templates. To enable and disable the creation of
- * type comments go to Window>Preferences>Java>Code Generation.
- */
-public class IDEInitErrorBeanTypeProxy extends IDEBeanTypeProxy {
-
-	protected String classname;
-
-	protected String initializationError;
-
-	protected IDEInitErrorBeanTypeProxy(IDEProxyFactoryRegistry registry, String classname, String initializationError) {
-		super(registry, null);
-		this.classname = classname;
-		this.initializationError = initializationError;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(String[])
-	 */
-	public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	public IConstructorProxy[] getConstructors() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(String[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	public IConstructorProxy[] getDeclaredConstructors() {
-		return null;
-	}
-
-	public IFieldProxy[] getFields() {
-		return null;
-	}
-
-	public IFieldProxy[] getDeclaredFields() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(String)
-	 */
-	public IFieldProxy getFieldProxy(String fieldName) {
-		return null;
-	}
-
-	public IMethodProxy[] getMethods() {
-		return null;
-	}
-
-	public IMethodProxy[] getDeclaredMethods() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, String[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, String)
-	 */
-	public IMethodProxy getMethodProxy(String methodName, String argumentClassName) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, IBeanTypeProxy[])
-	 */
-	public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, String[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, IBeanTypeProxy[])
-	 */
-	public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
-	 */
-	public IConstructorProxy getNullConstructorProxy() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
-	 */
-	public IBeanTypeProxy getSuperBeanTypeProxy() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
-	 */
-	public String getTypeName() {
-		return classname;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
-	 */
-	public String getFormalTypeName() {
-		return getTypeName();
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
-	 */
-	public boolean isArray() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
-	 */
-	public boolean isInterface() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
-	 */
-	public boolean isPrimitive() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(IBeanTypeProxy)
-	 */
-	public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
-	 */
-	public IBeanProxy newInstance() {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(String)
-	 */
-	public IBeanProxy newInstance(String initializationString) {
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
-	 */
-	public String getInitializationError() {
-		return initializationError;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
-	 */
-	public String toBeanString() {
-		return classname;
-	}
-
-	/**
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
-	 */
-	public boolean isValid() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String,
-	 *      org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
-	 */
-	public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerBeanProxy.java
deleted file mode 100644
index 1b31a1f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerBeanProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEIntegerBeanProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * IDE Proxy for Integers. Since Integers were first implemented
- * in the VCE, and because they are often referenced, we've created
- * a subclass to handle them. That way we wouldn't need to change
- * everyone that was using the IIntegerProxy interface and we
- * can store the int value to speed up access.
- */
-public class IDEIntegerBeanProxy extends IDENumberBeanProxy implements IIntegerBeanProxy {
-	protected int fIntValue;
-IDEIntegerBeanProxy(IDEProxyFactoryRegistry aRegistry, Number anInteger, IBeanTypeProxy aBeanTypeProxy) {
-	super(aRegistry, anInteger , aBeanTypeProxy);
-	fIntValue = anInteger.intValue();
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fIntValue;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerClassBeanTypeProxy.java
deleted file mode 100644
index 6c0fc08..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerClassBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEIntegerClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.IIntegerBeanProxy;
-
-/**
- * IDE Implementation of IIntegerBeanTypeProxy
- */
-final class IDEIntegerClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-// Some values are cache'd for speed
-	private final IDEIntegerBeanProxy zeroIntProxy;
-	private final IDEIntegerBeanProxy oneIntProxy;
-	private final IDEIntegerBeanProxy twoIntProxy;
-	private final IDEIntegerBeanProxy threeIntProxy;
-IDEIntegerClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass, new Integer(0));
-	// Create the cached values
-	zeroIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(0), this );	
-	oneIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(1), this );
-	twoIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(2), this );
-	threeIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(3), this );
-		
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IIntegerBeanProxy createIntegerBeanProxy(Integer anInteger) {
-	switch(anInteger.intValue()){
-		case 0: return zeroIntProxy ;
-		case 1: return oneIntProxy ;
-		case 2: return twoIntProxy ;
-		case 3: return threeIntProxy ;
-		default: return new IDEIntegerBeanProxy(fProxyFactoryRegistry,anInteger,this);
-	}
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	return (IIDEBeanProxy)createIntegerBeanProxy((Integer)anObject);
-
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerTypeBeanTypeProxy.java
deleted file mode 100644
index 22f81f1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,69 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEIntegerTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.IIntegerBeanProxy;
-
-/**
- * IDE Implementation of IIntegerBeanTypeProxy
- */
-final class IDEIntegerTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
-	private final IDEIntegerBeanProxy zeroProxy;
-	private final IDEIntegerBeanProxy oneProxy;
-	private final IDEIntegerBeanProxy twoProxy;
-	private final IDEIntegerBeanProxy threeProxy;
-IDEIntegerTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-	// Create the cached values
-	zeroProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(0), this );
-	oneProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(1), this );
-	twoProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(2), this );
-	threeProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(3), this );
-		
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IIntegerBeanProxy createIntegerBeanProxy(int anInt) {
-	switch(anInt){
-		case 0: return zeroProxy ;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new IDEIntegerBeanProxy(fProxyFactoryRegistry,new Integer(anInt),this);
-	}
-}
-/* Specialized from IDEBeanTypeProxy to ensure IIntegerBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-	Number n = anObject instanceof Character ? new Integer(((Character) anObject).charValue()) : (Number) anObject;
-	switch(n.intValue()){
-		case 0: return zeroProxy ;
-		case 1: return oneProxy ;
-		case 2: return twoProxy ;
-		case 3: return threeProxy ;
-		default: return new IDEIntegerBeanProxy(fProxyFactoryRegistry, n, this);
-	}
-	
-	
-}
-int getPrimitiveType(){
-	return INTEGER;
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongClassBeanTypeProxy.java
deleted file mode 100644
index b3aea93..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongClassBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDELongClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Long BeanType Proxy.
- */
-final class IDELongClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-		
-protected IDELongClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass, new Long(0));
-}
-INumberBeanProxy createLongBeanProxy(Long aLong){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,aLong,this);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongTypeBeanTypeProxy.java
deleted file mode 100644
index eb86b3a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongTypeBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDELongTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Long BeanType Proxy.
- */
-final class IDELongTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-	
-protected IDELongTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-}
-INumberBeanProxy createLongBeanProxy(long aLong){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,new Long(aLong),this);
-}
-int getPrimitiveType(){
-	return LONG;
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-	Number n = anObject instanceof Character ? new Long(((Character) anObject).charValue()) : (Number) anObject;
-	return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java
deleted file mode 100644
index 9ce7b1f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java
+++ /dev/null
@@ -1,191 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEMethodProxy.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEMethodProxy extends IDEAccessibleObjectProxy implements IMethodProxy {
-
-	protected IDEMethodProxy(IDEProxyFactoryRegistry aRegistry, Method aMethod) {
-		super(aRegistry, aMethod);
-	}
-
-	public IBeanTypeProxy getClassType() {
-		return ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
-			((Method) getBean()).getDeclaringClass());
-	}
-	public IBeanTypeProxy getReturnType() {
-		return ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
-			((Method) getBean()).getReturnType());
-	}
-	public IBeanTypeProxy[] getParameterTypes() {
-		Class[] parmClasses = ((Method) getBean()).getParameterTypes();
-		IBeanTypeProxy[] parmTypes = new IBeanTypeProxy[parmClasses.length];
-		IDEStandardBeanTypeProxyFactory factory = (IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory();
-		for (int i = 0; i < parmClasses.length; i++) {
-			parmTypes[i] = factory.getBeanTypeProxy(parmClasses[i]);
-		}
-		return parmTypes;
-	}
-	public String getName() {
-		return ((Method) getBean()).getName();
-	}
-
-	/**
-	 * The type proxy is constant proxy out of the method factory.
-	 */
-	public IBeanTypeProxy getTypeProxy() {
-		return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).methodType;
-	}
-
-	/**
-	 * Invoke the method directly.  Because we are an IDEMethodProxy we can assume that IBeanProxy
-	 * is an IDEBeanProxy and we can get its bean directly
-	 */
-	public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
-		try {
-			Object result = ((Method) getBean()).invoke(subject != null ? ((IIDEBeanProxy) subject).getBean() : null, new Object[0]);
-			if (result == null) {
-				return null;
-			} else {
-				// The result may be a java.lang.Integer when we really want to create an int
-				// Reflection always give you the big object
-				Class returnType = ((Method) getBean()).getReturnType();
-				return getBeanProxy(returnType, result);
-			}
-		} catch (InvocationTargetException e) {
-			// This is a wrappered exception. Return the wrappered one so it looks like
-			// it was the real one.
-			IBeanTypeProxy exceptionTypeProxy =
-				((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
-					e.getTargetException().getClass());
-			throw new IDEThrowableProxy(e.getTargetException(), exceptionTypeProxy);
-		} catch (Exception exc) {
-			IBeanTypeProxy exceptionTypeProxy =
-				((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(exc.getClass());
-			throw new IDEThrowableProxy(exc, exceptionTypeProxy);
-		}
-	}
-	/**
-	 * Do not throw an exception
-	 */
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
-		try {
-			return invoke(subject);
-		} catch (ThrowableProxy exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-		}
-		return null;
-	}
-	/**
-	 * Invoke the method with argument.  The argument will be an IDEBeanProxy 
-	 * ( because we are an IDEMethodProxy ) so we can cast to it and get the actual bean
-	 * itself and use this to invoke against method which is the actual
-	 * java.lang.Reflect instance
-	 */
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy argument) throws ThrowableProxy {
-		try {
-			Object result =
-				((Method) getBean()).invoke(
-					subject != null ? ((IIDEBeanProxy) subject).getBean() : null,
-					new Object[] { argument != null ? ((IIDEBeanProxy) argument).getBean() : null });
-			if (result == null) {
-				return null;
-			} else {
-				Class returnType = ((Method) getBean()).getReturnType();
-				return getBeanProxy(returnType, result);
-			}
-		} catch (InvocationTargetException e) {
-			// This is a wrappered exception. Return the wrappered one so it looks like
-			// it was the real one.
-			IBeanTypeProxy exceptionTypeProxy =
-				((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
-					e.getTargetException().getClass());
-			throw new IDEThrowableProxy(e.getTargetException(), exceptionTypeProxy);
-		} catch (Exception exc) {
-			IBeanTypeProxy exceptionTypeProxy =
-				((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(exc.getClass());
-			throw new IDEThrowableProxy(exc, exceptionTypeProxy);
-		}
-	}
-	/**
-	 * Invoke without throwing an exception
-	 */
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy argument) {
-		try {
-			return invoke(subject, argument);
-		} catch (ThrowableProxy exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-		}
-		return null;
-	}
-	/**
-	 * Invoke the method with arguments.  The arguments will be IDEBeanProxy objects
-	 * ( because we are an IDEMethodProxy ) so we can cast to them and get the actual bean
-	 * objects themselves and use these to invoke against method which is the actual
-	 * java.lang.Reflect instance
-	 */
-	public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] arguments) throws ThrowableProxy {
-		Object[] beanArguments = new Object[arguments.length];
-		for (int i = 0; i < arguments.length; i++) {
-			if (arguments[i] != null) {
-				beanArguments[i] = ((IIDEBeanProxy) arguments[i]).getBean();
-			}
-		}
-		try {
-			Object result = ((Method) getBean()).invoke(subject != null ? ((IIDEBeanProxy) subject).getBean() : null, beanArguments);
-			if (result == null) {
-				return null;
-			} else {
-				Class returnType = ((Method) getBean()).getReturnType();
-				return getBeanProxy(returnType, result);
-			}
-		} catch (InvocationTargetException e) {
-			// This is a wrappered exception. Return the wrappered one so it looks like
-			// it was the real one.
-			IBeanTypeProxy exceptionTypeProxy =
-				((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
-					e.getTargetException().getClass());
-			throw new IDEThrowableProxy(e.getTargetException(), exceptionTypeProxy);
-		} catch (Exception exc) {
-			IBeanTypeProxy exceptionTypeProxy =
-				((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(exc.getClass());
-			throw new IDEThrowableProxy(exc, exceptionTypeProxy);
-		}
-	}
-	/**
-	 * Invoke without throwing an exception
-	 */
-	public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] arguments) {
-		try {
-			return invoke(subject, arguments);
-		} catch (ThrowableProxy exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-		}
-		return null;
-	}
-	IBeanProxy getBeanProxy(Class returnType, Object bean) {
-		return fProxyFactoryRegistry.getBeanProxy(returnType, bean);
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java
deleted file mode 100644
index 0ada52c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java
+++ /dev/null
@@ -1,337 +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
- *******************************************************************************/
-/*
- * $RCSfile: IDEMethodProxyFactory.java,v $ $Revision: 1.10 $ $Date: 2005/05/11 19:01:12 $
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import java.lang.reflect.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEMethodProxyFactory implements IMethodProxyFactory {
-
-	final protected IDEProxyFactoryRegistry fProxyFactoryRegistry;
-
-	final protected static Map primLookup = new HashMap();
-
-	IDEBeanTypeProxy accessibleType, fieldType, methodType, constructorType;
-	// Cached copy of a few typical method type proxies.
-	static {
-		primLookup.put("int", Integer.TYPE); //$NON-NLS-1$
-		primLookup.put("char", Character.TYPE); //$NON-NLS-1$
-		primLookup.put("long", Long.TYPE); //$NON-NLS-1$
-		primLookup.put("short", Short.TYPE); //$NON-NLS-1$
-		primLookup.put("double", Double.TYPE); //$NON-NLS-1$
-		primLookup.put("boolean", Boolean.TYPE); //$NON-NLS-1$
-		primLookup.put("byte", Byte.TYPE); //$NON-NLS-1$
-		primLookup.put("float", Float.TYPE); //$NON-NLS-1$
-	}
-
-	IDEMethodProxyFactory(IDEProxyFactoryRegistry aRegistry) {
-		fProxyFactoryRegistry = aRegistry;
-		fProxyFactoryRegistry.registerMethodProxyFactory(this);
-		accessibleType = new IDEBeanTypeProxy(aRegistry, AccessibleObject.class);
-		fieldType = new IDEFieldTypeProxy(aRegistry);
-		methodType = new IDEMethodTypeProxy(aRegistry);
-		constructorType = new IDEConstructorTypeProxy(aRegistry);
-		fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(accessibleType, true);
-		fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(fieldType, true);
-		fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(methodType, true);
-		fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(constructorType, true);
-	}
-
-	/**
-	 * Return an instance of an IDEConstructorProxy This is package protected because the only people who can use this are priveledge objects that
-	 * have the aMethod instance. These are part of the idevm package only. If you have to make this method public you are doing things incorrectly.
-	 * To get a method proxy you must use the interface methods on IMethodProxyFactory to do lookup by string or else on IBeanTypeProxy that has
-	 * getMethod(String) as well
-	 */
-	IConstructorProxy getConstructorProxy(Constructor aConstructor) {
-
-		return (IConstructorProxy) constructorType.newBeanProxy(aConstructor);
-
-	}
-	
-	IConstructorProxy[] getConstructors(Class aClass) {
-		Constructor[] ctors = aClass.getConstructors();
-		IConstructorProxy[] ctorProxies = new IConstructorProxy[ctors.length];
-		for (int i = 0; i < ctors.length; i++) {
-			ctorProxies[i] = getConstructorProxy(ctors[i]);
-		}
-		return ctorProxies;
-	}
-
-	IConstructorProxy[] getDeclaredConstructors(Class aClass) {
-		Constructor[] ctors = aClass.getDeclaredConstructors();
-		IConstructorProxy[] ctorProxies = new IConstructorProxy[ctors.length];
-		for (int i = 0; i < ctors.length; i++) {
-			ctorProxies[i] = getConstructorProxy(ctors[i]);
-		}
-		return ctorProxies;
-	}
-
-	IConstructorProxy getConstructorProxy(Class aClass, Class[] args) {
-
-		try {
-			Constructor ctor = aClass.getConstructor(args);
-			return getConstructorProxy(ctor);
-		} catch (NoSuchMethodException exc) {
-			return null;
-		}
-	}
-
-	IConstructorProxy getDeclaredConstructorProxy(Class aClass, Class[] args) {
-
-		try {
-			Constructor ctor = aClass.getDeclaredConstructor(args);
-			return getConstructorProxy(ctor);
-		} catch (NoSuchMethodException exc) {
-			return null;
-		}
-	}
-
-	IFieldProxy[] getFields(Class aClass) {
-		Field[] fields = aClass.getFields();
-		IFieldProxy[] fieldProxies = new IFieldProxy[fields.length];
-		for (int i = 0; i < fields.length; i++) {
-			fieldProxies[i] = getFieldProxy(fields[i]);
-		}
-		return fieldProxies;
-	}
-
-	IFieldProxy[] getDeclaredFields(Class aClass) {
-		Field[] fields = aClass.getDeclaredFields();
-		IFieldProxy[] fieldProxies = new IFieldProxy[fields.length];
-		for (int i = 0; i < fields.length; i++) {
-			fieldProxies[i] = getFieldProxy(fields[i]);
-		}
-		return fieldProxies;
-	}
-
-	/**
-	 * Return an instance of an IDEFieldProxy This is package protected because the only people who can use this are priveledge objects that have the
-	 * aField instance. These are part of the idevm package only. If you have to make this method public you are doing things incorrectly. To get a
-	 * field proxy you must use the interface methods on IBeanTypeProxy that has getField(String) as well
-	 */
-	IFieldProxy getFieldProxy(Field aField) {
-
-		return (IFieldProxy) fieldType.newBeanProxy(aField);
-
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String)
-	 */
-	public IProxyField getFieldProxy(IExpression expression, String className, String fieldName) {
-		// We are getting the class resolved through the expression. Might as well because it probably will
-		// be needed again and this way when the expression is finished they will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
-		return beanType.getFieldProxy(expression, fieldName);
-	}
-
-	/**
-	 * Return an instance of an IDEMethodProxy This is package protected because the only people who can use this are priveledge objects that have the
-	 * aMethod instance. These are part of the idevm package only. If you have to make this method public you are doing things incorrectly. To get a
-	 * method proxy you must use the interface methods on IMethodProxyFactory to do lookup by string or else on IBeanTypeProxy that has
-	 * getMethod(String) as well
-	 */
-	IDEMethodProxy getMethodProxy(Method aMethod) {
-
-		return (IDEMethodProxy) methodType.newBeanProxy(aMethod);
-
-	}
-
-	public IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes) {
-		try {
-			Class aClass = fProxyFactoryRegistry.loadClass(className);
-			return getMethodProxy(aClass, methodName, parameterTypes);
-		} catch (ClassNotFoundException exc) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-			return null;
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes) {
-		// We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
-		// be needed again and this way when the expression is finished they will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
-		IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
-		return beanType.getMethodProxy(expression, methodName, parmTypes);
-	}	
-	
-	/**
-	 * Helper method for Beantypes and Proxy bean types to get the proxy.
-	 * @param expression
-	 * @param classType
-	 * @param methodName
-	 * @param parameterTypes
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType classType, String methodName, String[] parameterTypes) {
-		// We are getting the parmtypes resolved through the expression. Might as well because they probably will
-		// be needed again and this way when the expression is finished they will be resolved for later usage.
-		IStandardBeanTypeProxyFactory beanTypeProxyFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
-		IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
-		return classType.getMethodProxy(expression, methodName, parmTypes);
-	}
-
-	/**
-	 * @param expression
-	 * @param parameterTypes
-	 * @param beanTypeProxyFactory
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected IProxyBeanType[] getParameterTypes(IExpression expression, String[] parameterTypes, IStandardBeanTypeProxyFactory beanTypeProxyFactory) {
-		IProxyBeanType[] parmTypes;
-		if (parameterTypes == null || parameterTypes.length == 0)
-			parmTypes = null;
-		else {
-			parmTypes = new IProxyBeanType[parameterTypes.length];
-			for (int i = 0; i < parameterTypes.length; i++) {
-				parmTypes[i] = beanTypeProxyFactory.getBeanTypeProxy(expression, parameterTypes[i]);
-			}
-		}
-		return parmTypes;
-	}
-
-	public IMethodProxy getMethodProxy(Class cls, String methodName, String[] parameterTypes) {
-		try {
-			Class[] parmClasses = null;
-			if (parameterTypes != null) {
-				parmClasses = new Class[parameterTypes.length];
-				for (int i = 0; i < parmClasses.length; i++) {
-					Class temp = (Class) primLookup.get(parameterTypes[i]);
-					if (temp == null)
-						temp = fProxyFactoryRegistry.loadClass(parameterTypes[i]);
-					parmClasses[i] = temp;
-				}
-			}
-			return getMethodProxy(cls.getMethod(methodName, parmClasses));
-		} catch (ClassNotFoundException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		} catch (NoSuchMethodException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		}
-		return null;
-	}
-	
-	IMethodProxy getDeclaredMethodProxy(Class cls, String methodName, String[] parameterTypes) {
-		try {
-			Class[] parmClasses = null;
-			if (parameterTypes != null) {
-				parmClasses = new Class[parameterTypes.length];
-				for (int i = 0; i < parmClasses.length; i++) {
-					Class temp = (Class) primLookup.get(parameterTypes[i]);
-					if (temp == null)
-						temp = fProxyFactoryRegistry.loadClass(parameterTypes[i]);
-					parmClasses[i] = temp;
-				}
-			}
-			return getMethodProxy(cls.getDeclaredMethod(methodName, parmClasses));
-		} catch (ClassNotFoundException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		} catch (NoSuchMethodException e) {
-			ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-		}
-		return null;
-	}	
-
-	IDEMethodProxy getMethodProxy(Class aClass, String methodName, Class[] args) {
-		try {
-			Method method = aClass.getMethod(methodName, args);
-			return getMethodProxy(method);
-		} catch (NoSuchMethodException exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName()
-							+ ":" + methodName + " args=" + args, exc));
-			return null;
-		}
-	}
-	
-	IMethodProxy getDeclaredMethodProxy(Class aClass, String methodName, Class[] args) {
-		try {
-			Method method = aClass.getDeclaredMethod(methodName, args);
-			return getMethodProxy(method);
-		} catch (NoSuchMethodException exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName()
-							+ ":" + methodName + " args=" + args, exc));
-			return null;
-		}
-	}	
-
-	IMethodProxy getMethodProxy(IDEBeanTypeProxy aTypeProxy, String methodName, String[] parameterTypes) {
-		return getMethodProxy(aTypeProxy.fClass, methodName, parameterTypes);
-	}
-	
-	IMethodProxy[] getMethods(Class aClass) {
-		Method[] methods = aClass.getMethods();
-		IMethodProxy[] methodProxies = new IMethodProxy[methods.length];
-		for (int i = 0; i < methods.length; i++) {
-			methodProxies[i] = getMethodProxy(methods[i]);
-		}
-		return methodProxies;
-	}
-	
-	IMethodProxy getCompatibleMethod(Class aClass, String methodName, Class[] parmTypes) throws NoSuchMethodException, AmbiguousMethodException {
-		Method method = MethodHelper.findCompatibleMethod(aClass, methodName, parmTypes);
-		return getMethodProxy(method);
-	}
-	
-	IConstructorProxy getCompatibleConstructor(Class aClass, Class[] parmTypes) throws AmbiguousMethodException, NoSuchMethodException {
-		Constructor method = MethodHelper.findCompatibleConstructor(aClass, parmTypes);
-		return getConstructorProxy(method);
-	}
-	
-
-	IMethodProxy[] getDeclaredMethods(Class aClass) {
-		Method[] methods = aClass.getDeclaredMethods();
-		IMethodProxy[] methodProxies = new IMethodProxy[methods.length];
-		for (int i = 0; i < methods.length; i++) {
-			methodProxies[i] = getMethodProxy(methods[i]);
-		}
-		return methodProxies;
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getInvokable(java.lang.String, java.lang.String, java.lang.String[])
-	 */
-	public IInvokable getInvokable(String className, String methodName, String[] parameterTypes) {
-		return getMethodProxy(className, methodName, parameterTypes);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodTypeProxy.java
deleted file mode 100644
index bf651ed..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEMethodTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-
-/**
- * @version 	1.0
- * @author
- */
-public class IDEMethodTypeProxy extends IDEBeanTypeProxy {
-	
-	IDEMethodTypeProxy(IDEProxyFactoryRegistry registry) {
-		super(registry, java.lang.reflect.Method.class);
-	}
-
-	/*
-	 * @see IDEBeanTypeProxy#newBeanProxy(Object)
-	 */
-	protected IIDEBeanProxy newBeanProxy(Object anObject) {
-		return new IDEMethodProxy(fProxyFactoryRegistry, (java.lang.reflect.Method) anObject);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanProxy.java
deleted file mode 100644
index 1248925..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanProxy.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
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDENumberBeanProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 22:41:24 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of INumberBeanProxy for any Number (i.e. the non-primitives)
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-public class IDENumberBeanProxy extends IDEBeanProxy implements INumberBeanProxy {
-	private final Number fNumberValue;
-	protected IBeanTypeProxy fBeanTypeProxy;
-	
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-IDENumberBeanProxy(IDEProxyFactoryRegistry aRegistry, Number aNumber , IBeanTypeProxy aBeanTypeProxy) {
-	super(aRegistry,aNumber);
-	fNumberValue = aNumber;
-	fBeanTypeProxy = aBeanTypeProxy;
-}
-/**
- * equals: Equal if:
- *         1) This proxy == (identity) to the other object
- *         2) Else if other is an IBeanProxy and not a constant one, then if
- *            equals on the server.
- *         3) If this is a constant proxy and the other is too or is a constant
- *            value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
-	if (this == anObject)
-		return true;	// Identity
-	if (anObject instanceof IDENumberBeanProxy)
-		return fNumberValue.equals(((IDENumberBeanProxy) anObject).numberValue());
-	if (anObject instanceof Number)
-		return fNumberValue.equals(anObject);
-	return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
-	return fNumberValue.byteValue();
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
-	return fNumberValue.doubleValue();
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
-	return fNumberValue.floatValue();
-}
-/**
- * Return the int value
- */
-public int intValue() {
-	return fNumberValue.intValue();
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
-	return fNumberValue.longValue();
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
-	return fNumberValue;
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
-	return fNumberValue.shortValue();
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
-	return fNumberValue.toString();
-}
-public IBeanTypeProxy getTypeProxy(){
-	return fBeanTypeProxy;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanTypeProxy.java
deleted file mode 100644
index 0bb36f6..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanTypeProxy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDENumberBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Number BeanType Proxy.
- */
-public abstract class IDENumberBeanTypeProxy extends IDEBeanTypeProxy {
-	protected final IDENumberBeanProxy zeroProxy;
-/**
- * IDENumberBeanTypeProxy constructor comment.
- * @param aRegistry com.ibm.etools.vce.proxy.ProxyFactoryRegistry
- * @param aClass java.lang.Class
- */
-protected IDENumberBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass, Number zeroNumber) {
-	super(aRegistry, aClass);
-	// Cache a zero proxy of this type (though the number will be Long).
-	zeroProxy = new IDENumberBeanProxy(aRegistry, zeroNumber , this);
-}
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createNumberBeanProxy(Number aNumber) {
-	if (aNumber == null || zeroProxy.fBean.equals(aNumber))
-		return zeroProxy;
-	return new IDENumberBeanProxy(fProxyFactoryRegistry, aNumber, this);
-}
-/**
- * Specialized from IDEBeanTypeProxy to ensure INumberBeanProxies are created correctly.
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	return (IIDEBeanProxy)createNumberBeanProxy((Number) anObject);
-
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEObjectBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEObjectBeanProxy.java
deleted file mode 100644
index 6f578e1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEObjectBeanProxy.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEObjectBeanProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEObjectBeanProxy extends IDEBeanProxy {
-
-	protected IBeanTypeProxy fBeanTypeProxy; // Cache the type proxy for speed
-	
-protected IDEObjectBeanProxy(IDEProxyFactoryRegistry aRegistry){
-	super(aRegistry);
-}
-/**
- * Constructor that lets the bean type be set on creation.
- * This saves the overhead of it being looked up the first time it is asked for.
- *
- * This is protected because the only person
- * who should use it is the IDEBeanTypeProxy or a subclass.  Making it package protected stops people from
- * writing bogus code and doing casts and slamming new beans in without going through the proper API
- * that is based around any kind of VM artifact being proxied to support target VMs and pluggable JDK
- * levels 
- */
-protected IDEObjectBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy){
-	
-	this(aRegistry, aBean);
-	fBeanTypeProxy = aBeanTypeProxy;
-	
-}
-/**
- * Set the bean we are proxying.  We are a proxy for a bean running on the same IDE
- * so we hold the bean directly and can return it. 
- */
-protected IDEObjectBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean){
-	this(aRegistry);
-	
-	fBean = aBean;
-	
-}
-/**
- * The type proxy is got from our class name
- * If we have the type return it, otherwise go the factory for it
- * Don't new it up because the factory must be responsible for creating type proxies as it
- * has to perform instance management on them
- */
-public IBeanTypeProxy getTypeProxy() {
-
-	if ( fBeanTypeProxy == null ) {	
-		fBeanTypeProxy = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy( fBean.getClass().getName() );
-	}
-	return fBeanTypeProxy;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEPrimitiveBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEPrimitiveBeanTypeProxy.java
deleted file mode 100644
index 566ccc5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEPrimitiveBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEPrimitiveBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-
-public abstract class IDEPrimitiveBeanTypeProxy extends IDEBeanTypeProxy {
-	
-	static final int BOOLEAN = 1;
-	static final int BYTE = 2;
-	static final int CHAR = 3;
-	static final int DOUBLE = 4;
-	static final int FLOAT = 5;
-	static final int INTEGER = 6;
-	static final int LONG = 7;
-	static final int SHORT = 8;
-	
-public IDEPrimitiveBeanTypeProxy(IDEProxyFactoryRegistry aRegistry,Class aClass){
-	super(aRegistry,aClass);
-}
-public boolean isPrimitive() {
-	return true;
-}
-abstract int getPrimitiveType();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java
deleted file mode 100644
index 4308b1f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java
+++ /dev/null
@@ -1,170 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEProxyFactoryRegistry.java,v $
- *  $Revision: 1.9 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This implementation runs the Beans inside the Eclipse IDE
- * It should only be used by plugins that can guarantee their their beans do
- * not change during the lifetime of the IDE and can run at the same JDK level
- * that the Eclipse IDE is running
- */
-
-public class IDEProxyFactoryRegistry extends org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry {
-
-	protected String fName;
-	protected ClassLoader fClassLoader;
-	protected IDECallbackRegistry fCallbackRegistry;
-	
-	/*
-	 * Special classloader that firsts tries to load from bundle then tries from url paths so
-	 * that bundle is treated as being at the head of the url paths.
-	 * 
-	 * @since 1.0.0
-	 */
-	private static class IDESpecialClassLoader extends URLClassLoader {
-		
-		private Bundle bundle;
-		// This is the bundle that contains the IDE Eclipse code.
-		// This must be checked first because there are IDE specific stuff that is used on the "remote vm" too and
-		// so must be common.
-		private Bundle ideBundle;	 
-
-		public IDESpecialClassLoader(URL[] urls, Bundle bundle) {
-			super(urls, null);
-			ideBundle = ProxyPlugin.getPlugin().getBundle();
-			this.bundle = bundle;
-		}
-		
-		public IDESpecialClassLoader(URL[] urls) {
-			this(urls, null);
-		}
-		
-		/* (non-Javadoc)
-		 * @see java.lang.ClassLoader#findClass(java.lang.String)
-		 */
-		protected Class findClass(String name) throws ClassNotFoundException {
-			try {
-				return ideBundle.loadClass(name);
-			} catch (ClassNotFoundException e) {
-				if (bundle != null) {
-					try {
-						return bundle.loadClass(name);
-					} catch (ClassNotFoundException e1) {
-					}
-				}
-				return super.findClass(name);
-			}
-		}
-		
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.lang.ClassLoader#findResource(java.lang.String)
-		 */
-		public URL findResource(String name) {
-			URL r = ideBundle.getResource(name);
-			if (r == null && bundle != null)
-				r = bundle.getResource(name);
-			return r != null ? r : super.findResource(name);
-		}
-}
-
-/**
- * Create a special loader that has the plugin classloader of the passed in plugin
- * as the parent loader, plus all of the urls, plus the remotevm.jar file that is
- * needed by IDE Proxy to work.
- */	
-public static ClassLoader createSpecialLoader(String pluginName, URL[] otherURLs) {
-	Bundle bundle = pluginName != null ? Platform.getBundle(pluginName) : null;
-	
-	URL[] mustHaveUrls = ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(ProxyPlugin.getPlugin().getBundle(), "vm/remotevm.jar"); //$NON-NLS-1$
-	
-	URL[] urls = null;
-	if (otherURLs != null) {
-		urls = new URL[otherURLs.length+mustHaveUrls.length];
-		System.arraycopy(mustHaveUrls, 0, urls, 0, mustHaveUrls.length);
-		System.arraycopy(otherURLs, 0, urls, mustHaveUrls.length, otherURLs.length);
-	} else 
-		urls = mustHaveUrls;
-		
-	return bundle != null ? new IDESpecialClassLoader(urls, bundle) : new IDESpecialClassLoader(urls);
-}
-
-public IDEProxyFactoryRegistry(String aName, ClassLoader loader) {
-	fName = aName;
-	fClassLoader = loader;
-}
-
-ClassLoader getPluginClassLoader(){
-	return fClassLoader;
-}
-
-protected void registryTerminated(boolean wait){	
-}
-
-Class loadClass(String aClassName) throws ClassNotFoundException, ExceptionInInitializerError, LinkageError {
-	return fClassLoader.loadClass(aClassName);
-}
-
-public ICallbackRegistry getCallbackRegistry(){
-	if ( fCallbackRegistry == null ){
-		fCallbackRegistry = new IDECallbackRegistry(this);
-	}
-	return fCallbackRegistry;
-}
-
-
-/**
- * Get a bean proxy from the bean of the correct type.
- * 
- * @param returnType
- * @param bean
- * @return
- * 
- * @since 1.0.0
- */
-IBeanProxy getBeanProxy(Class returnType, Object bean) {
-	IDEStandardBeanTypeProxyFactory proxyFactory = (IDEStandardBeanTypeProxyFactory) this.getBeanTypeProxyFactory();
-	if (!returnType.isPrimitive()) {
-		return IDEStandardBeanProxyFactory.createBeanProxy(this, bean);
-	} else if (returnType == Integer.TYPE) {
-		return proxyFactory.intType.newBeanProxy(bean);
-	} else if (returnType == Boolean.TYPE) {
-		return proxyFactory.booleanType.newBeanProxy(bean);
-	} else if (returnType == Float.TYPE) {
-		return proxyFactory.floatType.newBeanProxy(bean);
-	} else if (returnType == Long.TYPE) {
-		return proxyFactory.longType.newBeanProxy(bean);
-	} else if (returnType == Short.TYPE) {
-		return proxyFactory.shortType.newBeanProxy(bean);
-	} else if (returnType == Double.TYPE) {
-		return proxyFactory.doubleType.newBeanProxy(bean);
-	} else if (returnType == Byte.TYPE) {
-		return proxyFactory.byteType.newBeanProxy(bean);
-	} else if (returnType == Character.TYPE) {
-		return proxyFactory.charType.newBeanProxy(bean);
-	} else {
-		throw new RuntimeException("Unknown primitive type " + returnType.getName()); //$NON-NLS-1$
-	}
-}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java
deleted file mode 100644
index 20053e9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java
+++ /dev/null
@@ -1,160 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDERegistration.java,v $
- *  $Revision: 1.9 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.ide.awt.IDERegisterAWT;
-import org.eclipse.jem.internal.proxy.remote.LocalFileConfigurationContributorController;
-/**
- * This is the registration class for starting an IDERemote VM.
- */
-
-public class IDERegistration {
-	
-	public static ProxyFactoryRegistry startAnImplementation(
-		IConfigurationContributor[] contributors,
-		boolean attachAWT,
-		IProject project,
-		String vmName,
-		String pluginName,
-		IProgressMonitor pm) throws CoreException {
-			IDERegistration idereg = new IDERegistration(pluginName);
-			return idereg.startImplementation(contributors, attachAWT, project, vmName, pm); 
-		}
-	
-	public IDERegistration() {
-	}
-	
-	private IDERegistration(String pluginName) {
-		this.pluginName = pluginName;
-	}
-	private String pluginName;	
-
-	/**
-	 * This will create a remote VM and return an initialized REMProxyFactoryRegistry.
-	 * Passed in are:
-	 *      project: The project this is being started on. Must not be null and must be a JavaProject. (Currently ignored for IDE).
-	 *      attachAWT: Should AWT be attached to this implementation.
-	 *      contributors: Contributors to the configuration. Can be null.
-	 *      pm: ProgressMonitor to use. Must not be null.
-	 *      vmName: Name for the vm. Can be null.
-	 */
-	public ProxyFactoryRegistry startImplementation(
-		IConfigurationContributor[] contributors,
-		boolean attachAWT,
-		IProject project,
-		String vmName,
-		IProgressMonitor pm)
-		throws CoreException {
-
-		URL[] classPaths = null;
-		IJavaProject javaProject = null;
-		if (project != null) {
-			javaProject = JavaCore.create(project);
-			// Add in the paths for the project	 	
-			classPaths = ProxyLaunchSupport.convertStringPathsToURL(JavaRuntime.computeDefaultRuntimeClassPath(javaProject));
-		} else
-			classPaths = new URL[0];
-
-		final IJavaProject jp = javaProject;
-
-		// Add in any classpaths the contributors want to add.
-		if (contributors != null) {
-			final ProxyLaunchSupport.LaunchInfo launchInfo = new ProxyLaunchSupport.LaunchInfo();
-			contributors = ProxyLaunchSupport.fillInLaunchInfo(contributors, launchInfo, jp != null ? jp.getElementName() : null);
-			final LocalFileConfigurationContributorController controller = new LocalFileConfigurationContributorController(classPaths, new URL[3][], launchInfo);
-			final IConfigurationContributor[] contribs = contributors;
-			for (int i = 0; i < contributors.length; i++) {
-				final int ii = i;
-				// Run in safe mode so that anything happens we don't go away.
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contribs[ii].initialize(launchInfo.getConfigInfo());
-					}
-				});				
-			}			
-			for (int i = 0; i < contributors.length; i++) {
-				final int ii = i;
-				// Run in safe mode so that anything happens we don't go away.
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contribs[ii].contributeClasspaths(controller);
-					}
-				});				
-			}
-			classPaths = controller.getFinalClasspath();
-		}
-
-		final ProxyFactoryRegistry registry = createIDEProxyFactoryRegistry(vmName, pluginName, classPaths);
-		// Contribute to the registry from contributors.
-		if (contributors != null) {
-			final IConfigurationContributor[] contribs = contributors;
-			for (int i = 0; i < contributors.length; i++) {
-				final int ii = i;
-				// Run in safe mode so that anything happens we don't go away.
-				Platform.run(new ISafeRunnable() {
-					public void handleException(Throwable exception) {
-						// Don't need to do anything. Platform.run logs it for me.
-					}
-
-					public void run() throws Exception {
-						contribs[ii].contributeToRegistry(registry);
-					}
-				});	
-			}
-		}
-
-		return registry;
-	}
-
-	public static ProxyFactoryRegistry createIDEProxyFactoryRegistry(String aName, String aPluginName, URL[] otherURLs) {
-		// Create the registry.
-		IDEProxyFactoryRegistry registry =
-			new IDEProxyFactoryRegistry(aName, IDEProxyFactoryRegistry.createSpecialLoader(aPluginName, otherURLs));
-		initRegistry(registry);
-		return registry;
-	}
-
-	public static ProxyFactoryRegistry createIDEProxyFactoryRegistry(String aName, ClassLoader loader) {
-		// Create the registry.
-		IDEProxyFactoryRegistry registry = new IDEProxyFactoryRegistry(aName, loader);
-		initRegistry(registry);
-		return registry;
-	}
-
-	private static void initRegistry(IDEProxyFactoryRegistry registry) {
-		new IDEStandardBeanTypeProxyFactory(registry);
-		new IDEStandardBeanProxyFactory(registry);
-		new IDEMethodProxyFactory(registry);
-		// Always support AWT for now
-		IDERegisterAWT.registerAWT(registry);
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortClassBeanTypeProxy.java
deleted file mode 100644
index e483d1c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortClassBeanTypeProxy.java
+++ /dev/null
@@ -1,28 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEShortClassBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Short BeanType Proxy.
- */
-final class IDEShortClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-protected IDEShortClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass, new Short((short)0));
-}
-INumberBeanProxy createShortBeanProxy(Short aShort){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,aShort,this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortTypeBeanTypeProxy.java
deleted file mode 100644
index 9d33a8e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortTypeBeanTypeProxy.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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEShortTypeBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Short BeanType Proxy.
- */
-final class IDEShortTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEShortTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-}
-INumberBeanProxy createShortBeanProxy(short aShort){
-	return new IDENumberBeanProxy(fProxyFactoryRegistry,new Short(aShort),this);
-}
-int getPrimitiveType(){
-	return SHORT;
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-	Number n = anObject instanceof Character ? new Short((short) ((Character) anObject).charValue()) : (Number) anObject;
-	return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java
deleted file mode 100644
index 981c3f2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java
+++ /dev/null
@@ -1,255 +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.jem.internal.proxy.ide;
-/*
- * $RCSfile: IDEStandardBeanProxyFactory.java,v $ $Revision: 1.8 $ $Date: 2005/02/15 22:57:26 $
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringParser;
-
-public class IDEStandardBeanProxyFactory implements IStandardBeanProxyFactory {
-
-
-	protected IDEProxyFactoryRegistry fRegistry;
-	protected IDEStandardBeanTypeProxyFactory fBeanTypeProxyFactory;
-	
-	/*
-	 * Return a bean proxy for the argument. To do this create through the correct BeanTypeProxy
-	 * Which ensures that special subclasses of IDEBeanProxy are created. This is just a local
-	 * helper method.
-	 */
-	static IIDEBeanProxy createBeanProxy(ProxyFactoryRegistry aRegistry, Object anObject) {
-
-		return ((IDEStandardBeanProxyFactory) aRegistry.getBeanProxyFactory()).createIDEBeanProxyWith(anObject);
-	}
-	
-	IDEStandardBeanProxyFactory(IDEProxyFactoryRegistry aRegistry) {
-		fRegistry = aRegistry;
-		fRegistry.registerBeanProxyFactory(this);
-		fBeanTypeProxyFactory = (IDEStandardBeanTypeProxyFactory) aRegistry.getBeanTypeProxyFactory();
-	}
-	
-	public IStringBeanProxy createBeanProxyWith(String aString) {
-		return fBeanTypeProxyFactory.stringClass.createStringBeanProxy(aString);
-	}
-	
-	public INumberBeanProxy createBeanProxyWith(float aFloat) {
-		return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(aFloat);
-	}
-	
-	public INumberBeanProxy createBeanProxyWith(short aShort) {
-		return fBeanTypeProxyFactory.shortType.createShortBeanProxy(aShort);
-	}
-	
-	public ICharacterBeanProxy createBeanProxyWith(char aChar) {
-		return fBeanTypeProxyFactory.charType.createCharBeanProxy(aChar);
-	}
-	
-	public ICharacterBeanProxy createBeanProxyWith(Character aCharacter) {
-		return fBeanTypeProxyFactory.charClass.createCharacterBeanProxy(aCharacter);
-	}
-	
-	public IIntegerBeanProxy createBeanProxyWith(int anInt) {
-		return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(anInt);
-	}
-	
-	public IIntegerBeanProxy createBeanProxyWith(Integer anInteger) {
-		return fBeanTypeProxyFactory.integerClass.createIntegerBeanProxy(anInteger);
-	}
-	
-	public INumberBeanProxy createBeanProxyWith(long aLong) {
-		return fBeanTypeProxyFactory.longType.createLongBeanProxy(aLong);
-	}
-	
-	public INumberBeanProxy createBeanProxyWith(Number aNumber) {
-		IDENumberBeanTypeProxy numberTypeProxy = (IDENumberBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(aNumber.getClass());
-		return numberTypeProxy.createNumberBeanProxy(aNumber);
-	}
-	
-	public IBooleanBeanProxy createBeanProxyWith(boolean aBoolean) {
-		return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(aBoolean);
-	}
-	
-	public IBooleanBeanProxy createBeanProxyWith(Boolean aBoolean) {
-		return fBeanTypeProxyFactory.booleanClass.createBooleanBeanProxy(aBoolean);
-	}
-	
-	public INumberBeanProxy createBeanProxyWith(byte aByte) {
-		return fBeanTypeProxyFactory.byteType.createByteBeanProxy(aByte);
-	}
-	
-	public INumberBeanProxy createBeanProxyWith(double aDouble) {
-		return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(aDouble);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#convertToPrimitiveBeanProxy(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public IBeanProxy convertToPrimitiveBeanProxy(IBeanProxy nonPrimitiveProxy) {
-		if (nonPrimitiveProxy == null)
-			return null;
-		if (!nonPrimitiveProxy.isValid())
-			return nonPrimitiveProxy;
-		IDEBeanTypeProxy type = (IDEBeanTypeProxy) nonPrimitiveProxy.getTypeProxy();
-		if (type.getClass() == Boolean.class)
-			return this.createBeanProxyWith(((IBooleanBeanProxy) nonPrimitiveProxy).booleanValue());
-		else if (type.getClass() == Byte.class)
-			return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).byteValue());
-		else if (type.getClass() == Character.class)
-			return this.createBeanProxyWith(((ICharacterBeanProxy) nonPrimitiveProxy).charValue());
-		else if (type.getClass() == Double.class)
-			return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).doubleValue());
-		else if (type.getClass() == Float.class)
-			return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).floatValue());
-		else if (type.getClass() == Integer.class)
-			return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).intValue());
-		else if (type.getClass() == Long.class)
-			return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).longValue());
-		else if (type.getClass() == Short.class)
-			return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).shortValue());
-		else
-			return nonPrimitiveProxy;
-	}
-
-	/**
-	 * Create a one-dimensional array. The result will be the same as calling
-	 * createBeanProxyWith(IBeanTypeProxy type, new int[1] {x}) where 'x' is the value passed in as
-	 * the dimension.
-	 */
-	public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int dimension) throws ThrowableProxy {
-		return createBeanProxyWith(type, new int[] { dimension });
-	}
-	
-	/**
-	 * Create an array bean proxy.
-	 *  - (int, new int[2] {3, 4}) will create: int [3] [4]
-	 *  - (int[], new int[1] {1}) int [1]
-	 *  - (int[], new int[2] {2,3}) int [2] [3]
-	 * 
-	 *  - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0]) int [0]... or
-	 * (int[][]..., null) or (int[][]..., new int[0]) int[0][]... This is because an array instance
-	 * with no specified dimensions is not valid.
-	 *  - (int[][], new int[1] {3}) int[3][]
-	 */
-	public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int[] dimensions) throws ThrowableProxy {
-		if (type.isArray())
-			return ((IDEArrayBeanTypeProxy) type).createBeanProxyWith(dimensions); // Already an
-																				   // array type,
-																				   // just pass it
-																				   // on.
-		else {
-			// It is not an array type, so we need to get an array of this type and dimensions.
-			IDEArrayBeanTypeProxy arrayType =
-				(IDEArrayBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(type.getTypeName(), dimensions.length);
-			return arrayType.createBeanProxyWith(dimensions);
-		}
-	}
-	
-	public void releaseProxy(IBeanProxy aProxy) {
-		// Do nothing. This is more for remote proxies
-	}
-	
-	/**
-	 * createIDEBeanProxyWith method comment. This is not part of the IStandardBeanProxyFactory
-	 * interface. It is available only from IDEBeanProxyFactory so that IDE registered extensions
-	 * can wrapper a bean. They will need to get current and explicitly cast to
-	 * IDEBeanProxyFactory, so they should only be IDE types themselves.
-	 */
-	public IIDEBeanProxy createIDEBeanProxyWith(Object anObject) {
-		if (anObject == null)
-			return null;
-		return ((IDEBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(anObject.getClass())).newBeanProxy(anObject);
-	}
-	
-	/**
-	 * For the IDE Factory we will create an IDEBeanProxy using the initializationString. If the
-	 * format of the string is not one we understand, pass it onto the evaluator. The
-	 * initStringParser is passed to allow shortcut evaluation. Package protected so only
-	 * IDEBeanTypeProxies can create instances.
-	 */
-	IBeanProxy createBeanProxy(IDEBeanTypeProxy aTypeProxy, String initializationString) {
-		if (initializationString.equals("null")) //$NON-NLS-1$
-			return null; // Value is initialized as null.
-		// We have to evaluate the result of the initializationString
-		try {
-			ClassLoader pluginClassLoader = fRegistry.getPluginClassLoader();
-			Object newValue = InitializationStringParser.evaluate(initializationString, pluginClassLoader);
-			return newValue != null ? aTypeProxy.newBeanProxy(newValue) : null;
-		} catch (Exception exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-			return null;
-		}
-	}
-	
-	/**
-	 * For the IDE Factory we will create an IDEBeanProxy using the null constructor Package
-	 * protected so only IDEBeanTypeProxies can create instances.
-	 */
-	IBeanProxy createBeanProxy(IDEBeanTypeProxy aTypeProxy) {
-
-		Class beanType = aTypeProxy.fClass;
-
-		// If the beanType is a primitive, the creation will fail because you can't
-		// create a primitive without a value.
-		try {
-			return aTypeProxy.newBeanProxy(!(aTypeProxy.isPrimitive()) ? beanType.newInstance() : null);
-		} catch (Exception exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-				new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-			return null;
-		}
-	}
-	
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
-	 */
-	public void terminateFactory(boolean wait) {
-		// Nothing really to do here - more applicable to remote proxy factories
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createExpression()
-	 */
-	public IExpression createExpression() {
-		return new IDEExpression(this.fRegistry);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createBeanProxyFrom(java.lang.String)
-	 */
-	public IBeanProxy createBeanProxyFrom(String initializationString) throws ThrowableProxy {
-		if (initializationString.equals("null")) //$NON-NLS-1$
-			return null; // Value is initialized as null.
-		// We have to evaluate the result of the initializationString
-		try {
-			ClassLoader pluginClassLoader = fRegistry.getPluginClassLoader();
-			InitializationStringParser parser = InitializationStringParser.createParser(initializationString, pluginClassLoader);
-			Object newValue = parser.evaluate();
-			if (newValue != null) {
-				return fRegistry.getBeanProxy(parser.getExpectedType(), newValue);
-			} else 
-				return null;
-		} catch (Exception exc) {
-			ProxyPlugin.getPlugin().getLogger().log(
-					new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc));
-			return null;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java
deleted file mode 100644
index 018bf5e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,461 +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.jem.internal.proxy.ide;
-
-/*
- * $RCSfile: IDEStandardBeanTypeProxyFactory.java,v $ $Revision: 1.9 $ $Date: 2005/05/11 19:01:12 $
- */
-
-import java.lang.reflect.Array;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-public class IDEStandardBeanTypeProxyFactory implements IStandardBeanTypeProxyFactory {
-
-	protected final IDEProxyFactoryRegistry fFactoryRegistry;
-
-	// Hashtable to cache proxies for classes so they are found on second and subsequent lookups
-	protected Map beanProxies;
-
-	public static Map MAP_SHORTSIG_TO_TYPE = new HashMap(8);
-
-	public static Map MAP_TYPENAME_TO_SHORTSIG = new HashMap(8);
-
-	static {
-		MAP_SHORTSIG_TO_TYPE.put("B", Byte.TYPE); //$NON-NLS-1$
-		MAP_SHORTSIG_TO_TYPE.put("C", Character.TYPE); //$NON-NLS-1$
-		MAP_SHORTSIG_TO_TYPE.put("D", Double.TYPE); //$NON-NLS-1$
-		MAP_SHORTSIG_TO_TYPE.put("F", Float.TYPE); //$NON-NLS-1$
-		MAP_SHORTSIG_TO_TYPE.put("I", Integer.TYPE); //$NON-NLS-1$
-		MAP_SHORTSIG_TO_TYPE.put("J", Long.TYPE); //$NON-NLS-1$
-		MAP_SHORTSIG_TO_TYPE.put("S", Short.TYPE); //$NON-NLS-1$
-		MAP_SHORTSIG_TO_TYPE.put("Z", Boolean.TYPE); //$NON-NLS-1$
-
-		MAP_TYPENAME_TO_SHORTSIG.put("byte", "B"); //$NON-NLS-1$ //$NON-NLS-2$
-		MAP_TYPENAME_TO_SHORTSIG.put("char", "C"); //$NON-NLS-1$ //$NON-NLS-2$
-		MAP_TYPENAME_TO_SHORTSIG.put("double", "D"); //$NON-NLS-1$ //$NON-NLS-2$
-		MAP_TYPENAME_TO_SHORTSIG.put("float", "F"); //$NON-NLS-1$ //$NON-NLS-2$
-		MAP_TYPENAME_TO_SHORTSIG.put("int", "I"); //$NON-NLS-1$ //$NON-NLS-2$
-		MAP_TYPENAME_TO_SHORTSIG.put("long", "J"); //$NON-NLS-1$ //$NON-NLS-2$
-		MAP_TYPENAME_TO_SHORTSIG.put("short", "S"); //$NON-NLS-1$ //$NON-NLS-2$
-		MAP_TYPENAME_TO_SHORTSIG.put("boolean", "Z"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	// Cached copy of a few typical bean type proxies.
-	IDEBeanTypeProxy objectClass;
-
-	IDEBooleanTypeBeanTypeProxy booleanType;
-
-	IDEBooleanClassBeanTypeProxy booleanClass;
-
-	IDEIntegerTypeBeanTypeProxy intType;
-
-	IDEIntegerClassBeanTypeProxy integerClass;
-
-	IDEFloatTypeBeanTypeProxy floatType;
-
-	IDEFloatClassBeanTypeProxy floatClass;
-
-	IDELongTypeBeanTypeProxy longType;
-
-	IDELongClassBeanTypeProxy longClass;
-
-	IDEShortTypeBeanTypeProxy shortType;
-
-	IDEShortClassBeanTypeProxy shortClass;
-
-	IDEByteTypeBeanTypeProxy byteType;
-
-	IDEByteClassBeanTypeProxy byteClass;
-
-	IDECharTypeBeanTypeProxy charType;
-
-	IDECharacterClassBeanTypeProxy charClass;
-
-	IDEDoubleTypeBeanTypeProxy doubleType;
-
-	IDEDoubleClassBeanTypeProxy doubleClass;
-
-	IDEStringBeanTypeProxy stringClass;
-
-	IDEClassBeanTypeProxy classClass;
-
-	IDEBeanTypeProxy voidType;
-
-	public IDEStandardBeanTypeProxyFactory(IDEProxyFactoryRegistry aRegistry) {
-		fFactoryRegistry = aRegistry;
-		aRegistry.registerBeanTypeProxyFactory(this);
-
-		// Now initialize the cache.
-		objectClass = new IDEBeanTypeProxy(fFactoryRegistry, Object.class);
-		booleanType = new IDEBooleanTypeBeanTypeProxy(fFactoryRegistry, Boolean.TYPE);
-		booleanClass = new IDEBooleanClassBeanTypeProxy(fFactoryRegistry, Boolean.class);
-		intType = new IDEIntegerTypeBeanTypeProxy(fFactoryRegistry, Integer.TYPE);
-		integerClass = new IDEIntegerClassBeanTypeProxy(fFactoryRegistry, Integer.class);
-		floatType = new IDEFloatTypeBeanTypeProxy(fFactoryRegistry, Float.TYPE);
-		floatClass = new IDEFloatClassBeanTypeProxy(fFactoryRegistry, Float.class);
-		longType = new IDELongTypeBeanTypeProxy(fFactoryRegistry, Long.TYPE);
-		longClass = new IDELongClassBeanTypeProxy(fFactoryRegistry, Long.class);
-		shortType = new IDEShortTypeBeanTypeProxy(fFactoryRegistry, Short.TYPE);
-		shortClass = new IDEShortClassBeanTypeProxy(fFactoryRegistry, Short.class);
-		byteType = new IDEByteTypeBeanTypeProxy(fFactoryRegistry, Byte.TYPE);
-		byteClass = new IDEByteClassBeanTypeProxy(fFactoryRegistry, Byte.class);
-		charType = new IDECharTypeBeanTypeProxy(fFactoryRegistry, Character.TYPE);
-		charClass = new IDECharacterClassBeanTypeProxy(fFactoryRegistry, Character.class);
-		doubleType = new IDEDoubleTypeBeanTypeProxy(fFactoryRegistry, Double.TYPE);
-		doubleClass = new IDEDoubleClassBeanTypeProxy(fFactoryRegistry, Double.class);
-		stringClass = new IDEStringBeanTypeProxy(fFactoryRegistry, String.class);
-		classClass = new IDEClassBeanTypeProxy(fFactoryRegistry, java.lang.Class.class);
-		voidType = new IDEBeanTypeProxy(fFactoryRegistry, Void.TYPE);
-
-		// Initialize the hashtable with the primitives, their lang equivalents, and also common classes like String
-		beanProxies = new HashMap(20);
-
-		// Primitives
-		beanProxies.put(intType.getTypeName(), intType);
-		beanProxies.put(booleanType.getTypeName(), booleanType);
-		beanProxies.put(charType.getTypeName(), charType);
-		beanProxies.put(byteType.getTypeName(), byteType);
-		beanProxies.put(shortType.getTypeName(), shortType);
-		beanProxies.put(longType.getTypeName(), longType);
-		beanProxies.put(floatType.getTypeName(), floatType);
-		beanProxies.put(doubleType.getTypeName(), doubleType);
-
-		// java.lang primitive peers
-		// Note that special classes are used for some of these which allow the IDE to get the
-		// lang objects from the objects that are holding proxies
-		beanProxies.put(integerClass.getTypeName(), integerClass);
-		beanProxies.put(booleanClass.getTypeName(), booleanClass);
-		beanProxies.put(charClass.getTypeName(), charClass);
-		beanProxies.put(byteClass.getTypeName(), byteClass);
-		beanProxies.put(shortClass.getTypeName(), shortClass);
-		beanProxies.put(longClass.getTypeName(), longClass);
-		beanProxies.put(floatClass.getTypeName(), floatClass);
-		beanProxies.put(doubleClass.getTypeName(), doubleClass);
-		beanProxies.put(BigDecimal.class.getName(), new IDEBigDecimalBeanTypeProxy(fFactoryRegistry, BigDecimal.class));//$NON-NLS-1$
-		beanProxies.put(BigInteger.class.getName(), new IDEBigIntegerBeanTypeProxy(fFactoryRegistry, BigInteger.class));//$NON-NLS-1$		
-		beanProxies.put(stringClass.getTypeName(), stringClass);
-
-		beanProxies.put(classClass.getTypeName(), classClass);
-		beanProxies.put(voidType.getTypeName(), voidType);
-	}
-
-	/**
-	 * We are an IDE proxy and know that the type is in the same VM as the IDE. the IDEBeanTypeProxy object NOTE This is package protected because the
-	 * only person who can call it are priveledged classes that are also creating things in an IDEProxy environment. If anyone needs to make this
-	 * method public they are doing the wrong thing as they should use the public method getBeanTypeProxy(String) that is on the interface. The only
-	 * other object that can guarantee that they have the class for the argument are those that are part of the idevm package
-	 */
-	IBeanTypeProxy getBeanTypeProxy(Class anIDEClass) {
-		return getBeanTypeProxy(anIDEClass.getName());
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(java.lang.String)
-	 */
-	public synchronized IBeanTypeProxy getBeanTypeProxy(String typeName) {
-		typeName = MapTypes.getJNIFormatName(typeName);
-
-		// See whether we already have the proxy for the argument name
-		IProxyBeanType beanTypeProxy = (IProxyBeanType) beanProxies.get(typeName);
-		// See if there and resolved, if so, return it. If not resolved, that means we need it NOW
-		// so we must go for it. When finally resolved the original ExpressionProxy will be deregistered and
-		// the resolved beantypeproxy will be in its place.
-		if (beanTypeProxy != null && beanTypeProxy.isBeanProxy()) {
-			return (IBeanTypeProxy) beanTypeProxy;
-		}
-
-		// If not an array, then see if the package extension mechanism can find it.
-		// Do this here so that if it is found in the package extension we won't necessarily create an
-		// extra connection when not needed.
-		if (typeName.charAt(0) != '[') {
-			// It is not an array
-			// First check with the factory for the package of the class.
-			// Inner classes have to use the dollar notation since if they didn't we couldn't tell where
-			// the package ended and the class started.
-			int packageIndex = typeName.lastIndexOf('.');
-			if (packageIndex != -1) {
-				String packageName = typeName.substring(0, packageIndex);
-				IDEExtensionBeanTypeProxyFactory packageFactory = (IDEExtensionBeanTypeProxyFactory) fFactoryRegistry
-						.getBeanTypeProxyFactoryExtension(packageName);
-				if (packageFactory != null) {
-					beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName);
-					if (beanTypeProxy != null) {
-						registerBeanTypeProxy((IBeanTypeProxy) beanTypeProxy, false);
-						return (IBeanTypeProxy) beanTypeProxy;
-					}
-				}
-			}
-			// There was not a registered factory that dealt with the class. Load it using the factory
-			// registry which has the plugin's class loader
-			try {
-				Class ideClass = fFactoryRegistry.loadClass(typeName);
-				IDEBeanTypeProxy superTypeProxy = null;
-				if (ideClass.getSuperclass() != null) {
-					// Get the beantype proxy of the superclass.
-					superTypeProxy = (IDEBeanTypeProxy) getBeanTypeProxy(ideClass.getSuperclass());
-				}
-
-				// Ask the supertype
-				// to create a beantype proxy of the same beantype proxy class.
-				// This is so that any subclasses will get the same beantype proxy class
-				// for it if it is special.
-				if (superTypeProxy != null)
-					beanTypeProxy = superTypeProxy.newBeanTypeForClass(ideClass);
-
-				if (beanTypeProxy == null)
-					beanTypeProxy = new IDEBeanTypeProxy(fFactoryRegistry, ideClass);
-			} catch (ClassNotFoundException e) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.INFO, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-				String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
-				beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg);
-			} catch (ExceptionInInitializerError e) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-				String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
-				beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg);
-			} catch (LinkageError e) {
-				ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e));
-				String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
-				beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg);
-			}
-
-			// Cache the instance so we can re-use it again
-			beanProxies.put(typeName, beanTypeProxy);
-			return (IBeanTypeProxy) beanTypeProxy;
-		} else {
-			// need to create a array of this many dimensions so that we can get the appropriate class for it.
-			int dims = typeName.lastIndexOf('[') + 1;
-			Class finalComponentType = null;
-			if (typeName.charAt(dims) == 'L') {
-				// It is a class.
-				// Strip off up to the 'L', and the trailing ';'. That is the class name.
-				IDEBeanTypeProxy finalType = (IDEBeanTypeProxy) getBeanTypeProxy(typeName.substring(dims + 1, typeName.length() - 1));
-				if (finalType != null)
-					finalComponentType = finalType.fClass;
-			} else {
-				// It is a type. Need to map it.
-				finalComponentType = (Class) IDEStandardBeanTypeProxyFactory.MAP_SHORTSIG_TO_TYPE.get(typeName.substring(dims, dims + 1));
-			}
-
-			if (finalComponentType != null) {
-				Object dummyArray = Array.newInstance(finalComponentType, new int[dims]);
-				beanTypeProxy = new IDEArrayBeanTypeProxy(fFactoryRegistry, typeName, dummyArray.getClass());
-				beanProxies.put(typeName, beanTypeProxy);
-			}
-			return (IBeanTypeProxy) beanTypeProxy;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
-	 *      java.lang.String)
-	 */
-	public synchronized IProxyBeanType getBeanTypeProxy(IExpression expression, String typeName) {
-		typeName = MapTypes.getJNIFormatName(typeName);
-
-		// See whether we already have the proxy for the argument name
-		IProxyBeanType beanTypeProxy = (IProxyBeanType) beanProxies.get(typeName);
-		if (beanTypeProxy != null) { return beanTypeProxy; }
-		
-		// Now see if an expression proxy cached.
-		beanTypeProxy = ((IDEExpression) expression).getBeanType(typeName);
-		if (beanTypeProxy != null)
-			return beanTypeProxy;		
-
-
-		// If not an array, then see if the package extension mechanism can find it.
-		// Do this here so that if it is found in the package extension we won't necessarily create an
-		// extra connection when not needed.
-		if (typeName.charAt(0) != '[') {
-			// It is not an array
-			// First check with the factory for the package of the class.
-			// Inner classes have to use the dollar notation since if they didn't we couldn't tell where
-			// the package ended and the class started.
-			int packageIndex = typeName.lastIndexOf('.');
-			if (packageIndex != -1) {
-				String packageName = typeName.substring(0, packageIndex);
-				IDEExtensionBeanTypeProxyFactory packageFactory = (IDEExtensionBeanTypeProxyFactory) fFactoryRegistry
-						.getBeanTypeProxyFactoryExtension(packageName);
-				if (packageFactory != null) {
-					beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName, expression);
-					if (beanTypeProxy != null) {
-						registerBeanTypeProxy(beanTypeProxy, false);
-						return beanTypeProxy;
-					}
-				}
-			}
-		}
-
-		// There was not a registered factory that dealt with the class. So create the expression proxy.
-		beanTypeProxy = ((Expression) expression).createBeanTypeExpressionProxy(typeName);
-		registerBeanTypeProxy(beanTypeProxy, false);
-		return beanTypeProxy;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(java.lang.String, int)
-	 */
-	public IBeanTypeProxy getBeanTypeProxy(String componentClassName, int dimensions) {
-		return getBeanTypeProxy(getArrayClassname(componentClassName, dimensions));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
-	 *      java.lang.String, int)
-	 */
-	public IProxyBeanType getBeanTypeProxy(IExpression expression, String componentClassName, int dimensions) {
-		return getBeanTypeProxy(expression, getArrayClassname(componentClassName, dimensions));
-	}
-
-	/**
-	 * @param componentClassName
-	 * @param dimensions
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	protected String getArrayClassname(String componentClassName, int dimensions) {
-		String jniComponentTypeName = MapTypes.getJNIFormatName(componentClassName);
-		String compType = jniComponentTypeName;
-		if (jniComponentTypeName.charAt(0) != '[') {
-			// We're not already an array, so create correct template.
-			compType = (String) MAP_TYPENAME_TO_SHORTSIG.get(componentClassName);
-			if (compType == null) {
-				// It is a class, and not a type.
-				compType = "L" + jniComponentTypeName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		// Now create it with the appropriate number of '[' in front.
-		StringBuffer buffer = new StringBuffer(dimensions + compType.length());
-		for (int i = 0; i < dimensions; i++)
-			buffer.append('[');
-		buffer.append(compType);
-		return buffer.toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy,
-	 *      boolean)
-	 */
-	public synchronized void registerBeanTypeProxy(IBeanTypeProxy aBeanTypeProxy, boolean permanent) {
-		beanProxies.put(aBeanTypeProxy.getTypeName(), aBeanTypeProxy);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType,
-	 *      boolean)
-	 */
-	public void registerBeanTypeProxy(IProxyBeanType aProxyBeanType, boolean permanent) {
-		if (aProxyBeanType.isBeanProxy())
-			registerBeanTypeProxy((IBeanTypeProxy) aProxyBeanType, permanent); // A regular kind, do regular registration.
-		else {
-			ExpressionProxy beanExpressionProxy = ((ExpressionProxy) aProxyBeanType);
-			final String typeName = aProxyBeanType.getTypeName();
-			((IDEExpression) beanExpressionProxy.getExpression()).addBeanType(typeName, aProxyBeanType);
-			beanExpressionProxy.addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
-				public void proxyResolved(ProxyEvent event) {
-					String typeName = ((IProxyBeanType) event.getSource()).getTypeName();
-					synchronized (IDEStandardBeanTypeProxyFactory.this) {
-						if (!beanProxies.containsKey(typeName)) {
-							// It hasn't been resolved through some other means. So this is good. Actually this should never
-							// occur because upon resolution we've already registered the bean type proxy through the
-							// normal mechanisms. But to be safe, we'll do it here.
-							beanProxies.put(typeName, event.getProxy());
-						}
-					}
-				}
-				
-				public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
-					((IDEExpression) ((ExpressionProxy) event.getSource()).getExpression()).removeBeanType(typeName);
-				}
-			});
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeRegistered(String)
-	 */
-	public synchronized boolean isBeanTypeRegistered(String className) {
-		return beanProxies.containsKey(MapTypes.getJNIFormatName(className));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registeredTypes()
-	 */
-	public Set registeredTypes() {
-		return beanProxies.keySet();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeNotFound(String)
-	 */
-	public boolean isBeanTypeNotFound(String className) {
-		// Do nothing. No need for it in IDE system because there will always be a proxy, even when not found.
-		// In that case an IDEInitErrorBeanTypeProxy will be created.
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isMaintainNotFoundTypes()
-	 */
-	public boolean isMaintainNotFoundTypes() {
-		// Do nothing. No need for it in IDE system because there will always be a proxy, even when not found.
-		// In that case an IDEInitErrorBeanTypeProxy will be created.
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#setMaintainNotFoundTypes(boolean)
-	 */
-	public void setMaintainNotFoundTypes(boolean maintain) {
-		// Do nothing. No need for it in IDE system because there will always be a proxy, even when not found.
-		// In that case an IDEInitErrorBeanTypeProxy will be created.
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanProxy.java
deleted file mode 100644
index 9f5fcee..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanProxy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEStringBeanProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of IStringBeanProxy
- * Creation date: (2/6/00 9:02:42 AM)
- * @author: Joe Winchester
- */
-final class IDEStringBeanProxy extends IDEObjectBeanProxy implements IStringBeanProxy {
-	protected String fString;
-/**
- * Store the bean in the string field to save re-casting each time it is asked for.
- * It is package protected because they are created
- * in a special way and no one else should create them.
- */
-IDEStringBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
-	super(aRegistry, aBean,aBeanTypeProxy);
-	fString = (String)aBean;
-}
-/**
- * Return the cache'd string that is a java.lang.String that the IDE can use
- */
-public String stringValue() {
-	return fString;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanTypeProxy.java
deleted file mode 100644
index 49ebf74..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanTypeProxy.java
+++ /dev/null
@@ -1,49 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEStringBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.IStringBeanProxy;
-/**
- * IDE Implementation of the BeanType proxy for java.lang.String
- */
-final class IDEStringBeanTypeProxy extends IDEBeanTypeProxy {
-	// Cache a proxy to an empty string for speed
-	protected final IDEStringBeanProxy emptyStringProxy;
-
-IDEStringBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-	super(aRegistry, aClass);
-	// Cache a proxy to an empty string for speed
-	emptyStringProxy = new IDEStringBeanProxy(aRegistry, "",this);	//$NON-NLS-1$
-}
-/**
- * Helper to create string beans
- * Package protected because no-one else outside the package should use this, they
- * must go through the API where you look up a factory first.
- */
-IStringBeanProxy createStringBeanProxy(String aString){
-	if ( aString.equals("") ) {//$NON-NLS-1$
-		return emptyStringProxy;
-	} else {
-		return new IDEStringBeanProxy(fProxyFactoryRegistry,aString,this);
-	}
-}
-/* Specialized from IDEBeanTypeProxy to ensure IStringBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	return (IIDEBeanProxy)createStringBeanProxy( (String)anObject );
-
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEThrowableProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEThrowableProxy.java
deleted file mode 100644
index f1ccaa1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEThrowableProxy.java
+++ /dev/null
@@ -1,94 +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.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEThrowableProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEThrowableProxy extends ThrowableProxy implements IIDEBeanProxy {
-
-	protected IBeanTypeProxy fBeanTypeProxy;
-
-	protected IDEThrowableProxy(Throwable exc, IBeanTypeProxy aBeanTypeProxy) {
-		super(exc);
-		fBeanTypeProxy = aBeanTypeProxy;
-	}
-
-	public boolean equals(Object obj) {
-		if (super.equals(obj))
-			return true;
-		if (obj instanceof IIDEBeanProxy) {
-			return getCause().equals(((IIDEBeanProxy) obj).getBean());
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
-	 */
-	public boolean sameAs(IBeanProxy aBeanProxy) {
-		if (this == aBeanProxy)
-			return true;
-		if (aBeanProxy instanceof IIDEBeanProxy)
-			return getCause() == ((IIDEBeanProxy) aBeanProxy).getBean();
-		return false;
-	}
-
-	public String getProxyLocalizedMessage() {
-		return getCause().getLocalizedMessage();
-	}
-	public String getProxyMessage() {
-		return getCause().getMessage();
-	}
-	public void printProxyStackTrace(java.io.PrintWriter writer) {
-		getCause().printStackTrace(writer);
-	}
-	public void printProxyStackTrace(java.io.PrintStream stream) {
-		getCause().printStackTrace(stream);
-	}
-	public void printProxyStackTrace() {
-		getCause().printStackTrace();
-	}
-	public IBeanTypeProxy getTypeProxy() {
-		return fBeanTypeProxy;
-	}
-	public ProxyFactoryRegistry getProxyFactoryRegistry() {
-		return fBeanTypeProxy.getProxyFactoryRegistry();
-	}
-	public String toBeanString() {
-		return getCause().toString();
-	}
-	public boolean isValid() {
-		return true;
-	}
-	/**
-	 * Return the exception which is the live bean
-	 */
-	public Object getBean() {
-		return getCause();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
-	 */
-	public final boolean isBeanProxy() {
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
-	 */
-	public final boolean isExpressionProxy() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEVMServer.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEVMServer.java
deleted file mode 100644
index 57f83fa..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEVMServer.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- *  $RCSfile: IDEVMServer.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.io.OutputStream;
-
-import org.eclipse.jem.internal.proxy.common.*;
-
-public class IDEVMServer implements IVMServer {
-	
-	IDECallbackRegistry fCallbackRegistry;
-	IDEStandardBeanProxyFactory fBeanProxyFactory;
-	
-IDEVMServer(IDECallbackRegistry aCallbackRegistry){
-	fCallbackRegistry = aCallbackRegistry;
-	fBeanProxyFactory = (IDEStandardBeanProxyFactory)fCallbackRegistry.fProxyFactoryRegistry.getBeanProxyFactory();
-	
-}	
-public Object doCallback(ICallbackRunnable aRunnable){
-	try {
-		return aRunnable.run(new ICallbackHandler(){
-			public Object callbackWithParms(int callbackID, int msgID, Object[] parms){
-				// We are running in the same IDE so just call the registry directly
-				// although we must convert the parms to bean proxies
-				Object[] proxyParms = null;
-				// If we have any parms then convert them to bean proxies
-				if ( parms != null ) {
-					proxyParms = new Object[parms.length];
-					for ( int i=0;i<parms.length;i++){
-						Object p = parms[i];
-						proxyParms[i] = createNextParm(p);
-					}
-				}
-				return fCallbackRegistry.vmCallback(callbackID,msgID,proxyParms);
-			}
-
-			private Object createNextParm(Object p) {
-				if (!(p instanceof ICallbackHandler.TransmitableArray)) {
-					return fBeanProxyFactory.createIDEBeanProxyWith(p);
-				} else {
-					Object[] array = ((ICallbackHandler.TransmitableArray) p).getArray();
-					Object[] parm = new Object[array.length];
-					for (int i = 0; i < array.length; i++) {
-						parm[i] = createNextParm(array[i]);
-					}
-					return parm;
-				}
-			}
-			
-			/* (non-Javadoc)
-			 * @see org.eclipse.jem.internal.proxy.common.ICallbackHandler#callbackAsConstants(int, int, java.lang.Object)
-			 */
-			public Object callbackAsConstants(int callbackID, int msgID, Object parm) throws CommandException {
-				return fCallbackRegistry.vmCallback(callbackID,msgID,parm);
-			}
-		});
-		
-	} catch ( CommandException exc ) {
-		return null;	
-	}
-}
-
-public OutputStream requestStream(int callbackID, int msgID) throws CommandException {
-	return fCallbackRegistry.requestStream(callbackID,msgID);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IIDEBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IIDEBeanProxy.java
deleted file mode 100644
index 3cbff57..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IIDEBeanProxy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.jem.internal.proxy.ide;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IIDEBeanProxy.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-
-
-/**
- * Interface that allows the IDE VM to get the actual bean.
- */
-public interface IIDEBeanProxy extends IBeanProxy {
-/**
- * Get the actual live bean. 
- * USE with extreme care.
- */
-public Object getBean();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanProxy.java
deleted file mode 100644
index 8d039a8..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanProxy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
- *  $RCSfile: IDEDimensionBeanProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.awt.Dimension;
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.core.IDimensionBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEObjectBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-
-public class IDEDimensionBeanProxy extends IDEObjectBeanProxy implements IDimensionBeanProxy {
-	
-	protected Dimension fDimension;
-
-IDEDimensionBeanProxy(IDEProxyFactoryRegistry aRegistry,Object aDimension, IBeanTypeProxy aBeanTypeProxy){
-	super(aRegistry,aDimension,aBeanTypeProxy);
-	fDimension = (Dimension)aDimension;
-}
-public int getWidth(){
-	return fDimension.width;
-}
-public void setWidth(int aWidth){
-	fDimension.width = aWidth;
-}
-public int getHeight(){
-	return fDimension.height;
-}
-public void setHeight(int aHeight){
-	fDimension.height = aHeight;
-}
-public void setSize(IDimensionBeanProxy aBeanProxy){
-	fDimension.setSize(new Dimension(aBeanProxy.getWidth(),aBeanProxy.getHeight()));
-}
-public void setSize(int width, int height){
-	fDimension.width = width;
-	fDimension.height = height;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanTypeProxy.java
deleted file mode 100644
index 71615f4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanTypeProxy.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.jem.internal.proxy.ide.awt;
-/*
- *  $RCSfile: IDEDimensionBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.awt.Dimension;
-
-import org.eclipse.jem.internal.proxy.ide.*;
-
-public class IDEDimensionBeanTypeProxy extends IDEBeanTypeProxy {
-
-IDEDimensionBeanTypeProxy(IDEProxyFactoryRegistry aRegistry){
-	this(aRegistry,Dimension.class);
-}
-
-private IDEDimensionBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class type){
-	super(aRegistry, type);
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	return new IDEDimensionBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-}
-IDEDimensionBeanProxy createDimensionBeanProxy(int width, int height){
-	return new IDEDimensionBeanProxy(fProxyFactoryRegistry,new Dimension(width,height),this);
-}
-	/*
-	 * @see IDEBeanTypeProxy#newBeanTypeForClass(Class)
-	 */
-	public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
-		return new IDEDimensionBeanTypeProxy(fProxyFactoryRegistry, type);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanProxy.java
deleted file mode 100644
index 149ad21..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanProxy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
- *  $RCSfile: IDEPointBeanProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.awt.Point;
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.core.IPointBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEObjectBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-
-public class IDEPointBeanProxy extends IDEObjectBeanProxy implements IPointBeanProxy {
-	
-	protected Point fPoint;
-
-IDEPointBeanProxy(IDEProxyFactoryRegistry aRegistry,Object aPoint, IBeanTypeProxy aBeanTypeProxy){
-	super(aRegistry,aPoint,aBeanTypeProxy);
-	fPoint = (Point)aPoint;
-}
-public int getX(){
-	return fPoint.x;
-}
-public void setX(int anX){
-	fPoint.x = anX;
-}
-public int getY(){
-	return fPoint.y;
-}
-public void setY(int aY){
-	fPoint.y = aY;
-}
-public void setLocation(IPointBeanProxy aBeanProxy){
-	fPoint.setLocation(new Point(aBeanProxy.getX(),aBeanProxy.getY()));
-}
-public void setLocation(int anX, int aY){
-	fPoint.x = anX;
-	fPoint.y = aY;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanTypeProxy.java
deleted file mode 100644
index cc63f5c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanTypeProxy.java
+++ /dev/null
@@ -1,44 +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.jem.internal.proxy.ide.awt;
-/*
- *  $RCSfile: IDEPointBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.awt.Point;
-
-import org.eclipse.jem.internal.proxy.ide.*;
-
-public class IDEPointBeanTypeProxy extends IDEBeanTypeProxy {
-
-IDEPointBeanTypeProxy(IDEProxyFactoryRegistry aRegistry){
-	this(aRegistry,Point.class);
-}
-private IDEPointBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class type){
-	super(aRegistry,type);
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	return new IDEPointBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-}
-IDEPointBeanProxy createPointBeanProxy(int x, int y){
-	return new IDEPointBeanProxy(fProxyFactoryRegistry,new Point(x,y),this);
-}
-	/*
-	 * @see IDEBeanTypeProxy#newBeanTypeForClass(Class)
-	 */
-	public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
-		return new IDEPointBeanTypeProxy(fProxyFactoryRegistry, type);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanProxy.java
deleted file mode 100644
index b566391..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
- *  $RCSfile: IDERectangleBeanProxy.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.awt.Rectangle;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.ide.IDEObjectBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-
-public class IDERectangleBeanProxy extends IDEObjectBeanProxy implements IRectangleBeanProxy {
-	
-	protected Rectangle fRectangle;
-
-IDERectangleBeanProxy(IDEProxyFactoryRegistry aRegistry,Object aRectangle, IBeanTypeProxy aBeanTypeProxy){
-	super(aRegistry,aRectangle,aBeanTypeProxy);
-	fRectangle = (Rectangle)aRectangle;
-}
-public int getX(){
-	return fRectangle.x;
-}
-public void setX(int anX){
-	fRectangle.x = anX;
-}
-public int getY(){
-	return fRectangle.y;
-}
-public void setY(int aY){
-	fRectangle.y = aY;
-}
-public int getHeight(){
-	return fRectangle.height;
-}
-public void setHeight(int aHeight){
-	fRectangle.height = aHeight;
-}
-public void setWidth(int aWidth){
-	fRectangle.width = aWidth;
-}
-public int getWidth(){
-	return fRectangle.width;
-}
-public void setBounds(IRectangleBeanProxy aBeanProxy){
-	fRectangle.setBounds(aBeanProxy.getX(),aBeanProxy.getY(),aBeanProxy.getWidth(),aBeanProxy.getHeight());
-}
-public void setBounds(int x, int y, int width, int height){
-	fRectangle.setBounds(x,y,width,height);
-}
-public void setSize(IDimensionBeanProxy aBeanProxy){
-	fRectangle.setSize(aBeanProxy.getWidth(),aBeanProxy.getWidth());
-}
-public void setLocation(IPointBeanProxy aBeanProxy){
-	fRectangle.setLocation(aBeanProxy.getX(),aBeanProxy.getY());
-}
-public void setLocation(int x, int y){
-	fRectangle.setLocation(x,y);
-}
-public void setSize(int width, int height){
-	fRectangle.setSize(width,height);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanTypeProxy.java
deleted file mode 100644
index beeef7e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanTypeProxy.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.jem.internal.proxy.ide.awt;
-/*
- *  $RCSfile: IDERectangleBeanTypeProxy.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-import java.awt.Rectangle;
-
-import org.eclipse.jem.internal.proxy.ide.*;
-
-public class IDERectangleBeanTypeProxy extends IDEBeanTypeProxy {
-
-IDERectangleBeanTypeProxy(IDEProxyFactoryRegistry aRegistry){
-	this(aRegistry,Rectangle.class);
-}
-
-private IDERectangleBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class type){
-	super(aRegistry,type);
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
-	return new IDERectangleBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-}
-IDERectangleBeanProxy createRectangleBeanProxy(int x, int y, int width, int height){
-	return new IDERectangleBeanProxy(fProxyFactoryRegistry,new Rectangle(x,y,width,height),this);
-}
-	/*
-	 * @see IDEBeanTypeProxy#newBeanTypeForClass(Class)
-	 */
-	public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
-		return new IDERectangleBeanTypeProxy(fProxyFactoryRegistry, type);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERegisterAWT.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERegisterAWT.java
deleted file mode 100644
index 35c1a47..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERegisterAWT.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IDERegisterAWT.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-/**
- * This class is used to register the AWT factories.
- */
-public final class IDERegisterAWT {
-	public static void registerAWT(IDEProxyFactoryRegistry registry) {
-		new IDEStandardAWTBeanTypeProxyFactory(registry);
-		new IDEStandardAWTBeanProxyFactory(registry);
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanProxyFactory.java
deleted file mode 100644
index 2228212..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanProxyFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*******************************************************************************
- * Copyright (c)  2001, 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IDEStandardAWTBeanProxyFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:57:26 $ 
- */
-
-
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Standard AWT Bean Proxy Factory.
- * Package protected because it should not referenced
- * outside of the package other than through the interface.
- */
-class IDEStandardAWTBeanProxyFactory implements IStandardAwtBeanProxyFactory {
-
-	final IDEStandardAWTBeanTypeProxyFactory fAWTBeanTypeFactory;
-	
-public IDEStandardAWTBeanProxyFactory(ProxyFactoryRegistry factory) {
-	factory.registerBeanProxyFactory(IStandardAwtBeanProxyFactory.REGISTRY_KEY, this);
-	fAWTBeanTypeFactory = (IDEStandardAWTBeanTypeProxyFactory)factory.getBeanTypeProxyFactoryExtension(IDEStandardAWTBeanTypeProxyFactory.BEAN_TYPE_FACTORY_KEY);
-}
-public IDimensionBeanProxy createDimensionBeanProxyWith(int width, int height){
-	return fAWTBeanTypeFactory.dimensionType.createDimensionBeanProxy(width,height);
-}
-
-public IPointBeanProxy createPointBeanProxyWith(int x, int y){
-	return fAWTBeanTypeFactory.pointType.createPointBeanProxy(x,y);
-}
-public IRectangleBeanProxy createBeanProxyWith(int x, int y, int width, int height){
-	return fAWTBeanTypeFactory.rectangleType.createRectangleBeanProxy(x,y,width,height);
-}
-public void terminateFactory(boolean wait) {
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanTypeProxyFactory.java
deleted file mode 100644
index 53707b9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2001, 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IDEStandardAWTBeanTypeProxyFactory.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.ide.awt;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.ide.*;
-
-/**
- * BeanType factory standard AWT bean types. This is package protected because it shouldn't be referenced outside the package. It should only be
- * accessed through the interface.
- */
-class IDEStandardAWTBeanTypeProxyFactory implements IDEExtensionBeanTypeProxyFactory {
-
-	static final String BEAN_TYPE_FACTORY_KEY = "java.awt"; //$NON-NLS-1$
-
-	protected final IDEProxyFactoryRegistry fFactoryRegistry;
-
-	protected final IDEDimensionBeanTypeProxy dimensionType;
-
-	protected final IDEPointBeanTypeProxy pointType;
-
-	protected final IDERectangleBeanTypeProxy rectangleType;
-
-	IDEStandardAWTBeanTypeProxyFactory(IDEProxyFactoryRegistry aRegistry) {
-		fFactoryRegistry = aRegistry;
-		fFactoryRegistry.registerBeanTypeProxyFactory(BEAN_TYPE_FACTORY_KEY, this);
-		dimensionType = new IDEDimensionBeanTypeProxy(fFactoryRegistry);
-		pointType = new IDEPointBeanTypeProxy(fFactoryRegistry);
-		rectangleType = new IDERectangleBeanTypeProxy(fFactoryRegistry);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.ide.IDEExtensionBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String)
-	 */
-	public IDEBeanTypeProxy getExtensionBeanTypeProxy(String className) {
-
-		if ("java.awt.Dimension".equals(className)) //$NON-NLS-1$
-			return dimensionType;
-		else if ("java.awt.Point".equals(className)) //$NON-NLS-1$
-			return pointType;
-		else if ("java.awt.Rectangle".equals(className)) //$NON-NLS-1$
-			return rectangleType;
-		else
-			return null;
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.ide.IDEExtensionBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
-	 */
-	public IDEBeanTypeProxy getExtensionBeanTypeProxy(String className, IBeanTypeProxy beanTypeProxy) {
-
-		return getExtensionBeanTypeProxy(className);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.internal.proxy.ide.IDEExtensionBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String,
-	 *      org.eclipse.jem.internal.proxy.core.IExpression)
-	 */
-	public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression) {
-		return getExtensionBeanTypeProxy(typeName);
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
-	 */
-	public void terminateFactory(boolean wait) {
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java
deleted file mode 100644
index c3042e7..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java
+++ /dev/null
@@ -1,70 +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.jem.internal.proxy.common.remote;
-/*
- *  $RCSfile: CommandErrorException.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * An error return from a command. This is clean return in that
- * the connection is still valid and alive.
- * After it has been processed the data will be the value retrieved
- * out of the valueobject and made into a proxy.
- */
-public class CommandErrorException extends CommandException {
-	private final Object fErrorObject;
-	private final int fErrorCode;
-	
-	public CommandErrorException(int errorCode, Commands.ValueObject errorData) {
-		super(errorData.clone());	// Clone it because typically these get reused and cleared out. This way we have our own.
-		fErrorObject = null;
-		fErrorCode = errorCode;
-	}
-	
-	public CommandErrorException(String msg, int errorCode, Commands.ValueObject errorData, Object errorObject) {
-		super(msg, errorData.clone());
-		fErrorObject = errorObject;
-		fErrorCode = errorCode;		
-	}
-	
-	public Commands.ValueObject getValue() {
-		return (Commands.ValueObject) getExceptionData();
-	}
-		
-	public boolean isRecoverable() {
-		return true;	// Command errors are recoverable.
-	}
-	
-	/**
-	 * Return the error code.
-	 */
-	public int getErrorCode() {
-		return fErrorCode;
-	}
-	
-	/**
-	 * Return the error object after conversion to proxy format.
-	 */
-	public Object getErrorObject() {
-		return fErrorObject;
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return super.toString() + "-- Error code:"+getErrorCode() + (getValue() != null ? " Value data:\"" + getValue().getAsObject() + "\"" : " ") + (fErrorObject != null ? " Error object:\""+fErrorObject.toString()+"\"" : " ");
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/Commands.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/Commands.java
deleted file mode 100644
index be8cdd3..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/Commands.java
+++ /dev/null
@@ -1,1450 +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.jem.internal.proxy.common.remote;
-/*
- *  $RCSfile: Commands.java,v $
- *  $Revision: 1.14 $  $Date: 2005/05/16 19:11:24 $ 
- */
-
-import java.io.*;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * The commands that can be passed back and forth between
- * client and server. And other constants.
- *
- * - Contains helper methods for reading/writing commands.
- */
-public class Commands {
-	// The commands will be written in writeByte format .
-	public final static byte
-		GET_CLASS = 1,		// Get the class object,
-		VALUE = 2,		// Returning a value
-		QUIT_CONNECTION = 4,	// Close this connection
-		TERMINATE_SERVER = 5,	// Terminate the entire server.
-		ERROR = 6,		// Returning an error
-		RELEASE_OBJECT = 7,	// An object is no longer needed on the client side, so
-					// it can be removed from the server id table and released.
-		GET_CLASS_RETURN = 8,	// The return command from GET_CLASS
-		// Obsolete, not used anymore GET_METHOD = 9,	// Return the id for a method
-		// Obsolete, not used anymore GET_CTOR = 10,		// Return the id for a constructor		
-		NEW_INIT_STRING = 11,	// Create a new bean using the init string
-		GET_CLASS_FROM_ID = 12,	// We have an ID, return the class info for this id.
-		GET_CLASS_ID_RETURN = 13,	// The return command from GET_CLASS_FROM_ID
-		GET_OBJECT_DATA = 14,	// We have an ID, but we don't have the info, return it. This is a 
-					// corrective command only. This would happen if for some strange
-					// reason the proxy has been removed but has not been released. This
-					// really shouldn't happen except as a possible race condition between
-					// GC and returning id from the server.
-		INVOKE = 15,		// Invoke a method.
-	
-	
-		// These commands are to the Master Server thread in the IDE.
-		ALIVE = 16,	// Are you alive?
-		REMOTE_STARTED = 17,	// Remote VM has started.
-		ATTACH_CALLBACK = 18,	// Attach to a callback thread on the IDE side. The remote vm will use its socket as the callback socket.
-								// it will return boolean <code>true</code> if attach worked or <code>false</code> if it failed.
-
-		// These are more regular commands. They were historically added after the master server thread commands, so
-		// they are shown here after them and with numbers greater than them.
-		EXPRESSION_TREE_COMMAND = 19,	// An expression tree subcommand has come in.
-		INVOKE_WITH_METHOD_PASSED = 20,	// Invoke where the description of the method is passed in with the command.
-		GET_ARRAY_CONTENTS = 21;	// Get the first dimension contents as an array of ids and send them back.
-	
-		
-	// Callback commands
-	public final static byte
-		CALLBACK = (byte) 255,	// A callback has come in.
-		CALLBACK_DONE = (byte) 254,	// A callback done command, sent to the remote vm upon callback completion.
-		CALLBACK_STREAM = (byte) 253,	// A callback for a byte stream has come in.
-								// This is a special callback. When this comes in a special
-								// input stream will be created that will take over control of
-								// the connection until the stream is terminated on the remote
-								// side. At this time the connection will be returned.
-		CALLBACK_STREAM_TERMINATE = (byte) 252;	// A callback stream is asked to terminate early.
-		
-	// The error values from the command on the server.
-	public final static int
-		NO_ERROR = 0,				// No error status.
-		UNKNOWN_COMMAND_SENT = 1,	// An unknown command was sent to the server. Value is void.
-		GET_CLASS_NOT_FOUND = 2,	// The class was not found in GetClass. Value is void.
-		CANNOT_EVALUATE_STRING = 3,	// Evaluator couldn't evaluate the init string. Too complicated. Value is a throwable of the wrappered Init string error.
-		CLASS_CAST_EXCEPTION = 4,	// The result is not assignable to the expected type. Value is void.
-		GET_METHOD_NOT_FOUND = 5,	// Method requested wasn't found. Value is void.
-		THROWABLE_SENT = 6,			// A Throwable is being sent back as the error, not as just data for the error. Value is the Throwable.
-		CALLBACK_RUNTIME_EXCEPTION = 7,	// A runtime exception occurred during a callback. The data is the message.
-		CALLBACK_NOT_REGISTERED = 8,
-		MAX_ERROR_CODE = CALLBACK_NOT_REGISTERED;	// This is just the max code. Not actually sent. Used as a flag.
-		
-	// Predefined standard id's for standard classes/objects. Both sides will assume these id's have been assigned
-	// to these classes/types/objects
-	public final static int
-		NOT_AN_ID = -1,	// This value means it is not an id. It is never a valid id.
-		VOID_TYPE = 0,
-		BOOLEAN_TYPE = 1,
-		BOOLEAN_CLASS = 2,
-		INTEGER_TYPE = 3,
-		INTEGER_CLASS = 4,
-		BYTE_TYPE = 5,
-		BYTE_CLASS = 6,
-		CHARACTER_TYPE = 7,
-		CHARACTER_CLASS = 8,
-		DOUBLE_TYPE = 9,
-		DOUBLE_CLASS = 10,
-		FLOAT_TYPE = 11,
-		FLOAT_CLASS = 12,
-		SHORT_TYPE = 13,
-		SHORT_CLASS = 14,
-		LONG_TYPE = 15,
-		LONG_CLASS = 16,
-		STRING_CLASS = 17,
-		BIG_DECIMAL_CLASS = 18,
-		BIG_INTEGER_CLASS = 19,
-		NUMBER_CLASS = 20,
-		THROWABLE_CLASS = 21,
-		CLASS_CLASS = 22,
-		OBJECT_CLASS = 23,
-		ACCESSIBLEOBJECT_CLASS = 24,
-		METHOD_CLASS = 25,
-		FIELD_CLASS = 26,
-		CONSTRUCTOR_CLASS = 27,
-		GET_METHOD_ID = 28,	// Class.getMethod(...) predefined id.
-		IVMSERVER_CLASS = 29,	// IVMServer.class
-		ICALLBACK_CLASS = 30,	// ICallback.class
-		REMOTESERVER_ID = 31,	// id of RemoteVMServerThread instance.
-		REMOTEVMSERVER_CLASS = 32,	// RemoteVMServer.class
-		INITIALIZECALLBACK_METHOD_ID = 33,	// ICallback.initializeCallback method.
-		THREAD_CLASS = 34,
-		EXPRESSIONPROCESSERCONTROLLER_CLASS = 35,
-		FIRST_FREE_ID = 36;
-				
-	// The type flags written in writeByte format
-	public final static byte
-		VOID = VOID_TYPE,	// null - nothing follows
-		BYTE = BYTE_TYPE,	// byte - writeByte
-		L_BYTE = BYTE_CLASS,	// java.lang.Byte - writeByte
-		CHAR = CHARACTER_TYPE,	// char - writeChar
-		L_CHAR = CHARACTER_CLASS,	// java.lang.Character - writeChar
-		DOUBLE = DOUBLE_TYPE,	// double - writeDouble
-		L_DOUBLE = DOUBLE_CLASS,	// java.lang.Double - writeDouble
-		FLOAT = FLOAT_TYPE,	// float - writeFloat
-		L_FLOAT = FLOAT_CLASS,	// java.lang.Float - writeFloat
-		INT = INTEGER_TYPE,	// int - writeInt
-		L_INT = INTEGER_CLASS,	// java.lang.Integer - writeInt
-		LONG = LONG_TYPE,	// long - writeLong
-		L_LONG = LONG_CLASS,	// java.lang.Long - writeLong
-		SHORT = SHORT_TYPE,	// short - writeShort
-		L_SHORT = SHORT_CLASS,	// java.lang.Short - writeShort
-		BOOL = BOOLEAN_TYPE,	// boolean - writeBoolean
-		L_BOOL = BOOLEAN_CLASS,	// java.lang.Boolean - writeBoolean
-		STRING = STRING_CLASS,	// java.lang.String - writeUTF
-		OBJECT = OBJECT_CLASS,	// Object - special, see below (Object can be used to return an array (except if the array contains any object_ids, that has a special type)
-		OBJECT_ID = 50,	// Object identity key - writeInt
-		NEW_OBJECT_ID = 51,	// New Object identity (this is a new object that didn't exist before)
-		THROW = 52,	// An exception occured. The value is a throwable, it is of the same format as NEW_OBJECT_ID.
-		ARRAY_IDS = 53,	// An array of values, where there are at least one ID in the array. If there were no
-						// ID's (i.e. all just values), then use OBJECT type intead and have it written as
-						// writeObject.
-		FLAG = 54;	// The value is a flag int. If this is allowed on a read, the anInt field will contain the flag value.
-				
-		
-		
-	// Unless specified below, the commands are one byte long.
-	// Also, unless specified below, the commands do not return a confirmation response.
-	//
-	// NOTE: VERY IMPORTANT, after every command, flush() should be used so that the
-	// the data is immediately sent to the server. 	
-	//
-	// n means int (e.g. 1)
-	// nb means byte (e.g. 1b)
-	// 'x' means Unicode char (i.e. writeChar())
-	// "xxx" means UTF8 string (i.e. writeUTF)
-	// bool means a one byte boolean value
-	//
-	// The commas aren't actually written, they are used as separaters in the comments below
-	//
-	// GET_CLASS: 1b, "classname"
-	//		Will return on the output stream GET_CLASS_RETURN command:
-	//		8b, n1, bool1, bool2, "superclassname"
-	//		The "n1" is the class id.
-	//		The bool1 is whether this class is an interface (true if it is).
-	//		The bool2 is whether this class is abstract (true if it is).	
-	//		The "superclassname" is the class name of the super class (0 length if no superclass)
-	//		If the class is not found, then it will return an error with a value for the error.
-	//
-	// GET_CLASS_FROM_ID: 12b, n
-	//		Where "n" is the class id.
-	//		Will return on the output stream GET_CLASS_ID_RETURN command:	
-	//		13b, "classname", bool1, bool2, "superclassname"
-	//		The bool1 is whether this class is an interface (true if it is).
-	//		The bool2 is whether this class is abstract (true if it is).	
-	//
-	// VALUE: 2b, tb, value
-	//		Where tb is the type in byte, and value is the appropriate value shown in
-	//		table above.
-	//		OBJECT_ID: 50b, n
-	//			Where "n" is the object id.
-	//		NEW_OBJECT_ID: 51b, n1, n2
-	//			Where "n1" is class ObjectID of the object that the object_id ("n2") is made of.
-	//		OBJECT: 19b, n, writeObject
-	//			Where "n" is the classObjectID of the class of the type of the object.
-	//			NOTE: Object should be used only very rarely. Identity is lost, i.e.
-	//			a copy is made each time and it can't be referenced back on the remote
-	//			VM.
-	//		ARRAY_IDS: 52b, id, n, [tb, value, ...]
-	//			This is a very special array. It contains at least one ID. Therefor all of the 
-	//			First level entries are value objects. 
-	//			"id" is the id of the component type of the array(e.g. id for Object, or if multi-dimensional String[] (this will produce String[][]).
-	//			"n" is the number of entries in the array. Followed by the values, one of the
-	//			values could be an ARRAY_IDS too. The reading/writing of these are special because
-	//			there is a callback mechanism to process the individual entries. This is so that
-	//			temp arrays of ValueObjects won't need to be created to handle this, so it can
-	//			go directly from the array to/from the stream.
-	//		
-	// RELEASE_OBJECT: 7b, n
-	//		Where the n is the object id to release. There is no confirmation to read back.
-	//
-	// ERROR: 6b, n, tb, ...
-	//      n is the error code for this error.
-	//		tb is a type flag, followed by the value. The value is dependent upon
-	//		the command that this is error is from. If a THROW, then the THROW is ALWAYS a new
-	//		ID, it can never be an existing id.
-	//      
-	//
-	// TO_BEAN_STRING: 9b, n
-	//		Where n is the object id to produce the bean string for.
-	//		It will return a VALUE command where the type is String.
-	//
-	// NEW_INSTANCE: 10b, n
-	//		Where n is the class object id of the class to create a new instance of using the default ctor.
-	//		It will return either a VALUE command containing the new value (of type OBJECT_ID/NEW_OBJECT_ID if not
-	//		one of the constant types with the true classID in it) or an ERROR command. (The ERROR could
-	//		be a THROW type). If the object created is not assignable to the type passed in, then
-	//		an ERROR is returned with CLASS_CAST_EXCEPTION flag.
-	//
-	// NEW_INIT_STRING: 11b, n, "initstring"
-	//		Where n is the class object id of the class this initstring is supposed to create for.
-	//		It will return either a VALUE command containing the new value (of type OBJECT_ID/NEW_OBJECT_ID if not
-	//		one of the constant types with the true classID in it) or an ERROR command. (The ERROR could
-	//		be a THROW type). The error could also be CANNOT_EVALUATE_STRING. This means that the string was too
-	//		complicated for the evaluator and needs to be compiled and tried again. (TBD)
- 	//		If the object created is not assignable to the type passed in, then
-	//		an ERROR is returned with CLASS_CAST_EXCEPTION flag.
-	//
-	// GET_OBJECT_DATA: 14b, n
-	//		Where n is the id of the object being requested. It will return a NEW_OBJECT_ID value with the info.
-	//
-	// GET_METHOD: 9b, classId, "methodName", n1, [n2]...
-	//		Where classID is the id of the class the method should be found in.
-	//		Where n1 is the number of parm types following, and n2 is replicated that many times,
-	//		each entry is the id of class for the parm type. (0 is valid which means there are no parms).
-	//		The return will be a VALUE command containing the OBJECT_ID of the method.
-	//
-	// GET_CTOR: 10b, classId, n1, [n2]...
-	//		Where classID is the id of the class the method should be found in.
-	//		Where n1 is the number of parm types following, and n2 is replicated that many times,
-	//		each entry is the id of class for the parm type. (0 is valid which means there are no parms).
-	//		The return will be a VALUE command containing the OBJECT_ID of the method.
-	//	
-	// GET_FIELD:
-	//
-	// GET_CTOR:
-	//
-	// INVOKE: 15b, n1, tb, value1, value2
-	//		Where "n1" is the id of the method to invoke.
-	//		tb, value1 is the value of who to invoke against (it is usually an OBJECT_ID for tb)
-	//      value2 is an ARRAY_IDS type or an OBJECT array of values if all constants.
-	//		What is returned is a VALUE command containing the return value, (the value will be null (VOID) if
-	//		there is no return type (i.e. the method was void). So null can be returned either if the value
-	//		was null or if the return type was void.
-	//
-	// EXPRESSION_TREE_COMMAND: 20b, n, b
-	//		Receiving an expression tree subcommand. Where "n" is a unique id number of the
-	//		expression being processed. Where "b" is byte code, defined in ExpressionCommands, that
-	//		determines the type of expression tree commands.
-	//		There can be more data following, but it is read by the 
-	//		ExpressionProcesserController, not by the connection. See the controller for the subcommands.
-	//
-	//		The id number is the id of the expression being processed. This allows more than one expression
-	//		to be processed at a time from this connection.
-	//
-	//		@see ExpressionCommands
-	//		@see ExpressionProcessController
-	//
-	// INVOKE_WITH_METHOD_PASSED: 20b,  classId, "methodName", value0, tb, value1, value2
-	//		Where classID is the id of the class the method should be found in.
-	//		value0 is an ARRAY_IDS type for the type of the parms, or null type for no parms.  
-	//		tb, value1 is the value of who to invoke against (it is usually an OBJECT_ID for tb)
-	//      value2 is an ARRAY_IDS type or an OBJECT array of values if all constants.
-	//		What is returned is a VALUE command containing the return value, (the value will be null (VOID) if
-	//		there is no return type (i.e. the method was void). So null can be returned either if the value
-	//		was null or if the return type was void.
-	//
-	// GET_ARRAY_CONTENTS: 21b, arrayId
-	//		Where arrayID is the id of the array to get the contents of. What is returned is a value command
-	//		containing an array of ids of the first dimension contents.
-	//
-	// Callback commands:
-	//
-	// CALLBACK: 255b, n1, n2, value1
-	//      Where
-	//        "n1" is the id of callback type (these are registered with the callback server)
-	//        "n2" is the msgId for the callback (These are entirely callback dependent and are maintained by the callback developer)
-	//        value1 is an ARRAY_IDS type or an OBJECT array of values if all constants. These are
-	//          parms to send to the callback msg.
-	//      It will return a CALLBACK_DONE.
-	//
-	// CALLBACK_DONE: 254b, value command.
-	//		What comes back is a value command (i.e. Commands.VALUE followed by value). This allows
-	//		ERRORS to be sent back too.
-	//
-	// CALLBACK_STREAM: 253b, n1, n2
-	//      Where
-	//        "n1" is the id of callback type (these are registered with the callback server)
-	//        "n2" is the msgId for the callback (These are entirely callback dependent and are maintained by the callback developer)
-	//		It will create a CallbackInputStream and notify the registered callback that the
-	//		stream is available. It will send a callback_done when it has accepted the request
-	//		but before it notifies the registered callback with the stream. This lets the remote
-	//		vm know that it can start sending data.
-	
-
-	// To the MasterServer socket:
-	// The MasterServer socket will expect input in DataInputStream format, and DataOutputStream for return.
-	// The socket will be short-lived. It will be for one transaction only. Each request will return a new socket.
-	//
-	// ALIVE: 16b, n1
-	//      Where
-	//        "n1" is the id of the registry this is asking to test for aliveness
-	//      Will return bool, where false if registry is not alive, true if it is alive.
-	// REMOTE_STARTED: 17b, n1, n2
-	//      Where
-	//        "n1" is the id of the registry this is telling that it is started
-	//        "n2" is the serversocket port number of the server socket in this remote vm.
-	//      Will return bool, where false if registry is not alive, true if it is alive. If false, then terminate the server because nothing to talk to.
-	// GET_CALLBACK_PORT: 18b, n1
-	//      Where
-	//        "n1" is the id of the registry this is asking for the callback server port.
-	//      Will return int, where the value is the callback server port number. -1 if there is no callback server port.		
-	
-	/**
-	 * This class is the return from a read value. It contains the
-	 * type of the value and the value itself. Since primitives can be
-	 * returned also, there is a slot for each one and the type should
-	 * be checked to see which one is set.
-	 *
-	 * Also, if the type is OBJECT, then the anObject has the object in it, AND
-	 * the classID field has the object_id of the class of the object so that the
-	 * appropriate beantypeproxy can be found to use that object. Also, only
-	 * IREMConstantBeanTypeProxies can be of type OBJECT. That is because those
-	 * are the only ones that know how to take the value object and interpret it.
-	 *
-	 * If the type is OBJECT_ID or NEW_OBJECT_ID, then the objectID field will be set with
-	 * the id.
-	 * If the type is NEW_OBJECT_ID, then the classID field will
-	 * have the class objectID of the class of the object for which object_id proxies.
-	 *
-	 * THROW is treated like NEW_OBJECT_ID in what fields are set since it is a new object.
-	 *
-	 * Note: so as not to create unnecessary objects, if the Object type of the primitive is being
-	 * sent, then the primitive field will be set instead, though the type
-	 * will still be the Object type (i.e. if type = L_BYTE, the aByte will
-	 * have the value in it).
-	 * 
-	 * Note: Also flags can be send back. The type will be FLAG and the anInt field will be the
-	 * flag value. This is used to indicate special things that aren't values. Most useful in
-	 * arrays where one of the entries is not a value. This can only be used if readValue
-	 * is passed a flag indicating flags are valid, otherwise it will be treated as not valie.
-	 */
-	public static class ValueObject implements Cloneable {
-		public byte type;	// Same as the types above
-		public byte aByte;
-		public char aChar;
-		public double aDouble;
-		public float aFloat;
-		public int anInt;
-		public short aShort;
-		public long aLong;
-		public boolean aBool;
-		public int objectID;	// The object id for either OBJECT_ID or NEW_OBJECT_ID.
-		public int classID;		// The class object id of the value in Object if the type is Object
-		public Object anObject;	// String also will be in here
-		
-		public ValueObject() {
-			type = VOID;
-		}
-		
-		public Object clone() {
-			try {
-				return (ValueObject) super.clone();
-			} catch (CloneNotSupportedException e) {
-				return null;
-			}
-		}
-		
-		/**
-		 * Return whether the value stored here is a primitive.
-		 * 
-		 * @return <code>true</code> if value is a primitive type.
-		 * 
-		 * @since 1.0.0
-		 */
-		public boolean isPrimitive() {
-			return getPrimitiveType().isPrimitive();
-		}
-		
-		/**
-		 * Get the primitive type of the value. 
-		 * @return The primitive type, or if not primitive, it returns simply <code>Object.class</code>.
-		 * 
-		 * @since 1.0.0
-		 */
-		public Class getPrimitiveType() {
-			switch (type) {
-				case BYTE:
-					return Byte.TYPE;
-				case CHAR:
-					return Character.TYPE;
-				case DOUBLE:
-					return Double.TYPE;
-				case FLOAT:
-					return Float.TYPE;
-				case INT:
-					return Integer.TYPE;
-				case SHORT:
-					return Short.TYPE;
-				case LONG:
-					return Long.TYPE;
-				case BOOL:
-					return Boolean.TYPE;
-				default:
-					return Object.class;
-			}	
-			
-		}
-		
-		/**
-		 * Get the type as one of the valid Commands.Types. VOID, BYTE, L_BYTE, etc.
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public int getType() {
-			return type;
-		}
-		
-		/**
-		 * Special getter to get the type as an Object, this is used by invoke for example.
-		 */
-		public Object getAsObject() {
-			switch (type) {
-				case VOID:
-					return null;
-				case BYTE:
-				case L_BYTE:
-					return new Byte(aByte);
-				case CHAR:
-				case L_CHAR:
-					return new Character(aChar);
-				case DOUBLE:
-				case L_DOUBLE:
-					return new Double(aDouble);
-				case FLOAT:
-				case L_FLOAT:
-					return new Float(aFloat);
-				case INT:
-				case L_INT:
-					return new Integer(anInt);
-				case SHORT:
-				case L_SHORT:
-					return new Short(aShort);
-				case LONG:
-				case L_LONG:
-					return new Long(aLong);
-				case BOOL:
-				case L_BOOL:
-					return aBool ? Boolean.TRUE : Boolean.FALSE;
-				case STRING:
-					return (String) anObject;
-				case OBJECT:
-					return anObject;
-				
-				default: 
-					return null;	// Can't handle others. Those need to be checked before calling.
-			}
-		}
-		
-		/**
-		 * Special setter to set the value depending upon the type.
-		 */
-		public void setAsObject(Object value, int valueClassID) {
-			switch (valueClassID) {
-				case VOID:
-					set();
-					break;
-				case BYTE_CLASS:
-					set((Byte) value);
-					break;
-				case CHARACTER_CLASS:
-					set((Character) value);
-					break;
-				case DOUBLE_CLASS:
-					set((Double) value);
-					break;
-				case FLOAT_CLASS:
-					set((Float) value);
-					break;
-				case INTEGER_CLASS:
-					set((Integer) value);
-					break;
-				case SHORT_CLASS:
-					set((Short) value);
-					break;
-				case LONG_CLASS:
-					set((Long) value);
-					break;
-				case BOOLEAN_CLASS:
-					set((Boolean) value);
-					break;
-				case STRING_CLASS:
-					set((String) value);
-					break;
-				default:
-					set(value, valueClassID);
-					break;
-			}
-		}
-			
-		public void set() {
-			type = VOID;
-			anObject = null;
-		}
-		
-		public void setFlag(int flag) {
-			type = FLAG;
-			anInt = flag;
-		}
-		
-		public void set(byte value) {
-			type = BYTE;
-			aByte = value;
-			anObject = null;
-		}
-		public void set(Byte value) {
-			if (value != null) {
-				type = L_BYTE;
-				aByte = value.byteValue();
-				anObject = null;
-			} else
-				set();
-		}
-		public void set(char value) {
-			type = CHAR;
-			aChar = value;
-			anObject = null;
-		}
-		public void set(Character value) {
-			if (value != null) {
-				type = L_CHAR;
-				aChar = value.charValue();
-				anObject = null;
-			} else
-				set();
-		}
-		public void set(double value) {
-			type = DOUBLE;
-			aDouble = value;
-			anObject = null;
-		}
-		public void set(Double value) {
-			if (value != null) {
-				type = L_DOUBLE;
-				aDouble = value.doubleValue();
-				anObject = null;
-			} else
-				set();
-		}
-		public void set(float value) {
-			type = FLOAT;
-			aFloat = value;
-			anObject = null;
-		}
-		public void set(Float value) {
-			if (value != null) {
-				type = L_FLOAT;
-				aFloat = value.floatValue();
-				anObject = null;
-			} else
-				set();
-		}
-		public void set(int value) {
-			type = INT;
-			anInt = value;
-			anObject = null;
-		}
-		public void set(Integer value) {
-			if (value != null) {
-				type = L_INT;
-				anInt = value.intValue();
-				anObject = null;
-			} else
-				set();
-		}
-		public void set(short value) {
-			type = SHORT;
-			aShort = value;
-			anObject = null;
-		}
-		public void set(Short value) {
-			if (value != null) {
-				type = L_SHORT;
-				aShort = value.shortValue();
-				anObject = null;
-			} else
-				set();
-		}
-		public void set(long value) {
-			type = LONG;
-			aLong = value;
-			anObject = null;
-		}
-		public void set(Long value) {
-			type = L_LONG;
-			aLong = value.longValue();
-			anObject = null;
-		}
-		public void set(boolean value) {
-			type = BOOL;
-			aBool = value;
-			anObject = null;
-		}
-		public void set(Boolean value) {
-			if (value != null) {
-				type = L_BOOL;
-				aBool = value.booleanValue();
-				anObject = null;
-			} else
-				set();
-		}
-		public void set(String value) {
-			if (value != null) {
-				type = STRING;
-				anObject = value;
-			} else
-				set();
-		}				
-		public void set(Object value, int classObjectID) {
-			if (value != null) {
-				type = OBJECT;
-				classID = classObjectID;
-				anObject = value;
-			} else
-				set();
-		}
-		public void setObjectID(int value) {
-			type = OBJECT_ID;
-			objectID = value;
-			anObject = null;
-		}
-		
-		// Use this if the object is an array containing IDs. The retriever
-		// will be used to get the next value to write to the stream.
-		public void setArrayIDS(ValueRetrieve retriever, int arraySize, int componentType) {
-			type = ARRAY_IDS;
-			classID = componentType;
-			anInt = arraySize;
-			anObject = retriever;
-		}
-		
-		
-		// Use this if this is a new object so that we can get the correct class type.
-		public void setObjectID(int value, int classObjectID) {
-			type = NEW_OBJECT_ID;
-			objectID = value;
-			classID = classObjectID;
-			anObject = null;
-		}									
-		
-		// Use this to indicate an exception occured.
-		public void setException(int throwID, int throwClassID) {
-			type = THROW;
-			objectID = throwID;
-			classID = throwClassID;
-			anObject = null;
-		}
-	}
-	
-	/************************
-	 * Helpful commands.
-	 * - If a command throws any exception except CommandErrorException, or
-	 *   UnexpectedCommandException with recoverable true, then the connection is in a bad state
-	 *   and needs to be closed.
-	 ************************/
-	
-	/**
-	 * Use this to read a value (inputstream should be pointing to the type byte as the next byte to read).
-	 * The primitive fields of "value" will not be changed if they are not the
-	 * type of the value being read. However, anObject will be set to null.
-	 */
-	 
-	/**
-	 * Error flags for UnexpectedCommandExceptions that can be thrown.
-	 */
-	public static final Object UNKNOWN_READ_TYPE = "UNKNOWN_READ_TYPE";		// The read type byte was not a valid type //$NON-NLS-1$
-	public static final Object UNKNOWN_WRITE_TYPE = "UNKNOWN_WRITE_TYPE";		// The write type byte was not a valid type	 //$NON-NLS-1$
-	public static final Object TYPE_INVALID_FOR_COMMAND = "TYPE_INVALID_FOR_COMMAND";		// The data type read is not valid for this command //$NON-NLS-1$
-	public static final Object UNKNOWN_COMMAND = "UNKNOWN_COMMAND";			// The command flag is unknown //$NON-NLS-1$
-	public static final Object SOME_UNEXPECTED_EXCEPTION = "SOME_UNEXPECTED_EXCEPTION";	// There was some kind of exception that wasn't expected. The data will be the exception. //$NON-NLS-1$
-	public static final Object TOO_MANY_BYTES = "TOO_MANY_BYTES";			// Too many bytes were sent on a writeBytes. It was //$NON-NLS-1$
-																		// more than could be read into the buffer. The data will be the size sent.
-
-	/**
-	 * Read a value from the stream into the value object. It will not allow values of type FLAG.
-	 * 
-	 * @param is
-	 * @param value
-	 * @param allowFlag
-	 * @return the value object sent in. This allows <code>value = Commands.readValue(is, new Commands.ValueObject());</code> 
-	 * @throws CommandException
-	 * 
-	 * 
-	 * @since 1.0.0
-	 */
-	public static ValueObject readValue(DataInputStream is, ValueObject value) throws CommandException {
-		readValue(is, value, false);
-		return value;
-	}
-
-	/**
-	 * Read a value from the stream into the value object. It will allow values of type FLAG if allowFlag is true.
-	 * @param is
-	 * @param value
-	 * @param allowFlag <code>true</code> if values of type flag are allow.
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void readValue(DataInputStream is, ValueObject value, boolean allowFlag) throws CommandException {
-		try {
-			value.anObject = null;
-			value.type = is.readByte();
-			switch (value.type) {
-				case BYTE:
-				case L_BYTE:
-					value.aByte = is.readByte();
-					break;
-				case CHAR:
-				case L_CHAR:
-					value.aChar = is.readChar();
-					break;
-				case DOUBLE:
-				case L_DOUBLE:
-					value.aDouble = is.readDouble();
-					break;
-				case FLOAT:
-				case L_FLOAT:
-					value.aFloat = is.readFloat();
-					break;
-				case INT:
-				case L_INT:
-					value.anInt = is.readInt();
-					break;
-				case OBJECT_ID:
-					value.objectID = is.readInt();
-					break;					
-				case NEW_OBJECT_ID:
-					value.classID = is.readInt();
-					value.objectID = is.readInt();
-					break;
-				case THROW:
-					value.classID = is.readInt();
-					value.objectID = is.readInt();
-					break;				
-				case SHORT:
-				case L_SHORT:
-					value.aShort = is.readShort();
-					break;
-				case LONG:
-				case L_LONG:
-					value.aLong = is.readLong();
-					break;
-				case BOOL:
-				case L_BOOL:
-					value.aBool = is.readBoolean();
-					break;
-				case STRING:
-					value.anObject = readStringData(is);
-					break;
-				case OBJECT:
-					value.classID = is.readInt();	// Read the class id
-					ObjectInputStream oi = new ObjectInputStream(is);
-					value.anObject = oi.readObject();	// Read the object itself
-					oi = null;	// Don't close it, that would close the stream itself.
-					break;
-				case ARRAY_IDS:
-					// The header for an array of ids.
-					value.classID = is.readInt();	// The component type of the array
-					value.anInt = is.readInt();	// The size of the array.
-					// At this point, it is the responsibility of the caller to use readArray to read in the array.
-					break;
-				case VOID:
-					break;
-				case FLAG:
-					if (allowFlag) {
-						value.anInt = is.readInt();
-						break;
-					}
-					// Flags not allowed, so drop into default.
-				default:
-					throw new UnexpectedCommandException(UNKNOWN_READ_TYPE, false, new Byte(value.type));
-			}
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}
-	}
-	
-	/**
-	 * Special interface used to read back arrays. It will be called when 
-	 */
-	public static interface ValueSender {
-		/**
-		 * This is called for each entry from the array. It is assumed that the ValueSender has
-		 * the array that is being built.
-		 * @param value
-		 * 
-		 * @since 1.1.0
-		 */
-		public void sendValue(ValueObject value);
-
-		/**
-		 * This is called when an ARRAY_IDS is found within the reading of the array (i.e. nested arrays)
-		 * It is asking for a new ValueSender to use while this nested array. The arrayValue contains
-		 * the valueobject for the array header (i.e. the class id of the array and the number of elements).
-		 * It is the responsibility of the ValueSender to store this array in the array that is being built.
-		 * @param arrayValue
-		 * @return
-		 * 
-		 * @since 1.1.0
-		 */
-		public ValueSender nestedArray(ValueObject arrayValue);
-		
-		/**
-		 * Called to initialize the sender with the given array header. This is not always called, each usage
-		 * knows whether it can be called or not. For example the implementation of nestedArray may not need to call initialize.
-		 * @param arrayHeader
-		 * 
-		 * @since 1.1.0
-		 */
-		public void initialize(ValueObject arrayHeader);
-		
-	}	
-	
-	/*
-	 * NOTE: It is important that on the IDE side that this is called within a transaction. 
-	 * If not, there could be some corruption if proxy cleanup occurs in the middle.
-	 */
-	public static void readArray(DataInputStream is, int arraySize, ValueSender valueSender, ValueObject value, boolean allowFlag) throws CommandException {
-		// Anything exception other than a CommandException, we will try to flush the input so that
-		// it can continue with the next command and not close the connection.
-		RuntimeException exception = null;
-		for (int i=0; i<arraySize; i++) {
-			readValue(is, value, allowFlag);
-			if (exception == null) 
-				try {
-					if (value.type != ARRAY_IDS)
-						valueSender.sendValue(value);
-					else {
-						// We have a nested array.
-						ValueSender nestedSender = null;
-						try {
-							nestedSender = valueSender.nestedArray(value);
-						} catch (RuntimeException e) {
-							// We still need to read in the array to flush. Create
-							// a dummy sender that accepts everything sent to it.
-							exception = e;
-							nestedSender = new ValueSender() {
-								public void sendValue(ValueObject value) {
-								}
-								public ValueSender nestedArray(ValueObject arrayValue) {
-									return this;
-								}
-								public void initialize(ValueObject arrayHeader) {
-								}
-							};
-						}
-						readArray(is, value.anInt, nestedSender, value, allowFlag);
-						if (exception != null)
-							throw exception;	// An exception ocurred in new sender request.
-					}
-				} catch (RuntimeException e) {
-					// We want to flush the queue, so save the exception for later.
-					exception = e;
-				}
-		}
-		if (exception != null)
-			throw exception;
-	}
-				
-
-	/**
-	 * Special interface to handle writing the ARRAY_IDS type.
-	 * An instance of this object will be in the valueObject sent to writeValue when the type of the value
-	 * is ARRAY_IDS. Then write value will know to call this interface to write out the values.
-	 * 
-	 * @since 1.1.0
-	 */
-	public static interface ValueRetrieve {
-		/**
-		 * Returns the next value object to send. It will be called the number of times that the size of 
-		 * the array was set to be send. 
-		 * @return The value object to send.
-		 * @throws EOFException
-		 * 
-		 * @since 1.1.0
-		 */
-		public ValueObject nextValue() throws EOFException;
-	}	
-
-	public static void writeValue(DataOutputStream os, ValueObject value, boolean asValueCommand) throws CommandException  {
-		writeValue(os, value, asValueCommand, asValueCommand ? true : false);
-	}
-	
-	public static void writeValue(DataOutputStream os, ValueObject value, boolean asValueCommand, boolean flush) throws CommandException  {
-		try {
-			if (asValueCommand)
-				os.writeByte(VALUE);
-			switch (value.type) {
-				case BYTE:
-				case L_BYTE:
-					os.writeByte(value.type);
-					os.writeByte(value.aByte);
-					break;
-				case CHAR:
-				case L_CHAR:
-					os.writeByte(value.type);			
-					os.writeChar(value.aChar);
-					break;
-				case DOUBLE:
-				case L_DOUBLE:
-					os.writeByte(value.type);			
-					os.writeDouble(value.aDouble);
-					break;
-				case FLOAT:
-				case L_FLOAT:
-					os.writeByte(value.type);			
-					os.writeFloat(value.aFloat);
-					break;
-				case INT:
-				case L_INT:
-					os.writeByte(value.type);			
-					os.writeInt(value.anInt);
-					break;
-				case OBJECT_ID:
-					os.writeByte(value.type);
-					os.writeInt(value.objectID);
-					break;					
-				case NEW_OBJECT_ID:
-					os.writeByte(value.type);
-					os.writeInt(value.classID);
-					os.writeInt(value.objectID);
-					break;
-				case THROW:
-					os.writeByte(value.type);
-					os.writeInt(value.classID);
-					os.writeInt(value.objectID);
-					break;
-				case SHORT:
-				case L_SHORT:
-					os.writeByte(value.type);			
-					os.writeShort(value.aShort);
-					break;
-				case LONG:
-				case L_LONG:
-					os.writeByte(value.type);			
-					os.writeLong(value.aLong);
-					break;
-				case BOOL:
-				case L_BOOL:
-					os.writeByte(value.type);			
-					os.writeBoolean(value.aBool);
-					break;
-				case STRING:
-					os.writeByte(value.type);			
-					sendStringData(os, (String) value.anObject);
-					break;
-				case OBJECT:
-					os.writeByte(value.type);
-					os.writeInt(value.classID);	// Write the class ID.
-					ObjectOutputStream oos = new ObjectOutputStream(os);
-					oos.writeObject(value.anObject);
-					oos.flush();
-					oos = null;	// Don't close it, that would close the stream itself.
-					break;					
-				case ARRAY_IDS:
-					// We are writing out an array with ID's in it. The fields of the vale object will be:
-					// 	classID: The class id of the component type of the array.
-					//  anObject: Contains the ValueRetriever to get the next value.
-					os.writeByte(ARRAY_IDS);	
-					os.writeInt(value.classID);
-					os.writeInt(value.anInt);	// The size of the array.
-					// Now comes the kludgy part, writing the values.
-					ValueRetrieve retriever = (ValueRetrieve) value.anObject;
-					int len = value.anInt;
-					while (len-- > 0)
-						writeValue(os, retriever.nextValue(), false);
-					break;
-				case VOID:
-					os.writeByte(value.type);			
-					break;
-				case FLAG:
-					os.writeByte(FLAG);
-					os.writeInt(value.anInt);
-					break;
-				default:
-					os.writeByte(VOID);
-					throw new UnexpectedCommandException(UNKNOWN_WRITE_TYPE, true, value);					
-			}
-			if (flush)
-				os.flush();
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}	
-	
-	/**
-	 * For reading a large number of bytes. This is a value type, not a command. The command 
-	 * needs to be handled separately. It returns the number of bytes read. -1 if there
-	 * is no more data to send and the stream should closed. If read something but not all,
-	 * then just what it could read will be returned. The next read will return -1 for EOF.
-	 *
-	 * It will read from the format:
-	 *   int - number of bytes to read (retrieved from the stream).
-	 *   bytes - the actual bytes.
-	 *
-	 * Note: A command exception will be thrown if the number of bytes to read
-	 *       is larger than the size of the byte array.
-	 */
-	public static int readBytes(DataInputStream is, byte[] bytes) throws CommandException  {
-		try {
-			int bytesToRead = -1;
-			try {
-				bytesToRead = is.readInt();
-			} catch (EOFException e) {
-			}
-			if (bytesToRead == -1)
-				return -1;
-			if (bytesToRead > bytes.length)
-				throw new UnexpectedCommandException(TOO_MANY_BYTES, false, new Integer(bytesToRead));
-			int start = 0;
-			int toRead = bytesToRead;
-			while (toRead > 0) {
-				int bytesRead = is.read(bytes, start, toRead);
-				if (bytesRead == -1)
-					return bytesToRead != toRead ? bytesToRead-toRead : -1;	// Actual number read, or if none read, then EOF
-				start+=bytesRead;
-				toRead-=bytesRead;
-			}
-			return bytesToRead;
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-		
-	/**
-	 * For writing a large number of bytes. This is a value type, not a command. The command 
-	 * needs to be handled separately.
-	 *
-	 * It will write it in the format:
-	 *   int - number of bytes
-	 *   bytes - the actual bytes.
-	 *
-	 */
-	public static void writeBytes(DataOutputStream os, byte[] bytes, int bytesToWrite) throws CommandException  {
-		try {
-			os.writeInt(bytesToWrite);
-			os.write(bytes, 0, bytesToWrite);
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}	
-		
-	/************************
-	 * Send command helpers
-	 ************************/
-	 
-	public static void sendQuitCommand(DataOutputStream os) throws IOException {
-		os.writeByte(QUIT_CONNECTION);
-		os.flush();
-			
-	}
-	
-	public static void sendTerminateCommand(DataOutputStream os) throws IOException {
-		os.writeByte(TERMINATE_SERVER);
-		os.flush();
-	}
-	
-	
-	public static void releaseObjectCommand(DataOutputStream os, int id) throws IOException {
-		os.writeByte(Commands.RELEASE_OBJECT);
-		os.writeInt(id);
-		os.flush();
-	}
-
-	/**
-	 * Send a callback request. The value is to be send separately.
-	 */
-	public static void sendCallbackCommand(DataOutputStream os, int callbackID, int msgID) throws CommandException {
-		try {
-			os.writeByte(CALLBACK);
-			os.writeInt(callbackID);
-			os.writeInt(msgID);
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-		
-	public static void sendCallbackDoneCommand(DataOutputStream os, ValueObject value, int errorCode) throws CommandException {
-		try {
-			os.writeByte(CALLBACK_DONE);
-			if (errorCode == NO_ERROR) {
-				writeValue(os, value, true);
-				os.flush();
-			} else
-				sendErrorCommand(os, errorCode, value);
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-	
-	/**
-	 * Send a start callback stream request. The data will be written separately.
-	 * There will not be a callback done command. It will return as soon as the command
-	 * is sent.
-	 */
-	public static void sendCallbackStreamCommand(DataOutputStream os, int callbackID, int msgID) throws CommandException {
-		try {
-			os.writeByte(CALLBACK_STREAM);
-			os.writeInt(callbackID);
-			os.writeInt(msgID);
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-	
-	protected static final byte STRING_NOT_CHUNKED = 0;
-	protected static final byte STRING_CHUNKED = 1;
-	protected static final byte MORE_CHUNKS = 2;
-	protected static final byte LAST_CHUNK = 3;
-	protected static final int CHUNK_SIZE = 65000/3; 
-	
-	/**
-	 * Send string data. This is for general string data. It makes sure that if the string is too big (there is a UTF-8 limit)
-	 * that it will send it in chunks. Use the corresponding <code>readStringData</code> to read such data in.
-	 * @param os
-	 * @param string
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendStringData(DataOutputStream os, String string) throws IOException {
-		// UTF-8 can take up to three bytes for each char. To be on safe side we will
-		// not send a string larger than 65K/3 as one chunk.
-		if (string.length() <= CHUNK_SIZE) {
-			// Less than the limit, send byte to indicate not chunked.
-			os.writeByte(STRING_NOT_CHUNKED);
-			os.writeUTF(string);
-		} else {
-			// Over limit, need to chunk it.
-			// send byte to indicate chunked, then send true length so that other side knows how big to create.
-			os.writeByte(STRING_CHUNKED);
-			os.writeInt(string.length());
-			// Now send first chunk
-			for(int i=0; i<string.length(); i+=CHUNK_SIZE) {
-				int endIndex = i+CHUNK_SIZE;
-				if (i == 0) {
-					// The first chunk is just written as is. We know endIndex will be ok because we wouldn't get here unless LARGER than chunksize.
-					os.writeUTF(string.substring(i, endIndex));
-				} else {
-					// Following chunks have either byte MORE_CHUNKS or LAST_CHUNK
-					if (endIndex >= string.length()) {
-						// This is last chunk.
-						os.writeByte(LAST_CHUNK);
-						os.writeUTF(string.substring(i));
-					} else {
-						// This is an intermediate chunk.
-						os.writeByte(MORE_CHUNKS);
-						os.writeUTF(string.substring(i, endIndex));
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Read a string that was sent using the sendStringData command.
-	 * @param in
-	 * @return
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static String readStringData(DataInputStream is) throws IOException {
-		byte chunked = is.readByte();
-		if (chunked == STRING_NOT_CHUNKED)
-			return is.readUTF();	// Not chunk, just read it.
-		else {
-			// It is chunked.
-			int totalLength = is.readInt();	// Get the total length.
-			StringBuffer sbr = new StringBuffer(totalLength);
-			while(true) {
-				sbr.append(is.readUTF());
-				if (chunked != LAST_CHUNK)
-					chunked = is.readByte();
-				else
-					break;
-			}
-			return sbr.toString();
-		}
-	}
-	
-	/**
-	 * Read back command, expecting either a VALUE or an ERROR. You can request that
-	 * it be of a specific type (if any type can be accepted then enter -1 for the type).
-	 */
-	public static final byte NO_TYPE_CHECK = -1;
-	public static void readBackValue(DataInputStream is, ValueObject value, byte expectedType) throws CommandException {
-		try {		
-			byte v = is.readByte();
-			switch (v) {
-				case VALUE:
-					readValue(is, value);
-					if (expectedType != NO_TYPE_CHECK && 
-							!(expectedType == value.type || (expectedType == Commands.OBJECT_ID && value.type == NEW_OBJECT_ID)))
-						throw new UnexpectedCommandException(TYPE_INVALID_FOR_COMMAND, true, value);
-					break;
-				case ERROR:
-					int code = is.readInt();
-					readValue(is, value);
-					throw new CommandErrorException(code, value);
-				default:
-					throw new UnexpectedCommandException(UNKNOWN_COMMAND, false, new Byte(v));
-			}
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}				
-	}
-		
-	
-	/**
-	 * GetClass command returns a GetClassReturn object.
-	 */
-	public static class GetClassReturn {
-		public int classID;
-		public boolean isInterface;
-		public boolean isAbstract;
-		public String superClassname;
-	}
-	
-	public static GetClassReturn sendGetClassCommand(DataOutputStream os, DataInputStream is, String className) throws CommandException {
-		try {
-			os.writeByte(GET_CLASS);
-			os.writeUTF(className);
-			os.flush();
-			
-			GetClassReturn ret = new GetClassReturn();
-			byte v = is.readByte();
-			switch (v) {
-				case GET_CLASS_RETURN:
-					ret.classID = is.readInt();	// Get the new class id.
-					ret.isInterface = is.readBoolean();	// Get the isInterface flag
-					ret.isAbstract = is.readBoolean();	// Get the isAbstract flag.					
-					ret.superClassname = is.readUTF();	// Get the super class name.
-					return ret;
-				case ERROR:
-					int code = is.readInt();
-					ValueObject value = new ValueObject();
-					readValue(is, value);
-					throw new CommandErrorException(code, value);
-				default:
-					throw new UnexpectedCommandException(UNKNOWN_COMMAND, false, new Byte(v));
-			}
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-	
-	/**
-	 * GetClassFromID command returns a GetClassIDReturn object.
-	 */
-	public static class GetClassIDReturn {
-		public String className;
-		public boolean isInterface;
-		public boolean isAbstract;
-		public String superClassname;
-	}
-		
-	public static GetClassIDReturn sendGetClassFromIDCommand(DataOutputStream os, DataInputStream is, int classID) throws CommandException {
-		try {
-			os.writeByte(GET_CLASS_FROM_ID);
-			os.writeInt(classID);
-			os.flush();
-			
-			GetClassIDReturn ret = new GetClassIDReturn();
-			byte v = is.readByte();
-			switch (v) {
-				case GET_CLASS_ID_RETURN:
-					ret.className = is.readUTF();	// Get the new class name.
-					ret.isInterface = is.readBoolean();	// Get the isInterface flag
-					ret.isAbstract = is.readBoolean();	// Get the isAbstract flag.
-					ret.superClassname = is.readUTF();	// Get the super class name.
-					return ret;
-				case ERROR:
-					int code = is.readInt();
-					ValueObject value = new ValueObject();
-					readValue(is, value);
-					throw new CommandErrorException(code, value);
-				default:
-					throw new UnexpectedCommandException(UNKNOWN_COMMAND, false, new Byte(v));
-			}
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-		
-	public static void sendGetObjectData(DataOutputStream os, DataInputStream is, int objectID, ValueObject valueReturn) throws CommandException {
-		try {
-			os.writeByte(GET_OBJECT_DATA);
-			os.writeInt(objectID);
-			os.flush();
-			readBackValue(is, valueReturn, NEW_OBJECT_ID);
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}		
-	
-	public static void sendErrorCommand(DataOutputStream os, int code, ValueObject errorValue) throws CommandException {
-		try {
-			os.writeByte(ERROR);
-			os.writeInt(code);
-			writeValue(os, errorValue, false);
-			os.flush();
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}		
-	
-	public static void sendNewInstance(DataOutputStream os, DataInputStream is, int classId, String initializationString, ValueObject newValueReturn) throws CommandException {
-		try {
-			os.writeByte(NEW_INIT_STRING);
-			os.writeInt(classId);
-			os.writeUTF(initializationString);
-			os.flush();
-			readBackValue(is, newValueReturn, NO_TYPE_CHECK);
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}	
-	
-	
-	public static void sendInvokeMethodCommand(DataOutputStream os, DataInputStream is, int methodID, ValueObject invokeOn, ValueObject parms, ValueObject valueReturn) throws CommandException {
-		try {
-			os.writeByte(INVOKE);
-			os.writeInt(methodID);
-			writeValue(os, invokeOn, false);
-			writeValue(os, parms, false);
-			os.flush();
-			readBackValue(is, valueReturn, NO_TYPE_CHECK);
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-
-	public static void sendInvokeMethodCommand(DataOutputStream os, DataInputStream is, ValueObject classType, String methodName, ValueObject parmTypes, ValueObject invokeOn, ValueObject parms, ValueObject valueReturn) throws CommandException {
-		try {
-			os.writeByte(INVOKE_WITH_METHOD_PASSED);
-			writeValue(os, classType, false);
-			os.writeUTF(methodName);
-			writeValue(os, parmTypes, false);
-			writeValue(os, invokeOn, false);
-			writeValue(os, parms, false);
-			os.flush();
-			readBackValue(is, valueReturn, NO_TYPE_CHECK);
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-	
-	public static void sendGetArrayContentsCommand(DataOutputStream os, DataInputStream is, int arrayID, ValueObject valueReturn) throws CommandException {
-		try {
-			os.writeByte(GET_ARRAY_CONTENTS);
-			os.writeInt(arrayID);
-			os.flush();
-			readBackValue(is, valueReturn, NO_TYPE_CHECK);
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-	
-	private Commands() {
-		// Never intended to be instantiated.
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java
deleted file mode 100644
index da893ac..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ExpressionCommands.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/16 19:11:23 $ 
- */
-package org.eclipse.jem.internal.proxy.common.remote;
-
-import java.io.*;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-
- 
-/**
- * 
- * @since 1.0.0
- */
-public class ExpressionCommands {
-
-	// These are the sub-commands under EXPRESSION_TREE_COMMANDS that can be send.
-	public static final byte
-		START_EXPRESSION_TREE_PROCESSING = 0,
-		PUSH_EXPRESSION = 1,
-		END_EXPRESSION_TREE_PROCESSING = 2,
-		SYNC_REQUEST = 3,
-		PULL_VALUE_REQUEST = 4,
-		TRANSFER_EXPRESSION_REQUEST = 5,
-		RESUME_EXPRESSION_REQUEST = 6;
-		
-	// These are the expression specific error codes (it can also send back general ones. See SYNC_REQUEST docs lower down).
-	public static final int
-		EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION = Commands.MAX_ERROR_CODE+1;	// No expression value occurred.
-	
-	// These are the flag values sent in proxy resolution when doesn't resolve to proxy.
-	public static final int
-		EXPRESSIONPROXY_VOIDTYPE = 0,	// Expression proxy resolves to void type.
-		EXPRESSIONPROXY_NOTRESOLVED = 1;	// Expression proxy not resolved.
-
-	public static final String EXPRESSIONTRACE = "proxyvm.expressionTrace";	// The system property for turning on expression tracing.
-	public static final String EXPRESSIONTRACE_TIMER_THRESHOLD = "proxyvm.expressionTraceTimerThreshold";	// The system property for timer threshold.
-	
-	/*
-	 * The format of the commands are:
-	 * 		Note: Most of the commands will not being doing a os.flush() at the end. We are just going to
-	 * 		be streaming the data over the line. At the end we will flush and then catch up. That way
-	 * 		we aren't waiting for the other side as we send the data.
-	 * 
-	 * START_EXPRESSION_TREE_PROCESSING: 0b
-	 * 	Start processing.
-	 * 
-	 * PUSH_EXPRESSION: 1b, b
-	 * 	Push an expression. Where "b" is the expression type from IInternalExpressionConstants. 
-	 * 	The actual data that follows is expression type dependent and will be
-	 * 	sent in a following call to ExpressionCommands as it builds up the actual command.
-	 * 	See REMExpression and each type of push call method within it to see the actual
-	 * 	sent data.
-	 * 
-	 * END_EXPRESSION_TREE_PROCESSING: 2b
-	 * 	End the processing and clean up.
-	 * 
-	 * SYNC_REQUEST: 3b
-	 * 	This will return the current status. The reason it is called sync is because the
-	 * 	IDE will wait for it to complete and read back the value. It will send back:
-	 * 		1: VALUE command with boolean true as the value.
-	 * 		2: ERROR command with code of ExpressionClassNotFound, with value of String with message from exception.
-	 * 		3: ERROR command with code of EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION, with value of String with message from exception.
-	 * 		4: THROWABLE command with the actual exception that occurred.
-	 * 
-	 *
-	 * PULL_VALUE_REQUEST: 4b
-	 * 	This will do a sync up and return the value from the expression.
-	 * 	IDE will wait for it to compleate and read back the value. It will send back:
-	 * 		1: VALUE command with the result as the value.
-	 * 		2: ERROR or EXCEPTION if there were errors, see SYNC_REQUEST with the format they are sent back.
-	 * 
-	 * TRANSFER_EXPRESSION_REQUEST: 5b
-	 *  This will do a sync up, and return the ExpressionProcessorController that the request is for. And remove
-	 *  the controller from its list of active expression controllers. 
-	 *  
-	 * RESUME_EXPRESSION_REQUEST: 6b, anExpressionProcessorController
-	 *  This will take the given controller and add it to the list of controllers this connection is handling. It returns nothing.  
-	 *  
-	 * @see org.eclipse.jem.internal.proxy.initParser.tree.IInternalExpressionConstants
-	 * @see org.eclipse.jem.internal.proxy.remote.REMExpression
-	 * 
-	 */
-	
-	/**
-	 * Send the start expression processing command.
-	 * @param expressionID 
-	 * @param os
-	 * 
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendStartExpressionProcessingCommand(int expressionID, DataOutputStream os) throws IOException {
-		os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
-		os.writeInt(expressionID);
-		os.writeByte(START_EXPRESSION_TREE_PROCESSING);
-	}
-	
-	/**
-	 * Send the end expression processing command.
-	 * @param expressionID 
-	 * @param os
-	 * 
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendEndExpressionProcessingCommand(int expressionID, DataOutputStream os) throws IOException {
-		os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
-		os.writeInt(expressionID);
-		os.writeByte(END_EXPRESSION_TREE_PROCESSING);
-		os.flush();	// Flushing because we are done and want to make sure everything goes out.
-	}
-	
-	/**
-	 * Send an expression subcommand.
-	 * @param expressionID 
-	 * @param os
-	 * @param subcommand
-	 * 
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendExpressionCommand(int expressionID, DataOutputStream os, byte subcommand) throws IOException {
-		os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
-		os.writeInt(expressionID);
-		os.writeByte(PUSH_EXPRESSION);
-		os.writeByte(subcommand);
-	}
-	
-	/**
-	 * Send just a byte.
-	 * 
-	 * @param os
-	 * @param aByte
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendByte(DataOutputStream os, byte aByte) throws IOException {
-		os.writeByte(aByte);
-	}
-	
-	/**
-	 * Send just an int.
-	 * 
-	 * @param os
-	 * @param anInt
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendInt(DataOutputStream os, int anInt) throws IOException {
-		os.writeInt(anInt);
-	}
-	
-	/**
-	 * Send just a string.
-	 * 
-	 * @param os
-	 * @param aString
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendString(DataOutputStream os, String aString) throws IOException {
-		Commands.sendStringData(os, aString);
-	}
-	
-	/**
-	 * Send just a boolean.
-	 * 
-	 * @param os
-	 * @param aBool
-	 * @throws IOException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendBoolean(DataOutputStream os, boolean aBool) throws IOException {
-		os.writeBoolean(aBool);
-	}
-	
-	/**
-	 * Send the pull value command. After processing the proxies, caller should call getFinalValue() to get the value.
-	 * @param expressionID 
-	 * @param os
-	 * @param is
-	 * @param proxyids if not <code>null</code>, then this is the list of expression proxy ids that need to be returned as rendered.
-	 * @param sender sender used to process the resolved proxy ids, or <code>null</code> if no proxy ids.
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendPullValueCommand(int expressionID, DataOutputStream os, DataInputStream is, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException {
-		try {
-			os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
-			os.writeInt(expressionID);
-			os.writeByte(PULL_VALUE_REQUEST);
-			sendProxyIDs(os, proxyids);
-			os.flush();
-			if (proxyids != null) {
-				Commands.readBackValue(is, proxyids, Commands.ARRAY_IDS);	// Read the array header.
-				sender.initialize(proxyids);
-				Commands.readArray(is, proxyids.anInt, sender, proxyids, true);	// Read the array.
-			}
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (IOException e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}
-	
-	/**
-	 * Send a sync command. This does a synchronize with the remote expression processor. It makes sure that the
-	 * stream is caught and doesn't return until everything on the stream has been processed. Should then call
-	 * getFinalValue() to verify the expression is valid.
-	 * @param expressionID 
-	 * @param os
-	 * @param is
-	 * @param proxyids if not <code>null</code>, then this is the list of expression proxy ids that need to be returned as rendered.
-	 * @param sender the sender used for reading back the proxyid resolutions, or <code>null</code> if no proxy ids.
-	 * 
-	 * @throws CommandException
-	 * 
-	 * @since 1.0.0
-	 */
-	public static void sendSyncCommand(int expressionID, DataOutputStream os, DataInputStream is, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException {
-		try {
-			os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
-			os.writeInt(expressionID);
-			os.writeByte(SYNC_REQUEST);
-			sendProxyIDs(os, proxyids);
-			os.flush();
-			if (proxyids != null) {
-				Commands.readBackValue(is, proxyids, Commands.ARRAY_IDS);	// Read the array header.
-				sender.initialize(proxyids);
-				Commands.readArray(is, proxyids.anInt, sender, proxyids, true);	// Read the array.
-			}
-		} catch (CommandException e) {
-			// rethrow this exception since we want these to go on out.
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}		
-	}	
-	
-	/**
-	 * Send the proxyids (if not null) as part of a command. Used by sync and pullValue.
-	 * @param os
-	 * @param proxyids <code>null</code> if not requesting proxy ids.
-	 * @throws IOException
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	private static void sendProxyIDs(DataOutputStream os, Commands.ValueObject proxyids) throws IOException, CommandException {
-		if (proxyids != null) {
-			os.writeBoolean(true);	// Indicates proxy ids being sent.
-			Commands.writeValue(os, proxyids, false, false);
-		} else
-			os.writeBoolean(false);	// No proxyids being sent.
-	}
-	
-	/**
-	 * Send the transfer expression command and receive back the expression processor controller.
-	 * 
-	 * @param expressionID
-	 * @param os
-	 * @param is
-	 * @param expressionProcesserController
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void sendTransferExpressionCommand(int expressionID, DataOutputStream os, DataInputStream is, Commands.ValueObject expressionProcesserController) throws CommandException {
-		try {
-			os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
-			os.writeInt(expressionID);
-			os.writeByte(TRANSFER_EXPRESSION_REQUEST);
-			os.flush();
-			Commands.readBackValue(is, expressionProcesserController, Commands.NO_TYPE_CHECK); // Read the expression processor controller
-		} catch (CommandException e) {
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}
-	}
-
-	/**
-	 * Send the resume expression command with given expression processor controller.
-	 * 
-	 * @param expressionID
-	 * @param os
-	 * @param expressionProcessorController
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	public static void sendResumeExpressionCommand(int expressionID, DataOutputStream os, Commands.ValueObject expressionProcessorController) throws CommandException {
-		try {
-			os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
-			os.writeInt(expressionID);
-			os.writeByte(RESUME_EXPRESSION_REQUEST);
-			Commands.writeValue(os, expressionProcessorController, false, false);
-		} catch (CommandException e) {
-			throw e;
-		} catch (Exception e) {
-			// Wrapper this one.
-			throw new UnexpectedExceptionCommandException(false, e);
-		}			
-	}
-	
-	private ExpressionCommands() {
-		// Never intended to be instantiated.
-	}
-	
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/IOCommandException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/IOCommandException.java
deleted file mode 100644
index 219421b..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/IOCommandException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jem.internal.proxy.common.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IOCommandException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:39 $ 
- */
-
-import java.io.IOException;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-
-/**
- * A command exception occured while processing an io request
- * in a callback stream. This exception wrappers the command exception.
- */
-
-public class IOCommandException extends IOException {
-	protected CommandException fException;
-	
-	public IOCommandException(CommandException e) {
-		fException = e;
-	}
-	
-	public CommandException getException() {
-		return fException;
-	}
-	
-	public String getMessage() {
-		return fException.getMessage();
-	}
-	
-	public void printStackTrace() {
-		fException.printStackTrace();
-	}
-	
-	public void printStackTrace(java.io.PrintStream p) {
-		fException.printStackTrace(p);
-	}
-
-	public void printStackTrace(java.io.PrintWriter p) {
-		fException.printStackTrace(p);
-	}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/TransmitableArray.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/TransmitableArray.java
deleted file mode 100644
index d2a3544..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/TransmitableArray.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.jem.internal.proxy.common.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: TransmitableArray.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:39 $ 
- */
-
-
-/**
- * A value can be a TransmitableArray. This means this value is an array that
- * needs to have a ValueRetriever created for it. This is used if the array has ID's in
- * it and is not an existing array on the server or all constant values.
- *
- * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
- *       It should still work, but it could be asking for them in the middle of the request
- *       if they are not first gotton. And this could throw a non-recoverable exception if not found.
- */
-public final class TransmitableArray {
-	public int componentTypeID;	// The id of the type of the component type of the array.
-	public Object[] array;	// The array it self.
-	public TransmitableArray(int typeID, Object[] anArray) {
-		componentTypeID = typeID;
-		array = anArray;
-	}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedCommandException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedCommandException.java
deleted file mode 100644
index ee29bc4..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedCommandException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jem.internal.proxy.common.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: UnexpectedCommandException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:39 $ 
- */
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * This is an exception that is thrown when the processing
- * of data was invalid for the command. 
- * There will be a flag indicting error type, and a flag
- * indicating whether the connection is recoverable or not.
- * If not recoverable, then the connection needs to be closed.
- *
- */
-public class UnexpectedCommandException extends CommandException {
-	private final Object fErrorType;
-	private final boolean fRecoverable;
-	
-	public UnexpectedCommandException(Object errorType, boolean recoverable) {
-		fErrorType = errorType;
-		fRecoverable = recoverable;
-	}		
-	
-	public UnexpectedCommandException(Object errorType, boolean recoverable, Object data) {
-		super(data);
-		fErrorType = errorType;
-		fRecoverable = recoverable;
-	}
-	
-	public UnexpectedCommandException(Object errorType, boolean recoverable, String msg, Object data) {
-		super(msg, data);
-		fErrorType = errorType;
-		fRecoverable = recoverable;
-	}
-
-	public Object getErrorType() {
-		return fErrorType;
-	}
-	
-	public boolean isRecoverable() {
-		return fRecoverable;
-	}
-	
-	public String getMessage() {
-		String m = super.getMessage();
-		if (fErrorType != null) {
-			String dataMsg = getExceptionData() != null ? " Errordata="+getExceptionData().toString() : "";	//$NON-NLS-1$ //$NON-NLS-2$
-			if (m == null)
-				return "Errortype="+fErrorType.toString() + dataMsg; //$NON-NLS-1$
-			else
-				return m + ':' + "Errortype="+fErrorType.toString() + dataMsg; //$NON-NLS-1$
-		} else
-			return m;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedExceptionCommandException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedExceptionCommandException.java
deleted file mode 100644
index d20518c..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedExceptionCommandException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.jem.internal.proxy.common.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: UnexpectedExceptionCommandException.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:56:39 $ 
- */
-
-/**
- * Wrapper an unexpected exception in a Command Exception.
- */
-public class UnexpectedExceptionCommandException extends UnexpectedCommandException {
-
-	public UnexpectedExceptionCommandException(boolean recoverable, Throwable data) {
-		super(Commands.SOME_UNEXPECTED_EXCEPTION, recoverable, data);
-	}
-	
-	public UnexpectedExceptionCommandException(boolean recoverable, String msg, Throwable data) {
-		super(Commands.SOME_UNEXPECTED_EXCEPTION, recoverable, msg, data);
-	}
-	
-	public Throwable getException() {
-		return (Throwable) getExceptionData();
-	}
-	
-	public String getMessage() {
-		String localMsg = super.getMessage();
-		if (getException() != null)
-			if (localMsg == null || localMsg.length() == 0)
-				return getException().getLocalizedMessage();
-			else
-				return localMsg + ": " + getException().getLocalizedMessage(); //$NON-NLS-1$
-		return
-			localMsg;
-	}
-	
-	public void printExceptionStackTrace() {
-		getException().printStackTrace();
-	}
-	
-	public void printStackTrace() {
-		printExceptionStackTrace();
-	}
-	
-	public void printStackTrace(java.io.PrintStream p) {
-		getException().printStackTrace(p);
-	}
-
-	public void printStackTrace(java.io.PrintWriter p) {
-		getException().printStackTrace(p);
-	}	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/schema/contributors.exsd b/plugins/org.eclipse.jem.proxy/schema/contributors.exsd
deleted file mode 100644
index 972d3fb..0000000
--- a/plugins/org.eclipse.jem.proxy/schema/contributors.exsd
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.proxy">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jem.proxy" id="contributors" name="Proxy Configuration Contributors"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to supply configuration contributors for proxy support. You can supply a contributor for a specific classpath container or for a plugin.
-&lt;p&gt;
-The way configuration contributors work is that when a proxy vm is started, it first runs through all of the explicit contributors that were given to it. It then goes through the classpath of the project and finds the containers. If the container implements IConfigurationContributor, it will be called as a contributor. Then all of the extensions of this extension point will be searched for those have the same container id, and if so they will be called as a contributor.
-&lt;p&gt;
-The extensions will be called in plugin order. In other words if plugin A depends on plugin B, the contribution in plugin A will not be called before the contribution in plugin B.
-&lt;p&gt;
-If a plugin is in the classpath of the project (in other words the project is PDE plugin development project and requires a plugin) then the contributor with the given plugin id will be called.
-&lt;p&gt;
-Both container and plugin can be specified, but at least one of them must be specified. If both are specified, then this entry will be used if either the container or the plugin is found in the classpath.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="contributor" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="contributor">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="class"/>
-         </appInfo>
-         <documentation>
-            A contributor. Either the container or the plugin attributes must be set.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="container" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a container. The value is the container id (e.g. &quot;JRE_CONTAINER&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="plugin" type="string">
-            <annotation>
-               <documentation>
-                  contributor is for a plugin. The value is the plugin id (e.g. &quot;org.eclipse.swt&quot;).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class that implements this contributor. The class must implement IConfigurationContributor.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jem.internal.proxy.core.IConfigurationContributor"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         1.0.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of a contributor: 
-
-&lt;p&gt;
-&lt;pre&gt;
- &lt;extension point=&quot;org.eclipse.jem.proxy.contributors&quot;&gt;
-  &lt;contributor
-   class=&quot;com.example.ContributorImplementation&quot;
-   container=&quot;MY_CONTAINER&quot;&gt;
-  &lt;/contributor&gt;
- &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The &lt;samp&gt;class&lt;/samp&gt; attribute must be a fully-qualified class that implements the &lt;samp&gt;org.eclipse.jem.internal.proxy.core.IConfigurationContributor&lt;/samp&gt; interface.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         There is &lt;samp&gt;org.eclipse.jem.internal.proxy.core.ConfigurationContributorAdapter&lt;/samp&gt; available to subclass to provide specific overrides. The default for the adapter is that it doesn&apos;t do anything.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2004 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at 
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/AWTStarter.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/AWTStarter.java
deleted file mode 100644
index 761f48e..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/AWTStarter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: AWTStarter.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.vm.remote;
-
-import java.awt.Toolkit;
- 
-
-/**
- * This class is used to do start the AWT eventqueue ahead of time to try to parallel process it.
- * @since 1.1.0
- */
-public class AWTStarter {
-
-	public static void startAWT() {
-		Thread t = new Thread() {
-			public void run() {
-				Thread.yield();	// So as not to possibly hold up the guy doing the starting.
-				Toolkit.getDefaultToolkit();
-			}
-		};
-		t.start();
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ArrayHelper.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ArrayHelper.java
deleted file mode 100644
index 01cd63a..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ArrayHelper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ArrayHelper.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:54 $ 
- */
-
-
-/**
- * This class provides similiar function as the java.lang.reflect.Array class but
- * it handles multi-dimensional arrays. Without this helper, the client would have
- * to walk down through each dimension executing a get command. This would mean
- * many transactions instead of one provided by this helper.
- *
- * It also provides some other helper functions for arrays that Array doesn't provide.
- */
-
-public final class ArrayHelper {
-	// It can never be instantiated.
-	private ArrayHelper() {
-	}
-	
-	public static Object get(Object array, int[] indexes) {
-		Object answer = array;
-		for (int i=0; i<indexes.length; i++)
-			answer = java.lang.reflect.Array.get(answer, indexes[i]);
-		return answer;
-	}
-	
-	public static byte getByte(Object array, int[] indexes) {
-		return ((Byte) get(array, indexes)).byteValue();
-	}
-	public static boolean getBoolean(Object array, int[] indexes) {
-		return ((Boolean) get(array, indexes)).booleanValue();
-	}
-	public static char getChar(Object array, int[] indexes) {
-		return ((Character) get(array, indexes)).charValue();
-	}	
-	public static double getDouble(Object array, int[] indexes) {
-		return ((Double) get(array, indexes)).doubleValue();
-	}
-	public static float getFloat(Object array, int[] indexes) {
-		return ((Float) get(array, indexes)).floatValue();
-	}
-	public static int getInt(Object array, int[] indexes) {
-		return ((Integer) get(array, indexes)).intValue();
-	}
-	public static long getLong(Object array, int[] indexes) {
-		return ((Long) get(array, indexes)).longValue();
-	}
-	public static short getShort(Object array, int[] indexes) {
-		return ((Short) get(array, indexes)).shortValue();
-	}
-	
-	public static void set(Object array, int[] indexes, Object value) {
-		Object subArray = array;
-		int upTo = indexes.length-1;
-		for (int i=0; i<upTo; i++)
-			subArray = java.lang.reflect.Array.get(subArray, indexes[i]);
-		java.lang.reflect.Array.set(subArray, indexes[upTo], value);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackHandler.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackHandler.java
deleted file mode 100644
index 73d50b7..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackHandler.java
+++ /dev/null
@@ -1,181 +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.jem.internal.proxy.vm.remote;
-/*
- *  $RCSfile: CallbackHandler.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
- */
-
-import java.net.Socket;
-import java.io.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.UnexpectedExceptionCommandException;
-import org.eclipse.jem.internal.proxy.common.*;
-/**
- * This is a handler for doing callbacks to the
- * client.
- *
- * This is package protected because no one should
- * use it from the outside. It is too critical that
- * callback's work only in this specified way.
- */
-class CallbackHandler extends ConnectionHandler implements ICallbackHandler {
-	public CallbackHandler(Socket sc, RemoteVMServerThread svr) {
-		super(sc, svr, null);
-	}		
-	
-	/**
-	 * Initiate a stream callback request.
-	 */
-	public void initiateCallbackStream(int callbackID, int msgID) throws CommandException {
-		try {
-			Commands.sendCallbackStreamCommand(out, callbackID, msgID);
-			out.flush();
-		} catch (CommandException e) {
-			throw e;
-		} catch (Exception e) {
-			throw new UnexpectedExceptionCommandException(false, e);
-		}
-		run();	// Now run and wait for return. If no command exeception thrown, then it signals to continue.
-	}
-	
-	/**
-	 * Write bytes to the client. If bytesToWrite is -1, then this is end and
-	 * no bytes are being written. Just write the -1 then.
-	 */
-	public void writeBytes(byte[] bytes, int bytesToWrite) throws CommandException {
-		try {
-			if (bytesToWrite != -1)
-				Commands.writeBytes(out, bytes, bytesToWrite);
-			else
-				out.writeInt(-1);
-		} catch (CommandException e) {
-			throw e;
-		} catch (Exception e) {
-			throw new UnexpectedExceptionCommandException(false, e);
-		}
-	}
-
-		
-	/**
-	 * Callback, but send the parm as an object, ie. it must
-	 * be nothing but constants, e.g. String, Integer, or an
-	 * array of constants. Constants should not be things like
-	 * regular objects. This is because only standard java.lang
-	 * type constants can be assured to be available on the other
-	 * client. Also you don't want to send big objects, except
-	 * maybe something like an array of bytes or strings. It must
-	 * be constants that don't need to be sent back for any reason
-	 * since their identity will be lost in the transfer.
-	 *
-	 * This should be used if there are no parms (i.e. it is null).
-	 */
-	public Object callbackAsConstants(int callbackID, int msgID, Object parm) throws CommandException {
-
-		try {
-			Commands.sendCallbackCommand(out, callbackID, msgID);
-			Commands.ValueObject v = new Commands.ValueObject();
-			sendObject(parm, SEND_AS_IS, v, out, false);
-			out.flush();
-		} catch (CommandException e) {
-			throw e;
-		} catch (Exception e) {
-			throw new UnexpectedExceptionCommandException(false, e);
-		}
-		return run();	// Now run and wait for return.
-	}
-	
-	
-	// A retriever is what handles the array part.
-	private class Retriever implements Commands.ValueRetrieve {
-		int index=0;
-		Object[] array;
-		Commands.ValueObject worker = new Commands.ValueObject();
-		
-		
-		public Retriever(Object[] anArray) {
-			array = anArray;
-		}
-		
-		public Commands.ValueObject nextValue() {
-			Object parm = array[index++];
-			if (parm != null) {
-				if (parm instanceof ICallbackHandler.TransmitableArray) {
-					// It is another array, create a new retriever.
-					worker.setArrayIDS(new Retriever(((ICallbackHandler.TransmitableArray) parm).getArray()), ((ICallbackHandler.TransmitableArray) parm).getArray().length, Commands.OBJECT_CLASS);
-				} else {
-					// They may add some new ID's and if there is an error, they
-					// won't get released, but that is a slight chance we will have
-					// to take because we don't know which ones were new and which
-					// ones weren't.
-					fillInValue(parm, NOT_A_PRIMITIVE, worker);
-				}
-			} else
-				worker.set();
-			return worker;
-		}
-	};
-		
-	private static final Object[] NULL_SENT = new Object[1];
-	/**
-	 * Callback, but send the parm as IDs so that proxies
-	 * will be created for the objects and can be referenced.
-	 *
-	 * This should be used even if there is only one parm.
-	 */
-	public Object callbackWithParms(int callbackID, int msgID, Object[] parms) throws CommandException {
-		try {
-			if (parms == null)
-				parms = NULL_SENT;
-				
-			Commands.ValueObject v = new Commands.ValueObject();
-							
-			v.setArrayIDS(new Retriever(parms), parms.length, Commands.OBJECT_CLASS);
-			Commands.sendCallbackCommand(out, callbackID, msgID);
-			Commands.writeValue(out, v, false);
-			out.flush();
-		} catch (CommandException e) {
-			throw e;
-		} catch (Exception e) {
-			throw new UnexpectedExceptionCommandException(false, e);
-		}
-		return run();	// Now run and wait for return.
-	}	
-	
-	/**
-	 * A closeHandler has been requested. This is called when
-	 * not waiting within a loop, so we need to do the cleanup ourselves.
-	 */
-	public void closeHandler() {
-		if (isConnected()) {
-			try {
-				Commands.sendQuitCommand(out);
-			} catch (IOException e) {
-			} finally {
-				if (in != null)
-					try {
-						in.close();
-					} catch (Exception e) {
-					}
-				if (out != null)
-					try {
-						out.close();
-					} catch (Exception e) {
-					}
-				close();
-				in = null;
-				out = null;
-				socket = null;
-			}
-		}
-	}
-			
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackOutputStream.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackOutputStream.java
deleted file mode 100644
index bbc57bc..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackOutputStream.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: CallbackOutputStream.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:54 $ 
- */
-
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.IOCommandException;
-/**
- * This is the special stream used to buffer and write a lot
- * of bytes to callback into the client.
- *
- * Before writing any bytes to the client, it will see if the
- * client has sent anything back. If it has, this is an indication
- * that that client has requested that the stream be closed. In that
- * case an InterruptedIOException is raised to indicate that
- * the stream will be closed and no more data will be sent.
- */
-public class CallbackOutputStream extends OutputStream {
-	
-	protected CallbackHandler fHandler;
-	protected RemoteVMServerThread fSvr;
-	protected byte[] fBuffer;
-	protected int fNextByte = 0;
-	
-	public CallbackOutputStream(CallbackHandler handler, RemoteVMServerThread svr) {
-		fHandler = handler;
-		fSvr = svr;
-		
-		Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-		if (bufSize == null)
-			bufSize = new Integer(5000);
-		fBuffer = new byte[bufSize.intValue()];
-	}
-	
-	protected void clearStream() {
-		fSvr.returnCallbackHandler(fHandler);
-		fSvr = null;
-		fHandler = null;
-		fBuffer = null;
-	}
-	
-	protected void processException(CommandException e) throws IOException {
-		clearStream();
-		throw new IOCommandException(e);
-	}
-	
-	public void flush() throws IOException {
-		flushBuffer();
-		fHandler.out.flush();
-	}
-
-	protected void flushBuffer() throws IOException {
-		if (fHandler == null)
-			throw new IOException("Stream closed. No more operations permitted."); //$NON-NLS-1$
-		if (fNextByte > 0) {
-			try {
-				if (fHandler.in.available() > 0) {
-					// There was something waiting. This means a cancel has been requested.
-					fHandler.in.skip(fHandler.in.available());
-					close(false);	// Now close the stream. We need to have the close indicator sent so that the remote side, but we don't need to wait because the terminate response has already been sent.
-					throw new InterruptedIOException();
-				}
-				fHandler.writeBytes(fBuffer, fNextByte);
-				fNextByte = 0;
-			} catch (CommandException e) {
-				processException(e);
-			}
-		}
-	}
-	
-	/**
-	 * Closes this output stream and releases any system resources 
-	 * associated with this stream. The general contract of <code>close</code> 
-	 * is that it closes the output stream. A closed stream cannot perform 
-	 * output operations and cannot be reopened.
-	 * <p>
-	 * Close will send a -1 to the client and set to indicate it is closed.
-	 *
-	 * @exception  IOException  if an I/O error occurs.
-	 */
-	public void close() throws IOException {
-		close(true);
-	}
-	
-
-	protected void close(boolean wait) throws IOException {
-		if (fHandler != null) {
-			try {
-				flushBuffer();
-				try {				
-					fHandler.writeBytes(null, -1);
-					fHandler.out.flush();
-					if (wait) {
-						// Wait means wait for the remote side to send the terminated response.
-						// A normal close will do this. If the remote side sent a cancel request, then it has already
-						// sent the terminated response and it is waiting for us to send the end-of-file command.
-						
-						fHandler.in.readByte();	// Block and wait until the terminate request. There shouldn't be anything else in the pipeline.
-						if (fHandler.in.available() > 0)
-							// There was something else waiting. Let's just clear it out to be safe.
-							fHandler.in.skip(fHandler.in.available());
-					}
-				} catch (CommandException e) {
-					processException(e);
-				}
-			} finally {
-				clearStream();
-			}
-		}
-	}
-	
-	public void write(int b) throws IOException {
-		fBuffer[fNextByte++] = (byte) b;
-		if (fNextByte >= fBuffer.length)
-			flushBuffer();
-	}
-	
-	public void write(byte b[], int off, int len) throws IOException {
-		if (b == null) {
-		    throw new NullPointerException();
-		} else if ((off < 0) || (off > b.length) || (len < 0) ||
-			   ((off + len) > b.length) || ((off + len) < 0)) {
-		    throw new IndexOutOfBoundsException();
-		} else if (len == 0) {
-		    return;
-		}
-		
-		while (len > 0) {
-			int move = fBuffer.length-fNextByte;
-			if (len < move)
-				move = len;
-			System.arraycopy(b, off, fBuffer, fNextByte, move);
-			len -= move;
-			off += move;
-			fNextByte += move;
-			if (fNextByte >= fBuffer.length)
-				flushBuffer();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ClassHelper.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ClassHelper.java
deleted file mode 100644
index 2d62227..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ClassHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ClassHelper.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:54 $ 
- */
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This class is a helper for Class accessing functions.
- * Its main function is to bypass security. This is because
- * we don't care about security for remote vm. Security is
- * handled by the IDE and compilor over there. We do what
- * we're told.
- * 
- * @author richkulp
- */
-public class ClassHelper {
-
-	/**
-	 * Constructor for ClassHelper.
-	 */
-	private ClassHelper() {
-		super();
-	}
-	
-	private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
-	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];	
-	public static Object newInstance(Class targetClass) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
-		// We want to get the default ctor, which is in the declared list. No need
-		// to worry about inheritance because ctors are never virtual.
-		Constructor ctor = targetClass.getDeclaredConstructor(EMPTY_CLASS_ARRAY);
-		ctor.setAccessible(true);
-		return ctor.newInstance(EMPTY_OBJECT_ARRAY);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionHandler.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionHandler.java
deleted file mode 100644
index b9eb863..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionHandler.java
+++ /dev/null
@@ -1,922 +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.jem.internal.proxy.vm.remote;
-/*
- *  $RCSfile: ConnectionHandler.java,v $
- *  $Revision: 1.13 $  $Date: 2005/05/16 19:11:23 $ 
- */
-
-
-import java.io.*;
-import java.lang.reflect.Array;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.initParser.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.NoExpressionValueException;
-
-/**
- * This handles one connection.
- */
-
-public class ConnectionHandler {	
-		
-	protected Socket socket;
-	final protected RemoteVMServerThread server;
-	final protected Thread connectionThread;
-	protected DataInputStream in;
-	protected DataOutputStream out;
-	
-	// Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
-	// wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
-	// in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
-	static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3");	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	
-	/**
-	 * This may be running as a callback, in that case there is no connectionThread.
-	 */
-	public ConnectionHandler(Socket sc, RemoteVMServerThread svr, Thread connectionThread) {
-		socket = sc;
-		server = svr;
-		this.connectionThread = connectionThread;
-		
-		Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
-		if (bufSize == null)
-			bufSize = new Integer(5000);
-			
-		try {
-			out = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream(), bufSize.intValue()));
-			in = new DataInputStream(new BufferedInputStream(socket.getInputStream(), bufSize.intValue()));
-		} catch (IOException e) {
-		}
-			
-	}
-	
-	/**
-	 * Did this construct correctly.
-	 * This is needed because an exception could be thrown in the ctor and
-	 * that's not a good thing to do.
-	 */
-	public boolean isConnected() {
-		return socket != null;
-	}	
-	
-	/**
-	 * Request the thread to close down.
-	 */
-	public void close() {
-		if (socket != null) {
-			try {
-				Socket s = socket;
-				socket = null;
-				s.close();
-			} catch (Exception e) {
-			}
-		}
-	}
-	
-	// Map of ID to expression processers that are currently being processed.
-	private Map expressionProcessors = new HashMap();
-	
-	/**
-	 * Process and loop until told to stop. A callback_done will stop
-	 * the loop and will return a result. Otherwise null is returned.
-	 */
-	public Object run() throws CommandException {
-		Object result = null;		
-		boolean shutdown = false;
-		boolean closeWhenDone = true;
-		Commands.ValueObject valueObject = new Commands.ValueObject();	// Working value object so not continually recreated.
-		InvokableValueSender valueSender = new InvokableValueSender();	// Working valuesender so not continually recreated. 
-		try {
-			boolean doLoop = true;
-
-			/**
-			 * Note: In the cases below you will see a lot of finally clauses that null variables out.
-			 * This is because this is a long running loop, and variables declared within blocks are not
-			 * garbage collected until the method is terminated, so these variables once set would never
-			 * be GC'd. The nulling at the end of the case makes sure that any of those objects set are
-			 * now available for garbage collection when necessary.
-			 */		
-			while(doLoop && isConnected()) {
-				byte cmd = 0;
-				try {
-					if (LINUX_1_3)
-						socket.setSoTimeout(1000);	// Linux 1.3 bug, see comment on LINUX_1_3
-					cmd = in.readByte();
-					if (LINUX_1_3 && isConnected())
-						socket.setSoTimeout(0);	// Linux 1.3 bug, see comment on LINUX_1_3
-				} catch (InterruptedIOException e) {
-					continue;	// Timeout, try again
-				}
-				switch (cmd) {
-					case Commands.QUIT_CONNECTION:				
-						doLoop = false;	
-						break;	// Close this connection
-						
-					case Commands.TERMINATE_SERVER:
-						doLoop = false;		
-						shutdown = true;	// Shutdown everything
-						break;
-						
-					case Commands.GET_CLASS:
-						String className = in.readUTF();
-						Class aClass = null;
-						Class superClass = null;
-						String superClassName = null;
-						boolean added = false;
-						try {
-							aClass = Class.forName(className);	// Turns out using JNI format for array type will work fine.
-								
-							added = server.getIdentityID(aClass, valueObject);
-							boolean isInterface = aClass.isInterface();
-							boolean isAbstract = java.lang.reflect.Modifier.isAbstract(aClass.getModifiers());
-							superClass = aClass.getSuperclass();
-							superClassName = (superClass != null) ? superClass.getName() : ""; //$NON-NLS-1$
-							out.writeByte(Commands.GET_CLASS_RETURN);
-							out.writeInt(valueObject.objectID);
-							out.writeBoolean(isInterface);
-							out.writeBoolean(isAbstract);
-							out.writeUTF(superClassName);
-							out.flush();
-						} catch (ClassNotFoundException e) {
-							valueObject.set();
-							Commands.sendErrorCommand(out, Commands.GET_CLASS_NOT_FOUND, valueObject);						
-						} catch (ExceptionInInitializerError e) {
-							sendException(e.getException(), valueObject, out);								
-						} catch (LinkageError e) {
-							sendException(e, valueObject, out);								
-						} catch (Throwable e) {
-							// Something bad, did we add a class? If we did remove it from the table.
-							if (added)
-								server.removeObject(server.getObject(valueObject.objectID));
-							throw e;
-						} finally {
-							// clear out for GC to work.
-							className = null;
-							aClass = null;
-							superClass = null;
-							superClassName = null;
-							valueObject.set();
-						}
-						break;
-						
-					case Commands.GET_CLASS_FROM_ID:
-						int classID = in.readInt();
-						try {
-							aClass = (Class) server.getObject(classID);
-							boolean isInterface = aClass.isInterface();
-							boolean isAbstract = java.lang.reflect.Modifier.isAbstract(aClass.getModifiers());							
-							superClass = aClass.getSuperclass();
-							superClassName = (superClass != null) ? superClass.getName() : ""; //$NON-NLS-1$
-							out.writeByte(Commands.GET_CLASS_ID_RETURN);
-							out.writeUTF(aClass.getName());
-							out.writeBoolean(isInterface);
-							out.writeBoolean(isAbstract);
-							out.writeUTF(superClassName);
-							out.flush();
-						} catch (ClassCastException e) {
-							valueObject.set();
-							Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
-						} finally {	
-							// clear out for GC to work.
-							aClass = null;
-							superClass = null;
-							superClassName = null;
-							valueObject.set();							
-						}
-						break;
-
-					case Commands.GET_OBJECT_DATA:
-						int objectID = in.readInt();
-						Object anObject = null;
-						try {
-							anObject = server.getObject(objectID);
-							valueObject.setObjectID(objectID, server.getIdentityID(anObject.getClass()));
-							Commands.writeValue(out, valueObject, true);
-						} catch (ClassCastException e) {
-							valueObject.set();
-							Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
-						} finally {
-							anObject = null;	// Clear out for GC to work
-							valueObject.set();							
-						}
-						break;												
-						
-					case Commands.RELEASE_OBJECT:
-						int id = in.readInt();
-						server.removeObject(server.getObject(id));
-						break;						
-
-					case Commands.NEW_INIT_STRING:
-						classID = in.readInt();	// ID Of class to do new upon.
-						String initString = in.readUTF();	// The init string.
-						Object newValue = null;
-						Class theClass = null;
-						try {
-							theClass = (Class) server.getObject(classID);
-							if (theClass == null) {
-								// The class wasn't found. So imply ClassNotFound exception.
-								throw new ClassNotFoundException();
-							}
-							
-							InitializationStringParser parser = null;
-							try {
-								parser = InitializationStringParser.createParser(initString);
-								newValue = parser.evaluate();								
-								boolean primitive = parser.isPrimitive();
-								// If expected class is Void.TYPE, that means don't test the type of the result
-								// to verify if correct type, just return what it really is.
-								if (theClass != Void.TYPE && primitive != theClass.isPrimitive()) {
-									valueObject.set();
-									Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
-									continue;	// Goto next command.
-								} 
-								if (primitive) {
-									try {
-										// Need to do special tests for compatibility and assignment.
-										sendObject(newValue, classID != Commands.VOID_TYPE ? classID : server.getIdentityID(parser.getExpectedType()), valueObject, out, true);	// This will make sure it goes out as the correct primitive type
-									} catch (ClassCastException e) {
-										// The returned type is not of the correct type for what is expected.
-										valueObject.set();
-										Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
-										continue;	// Goto next command
-									}									
-								} else {
-									if (newValue != null) {
-										// Test to see if they are compatible. (Null can be assigned to any object,
-										// so that is why it was tested out above).
-										// If expected class is Void.TYPE, that means don't test the type of the result
-										// to verify if correct type, just return what it really is.
-										if (theClass != Void.TYPE && !theClass.isInstance(newValue)) {
-											// The returned type is not of the correct type for what is expected.
-											valueObject.set();
-											Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
-											continue;	// Goto next command
-										}
-									}
-									sendObject(newValue, NOT_A_PRIMITIVE, valueObject, out, true);	// Send out as an object.
-								}
-							} catch (InitializationStringEvaluationException e) {
-								if (e instanceof EvaluationException) {
-									// Want to return the real exception.
-									sendException(e.getOriginalException(), valueObject, out);
-								} else {
-									// Couldn't be evaluated, return an error for this.
-									setExceptionIntoValue(e.getOriginalException(), valueObject);
-									Commands.sendErrorCommand(out, Commands.CANNOT_EVALUATE_STRING, valueObject);
-								}
-							} finally {
-								parser = null;	// Clear out for GC to work
-							}									
-						} catch (Throwable e) {
-							sendException(e, valueObject, out);
-						} finally {
-							// Clear out for GC to work
-							initString = null;
-							theClass = null;
-							newValue = null;
-							valueObject.set();							
-						}	
-						break;						
-												
-					case Commands.INVOKE:
-						Object target = null;
-						Object[] parms = null;						
-						Class returnType = null;
-						java.lang.reflect.Method aMethod = null;						
-						try {					
-							int methodID = in.readInt();	// ID of method to invoke
-							aMethod = (java.lang.reflect.Method) server.getObject(methodID);	// Method to invoke
-							Commands.readValue(in, valueObject);
-							target = getInvokableObject(valueObject);	
-							Commands.readValue(in, valueObject);
-							if (valueObject.type == Commands.ARRAY_IDS) {
-								// It is an array containing IDs, as it normally would be.
-								valueSender.initialize(valueObject);
-								Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-								parms = (Object[]) valueSender.getArray();
-							} else {
-								// It is all objects or null, so it should be an Object[] or null. If not, then this is an error.
-								parms = (Object[]) valueObject.anObject;
-							}
-							
-							if (!aMethod.isAccessible())
-								aMethod.setAccessible(true);	// We will allow all to occur. Let access control be handled by IDE and compiler.
-							newValue = aMethod.invoke(target, parms);
-							returnType = aMethod.getReturnType();
-							if (returnType.isPrimitive()) {
-								int returnTypeID = server.getIdentityID(returnType);
-								// Need to tell sendObject the correct primitive type.
-								sendObject(newValue, returnTypeID, valueObject, out, true);
-				
-							} else {
-								sendObject(newValue, NOT_A_PRIMITIVE, valueObject, out, true);	// Just send the object back. sendObject knows how to iterpret the type
-							}									
-						} catch (CommandException e) {
-							throw e;	// Throw it again. These we don't want to come up as an exception proxy. These should end the thread.
-						} catch (java.lang.reflect.InvocationTargetException e) {
-							// This is a wrappered exception. Return the wrappered one so it looks like
-							// it was the real one. (Sometimes the method being invoked is on a java.lang.reflect.Constructor.newInstance,
-							// which in turn is an InvocationTargetException, so we will go until we don't have an InvocationTargetException.
-							Throwable t = e;
-							do {
-								t = ((java.lang.reflect.InvocationTargetException) t).getTargetException();
-							} while (t instanceof java.lang.reflect.InvocationTargetException);
-							sendException(t, valueObject, out);
-						} catch (Throwable e) {
-							sendException(e, valueObject, out);	// Turn it into a exception proxy on the client.
-						} finally {
-							// Clear out for GC to work
-							valueObject.set();
-							parms = null;
-							target = null;
-							aMethod = null;
-							returnType = null;
-							newValue = null;
-							valueSender.clear();
-						}					
-						break;
-						
-					case Commands.INVOKE_WITH_METHOD_PASSED:
-						aClass = null;
-						String methodName = null;
-						Class[] parmTypes = null;
-						target = null;
-						parms = null;						
-						returnType = null;
-						aMethod = null;						
-						
-						try {
-							Commands.readValue(in, valueObject);
-							aClass = (Class) getInvokableObject(valueObject); // The class that has the method.
-							methodName = in.readUTF();
-							Commands.readValue(in, valueObject);
-							if (valueObject.type == Commands.ARRAY_IDS) {
-								// It is an array containing IDs, as it normally would be.
-								valueSender.initialize(valueObject);
-								Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-								parmTypes = (Class[]) valueSender.getArray();
-							} else {
-								// It null, so it should be an null. If not, then this is an error.
-								parmTypes = null;
-							}
-							aMethod = aClass.getMethod(methodName, parmTypes);
-
-							// Now we get the info for the invocation of the method and execute it.
-							Commands.readValue(in, valueObject);
-							target = getInvokableObject(valueObject);	
-							Commands.readValue(in, valueObject);
-							if (valueObject.type == Commands.ARRAY_IDS) {
-								// It is an array containing IDs, as it normally would be.
-								valueSender.initialize(valueObject);
-								Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-								parms = (Object[]) valueSender.getArray();
-							} else {
-								// It is all objects or null, so it should be an Object[] or null. If not, then this is an error.
-								parms = (Object[]) valueObject.anObject;
-							}
-							
-							if (!aMethod.isAccessible())
-								aMethod.setAccessible(true);	// We will allow all to occur. Let access control be handled by IDE and compiler.
-							newValue = aMethod.invoke(target, parms);
-							returnType = aMethod.getReturnType();
-							if (returnType.isPrimitive()) {
-								int returnTypeID = server.getIdentityID(returnType);
-								// Need to tell sendObject the correct primitive type.
-								sendObject(newValue, returnTypeID, valueObject, out, true);
-				
-							} else {
-								sendObject(newValue, NOT_A_PRIMITIVE, valueObject, out, true);	// Just send the object back. sendObject knows how to iterpret the type
-							}									
-						} catch (CommandException e) {
-							throw e;	// Throw it again. These we don't want to come up as an exception proxy. These should end the thread.
-						} catch (java.lang.reflect.InvocationTargetException e) {
-							// This is a wrappered exception. Return the wrappered one so it looks like
-							// it was the real one. (Sometimes the method being invoked is on a java.lang.reflect.Constructor.newInstance,
-							// which in turn is an InvocationTargetException, so we will go until we don't have an InvocationTargetException.
-							Throwable t = e;
-							do {
-								t = ((java.lang.reflect.InvocationTargetException) t).getTargetException();
-							} while (t instanceof java.lang.reflect.InvocationTargetException);
-							sendException(t, valueObject, out);
-
-						} catch (Throwable e) {
-								sendException(e, valueObject, out);	// Turn it into a exception proxy on the client.
-						} finally {
-							aClass = null;
-							methodName = null;
-							parmTypes = null;
-							// Clear out for GC to work
-							valueObject.set();
-							parms = null;
-							target = null;
-							aMethod = null;
-							returnType = null;
-							newValue = null;
-							valueSender.clear();							
-						}
-						break;
-						
-					case Commands.GET_ARRAY_CONTENTS:
-						try {
-							target = server.getObject(in.readInt());	// Array to get the ids for.
-							valueObject.setArrayIDS(new ArrayContentsRetriever(target), Array.getLength(target), Commands.OBJECT_CLASS);
-							Commands.writeValue(out, valueObject, true);	// Write it back as a value command.
-						} catch (CommandException e) {
-							throw e;	// Throw it again. These we don't want to come up as an exception proxy. These should end the thread.
-						} catch (Throwable e) {
-							sendException(e, valueObject, out);	// Turn it into a exception proxy on the client.
-						} finally {
-							target = null;
-							valueObject.set();
-						}
-						break;
-						
-					case Commands.CALLBACK_DONE:
-						try {
-							if (connectionThread != null) {
-								valueObject.set();
-								Commands.sendErrorCommand(out, Commands.UNKNOWN_COMMAND_SENT, valueObject);
-							} else {
-								try {
-									Commands.readBackValue(in, valueObject, Commands.NO_TYPE_CHECK);
-									if (valueObject.type == Commands.ARRAY_IDS) {
-										// It is an array containing IDs, as it normally would be.
-										valueSender.initialize(valueObject);
-										Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-										result = (Object[]) valueSender.getArray();
-									} else {
-										result = getInvokableObject(valueObject);
-									}
-									doLoop = false; // We need to terminate and return result
-									closeWhenDone = false; // Don't close, we will continue.
-								} catch (CommandErrorException e) {
-									// There was an command error on the other side. This means 
-									// connection still good, but don't continue the callback processing.
-									doLoop = false; // We need to terminate and return result
-									closeWhenDone = false; // Don't close, we will continue.
-									throw e;	// Let it go on out.
-								}
-							}
-						} finally {
-							valueObject.set();
-							valueSender.clear();
-						}
-						break;
-						
-					case Commands.ERROR:
-						try {
-							// Got an error command. Don't know what to do but read the
-							// value and simply print it out.
-							Commands.readValue(in, valueObject);
-							result = getInvokableObject(valueObject);
-							System.out.println("Error sent to server: Result=" + result); //$NON-NLS-1$
-						} finally {
-							valueObject.set();
-						}
-						break;
-					
-					case Commands.EXPRESSION_TREE_COMMAND:
-						try {
-							processExpressionCommand(valueObject, valueSender);
-						} finally {
-							valueObject.set();
-							valueSender.clear();
-						}
-						break;
-						
-					default:
-						// Unknown command. We don't know how long it is, so we need to shut the connection down.
-						System.err.println("Error: Invalid cmd send to server: Cmd=" + cmd); //$NON-NLS-1$
-						doLoop = false;
-						closeWhenDone = true;
-						break;
-				}
-			}
-		} catch (EOFException e) {
-			// This is ok. It means that the connection on the other side was terminated.
-			// So just accept this and go down.
-		} catch (CommandException e) {
-			throw e;
-		} catch (SocketException e) {
-			if (socket != null)
-				throw new UnexpectedExceptionCommandException(false, e);	// socket null means a valid close request
-		} catch (Throwable e) {
-			e.printStackTrace();
-		} finally {
-			if (closeWhenDone) {
-				try {
-					for (Iterator itr = expressionProcessors.values().iterator(); itr.hasNext();) {
-						ExpressionProcesserController exp = (ExpressionProcesserController) itr.next();
-						exp.close();
-					}
-				} finally {
-					expressionProcessors.clear();
-				}
-
-				if (in != null)
-					try {
-						in.close();
-					} catch (Exception e) {
-					}
-				in = null;
-				if (out != null)
-					try {
-						out.close();
-					} catch (Exception e) {
-					}
-				out = null;
-				close();
-			}
-		}
-		
-		if (closeWhenDone && connectionThread != null)
-			server.removeConnectionThread(connectionThread);
-		if (shutdown)
-			server.requestShutdown();
-			
-		return result;
-	}
-	
-	// A retriever is what handles the array get contents.
-	private class ArrayContentsRetriever implements Commands.ValueRetrieve {
-		int index=0;
-		Object array;
-		int length;
-		int componentType;
-		Commands.ValueObject worker = new Commands.ValueObject();
-		
-		
-		public ArrayContentsRetriever(Object anArray) {
-			array = anArray;
-			length = Array.getLength(anArray);
-			if (anArray.getClass().getComponentType().isPrimitive()) {
-				componentType = server.getIdentityID(anArray.getClass().getComponentType());
-			} else
-				componentType = NOT_A_PRIMITIVE;
-		}
-		
-		public Commands.ValueObject nextValue() {
-			fillInValue(Array.get(array, index++), componentType, worker);
-			return worker;
-		}
-	};
-
-	
-	private void processExpressionCommand(Commands.ValueObject valueObject, InvokableValueSender valueSender) throws IOException, CommandException {
-		Integer expressionID = new Integer(in.readInt());
-		byte cmdType = in.readByte();
-		ExpressionProcesserController exp = null;
-		switch (cmdType) {
-			case ExpressionCommands.START_EXPRESSION_TREE_PROCESSING:
-				exp = new ExpressionProcesserController(server, this);
-				expressionProcessors.put(expressionID, exp);
-				break;
-			case ExpressionCommands.TRANSFER_EXPRESSION_REQUEST:
-				exp = (ExpressionProcesserController) expressionProcessors.remove(expressionID); 
-				sendObject(exp, NOT_A_PRIMITIVE, valueObject, out, true);
-				break;
-			case ExpressionCommands.RESUME_EXPRESSION_REQUEST:
-				Commands.readValue(in, valueObject);
-				exp = (ExpressionProcesserController) getInvokableObject(valueObject); 
-				expressionProcessors.put(expressionID, exp);
-				break;
-			case ExpressionCommands.PUSH_EXPRESSION:
-				exp = (ExpressionProcesserController) expressionProcessors.get(expressionID);
-				exp.process(in);
-				break;
-			case ExpressionCommands.SYNC_REQUEST:
-				boolean haveProxies = in.readBoolean();	// See if we expression proxy ids that need to be resolved 
-				if (haveProxies) {
-					Commands.readValue(in, valueObject);
-					valueSender.initialize(valueObject);
-					Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-				}
-
-				exp = (ExpressionProcesserController) expressionProcessors.get(expressionID);
-				if (haveProxies)
-					sendExpressionProxyResolutions(valueObject, (int[]) valueSender.getArray(), exp);
-				if (exp.noErrors()) {
-					valueObject.set(true); // Mark that all is good.
-					Commands.writeValue(out, valueObject, true, true);
-				} else {
-					processExpressionError(exp, valueObject);
-				}
-				break;
-			case ExpressionCommands.PULL_VALUE_REQUEST:
-				haveProxies = in.readBoolean();	// See if we expression proxy ids that need to be resolved
-				if (haveProxies) {
-					Commands.readValue(in, valueObject);
-					valueSender.initialize(valueObject);
-					Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
-				}
-
-				exp = (ExpressionProcesserController) expressionProcessors.get(expressionID);
-				if (haveProxies)
-					sendExpressionProxyResolutions(valueObject, (int[]) valueSender.getArray(), exp);
-				if (exp.noErrors()) {
-					try {
-						Object[] pulledValue = exp.pullValue();
-						// Send back the command code for pull value. Don't flush. We will flush when all done.
-						if (((Class) pulledValue[1]).isPrimitive()) {
-							int returnTypeID = server.getIdentityID(pulledValue[1]);
-							// Need to tell sendObject the correct primitive type.
-							sendObject(pulledValue[0], returnTypeID, valueObject, out, true, true);
-							
-						} else {
-							sendObject(pulledValue[0], NOT_A_PRIMITIVE, valueObject, out, true, true);	// Just send the object back. sendObject knows how to iterpret the type
-						}
-					} catch (NoExpressionValueException e) {
-						sendNoValueErrorCommand(exp, valueObject);
-					}
-				} else 
-					processExpressionError(exp, valueObject);
-				break;
-			case ExpressionCommands.END_EXPRESSION_TREE_PROCESSING:
-				exp = (ExpressionProcesserController) expressionProcessors.remove(expressionID);
-				exp.close();
-				break;
-		}
-	}
-
-	/*
-	 * @param is
-	 * @param exp
-	 * 
-	 * @since 1.1.0
-	 */
-	private void sendExpressionProxyResolutions(Commands.ValueObject valueObject, final int[] proxyIDs, final ExpressionProcesserController exp) throws CommandException {
-		class ExpressionProxyRetriever implements Commands.ValueRetrieve {
-			int index = 0;
-			Object[] proxyResolution = new Object[2];
-			Commands.ValueObject worker = new Commands.ValueObject();
-
-			public Commands.ValueObject nextValue() {
-				int proxyID = proxyIDs[index++];
-				if (exp.pullExpressionProxyValue(proxyID, proxyResolution)) {
-					if (proxyResolution[1] != Void.TYPE) {
-						if (((Class) proxyResolution[1]).isPrimitive()) {
-							int returnTypeID = server.getIdentityID(proxyResolution[1]);
-							// Need to tell worker the correct primitive type.
-							fillInValue(proxyResolution[0], returnTypeID, worker);
-						} else {
-							fillInValue(proxyResolution[0], NOT_A_PRIMITIVE, worker);
-						}
-					} else
-						worker.setFlag(ExpressionCommands.EXPRESSIONPROXY_VOIDTYPE);	// It was resolved, but to not set due to void type of expression.
-				} else
-					worker.setFlag(ExpressionCommands.EXPRESSIONPROXY_NOTRESOLVED);	// It wasn't resolved.
-				
-				return worker;
-			}
-		};
-
-		valueObject.setArrayIDS(new ExpressionProxyRetriever(), proxyIDs.length, Commands.OBJECT_CLASS);
-		Commands.writeValue(out, valueObject, true, false);	// Write it back as a value command.
-
-	}
-
-	private void processExpressionError(ExpressionProcesserController exp, Commands.ValueObject valueObject) throws CommandException {
-		if (exp.isNoExpressionValue()) {
-			sendNoValueErrorCommand(exp, valueObject);
-		} else
-			sendException(exp.getErrorThrowable(), valueObject, out);
-	}
-
-	/*
-	 * @param exp
-	 * @param valueObject
-	 * @throws CommandException
-	 * 
-	 * @since 1.1.0
-	 */
-	private void sendNoValueErrorCommand(ExpressionProcesserController exp, Commands.ValueObject valueObject) throws CommandException {
-		setExceptionIntoValue(exp.getErrorThrowable(), valueObject);
-		Commands.sendErrorCommand(out, ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION, valueObject);
-	}
-
-protected static final int NOT_A_PRIMITIVE = Commands.NOT_AN_ID;
-protected static final int SEND_AS_IS = -2;	// This means sends as an object not as an id.
-	
-public static final int CLASS_ADDED = 1;
-public static final int OBJECT_ADDED = 2;
-public int fillInValue(Object object, int primitiveTypeID, Commands.ValueObject valueObject) {
-	int added = 0;
-	if (object == null) {
-		valueObject.set();
-	} else {
-		int classID = 0;
-		if (primitiveTypeID != NOT_A_PRIMITIVE && primitiveTypeID != SEND_AS_IS) {
-			classID = primitiveTypeID;	// The object is really supposed to be a primitive of this type
-			switch (classID) {
-				case Commands.BOOLEAN_TYPE:
-					valueObject.set(((Boolean) object).booleanValue());
-					break;
-				case Commands.INTEGER_TYPE:
-					if (object instanceof Character)
-						valueObject.set((int) ((Character) object).charValue());	// Because char can be widened to an int
-					else
-						valueObject.set(((Number) object).intValue());					
-					break;
-				case Commands.BYTE_TYPE:
-					valueObject.set(((Number) object).byteValue());
-					break;
-				case Commands.CHARACTER_TYPE:
-					valueObject.set(((Character) object).charValue());
-					break;
-				case Commands.DOUBLE_TYPE:
-					if (object instanceof Character)
-						valueObject.set((double) ((Character) object).charValue());	// Because char can be widened to a double
-					else
-						valueObject.set(((Number) object).doubleValue());					
-					break;
-				case Commands.FLOAT_TYPE:
-					if (object instanceof Character)
-						valueObject.set((float) ((Character) object).charValue());	// Because char can be widened to a float
-					else
-						valueObject.set(((Number) object).floatValue());					
-					break;
-				case Commands.SHORT_TYPE:
-					valueObject.set(((Number) object).shortValue());
-					break;
-				case Commands.LONG_TYPE:
-					if (object instanceof Character)
-						valueObject.set((long) ((Character) object).charValue());	// Because char can be widened to a long
-					else
-						valueObject.set(((Number) object).longValue());					
-					break;
-			}
-		} else {
-			// It's not a primitive.
-			boolean addObject = false, addClass = false;			
-			Class objClass = object.getClass();
-			classID = server.getIdentityID(objClass);
-			if (classID == RemoteVMServerThread.ID_NOT_FOUND) {
-				Commands.ValueObject classValue = new Commands.ValueObject();
-				addClass = server.getIdentityID(objClass, classValue);
-				if (addClass)
-					added |= CLASS_ADDED;
-				classID = classValue.objectID;
-			}
-		
-			switch (classID) {
-				case Commands.BYTE_CLASS:
-					valueObject.set((Byte) object);
-					break;
-				case Commands.CHARACTER_CLASS:
-					valueObject.set((Character) object);
-					break;
-				case Commands.DOUBLE_CLASS:
-					valueObject.set((Double) object);
-					break;
-				case Commands.FLOAT_CLASS:
-					valueObject.set((Float) object);
-					break;
-				case Commands.INTEGER_CLASS:
-					valueObject.set((Integer) object);
-					break;
-				case Commands.LONG_CLASS:
-					valueObject.set((Long) object);
-					break;
-				case Commands.SHORT_CLASS:
-					valueObject.set((Short) object);
-					break;
-				case Commands.BOOLEAN_CLASS:
-					valueObject.set((Boolean) object);
-					break;
-				case Commands.STRING_CLASS:
-					valueObject.set((String) object);
-					break;
-				case Commands.BIG_DECIMAL_CLASS:
-					valueObject.set(object, Commands.BIG_DECIMAL_CLASS);
-					break;
-				case Commands.BIG_INTEGER_CLASS:
-					valueObject.set(object, Commands.BIG_INTEGER_CLASS);
-					break;
-				default:
-					if (primitiveTypeID != SEND_AS_IS) {
-						addObject = server.getIdentityID(object, valueObject);
-						if (addObject) {
-							added |= OBJECT_ADDED;			
-							valueObject.setObjectID(valueObject.objectID, classID);
-						} else
-							valueObject.setObjectID(valueObject.objectID);
-					} else
-						valueObject.set(object, classID);
-					break;
-			}
-		}
-	}
-	
-	return added;
-}
-
-public void sendObject(Object object, int primitiveTypeID, Commands.ValueObject valueObject, DataOutputStream out, boolean writeAsCommand) throws CommandException {
-	sendObject(object, primitiveTypeID, valueObject, out, writeAsCommand, writeAsCommand);
-}
-public void sendObject(Object object, int primitiveTypeID, Commands.ValueObject valueObject, DataOutputStream out, boolean writeAsCommand, boolean flush) throws CommandException {			
-	int added = fillInValue(object, primitiveTypeID, valueObject);
-	boolean sent = false;
-	try {
-		Commands.writeValue(out, valueObject, writeAsCommand, flush);	// Write it back as a value command.
-		sent = true;
-	} finally {
-		if (!sent) {
-			// Ending due to some problem, so clean up any added objects from the id table.
-			if ((added & OBJECT_ADDED) != 0)
-				server.removeObject(valueObject.objectID);
-			if ((added & CLASS_ADDED) != 0)
-				server.removeObject(valueObject.classID);
-		}
-	}
-}
-		
-	
-	public void sendException(Throwable e, Commands.ValueObject value, DataOutputStream out) throws CommandException {
-		// Exception ocurred, return a value command with the exception within it.
-		setExceptionIntoValue(e, value);
-		Commands.sendErrorCommand(out, Commands.THROWABLE_SENT, value);		
-	}
-
-	public void setExceptionIntoValue(Throwable e, Commands.ValueObject value) {		
-		server.getIdentityID(e, value);	// It should always create it so we don't need to know.
-		int eID = value.objectID;
-		Class eClass = e.getClass();							
-		server.getIdentityID(eClass, value);
-		int eClassID = value.objectID;
-		value.setException(eID, eClassID);
-	}
-	
-	/**
-	 * From the valueObject, get an Object that is invokable (i.e. can be the target of an invoke, or one of its parms).
-	 * If it is an array type, the a ValueSender is returned. The invoker needs to then cast this
-	 * to a ValueSender and call the readArray routine.
-	 */
-	public Object getInvokableObject(final Commands.ValueObject value) {
-		switch (value.type) {
-			case Commands.NEW_OBJECT_ID:
-			case Commands.OBJECT_ID:
-				// These need to have access to the server to get the real object
-				return server.getObject(value.objectID);						
-			default:
-				// These have all the info needed within the value object itself, so ask it.
-				return value.getAsObject();
-		}
-	}
-	
-	// Helper class for getting an array.
-	private class InvokableValueSender implements Commands.ValueSender {
-		int index = 0;
-		Object array;
-
-		public InvokableValueSender() {
-		}
-				
-		public InvokableValueSender(Commands.ValueObject arrayHeader) {
-			initialize(arrayHeader);
-		}
-		
-		public void initialize(Commands.ValueObject arrayHeader) {
-			index = 0;
-			Class arrayType = (Class) server.getObject(arrayHeader.classID);
-			array = java.lang.reflect.Array.newInstance(arrayType, arrayHeader.anInt);
-		}
-		
-		public void clear() {
-			array = null;
-			index = 0;
-		}
-		
-		public Object getArray() {
-			return array;
-		}
-					
-		// A new value is being sent to the array
-		public void sendValue(Commands.ValueObject value) {
-			java.lang.reflect.Array.set(array, index++, getInvokableObject(value));	// add it to the array
-		}
-					
-		// The next entry is an array too!
-		public Commands.ValueSender nestedArray(Commands.ValueObject arrayHeader) {
-			InvokableValueSender sender = new InvokableValueSender(arrayHeader);
-			// Take the newly created array and put it into the current array.
-			java.lang.reflect.Array.set(array, index++, sender.getArray());
-			return sender;
-		}
-	}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionThread.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionThread.java
deleted file mode 100644
index a957703..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionThread.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ConnectionThread.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:54 $ 
- */
-
-
-import java.net.Socket;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * This is a thread to handle one connection.
- */
-
-public class ConnectionThread extends Thread {	
-		
-	final protected ConnectionHandler connectionHandler;
-	
-	public ConnectionThread(Socket sc, RemoteVMServerThread svr, String name) {
-		super(name);
-
-		connectionHandler = new ConnectionHandler(sc, svr, this);
-	}
-	
-	/**
-	 * Request the thread to close down.
-	 */
-	public void close() {
-		try {
-			connectionHandler.close();
-		} catch (Exception e) {
-		}
-	}
-	
-	public void run() {
-		try {
-			connectionHandler.run();
-		} catch (CommandException e) {
-			e.printStackTrace();
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java
deleted file mode 100644
index de89505..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ExpressionProcesserController.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:12 $ 
- */
-package org.eclipse.jem.internal.proxy.vm.remote;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jem.internal.proxy.common.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.ExpressionCommands;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
- 
-/**
- * This processes the commands for expression processing and sends them over
- * to the common expression processer.
- * 
- * This will be instantiated on the start of an expression. And then
- * each expression request from the IDE will be sent into here. The
- * reason this guy doesn't hold onto the connection and process the
- * entire expression is because we need to return to the connection
- * handler to keep the connection live (there is timeouts and stuff
- * in there that we don't want to duplicate here).
- * <p>
- * If there are any expression processing errors (versus hard io errors) we
- * will save up the error but don't do any more processing other than to make
- * sure we read the complete subcommand. This is so that the inputstream is left
- * in a valid state without standed data.
- * <p>
- * The at the sync point (either get value or sync subcommand) we will send back
- * the error.
- *  
- * @since 1.0.0
- */
-public class ExpressionProcesserController {
-
-	
-	protected final RemoteVMServerThread server;
-	protected final ConnectionHandler connHandler;	
-	protected final ExpressionProcesser exp;
-	protected Commands.ValueObject workerValue = new Commands.ValueObject();	// A worker value object so we don't need to keep creating them and releasing them.
-	private ClassLoader classLoader;
-	
-	/**
-	 * Create with a default expression processer.
-	 * @param server
-	 * 
-	 * @since 1.0.0
-	 */
-	public ExpressionProcesserController(RemoteVMServerThread server, ConnectionHandler connHandler) {
-		this(server, connHandler, new ExpressionProcesser(Boolean.getBoolean(ExpressionCommands.EXPRESSIONTRACE), Long.getLong(ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD, -1L).longValue()));
-	}
-	
-	/**
-	 * Create from a subclass with a given expression processer.
-	 * 
-	 * @param server
-	 * @param exp
-	 * 
-	 * @since 1.0.0
-	 */
-	protected ExpressionProcesserController(RemoteVMServerThread server, ConnectionHandler connHandler, ExpressionProcesser exp) {
-		this.server = server;
-		this.connHandler = connHandler;
-		this.exp = exp;
-	}
-	
-	/**
-	 * Set the class loader to use for finding classes. If never set, or if <code>null</code>, then
-	 * <code>Class.forName</code> will be used.
-	 * 
-	 * @param classLoader
-	 * 
-	 * @since 1.0.0
-	 */
-	public void setClassLoader(ClassLoader classLoader) {
-		this.classLoader = classLoader;
-	}
-	
-	/*
-	 * Array of primitive type names. Used to look up primtive types in primitive types array. 
-	 * 
-	 * @since 1.0.0
-	 */
-	private static final List PRIMITIVE_NAMES = Arrays.asList(new String[] {"byte", "char", "short", "int", "long", "float", "double"});
-	private static final Class[] PRIMITIVE_TYPES = new Class[] {Byte.TYPE, Character.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE};
-	/**
-	 * Load the class given the name. If not found, return null.
-	 * 
-	 * @param className
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected Class loadClass(String className) throws ClassNotFoundException {
-		if (className == null)
-			return null;
-		else if (className.endsWith("[]")) {
-			// We have an array request instead. This is trickier.
-			return loadClass(MapTypes.getJNIFormatName(className));
-		} else {
-			int primIndex = PRIMITIVE_NAMES.indexOf(className);
-			if (primIndex >= 0)
-				return PRIMITIVE_TYPES[primIndex];
-			else if (classLoader == null) {
-				return Class.forName(className);
-			} else {
-				return classLoader.loadClass(className);
-			}
-		}
-	}
-
-	/**
-	 * Now process the input stream. If either throws occurs, this is a hard error and we must terminate
-	 * the entire connection. The input stream is in an unknown state.
-	 * 
-	 * @param in The input stream to get the data for the current sub-command.
-	 * 
-	 * @throws CommandException
-	 * @throws IOException
-	 * @since 1.0.0
-	 */
-	public void process(DataInputStream in) throws CommandException, IOException {
-		// In the following subcommand processing, we always read the entire subcommand from the stream.
-		// This is so that any errors during processing will not mess up the stream with unread data.
-		//
-		// Then we check if an error has occurred in the past. If it has, we simply break. This is because
-		// once an error occurred we don't want to continue wasting time evaluating, however we need to make
-		// sure that the stream is read completely so that we don't have a corrupted input stream. That way
-		// when all is done we can return the error and still have a valid connection socket.
-		byte subcommand = in.readByte();
-		try {
-			switch (subcommand) {
-				case InternalExpressionTypes.PUSH_TO_PROXY_EXPRESSION_VALUE:
-					// Getting a proxy push. The value is sent as valueObject, so use that to read it in.
-					Commands.readValue(in, workerValue);
-					Object value = connHandler.getInvokableObject(workerValue);
-					if (value == null)
-						exp.pushExpression(null, MethodHelper.NULL_TYPE);
-					else if (workerValue.isPrimitive())
-						exp.pushExpression(value, workerValue.getPrimitiveType());
-					else
-						exp.pushExpression(value, value.getClass());
-					break;
-
-				case InternalExpressionTypes.CAST_EXPRESSION_VALUE:
-					// Get a cast request. The type is sent as valueObject.
-					Commands.readValue(in, workerValue);
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushCast(classValue);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					} 
-					break;
-
-				case InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE:
-					// Get a instanceof request. The type is sent as valueObject.
-					Commands.readValue(in, workerValue);
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushInstanceof(classValue);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					} 
-					break;
-
-				case InternalExpressionTypes.INFIX_EXPRESSION_VALUE:
-					// Get an infix request. The operator and operand type are sent as bytes.
-					byte infix_operator = in.readByte();
-					byte infix_operandType = in.readByte();
-					exp.pushInfix(InfixOperator.get(infix_operator), InternalInfixOperandType.get(infix_operandType));
-					break;
-
-				case InternalExpressionTypes.PREFIX_EXPRESSION_VALUE:
-					// Get a prefix request. The operator is sent as byte.
-					byte prefix_operandType = in.readByte();
-					exp.pushPrefix(PrefixOperator.get(prefix_operandType));
-					break;
-
-				case InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE:
-					// Get an array access request. The index cound is sent as int.
-					int arrayAccess_Indexcount = in.readInt();
-					exp.pushArrayAccess(arrayAccess_Indexcount);
-					break;
-
-				case InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE:
-					// Get an array creation request. The type is sent as valueObject, followed by int dimension count.
-					Commands.readValue(in, workerValue);
-					int arrayCreation_dimCount = in.readInt();
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushArrayCreation(classValue, arrayCreation_dimCount);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					} 
-
-					break;
-
-				case InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE:
-					// Get an array initializer request. The type is sent as valueObject, followed by int expression count.
-					Commands.readValue(in, workerValue);
-					int stripCount = in.readInt();
-					int arrayInitializer_expressionCount = in.readInt();
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushArrayInitializer(classValue, stripCount, arrayInitializer_expressionCount);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					}
-					break;
-
-				case InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE:
-					// Get a class instance creation request. The type is sent as valueObject, followed by int argument count.
-					Commands.readValue(in, workerValue);
-					int newInstance_argCount = in.readInt();
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushClassInstanceCreation(classValue, newInstance_argCount);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					}
-					break;
-
-				case InternalExpressionTypes.TYPERECEIVER_EXPRESSION_VALUE:
-					// Get a type receiver request. The type is sent as valueObject.
-					Commands.readValue(in, workerValue);
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushExpression(classValue, classValue);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					}
-					break;
-
-				case InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE:
-					// Get a field access request. Command.ValueObject, followed by hasReceiver as boolean.
-					Commands.readValue(in, workerValue);
-					boolean has_fieldAccess_receiver = in.readBoolean();
-					try {
-						Object fieldAccess = getFieldValue(workerValue);
-						exp.pushFieldAccess(fieldAccess, workerValue.getType() == Commands.STRING, has_fieldAccess_receiver);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.						
-					} catch (NoSuchFieldException e1) {
-						// Do nothing, already processed.
-					}
-					break;
-
-				case InternalExpressionTypes.METHOD_EXPRESSION_VALUE:
-					// Get a method invocation request. Sent as Commands.ValueObject, followed by hasReceiver as boolean., and argCount as int.
-					Commands.readValue(in, workerValue);
-					boolean has_method_receiver = in.readBoolean();
-					int method_argCount = in.readInt();
-					try {
-						Object method = getMethodValue(workerValue);					
-						exp.pushMethodInvocation(method, workerValue.getType() == Commands.STRING, has_method_receiver, method_argCount);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (NoSuchMethodException e) {
-						// Do nothing, already processed.
-					}						
-					break;
-
-				case InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE:
-					// Get a conditional expression request. The expression type (ie. condition/true/false) is sent as a byte
-					exp.pushConditional(InternalConditionalOperandType.get(in.readByte()));
-					break;
-					
-				case InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE:
-					// Get an assignment expression request. The proxy id is sent as an int.
-					int proxyid = in.readInt();
-					exp.pushAssignment(new RemoteExpressionProxy(proxyid));
-					break;
-					
-				case InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE:
-					// Get an assignment expression request. Nothing else to read from stream.
-					exp.pushAssignment();
-					break;
-					
-				case InternalExpressionTypes.PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE:
-					// Get a push expression proxy expression. The proxy id is sent as an int.
-					exp.pushExpressionProxy(in.readInt());
-					break;
-				
-				case InternalExpressionTypes.BLOCK_BEGIN_EXPRESSION_VALUE:
-					// Get a begin block proxy expression. The block id is sent as an int.
-					exp.pushBlockBegin(in.readInt());
-					break;
-					
-				case InternalExpressionTypes.BLOCK_BREAK_EXPRESSION_VALUE:
-					// Get a break block proxy expression. The block id is sent as an int.
-					exp.pushBlockBreak(in.readInt());
-					break;
-					
-				case InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE:
-					// Get a end block proxy expression. The block id is sent as an int.
-					exp.pushBlockEnd(in.readInt());
-					break;
-					
-				case InternalExpressionTypes.TRY_BEGIN_EXPRESSION_VALUE:
-					// Get a try begin proxy expression. The try id is sent as an int.
-					exp.pushTryBegin(in.readInt());
-					break;
-					
-				case InternalExpressionTypes.TRY_CATCH_EXPRESSION_VALUE:
-					int tryNumber = in.readInt();
-					Commands.readValue(in, workerValue);
-					proxyid = in.readInt();
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushTryCatchClause(tryNumber, classValue, proxyid != -1 ? new RemoteExpressionProxy(proxyid) : null);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					}					
-					break;
-
-				case InternalExpressionTypes.TRY_FINALLY_EXPRESSION_VALUE:
-					// Get a try finally proxy expression. The try id is sent as an int.
-					exp.pushTryFinallyClause(in.readInt());
-					break;
-
-				case InternalExpressionTypes.TRY_END_EXPRESSION_VALUE:
-					// Get a try end proxy expression. The try id is sent as an int.
-					exp.pushTryEnd(in.readInt());
-					break;
-					
-				case InternalExpressionTypes.THROW_EXPRESSION_VALUE:
-					exp.pushThrowException();
-					break;
-
-				case InternalExpressionTypes.RETHROW_EXPRESSION_VALUE:
-					// Get a rethrow proxy expression. The try id is sent as an int.
-					exp.pushTryRethrow(in.readInt());
-					break;
-
-				case InternalExpressionTypes.PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE:
-					// Get the beantype expression proxy and resolve it.
-					proxyid = in.readInt();
-					String typeName = Commands.readStringData(in);
-					try {
-						Class classValue = loadClass(typeName);
-						RemoteExpressionProxy rep = new RemoteExpressionProxy(proxyid);
-						rep.setProxy(classValue, Class.class);
-						exp.allocateExpressionProxy(rep);
-					} catch (ClassNotFoundException e) {
-						exp.processException(e);
-					} catch (LinkageError e) {
-						exp.processException(e);
-					}
-					break;
-					
-				case InternalExpressionTypes.PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE:
-					// Get the Method expression proxy and resolve it.
-					// Comes over as:
-					//   int for proxy id for the method
-					//   beanTypeValue for declaring class (either beantype or expression proxy)
-					//   string for method name
-					//   int for arg count
-					//   beanTypeValue(s) for arg types (as many as arg count).
-					proxyid = in.readInt();
-					Commands.ValueObject decClassValue =  Commands.readValue(in, new Commands.ValueObject());
-					String methodName = Commands.readStringData(in);
-					int argCount = in.readInt();
-					Commands.ValueObject[] args = null;
-					if (argCount > 0) {
-						args = new Commands.ValueObject[argCount];
-						for (int i = 0; i < argCount; i++) {
-							args[i] = Commands.readValue(in, new Commands.ValueObject());
-						}
-					}
-					try {
-						Class decClass = getBeanTypeValue(decClassValue);
-						Class[] argClasses = null;
-						if (argCount>0) {
-							argClasses = new Class[argCount];
-							for (int i = 0; i < argCount; i++) {
-								argClasses[i] = getBeanTypeValue(args[i]);
-							}
-						}
-						// Now get the method itself.
-						Method m = decClass.getMethod(methodName, argClasses);
-						RemoteExpressionProxy rep = new RemoteExpressionProxy(proxyid);
-						rep.setProxy(m, Method.class);
-						exp.allocateExpressionProxy(rep);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					} catch (NoSuchMethodException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					}					
-					break;
-					
-				case InternalExpressionTypes.PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE:
-					// Get the Filed expression proxy and resolve it.
-					// Comes over as:
-					//   int for proxy id for the field
-					//   beanTypeValue for declaring class (either beantype or expression proxy)
-					//   string for field name
-					proxyid = in.readInt();
-					decClassValue =  Commands.readValue(in, new Commands.ValueObject());
-					String fieldName = Commands.readStringData(in);
-					try {
-						Class decClass = getBeanTypeValue(decClassValue);
-						// Now get the field itself.
-						Field f = decClass.getField(fieldName);
-						RemoteExpressionProxy rep = new RemoteExpressionProxy(proxyid);
-						rep.setProxy(f, Method.class);
-						exp.allocateExpressionProxy(rep);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					} catch (NoSuchFieldException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					}					
-					break;					
-					
-				case InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE:
-					// Get a if test expression request. 
-					exp.pushIfElse();
-					break;
-					
-				case InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE:
-					// Get a if/else expression clause request. The clause type (ie. true/false) is sent as a byte
-					exp.pushIfElse(InternalIfElseOperandType.get(in.readByte()));
-					break;
-					
-				case InternalExpressionTypes.NEW_INSTANCE_VALUE:
-					// Get a new instance from string.
-					String initString = Commands.readStringData(in);
-					workerValue =  Commands.readValue(in, new Commands.ValueObject());
-					try {
-						Class classValue = getBeanTypeValue(workerValue);
-						exp.pushNewInstanceFromString(initString, classValue, classLoader);
-					} catch (ClassCastException e) {
-						exp.processException(e);	// Let the processor know we have a stopping error.
-					} catch (ClassNotFoundException e) {
-						// Do nothing, already processed.
-					}
-					break;
-					
-				case InternalExpressionTypes.MARK_VALUE:
-					// Do a mark.
-					int markID = in.readInt();
-					exp.pushMark(markID);
-					break;
-					
-				case InternalExpressionTypes.ENDMARK_VALUE:
-					// Do an end mark.
-					markID = in.readInt();
-					boolean restore = in.readBoolean();
-					exp.pushEndmark(markID, restore);
-					break;
-			}
-			
-		} catch (RuntimeException e) {
-			exp.processException(e);
-		}
-		
-		workerValue.set();	// Clear it out so nothing being held onto.
-	}
-	
-	/**
-	 * Get the beantype (class) out of the value object sent in. It can handle the beantype sent or
-	 * as an expression proxy to a beantype expression proxy.
-	 * 
-	 * @param value
-	 * @return
-	 * @throws ClassCastException means either not a type sent in, or proxy was not a type.
-	 * @throws ClassNotFoundException the expression proxy did not resolve. In that case it has already been processed by the expression processor.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected Class getBeanTypeValue(Commands.ValueObject value) throws ClassCastException, ClassNotFoundException {
-		Object beantype = connHandler.getInvokableObject(value);
-		// It is either a type directly or is an expression proxy.
-		if (value.type == Commands.INT) {
-			// It is an expression proxy request.
-			Object[] expvalue = new Object[2];
-			if (exp.getExpressionProxyValue(((Integer) beantype).intValue(), expvalue)) {
-				beantype = expvalue[0]; 
-			} else
-				throw new ClassNotFoundException();
-		}
-		return (Class) beantype;
-	}
-		
-	/**
-	 * Get the method out of the value object sent in. It can handle the method sent or
-	 * as an expression proxy to a method expression proxy.
-	 * @param value
-	 * @return method if a method or string if a string or get the method if an expression proxy.
-	 * @throws NoSuchMethodException the expression proxy did not resolve. In that case it has already been processed by the expression processor.
-	 * @throws ClassCastException means either not a method sent in, or proxy was not a method.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected Object getMethodValue(Commands.ValueObject value) throws NoSuchMethodException, ClassCastException {
-		Object method = connHandler.getInvokableObject(value);
-		// It is either a method directly or is an expression proxy.
-		if (value.type == Commands.INT) {
-			// It is an expression proxy request.
-			Object[] expvalue = new Object[2];
-			if (exp.getExpressionProxyValue(((Integer) method).intValue(), expvalue)) {
-				method = expvalue[0]; 
-			} else
-				throw new NoSuchMethodException();
-		}
-		return method;
-	}	
-
-	/**
-	 * Get the field out of the value object sent in. It can handle the field sent or
-	 * as an expression proxy to a field expression proxy.
-	 * @param value
-	 * @return field if a field or string if a string or get the field if an expression proxy.
-	 * @throws NoSuchFieldException the expression proxy did not resolve. In that case it has already been processed by the expression processor.
-	 * @throws ClassCastException means either not a field sent in, or proxy was not a field.
-	 * 
-	 * @since 1.1.0
-	 */
-	protected Object getFieldValue(Commands.ValueObject value) throws NoSuchFieldException, ClassCastException {
-		Object field = connHandler.getInvokableObject(value);
-		// It is either a field directly or is an expression proxy.
-		if (value.type == Commands.INT) {
-			// It is an expression proxy request.
-			Object[] expvalue = new Object[2];
-			if (exp.getExpressionProxyValue(((Integer) field).intValue(), expvalue)) {
-				field = expvalue[0]; 
-			} else
-				throw new NoSuchFieldException();
-		}
-		return field;
-	}	
-	
-	/**
-	 * Pull the Expression Proxy value into the result object.
-	 * @param proxyID
-	 * @param result
-	 * @return <code>true</code> if value could be returned, <code>false</code> if it was no expression value assigned.
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean pullExpressionProxyValue(int proxyID, Object[] result) {
-		try {
-			exp.pullExpressionProxyValue(proxyID, result);
-			return true;
-		} catch (NoExpressionValueException e) {
-		}
-		return false;
-	}
-	
-	private static class RemoteExpressionProxy implements InternalExpressionProxy {
-
-		
-		private final int proxyID;
-		private Object value;
-		private Class type;
-		private boolean set;
-		
-		public RemoteExpressionProxy(int proxyID) {
-			this.proxyID = proxyID;
-			
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getProxyID()
-		 */
-		public int getProxyID() {
-			return proxyID;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getType()
-		 */
-		public Class getType() {
-			return type;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getValue()
-		 */
-		public Object getValue() {
-			return value;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#isSet()
-		 */
-		public boolean isSet() {
-			return set;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#setProxy(java.lang.Object, java.lang.Class)
-		 */
-		public void setProxy(Object value, Class type) {
-			this.value = value;
-			this.type = type;
-			set = true;
-		}
-	}
-	
-
-	/**
-	 * Pull the value. 
-	 * 
-	 * @return r[0] is the value, r[1] is the type of the value.
-	 * @throws NoExpressionValueException
-	 * 
-	 * @since 1.0.0
-	 */
-	public Object[] pullValue() throws NoExpressionValueException {
-		Object[] result = new Object[2];
-		exp.pullValue(result);
-		return result;
-	}
-				
-	/**
-	 * Close out things.
-	 * 
-	 * @since 1.0.0
-	 */
-	public void close() {
-		exp.close();
-	}
-	
-	/**
-	 * Get the throwable error.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public Throwable getErrorThrowable() {
-		return exp.getErrorThrowable();
-	}
-	
-	/**
-	 * Return whether there were no errors or not.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean noErrors() {
-		return exp.noErrors();
-	}
-	
-	/**
-	 * Return whether there is a no expression value exception or not.
-	 * @return
-	 * 
-	 * @since 1.1.0
-	 */
-	public boolean isNoExpressionValue() {
-		return exp.isNoExpressionValue();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/IdentityMap.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/IdentityMap.java
deleted file mode 100644
index c5f3418..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/IdentityMap.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IdentityMap.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:54 $ 
- */
-
-
-import java.util.*;
-/**
- * A HashMap where the key is
- * done as an identity (i.e. found by '==' not equals()).
- */
-
-public class IdentityMap extends HashMap{
-	
-	/**
-	 * Key that returns true on equals() only
-	 * if the item it is wrappering is '=='
-	 * not equals()
-	 */
-	static class IdentityKey {
-		
-		public static IdentityKey createKey(Object obj) {
-			return obj != null ? new IdentityKey(obj) : null;
-		}
-		
-		final Object o;
-		
-		public IdentityKey(Object obj) {
-			o = obj;
-		}
-		
-		public boolean equals(Object obj) {
-			if (this == obj) return true;
-			if (!(obj instanceof IdentityKey)) return false;
-			if (this.o == (((IdentityKey) obj).o)) return true;
-			return false;
-		}
-		
-		public int hashCode() {
-			return o.hashCode();
-		}
-	}
-	
-	public IdentityMap() {
-	}
-	
-	public IdentityMap(int capacity) {
-		super(capacity);
-	}
-	
-	public IdentityMap(int capacity, float loadFactor) {
-		super(capacity, loadFactor);
-	}
-	
-	public boolean containsKey(Object key) {
-		return super.containsKey(IdentityKey.createKey(key));
-	}
-	
-	public Object get(Object key) {
-		return super.get(IdentityKey.createKey(key));
-	}
-	
-	public Object put(Object key, Object value) {
-		return super.put(IdentityKey.createKey(key), value);
-	}
-	
-	public Object remove(Object key) {
-		return super.remove(IdentityKey.createKey(key));
-	}
-	
-	/**
-	 * NOTE: Didn't bother implementing entrySet(). If that becomes
-	 * needed, then it will be implemented.
-	 */
-	public Set entrySet() {
-		throw  new UnsupportedOperationException();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMApplication.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMApplication.java
deleted file mode 100644
index b456576..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMApplication.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: RemoteVMApplication.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:54 $ 
- */
-
-
-/**
- * The application to run to kick off the remote VM server side.
- *
- *
- * All this does is start the Server Thread and waits for it to finish.
- * This allows other mains to have a server thread, and some other
- * threads if they wished. They could start the server thread too
- * and some other thread, and then wait for both to finish.
- */
-
-public class RemoteVMApplication {
-
-public static void main(java.lang.String[] args) {
-	String serverName = "Server Thread"; //$NON-NLS-1$
-	if (System.getProperty("proxyvm.servername") != null) //$NON-NLS-1$
-		serverName = serverName + "-" + System.getProperty("proxyvm.servername"); //$NON-NLS-1$ //$NON-NLS-2$
-	Thread t = new RemoteVMServerThread(serverName);
-	t.start();
-	try {
-		t.join();
-	} catch (Exception e) {
-	}
-	System.exit(0);
-}
-
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java
deleted file mode 100644
index 7557386..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java
+++ /dev/null
@@ -1,651 +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.jem.internal.proxy.vm.remote;
-/*
- *  $RCSfile: RemoteVMServerThread.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/16 19:11:23 $ 
- */
-
-
-import java.util.*;
-import java.io.*;
-import java.net.*;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.*;
-/**
- * RemoteVM Server Thread. This thread is the one
- * that waits for connections and spins off 
- * server connection threads. It manages the
- * connection threads and handles shutting them
- * down.
- *
- * System Properties:
- *   proxyvm.port - Port number to use for the ServerSocket (default is 8888)
- *   proxyvm.bufsize - Buffer size to use for TCP/IP buffers (default is system default)
- */
-
-public class RemoteVMServerThread extends Thread implements IVMServer {
-	protected List threads = Collections.synchronizedList(new LinkedList());	// List of active threads.
-	protected ServerSocket server;	// Server Socket for this application
-	private int highestIdentityID = 0;	// Identity codes to identify objects between server and client.
-	private IdentityMap objectToIDMap = new IdentityMap(100);	// Map from object to identity id
-	private HashMap idToObjectMap = new HashMap(100);	// Map from identity id to object
-	
-	protected Stack fCallbackHandlerPool = new Stack();	// Stack of free callback handlers
-	protected static int NUMBER_FREE_CALLBACKS = 5;	// Number of free callback handlers to keep open.
-	
-	public static int ID_NOT_FOUND = Commands.NOT_AN_ID;	// The id was not found in the table.
-	
-	protected int masterIDESocketPort = -1;	// Port of master server socket on IDE. Used for special global requests.
-	protected int registryKey = -1;	// Key of registry on the IDE.
-	
-	// Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
-	// wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
-	// in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
-	static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3");	 //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-	
-	public RemoteVMServerThread(String name) {
-		super(name);
-	}
-	
-	// The purpose of this thread is to wait 5 minutes, then see if the IDE is still
-	// up. If it isn't it will go down. This is safety mechanism
-	// in case the client went down without cleaning up and telling the server to go down.
-	// That way it won't hang around forever.
-	private boolean goingDown = false;
-	private Thread safeClean = new Thread(new Runnable() {
-		public void run() {
-			while (!goingDown) {
-				if (Thread.interrupted())
-					continue;	// Get to clean uninterrupted state.
-				try {
-					Thread.sleep(5 * 60 * 1000);	// Sleep five minutes
-					// Test if IDE still up.
-					if (!isAlive()) {
-						System.err.println("No registry available to connect with after five minutes. Shutting down.");	//$NON-NLS-1$
-						requestShutdown();
-						break;
-					}
-				} catch (InterruptedException e) {
-				}
-			}
-		}
-
-		/*
-		 * See if still alive
-		 */		
-		private boolean isAlive() {
-			Socket socket = getSocket();
-			if (socket != null) {
-				try {
-					DataOutputStream out = new DataOutputStream(socket.getOutputStream());
-					DataInputStream in = new DataInputStream(socket.getInputStream());
-					
-					try {
-						out.writeByte(Commands.ALIVE);
-						out.writeInt(registryKey);
-						out.flush();
-						return in.readBoolean();
-						// Now get the result.
-					} finally {
-						try {
-							in.close();
-						} catch (IOException e) {
-						}
-						try {
-							out.close();
-						} catch (IOException e) {
-						}
-					}
-				} catch (IOException e) {
-					e.printStackTrace();
-				} finally {
-					try {
-						socket.close();
-					} catch (IOException e) {
-						e.printStackTrace();	// They should be closing. If they aren't, then they accumulate and master server will start rejecting new ones.
-					}
-				}					
-			}
-			
-			return false;
-		}	
-		
-	}, "Timeout Termination Thread"); //$NON-NLS-1$
-	
-	
-	public void run() {
-		
-		// Initialize the mapping table with certain pre-defined ids.
-		synchronized(objectToIDMap) {
-			objectToIDMap.put(Void.TYPE, new Integer(Commands.VOID_TYPE));
-			idToObjectMap.put(new Integer(Commands.VOID_TYPE), Void.TYPE);
-			
-			objectToIDMap.put(Boolean.TYPE, new Integer(Commands.BOOLEAN_TYPE));
-			idToObjectMap.put(new Integer(Commands.BOOLEAN_TYPE), Boolean.TYPE);
-			objectToIDMap.put(Boolean.class, new Integer(Commands.BOOLEAN_CLASS));
-			idToObjectMap.put(new Integer(Commands.BOOLEAN_CLASS), Boolean.class);
-			
-			objectToIDMap.put(Integer.TYPE, new Integer(Commands.INTEGER_TYPE));
-			idToObjectMap.put(new Integer(Commands.INTEGER_TYPE), Integer.TYPE);
-			objectToIDMap.put(Integer.class, new Integer(Commands.INTEGER_CLASS));
-			idToObjectMap.put(new Integer(Commands.INTEGER_CLASS), Integer.class);
-			
-			objectToIDMap.put(Byte.TYPE, new Integer(Commands.BYTE_TYPE));
-			idToObjectMap.put(new Integer(Commands.BYTE_TYPE), Byte.TYPE);
-			objectToIDMap.put(Byte.class, new Integer(Commands.BYTE_CLASS));
-			idToObjectMap.put(new Integer(Commands.BYTE_CLASS), Byte.class);
-			
-			objectToIDMap.put(Short.TYPE, new Integer(Commands.SHORT_TYPE));
-			idToObjectMap.put(new Integer(Commands.SHORT_TYPE), Short.TYPE);
-			objectToIDMap.put(Short.class, new Integer(Commands.SHORT_CLASS));
-			idToObjectMap.put(new Integer(Commands.SHORT_CLASS), Short.class);	
-			
-			objectToIDMap.put(Long.TYPE, new Integer(Commands.LONG_TYPE));
-			idToObjectMap.put(new Integer(Commands.LONG_TYPE), Long.TYPE);
-			objectToIDMap.put(Long.class, new Integer(Commands.LONG_CLASS));
-			idToObjectMap.put(new Integer(Commands.LONG_CLASS), Long.class);
-			
-			objectToIDMap.put(Character.TYPE, new Integer(Commands.CHARACTER_TYPE));
-			idToObjectMap.put(new Integer(Commands.CHARACTER_TYPE), Character.TYPE);
-			objectToIDMap.put(Character.class, new Integer(Commands.CHARACTER_CLASS));
-			idToObjectMap.put(new Integer(Commands.CHARACTER_CLASS), Character.class);
-			
-			objectToIDMap.put(Double.TYPE, new Integer(Commands.DOUBLE_TYPE));
-			idToObjectMap.put(new Integer(Commands.DOUBLE_TYPE), Double.TYPE);
-			objectToIDMap.put(Double.class, new Integer(Commands.DOUBLE_CLASS));
-			idToObjectMap.put(new Integer(Commands.DOUBLE_CLASS), Double.class);
-			
-			objectToIDMap.put(Float.TYPE, new Integer(Commands.FLOAT_TYPE));
-			idToObjectMap.put(new Integer(Commands.FLOAT_TYPE), Float.TYPE);
-			objectToIDMap.put(Float.class, new Integer(Commands.FLOAT_CLASS));
-			idToObjectMap.put(new Integer(Commands.FLOAT_CLASS), Float.class);														
-						
-			objectToIDMap.put(String.class, new Integer(Commands.STRING_CLASS));
-			idToObjectMap.put(new Integer(Commands.STRING_CLASS), String.class);
-			
-			objectToIDMap.put(java.math.BigDecimal.class, new Integer(Commands.BIG_DECIMAL_CLASS));
-			idToObjectMap.put(new Integer(Commands.BIG_DECIMAL_CLASS), java.math.BigDecimal.class);
-			
-			objectToIDMap.put(java.math.BigInteger.class, new Integer(Commands.BIG_INTEGER_CLASS));
-			idToObjectMap.put(new Integer(Commands.BIG_INTEGER_CLASS), java.math.BigInteger.class);
-			
-			objectToIDMap.put(Number.class, new Integer(Commands.NUMBER_CLASS));
-			idToObjectMap.put(new Integer(Commands.NUMBER_CLASS), Number.class);				
-			
-			objectToIDMap.put(Throwable.class, new Integer(Commands.THROWABLE_CLASS));
-			idToObjectMap.put(new Integer(Commands.THROWABLE_CLASS), Throwable.class);	
-			
-			
-			objectToIDMap.put(Object.class, new Integer(Commands.OBJECT_CLASS));
-			idToObjectMap.put(new Integer(Commands.OBJECT_CLASS), Object.class);	
-						
-			objectToIDMap.put(Class.class, new Integer(Commands.CLASS_CLASS));
-			idToObjectMap.put(new Integer(Commands.CLASS_CLASS), Class.class);
-			
-			objectToIDMap.put(java.lang.reflect.AccessibleObject.class, new Integer(Commands.ACCESSIBLEOBJECT_CLASS));
-			idToObjectMap.put(new Integer(Commands.ACCESSIBLEOBJECT_CLASS), java.lang.reflect.AccessibleObject.class);								
-
-			objectToIDMap.put(java.lang.reflect.Method.class, new Integer(Commands.METHOD_CLASS));
-			idToObjectMap.put(new Integer(Commands.METHOD_CLASS), java.lang.reflect.Method.class);
-			
-			objectToIDMap.put(java.lang.reflect.Constructor.class, new Integer(Commands.CONSTRUCTOR_CLASS));
-			idToObjectMap.put(new Integer(Commands.CONSTRUCTOR_CLASS), java.lang.reflect.Constructor.class);				
-			
-			objectToIDMap.put(java.lang.reflect.Field.class, new Integer(Commands.FIELD_CLASS));
-			idToObjectMap.put(new Integer(Commands.FIELD_CLASS), java.lang.reflect.Field.class);	
-
-			objectToIDMap.put(IVMServer.class, new Integer(Commands.IVMSERVER_CLASS));
-			idToObjectMap.put(new Integer(Commands.IVMSERVER_CLASS), IVMServer.class);	
-
-			objectToIDMap.put(ICallback.class, new Integer(Commands.ICALLBACK_CLASS));
-			idToObjectMap.put(new Integer(Commands.ICALLBACK_CLASS), ICallback.class);	
-			
-			objectToIDMap.put(this, new Integer(Commands.REMOTESERVER_ID));
-			idToObjectMap.put(new Integer(Commands.REMOTESERVER_ID), this);	
-
-			objectToIDMap.put(RemoteVMServerThread.class, new Integer(Commands.REMOTEVMSERVER_CLASS));
-			idToObjectMap.put(new Integer(Commands.REMOTEVMSERVER_CLASS), RemoteVMServerThread.class);	
-
-			objectToIDMap.put(Thread.class, new Integer(Commands.THREAD_CLASS));
-			idToObjectMap.put(new Integer(Commands.THREAD_CLASS), Thread.class);	
-
-			objectToIDMap.put(ExpressionProcesserController.class, new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS));
-			idToObjectMap.put(new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS), ExpressionProcesserController.class);	
-
-			try {
-				java.lang.reflect.Method getMethod = Class.class.getMethod("getMethod", new Class[] {String.class, (new Class[0]).getClass()}); //$NON-NLS-1$
-				objectToIDMap.put(getMethod, new Integer(Commands.GET_METHOD_ID));
-				idToObjectMap.put(new Integer(Commands.GET_METHOD_ID), getMethod);	
-				
-				java.lang.reflect.Method initMethod = ICallback.class.getMethod("initializeCallback", new Class[] {IVMServer.class, Integer.TYPE}); //$NON-NLS-1$
-				objectToIDMap.put(initMethod, new Integer(Commands.INITIALIZECALLBACK_METHOD_ID));
-				idToObjectMap.put(new Integer(Commands.INITIALIZECALLBACK_METHOD_ID), initMethod);	
-				
-			} catch (NoSuchMethodException e) {
-				// Shouldn't really ever occur.
-			}				
-
-			highestIdentityID = Commands.FIRST_FREE_ID;		
-		}
-
-		masterIDESocketPort = Integer.getInteger("proxyvm.masterPort", -1).intValue(); //$NON-NLS-1$
-		if (masterIDESocketPort == -1) {
-			// No ports specified, need to just shutdown.
-			shutdown();
-			return;
-		}
-		
-		registryKey = Integer.getInteger("proxyvm.registryKey", -1).intValue(); //$NON-NLS-1$
-		if (registryKey == -1) {
-			// No registry specified, need to just shutdown.
-			shutdown();
-			return;
-		}		
-		
-		safeClean.setPriority(Thread.MIN_PRIORITY);
-		safeClean.start();	
-		boolean trying = true;
-		try {
-			server = new ServerSocket(0, 50 , InetAddress.getByName("localhost")); //$NON-NLS-1$
-			trying = false;
-			if (LINUX_1_3)
-				server.setSoTimeout(1000);	// Linux 1.3 bug, see comment on LINUX_1_3
-			if (registerServer(server.getLocalPort())) {
-				while(server != null) {
-					Socket incoming = null;
-					try {
-						incoming = server.accept();
-					} catch (InterruptedIOException e) {
-						continue;	// Timeout, try again
-					} catch (NullPointerException e) {
-						continue;	// Server could of gone null after test in while, means shutting down. This probably would only happen Linux 1.3.
-					}
-					Thread st = new ConnectionThread(incoming, this, "Connection Thread"); //$NON-NLS-1$
-					threads.add(st);
-					safeClean.interrupt();	// Let safeClean know there is a change
-					st.start();
-					// Null out locals so they can be GC'd since this is a long running loop.
-					st = null;
-					incoming = null;
-				}
-			}
-		} catch (SocketException e) {
-			if (trying || server != null)
-				e.printStackTrace();	// Exception and not shutdown request, so print stack trace.
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-		
-		// We've had an exception, either something really bad, or we were closed,
-		// so go through shutdowns.
-		shutdown();		
-	}
-	
-	
-	/**
-	 * Get an identityID, return -1 if not found.
-	 */
-	public int getIdentityID(Object anObject) {
-		synchronized(objectToIDMap) {
-			Integer id = (Integer) objectToIDMap.get(anObject);
-			return id != null ? id.intValue() : ID_NOT_FOUND;
-		}
-	}
-	
-	/**
-	 * Get an identityID and add it if not found. Place the id in the
-	 * ValueObject passed in and return whether it was added (true) or was already in table (false)
-	 */
-	public boolean getIdentityID(Object anObject, Commands.ValueObject intoValue ) {
-		boolean added = false;
-		synchronized(objectToIDMap) {
-			Integer id = (Integer) objectToIDMap.get(anObject);
-			if (id == null) {
-				do {
-					if (++highestIdentityID == Commands.NOT_AN_ID)
-						++highestIdentityID;	// Don't let -1 be a valid id.
-					id = new Integer(highestIdentityID);
-				} while (idToObjectMap.containsKey(id)); // Make sure not in use, really shouldn't ever happen because we have over 4 billion before it wraps back
-				objectToIDMap.put(anObject, id);
-				idToObjectMap.put(id, anObject);
-				added = true;
-			} 
-			intoValue.setObjectID(id.intValue());
-		}
-		return added;
-	}
-	
-	/**
-	 * Remove an identity object from the mapping.
-	 */
-	public void removeObject(Object anObject) {
-		synchronized(objectToIDMap) {
-			Integer id = (Integer) objectToIDMap.remove(anObject);
-			idToObjectMap.remove(id);
-		}
-	}
-	
-	/**
-	 * Remove an identity object from the mapping, given the id.
-	 */
-	public void removeObject(int id) {
-		synchronized(objectToIDMap) {
-			Object o = idToObjectMap.remove(new Integer(id));
-			objectToIDMap.remove(o);
-		}
-	}
-	
-	/**
-	 * Get the object for an identity id
-	 */
-	public Object getObject(int id) {
-		synchronized(objectToIDMap) {
-			return idToObjectMap.get(new Integer(id));
-		}
-	} 
-	
-	/**
-	 * Remove a thread from the list.
-	 */
-	public void removeConnectionThread(Thread thread) {
-		threads.remove(thread);
-		safeClean.interrupt();	// Let safe clean know there is a change.
-	}
-	
-	/**
-	 * Use this to request a shutdown. If the server hasn't even been
-	 * created yet, this will return false.
-	 */
-	public boolean requestShutdown() {		
-		if (server == null)
-			return false;
-		// Closing the server socket should cause a break.
-		try {
-			ServerSocket srv = server;
-			server = null;	// So that server knows it is being shutdown and not print exception msg.
-			srv.close();
-		} catch (Exception e) {
-		}
-		return true;
-	}
-	
-	/**
-	 * Request a callback stream to write to.
-	 * When done, the stream should be closed to release the connection.
-	 */
-	public OutputStream requestStream(int callbackID, int msgID)  throws CommandException {
-		CallbackHandler h = (CallbackHandler) getFreeCallbackHandler();
-		if (h == null)
-			throw new CommandException("No callback handler retrieved.", null);	//$NON-NLS-1$
-		h.initiateCallbackStream(callbackID, msgID);
-		return new CallbackOutputStream(h, this);
-	}
-	
-	protected void shutdown() {
-		goingDown = true;
-		safeClean.interrupt();	// Let safeClean know to come down.
-		
-		if (server != null)
-			try {
-				server.close();	// Close it so that no more requests can be made.
-			} catch (Exception e) {
-			}
-		
-		// Go through each thread and ask it to close. Make a copy of the list so that we
-		// won't get into deadlocks.
-		ConnectionThread[] threadsArray = (ConnectionThread[]) threads.toArray(new ConnectionThread[0]);
-		for (int i=0; i<threadsArray.length; i++) {
-			// This is a harsh way to shut a connection down, but there's no
-			// other way I know of to interrupt the read on a socket.
-			threadsArray[i].close();
-		}
-			
-		// Now that they've been told to close, wait on each one to finish.
-		for (int i=0; i<threadsArray.length; i++)
-			try {
-				threadsArray[i].join(10000);	// Wait ten seconds, if longer, just go on to next one.
-				if (threadsArray[i].isAlive())
-					System.out.println("*** Connection "+i+" did not die.");
-			} catch (InterruptedException e) {
-			}
-	
-		if (safeClean.isAlive()) {
-			try {	
-				safeClean.join(10000);
-				if (safeClean.isAlive())
-					System.out.println("*** Cleanup thread did not die.");
-			} catch (InterruptedException e) {
-			}
-		}
-		
-		// Now close the callbacks.
-		synchronized(fCallbackHandlerPool) {
-			// Now we walk through all of the free handlers and close them properly.
-			Iterator itr = fCallbackHandlerPool.iterator();
-			while (itr.hasNext()) {
-				((CallbackHandler) itr.next()).closeHandler();
-			}
-			
-			fCallbackHandlerPool.clear();
-		}					
-	}
-	
-	/**
-	 * Return a free callback handler
-	 */
-	public ICallbackHandler getFreeCallbackHandler() {
-		synchronized(fCallbackHandlerPool) {
-			if (!fCallbackHandlerPool.isEmpty())
-				return (ICallbackHandler) fCallbackHandlerPool.pop();
-			// else we need to allocate one.			
-			return createCallbackHandler();
-		}
-	}
-	
-	/**
-	 * Make a new callback handler
-	 */
-	protected ICallbackHandler createCallbackHandler() {
-		Socket callbackSocket = requestCallbackSocket();
-		if (callbackSocket != null) {
-			CallbackHandler handler = new CallbackHandler(callbackSocket, this);
-			if (handler.isConnected())
-				return handler;
-				
-			// Failed, close the socket.
-			try {
-				callbackSocket.close();
-			} catch (IOException e) {
-			}
-		}
-		return null;
-	}	
-	
-	/**
-	 * Free the handler
-	 */
-	public void returnCallbackHandler(ICallbackHandler aHandler) {
-		CallbackHandler handler = (CallbackHandler) aHandler;
-		if (handler.isConnected())
-			synchronized (fCallbackHandlerPool) {
-				if (fCallbackHandlerPool.size() < NUMBER_FREE_CALLBACKS)
-					fCallbackHandlerPool.push(handler);
-				else
-					handler.closeHandler();	// We don't need to maintain more than five free connections.
-			}
-	}
-	
-	/**
-	 * Process a callback.
-	 */
-	public Object doCallback(ICallbackRunnable run) throws CommandException {
-		CallbackHandler handler = (CallbackHandler) getFreeCallbackHandler();
-		if (handler != null) {
-			try {
-				try {
-					return run.run(handler);
-				} catch (CommandErrorException e) {
-					// This is command error, connection still good, don't retry, just pass it on.
-					// It means the other side said I processed it, but there is an error.
-					throw e;
-				} catch (CommandException e) {
-					if (!e.isRecoverable()) {
-						// Close this handler and try a new one, one more time.
-						handler.closeHandler();
-						handler = (CallbackHandler) getFreeCallbackHandler();
-						try {
-							return run.run(handler);											
-						} catch (CommandException eAgain) {
-							// It failed again, just close the connection and rethrow the exception.
-							handler.closeHandler();
-							throw eAgain;
-						}
-					} else
-						throw e;	// Recoverable, rethrow exception.
-				}
-			} finally {
-				returnCallbackHandler(handler);
-			}
-		} else
-			throw new CommandException("No callback handler retrieved.", null);	//$NON-NLS-1$
-		
-	}
-	
-	/*
-	 * Register the server. Return if ide still active
-	 */
-	private boolean registerServer(int vmserverPort) {
-		Socket socket = getSocket();
-		if (socket != null) {
-			try {
-				DataOutputStream out = new DataOutputStream(socket.getOutputStream());
-				DataInputStream in = new DataInputStream(socket.getInputStream());
-				
-				try {
-					out.writeByte(Commands.REMOTE_STARTED);
-					out.writeInt(registryKey);
-					out.writeInt(vmserverPort);
-					out.flush();
-					return in.readBoolean();
-				} finally {
-					try {
-						in.close();
-					} catch (IOException e) {
-					}
-					try {
-						out.close();
-					} catch (IOException e) {
-					}
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			} finally {
-				try {
-					socket.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}					
-
-		}
-		
-		return false;
-	}
-	
-	/*
-	 * Request the callback socket. <code>null</code> if there isn't one.
-	 */
-	private Socket requestCallbackSocket() {
-		Socket socket = getSocket();
-		if (socket != null) {
-			boolean closeSocket = true;
-			try {
-				DataOutputStream out = new DataOutputStream(socket.getOutputStream());
-				DataInputStream in = new DataInputStream(socket.getInputStream());
-				
-				try {
-					out.writeByte(Commands.ATTACH_CALLBACK);
-					out.writeInt(registryKey);
-					out.flush();
-					closeSocket = !in.readBoolean();
-					return !closeSocket ? socket : null;
-				} finally {
-					if (closeSocket) {
-						try {
-							in.close();
-						} catch (IOException e) {
-						}
-						try {
-							out.close();
-						} catch (IOException e) {
-						}
-					}
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			} finally {
-				if (closeSocket) {
-					try {
-						socket.close();
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-			}					
-		}
-		
-		return null;
-	}	
-	
-
-
-	protected Socket getSocket() {
-		// We are putting it off into a thread because there are no timeout capabilities on getting a socket.
-		// So we need to allow for that.		
-		final Socket[] scArray = new Socket[1];
-		final boolean[] waiting = new boolean[] {true};		
-		Thread doIt = new Thread(new Runnable() {
-			public void run() {
-				try {
-					Socket sc = new Socket("localhost", masterIDESocketPort); //$NON-NLS-1$
-					synchronized (this) {
-						if (waiting[0])
-							scArray[0] = sc;
-						else
-							sc.close();	// We are no longer waiting on this thread so close the socket since no one will use it.
-					}					
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		});
-		
-		doIt.start();
-		while (true) {
-			try {
-				doIt.join(60000);
-				synchronized (doIt) {
-					waiting[0] = false;	// To let it know we are no longer waiting
-				}
-				break;
-			} catch (InterruptedException e) {
-			}
-		}
-		
-		if (scArray[0] == null) {
-			System.out.println("Couldn't retrieve a socket from master server in 60 seconds.");	//$NON-NLS-1$
-			return null;	// Couldn't get one, probably server is down.
-		}
-			
-		return scArray[0];
-	}
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/StackTraceUtility.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/StackTraceUtility.java
deleted file mode 100644
index beb0921..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/StackTraceUtility.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: StackTraceUtility.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:57:54 $ 
- */
-
-
-import java.io.*;
-/**
- * A utility to get the stack trace from an exception
- * back to the client.
- */
-public class StackTraceUtility {
-	
-	public static String printStackTrace(Throwable t) {
-		StringWriter writer = new StringWriter();
-		t.printStackTrace(new PrintWriter(writer));
-		return writer.toString();
-	}
-		
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.ui/.classpath b/plugins/org.eclipse.jem.ui/.classpath
deleted file mode 100644
index 66f349e..0000000
--- a/plugins/org.eclipse.jem.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="ui"/>
-	<classpathentry kind="src" path="beaninfoui"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.ui/.cvsignore b/plugins/org.eclipse.jem.ui/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/plugins/org.eclipse.jem.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/plugins/org.eclipse.jem.ui/.options b/plugins/org.eclipse.jem.ui/.options
deleted file mode 100644
index a7e0740..0000000
--- a/plugins/org.eclipse.jem.ui/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.ui/debug/logtrace=default
-org.eclipse.jem.ui/debug/logtracefile=default
-org.eclipse.jem.ui/debug/loglevel=default
diff --git a/plugins/org.eclipse.jem.ui/.project b/plugins/org.eclipse.jem.ui/.project
deleted file mode 100644
index aee49c2..0000000
--- a/plugins/org.eclipse.jem.ui/.project
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.debug.core</project>
-		<project>org.eclipse.debug.ui</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jdt.debug.ui</project>
-		<project>org.eclipse.jdt.launching</project>
-		<project>org.eclipse.jdt.ui</project>
-		<project>org.eclipse.jem.beaninfo</project>
-		<project>org.eclipse.jem.proxy</project>
-		<project>org.eclipse.jem.workbench</project>
-		<project>org.eclipse.ui</project>
-		<project>org.eclipse.ui.ide</project>
-	</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.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9080e5..0000000
--- a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,282 +0,0 @@
-#Wed May 11 18:32:12 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.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=ignore
-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.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_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_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_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_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_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_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
diff --git a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4cff627..0000000
--- a/plugins/org.eclipse.jem.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed May 11 16:20:15 EDT 2005
-eclipse.preferences.version=1
-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.ui/about.html b/plugins/org.eclipse.jem.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jem.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BIListElementSorter.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BIListElementSorter.java
deleted file mode 100644
index 9ce05ca..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BIListElementSorter.java
+++ /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
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BIListElementSorter.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-
-/**
- * Sorter for sorting BPBeaninfoListElements within the main list.
- * 
- * @version 	1.0
- * @author
- */
-public class BIListElementSorter extends ViewerSorter {
-	
-	/*
-	 * @see ViewerSorter#category(Object)
-	 */
-	public int category(Object obj) {
-		if (obj instanceof BPBeaninfoListElement) {
-			BPBeaninfoListElement element = (BPBeaninfoListElement) obj;
-			
-			switch (((BeaninfoEntry) element.getEntry()).getKind()) {
-			case IClasspathEntry.CPE_LIBRARY:
-				return 4;
-			case IClasspathEntry.CPE_PROJECT:
-				return 1;
-			case IClasspathEntry.CPE_SOURCE:
-				return 0;
-			case IClasspathEntry.CPE_VARIABLE:
-				return 3;
-			case BeaninfoEntry.BIE_PLUGIN:
-				return 5;
-			case IClasspathEntry.CPE_CONTAINER:
-				return 2;
-			}
-		}
-		return super.category(obj);
-	}
-
-	/*
-	 * @see ViewerSorter#compare()
-	 */	
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		int cat1 = category(e1);
-		int cat2 = category(e2);
-	
-		if (cat1 != cat2)
-			return cat1 - cat2;
-			
-		if ((e1 instanceof BPBeaninfoListElement) && (e2 instanceof BPBeaninfoListElement)) {
-			BeaninfoEntry p1 = (BeaninfoEntry) ((BPBeaninfoListElement) e1).getEntry();
-			BeaninfoEntry p2 = (BeaninfoEntry) ((BPBeaninfoListElement) e2).getEntry();
-			
-			// Compare paths
-			return p1.getPath().toString().compareTo(p2.getPath().toString());
-		}
-		return super.compare(viewer, e1, e2);
-	}	
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPBeaninfoListElement.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPBeaninfoListElement.java
deleted file mode 100644
index d87c883..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPBeaninfoListElement.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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BPBeaninfoListElement.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * @version 	1.0
- * @author
- */
-public class BPBeaninfoListElement extends BPListElement {
-
-	BPSearchListElement[] searchpaths;
-	
-	/**
-	 * Constructor for BPBeaninfoListElement.
-	 * The searchPaths is the initial list, it is assumed that
-	 * the beaninfoEntry has these searchpaths in them too.
-	 */
-	public BPBeaninfoListElement(BeaninfoEntry entry, BPSearchListElement[] searchpaths, boolean missing) {
-		super(entry, missing);
-		this.searchpaths = searchpaths != null ? searchpaths : new BPSearchListElement[0];
-	}
-
-	/**
-	 * Mark the entry as exported.
-	 */
-	public void setExported(boolean exported) {
-		((BeaninfoEntry) entry).setIsExported(exported);
-	}
-
-	/*
-	 * @see BPListElement#canExportBeChanged()
-	 */
-	public boolean canExportBeChanged() {
-		return true;
-	}
-
-	/*
-	 * @see BPListElement#isExported()
-	 */
-	public boolean isExported() {
-		return ((BeaninfoEntry) entry).isExported();
-	}
-	
-	/**
-	 * Return the current list of Searchpaths for this Beaninfo Element.
-	 */
-	public BPSearchListElement[] getSearchpaths() {
-		return searchpaths;
-	}
-	
-	/**
-	 * Set the new list. This will update the beaninfo entry too.
-	 */
-	public void setSearchpaths(BPSearchListElement[] searchpaths) {
-		this.searchpaths = searchpaths;
-		
-		SearchpathEntry[] spEntries = new SearchpathEntry[searchpaths.length];
-		for (int i = 0; i < searchpaths.length; i++) {
-			BPSearchListElement bps = searchpaths[i];
-			spEntries[i] = (SearchpathEntry) bps.getEntry();
-		}
-		
-		((BeaninfoEntry) entry).setSearchPaths(spEntries);
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPListElement.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPListElement.java
deleted file mode 100644
index 371e3bd..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPListElement.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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BPListElement.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-
-import org.eclipse.jem.internal.beaninfo.core.IBeaninfosDocEntry;
-/**
- * A Base ListElement (i.e. element in a list viewer) for
- * a BeanInfo Search Path Entry.
- */
-
-public abstract class BPListElement extends Object {
-	protected IBeaninfosDocEntry entry;
-	protected boolean missing; // Library/folder/classpath entry for this entry could not be found.
-
-	public BPListElement(IBeaninfosDocEntry entry, boolean missing) {
-		this.entry = entry;
-		this.missing = missing;
-	}
-
-	public IBeaninfosDocEntry getEntry() {
-		return entry;
-	}
-
-	public boolean isMissing() {
-		return missing;
-	}
-
-	/**
-	 * Certain entries cannot have their export status changed.
-	 */
-	public abstract boolean canExportBeChanged();
-
-	/**
-	 * Return whether this entry is exported.
-	 */
-	public abstract boolean isExported();
-
-	/**
-	 * If export can be changed, change it.
-	 */
-	public abstract void setExported(boolean exported);
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPSearchListElement.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPSearchListElement.java
deleted file mode 100644
index 2e1e7a3..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BPSearchListElement.java
+++ /dev/null
@@ -1,71 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BPSearchListElement.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * @version 	1.0
- * @author
- */
-public class BPSearchListElement extends BPListElement {
-
-	protected boolean exported;
-	protected boolean packageMissing;
-	/**
-	 * Constructor for BPSearchListElement.
-	 * @param entry
-	 * @param project
-	 * @param inMissing
-	 */
-	public BPSearchListElement(
-		SearchpathEntry entry,
-		boolean missing,
-		boolean packageMissing,
-		boolean exported) {
-		super(entry, missing);
-
-		this.packageMissing = packageMissing;
-		this.exported = exported;
-	}
-
-	/*
-	 * @see BPListElement#canExportBeChanged()
-	 */
-	public boolean canExportBeChanged() {
-		return false;
-	}
-
-	/*
-	 * @see BPListElement#isExported()
-	 */
-	public boolean isExported() {
-		return exported;
-	}
-
-	/**
-	 * Is the package missing.
-	 */
-	public boolean isPackageMissing() {
-		return packageMissing;
-	}
-	
-	/*
-	 * @see BPListElement#setExported(boolean)
-	 */
-	public void setExported(boolean exported) {
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeanInfoUIMessages.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeanInfoUIMessages.java
deleted file mode 100644
index 07ac6f6..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeanInfoUIMessages.java
+++ /dev/null
@@ -1,60 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BeanInfoUIMessages.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class BeanInfoUIMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.ui.messages";	//$NON-NLS-1$
-
-	public static final String BUI_ERRORTITLE = "Beaninfo_UI_.errortitle"; //$NON-NLS-1$
-	public static final String BUI_ERROR = "Beaninfo_UI_.error";	 //$NON-NLS-1$
-	
-	public static final String BPP_NOJAVAPROJECT = "BeaninfoPropertiesPage_INFO_.nojavaproject"; //$NON-NLS-1$
-	public static final String BPP_CLOSEDPROJECT = "BeaninfoPropertiesPage_INFO_.closedproject"; //$NON-NLS-1$
-	
-	public static final String BPB_ENABLEBEANINFO = "BeaninfoPathsBlock_UI_.enablebeaninfo"; //$NON-NLS-1$
-	
-	public static final String BPB_SEARCHPATH_LABEL = "BeaninfoPathsBlock_UI_.searchpath.label";	 //$NON-NLS-1$
-	public static final String BPB_SEARCHPATH_UP = "BeaninfoPathsBlock_UI_.searchpath.up.button"; //$NON-NLS-1$
-	public static final String BPB_SEARCHPATH_DOWN = "BeaninfoPathsBlock_UI_.searchpath.down.button"; //$NON-NLS-1$
-	public static final String BPB_SEARCHPATH_REMOVE = "BeaninfoPathsBlock_UI_.searchpath.remove.button";	 //$NON-NLS-1$
-	public static final String BPB_SEARCHPATH_ADD = "BeaninfoPathsBlock_UI_.searchpath.add.button"; //$NON-NLS-1$
-	public static final String BPB_SEARCHPATH_TAB_ORDER = "BeaninfoPathsBlock_UI_.serachpath.tab.order"; //$NON-NLS-1$
-	
-	public static final String BPB_SEARCHPATH_MISSINGPACKAGE_FORMAT = "BeaninfoPathsBlock_WARN_.searchpath.missing.path.format"; //$NON-NLS-1$
-	public static final String BPB_SEARCHPATH_OPDESC = "BeaninfoPathsBlock_UI_.searchpath.operationdescription"; //$NON-NLS-1$
-	
-	public static final String BPB_ADDSEARCHPATH_TITLE = "BeaninfoPathsBlock_UI_.addsearchpath.title"; //$NON-NLS-1$
-	public static final String BPB_ADDSEARCHPATH_DESC = "BeaninfoPathsBlock_UI_.addsearchpath.description";		 //$NON-NLS-1$
-	
-	public static final String BPB_SEARCHPATH_MISSING = "BeaninfoPathsBlock_UI_.warning.EntryMissing"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private BeanInfoUIMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java
deleted file mode 100644
index c0c7f64..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoEntrySearchpathDialog.java
+++ /dev/null
@@ -1,354 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BeaninfoEntrySearchpathDialog.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.jdt.internal.ui.util.PixelConverter;
-import org.eclipse.jdt.internal.ui.wizards.TypedViewerFilter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * This dialog is used to display and modify the search path
- * within a BeaninfoEntry.
- * @version 	1.0
- * @author
- */
-public class BeaninfoEntrySearchpathDialog extends Dialog {
-
-	private class DialogAdapter implements IListAdapter {
-
-		// -------- IListAdapter --------
-		public void customButtonPressed(ListDialogField field, int index) {
-			pageCustomButtonPressed(index);
-		}
-
-		public void selectionChanged(ListDialogField field) {
-		}
-
-		/**
-		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(ListDialogField)
-		 */
-		public void doubleClicked(ListDialogField field) {
-		}
-
-	}
-
-	protected BPBeaninfoListElement infoElement;
-	protected IJavaProject jProject;
-	protected ListDialogField listField;
-
-	public BeaninfoEntrySearchpathDialog(
-		Shell parentShell,
-		BPBeaninfoListElement infoElement,
-		IJavaProject jProject) {
-		super(parentShell);
-
-		this.infoElement = infoElement;
-		this.jProject = jProject;
-
-		DialogAdapter adapter = new DialogAdapter();
-
-		String[] buttonLabels = new String[] {
-			/* 0 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_UP),
-			/* 1 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_DOWN),
-			/* 2 */
-			null,
-			/* 3 */
-			BeanInfoUIMessages.getString("SearchPathDialog.ChoosePackages"), //$NON-NLS-1$
-			/* 4 */
-			null,
-			/* 5 */
-			BeanInfoUIMessages.getString("SearchPathDialog.Remove") }; //$NON-NLS-1$
-
-		listField = new ListDialogField(adapter, buttonLabels, new SearchPathListLabelProvider(jProject));
-		listField.setLabelText(BeanInfoUIMessages.getString("SearchPathDialog.Desc.Label")); //$NON-NLS-1$
-		listField.setUpButtonIndex(0);
-		listField.setDownButtonIndex(1);
-		listField.setRemoveButtonIndex(5);
-	}
-
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(
-			MessageFormat.format(
-				BeanInfoUIMessages.getString("SearchPathDialog.ModifySearchPaths"), //$NON-NLS-1$
-				new Object[] { infoElement.getEntry().getPath().toString()}));
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		PixelConverter converter = new PixelConverter(parent);
-
-		Composite composite = new Composite(parent, SWT.NONE);
-
-		LayoutUtil.doDefaultLayout(
-			composite,
-			new DialogField[] { listField },
-			true,
-			SWT.DEFAULT,
-			SWT.DEFAULT);
-		int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
-		listField.setButtonsMinWidth(buttonBarWidth);
-
-		updatePackagesList();
-
-		return composite;
-	}
-
-	private void updatePackagesList() {
-		if (infoElement.getEntry().getKind() == BeaninfoEntry.BIE_PLUGIN) {
-			// We don't allow these to be updated. They should only be used through
-			// registered mechanisms and we won't be showing them here normally.
-			listField.setLabelText(BeanInfoUIMessages.getString("SearchPathDialog.NotEditable_INFO_")); //$NON-NLS-1$
-			listField.setEnabled(false);
-			return;
-		}
-
-		listField.setElements(Arrays.asList(infoElement.getSearchpaths()));
-	}
-
-	protected void pageCustomButtonPressed(int index) {
-		if (index != 3)
-			return;
-
-		List elementsToAdd = choosePackages();
-
-		if (elementsToAdd != null && !elementsToAdd.isEmpty()) {
-			listField.addElements(elementsToAdd);
-			listField.postSetSelection(new StructuredSelection(elementsToAdd));
-		}
-	}
-
-	protected void okPressed() {
-		if (listField.isEnabled()) {
-			// If the field is not enabled, then there is no update to perform. We don't
-			// want to accidentially wipe out the search paths in this case.
-
-			// Override to put the list of elements back into the BPBeaninfoListElement
-			// Until then they aren't actually updated.
-			List paths = listField.getElements();
-			infoElement.setSearchpaths(
-				(BPSearchListElement[]) paths.toArray(new BPSearchListElement[paths.size()]));
-		}
-		super.okPressed();
-	}
-
-	/**
-	 * Choose the packages that should be in the search path.
-	 */
-	private List choosePackages() {
-
-		IPackageFragmentRoot[] roots = getBeaninfoRoots();
-		List newPackageNames = new ArrayList();
-		if (roots != null) {
-			// It's within the workspace, so we can get the roots and packages.
-			ISelectionStatusValidator validator = new PackagesWorkbookPage.ChoosePackagesSelectionValidator();
-
-			// Show up to the package fragment, don't show any contents of it.
-			Class[] acceptedClasses = new Class[] { IPackageFragmentRoot.class, IPackageFragment.class };
-			Object[] rejectedFragments = getFilteredExistingEntries(roots);
-
-			// Only show package fragments that have children (i.e. there classes in it, not interested
-			// in intermediate ones that have no classes defined in them. Those are filtered out.
-			TypedViewerFilter filter = new TypedViewerFilter(acceptedClasses, rejectedFragments) {
-				public boolean select(Viewer viewer, Object parentElement, Object element) {
-					if (super.select(viewer, parentElement, element)) {
-						if (element instanceof IPackageFragment) {
-							IPackageFragment pkg = (IPackageFragment) element;
-							try {
-								return pkg.hasChildren();
-							} catch (JavaModelException e) {
-							}
-							return false;
-						} else
-							return true;
-					}
-					return false;
-				}
-			};
-
-			ITreeContentProvider provider = new PackageOnlyContentProvider();
-
-			ILabelProvider labelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-			ElementTreeSelectionDialog dialog =
-				new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
-			dialog.setTitle(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_TITLE));
-
-			dialog.setValidator(validator);
-			dialog.setMessage(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_DESC));
-			dialog.addFilter(filter);
-			dialog.setInput(Arrays.asList(getBeaninfoRoots()));
-
-			if (dialog.open() == Window.OK) {
-				Object[] elements = dialog.getResult();
-				for (int i = 0; i < elements.length; i++) {
-					newPackageNames.add(((IPackageFragment) elements[i]).getElementName());
-				}
-			}
-		} else {
-			// It's not within the workspace
-			final List existingPackagenames = getFilteredExistingEntries();
-			IInputValidator validator = new IInputValidator() {
-				public String isValid(String newText) {
-					if (existingPackagenames.contains(newText))
-						return BeanInfoUIMessages.getString("SearchPathDialog.PackagePresent_INFO_"); //$NON-NLS-1$
-						
-					IStatus status = JavaConventions.validatePackageName(newText);
-					return status.getSeverity() == IStatus.OK ? null : status.getMessage();
-				}
-			};
-			InputDialog dialog = new InputDialog(getShell(), BeanInfoUIMessages.getString("SearchPathDialog.InputDialog.Title"), BeanInfoUIMessages.getString("SearchPathDialog.InputDialog.Message"), null, validator); //$NON-NLS-1$ //$NON-NLS-2$
-			if (dialog.open() == Window.OK)
-				newPackageNames.add(dialog.getValue());
-		}
-
-		if (newPackageNames.size() == 0)
-			return Collections.EMPTY_LIST;
-
-		List newElements = new ArrayList(newPackageNames.size());
-		for (int i = 0; i < newPackageNames.size(); i++)
-			newElements.add(
-				new BPSearchListElement(new SearchpathEntry((String) newPackageNames.get(i)), false, false, false));
-		return newElements;
-	}
-	/**
-	 * Return the packagefragment roots for the given beaninfo entry.
-	 * Return null if it can be handled (i.e. not in a project some where).
-	 */
-	protected IPackageFragmentRoot[] getBeaninfoRoots() {
-		IPackageFragmentRoot[] roots = null;
-		if (infoElement.getEntry().getKind() != BeaninfoEntry.BIE_PLUGIN) {
-			IClasspathEntry resolved = JavaCore.getResolvedClasspathEntry(((BeaninfoEntry) infoElement.getEntry()).getClasspathEntry());
-			IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(resolved.getPath());
-			if (res != null && res.exists()) {
-				if (res instanceof IProject) {
-					// It is a project itself.
-					IJavaProject jp = (IJavaProject) JavaCore.create(res);
-					try {
-						if (jp != null)
-							roots = jp.getPackageFragmentRoots(); // All of the roots in the project are applicable.
-					} catch (JavaModelException e) {
-					}
-				} else {
-					// It is within another project
-					IProject containingProject = res.getProject();
-					IJavaProject jp = JavaCore.create(containingProject);
-					if (jp != null) {
-						// The roots if this is in the classpath of this project
-						try {
-							IPackageFragmentRoot root = jp.findPackageFragmentRoot(resolved.getPath());
-							if (root != null)
-								roots = new IPackageFragmentRoot[] { root };
-						} catch (JavaModelException e) {
-						}
-					}
-				}
-			}
-		}
-		return roots;
-	}
-
-	/**
-	 * Return the list of entries that already are in the search path
-	 * so that they don't show up in the list.
-	 */
-	protected Object[] getFilteredExistingEntries(IPackageFragmentRoot[] roots) {
-		List entries = listField.getElements();
-		List fragments = new ArrayList(entries.size());
-		Iterator itr = entries.iterator();
-		while (itr.hasNext()) {
-			BPSearchListElement elem = (BPSearchListElement) itr.next();
-			fragments.addAll(getPackages(elem, roots));
-		}
-		return fragments.toArray();
-	}
-	
-	/**
-	 * Return the list of entries that already are in the search path
-	 * so that they don't show up in the list. This one is just the package names.
-	 */
-	protected List getFilteredExistingEntries() {
-		List entries = listField.getElements();
-		List names = new ArrayList(entries.size());
-		Iterator itr = entries.iterator();
-		while (itr.hasNext()) {
-			BPSearchListElement elem = (BPSearchListElement) itr.next();
-			names.add(((SearchpathEntry) elem.getEntry()).getPackage());
-		}
-		return names;
-	}
-
-	protected List getPackages(BPSearchListElement element, IPackageFragmentRoot[] roots) {
-		String packageName = ((SearchpathEntry) element.getEntry()).getPackage();
-		if (packageName == null)
-			return Collections.EMPTY_LIST;
-
-		try {
-			List packages = new ArrayList(10);
-			for (int i = 0; i < roots.length; i++) {
-				IJavaElement[] pfs = roots[i].getChildren();
-				for (int j = 0; j < pfs.length; j++)
-					if (pfs[j].getElementType() == IJavaElement.PACKAGE_FRAGMENT
-						&& pfs[j].getElementName().equals(packageName)) {
-						packages.add(pfs[j]);
-						break;
-					}
-			}
-			return packages;
-		} catch (JavaModelException e) {
-		}
-		return Collections.EMPTY_LIST;
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
deleted file mode 100644
index 141be74..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfoPathsBlock.java
+++ /dev/null
@@ -1,566 +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
- *******************************************************************************/
-/*
- *  $RCSfile: BeaninfoPathsBlock.java,v $
- *  $Revision: 1.8 $  $Date: 2005/04/06 22:24:40 $ 
- */
-package org.eclipse.jem.internal.beaninfo.ui;
-
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.jdt.internal.ui.viewsupport.ImageDisposer;
-import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-public class BeaninfoPathsBlock {
-
-	private IWorkspaceRoot fWorkspaceRoot;
-
-	private CheckedListDialogField fSearchOrder;
-	// Search path list. filtered for each tab page to appropriate entries
-	private SelectionButtonDialogField fEnableBeaninfoDialogField;
-	// Checkbox to add/remove beaninfo nature entirely.
-
-	private StatusInfo fSearchStatus;
-
-	private IJavaProject fCurrJProject;
-
-	private IStatusChangeListener fContext;
-	private PackagesWorkbookPage fPackagesPage;
-	private BeaninfosWorkbookPage fBeaninfosPage;
-
-	private BuildSearchBasePage fCurrPage;
-	private SearchPathListLabelProvider labelProvider;
-	
-	public BeaninfoPathsBlock(IWorkspaceRoot root, IStatusChangeListener context) {
-		fWorkspaceRoot = root;
-		fContext = context;
-		fCurrPage = null;
-
-		BuildPathAdapter adapter = new BuildPathAdapter();
-
-		String[] buttonLabels = new String[] {
-			/* 0 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_UP),
-			/* 1 */
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_DOWN), 
-			/* 2 */ null,
-			/* 3 */ BeanInfoUIMessages.getString("BeanInfoPathsBlock.ExportAll") , //$NON-NLS-1$
-			/* 4 */ BeanInfoUIMessages.getString("BeanInfoPathsBlock.UnexportAll") //$NON-NLS-1$
-			};
-		
-		labelProvider = new SearchPathListLabelProvider();	// We keep around to update with latest project.
-		fSearchOrder = new CheckedListDialogField(null, buttonLabels, labelProvider);
-		fSearchOrder.setDialogFieldListener(adapter);
-		fSearchOrder.setLabelText(
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_LABEL));
-		fSearchOrder.setUpButtonIndex(0);
-		fSearchOrder.setDownButtonIndex(1);
-		fSearchOrder.setCheckAllButtonIndex(3);
-		fSearchOrder.setUncheckAllButtonIndex(4);
-
-		fEnableBeaninfoDialogField = new SelectionButtonDialogField(SWT.CHECK);
-		fEnableBeaninfoDialogField.setLabelText(
-			BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ENABLEBEANINFO));
-
-		fSearchStatus = new StatusInfo();
-
-		fCurrJProject = null;
-	}
-	
-	public CheckedListDialogField getSearchOrder() {
-		return fSearchOrder;
-	}
-	
-	/*
-	 * searchOrder dialog must never have all of elements set
-	 * directly. Must come through here first so that we can
-	 * make sure updates occur in correct sequence, else
-	 * we will wind up with entries being marked as unexported
-	 * when they really are exported. 
-	 */
-	public void setSearchOrderElements(List newElements) {
-		ArrayList exportedEntries = new ArrayList(newElements.size());
-		for (Iterator iter = newElements.iterator(); iter.hasNext();) {
-			BPListElement element = (BPListElement) iter.next();
-			if (element.isExported())
-				exportedEntries.add(element);
-		}
-		
-		inUpdate = true;	// So that on first set we don't waste time updating the list and reseting all of our entries.
-		fSearchOrder.setElements(newElements);
-		inUpdate = false;
-		fSearchOrder.setCheckedElements(exportedEntries);
-	}
-
-	// -------- UI creation ---------
-
-	public Control createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.numColumns = 1;
-		composite.setLayout(layout);
-
-		TabFolder folder = new TabFolder(composite, SWT.NONE);
-		folder.setLayoutData(new GridData(GridData.FILL_BOTH));
-		folder.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				tabChanged(e.item);
-			}
-		});
-
-		ImageRegistry imageRegistry = JavaPlugin.getDefault().getImageRegistry();
-
-		TabItem item;
-
-		ArrayList interestedDialogFields = new ArrayList(3);
-
-		fPackagesPage = new PackagesWorkbookPage(fWorkspaceRoot, this, interestedDialogFields);
-		item = new TabItem(folder, SWT.NONE);
-		item.setText(BeanInfoUIMessages.getString("BeanInfoPathsBlock.Page.Tab.Packages")); //$NON-NLS-1$
-		item.setImage(imageRegistry.get(JavaPluginImages.IMG_OBJS_PACKAGE));
-		item.setData(fPackagesPage);
-		item.setControl(fPackagesPage.getControl(folder));
-
-		// a non shared image
-		Image fBeanImage = null;
-		URL imageURL = Platform.find(JEMUIPlugin.getPlugin().getBundle(), new Path("icons/javabean.gif")); //$NON-NLS-1$
-		if (imageURL != null) 
-			fBeanImage = ImageDescriptor.createFromURL(imageURL).createImage();
-		else
-			fBeanImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-		composite.addDisposeListener(new ImageDisposer(fBeanImage));
-				
-		fBeaninfosPage= new BeaninfosWorkbookPage(fWorkspaceRoot, this, interestedDialogFields);		
-		item= new TabItem(folder, SWT.NONE);
-		item.setText(BeanInfoUIMessages.getString("BeanInfoPathsBlock.Page.Tab.Classes")); //$NON-NLS-1$
-		item.setImage(fBeanImage);
-		item.setData(fBeaninfosPage);
-		item.setControl(fBeaninfosPage.getControl(folder));
-
-		// a non shared image
-		Image cpoImage = JavaPluginImages.DESC_TOOL_CLASSPATH_ORDER.createImage();
-		composite.addDisposeListener(new ImageDisposer(cpoImage));
-		
-		SearchpathOrderingWorkbookPage ordpage = new SearchpathOrderingWorkbookPage(fSearchOrder, interestedDialogFields);
-		item = new TabItem(folder, SWT.NONE);
-		item.setText(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_TAB_ORDER));
-		item.setImage(cpoImage);
-		item.setData(ordpage);
-		item.setControl(ordpage.getControl(folder));
-
-		if (fCurrJProject != null) {
-			fPackagesPage.init(fCurrJProject);
-			fBeaninfosPage.init(fCurrJProject);
-		}
-
-		fEnableBeaninfoDialogField.doFillIntoGrid(composite, 1);
-		fEnableBeaninfoDialogField.attachDialogFields((DialogField[]) interestedDialogFields.toArray(new DialogField[interestedDialogFields.size()]));
-
-		folder.setSelection(2);
-		fCurrPage = ordpage;
-		fSearchOrder.selectFirstElement();
-
-		//		WorkbenchHelp.setHelp(composite, new Object[] { IJavaHelpContextIds.BUILD_PATH_BLOCK });				
-		return composite;
-	}
-
-
-	/**
-	 * Initializes the classpath for the given project. Multiple calls to init are allowed,
-	 * but all existing settings will be cleared and replace by the given or default paths.
-	 * @param project The java project to configure.
-	 */
-	public void init(IJavaProject jproject) {
-		fCurrJProject = jproject;
-		labelProvider.setJavaProject(jproject);
-
-		try {
-			// If we have a config file, we will assume we have a nature. It will add it automatically
-			// when we ask for the information. Even if we didn't have the nature, as soon as someone
-			// asks for it, we would create it anyhow, and it would use the existing config file.
-			// If we don't have a config file, we could have the nature, so we will check for that too.
-			boolean haveConfigFile = jproject.getProject().getFile(BeaninfoNature.P_BEANINFO_SEARCH_PATH).exists();
-			boolean haveNature = fCurrJProject.getProject().hasNature(BeaninfoNature.NATURE_ID);
-			fEnableBeaninfoDialogField.setSelection(haveConfigFile || haveNature);
-			if (haveNature || haveConfigFile) {
-				BeaninfosDoc doc = BeaninfoNature.getRuntime(fCurrJProject.getProject()).getSearchPath();
-				IClasspathEntry[] raw = fCurrJProject.getRawClasspath();
-
-				List newSearchpath = new ArrayList();
-				if (doc != null) {
-					IBeaninfosDocEntry[] sp = doc.getSearchpath();
-					for (int i = 0; i < sp.length; i++) {
-						IBeaninfosDocEntry curr = sp[i];
-						boolean isMissing = false;
-						BPListElement elem = null;
-						if (curr instanceof BeaninfoEntry) {
-							BeaninfoEntry be = (BeaninfoEntry) curr;
-
-							// get the resource, this tells if the beaninfos exist or not.
-							Object[] paths = be.getClasspath(fCurrJProject);
-							if (paths != null && paths.length > 0) {
-								for (int j = 0; !isMissing && j < paths.length; j++) {
-									Object path = paths[i];
-									if (path instanceof IProject)
-										isMissing = !((IProject) path).exists();
-									else if (path instanceof String) {
-										File f = new File((String) path);
-										isMissing = !f.exists();
-									} else if (path instanceof IPath) {
-										isMissing = true;	// Plugins are invalid in BeaninfoConfig. They only apply within contributions.
-									} else
-										isMissing = true; // Invalid, so isMissing.
-								}								
-							} else
-								isMissing = true;
-
-							elem = new BPBeaninfoListElement(be, getInitialSearchpaths(be), isMissing);
-						} else {
-							// Searchpath entry, see if we can find the raw classpath entry that it is for.
-							boolean isExported = false;
-							boolean isPackageMissing = true;
-							isMissing = true;	// Initially missing until we find it.
-							SearchpathEntry ce = (SearchpathEntry) curr;
-							int kind = ce.getKind();
-							IPath path = ce.getPath();
-							for (int j = 0; j < raw.length; j++) {
-								if (raw[j].getEntryKind() == kind && raw[j].getPath().equals(path)) {
-									isMissing = false;
-									isExported = raw[j].isExported() || raw[j].getEntryKind() == IClasspathEntry.CPE_SOURCE;
-									String packageName = ce.getPackage();
-									if (packageName != null) {
-										IPackageFragmentRoot[] roots = fCurrJProject.findPackageFragmentRoots(raw[j]);
-										for (int k = 0; k < roots.length; k++) {
-											IPackageFragmentRoot iroot = roots[k];
-											if (iroot.getPackageFragment(packageName).exists()) {
-												isPackageMissing = false;
-												break;
-											}
-										}
-									} else
-										isPackageMissing = false;
-									break;
-								}
-							}
-							elem = new BPSearchListElement(ce, isMissing, isPackageMissing, isExported);
-						}
-
-						newSearchpath.add(elem);
-					}
-				}
-
-				// inits the dialog field
-				setSearchOrderElements(newSearchpath);
-
-				if (fPackagesPage != null) {
-					fPackagesPage.init(fCurrJProject);
-					fBeaninfosPage.init(fCurrJProject);
-				}
-			} else {
-				// No nature, disable,
-				fEnableBeaninfoDialogField.setSelection(false);
-			}
-		} catch (JavaModelException e) {
-			fEnableBeaninfoDialogField.setSelection(false);
-		} catch (CoreException e) {
-			fEnableBeaninfoDialogField.setSelection(false);
-		}
-
-//		listenForClasspathChange();
-		doStatusLineUpdate();
-	}
-	
-	/*
-	 * Create the Searchpath elements for a BeaninfoElement.
-	 * Return null if not to update.
-	 */
-	private BPSearchListElement[] getInitialSearchpaths(BeaninfoEntry infoEntry) {
-
-		// We can only verify the existence of packages within beaninfos that are 
-		// located within a project on the desktop. Otherwise we can't find out what
-		// packages are in them.
-		IPackageFragmentRoot[] roots = null;
-
-		if (infoEntry.getKind() != BeaninfoEntry.BIE_PLUGIN) {
-			IClasspathEntry resolved = JavaCore.getResolvedClasspathEntry(infoEntry.getClasspathEntry());
-			IResource res = fWorkspaceRoot.findMember(resolved.getPath());
-			if (res != null && res.exists()) {
-				if (res instanceof IProject) {
-					// It is a project itself.
-					IJavaProject jp = (IJavaProject) JavaCore.create(res);
-					try {
-						if (jp != null)
-							roots = jp.getPackageFragmentRoots(); // All of the roots in the project are applicable.
-					} catch (JavaModelException e) {
-					}
-				} else {
-					// It is within another project
-					IProject containingProject = res.getProject();
-					IJavaProject jp = JavaCore.create(containingProject);
-					if (jp != null) {
-						// The roots if this is in the classpath of this project
-						try {
-							IPackageFragmentRoot root = jp.findPackageFragmentRoot(resolved.getPath());
-							if (root != null)
-								roots = new IPackageFragmentRoot[] { root };
-						} catch (JavaModelException e) {
-						}
-					}
-				}
-			}
-		}
-
-		SearchpathEntry[] entries = infoEntry.getSearchPaths();
-		BPSearchListElement[] packageElements = new BPSearchListElement[entries.length];
-		for (int i = 0;
-			i < entries.length;
-			i++) { // Searchpath entry, see if we can find the raw classpath entry that it is for.
-			boolean isPackageMissing = roots != null;
-			// If roots is null, then the package isn't missing because we can't test for it.
-			SearchpathEntry ce = entries[i];
-			if (roots != null) {
-				String packageName = ce.getPackage();
-				for (int k = 0; k < roots.length; k++) {
-					IPackageFragmentRoot iroot = roots[k];
-					if (iroot.getPackageFragment(packageName).exists()) {
-						isPackageMissing = false;
-						break;
-					}
-				}
-			}
-			packageElements[i] = new BPSearchListElement(ce, false, isPackageMissing, false);
-		}
-
-		return packageElements;
-	}
-
-	// -------- public api --------
-
-	/**
-	 * Returns the Java project. Can return <code>null<code> if the page has not
-	 * been initialized.
-	 */
-	public IJavaProject getJavaProject() {
-		return fCurrJProject;
-	}
-
-	private class BuildPathAdapter implements IDialogFieldListener {
-
-		// ---------- IDialogFieldListener --------
-		public void dialogFieldChanged(DialogField field) {
-			buildPathDialogFieldChanged(field);
-		}
-	}
-
-	private void buildPathDialogFieldChanged(DialogField field) {
-		if (field == fSearchOrder) {
-			updateSearchPathStatus();
-		}
-		doStatusLineUpdate();
-	}
-
-	// -------- verification -------------------------------
-
-	private void doStatusLineUpdate() {
-		fContext.statusChanged(fSearchStatus);
-	}
-
-	private boolean inUpdate;
-	// Flag to indicate we are in updateSearchPathStatus and to not do it again. This can
-	// happen due to using setCheckedElements instead of setCheckedWithoutUpdate.
-	/**
-	 * Validates the search path.
-	 */
-	private void updateSearchPathStatus() {
-		if (inUpdate)
-			return;
-		try {
-			inUpdate = true;
-
-			fSearchStatus.setOK();
-
-			List elements = fSearchOrder.getElements();
-
-			boolean entryMissing = false;
-
-			// Because of bug in setcheckedWithoutUpdate, which sets to true no matter what the state is, we need
-			// to accumulate the checked elements and re-set them again after this so that they will be correct.	
-			ArrayList exported = new ArrayList();
-
-			for (Iterator entries = elements.iterator(); entries.hasNext();) {
-				BPListElement currElement = (BPListElement) entries.next();
-
-				boolean isChecked = fSearchOrder.isChecked(currElement);
-				if (currElement.canExportBeChanged()) {
-					if (isChecked)
-						exported.add(currElement);
-					currElement.setExported(isChecked);
-				} else {
-					//				fSearchOrder.setCheckedWithoutUpdate(currElement, currElement.isExported());
-					if (currElement.isExported())
-						exported.add(currElement);
-				}
-
-				entryMissing = entryMissing || currElement.isMissing();
-			}
-
-			// Now reset the checked states, due to bug
-			fSearchOrder.setCheckedElements(exported);
-
-			if (entryMissing) {
-				fSearchStatus.setWarning(
-					BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_MISSING));
-			}
-		} finally {
-			inUpdate = false;
-		}
-	}
-
-	// -------- creation -------------------------------
-
-	/**
-	 * Creates a runnable that sets the configured build paths.
-	 */
-	public IRunnableWithProgress getRunnable() {
-		final boolean wantNature = fEnableBeaninfoDialogField.isSelected();
-		final List searchPathEntries = wantNature ? fSearchOrder.getElements() : null;
-
-		return new IRunnableWithProgress() {
-			public void run(IProgressMonitor monitor) throws InvocationTargetException {
-				if (monitor == null) {
-					monitor = new NullProgressMonitor();
-				}
-				monitor.beginTask(
-					BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_SEARCHPATH_OPDESC),
-					10);
-				try {
-					setBeaninfoSearchpath(wantNature, searchPathEntries, monitor);
-				} catch (CoreException e) {
-					throw new InvocationTargetException(e);
-				} finally {
-					monitor.done();
-				}
-			}
-		};
-	}
-
-	private void setBeaninfoSearchpath(
-		boolean wantNature,
-		List searchPathEntries,
-		IProgressMonitor monitor)
-		throws CoreException {
-
-		if (wantNature) {
-			// create beaninfo nature
-			if (!fCurrJProject.getProject().hasNature(BeaninfoNature.NATURE_ID)) {
-				addNatureIDToProject(fCurrJProject.getProject(), BeaninfoNature.NATURE_ID, monitor);
-			}
-
-			BeaninfoNature nature = BeaninfoNature.getRuntime(fCurrJProject.getProject());
-			// Now build/set the search path.
-			if (searchPathEntries.size() > 0) {
-				IBeaninfosDocEntry[] sparray = new IBeaninfosDocEntry[searchPathEntries.size()];
-				Iterator itr = searchPathEntries.iterator();
-				int i = 0;
-				while (itr.hasNext()) {
-					BPListElement elem = (BPListElement) itr.next();
-					sparray[i++] = elem.getEntry();
-				}
-				nature.setSearchPath(new BeaninfosDoc(sparray), monitor);
-			} else
-				nature.setSearchPath(null, monitor);
-		} else {
-			// Remove the nature, no longer wanted.
-			removeNatureIDFromProject(fCurrJProject.getProject(), BeaninfoNature.NATURE_ID, monitor);
-		}
-	}
-
-	/**
-	 * Adds a nature to a project
-	 */
-	private void addNatureIDToProject(IProject proj, String natureId, IProgressMonitor monitor)
-		throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures = description.getNatureIds();
-		String[] newNatures = new String[prevNatures.length + 1];
-		System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-		newNatures[prevNatures.length] = natureId;
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, monitor);
-	}
-
-	private void removeNatureIDFromProject(IProject proj, String natureId, IProgressMonitor monitor)
-		throws CoreException {
-		IProjectDescription description = proj.getDescription();
-		String[] prevNatures = description.getNatureIds();
-		int indx = -1;
-		for (int i = 0; i < prevNatures.length; i++) {
-			if (prevNatures[i].equals(natureId)) {
-				indx = i;
-				break;
-			}
-		}
-		if (indx == -1)
-			return;
-
-		String[] newNatures = new String[prevNatures.length - 1];
-		if (newNatures.length != 0) {
-			System.arraycopy(prevNatures, 0, newNatures, 0, indx);
-			if (indx < newNatures.length)
-				System.arraycopy(prevNatures, indx + 1, newNatures, indx, newNatures.length - indx);
-		}
-		description.setNatureIds(newNatures);
-		proj.setDescription(description, monitor);
-	}
-
-	// -------- tab switching ----------
-
-	private void tabChanged(Widget widget) {
-		if (widget instanceof TabItem) {
-			BuildSearchBasePage newPage = (BuildSearchBasePage) ((TabItem) widget).getData();
-			if (fCurrPage != null) {
-				List selection = fCurrPage.getSelection();
-				if (!selection.isEmpty()) {
-					newPage.setSelection(selection);
-				}
-			}
-			fCurrPage = newPage;
-		}
-	}	
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java
deleted file mode 100644
index 64bab4a..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosPropertyPage.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BeaninfosPropertyPage.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
-import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-/**
- * Property page for configuring Beaninfo path
- */
-public class BeaninfosPropertyPage extends PropertyPage implements IStatusChangeListener {
-		
-	private BeaninfoPathsBlock fBuildPathsBlock;
-	private IResourceChangeListener listener;
-	private IProject project;
-	
-	/*
-	 * @see PreferencePage#createControl(Composite)
-	 */
-	protected Control createContents(Composite parent) {
-// when we get help working.
-//		WorkbenchHelp.setHelp(parent, new DialogPageContextComputer(this, IJavaHelpContextIds.BUILD_PATH_PROPERTY_PAGE));
-
-		// ensure the page has no special buttons
-		noDefaultAndApplyButton();		
-		
-		project= getProject();
-		if (project == null || !isJavaProject(project)) {
-			return createWithoutJava(parent);
-		} else if (!project.isOpen()) {
-			return createForClosedProject(parent);
-		} else {
-			return createWithJava(parent);
-		}
-	}
-	
-	/**
-	 * Content for valid projects.
-	 */
-	private Control createWithJava(Composite parent) {
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-		fBuildPathsBlock= new BeaninfoPathsBlock(root, this);
-		final IJavaProject jproject = JavaCore.create(project);
-		fBuildPathsBlock.init(jproject);
-		final IPath classpathfile = project.getFile(".classpath").getFullPath();
-		listener = new IResourceChangeListener() {
-			
-			/* (non-Javadoc)
-			 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-			 */
-			public void resourceChanged(IResourceChangeEvent event) {
-				if (fBuildPathsBlock != null) {
-					if (event.getDelta().findMember(classpathfile) != null)
-						getControl().getDisplay().asyncExec(new Runnable() {	// Can be called outside of display loop
-							public void run() {
-								fBuildPathsBlock.init(jproject);
-							}
-						});
-				}
-			}
-		};
-		project.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
-
-		return fBuildPathsBlock.createControl(parent);
-	}
-
-	/**
-	 * Content for non-Java projects.
-	 */	
-	private Control createWithoutJava(Composite parent) {
-		Label label= new Label(parent, SWT.LEFT);
-		label.setText(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPP_NOJAVAPROJECT)); 
-		
-		fBuildPathsBlock= null;
-		setValid(true);
-		return label;
-	}
-
-	/**
-	 * Content for closed projects.
-	 */		
-	private Control createForClosedProject(Composite parent) {
-		Label label= new Label(parent, SWT.LEFT);
-		label.setText(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPP_CLOSEDPROJECT));
-		
-		fBuildPathsBlock= null;
-		setValid(true);
-		return label;
-	}
-	
-	private IProject getProject() {
-		IAdaptable adaptable= getElement();
-		if (adaptable != null) {
-			IJavaElement elem= (IJavaElement) adaptable.getAdapter(IJavaElement.class);
-			if (elem instanceof IJavaProject) {
-				return ((IJavaProject) elem).getProject();
-			}
-		}
-		return null;
-	}
-	
-	private boolean isJavaProject(IProject proj) {
-		try {
-			return proj.hasNature(JavaCore.NATURE_ID);
-		} catch (CoreException e) {
-			JEMUIPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-		return false;
-	}	
-	
-	/*
-	 * @see IPreferencePage#performOk
-	 */
-	public boolean performOk() {
-		if (fBuildPathsBlock != null) {
-			IRunnableWithProgress runnable= fBuildPathsBlock.getRunnable();
-
-			IRunnableWithProgress op= new WorkspaceModifyDelegatingOperation(runnable);
-			Shell shell= getControl().getShell();
-			try {
-				PlatformUI.getWorkbench().getProgressService().run(false, false, op);
-			} catch (InvocationTargetException e) {
-				String title= BeanInfoUIMessages.getString(BeanInfoUIMessages.BUI_ERRORTITLE);
-				String message= BeanInfoUIMessages.getString(BeanInfoUIMessages.BUI_ERROR); 
-				ExceptionHandler.handle(e, shell, title, message);
-				return false;
-			} catch (InterruptedException e) {
-				// cancelled
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * @see IStatusChangeListener#statusChanged
-	 */
-	public void statusChanged(IStatus status) {
-		setValid(!status.matches(IStatus.ERROR));
-		StatusUtil.applyToStatusLine(this, status);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
-	 */
-	public void dispose() {
-		if (listener != null)
-			project.getWorkspace().removeResourceChangeListener(listener);
-		listener = null;
-		super.dispose();
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosWorkbookPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosWorkbookPage.java
deleted file mode 100644
index 7742932..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BeaninfosWorkbookPage.java
+++ /dev/null
@@ -1,596 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BeaninfosWorkbookPage.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 22:41:35 $ 
- */
-
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.ui.util.PixelConverter;
-import org.eclipse.jdt.internal.ui.wizards.*;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ArchiveFileFilter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.*;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoEntry;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-/**
- * @version 	1.0
- * @author
- */
-public class BeaninfosWorkbookPage extends BuildSearchBasePage {
-	
-	private BeaninfoPathsBlock biPathsBlock;
-	private IJavaProject fCurrJProject;
-	
-	private ListDialogField fBeaninfosList;
-	private IWorkspaceRoot fWorkspaceRoot;
-	
-	private IDialogSettings fDialogSettings;
-	
-	private Control fSWTControl;
-	
-	private IClasspathEntry[] resolvedList;
-	private IClasspathEntry[] rawList;
-	private SearchPathListLabelProvider labelProvider;
-	
-	private static final String DIALOGSTORE_LASTEXTJAR = JEMUIPlugin.PI_BEANINFO_UI + ".lastextjar"; //$NON-NLS-1$
-	private static final String DIALOGSTORE_LASTVARIABLE = JEMUIPlugin.PI_BEANINFO_UI + ".lastvar"; //$NON-NLS-1$
-		
-	public BeaninfosWorkbookPage(IWorkspaceRoot root, BeaninfoPathsBlock biPathsBlock, List interestedFieldsForEnableControl) {
-		this.biPathsBlock = biPathsBlock;
-		fWorkspaceRoot= root;
-		fSWTControl= null;
-		
-		fDialogSettings= JEMUIPlugin.getPlugin().getDialogSettings();
-		
-		String[] buttonLabels= new String[] { 
-			/* 0 */ BeanInfoUIMessages.getString("BeanInfosWorkbookPage.AddFolders"), //$NON-NLS-1$
-			/* 1 */ BeanInfoUIMessages.getString("BeanInfosWorkbookPage.AddJARs"), //$NON-NLS-1$
-			/* 2 */ BeanInfoUIMessages.getString("BeanInfosWorkbookPage.AddExternalJAR"), //$NON-NLS-1$
-			/* 3 */ BeanInfoUIMessages.getString("BeanInfosWorkbookPage.AddVariable"), //$NON-NLS-1$
-			/* 4 */ BeanInfoUIMessages.getString("BeanInfosWorkbookPage.AddProjects"), //$NON-NLS-1$
-			/* 5 */ null,
-			/* 6 */ BeanInfoUIMessages.getString("BeanInfosWorkbookPage.ModifyPaths"), //$NON-NLS-1$
-			/* 7 */ null,  
-			/* 8 */ BeanInfoUIMessages.getString("BeanInfosWorkbookPage.Remove") //$NON-NLS-1$
-		};		
-				
-		BeaninfosAdapter adapter= new BeaninfosAdapter();
-				
-		labelProvider = new SearchPathListLabelProvider();	// kept around so can be updated with java project later
-		fBeaninfosList= new ListDialogField(adapter, buttonLabels, labelProvider);
-		fBeaninfosList.setDialogFieldListener(adapter);
-		fBeaninfosList.setLabelText(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.List.Text")); //$NON-NLS-1$
-		fBeaninfosList.setRemoveButtonIndex(8);
-		fBeaninfosList.enableButton(6, false);	// Need to initially disable it and let the selection state handle it from there.
-		
-		fBeaninfosList.setViewerSorter(new BIListElementSorter());
-		
-		interestedFieldsForEnableControl.add(fBeaninfosList);
-
-	}
-		
-	public void init(IJavaProject jproject) {
-		fCurrJProject= jproject;
-		labelProvider.setJavaProject(jproject);
-		try {
-			rawList = fCurrJProject.getRawClasspath();
-			resolvedList = new IClasspathEntry[rawList.length];
-			for (int i = 0; i < rawList.length; i++) {
-				resolvedList[i] = JavaCore.getResolvedClasspathEntry(rawList[i]);
-			}
-		} catch (JavaModelException e) {
-			rawList = resolvedList = new IClasspathEntry[0];
-		}
-		updateBeaninfosList();
-	}
-	
-	private void updateBeaninfosList() {
-		List spelements = biPathsBlock.getSearchOrder().getElements();
-
-		List biElements = new ArrayList(spelements.size());
-		for (int i = 0; i < spelements.size(); i++) {
-			BPListElement spe = (BPListElement) spelements.get(i);
-			if (spe instanceof BPBeaninfoListElement) {
-				biElements.add(spe);
-			}
-		}
-		fBeaninfosList.setElements(biElements);
-	}	
-		
-	// -------- ui creation
-	
-	public Control getControl(Composite parent) {
-		PixelConverter converter= new PixelConverter(parent);
-		
-		Composite composite= new Composite(parent, SWT.NONE);
-			
-		LayoutUtil.doDefaultLayout(composite, new DialogField[] { fBeaninfosList }, true, SWT.DEFAULT, SWT.DEFAULT);
-		int buttonBarWidth= converter.convertWidthInCharsToPixels(24);
-		fBeaninfosList.setButtonsMinWidth(buttonBarWidth);
-		
-		fSWTControl = composite;
-				
-		return composite;
-	}
-	
-	private Shell getShell() {
-		if (fSWTControl != null) {
-			return fSWTControl.getShell();
-		}
-		return JEMUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell();
-	}
-	
-	
-	private class BeaninfosAdapter implements IDialogFieldListener, IListAdapter {
-		
-		// -------- IListAdapter --------
-		public void customButtonPressed(ListDialogField field, int index) {
-			beaninfosPageCustomButtonPressed(index);
-		}
-		
-		public void selectionChanged(ListDialogField field) {
-			ListDialogField list = field;
-			int selCnt = list.getSelectedElements().size();
-			list.enableButton(6, selCnt == 1);	// Only want the button enabled if one beaninfo is selected.
-			
-		}
-			
-		// ---------- IDialogFieldListener --------
-	
-		public void dialogFieldChanged(DialogField field) {
-			beaninfosPageDialogFieldChanged();
-		}
-		/**
-		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(ListDialogField)
-		 */
-		public void doubleClicked(ListDialogField field) {
-		}
-
-	}
-	
-	private void beaninfosPageCustomButtonPressed(int index) {
-		List beaninfoEntries= null;
-		switch (index) {
-		case 0: /* add existing */
-			beaninfoEntries= chooseClassContainers();
-			break;
-		case 1: /* add jar */
-			beaninfoEntries= chooseJarFiles();
-			break;
-		case 2: /* add external jar */
-			beaninfoEntries= chooseExtJarFiles();
-			break;
-		case 3: /* add variable */
-			beaninfoEntries= chooseVariableEntries();
-			break;
-		case 4: /* add projects */
-			beaninfoEntries= chooseProjects();
-			break;
-		case 6: /* Modify search paths within beaninfos. */
-			modifySearchPaths();
-			return;
-		}
-		
-		if (beaninfoEntries != null) {
-			fBeaninfosList.addElements(beaninfoEntries);
-			fBeaninfosList.postSetSelection(new StructuredSelection(beaninfoEntries));
-		}
-	}
-	
-	private void modifySearchPaths() {
-		// Bring up the dialog for modifying search paths of a particular beaninfo entry.
-		BPBeaninfoListElement elem = (BPBeaninfoListElement) fBeaninfosList.getSelectedElements().get(0);	// There should only be one, button not enabled if none or more than one selected.
-		BeaninfoEntrySearchpathDialog dialog = new BeaninfoEntrySearchpathDialog(getShell(), elem, fCurrJProject);
-		dialog.open();
-	}
-	
-	private void beaninfosPageDialogFieldChanged() {
-		if (fCurrJProject != null) {
-			// already initialized
-			updateSearchpathList();
-		}
-	}			
-	
-	private void updateSearchpathList() {
-		List searchelements = biPathsBlock.getSearchOrder().getElements();
-
-		List beaninfoelements = fBeaninfosList.getElements();
-
-		boolean changeDone = false;
-		// First go through the search path and remove any Beaninfo list elements that
-		// are not in this pages beaninfos list.
-		for (ListIterator spitr = searchelements.listIterator(searchelements.size());
-			spitr.hasPrevious();
-			) {
-			BPListElement element = (BPListElement) spitr.previous();
-			if (element instanceof BPBeaninfoListElement && !beaninfoelements.remove(element)) {
-				// Search element and not found in packages list so remove it from searchpath list.
-				spitr.remove();
-				changeDone = true;
-			}
-		}
-		// Any left over in beaninfos list are new and need to be added.
-		searchelements.addAll(beaninfoelements);
-		changeDone = changeDone || !beaninfoelements.isEmpty();
-
-		if (changeDone)
-			biPathsBlock.setSearchOrderElements(searchelements);
-	}
-			
-			
-	private List chooseClassContainers() {	
-		Class[] acceptedClasses= new Class[] { IFolder.class };
-		ISelectionStatusValidator validator= new TypedElementSelectionValidator(acceptedClasses, true);
-			
-		acceptedClasses= new Class[] { IProject.class, IFolder.class };
-
-		ViewerFilter filter= new TypedViewerFilter(acceptedClasses, getUsedContainers());	
-			
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ITreeContentProvider cp= new WorkbenchContentProvider();
-
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), lp, cp);
-		dialog.setValidator(validator);
-		dialog.setTitle(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.SelectionDialog.Classes.Title")); //$NON-NLS-1$
-		dialog.setMessage(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.SelectionDialog.Classes.Prompt"));  //$NON-NLS-1$
-		dialog.addFilter(filter);
-		dialog.setInput(fWorkspaceRoot);
-		dialog.setInitialSelection(fCurrJProject.getProject());
-		
-		if (dialog.open() == Window.OK) {
-			Object[] elements= dialog.getResult();
-			List res= new ArrayList(elements.length);
-			for (int i= 0; i < elements.length; i++) {
-				BPBeaninfoListElement newGuy = newBPBeaninfoListElement((IResource) elements[i]);
-				if (newGuy != null)
-					res.add(newGuy);
-			}
-			return res;
-		}
-		return null;		
-	}
-	
-	private List chooseJarFiles() {
-		Class[] acceptedClasses= new Class[] { IFile.class };
-		ISelectionStatusValidator validator= new TypedElementSelectionValidator(acceptedClasses, true);
-		ViewerFilter filter= new ArchiveFileFilter(getUsedJARFiles(), true);
-		
-		ILabelProvider lp= new WorkbenchLabelProvider();
-		ITreeContentProvider cp= new WorkbenchContentProvider();
-
-		ElementTreeSelectionDialog dialog= new ElementTreeSelectionDialog(getShell(), lp, cp);
-		dialog.setValidator(validator);
-		dialog.setTitle(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.SelectionDialog.JARs.Title")); //$NON-NLS-1$
-		dialog.setMessage(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.SelectionDialog.JARs.Message")); //$NON-NLS-1$
-		dialog.addFilter(filter);
-		dialog.setInput(fWorkspaceRoot);
-		dialog.setInitialSelection(fCurrJProject.getProject());		
-
-		if (dialog.open() == Window.OK) {
-			Object[] elements= dialog.getResult();
-			List res= new ArrayList(elements.length);
-			for (int i= 0; i < elements.length; i++) {
-				BPBeaninfoListElement newGuy = newBPBeaninfoListElement((IResource) elements[i]);
-				if (newGuy != null)
-					res.add(newGuy);
-			}
-			return res;
-		}
-		return null;
-	}
-	
-	private IContainer[] getUsedContainers() {
-		// Containers used by both the classpath and the beaninfo search path.
-		// Don't want containers used by classpath because those would then be
-		// in the buildpath and user would select paths through the search path page.
-		ArrayList res= new ArrayList();
-		try {
-			IPath outputLocation= fCurrJProject.getOutputLocation();
-			if (outputLocation != null) {
-				IResource resource= fWorkspaceRoot.findMember(outputLocation);
-				if (resource instanceof IContainer) {
-					res.add(resource);
-				}
-			}
-		} catch (JavaModelException e) {
-			// ignore it here, just log
-			JEMUIPlugin.getPlugin().getLogger().log(e.getStatus());
-		}
-			
-		for (int i= 0; i < resolvedList.length; i++) {
-			if (resolvedList[i] != null && resolvedList[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-				IResource resource= fWorkspaceRoot.findMember(resolvedList[i].getPath());
-				if (resource instanceof IContainer) {
-					res.add(resource);
-				}
-			}
-		}
-
-		List bilist= fBeaninfosList.getElements();
-		for (int i= 0; i < bilist.size(); i++) {
-			BPListElement elem= (BPListElement)bilist.get(i);
-			if (elem.getEntry().getKind() == IClasspathEntry.CPE_SOURCE) {
-				IResource resource= fWorkspaceRoot.findMember(elem.getEntry().getPath());
-				res.add(resource);
-			}
-		}
-		return (IContainer[]) res.toArray(new IContainer[res.size()]);
-	}
-	
-	private IFile[] getUsedJARFiles() {
-		// Jars used by both the classpath and the beaninfo search path.
-		// Don't want jars used by classpath because those would then be
-		// in the buildpath and user would select paths through the search path page.
-		ArrayList res= new ArrayList();
-		for (int i= 0; i < resolvedList.length; i++) {
-			if (resolvedList[i] != null && resolvedList[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
-				IResource resource= fWorkspaceRoot.findMember(resolvedList[i].getPath());
-				if (resource instanceof IFile)
-					res.add(resource);
-			}
-		}
-
-		List bilist= fBeaninfosList.getElements();
-		for (int i= 0; i < bilist.size(); i++) {
-			BPListElement elem= (BPListElement)bilist.get(i);
-			if (elem.getEntry().getKind() == IClasspathEntry.CPE_LIBRARY) {
-				IResource resource= fWorkspaceRoot.findMember(elem.getEntry().getPath());
-				if (resource instanceof IFile)
-					res.add(resource);
-			}
-		}
-		return (IFile[]) res.toArray(new IFile[res.size()]);
-	}	
-	
-	/**
-	 * Create a new BPListElement for the given object.
-	 */
-	private BPBeaninfoListElement newBPBeaninfoListElement(IResource element) {
-		if (element instanceof IContainer || element instanceof IFile) {
-			IClasspathEntry cpe = JavaCore.newLibraryEntry(element.getFullPath(), null, null);
-			BeaninfoEntry bie = new BeaninfoEntry(cpe, null, true);
-			return new BPBeaninfoListElement(bie, null, false);
-		}
-		
-		return null;
-	}
-
-	
-	private List chooseExtJarFiles() {
-		String lastUsedPath= fDialogSettings.get(DIALOGSTORE_LASTEXTJAR);
-		if (lastUsedPath == null) {
-			lastUsedPath= ""; //$NON-NLS-1$
-		}
-		FileDialog dialog= new FileDialog(getShell(), SWT.MULTI);
-		dialog.setText(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.SelectionDialog.ExtJARs.Text")); //$NON-NLS-1$
-		dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String res= dialog.open();
-		if (res == null) {
-			return null;
-		}
-		String[] fileNames= dialog.getFileNames();
-		int nChosen= fileNames.length;
-			
-		IPath filterPath= new Path(dialog.getFilterPath());
-		List elems = new ArrayList(nChosen);
-		for (int i= 0; i < nChosen; i++) {
-			IPath path= filterPath.append(fileNames[i]).makeAbsolute();	
-			BPBeaninfoListElement newGuy = newBPBeaninfoListElement(path);
-			if (newGuy != null)
-				elems.add(newGuy);
-		}
-		fDialogSettings.put(DIALOGSTORE_LASTEXTJAR, filterPath.toOSString());
-		
-		return elems;
-	}
-	
-	private BPBeaninfoListElement newBPBeaninfoListElement(IPath path) {
-		// Create for an external, if not already used in either classpath or beaninfo path.
-		// These can't be pre-selected out like for the other choose dialogs.
-		for (int i = 0; i < resolvedList.length; i++) {
-			IClasspathEntry cpe = resolvedList[i];
-			if (cpe != null && cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY && cpe.getPath().equals(path))
-				return null;	// Already exists.
-		}
-		
-		// Now see if one of ours.
-		List ours = fBeaninfosList.getElements();
-		for (int i = 0; i < ours.size(); i++) {
-			BPBeaninfoListElement bpb = (BPBeaninfoListElement) ours.get(i);
-			if (bpb.getEntry().getKind() == IClasspathEntry.CPE_LIBRARY && bpb.getEntry().getPath().equals(path))
-				return null;	// Already exists
-		}
-		
-		IClasspathEntry cpe = JavaCore.newLibraryEntry(path, null, null);
-		BeaninfoEntry bie = new BeaninfoEntry(cpe, null, true);
-		return new BPBeaninfoListElement(bie, null, false);
-	}
-	
-	
-	private List chooseProjects() {	
-		Class[] acceptedClasses= new Class[] { IJavaProject.class };
-		ISelectionStatusValidator validator= new TypedElementSelectionValidator(acceptedClasses, true);
-
-		List allProjects = null;
-		try {
-			allProjects = new ArrayList(Arrays.asList(fCurrJProject.getJavaModel().getChildren()));
-		} catch(JavaModelException e) {
-			allProjects = Collections.EMPTY_LIST;
-		}
-		allProjects.removeAll(getUsedProjects());
-			
-		ILabelProvider lp= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), lp);
-		dialog.setValidator(validator);
-		dialog.setTitle(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.SelectionDialog.Projects.Title")); //$NON-NLS-1$
-		dialog.setMessage(BeanInfoUIMessages.getString("BeanInfosWorkbookPage.SelectionDialog.Projects.Prompt")); //$NON-NLS-1$
-		dialog.setElements(allProjects.toArray());
-		
-		if (dialog.open() == Window.OK) {
-			Object[] elements= dialog.getResult();
-			List res= new ArrayList(elements.length);
-			for (int i= 0; i < elements.length; i++) {
-				try {
-					IClasspathEntry cpe = JavaCore.newProjectEntry(((IJavaProject) elements[i]).getCorrespondingResource().getFullPath());
-					BeaninfoEntry bie = new BeaninfoEntry(cpe, null, true);
-					res.add(new BPBeaninfoListElement(bie, null, false));
-				} catch(JavaModelException e) {
-				}
-			}
-			return res;
-		}
-		return null;		
-	}
-	
-	private List getUsedProjects() {
-		// Projects used by both the classpath and the beaninfo search path.
-		// Don't want projects used by classpath because those would then be
-		// in the buildpath and user would select paths through the search path page.
-		ArrayList res= new ArrayList();
-		res.add(fCurrJProject);	// Plus our own project is used.
-		IJavaModel jmodel = fCurrJProject.getJavaModel();
-		for (int i= 0; i < resolvedList.length; i++) {
-			if (resolvedList[i] != null && resolvedList[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-				res.add(jmodel.getJavaProject(resolvedList[i].getPath().segment(0)));
-			}
-		}
-
-		List bilist= fBeaninfosList.getElements();
-		for (int i= 0; i < bilist.size(); i++) {
-			BPListElement elem= (BPListElement)bilist.get(i);
-			if (elem.getEntry().getKind() == IClasspathEntry.CPE_PROJECT) 
-				res.add(jmodel.getJavaProject(elem.getEntry().getPath().segment(0)));			
-		}
-		return res;
-	}
-	
-	private List chooseVariableEntries() {
-		// Remove existing variable entries in both the classpath and the beaninfopaths.
-		// Don't want classpath ones because they should be of been selected in the search paths page.
-		ArrayList existingPaths= new ArrayList();
-		for (int i= 0; i < rawList.length; i++) {
-			if (rawList[i].getEntryKind() == IClasspathEntry.CPE_VARIABLE) {
-				existingPaths.add(rawList[i].getPath());
-			}
-		}
-		
-		List ours = fBeaninfosList.getElements();
-		for (int i = 0; i < ours.size(); i++) {
-			BPBeaninfoListElement bpb = (BPBeaninfoListElement) ours.get(i);
-			if (bpb.getEntry().getKind() == IClasspathEntry.CPE_VARIABLE)
-				existingPaths.add(bpb.getEntry().getPath());
-		}
-		
-		VariableSelectionDialog dialog= new VariableSelectionDialog(getShell(), existingPaths);
-		if (dialog.open() == Window.OK) {
-			IPath path= dialog.getVariable();
-			IClasspathEntry cpe = JavaCore.newVariableEntry(path, null, null);
-			IPath resolvedPath= JavaCore.getResolvedVariablePath(path);
-			boolean isMissing = resolvedPath == null || !resolvedPath.toFile().isFile();
-			return Collections.singletonList(new BPBeaninfoListElement(new BeaninfoEntry(cpe, null, true), null, isMissing));
-		}
-		return null;
-	}	
-	
-
-	// a dialog to choose a variable
-	private class VariableSelectionDialog extends StatusDialog implements IStatusChangeListener {	
-		private VariableSelectionBlock fVariableSelectionBlock;
-				
-		public VariableSelectionDialog(Shell parent, List existingPaths) {
-			super(parent);
-			setTitle(NewWizardMessages.NewVariableEntryDialog_title); //$NON-NLS-1$
-			String initVar= fDialogSettings.get(DIALOGSTORE_LASTVARIABLE);
-			fVariableSelectionBlock= new VariableSelectionBlock(this, existingPaths, null, initVar, false);
-		}
-		
-		/*
-		 * @see Windows#configureShell
-		 */
-		protected void configureShell(Shell newShell) {
-			super.configureShell(newShell);
-//			WorkbenchHelp.setHelp(newShell, IJavaHelpContextIds.VARIABLE_SELECTION_DIALOG);
-		}		
-
-		/*
-		 * @see StatusDialog#createDialogArea()
-		 */				
-		protected Control createDialogArea(Composite parent) {
-			Composite composite= (Composite)super.createDialogArea(parent);
-					
-			Label message= new Label(composite, SWT.WRAP);
-			message.setText(NewWizardMessages.NewVariableEntryDialog_title); //$NON-NLS-1$
-			message.setLayoutData(new GridData());	
-						
-			Control inner= fVariableSelectionBlock.createControl(composite);
-			inner.setLayoutData(new GridData(GridData.FILL_BOTH));
-			return composite;
-		}
-		
-		/*
-		 * @see Dialog#okPressed()
-		 */
-		protected void okPressed() {
-			fDialogSettings.put(DIALOGSTORE_LASTVARIABLE, getVariable().segment(0));
-			super.okPressed();
-		}	
-
-		/*
-		 * @see IStatusChangeListener#statusChanged()
-		 */			
-		public void statusChanged(IStatus status) {
-			updateStatus(status);
-		}
-		
-		public IPath getVariable() {
-			return fVariableSelectionBlock.getVariablePath();
-		}		
-	}
-				
-	// a dialog to set the source attachment properties
-	
-	/*
-	 * @see BuildPathBasePage#getSelection
-	 */
-	public List getSelection() {
-		return fBeaninfosList.getSelectedElements();
-	}
-
-	/*
-	 * @see BuildPathBasePage#setSelection
-	 */	
-	public void setSelection(List selElements) {
-		fBeaninfosList.selectElements(new StructuredSelection(selElements));
-	}	
-
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BuildSearchBasePage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BuildSearchBasePage.java
deleted file mode 100644
index 45e894c..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/BuildSearchBasePage.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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: BuildSearchBasePage.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 23:02:54 $ 
- */
-import java.util.List;
-
-public abstract class BuildSearchBasePage {
-	
-	public abstract List getSelection();
-	public abstract void setSelection(List selection);
-	
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/OverlayComposite.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/OverlayComposite.java
deleted file mode 100644
index 301d1de..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/OverlayComposite.java
+++ /dev/null
@@ -1,200 +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 Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  Created Apr 27, 2005 by Gili Mendel
- * 
- *  $RCSfile: OverlayComposite.java,v $
- *  $Revision: 1.1 $  $Date: 2005/05/02 21:36:10 $ 
- */
-package org.eclipse.jem.internal.beaninfo.ui;
-
-import java.util.*;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
- 
-//TODO:  This class was dropped in 3.1 M7 from org.eclipse.ui.internal.misc
-//       We made  local copy for the time being.  Need to investigate if this is file
-//       for us given that the OverlayIcon (replacement) is internal
-public class OverlayComposite extends CompositeImageDescriptor {
-
-    private ImageData backgroundImage;
-
-    private ImageData leftImage;
-
-    private ImageData rightImage;
-
-    private ImageData topImage;
-
-    private ImageData bottomImage;
-
-    private List foregroundImages = new ArrayList();
-
-    /**
-     *	Create an instance of this class.
-     */
-    public OverlayComposite(ImageData background) {
-        backgroundImage = background;
-    }
-
-    /**
-     *	Add the passed image to this descriptor's collection of images to 
-     * be composed together to create an image.
-     */
-    public void addForegroundImage(ImageData image) {
-        foregroundImages.add(image);
-    }
-
-    /**
-     *Superimpose self's images within the given bounds by means of #drawImage
-     *
-     *@see CompositeImage#drawImage(ImageData src,int ox,int oy)
-     */
-    protected void drawCompositeImage(int width, int height) {
-        //draw background
-        drawImage(backgroundImage, getLeftBound(), getTopBound());
-
-        //draw foreground images
-        Iterator e = foregroundImages.iterator();
-        while (e.hasNext())
-            drawImage(((ImageData) e.next()), getLeftBound(), getTopBound());
-
-        //draw extensions
-        if (topImage != null)
-            drawImage(topImage, getLeftBound(), 0);
-        if (bottomImage != null)
-            drawImage(bottomImage, getLeftBound(), height - bottomImage.height);
-        if (leftImage != null)
-            drawImage(leftImage, 0, getTopBound());
-        if (rightImage != null)
-            drawImage(rightImage, width - rightImage.width, getTopBound());
-
-    }
-
-    /**
-     * @see Object#equals
-     */
-    public boolean equals(Object o) {
-        if (!(o instanceof OverlayComposite)) {
-            return false;
-        }
-        OverlayComposite other = (OverlayComposite) o;
-
-        return equals(backgroundImage, other.backgroundImage)
-                && equals(leftImage, other.leftImage)
-                && equals(rightImage, other.rightImage)
-                && equals(topImage, other.topImage)
-                && equals(bottomImage, other.bottomImage)
-                && equals(foregroundImages, other.foregroundImages);
-    }
-
-    /**
-     * Private utility for comparing two possibly-null objects.
-     */
-    private boolean equals(Object o1, Object o2) {
-        return o1 == null ? o2 == null : o1.equals(o2);
-    }
-
-    /**
-     *	Answer the left-most coordinate that the main image can draw to
-     *
-     *	@return int
-     */
-    protected int getLeftBound() {
-        if (leftImage == null)
-            return 0;
-
-        return leftImage.width;
-    }
-
-    /**
-     *	Answer self's size, as determined by the size of the initially-
-     *	provided base-level image
-     */
-    protected Point getSize() {
-        //start with basic size
-        Point size = new Point(backgroundImage.width, backgroundImage.height);
-
-        //overlays may increase size.
-        if (topImage != null)
-            size.y += topImage.height;
-
-        if (bottomImage != null)
-            size.y += bottomImage.height;
-
-        if (leftImage != null)
-            size.x += leftImage.width;
-
-        if (rightImage != null)
-            size.x += rightImage.width;
-
-        return size;
-    }
-
-    /**
-     *	Answer the top-most coordinate that the main image can draw to
-     *
-     *	@return int
-     */
-    protected int getTopBound() {
-        if (topImage == null)
-            return 0;
-
-        return topImage.height;
-    }
-
-    /**
-     * @see Object#hashCode
-     */
-    public int hashCode() {
-        return hashCode(backgroundImage) + hashCode(leftImage)
-                + hashCode(rightImage) + hashCode(topImage)
-                + hashCode(bottomImage) + hashCode(foregroundImages);
-    }
-
-    /**
-     * Private utility for getting the hashCode for an
-     * object that may be null.
-     */
-    private int hashCode(Object o) {
-        return o == null ? 0 : o.hashCode();
-    }
-
-    /**
-     *  Set the image to be drawn below the primary overlay region.
-     */
-    public void setBottomExtension(ImageData value) {
-        bottomImage = value;
-    }
-
-    /**
-     *  Set the image to be drawn to the left of the primary overlay region.
-     */
-    public void setLeftExtension(ImageData value) {
-        leftImage = value;
-    }
-
-    /**
-     *  Set the image to be drawn to the right of the primary overlay region.
-     */
-    public void setRightExtension(ImageData value) {
-        rightImage = value;
-    }
-
-    /**
-     *  Set the image to be drawn above the primary overlay region.
-     */
-    public void setTopExtension(ImageData value) {
-        topImage = value;
-    }
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackageOnlyContentProvider.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackageOnlyContentProvider.java
deleted file mode 100644
index 22ab880..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackageOnlyContentProvider.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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: PackageOnlyContentProvider.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-
-import org.eclipse.jdt.core.IPackageFragment;
-import java.util.*;
-/**
- * A content provider which will only go down to the package level,
- * it won't explore further. The advantage of this is so that plus signs ('+')
- * won't show up on packages. The Filter technique could be used to not
- * show the children, but this still shows the plus sign.
- *
- * Also, if the element is a java.util.List, then that list will be returned
- * as the children. This allows for a root to be composed instead of being
- * one of the standard Java Elements.
- */
-
-public class PackageOnlyContentProvider extends StandardJavaElementContentProvider {
-	
-	/**
-	 * If the element is a list, return the iterator on it.
-	 * Else send it up the chain.
-	 */
-	public Object[] getChildren(Object element) {
-		if (element instanceof List)
-			return ((List) element).toArray();
-		return super.getChildren(element);
-	}
-	
-	/**
-	 * If the element is a list and it is not empty, it has children,
-	 * if it is a IPackageFragment it does not,
-	 * else send it up the chain.
-	 */
-	public boolean hasChildren(Object element) {
-		if (element instanceof List)
-			return !((List) element).isEmpty();
-		if (element instanceof IPackageFragment)
-			return false;
-		return super.hasChildren(element);
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java
deleted file mode 100644
index ad97bda..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/PackagesWorkbookPage.java
+++ /dev/null
@@ -1,441 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: PackagesWorkbookPage.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import java.util.*;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.jdt.internal.ui.util.PixelConverter;
-import org.eclipse.jdt.internal.ui.wizards.TypedViewerFilter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.*;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.dialogs.*;
-
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-/**
- * Workbook page for selecting the packages from the current
- * project that are in the search path.
- * @version 	1.0
- * @author
- */
-public class PackagesWorkbookPage extends BuildSearchBasePage {
-
-	// Note: Not happy with how this works. It does a lot of manipulating of classpath to
-	// fragments and back and forth. But it works for now.
-
-	/**
-	 * Validator for this workbook page to verify the selections on Choose page.
-	 * @version 	1.0
-	 * @author
-	 */
-	public static class ChoosePackagesSelectionValidator implements ISelectionStatusValidator {
-
-		private IStatus fgErrorStatus = new StatusInfo(IStatus.ERROR, ""); //$NON-NLS-1$
-		private IStatus fgOKStatus = new StatusInfo();
-
-		public ChoosePackagesSelectionValidator() {
-		}
-
-		/*
-		 * @see ISelectionValidator#validate(Object)
-		 */
-		public IStatus validate(Object[] selection) {
-			if (isValid(selection)) {
-				return fgOKStatus;
-			}
-			return fgErrorStatus;
-		}
-
-		private boolean isValid(Object[] selection) {
-			if (selection.length == 0)
-				return false;
-
-			for (int i = 0; i < selection.length; i++) {
-				if (selection[i] instanceof IPackageFragment)
-					continue; // Fragments are always valid
-				return false;
-			}
-
-			return true;
-		}
-
-	}
-
-	private BeaninfoPathsBlock biPathsBlock;
-	private IJavaProject fCurrJProject;
-
-	private Control fSWTControl;
-
-	private ListDialogField fSearchPackagesList;
-
-	private IPackageFragmentRoot[][] rootsPerRawEntry;
-	private IClasspathEntry[] rawList;
-	
-	SearchPathListLabelProvider labelProvider;
-
-	public PackagesWorkbookPage(IWorkspaceRoot root, BeaninfoPathsBlock biPathsBlock, List interestedFieldsForEnableControl) {
-		this.biPathsBlock = biPathsBlock;
-
-		fSWTControl = null;
-
-		PackagesAdapter adapter = new PackagesAdapter();
-
-		String[] buttonLabels;
-
-		buttonLabels = new String[] {
-			/* 0 */
-			BeanInfoUIMessages.getString("PackagesWorkbook.ChoosePackages"), //$NON-NLS-1$
-			/* 1 */
-			BeanInfoUIMessages.getString("PackagesWorkbook.ChooseDefinedPaths"), //$NON-NLS-1$
-			/* 2 */
-			null,
-			/* 3 */
-			BeanInfoUIMessages.getString("PackagesWorkbook.Remove") }; //$NON-NLS-1$
-
-		labelProvider = new SearchPathListLabelProvider();
-		fSearchPackagesList = new ListDialogField(adapter, buttonLabels, labelProvider);
-		fSearchPackagesList.setDialogFieldListener(adapter);
-		fSearchPackagesList.setLabelText(BeanInfoUIMessages.getString("PackagesWorkbook.LabelText")); //$NON-NLS-1$
-		fSearchPackagesList.setRemoveButtonIndex(3);
-
-		fSearchPackagesList.setViewerSorter(new SPListElementSorter());
-		
-		interestedFieldsForEnableControl.add(fSearchPackagesList);
-	}
-
-	public void init(IJavaProject jproject) {
-		fCurrJProject = jproject;
-		labelProvider.setJavaProject(jproject);
-		try {
-			rawList = fCurrJProject.getRawClasspath();
-			rootsPerRawEntry = new IPackageFragmentRoot[rawList.length][];
-			for (int i = 0; i < rawList.length; i++) {
-				rootsPerRawEntry[i] = fCurrJProject.findPackageFragmentRoots(rawList[i]);
-			}		
-		} catch (JavaModelException e) {
-			rawList = new IClasspathEntry[0];
-			rootsPerRawEntry = new IPackageFragmentRoot[0][];
-		}
-		updatePackagesList();
-	}
-
-	private void updatePackagesList() {
-		List spelements = biPathsBlock.getSearchOrder().getElements();
-
-		List packageElements = new ArrayList(spelements.size());
-		for (int i = 0; i < spelements.size(); i++) {
-			BPListElement spe = (BPListElement) spelements.get(i);
-			if (spe instanceof BPSearchListElement) {
-				packageElements.add(spe);
-			}
-		}
-		fSearchPackagesList.setElements(packageElements);
-	}
-
-	public Control getControl(Composite parent) {
-		PixelConverter converter = new PixelConverter(parent);
-
-		Composite composite = new Composite(parent, SWT.NONE);
-
-		LayoutUtil.doDefaultLayout(
-			composite,
-			new DialogField[] { fSearchPackagesList },
-			true,
-			SWT.DEFAULT,
-			SWT.DEFAULT);
-
-		int buttonBarWidth = converter.convertWidthInCharsToPixels(24);
-		fSearchPackagesList.setButtonsMinWidth(buttonBarWidth);
-
-		fSWTControl = composite;
-
-		return composite;
-	}
-
-	private Shell getShell() {
-		if (fSWTControl != null) {
-			return fSWTControl.getShell();
-		}
-		return JEMUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell();
-	}
-
-	private class PackagesAdapter implements IListAdapter, IDialogFieldListener {
-
-		// -------- IListAdapter --------
-		public void customButtonPressed(ListDialogField field, int index) {
-			packagesPageCustomButtonPressed(field, index);
-		}
-
-		public void selectionChanged(ListDialogField field) {
-		}
-
-		// ---------- IDialogFieldListener --------
-		public void dialogFieldChanged(DialogField field) {
-			packagesPageDialogFieldChanged(field);
-		}
-		/**
-		 * @see org.eclipse.jdt.internal.ui.wizards.dialogfields.IListAdapter#doubleClicked(ListDialogField)
-		 */
-		public void doubleClicked(ListDialogField field) {
-		}
-
-	}
-
-	private void packagesPageCustomButtonPressed(DialogField field, int index) {
-		if (field == fSearchPackagesList) {
-			List elementsToAdd = null;
-			if (index == 0)
-				elementsToAdd = choosePackages();
-			else if (index == 1)
-				elementsToAdd = chooseDefined();
-
-			if (elementsToAdd != null && !elementsToAdd.isEmpty()) {
-				fSearchPackagesList.addElements(elementsToAdd);
-				fSearchPackagesList.postSetSelection(new StructuredSelection(elementsToAdd));
-			}
-		}
-	}
-
-	private void packagesPageDialogFieldChanged(DialogField field) {
-		if (fCurrJProject == null) {
-			// not initialized
-			return;
-		}
-
-		if (field == fSearchPackagesList) {
-			updateSearchpathList();
-		}
-	}
-
-	private void updateSearchpathList() {
-		List searchelements = biPathsBlock.getSearchOrder().getElements();
-
-		List packageelements = fSearchPackagesList.getElements();
-
-		boolean changeDone = false;
-		// First go through the search path and remove any SearchListElements that are
-		// not in the search packages list from this page.
-		for (ListIterator spitr = searchelements.listIterator(searchelements.size());
-			spitr.hasPrevious();
-			) {
-			BPListElement element = (BPListElement) spitr.previous();
-			if (element instanceof BPSearchListElement && !packageelements.remove(element)) {
-				// Search element and not found in packages list so remove it from searchpath list.
-				spitr.remove();
-				changeDone = true;
-			}
-		}
-		// Any left over in packages list are new and need to be added.
-		searchelements.addAll(packageelements);
-		changeDone = changeDone || !packageelements.isEmpty();
-
-		if (changeDone)
-			biPathsBlock.setSearchOrderElements(searchelements);
-	}
-	/*
-	 * @see BuildPathBasePage#getSelection
-	 */
-	public List getSelection() {
-		return fSearchPackagesList.getSelectedElements();
-	}
-
-	/*
-	 * @see BuildPathBasePage#setSelection
-	 */
-	public void setSelection(List selElements) {
-		fSearchPackagesList.selectElements(new StructuredSelection(selElements));
-	}
-
-	/**
-	 * Choose the packages that should be in the search path.
-	 */
-	private List choosePackages() {
-
-		ISelectionStatusValidator validator = new ChoosePackagesSelectionValidator();
-
-		// Show up to the package fragment, don't show any contents of it.
-		Class[] acceptedClasses =
-			new Class[] { IJavaProject.class, IPackageFragmentRoot.class, IPackageFragment.class };
-		Object[] rejectedFragments = getFilteredExistingEntries();
-
-		// Only show package fragments that have children (i.e. there classes in it, not interested
-		// in intermediate ones that have no classes defined in them. Those are filtered out.
-		TypedViewerFilter filter = new TypedViewerFilter(acceptedClasses, rejectedFragments) {
-			public boolean select(Viewer viewer, Object parentElement, Object element) {
-				if (super.select(viewer, parentElement, element)) {
-					if (element instanceof IPackageFragment) {
-						IPackageFragment pkg = (IPackageFragment) element;
-						try {
-							return pkg.hasChildren();
-						} catch (JavaModelException e) {
-						}
-						return false;
-					} else
-						return true;
-				}
-				return false;
-			}
-		};
-
-		ITreeContentProvider provider = new PackageOnlyContentProvider();
-
-		ILabelProvider labelProvider = new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		ElementTreeSelectionDialog dialog =
-			new ElementTreeSelectionDialog(getShell(), labelProvider, provider);
-		dialog.setTitle(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_TITLE));
-
-		dialog.setValidator(validator);
-		dialog.setMessage(BeanInfoUIMessages.getString(BeanInfoUIMessages.BPB_ADDSEARCHPATH_DESC));
-		dialog.addFilter(filter);
-		dialog.setInput(fCurrJProject);
-
-		if (dialog.open() == Window.OK) {
-			Object[] elements = dialog.getResult();
-			List newElements = new ArrayList(elements.length);
-			for (int i = 0; i < elements.length; i++) {
-				BPListElement newGuy = newBPListElement(elements[i]);
-				if (newGuy != null)
-					newElements.add(newGuy);
-			}
-			return newElements;
-		}
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Return the list of entries that already are in the search path
-	 * so that they don't show up in the list.
-	 */
-	protected Object[] getFilteredExistingEntries() {
-		try {
-			IPackageFragmentRoot[] roots = fCurrJProject.getPackageFragmentRoots();
-			List entries = fSearchPackagesList.getElements();
-			List fragments = new ArrayList(entries.size());
-			Iterator itr = entries.iterator();
-			while (itr.hasNext()) {
-				BPListElement elem = (BPListElement) itr.next();
-				if (elem instanceof BPSearchListElement) {
-					BPSearchListElement bse = (BPSearchListElement) elem;
-					fragments.addAll(getPackages(bse, roots));
-				}
-			}
-			return fragments.toArray();
-		} catch (JavaModelException e) {
-		}
-		return new Object[0];
-	}
-	
-	
-	/**
-	 * Choose the pre-defined search paths that should be in the search path.
-	 */
-	private List chooseDefined() {
-
-		// Current pre-defined ones are only pre-reqed projects.
-		// The list of inputs will not contain any already in the path.
-		// We will create them here and if not selected they will thrown away.
-		// The assumption is that there are not very many and our SearchPathListLabelProvider does
-		// a good job of showing them. Otherwise we would need to come up with one that can show
-		// IJavaProjects when we get them.
-		List inputs = new ArrayList();
-		List currentList = fSearchPackagesList.getElements();
-		for (int i = 0; i < rawList.length; i++) {
-			if (rawList[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-				boolean exists = false;
-				for (int j = 0; j < currentList.size(); j++) {
-					BPSearchListElement bse = (BPSearchListElement) currentList.get(j);
-					if (bse.getEntry().getKind() == IClasspathEntry.CPE_PROJECT && rawList[i].getPath().equals(bse.getEntry().getPath())) {
-						exists = true;
-						break;
-					}
-				}
-				
-				if (!exists)
-					inputs.add(new BPSearchListElement(new SearchpathEntry(IClasspathEntry.CPE_PROJECT, rawList[i].getPath(), null), false, false, rawList[i].isExported()));
-			}
-		}
-		
-		ILabelProvider labelProvider1 = new SearchPathListLabelProvider(fCurrJProject);
-		ElementListSelectionDialog dialog =
-			new ElementListSelectionDialog(getShell(), labelProvider1);
-		dialog.setTitle(BeanInfoUIMessages.getString("PackagesWorkbook.SelectionDialog.DefinedPaths.Title")); //$NON-NLS-1$
-
-		dialog.setMessage(BeanInfoUIMessages.getString("PackagesWorkbook.SelectionDialog.DefinedPaths.Message")); //$NON-NLS-1$
-		dialog.setElements(inputs.toArray());
-
-		if (dialog.open() == Window.OK)
-			return Arrays.asList(dialog.getResult());
-		else
-			return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * Create a new BPListElement for the given object.
-	 */
-	protected BPListElement newBPListElement(Object element) {
-		SearchpathEntry se = null;
-		boolean isExported = false;
-		IPackageFragment frag = (IPackageFragment) element;
-		// Need to find corresponding raw class path entry.
-		IPackageFragmentRoot root = (IPackageFragmentRoot) frag.getParent(); // Get frag root.
-		for (int i = 0; i < rootsPerRawEntry.length; i++) {
-			for (int j = 0; j < rootsPerRawEntry[i].length; j++) {
-				if (rootsPerRawEntry[i][j].equals(root)) {
-					isExported = rawList[i].isExported() || rawList[i].getEntryKind() == IClasspathEntry.CPE_SOURCE;
-					se = new SearchpathEntry(rawList[i].getEntryKind(), rawList[i].getPath(), frag.getElementName());
-					break;
-				}
-			}
-		}
-
-		return new BPSearchListElement(se, false, false, isExported);
-	}
-	
-	/**
-	 * Find the package fragments for this package entry.
-	 */
-	protected List getPackages(BPSearchListElement element, IPackageFragmentRoot[] roots) {
-		String packageName = ((SearchpathEntry) element.getEntry()).getPackage();
-		if (packageName == null)
-			return Collections.EMPTY_LIST;
-
-		try {
-			List packages = new ArrayList(10);
-			for (int i = 0; i < roots.length; i++) {
-				IJavaElement[] pfs = roots[i].getChildren();
-				for (int j = 0; j < pfs.length; j++)
-					if (pfs[j].getElementType() == IJavaElement.PACKAGE_FRAGMENT
-						&& pfs[j].getElementName().equals(packageName)) {
-						packages.add(pfs[j]);
-						break;
-					}
-			}
-			return packages;
-		} catch (JavaModelException e) {
-		}
-		return Collections.EMPTY_LIST;
-	}
-	
-	
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SPListElementSorter.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SPListElementSorter.java
deleted file mode 100644
index 5a448db..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SPListElementSorter.java
+++ /dev/null
@@ -1,88 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: SPListElementSorter.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-import org.eclipse.jem.internal.beaninfo.core.SearchpathEntry;
-
-/**
- * Sorter for sorting BPSearchListElements within the main list.
- * It is not to be used on elements within a specific beaninfo entry.
- * 
- * @version 	1.0
- * @author
- */
-public class SPListElementSorter extends ViewerSorter {
-	
-	/*
-	 * @see ViewerSorter#category(Object)
-	 */
-	public int category(Object obj) {
-		if (obj instanceof BPSearchListElement) {
-			BPSearchListElement element = (BPSearchListElement) obj;
-			
-			switch (((SearchpathEntry) element.getEntry()).getKind()) {
-			case IClasspathEntry.CPE_LIBRARY:
-				return 4;
-			case IClasspathEntry.CPE_PROJECT:
-				return 1;
-			case IClasspathEntry.CPE_SOURCE:
-				return 0;
-			case IClasspathEntry.CPE_VARIABLE:
-				return 3;
-			case IClasspathEntry.CPE_CONTAINER:
-				return 2;
-			}
-		}
-		return super.category(obj);
-	}
-
-	/*
-	 * @see ViewerSorter#compare()
-	 */	
-	public int compare(Viewer viewer, Object e1, Object e2) {
-		int cat1 = category(e1);
-		int cat2 = category(e2);
-	
-		if (cat1 != cat2)
-			return cat1 - cat2;
-			
-		if ((e1 instanceof BPSearchListElement) && (e2 instanceof BPSearchListElement)) {
-			SearchpathEntry p1 = (SearchpathEntry) ((BPSearchListElement) e1).getEntry();
-			SearchpathEntry p2 = (SearchpathEntry) ((BPSearchListElement) e2).getEntry();
-			
-			// Compare first within path, then packages within each path.
-			int c = p1.getPath().toString().compareTo(p2.getPath().toString());
-			if (c == 0) {
-				// Within same path, so now sort by package, if there are any.
-				String pkg1 = p1.getPackage();
-				String pkg2 = p2.getPackage();
-				if (pkg1 == null)
-					pkg1 = "";	// For null, use an empty string //$NON-NLS-1$
-				if (pkg2 == null)
-					pkg2 = ""; //$NON-NLS-1$
-				return pkg1.compareTo(pkg2);
-			} else
-				return c;	// Paths are not equal, so sort via path.
-		}
-		return super.compare(viewer, e1, e2);
-	}	
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java
deleted file mode 100644
index bb0a838..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchPathListLabelProvider.java
+++ /dev/null
@@ -1,369 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: SearchPathListLabelProvider.java,v $
- *  $Revision: 1.9 $  $Date: 2005/05/11 22:41:35 $ 
- */
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ArchiveFileFilter;
-import org.eclipse.jdt.ui.JavaElementImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.ide.IDE;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
-
-public class SearchPathListLabelProvider extends LabelProvider {
-
-	IWorkspaceRoot fRoot;
-	IJavaProject javaProject;
-
-	// Shared images
-	private Image fJarIcon, fExtJarIcon;
-	private Image fFolderImage, fProjectImage, fVariableImage, fLibraryImage;
-	private Image fMissingJarImage, fMissingVariableImage;
-	private Image fMissingFolderImage, fMissingProjectImage;
-	private Image fPackageImage;
-
-	// Local images, will be disposed.
-	private Image fPluginImage;
-	private Image fBeanImage;
-	private Image fMissingPackageImage;
-	private Image fBlankImage;
-	private Image fMissingLibraryImage;
-	private HashMap fBeanedImages = new HashMap(); // Key of image to a composite with a bean attached
-	private HashMap fPackagedImages = new HashMap();
-	private HashMap fMissingPackagedImages = new HashMap();
-	private HashMap fNormalImages = new HashMap();	// Need to composite normal images w/blank so that they are the same size as the composited ones.
-	// Key of image to a composite with a package attached
-
-	public SearchPathListLabelProvider() {
-		this(null);
-	}
-	
-	public SearchPathListLabelProvider(IJavaProject javaProject) {
-		this.javaProject = javaProject;
-		
-		fRoot = ResourcesPlugin.getWorkspace().getRoot();
-		ImageRegistry reg = JavaPlugin.getDefault().getImageRegistry();
-
-		fJarIcon = reg.get(JavaPluginImages.IMG_OBJS_JAR);
-		fExtJarIcon = reg.get(JavaPluginImages.IMG_OBJS_EXTJAR);
-		fFolderImage = reg.get(JavaPluginImages.IMG_OBJS_PACKFRAG_ROOT);
-
-		fVariableImage = reg.get(JavaPluginImages.IMG_OBJS_ENV_VAR);
-		
-		fLibraryImage = reg.get(JavaPluginImages.IMG_OBJS_LIBRARY);
-
-		IWorkbench workbench = JavaPlugin.getDefault().getWorkbench();
-		fProjectImage = workbench.getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
-
-		fMissingJarImage = reg.get(JavaPluginImages.IMG_OBJS_MISSING_JAR);
-		fMissingVariableImage = reg.get(JavaPluginImages.IMG_OBJS_MISSING_ENV_VAR);
-		fMissingFolderImage = reg.get(JavaPluginImages.IMG_OBJS_MISSING_PACKFRAG_ROOT);
-		fMissingProjectImage = workbench.getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT_CLOSED);
-
-		fPackageImage = reg.get(JavaPluginImages.IMG_OBJS_PACKAGE);
-
-		Rectangle r = fLibraryImage.getBounds();
-		Point s = new Point(r.width, r.height);
-		JavaElementImageDescriptor jed = new JavaElementImageDescriptor(reg.getDescriptor(JavaPluginImages.IMG_OBJS_LIBRARY),  JavaElementImageDescriptor.WARNING, s);
-		fMissingLibraryImage = jed.createImage();
-		Bundle bundle = JEMUIPlugin.getPlugin().getBundle();
-		URL url = Platform.find(bundle, new Path("icons/plugin_obj.gif")); //$NON-NLS-1$
-		if (url != null)
-			fPluginImage = ImageDescriptor.createFromURL(url).createImage();
-		else
-			fPluginImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-
-		url = Platform.find(bundle, new Path("icons/javabean.gif")); //$NON-NLS-1$
-		if (url != null)
-			fBeanImage = ImageDescriptor.createFromURL(url).createImage();
-		else
-			fBeanImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-
-		url = Platform.find(bundle, new Path("icons/package_obj_missing.gif")); //$NON-NLS-1$
-		if (url != null)
-			fMissingPackageImage = ImageDescriptor.createFromURL(url).createImage();
-		else
-			fMissingPackageImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-
-		url = Platform.find(bundle, new Path("icons/blank.gif")); //$NON-NLS-1$
-		if (url != null)
-			fBlankImage = ImageDescriptor.createFromURL(url).createImage();
-		else
-			fBlankImage = ImageDescriptor.getMissingImageDescriptor().createImage();
-	}
-
-	public void setJavaProject(IJavaProject javaProject) {
-		this.javaProject = javaProject;
-	}
-	
-	public String getText(Object element) {
-		if (element instanceof BPListElement) {
-			BPListElement bpentry = (BPListElement) element;
-			IBeaninfosDocEntry docEntry = bpentry.getEntry();
-			IPath path = docEntry.getPath();
-			String pathString = null;
-			switch (docEntry.getKind()) {
-				case IClasspathEntry.CPE_LIBRARY :
-					IResource resource = fRoot.findMember(path);
-					if (resource instanceof IFolder) {
-						pathString =
-							MessageFormat.format(BeanInfoUIMessages.getString("LabelProvider.Library.Folder"), new Object[] { path.makeRelative().toString()}); //$NON-NLS-1$
-					} else if (resource instanceof IFile) {
-						if (ArchiveFileFilter.isArchivePath(path)) {
-							// Internal library
-							String[] args =
-								new String[] { path.lastSegment(), path.removeLastSegments(1).makeRelative().toString()};
-							pathString = MessageFormat.format(BeanInfoUIMessages.getString("LabelProvider.Library.(PathLastSegment,PathRelative)"), args); //$NON-NLS-1$
-						}
-					} else {
-						if (ArchiveFileFilter.isArchivePath(path)) {
-							// External library
-							String[] args =
-								new String[] { path.lastSegment(), path.removeLastSegments(1).toString()};
-							pathString = MessageFormat.format(BeanInfoUIMessages.getString("LabelProvider.Library.(PathLastSegment,PathExceptLast)"), args); //$NON-NLS-1$
-						} else {
-							// should not come here
-							pathString = path.makeRelative().toString();
-						}
-					}
-					break;
-
-				case IClasspathEntry.CPE_VARIABLE :
-					String name = path.makeRelative().toString();
-					IPath entryPath = JavaCore.getClasspathVariable(path.segment(0));
-					if (entryPath != null)
-						pathString =
-							MessageFormat.format(
-								BeanInfoUIMessages.getString("LabelProvider.Variable.(name,PathOSString)"), //$NON-NLS-1$
-								new Object[] { name, entryPath.append(path.removeFirstSegments(1)).toOSString()});
-					else
-						pathString = name;
-					break;
-
-				case IClasspathEntry.CPE_CONTAINER:
-					try {
-						IClasspathContainer c = JavaCore.getClasspathContainer(path, javaProject);
-						if (c != null) {
-							pathString = c.getDescription();
-							break;
-						}
-					} catch (JavaModelException e) {
-					}
-					pathString = path.toString();
-					break;
-					
-				case IClasspathEntry.CPE_PROJECT :
-					pathString = path.toString();
-					break;
-
-				case IClasspathEntry.CPE_SOURCE :
-					pathString = path.makeRelative().toString();
-					break;
-
-				case BeaninfoEntry.BIE_PLUGIN :
-					pathString = path.toString();
-					break;
-				default :
-					// no path, so probably a search entry within a beaninfo entry.
-			}
-
-			if (docEntry instanceof SearchpathEntry) {
-				// There could be a package involved too if this is not a project or registered var entry
-				String packageName = ((SearchpathEntry) docEntry).getPackage();
-				if (packageName != null && packageName.length() > 0)
-					if (pathString != null)
-						return MessageFormat.format(BeanInfoUIMessages.getString("LabelProvider.(packageName,Path)"), new Object[] { packageName, pathString }); //$NON-NLS-1$
-					else
-						return packageName;
-			}
-
-			if (pathString != null)
-				return pathString;
-			else
-				return "?"; //$NON-NLS-1$
-		}
-		return super.getText(element);
-	}
-
-	public Image getImage(Object element) {
-		Image returnedImage = null;
-		boolean imageIsNormal = true;	// Whether this is a normal sized image (which will need compositing with blank)
-		if (element instanceof BPListElement) {
-			BPListElement bpentry = (BPListElement) element;
-			IBeaninfosDocEntry docEntry = bpentry.getEntry();
-			IPath path = docEntry.getPath();
-			Image pathImage = null;
-			switch (docEntry.getKind()) {
-				case IClasspathEntry.CPE_SOURCE :
-					if (!bpentry.isMissing())
-						pathImage = fFolderImage;
-					else
-						pathImage = fMissingFolderImage;
-					break;
-
-				case IClasspathEntry.CPE_LIBRARY :
-					if (!bpentry.isMissing()) {
-						IResource resource = fRoot.findMember(path);
-						if (resource instanceof IFolder)
-							pathImage = fFolderImage;
-						else if (resource instanceof IFile)
-							pathImage = fJarIcon;
-						else
-							pathImage = fExtJarIcon;
-					} else
-						pathImage = fMissingJarImage;
-					break;
-
-				case IClasspathEntry.CPE_PROJECT :
-					if (!bpentry.isMissing())
-						pathImage = fProjectImage;
-					else
-						pathImage = fMissingProjectImage;
-					break;
-
-				case IClasspathEntry.CPE_VARIABLE :
-					if (!bpentry.isMissing())
-						pathImage = fVariableImage;
-					else
-						pathImage = fMissingVariableImage;
-					break;
-
-				case IClasspathEntry.CPE_CONTAINER:
-					if (!bpentry.isMissing())
-						pathImage = fLibraryImage;
-					else
-						pathImage = fMissingLibraryImage;
-					break;				
-					
-				case BeaninfoEntry.BIE_PLUGIN:
-					pathImage = fPluginImage;
-					break;
-					
-				default :
-					// probably a searchentry under beaninfo entry, no path icon to decorate.
-					break;
-			}
-
-			if (bpentry instanceof BPSearchListElement) {
-				SearchpathEntry se = (SearchpathEntry) docEntry;
-				BPSearchListElement bpse = (BPSearchListElement) bpentry;
-				if (se.getPackage() != null) {
-					if (pathImage != null) {
-						if (!bpse.isPackageMissing()) {
-							// Need to decorate with a package symbol.
-							imageIsNormal = false;
-							returnedImage = (Image) fPackagedImages.get(pathImage); // See if we've already created the image
-							if (returnedImage == null) {
-								OverlayComposite oc = new OverlayComposite(pathImage.getImageData());
-								oc.setRightExtension(fPackageImage.getImageData());
-								returnedImage = oc.createImage();
-								fPackagedImages.put(pathImage, returnedImage);
-							}
-						} else {
-							// Need to decorate with a missing package symbol.
-							imageIsNormal = false;
-							returnedImage = (Image) fMissingPackagedImages.get(pathImage); // See if we've already created the image
-							if (returnedImage == null) {
-								OverlayComposite oc = new OverlayComposite(pathImage.getImageData());
-								oc.setRightExtension(fMissingPackageImage.getImageData());
-								returnedImage = oc.createImage();
-								fMissingPackagedImages.put(pathImage, returnedImage);
-							}
-						}
-					}
-				}
-					
-				if (pathImage == null && returnedImage == null)
-					if (!bpse.isPackageMissing())
-						returnedImage = fPackageImage; // Just a package image
-					else
-						returnedImage = fMissingPackageImage;	// Just the missing package image.
-				else if (returnedImage == null)
-					returnedImage = pathImage;
-			} else {
-				if (pathImage != null) {
-					// It is a beaninfo entry, need to decorate with the bean.
-					imageIsNormal = false;
-					returnedImage = (Image) fBeanedImages.get(pathImage); // See if we've already created the image
-					if (returnedImage == null) {
-						OverlayComposite oc = new OverlayComposite(pathImage.getImageData());
-						oc.setRightExtension(fBeanImage.getImageData());
-						returnedImage = oc.createImage();
-						fBeanedImages.put(pathImage, returnedImage);
-					}
-				}
-				if (returnedImage == null)
-					returnedImage = fBeanImage; // Shouldn't occur.
-			}
-		}
-		
-		if (imageIsNormal && returnedImage != null) {
-			// We need to composite it with blank so that the result will be the same size
-			// as composited images. If this isn't done, the viewer will stretch the image
-			// to match the same size as the composited images and things will look aweful.
-			Image newReturned = (Image) fNormalImages.get(returnedImage);
-			if (newReturned == null) {
-				OverlayComposite oc = new OverlayComposite(returnedImage.getImageData());
-				oc.setRightExtension(fBlankImage.getImageData());
-				newReturned = oc.createImage();
-				fNormalImages.put(returnedImage, newReturned);
-			}
-			returnedImage = newReturned;
-		}
-		return returnedImage;
-	}
-
-	/*
-	 * @see IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-
-		fPluginImage.dispose();
-		fBeanImage.dispose();
-		fMissingPackageImage.dispose();
-		fBlankImage.dispose();
-		fMissingLibraryImage.dispose();
-		for (Iterator itr = fBeanedImages.values().iterator(); itr.hasNext();) {
-			((Image) itr.next()).dispose();
-		}
-		for (Iterator itr = fPackagedImages.values().iterator(); itr.hasNext();) {
-			((Image) itr.next()).dispose();
-		}
-		for (Iterator itr = fMissingPackagedImages.values().iterator(); itr.hasNext();) {
-			((Image) itr.next()).dispose();
-		}
-		for (Iterator itr = fNormalImages.values().iterator(); itr.hasNext();) {
-			((Image) itr.next()).dispose();
-		}		
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchpathOrderingWorkbookPage.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchpathOrderingWorkbookPage.java
deleted file mode 100644
index 7a85647..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/SearchpathOrderingWorkbookPage.java
+++ /dev/null
@@ -1,68 +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.jem.internal.beaninfo.ui;
-/*
- *  $RCSfile: SearchpathOrderingWorkbookPage.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-import java.util.List;
-
-import org.eclipse.jdt.internal.ui.util.PixelConverter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.ListDialogField;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @version 	1.0
- * @author
- */
-public class SearchpathOrderingWorkbookPage extends BuildSearchBasePage {
-	
-	private ListDialogField fSearchPathList;
-	
-	public SearchpathOrderingWorkbookPage(ListDialogField searchPathList, List interestedFieldsForEnableControl) {
-		fSearchPathList= searchPathList;
-		interestedFieldsForEnableControl.add(fSearchPathList);
-	}
-	
-	public Control getControl(Composite parent) {
-		PixelConverter converter= new PixelConverter(parent);
-		
-		Composite composite= new Composite(parent, SWT.NONE);
-		
-		LayoutUtil.doDefaultLayout(composite, new DialogField[] { fSearchPathList }, true, SWT.DEFAULT, SWT.DEFAULT);
-
-		int buttonBarWidth= converter.convertWidthInCharsToPixels(24);
-		fSearchPathList.setButtonsMinWidth(buttonBarWidth);
-					
-		return composite;
-	}
-	
-	/*
-	 * @see BuildPathBasePage#getSelection
-	 */
-	public List getSelection() {
-		return fSearchPathList.getSelectedElements();
-	}
-
-	/*
-	 * @see BuildPathBasePage#setSelection
-	 */	
-	public void setSelection(List selElements) {
-		fSearchPathList.selectElements(new StructuredSelection(selElements));
-	}		
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/VariableSelectionBlock.java b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/VariableSelectionBlock.java
deleted file mode 100644
index 90a4ddf..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/VariableSelectionBlock.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.beaninfo.ui;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.dialogs.StatusInfo;
-import org.eclipse.jdt.internal.ui.dialogs.StatusUtil;
-import org.eclipse.jdt.internal.ui.util.PixelConverter;
-import org.eclipse.jdt.internal.ui.wizards.IStatusChangeListener;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.ArchiveFileFilter;
-import org.eclipse.jdt.internal.ui.wizards.buildpaths.VariablePathDialogField.ChooseVariableDialog;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-/*
- *  $RCSfile: VariableSelectionBlock.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 23:02:54 $ 
- */
-
-public class VariableSelectionBlock {
-	
-	
-	private List fExistingPaths;
-	
-	private StringButtonDialogField fVariableField;
-	private StringButtonDialogField fExtensionField;
-	
-	private CLabel fFullPath;
-	
-	private IStatus fVariableStatus;
-	private IStatus fExistsStatus;
-	private IStatus fExtensionStatus;
-	
-	private String fVariable;
-	private IStatusChangeListener fContext;
-	
-	private boolean fIsEmptyAllowed;
-	
-	/**
-	 * Constructor for VariableSelectionBlock
-	 */
-	public VariableSelectionBlock(IStatusChangeListener context, List existingPaths, IPath varPath, String lastVarSelection, boolean emptyAllowed) {	
-		fContext= context;
-		fExistingPaths= existingPaths;
-		fIsEmptyAllowed= emptyAllowed;
-		fVariableStatus= new StatusInfo();
-		fExistsStatus= new StatusInfo();
-		
-		VariableSelectionAdapter adapter= new VariableSelectionAdapter();
-		fVariableField= new StringButtonDialogField(adapter);
-		fVariableField.setDialogFieldListener(adapter);
-		fVariableField.setLabelText(BeanInfoUIMessages.getString("VariableSelectionBlock.variable.label")); //$NON-NLS-1$
-		fVariableField.setButtonLabel(BeanInfoUIMessages.getString("VariableSelectionBlock.variable.button")); //$NON-NLS-1$
-
-		fExtensionField= new StringButtonDialogField(adapter);
-		fExtensionField.setDialogFieldListener(adapter);
-		fExtensionField.setLabelText(BeanInfoUIMessages.getString("VariableSelectionBlock.extension.label")); //$NON-NLS-1$
-		fExtensionField.setButtonLabel(BeanInfoUIMessages.getString("VariableSelectionBlock.extension.button")); //$NON-NLS-1$
-
-		if (varPath != null) {
-			fVariableField.setText(varPath.segment(0));
-			fExtensionField.setText(varPath.removeFirstSegments(1).toString());
-		} else {
-			fVariableField.setText(""); //$NON-NLS-1$
-			fExtensionField.setText(""); //$NON-NLS-1$
-		}
-		updateFullTextField();
-	}
-	
-	public IPath getVariablePath() {
-		if (fVariable != null) {
-			return new Path(fVariable).append(fExtensionField.getText());
-		}
-		return null;
-	}
-	
-	public IPath getResolvedPath() {
-		if (fVariable != null) {
-			IPath entryPath= JavaCore.getClasspathVariable(fVariable);
-			if (entryPath != null) {
-				return entryPath.append(fExtensionField.getText());
-			}
-		}
-		return null;
-	}	
-			
-	public void setFocus(Display display) {
-		fVariableField.postSetFocusOnDialogField(display);
-	}
-
-	
-	public Control createControl(Composite parent) {
-		PixelConverter converter= new PixelConverter(parent);
-		
-		int nColumns= 3;
-		
-		Composite inner= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.numColumns= nColumns;
-		inner.setLayout(layout);
-		
-		int fieldWidthHint= converter.convertWidthInCharsToPixels(50);
-		
-		fVariableField.doFillIntoGrid(inner, nColumns);
-		LayoutUtil.setWidthHint(fVariableField.getTextControl(null), fieldWidthHint);
-		LayoutUtil.setHorizontalGrabbing(fVariableField.getTextControl(null));
-		
-		fExtensionField.doFillIntoGrid(inner, nColumns);
-		LayoutUtil.setWidthHint(fExtensionField.getTextControl(null), fieldWidthHint);
-		
-		Label label= new Label(inner, SWT.LEFT);
-		label.setLayoutData(new GridData());
-		label.setText(BeanInfoUIMessages.getString("VariableSelectionBlock.fullpath.label")); //$NON-NLS-1$
-		
-		fFullPath= new CLabel(inner, SWT.NONE);
-		fFullPath.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		DialogField.createEmptySpace(inner, nColumns - 2);
-		updateFullTextField();
-		
-		setFocus(parent.getDisplay());
-		
-		return inner;
-	}
-	
-	// -------- VariableSelectionAdapter --------
-
-	private class VariableSelectionAdapter implements IDialogFieldListener, IStringButtonAdapter {
-		
-	
-		// -------- IDialogFieldListener
-		public void dialogFieldChanged(DialogField field) {
-			doFieldUpdated(field);
-		}
-		
-		// -------- IStringButtonAdapter
-		public void changeControlPressed(DialogField field) {
-			doChangeControlPressed(field);
-		}
-		
-	}
-	
-	private void doChangeControlPressed(DialogField field) {
-		if (field == fVariableField) {
-			String variable= chooseVariable();
-			if (variable != null) {
-				fVariableField.setText(variable);
-			}
-		} else if (field == fExtensionField) {
-			IPath filePath= chooseExtJar();
-			if (filePath != null) {
-				fExtensionField.setText(filePath.toString());
-			}
-		}
-	}
-	
-	private void doFieldUpdated(DialogField field) {
-		if (field == fVariableField) {
-			fVariableStatus= variableUpdated();
-		} else if (field == fExtensionField) {
-			fExtensionStatus= extensionUpdated();
-		}
-		fExistsStatus= getExistsStatus();
-		updateFullTextField();
-		
-		fContext.statusChanged(StatusUtil.getMostSevere(new IStatus[] { fVariableStatus, fExtensionStatus, fExistsStatus }));
-	}		
-	
-	private IStatus variableUpdated() {
-		fVariable= null;
-		
-		StatusInfo status= new StatusInfo();
-		String name= fVariableField.getText();
-		if (name.length() == 0) {
-			if (!fIsEmptyAllowed) {
-				status.setError(BeanInfoUIMessages.getString("VariableSelectionBlock.error.entername_ERROR_")); //$NON-NLS-1$
-			} else {
-				fVariable= ""; //$NON-NLS-1$
-			}
-		} else if (JavaCore.getClasspathVariable(name) == null) {
-			status.setError(BeanInfoUIMessages.getString("VariableSelectionBlock.error.namenotexists_ERROR_")); //$NON-NLS-1$
-		} else {
-			fVariable= name;
-		}
-		fExtensionField.enableButton(fVariable != null);
-		return status;
-	}
-	
-	private IStatus extensionUpdated() {
-		StatusInfo status= new StatusInfo();
-		String extension= fExtensionField.getText();
-		if (extension.length() > 0 && !Path.ROOT.isValidPath(extension)) {
-			status.setError(BeanInfoUIMessages.getString("VariableSelectionBlock.error.invalidextension_ERROR_")); //$NON-NLS-1$
-		}
-		return status;
-	}
-		
-	private IStatus getExistsStatus() {
-		StatusInfo status= new StatusInfo();
-		IPath path= getResolvedPath();
-		if (path != null) {
-			if (findPath(path)) {
-				status.setError(BeanInfoUIMessages.getString("VariableSelectionBlock.error.pathexists_ERROR_")); //$NON-NLS-1$
-			} else if (!path.toFile().isFile()) {
-				status.setWarning(BeanInfoUIMessages.getString("VariableSelectionBlock.warning.pathnotexists_WARN_")); //$NON-NLS-1$
-			}
-		} else {
-			status.setWarning(BeanInfoUIMessages.getString("VariableSelectionBlock.warning.pathnotexists_WARN_")); //$NON-NLS-1$
-		}
-		return status;
-	}
-	
-	private boolean findPath(IPath path) {
-		for (int i= fExistingPaths.size() -1; i >=0; i--) {
-			IPath curr= (IPath) fExistingPaths.get(i);
-			if (curr.equals(path)) {
-				return true;
-			}
-		}
-		return false;
-	}	
-
-	private void updateFullTextField() {
-		if (fFullPath != null && !fFullPath.isDisposed()) {
-			IPath resolvedPath= getResolvedPath();
-			if (resolvedPath != null) {
-				fFullPath.setText(resolvedPath.toOSString());
-			} else {
-				fFullPath.setText(""); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	private Shell getShell() {
-		if (fFullPath != null) {
-			return fFullPath.getShell();
-		}
-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-	}	
-	
-	private IPath chooseExtJar() {
-		String lastUsedPath= ""; //$NON-NLS-1$
-		IPath entryPath= getResolvedPath();
-		if (entryPath != null) {
-			if (ArchiveFileFilter.isArchivePath(entryPath)) {
-				lastUsedPath= entryPath.removeLastSegments(1).toOSString();
-			} else {
-				lastUsedPath= entryPath.toOSString();
-			}
-		}
-		
-		FileDialog dialog= new FileDialog(getShell(), SWT.SINGLE);
-		dialog.setFilterExtensions(new String[] {"*.jar;*.zip"}); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		dialog.setText(BeanInfoUIMessages.getString("VariableSelectionBlock.ExtJarDialog.title")); //$NON-NLS-1$
-		String res= dialog.open();
-		if (res == null) {
-			return null;
-		}
-		IPath resPath= new Path(res).makeAbsolute();
-		IPath varPath= JavaCore.getClasspathVariable(fVariable);
-		
-		if (!varPath.isPrefixOf(resPath)) {
-			return new Path(resPath.lastSegment());
-		} else {
-			return resPath.removeFirstSegments(varPath.segmentCount()).setDevice(null);
-		}
-	}
-
-	private String chooseVariable() {
-		ChooseVariableDialog dialog= new ChooseVariableDialog(getShell(), fVariable);
-		if (dialog.open() == Window.OK) {
-			return dialog.getSelectedVariable();
-		}
-		
-		return null;
-	}
-		
-
-}
diff --git a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/messages.properties b/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/messages.properties
deleted file mode 100644
index cd64e15..0000000
--- a/plugins/org.eclipse.jem.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/messages.properties
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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.ui/beaninfoui/org/eclipse/jem/internal/beaninfo/ui/Attic/messages.properties,v $
-# $Revision: 1.3 $  $Date: 2005/02/15 23:02:54 $
-#
-
-
-SearchPathDialog.ChoosePackages                         = &Choose Packages
-SearchPathDialog.Remove                                 = &Remove
-SearchPathDialog.Desc.Label                             = &Modify search path of packages within this BeanInfo classes JAR/folder
-SearchPathDialog.ModifySearchPaths                      = Modify Search Paths - {0}
-SearchPathDialog.NotEditable_INFO_                      = IWAV0075I Plugin type BeanInfo classes locations are not editable
-SearchPathDialog.PackagePresent_INFO_                   = IWAV0076I Package already in the search path
-SearchPathDialog.InputDialog.Title                      = Package
-SearchPathDialog.InputDialog.Message                    = &Enter a package:
-BeanInfoPathsBlock.ExportAll                            = E&xport all
-BeanInfoPathsBlock.UnexportAll                          = U&nexport all
-BeanInfoPathsBlock.Page.Tab.Packages                    = &Packages
-BeanInfoPathsBlock.Page.Tab.Classes                     = &BeanInfo classes
-BeanInfosWorkbookPage.AddFolders                        = &Add Folders
-BeanInfosWorkbookPage.AddJARs                           = Add &JARs
-BeanInfosWorkbookPage.AddExternalJAR                    = Add E&xternal JARs
-BeanInfosWorkbookPage.AddVariable                       = Add &Variable
-BeanInfosWorkbookPage.AddProjects                       = Add Projec&ts
-BeanInfosWorkbookPage.ModifyPaths                       = &Modify Paths
-BeanInfosWorkbookPage.Remove                            = &Remove
-BeanInfosWorkbookPage.List.Text                         = &Choose locations of BeanInfo classes (BeanInfo classes locations not in current project)
-BeanInfosWorkbookPage.SelectionDialog.Classes.Title     = BeanInfo Class Folders Selection
-BeanInfosWorkbookPage.SelectionDialog.JARs.Title        = JAR Selection
-BeanInfosWorkbookPage.SelectionDialog.JARs.Message      = &Choose JARs to be added as BeanInfo classes JARs
-BeanInfosWorkbookPage.SelectionDialog.ExtJARs.Text      = JAR Selection
-BeanInfosWorkbookPage.SelectionDialog.Projects.Title    = BeanInfo Projects Selection
-BeanInfosWorkbookPage.SelectionDialog.Classes.Prompt    = &Choose folders to be added as BeanInfo classes folders.
-BeanInfosWorkbookPage.SelectionDialog.Projects.Prompt   = &Choose projects to be added as BeanInfo projects.
-PackagesWorkbook.ChoosePackages                         = &Choose packages
-PackagesWorkbook.ChooseDefinedPaths                     = Choose &defined paths
-PackagesWorkbook.Remove                                 = &Remove
-PackagesWorkbook.LabelText                              = Choose BeanInfo &packages from the class path
-PackagesWorkbook.SelectionDialog.DefinedPaths.Title     = Choose Defined Paths
-PackagesWorkbook.SelectionDialog.DefinedPaths.Message   = Choose the pre-defined paths to add to the search path
-LabelProvider.Library.Folder                            = {0} (class folder)
-LabelProvider.Library.(PathLastSegment,PathRelative)    = {0} - {1}
-LabelProvider.Library.(PathLastSegment,PathExceptLast)  = {0} - {1}
-LabelProvider.Variable.(name,PathOSString)              = {0} - {1}
-LabelProvider.(packageName,Path)                        = {0}: {1}
-
-VariableSelectionBlock.variable.label                   = &Variable Name:
-VariableSelectionBlock.variable.button                  = &Browse...
-VariableSelectionBlock.extension.label                  = Path E&xtension:
-VariableSelectionBlock.extension.button                 = Bro&wse...
-VariableSelectionBlock.fullpath.label                   = Resolved Path:
-
-VariableSelectionBlock.error.entername_ERROR_           = IWAV0077E Variable name must be entered.
-VariableSelectionBlock.error.namenotexists_ERROR_       = IWAV0078E Variable does not exist.
-VariableSelectionBlock.error.pathexists_ERROR_          = IWAV0079E Class path entry already exists.
-VariableSelectionBlock.error.invalidextension_ERROR_    = IWAV0080E Extension is not a valid path.
-
-VariableSelectionBlock.warning.pathnotexists_WARN_      = IWAV0081W Resolved path is not an existing JAR file.
-
-VariableSelectionBlock.ExtJarDialog.title               = JAR Selection
-
-
-
-
-#
-# Properties for the com.ibm.etools.beaninfo.ui plugin
-#
-
-# This shows up as the title of a message dialog
-Beaninfo_UI_.errortitle                                 = Error
-
-Beaninfo_UI_.error                                      = Error while setting BeanInfo configuration.
-
-BeaninfoPropertiesPage_INFO_.nojavaproject              = IWAV0019I BeanInfo is only applicable to Java projects.
-BeaninfoPropertiesPage_INFO_.closedproject              = IWAV0020I BeanInfo is not available for a closed project.
-
-# This is a checkbox on a preference page. The label is to indicate whether introspection is enabled to run or not.
-BeaninfoPathsBlock_UI_.enablebeaninfo                   = &Enable BeanInfo Introspection on this Project
-
-# This is a header line for a page of preferences.
-BeaninfoPathsBlock_UI_.searchpath.label                 = Build BeanInfo &search path order and exported entries:\n(Exported entries are contributed to dependent projects)
-BeaninfoPathsBlock_UI_.searchpath.up.button             = &Up
-BeaninfoPathsBlock_UI_.searchpath.down.button           = &Down
-BeaninfoPathsBlock_UI_.searchpath.remove.button         = &Remove
-BeaninfoPathsBlock_UI_.serachpath.tab.order             = &Order and Export
-
-BeaninfoPathsBlock_UI_.warning.EntryMissing             = Project class path entries, or BeanInfo class files are missing.
-
-# {0} will be the package name, e.g. java.lang
-BeaninfoPathsBlock_WARN_.searchpath.missing.path.format = IWAV0021W {0} - Package path not found.
-
-# This is a message on a progress dialog.
-BeaninfoPathsBlock_UI_.searchpath.operationdescription  = Setting BeanInfo search paths...
-
-BeaninfoPathsBlock_UI_.addsearchpath.title              = Select Packages
-BeaninfoPathsBlock_UI_.addsearchpath.description        = &Select packages to add to search path:
-
-BeaninfoPathsBlock_UI_.warning.EntryMissing             = Project class path entries, or BeanInfo class files are missing.
-BeaninfoPathsBlock_UI_.searchpath.add.button            = Add Package...
diff --git a/plugins/org.eclipse.jem.ui/build.properties b/plugins/org.eclipse.jem.ui/build.properties
deleted file mode 100644
index ecc401b..0000000
--- a/plugins/org.eclipse.jem.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               ui.jar,\
-               plugin.properties,\
-               icons/,\
-               about.html,\
-               .options
-src.includes = about.html
-output.ui.jar = bin/
-source.ui.jar = ui/,\
-                beaninfoui/
diff --git a/plugins/org.eclipse.jem.ui/icons/blank.gif b/plugins/org.eclipse.jem.ui/icons/blank.gif
deleted file mode 100644
index 21f9d02..0000000
--- a/plugins/org.eclipse.jem.ui/icons/blank.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/full/ctool16/run_exc.gif b/plugins/org.eclipse.jem.ui/icons/full/ctool16/run_exc.gif
deleted file mode 100644
index 57f4102..0000000
--- a/plugins/org.eclipse.jem.ui/icons/full/ctool16/run_exc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/full/obj16/file_obj.gif b/plugins/org.eclipse.jem.ui/icons/full/obj16/file_obj.gif
deleted file mode 100644
index 061161a..0000000
--- a/plugins/org.eclipse.jem.ui/icons/full/obj16/file_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/full/wizban/run_wiz.gif b/plugins/org.eclipse.jem.ui/icons/full/wizban/run_wiz.gif
deleted file mode 100644
index e3bd462..0000000
--- a/plugins/org.eclipse.jem.ui/icons/full/wizban/run_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/javabean.gif b/plugins/org.eclipse.jem.ui/icons/javabean.gif
deleted file mode 100644
index 1885261..0000000
--- a/plugins/org.eclipse.jem.ui/icons/javabean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/package_obj_missing.gif b/plugins/org.eclipse.jem.ui/icons/package_obj_missing.gif
deleted file mode 100644
index 78d7e20..0000000
--- a/plugins/org.eclipse.jem.ui/icons/package_obj_missing.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/icons/plugin_obj.gif b/plugins/org.eclipse.jem.ui/icons/plugin_obj.gif
deleted file mode 100644
index 8493df4..0000000
--- a/plugins/org.eclipse.jem.ui/icons/plugin_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem.ui/plugin.properties b/plugins/org.eclipse.jem.ui/plugin.properties
deleted file mode 100644
index 1187c91..0000000
--- a/plugins/org.eclipse.jem.ui/plugin.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/Attic/plugin.properties,v $
-# $Revision: 1.3 $  $Date: 2005/02/15 23:03:17 $
-#
-
-
-pluginName=Java EMF Model UI
-providerName = Eclipse.org
-
-proxyLaunchGroup.label=Proxy
-
-ActionSet.proxyTools=Proxy Tools
-ActionSet.proxyTools.Description=Actions for working with Proxy and Proxy Launchers.
-Action.proxyLaunch=Proxy...
-Action.proxyLaunchTip=Proxy Launch Manager
-Action.selectDefault=Select Default Proxy Configuration...
-Action.selectDefaultTip=Select default for {0}.
-Menu.run=&Run
-
-Editors.OverrideEditor = Override Editor
-
-# This is the title of the Properties page for setting properties of BeanInfo paths.
-BeaninfoPath_Title_UI_ = BeanInfo Path
diff --git a/plugins/org.eclipse.jem.ui/plugin.xml b/plugins/org.eclipse.jem.ui/plugin.xml
deleted file mode 100644
index 937783c..0000000
--- a/plugins/org.eclipse.jem.ui/plugin.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jem.ui"
-   name="%pluginName"
-   version="1.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jem.internal.ui.core.JEMUIPlugin">
-
-   <runtime>
-      <library name="ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jem.beaninfo"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.jem.proxy"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.debug.ui"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-
-   <extension
-         point="org.eclipse.debug.ui.launchGroups">
-      <launchGroup
-            label="%proxyLaunchGroup.label"
-            bannerImage="icons/full/wizban/run_wiz.gif"
-            category="org.eclipse.jem.proxy"
-            image="icons/full/ctool16/run_exc.gif"
-            mode="run"
-            id="org.eclipse.jem.proxy">
-      </launchGroup>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            icon="icons/full/ctool16/run_exc.gif"
-            configTypeID="org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
-            id="org.eclipse.jem.proxy.launchConfigurationTypeImage.localProxy">
-      </launchConfigurationTypeImage>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
-            class="org.eclipse.jem.internal.ui.proxy.remote.LocalLaunchTabGroup"
-            id="org.eclipse.jem.ui.remote.LocalLaunchTabGroup1">
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%ActionSet.proxyTools"
-            description="%ActionSet.proxyTools.Description"
-            id="org.eclipse.jem.ui.ProxyToolsSet">
-         <menu
-               label="%Menu.run"
-               path="additions"
-               id="org.eclipse.ui.run">
-         </menu>
-         <action
-               class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchToolbarDelegate"
-               icon="icons/full/ctool16/run_exc.gif"
-               id="org.eclipse.jem.ui.proxy.ProxyLaunchToolbarDelegateAction"
-               label="%Action.proxyLaunch"
-               style="pulldown"
-               toolbarPath="org.eclipse.debug.ui.launchActionSet/proxyLaunch"
-               tooltip="%Action.proxyLaunchTip">
-         </action>
-         <action
-               label="%Action.selectDefault"
-               class="org.eclipse.jem.internal.ui.proxy.SelectDefaultConfigurationActionDelegate"
-               menubarPath="org.eclipse.ui.run/"
-               enablesFor="1"
-               id="org.eclipse.jem.ui.proxy.SelectDefaultMenuDelegateAction">
-            <enablement>
-               <or>
-                  <objectClass
-                        name="org.eclipse.core.resources.IProject">
-                  </objectClass>
-                  <objectClass
-                        name="org.eclipse.jdt.core.IJavaProject">
-                  </objectClass>
-               </or>
-            </enablement>
-         </action>
-         <action
-               label="%Action.proxyLaunch"
-               icon="icons/full/ctool16/run_exc.gif"
-               tooltip="%Action.proxyLaunchTip"
-               class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchMenuDelegate"
-               menubarPath="org.eclipse.ui.run/"
-               id="org.eclipse.jem.ui.proxy.ProxyLaunchMenuDelegateAction">
-         </action>
-      </actionSet>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
-            id="org.eclipse.jem.ui.select.default.objectcontibution">
-         <action
-               label="%Action.selectDefault"
-               class="org.eclipse.jem.internal.ui.proxy.SelectDefaultConfigurationActionDelegate"
-               enablesFor="1"
-               id="org.eclipse.jem.ui.select.object.action">
-         </action>
-         <visibility>
-            <objectState
-                  name="persistentProperty"
-                  value="org.eclipse.jem.proxy.proxyLaunchConfiguration">
-            </objectState>
-         </visibility>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.propertyPages">
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="%BeaninfoPath_Title_UI_"
-            class="org.eclipse.jem.internal.beaninfo.ui.BeaninfosPropertyPage"
-            id="BeaninfoPropertiesPage">
-         <filter
-               name="nature"
-               value="org.eclipse.jdt.core.javanature">
-         </filter>
-      </page>
-      <page
-            objectClass="org.eclipse.jdt.core.IJavaProject"
-            name="%BeaninfoPath_Title_UI_"
-            class="org.eclipse.jem.internal.beaninfo.ui.BeaninfosPropertyPage"
-            id="BeaninfoPropertiesPage">
-         <filter
-               name="nature"
-               value="org.eclipse.jdt.core.javanature">
-         </filter>
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            name="%Editors.OverrideEditor"
-            extensions="override"
-            icon="icons/full/obj16/file_obj.gif"
-            class="org.eclipse.ui.editors/org.eclipse.ui.editors.text.TextEditor"
-            contributorClass="org.eclipse.ui.editors/org.eclipse.ui.editors.text.TextEditorActionContributor"
-            id="org.eclipse.jem.beaninfo.OverrideEditor">
-      </editor>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/JEMUIPlugin.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/JEMUIPlugin.java
deleted file mode 100644
index 452cbe7..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/core/JEMUIPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JEMUIPlugin.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 23:02:35 $ 
- */
-package org.eclipse.jem.internal.ui.core;
-
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
- 
-/**
- * 
- * @since 1.0.0
- */
-public class JEMUIPlugin extends AbstractUIPlugin {
-
-	private static JEMUIPlugin PLUGIN;
-	public static final String PI_BEANINFO_UI = "org.eclipse.jem.internal.beaninfo.ui";	// Key for dialog settings.	 //$NON-NLS-1$
-	
-	/**
-	 * @param descriptor
-	 * 
-	 * @since 1.0.0
-	 */
-	public JEMUIPlugin() {
-		PLUGIN = this;
-	}
-	
-	/**
-	 * Return the plugin.
-	 * 
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	public static JEMUIPlugin getPlugin() {
-		return PLUGIN;
-	}
-	
-	private Logger logger;
-	public Logger getLogger() {
-		if (logger == null)
-			logger = EclipseLogger.getEclipseLogger(this);
-		return logger;
-	}	
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchMenuDelegate.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchMenuDelegate.java
deleted file mode 100644
index d1a7584..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchMenuDelegate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ProxyLaunchMenuDelegate.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 23:02:35 $ 
- */
-package org.eclipse.jem.internal.ui.proxy;
-
-import org.eclipse.debug.ui.actions.OpenLaunchDialogAction;
-
-import org.eclipse.jem.internal.proxy.core.IProxyConstants;
- 
-/**
- * Menu delegate to launch the Proxy Launch Manager.
- * @since 1.0.0
- */
-public class ProxyLaunchMenuDelegate extends OpenLaunchDialogAction {
-	
-	public ProxyLaunchMenuDelegate() {
-		super(IProxyConstants.ID_PROXY_LAUNCH_GROUP);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchToolbarDelegate.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchToolbarDelegate.java
deleted file mode 100644
index 127a975..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyLaunchToolbarDelegate.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ProxyLaunchToolbarDelegate.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 23:02:35 $ 
- */
-package org.eclipse.jem.internal.ui.proxy;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
- 
-/**
- * The toolbar delegate for proxy launch.
- * @since 1.0.0
- */
-public class ProxyLaunchToolbarDelegate implements IWorkbenchWindowPulldownDelegate2 {
-
-	private Menu menu;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate2#getMenu(org.eclipse.swt.widgets.Menu)
-	 */
-	public Menu getMenu(Menu parent) {
-		setMenu(new Menu(parent));
-		fillMenu(menu);
-		return menu;
-	}
-	
-	private void setMenu(Menu menu) {
-		if (this.menu != null) {
-			this.menu.dispose();
-		}
-		this.menu = menu;
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate#getMenu(org.eclipse.swt.widgets.Control)
-	 */
-	public Menu getMenu(Control parent) {
-		setMenu(new Menu(parent));
-		fillMenu(menu);
-		return menu;
-	}
-	
-	private void fillMenu(Menu menu) {
-		addToMenu(menu, proxyLaunchDelegate, -1);	
-		addToMenu(menu, selectDelegate, -1);
-	}
-	
-	/**
-	 * Adds the given action to the specified menu with an accelerator specified
-	 * by the given number.
-	 * 
-	 * @param menu the menu to add the action to
-	 * @param action the action to add
-	 * @param accelerator the number that should appear as an accelerator
-	 */
-	protected void addToMenu(Menu menu, IAction action, int accelerator) {
-		StringBuffer label= new StringBuffer();
-		if (accelerator >= 0 && accelerator < 10) {
-			//add the numerical accelerator
-			label.append('&');
-			label.append(accelerator);
-			label.append(' ');
-		}
-		label.append(action.getText());
-		action.setText(label.toString());
-		ActionContributionItem item= new ActionContributionItem(action);
-		item.fill(menu, -1);
-	}	
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-		setMenu(null);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		selectDelegate.init(window);
-	}
-
-	protected SelectDefaultConfigurationActionDelegate selectDelegate = new SelectDefaultConfigurationActionDelegate();
-	protected ProxyLaunchMenuDelegate proxyLaunchDelegate = new ProxyLaunchMenuDelegate();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (selectDelegate.isEnabled())
-			selectDelegate.run(action);
-		else
-			proxyLaunchDelegate.run(action);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		selectDelegate.selectionChanged(null, selection);
-		if (selectDelegate.isEnabled())
-			action.setToolTipText(selectDelegate.getToolTipText());
-		else
-			action.setToolTipText(Platform.getResourceString(JEMUIPlugin.getPlugin().getBundle(), "%Action.proxyLaunchTip")); //$NON-NLS-1$
-			
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyUIMessages.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyUIMessages.java
deleted file mode 100644
index d080698..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/ProxyUIMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ProxyUIMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 23:02:35 $ 
- */
-package org.eclipse.jem.internal.ui.proxy;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
- 
-/**
- * Message for Proxy Remote UI
- * 
- * @since 1.0.0
- */
-public class ProxyUIMessages {
-
-	private static final String BUNDLE_NAME =
-		"org.eclipse.jem.internal.ui.proxy.messages";	//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private ProxyUIMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/SelectDefaultConfigurationActionDelegate.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/SelectDefaultConfigurationActionDelegate.java
deleted file mode 100644
index c17caac..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/SelectDefaultConfigurationActionDelegate.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: SelectDefaultConfigurationActionDelegate.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:02:35 $ 
- */
-package org.eclipse.jem.internal.ui.proxy;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.*;
-import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.ui.core.JEMUIPlugin;
- 
-/**
- * 
- * @since 1.0.0
- */
-public class SelectDefaultConfigurationActionDelegate extends Action implements IWorkbenchWindowActionDelegate, IObjectActionDelegate {
-	
-
-	/**
-	 * Helper to get single selected java project out of selection.
-	 * Used by ProxyLaunchToolbarDelegate too.
-	 * 
-	 * @param selection
-	 * @return
-	 * 
-	 * @since 1.0.0
-	 */
-	protected static IJavaProject getSelectedJavaProject(ISelection selection) {
-		if (selection.isEmpty() || !(selection instanceof IStructuredSelection) || ((IStructuredSelection) selection).size() > 1)
-			return null;	// Can't handle it.
-		else {
-			Object sel = ((IStructuredSelection) selection).getFirstElement();
-			if (sel instanceof IProject && ((IProject) sel).isOpen()) {
-				return JavaCore.create((IProject) sel);	// Will return null if not exist.
-			} else if (sel instanceof IJavaProject && ((IJavaProject) sel).isOpen())
-				return (IJavaProject) sel;
-			else
-				return null;
-		}
-	}
-	
-	/**
-	 * 
-	 * 
-	 * @since 1.0.0
-	 */
-	public SelectDefaultConfigurationActionDelegate() {
-		super(Platform.getResourceString(JEMUIPlugin.getPlugin().getBundle(), "%Action.selectDefault")); //$NON-NLS-1$
-		setEnabled(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
-	public void dispose() {
-	}
-
-	private IWorkbenchWindow window;
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run()
-	 */
-	public void run() {
-		selectDialog();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		run();
-	}	
-
-	protected IJavaProject javaproject;
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		javaproject = getSelectedJavaProject(selection);
-		try {
-			setEnabled(
-				javaproject != null
-					&& javaproject.getProject().getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION) != null);
-		} catch (Exception e) {
-			setEnabled(false);	// Some error, so not enabled.
-		}
-		if (action != null)			
-			action.setEnabled(isEnabled());
-		if (javaproject != null)
-			setToolTipText(MessageFormat.format(Platform.getResourceString(JEMUIPlugin.getPlugin().getBundle(), "%Action.selectDefaultTip"), new Object[] {javaproject.getElementName()})); //$NON-NLS-1$
-		else
-			setToolTipText(getText());
-	}
-	
-	private static final Object[] EMPTY = new Object[0];
-	protected void selectDialog() {
-		try {
-			ILabelProvider labelProvider = DebugUITools.newDebugModelPresentation();
-			
-			CheckedTreeSelectionDialog dialog = new CheckedTreeSelectionDialog(window.getShell(), labelProvider, new ITreeContentProvider() {
-				public Object[] getChildren(Object parentElement) {
-					return EMPTY;
-				}
-
-				public Object getParent(Object element) {
-					return null;
-				}
-
-				public boolean hasChildren(Object element) {
-					return false;
-				}
-
-				public Object[] getElements(Object inputElement) {
-					if (inputElement != null && inputElement instanceof Object[])
-						return (Object[]) inputElement;
-					else 
-						return null;
-				}
-
-				public void dispose() {
-				}
-
-				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-				}
-			}) {
-				protected CheckboxTreeViewer createTreeViewer(Composite parent) {
-					final CheckboxTreeViewer treeViewer = super.createTreeViewer(parent);
-					treeViewer.addCheckStateListener(new ICheckStateListener() {
-						boolean processingCheck = false;
-						public void checkStateChanged(CheckStateChangedEvent event) {
-							if (!processingCheck) {
-								try {
-									processingCheck = true;
-									if (event.getChecked()) {
-										// We are checking something, make sure old one unchecked.
-										Object[] checked = treeViewer.getCheckedElements();
-										for (int i = 0; i < checked.length; i++) {
-											if (checked[i] != event.getElement())
-												treeViewer.setChecked(checked[i], false);
-										}
-									}
-								} finally {
-									processingCheck = false;
-								}
-							}
-
-						}
-					});
-					return treeViewer;
-				}
-				
-				protected Composite createSelectionButtons(Composite composite) {
-					return new Composite(composite, SWT.NONE);	// We don't want selection buttons since only one can be selected at a time.
-				}
-			};
-			dialog.setTitle(ProxyUIMessages.getString("Select.title")); //$NON-NLS-1$	
-			dialog.setMessage(MessageFormat.format(ProxyUIMessages.getString("Select.message"), new Object[] { javaproject.getElementName()})); //$NON-NLS-1$			
-
-			ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
-			List configsList = new ArrayList(configs.length+1);
-			String jpName = javaproject.getElementName();
-			for (int i = 0; i < configs.length; i++) {
-				if (IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configs[i].getCategory()) && !configs[i].getAttribute(IDebugUIConstants.ATTR_PRIVATE, false) && jpName.equals(configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "")))
-					configsList.add(configs[i]);
-			}
-			configs = (ILaunchConfiguration[]) configsList.toArray(new ILaunchConfiguration[configsList.size()]);
-			dialog.setInput(configs);
-
-			String launchName = javaproject.getProject().getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION);
-			ILaunchConfiguration config = null;
-			if (launchName != null) {
-				for (int i = 0; i < configs.length; i++) {
-					if (configs[i].getName().equals(launchName)) {
-						config = configs[i];
-						break;
-					}
-				}
-				if (config != null) {
-					dialog.setInitialSelections(new Object[] { config });
-				}
-			}
-			if (dialog.open() == Window.OK) {
-				config = (ILaunchConfiguration) dialog.getFirstResult();
-				if (config != null)
-					javaproject.getProject().setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, config.getName());
-				else
-					javaproject.getProject().setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, ProxyLaunchSupport.NOT_SET);
-			} 
-			
-		} catch (CoreException e) {
-			ErrorDialog.openError(window.getShell(), null, null, e.getStatus());
-			ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
-		}					
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		// This is called instead of init(WorkbenchWindow) when this is on popup menu.
-		window = targetPart.getSite().getWorkbenchWindow();
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/messages.properties b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/messages.properties
deleted file mode 100644
index a0984c0..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/messages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/Attic/messages.properties,v $
-# $Revision: 1.3 $  $Date: 2005/02/15 23:02:35 $
-#
-
-Select.title=Select Default
-Select.message=Select default configuration for project "{0}":
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java
deleted file mode 100644
index 09a050e..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchProjectTab.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: LocalLaunchProjectTab.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 23:02:35 $ 
- */
-package org.eclipse.jem.internal.ui.proxy.remote;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.internal.debug.ui.launcher.JavaLaunchConfigurationTab;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.ide.IDE;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
- 
-/**
- * 
- * @since 1.0.0
- */
-public class LocalLaunchProjectTab extends JavaLaunchConfigurationTab {
-		
-	// Project UI widgets
-	protected Label fProjLabel;
-	protected Text fProjText;
-	protected Button fProjButton;
-			
-	
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(Composite)
-	 */
-	public void createControl(Composite parent) {
-		Font font = parent.getFont();
-		
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		GridLayout topLayout = new GridLayout();
-		comp.setLayout(topLayout);		
-		GridData gd;
-		
-		createVerticalSpacer(comp, 1);
-		
-		Composite projComp = new Composite(comp, SWT.NONE);
-		GridLayout projLayout = new GridLayout();
-		projLayout.numColumns = 2;
-		projLayout.marginHeight = 0;
-		projLayout.marginWidth = 0;
-		projComp.setLayout(projLayout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		projComp.setLayoutData(gd);
-		projComp.setFont(font);
-		
-		fProjLabel = new Label(projComp, SWT.NONE);
-		fProjLabel.setText(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.Project")); //$NON-NLS-1$
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		fProjLabel.setLayoutData(gd);
-		fProjLabel.setFont(font);
-		
-		fProjText = new Text(projComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		fProjText.setLayoutData(gd);
-		fProjText.setFont(font);
-		fProjText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent evt) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		fProjButton = createPushButton(projComp, ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.Browse"), null); //$NON-NLS-1$
-		fProjButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				handleProjectButtonSelected();
-			}
-		});
-				
-	}
-		
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration config) {
-		updateProjectFromConfig(config);
-	}
-	
-	protected void updateProjectFromConfig(ILaunchConfiguration config) {
-		String projectName = ""; //$NON-NLS-1$
-		try {
-			projectName = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");	
-		} catch (CoreException ce) {
-			ProxyPlugin.getPlugin().getLogger().log(ce);
-		}
-		fProjText.setText(projectName);
-	}
-			
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy config) {
-		config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, fProjText.getText());		
-	}
-			
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
-	 */
-	public void dispose() {
-	}
-			
-		
-	/**
-	 * Show a dialog that lets the user select a project.  This in turn provides
-	 * context for the main type, allowing the user to key a main type name, or
-	 * constraining the search for main types to the specified project.
-	 */
-	protected void handleProjectButtonSelected() {
-		IJavaProject project = chooseJavaProject();
-		if (project == null) {
-			return;
-		}
-		
-		String projectName = project.getElementName();
-		fProjText.setText(projectName);		
-	}
-	
-	/**
-	 * Realize a Java Project selection dialog and return the first selected project,
-	 * or null if there was none.
-	 */
-	protected IJavaProject chooseJavaProject() {
-		IJavaProject[] projects;
-		try {
-			projects= JavaCore.create(getWorkspaceRoot()).getJavaProjects();
-		} catch (JavaModelException e) {
-			ProxyPlugin.getPlugin().getLogger().log(e);
-			projects= new IJavaProject[0];
-		}
-		
-		ILabelProvider labelProvider= new JavaElementLabelProvider(JavaElementLabelProvider.SHOW_DEFAULT);
-		ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setTitle(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.Project_Selection")); //$NON-NLS-1$
-		dialog.setMessage(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ChooseProject")); //$NON-NLS-1$
-		dialog.setElements(projects);
-		
-		IJavaProject javaProject = getJavaProject();
-		if (javaProject != null) {
-			dialog.setInitialSelections(new Object[] { javaProject });
-		}
-		if (dialog.open() == Window.OK) {			
-			return (IJavaProject) dialog.getFirstResult();
-		}			
-		return null;		
-	}
-	
-	/**
-	 * Return the IJavaProject corresponding to the project name in the project name
-	 * text field, or null if the text does not match a project name.
-	 */
-	protected IJavaProject getJavaProject() {
-		String projectName = fProjText.getText().trim();
-		if (projectName.length() < 1) {
-			return null;
-		}
-		return getJavaModel().getJavaProject(projectName);		
-	}
-	
-	/**
-	 * Convenience method to get the workspace root.
-	 */
-	private IWorkspaceRoot getWorkspaceRoot() {
-		return ResourcesPlugin.getWorkspace().getRoot();
-	}
-	
-	/**
-	 * Convenience method to get access to the java model.
-	 */
-	private IJavaModel getJavaModel() {
-		return JavaCore.create(getWorkspaceRoot());
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-		
-		String name = fProjText.getText().trim();
-		if (name.length() > 0) {
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			IStatus status = workspace.validateName(name, IResource.PROJECT);
-			if (status.isOK()) {
-				IProject project= ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-				if (!project.exists()) {
-					setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectNotExist_ERROR_"), new String[] {name})); //$NON-NLS-1$
-					return false;
-				}
-				if (!project.isOpen()) {
-					setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectNotOpen_ERROR_"), new String[] {name})); //$NON-NLS-1$
-					return false;
-				}
-			} else {
-				setErrorMessage(MessageFormat.format(ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.ProjectValidateError_ERROR_"), new String[]{status.getMessage()})); //$NON-NLS-1$
-				return false;
-			}
-		}
-		
-		return false;	// Kludge. We always return false so that "Run" button is never enabled. We can't launch these configurations using the standard way. Only through ProxyLaunchSupport.
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		IJavaElement javaElement = getContext();
-		if (javaElement != null) {
-			initializeJavaProject(javaElement, config);
-		} else {
-			// We set empty attributes for project so that when one config is
-			// compared to another, the existence of empty attributes doesn't cause an
-			// incorrect result (the performApply() method can result in empty values
-			// for these attributes being set on a config if there is nothing in the
-			// corresponding text boxes)
-			config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, ""); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return ProxyRemoteUIMessages.getString("LocalLaunchProjectTab.name"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchTabGroup.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchTabGroup.java
deleted file mode 100644
index 4f4d3b2..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/LocalLaunchTabGroup.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: LocalLaunchTabGroup.java,v $ $Revision: 1.4 $ $Date: 2005/02/15 23:02:35 $
- */
-package org.eclipse.jem.internal.ui.proxy.remote;
-
-import org.eclipse.debug.ui.*;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.*;
-
-/**
- * Launch Tab Group for the Local Launch of a Remote Proxy Configuration.
- * 
- * @since 1.0.0
- */
-public class LocalLaunchTabGroup extends AbstractLaunchConfigurationTabGroup {
-
-	/**
-	 * Constructs a new Java applet tab group.
-	 */
-	public LocalLaunchTabGroup() {
-	}
-
-	/*
-	 * @see ILaunchConfigurationTabGroup#createTabs(ILaunchConfigurationDialog, String)
-	 */
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs =
-			new ILaunchConfigurationTab[] {
-				new LocalLaunchProjectTab(),
-				new JavaArgumentsTab(),
-				new JavaJRETab(),
-				new JavaClasspathTab(),
-				new SourceLookupTab(),	// TODO Need to see why SourceLookupTab didn't work. Until then use this.
-				new EnvironmentTab(),
-				new CommonTab()};
-		setTabs(tabs);
-	}
-
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/ProxyRemoteUIMessages.java b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/ProxyRemoteUIMessages.java
deleted file mode 100644
index bec8b8d..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/ProxyRemoteUIMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ProxyRemoteUIMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 23:02:35 $ 
- */
-package org.eclipse.jem.internal.ui.proxy.remote;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
- 
-/**
- * Message for Proxy Remote UI
- * 
- * @since 1.0.0
- */
-public class ProxyRemoteUIMessages {
-
-	private static final String BUNDLE_NAME =
-		"org.eclipse.jem.internal.ui.proxy.remote.messages";	//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE =
-		ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private ProxyRemoteUIMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties b/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties
deleted file mode 100644
index d77b023..0000000
--- a/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.ui/ui/org/eclipse/jem/internal/ui/proxy/remote/Attic/messages.properties,v $
-# $Revision: 1.6 $  $Date: 2005/04/06 18:03:40 $
-#
-
-LocalLaunchProjectTab.name                        = &Project
-LocalLaunchProjectTab.Project                     = &Project
-LocalLaunchProjectTab.Browse                      = &Browse...
-LocalLaunchProjectTab.Project_Selection           = Project Selection
-LocalLaunchProjectTab.ChooseProject               = Choose a &project to for the launch:
-LocalLaunchProjectTab.ProjectNotExist_ERROR_      = IWAV0174E Project "{0}" doesn''t exist.
-LocalLaunchProjectTab.ProjectNotOpen_ERROR_       = IWAV0175E Project "{0}" is not open.
-LocalLaunchProjectTab.ProjectValidateError_ERROR_ = IWAV0176E Project validation error. Msg is "{0}."
diff --git a/plugins/org.eclipse.jem.workbench/.classpath b/plugins/org.eclipse.jem.workbench/.classpath
deleted file mode 100644
index 7682dad..0000000
--- 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.pde.core.requiredPlugins"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <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 60463af..0000000
--- 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 81862bd..0000000
--- a/plugins/org.eclipse.jem.workbench/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem.workbench</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.emf.ecore.xmi</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>org.eclipse.jem</project>
-		<project>org.eclipse.jem.proxy</project>
-	</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.jdt.core.prefs b/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9080e5..0000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,282 +0,0 @@
-#Wed May 11 18:32:12 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.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=ignore
-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.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_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_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_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_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_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_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
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 4cff627..0000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed May 11 16:20:15 EDT 2005
-eclipse.preferences.version=1
-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/about.html b/plugins/org.eclipse.jem.workbench/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jem.workbench/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</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 0692b98..0000000
--- a/plugins/org.eclipse.jem.workbench/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.workbench.jar = workbench/
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               workbench.jar,\
-               about.html
-src.includes = about.html
-
diff --git a/plugins/org.eclipse.jem.workbench/plugin.properties b/plugins/org.eclipse.jem.workbench/plugin.properties
deleted file mode 100644
index 926798e..0000000
--- a/plugins/org.eclipse.jem.workbench/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.workbench/plugin.properties,v $
-# $Revision: 1.4 $  $Date: 2005/02/15 23:10:04 $
-#
-
-
-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 6483e5e..0000000
--- a/plugins/org.eclipse.jem.workbench/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jem.workbench"
-   name="%pluginName"
-   version="1.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jem.internal.plugin.JavaPlugin">
-
-   <runtime>
-      <library name="workbench.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.jem"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.jem.proxy"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jem.util"/>
-   </requires>
-
-
-   <extension
-         id="JavaEMFNature"
-         name="%JavaEMFNatureName"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-               class="org.eclipse.jem.internal.plugin.JavaEMFNature">
-         </run>
-      </runtime>
-   </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 5d0c1ab..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java
+++ /dev/null
@@ -1,336 +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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JDOMAdaptor.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:09:27 $ 
- */
-
-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.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.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.
-	}
-	/**
-	 * 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.
-	 *
-	 */
-	public static String signatureToString(String signature) throws IllegalArgumentException {
-		boolean hasDollar = (signature.indexOf(Signature.C_DOLLAR) != -1);
-		String result = Signature.toString(signature);
-		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 8be329a..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMClassFinder.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jem.internal.adapters.jdom;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: JDOMClassFinder.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 23:09:27 $ 
- */
-
-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 75175de..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package org.eclipse.jem.internal.adapters.jdom;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: JDOMSearchHelper.java,v $
- *  $Revision: 1.4 $  $Date: 2005/05/11 19:01:23 $ 
- */
-
-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.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 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) {
-					int index = resolvedName.lastIndexOf('$'); //$NON-NLS-1$
-					if (index > -1)
-						return ((IType) found).getType(resolvedName.substring(index + 1, resolvedName.length()));
-					else
-						return (IType) found;
-				}
-		} 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$ = "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 e2262b9..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaClassJDOMAdaptor.java
+++ /dev/null
@@ -1,626 +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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaClassJDOMAdaptor.java,v $
- *  $Revision: 1.15 $  $Date: 2005/02/15 23:09:27 $ 
- */
-
-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.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";
-	public static final String REFLECT_METHODS = "Reflect all JDOM methods for a class";
-	public static final String REFLECT_FIELDS = "Reflect all JDOM fields for a class";
-	
-	
-	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;
-	}
-	/**
-	 * Clear the reflected values.
-	 */
-	protected boolean flushReflectedValues(boolean clearCachedModelObject) {
-		if (clearCachedModelObject)
-			setSourceType(null);
-		typeResolutionCache.clear();
-		flushModifiers();
-		flushSuper();
-		flushImplements();
-		if (clearCachedModelObject) {
-			// 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();
-		return true;
-	}
-
-	/**
-	 * @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().getESuperTypesGen();
-		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) {
-			JavaClassImpl javaClass = (JavaClassImpl) getTarget();
-			sourceType = JDOMSearchHelper.findType(javaClass.getJavaPackage().getName(), javaClass.primGetName(), getSourceProject());
-		}
-		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() {
-		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();
-					//addImports();
-					if (isHeadless) {
-						registerWithFactory();
-						return true;
-					}
-				}
-			} finally {
-				TimerTests.basicTest.stopCumulativeStep(REFLECT_CLASS);
-			}
-		}
-		if (isHeadless)
-			return false;
-		else {
-			registerWithFactory();
-			return true;
-		}
-	}
-	
-	
-	/**
-	 * @return
-	 */
-	private boolean canReflect() {
-		return 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++) {
-				ref = reflectJavaClass(interfaceNames[i]);
-				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;
-		try {
-			if (!getSourceType().isInterface()) {
-				superName = getSourceType().getSuperclassName();
-				//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();
-					javaClassTarget.setSupertype(reflectJavaClass(superName));
-				}
-			}
-		} catch (JavaModelException npe) {
-		}
-	}
-	/**
-	 * 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);
-			}
-		}
-	}
-}
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 54b9261..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaFieldJDOMAdaptor.java
+++ /dev/null
@@ -1,292 +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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaFieldJDOMAdaptor.java,v $
- *  $Revision: 1.9 $  $Date: 2005/05/11 22:41:11 $ 
- */
-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.jdt.internal.core.JavaElement;
-
-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.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 = ((JavaElement) getSourceField()).getOpenableParent();
-		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) {
-						// 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 (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 d1928d3..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaJDOMAdapterFactory.java
+++ /dev/null
@@ -1,233 +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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaJDOMAdapterFactory.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 23:09:27 $ 
- */
-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();
-				if (filterFoundTypes && adaptor.sourceType != null)
-					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 = (ReflectionAdaptor) 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 41f86b9..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaMethodJDOMAdaptor.java
+++ /dev/null
@@ -1,364 +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
- *******************************************************************************/
-/*
- *  $RCSfile: JavaMethodJDOMAdaptor.java,v $
- *  $Revision: 1.10 $  $Date: 2005/02/15 23:09: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.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";
-
-	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();
-			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 (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;
-	}
-}
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 23ea4e8..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java
+++ /dev/null
@@ -1,275 +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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaModelListener.java,v $
- *  $Revision: 1.7 $  $Date: 2005/05/11 22:41:12 $ 
- */
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-
-/**
- * Insert the type's description here.
- * Creation date: (10/31/2000 1:13:12 PM)
- * @author: Administrator
- */
-public abstract class JavaModelListener implements IElementChangedListener {
-	
-/**
- * JavaModelListener constructor comment.
- */
-public JavaModelListener() {
-	this(ElementChangedEvent.POST_CHANGE);
-}
-
-public JavaModelListener(int eventsToListen) {
-	JavaCore.addElementChangedListener(this, eventsToListen);
-}
-/**
- * One or more attributes of one or more elements maintained by
- * the Java model have changed. The specific details of the change
- * are described by the given <code>ElementChangedEvent</code>.
- *
- * @see ElementChangedEvent
- */
-public void elementChanged(ElementChangedEvent event) {
-	processDelta((IJavaElementDelta) event.getSource());
-}
-/**
- * Generically dispatch the children of the delta.
- *
- */
-protected void processChildren(IJavaElement element, IJavaElementDelta delta) {
-	IJavaElementDelta[] children = delta.getAffectedChildren();
-	for (int i = 0; i < children.length; i++) {
-		processDelta(children[i]);
-	}
-}
-/**
- * Source context has been changed.
- * Creation date: (8/17/2001 3:58:31 PM)
- * @param param org.eclipse.jdt.core.IJavaElementDelta
- */
-protected void processContentChanged(IJavaElementDelta delta) {
-	  // override to implement specific behavior
-}
-/**
- * Dispatch the detailed handling of an element changed event.
- *
- * @see ElementChangedEvent
- */
-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 
-	}	
-}
-/**
- * Handle the change for a single element, children will be handled separately.
- *
- */
-protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
-	// override to implement specific behavior
-}
-/**
- * Handle the change for a single element, children will be handled separately.
- *
- */
-protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
-	processChildren(element, delta);
-}
-/**
- * Handle the change for a single element, children will be handled separately.
- *
- */
-protected void processJavaElementChanged(IJavaModel element, IJavaElementDelta delta) {
-	processChildren(element, delta);
-}
-/**
- * Handle the change for a single element, children will be handled separately.
- *
- */
-protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
-	processChildren(element, delta);
-}
-/**
- * Handle the change for a single element, children will be handled separately.
- *
- */
-protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
-	processChildren(element, delta);
-}
-/**
- * Handle the change for a single element, children will be handled separately.
- *
- */
-protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
-	processChildren(element, delta);
-}
-/**
- * Handle the change for a single element, children will be handled separately.
- *
- */
-protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
-	// override to implement specific behavior
-}
-
-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));
-}
-
-/**
- * Method isClasspathResourceChange.
- * @param delta
- * @return boolean
- */
-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;
-}
-
-/**
- * Is this path also a classpath change type of resource. If so, return true.
- * Subclasses may override. Default is false.
- * @param path
- * @return
- * 
- * @since 1.0.0
- */
-protected boolean isAlsoClasspathChange(IPath path) {
-	return false;
-}
-
-/**
- * This method will check to see if a <code>javaProject</code> is a project in the
- * classpath of the adapterFactory java project.
- */
-protected boolean isInClasspath(IJavaProject javaProject) {
-	IJavaProject adapterJavaProject = getJavaProject();
-	if (javaProject.equals(adapterJavaProject))
-		return true;
-	return isInClasspath(javaProject, adapterJavaProject, true, new HashSet());
-}
-
-/**
- * Get the java project that we are interested in.
- * @return
- * 
- * @since 1.0.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.
- * TODO This should be made private.
- */
-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;
-	}
-	IClasspathEntry entry, resEntry;
-	IJavaProject proj = null;
-	List projects = null;
-	for (int i = 0; i < entries.length; i++) {
-		entry = entries[i];
-		if (entry.getEntryKind() == IClasspathEntry.CPE_PROJECT) {
-			resEntry = JavaCore.getResolvedClasspathEntry(entry);
-			proj = getJavaProject(entry);
-			if (isFirstLevel || resEntry.isExported()) {
-				if (proj.equals(testProject))
-					return true;
-				else {
-					if (projects == null)
-						projects = new ArrayList();
-					projects.add(proj);
-				}
-			}
-		}
-	}
-	return isInClasspath(testProject, projects, false, visited);
-}
-
-/*
- * 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.
- * TODO This should be made private.
- */
-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;
-}
-
-protected IJavaProject getJavaProject(IClasspathEntry entry) {
-	IProject proj = getWorkspaceRoot().getProject(entry.getPath().segment(0));
-	if (proj != null)
-		return JavaCore.create(proj);
-	return null;
-}
-
-protected IWorkspaceRoot getWorkspaceRoot() {
-	return ResourcesPlugin.getWorkspace().getRoot();
-}
-}
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 706f48d..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaReflectionSynchronizer.java
+++ /dev/null
@@ -1,322 +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.jem.internal.adapters.jdom;
-/*
- *  $RCSfile: JavaReflectionSynchronizer.java,v $
- *  $Revision: 1.11 $  $Date: 2005/05/13 15:09:15 $ 
- */
-
-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;
-
-/**
- * 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, true));
-	}
-	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) {
-				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 : {
-				if (delta.getAffectedChildren().length == 0)
-					flushPackage(delta.getElement().getElementName(), true);
-				break;
-			}
-			case IJavaElementDelta.REMOVED :{
-				if (delta.getAffectedChildren().length == 0)
-					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(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 b8bb088..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/IJavaProjectInfo.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.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 6f2180e..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
+++ /dev/null
@@ -1,176 +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.jem.internal.plugin;
-/*
- * $RCSfile: JavaEMFNature.java,v $ $Revision: 1.11 $ $Date: 2005/05/13 14:16:40 $
- */
-
-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.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-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.JemProjectUtilities;
-
-public class JavaEMFNature extends EMFNature {
-	public static final String NATURE_ID = "org.eclipse.jem.workbench.JavaEMFNature";
-/**
- * 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))
-		addNatureToProject(project, NATURE_ID);
-
-	return getRuntime(project);
-}
-
-/**
- * Return the nature's ID.
- */
-public java.lang.String getNatureID() {
-	return 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(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(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(JavaXMIFactoryImpl.SCHEME, JavaXMIFactoryImpl.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
-	if (!factories.isEmpty()) {
-		AdapterFactory factory = EcoreUtil.getAdapterFactory(factories, ReadAdaptor.TYPE_KEY);
-		if (factory != null)
-			factories.remove(factory);
-	}
-	// This should maybe be considered a logic error, but we can recover easily
-	factories.add(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 50fe044..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
+++ /dev/null
@@ -1,67 +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.jem.internal.plugin;
-/*
- * $RCSfile: JavaPlugin.java,v $ $Revision: 1.8 $ $Date: 2005/02/15 23:09:27 $
- */
-
-import org.eclipse.core.runtime.*;
-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.impl.JavaRefFactoryImpl;
-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);
-		JavaRefFactoryImpl.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 55be058..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaProjectInfo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jem.internal.plugin;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: JavaProjectInfo.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 23:09:27 $ 
- */
-/**
- * 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 c97d06c..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ASTBoundResolver.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ASTBoundResolver.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 23:09:27 $ 
- */
-package org.eclipse.jem.workbench.utility;
-
-import org.eclipse.jdt.core.dom.*;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.Type;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTName;
-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("Not sure how to handle yet local field access of \""+variableBinding.getName()+"\"");
-//						push(new PushFieldVariable(variableId, getTypeSignature(declaringTypeBinding), fCounter));
-//						push(new PushThis(getEnclosingLevel(node, declaringTypeBinding)));
-//						storeInstruction();
-					}
-				} else {
-					throwInvalidExpressionException("Not sure how to handle yet local variable access of \""+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/JemProjectUtilities.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java
deleted file mode 100644
index 8b12792..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java
+++ /dev/null
@@ -1,724 +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.jem.workbench.utility;
-/*
- * $RCSfile: JemProjectUtilities.java,v $ $Revision: 1.7 $ $Date: 2005/05/13 14:16:40 $
- */
-
-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.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.plugin.JEMUtilPlugin;
-
-/**
- * Project Utilities for JEM and Java.
- * 
- * @since 1.1.0
- */
-public class JemProjectUtilities extends ProjectUtilities {
-	
-	private JemProjectUtilities(){
-	}
-
-	/**
-	 * 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()) {
-			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 3d93d08..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/NoASTResolver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: NoASTResolver.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 23:09:27 $ 
- */
-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 822692e..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseTreeCreationFromAST.java,v $
- *  $Revision: 1.11 $  $Date: 2005/02/15 23:09:27 $ 
- */
-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.jdt.core.dom.Expression;
-
-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 {
-		
-		/**
-		 * @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.getString("ParseTreeCreationFromAST.0"), new Object[] {e.getLocalizedMessage(), astExpression.toString()}); //$NON-NLS-1$
-			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.getString("ParseTreeCreationFromAST.ExpressionTooComplicated_EXC_"), new Object[] {astExpression.toString()})); //$NON-NLS-1$
-			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) {
-			throw new InvalidExpressionException(WorkbenchUtilityMessages.getString("ParseTreeCreationFromAST.CannotProcessAnonymousDeclarations_EXC_")); //$NON-NLS-1$
-		}
-		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.
-		cic.setType(node.getAST().apiLevel() == AST.JLS2 ? 
-				resolver.resolveType(node.getName()) :
-				resolver.resolveType(node.getType())); 					
-		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) {
-		PTFieldAccess fa = InstantiationFactory.eINSTANCE.createPTFieldAccess();
-		fa.setReceiver(perform(node.getExpression()));
-		fa.setField(node.getName().getIdentifier());
-		expression = fa;
-		return false;
-	}
-
-	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.getString("ParseTreeCreationFromAST.OperatorTooComplicatedToHandle_EXC_"), new Object[] { node.getOperator().toString() })); //$NON-NLS-1$
-		}
-		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) {
-		PTMethodInvocation mi = InstantiationFactory.eINSTANCE.createPTMethodInvocation();
-		mi.setReceiver(perform(node.getExpression()));
-		mi.setName(node.getName().getIdentifier());
-		List args = mi.getArguments();
-		List nargs = node.arguments();
-		int nsize = nargs.size();
-		for (int i = 0; i < nsize; i++) {
-			args.add(perform((Expression) nargs.get(i)));
-		}
-		expression = mi;
-		return false;
-	}
-
-	/* (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.getString("ParseTreeCreationFromAST.OperatorTooComplicatedToHandle_EXC_"), new Object[] { node.getOperator().toString() })); //$NON-NLS-1$
-		}
-		pe.setOperator(ptoper);
-		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) {
-		return false;	// We can't handle post fix.
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SuperMethodInvocation)
-	 */
-	public boolean visit(SuperMethodInvocation node) {
-		return false;	// We can't handle post fix.
-	}
-
-	/* (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 680b858..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/WorkbenchUtilityMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: WorkbenchUtilityMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 23:09:27 $ 
- */
-package org.eclipse.jem.workbench.utility;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WorkbenchUtilityMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.workbench.utility.messages";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private WorkbenchUtilityMessages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ 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 bfa82f2..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-ParseTreeCreationFromAST.0                                       = {0} - {1}
-ParseTreeCreationFromAST.ExpressionTooComplicated_EXC_           = IWAV0177E Expression "{0}" is too complicated.
-ParseTreeCreationFromAST.CannotProcessAnonymousDeclarations_EXC_ = IWAV0178E Cannot process anonymous declarations.
-ParseTreeCreationFromAST.OperatorTooComplicatedToHandle_EXC_     = IWAV0179E Operator "{0}" is too complicated to handle.
diff --git a/plugins/org.eclipse.jem/.classpath b/plugins/org.eclipse.jem/.classpath
deleted file mode 100644
index 34cd7a6..0000000
--- 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.pde.core.requiredPlugins"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <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 60463af..0000000
--- 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 493f8d4..0000000
--- 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 52a566e..0000000
--- a/plugins/org.eclipse.jem/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jem</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.runtime.compatibility</project>
-		<project>org.eclipse.emf.ecore.xmi</project>
-		<project>org.eclipse.jem.proxy</project>
-		<project>org.eclipse.osgi</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.rtp.tools.rose.builder</name>
-			<arguments>
-				<dictionary>
-					<key>rose</key>
-					<value></value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.ibm.rtp.tools.rose.toolnature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9080e5..0000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,282 +0,0 @@
-#Wed May 11 18:32:12 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.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=ignore
-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.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_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_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_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_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_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_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
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 faeaaf0..0000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed May 11 18:32:13 EDT 2005
-eclipse.preferences.version=1
-formatter_settings_version=8
-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/about.html b/plugins/org.eclipse.jem/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/plugins/org.eclipse.jem/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</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 a21a3ec..0000000
--- 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.gif
-
-# 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 bddaab4..0000000
--- 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 6cf79c1..0000000
--- a/plugins/org.eclipse.jem/about.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/about.properties,v $
-# $Revision: 1.6 $  $Date: 2005/02/15 22:38:01 $
-#
-
-# 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, 2004.  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 7e5d034..0000000
--- a/plugins/org.eclipse.jem/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-src.excludes = **/.cvsignore
-source.mofjava.jar = mofjava/
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               javainst.jar,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.gif,\
-               overrides/,\
-               mofjava.jar,\
-               .options
-jars.compile.order = mofjava.jar,\
-                     javainst.jar
-source.javainst.jar = javainst/
-src.includes = about.html,\
-               model/,\
-               rose/
diff --git a/plugins/org.eclipse.jem/eclipse32.gif b/plugins/org.eclipse.jem/eclipse32.gif
deleted file mode 100644
index f71a8f6..0000000
--- a/plugins/org.eclipse.jem/eclipse32.gif
+++ /dev/null
Binary files differ
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 ca12d64..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 06ad7fa..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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.6 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 276b22b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationFactory.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.7 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * <!-- 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();
-
-	/**
-	 * 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 65d0803..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java
+++ /dev/null
@@ -1,1819 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.8 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-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
- * @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>Object</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PT_INSTANCE_REFERENCE__OBJECT = 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.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 = 30;
-
-	/**
-	 * 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 = 31;
-
-
-	/**
-	 * 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#getObject <em>Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Object</em>'.
-	 * @see org.eclipse.jem.internal.instantiation.PTInstanceReference#getObject()
-	 * @see #getPTInstanceReference()
-	 * @generated
-	 */
-	EReference getPTInstanceReference_Object();
-
-	/**
-	 * 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 84388e7..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
- *  $RCSfile: JavaAllocation.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:36:08 $ 
- */
- 
-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{
-} // JavaAllocation
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 e11e360..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayAccess.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTArrayAccess.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 255bb2d..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayCreation.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTArrayCreation.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 d115006..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayInitializer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTArrayInitializer.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 bf6b75b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTBooleanLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTBooleanLiteral.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 2dcc174..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCastExpression.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTCastExpression.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 d3f2900..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCharacterLiteral.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTCharacterLiteral.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 9517695..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTClassInstanceCreation.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTClassInstanceCreation.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 633f661..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTConditionalExpression.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTConditionalExpression.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:08 $ 
- */
-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 978f2db..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTExpression.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTExpression.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:08 $ 
- */
-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 4bad675..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTFieldAccess.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTFieldAccess.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 369d826..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixExpression.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInfixExpression.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 95fbbfd..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixOperator.java
+++ /dev/null
@@ -1,619 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInfixOperator.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * <!-- begin-model-doc -->
-	 * * operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * / operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * % operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * + operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * - operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * << operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * >> operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * >>> operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * <  operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * > operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * <= operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * >= operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * == operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * != operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * ^ operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * & operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * |  operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * && operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * || operator
-	 * <!-- end-model-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 e422c7b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceReference.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInstanceReference.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:36:09 $ 
- */
-package org.eclipse.jem.internal.instantiation;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance;
-
-/**
- * <!-- 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#getObject <em>Object</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>Object</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Object</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Object</em>' reference.
-	 * @see #setObject(IJavaObjectInstance)
-	 * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceReference_Object()
-	 * @model required="true"
-	 * @generated
-	 */
-	IJavaObjectInstance getObject();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInstanceReference#getObject <em>Object</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Object</em>' reference.
-	 * @see #getObject()
-	 * @generated
-	 */
-	void setObject(IJavaObjectInstance 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 895b690..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceof.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInstanceof.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 c3b4cb0..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInvalidExpression.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInvalidExpression.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 bfd1ee0..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTMethodInvocation.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTMethodInvocation.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 c4d1df0..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTName.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTName.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 d5b1115..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNullLiteral.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTNullLiteral.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 3810a18..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNumberLiteral.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTNumberLiteral.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 37329e9..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTParenthesizedExpression.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTParenthesizedExpression.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 3fd5f90..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixExpression.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTPrefixExpression.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:08 $ 
- */
-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 983dd31..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixOperator.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.eclipse.jem.internal.instantiation;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTPrefixOperator.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * @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 -->
-	 * <!-- begin-model-doc -->
-	 * + operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * - operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * ~ operator
-	 * <!-- end-model-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 -->
-	 * <!-- begin-model-doc -->
-	 * ! operator
-	 * <!-- end-model-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 3d084bd..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTStringLiteral.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTStringLiteral.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 c715732..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTThisLiteral.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTThisLiteral.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 ef19375..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTTypeLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTTypeLiteral.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 846346c..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseTreeAllocation.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseTreeAllocation.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 be291bd..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseVisitor.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 {
-	/**
-	 * 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(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(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 8874f76..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/FeatureValueProvider.java
+++ /dev/null
@@ -1,101 +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.jem.internal.instantiation.base;
-/*
- *  $RCSfile: FeatureValueProvider.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/12 22:17:05 $ 
- */
-
-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) {
-			FeatureValueProvider fvp;
-			try {
-				fvp = (FeatureValueProvider) eobject;
-			} catch (ClassCastException e) {
-				// 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;
-			}
-			// We run it outside of the class cast block so in caise the visit itself
-			// throws a class cast, that one can go on out from here.
-			return fvp.visitSetFeatures(visitor);
-		}
-		
-		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);
-}
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 df33f4b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaDataTypeInstance.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jem.internal.instantiation.base;
-/*******************************************************************************
- * Copyright (c) 2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: IJavaDataTypeInstance.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-/**
- * 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 3efe218..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaInstance.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: IJavaInstance.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-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, 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();
-	
-}
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 e8e2f9d..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaObjectInstance.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.jem.internal.instantiation.base;
-/*
- *  $RCSfile: IJavaObjectInstance.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/12 22:17:05 $ 
- */
-
-
-/**
- * Interface for java object instances.
- */
-public interface IJavaObjectInstance extends IJavaInstance, FeatureValueProvider {
-	
-}
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 ee6a259..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InstantiationBaseMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-package org.eclipse.jem.internal.instantiation.base;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class InstantiationBaseMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.base.messages";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InstantiationBaseMessages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ 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 b9f3262..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaDataTypeInstance.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-import org.eclipse.jem.java.JavaHelpers;
-
-/**
- * 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 EObjectImpl implements IJavaDataTypeInstance {
-
-	protected JavaDataTypeInstance() {
-	}
-
-	/*
-	 * This is here only for JavaFactoryHandler to set the allocation.
-	 * It is not exposed in the interface and should not be called outside.
-	 */
-	public JavaAllocation getAllocation() {
-		return isSetAllocation() ? (JavaAllocation) eGet(JavaInstantiation.getAllocationFeature(this)) : null;
-	}
-	
-	public boolean isSetAllocation() {
-		return eIsSet(JavaInstantiation.getAllocationFeature(this));
-	}
-	
-	public void setAllocation(JavaAllocation allocation) {
-		eSet(JavaInstantiation.getAllocationFeature(this), allocation);
-	}
-			
-	public JavaHelpers getJavaType() {
-		return (JavaHelpers) eClass();
-	}
-		
-	public String toString() {
-		return isSetAllocation() ? getAllocation().toString() : ""; //$NON-NLS-1$
-	}
-	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 66e5bd6..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaFactoryHandler.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-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/JavaInstantiation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java
deleted file mode 100644
index 61103d9..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.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.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaInstantiation.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-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 8d189bd..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaInstantiationHandlerFactoryAdapter.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-
-import org.eclipse.jem.java.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 8c9d9e0..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java
+++ /dev/null
@@ -1,284 +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.jem.internal.instantiation.base;
-/*
- *  $RCSfile: JavaObjectInstance.java,v $
- *  $Revision: 1.15 $  $Date: 2005/05/12 22:17:05 $ 
- */
-
-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.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 class JavaObjectInstance extends EObjectImpl implements IJavaObjectInstance {
-	
-	public JavaHelpers getJavaType(){
-		return (JavaHelpers) eClass();
-	}
-	
-	public JavaAllocation getAllocation() {
-		return isSetAllocation() ? (JavaAllocation) eGet(JavaInstantiation.getAllocationFeature(this)) : null;
-	}
-	
-	/** 
-	 * 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()) {
-			JavaObjectInstancePropertiesHolder settings = (JavaObjectInstancePropertiesHolder) eProperties();
-
-			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 isSetAllocation() {
-		return eIsSet(JavaInstantiation.getAllocationFeature(this));
-	}
-	
-	public void setAllocation(JavaAllocation allocation) {
-		eSet(JavaInstantiation.getAllocationFeature(this), allocation);
-	}
-	
-	
-	public boolean isPrimitive(){
-		return false;
-	}
-	
-	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 JavaObjectInstancePropertiesHolder extends EPropertiesHolderImpl {
-		private EList allStructuralFeatures;
-		
-		public JavaObjectInstancePropertiesHolder() {
-		}
-		
-		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 JavaObjectInstancePropertiesHolder();
-	  }
-	  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.
-			JavaObjectInstancePropertiesHolder properties = (JavaObjectInstancePropertiesHolder) 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()); 
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.impl.EObjectImpl#eDynamicFeatureID(org.eclipse.emf.ecore.EStructuralFeature)
-	 */
-	protected int eDynamicFeatureID(EStructuralFeature eStructuralFeature) {
-		migrate();	// See if migration needed, and do if it does.
-		return super.eDynamicFeatureID(eStructuralFeature);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eContents()
-	 */
-	public EList eContents() {
-		migrate();			
-		return super.eContents();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EObject#eCrossReferences()
-	 */
-	public EList eCrossReferences() {
-		migrate();			
-		return super.eCrossReferences();
-	}
-
-}
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 dcaecc7..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseTreeAllocationInstantiationVisitor.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:16 $ 
- */
-package org.eclipse.jem.internal.instantiation.base;
-
-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 {
-		
-		/**
-		 * @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.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.getString("ParseTreeAllocationInstantiationVisitor.CurrentlyThisNotSupported_EXC_")); //$NON-NLS-1$
-	}
-
-	/* (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 05396b1..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
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 de872f1..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.6 $  $Date: 2005/05/11 22:41:08 $ 
- */
- 
-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);
-	}
-
-} //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 7e00050..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.5 $  $Date: 2005/02/15 22:36:09 $ 
- */
- 
-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);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (initString: ");
-		result.append(initString);
-		result.append(')');
-		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 f488a30..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.8 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-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 and 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();
-			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:
-				return PTInfixOperator.get(initialValue);
-			case InstantiationPackage.PT_PREFIX_OPERATOR:
-				return PTPrefixOperator.get(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 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 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 87c317a..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: InstantiationImplMessages.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-package org.eclipse.jem.internal.instantiation.impl;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class InstantiationImplMessages {
-
-	private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.impl.messages";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private InstantiationImplMessages() {
-	}
-
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ 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 c67c755..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
+++ /dev/null
@@ -1,1346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.9 $  $Date: 2005/02/15 22:36:09 $ 
- */
-
-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.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 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.get(InstantiationPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		InstantiationPackageImpl theInstantiationPackage = (InstantiationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InstantiationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-
-		// Obtain or create and register interdependencies
-
-		// Step 1: create meta-model objects
-		theInstantiationPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theInstantiationPackage.initializePackageContents();
-
-		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_Object() {
-		return (EReference)ptInstanceReferenceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- 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__OBJECT);
-
-		// 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());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(iJavaDataTypeInstanceEClass, IJavaDataTypeInstance.class, "IJavaDataTypeInstance", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(iJavaInstanceEClass, IJavaInstance.class, "IJavaInstance", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(iJavaObjectInstanceEClass, IJavaObjectInstance.class, "IJavaObjectInstance", IS_ABSTRACT, IS_INTERFACE);
-
-		initEClass(javaAllocationEClass, JavaAllocation.class, "JavaAllocation", IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(initStringAllocationEClass, InitStringAllocation.class, "InitStringAllocation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getInitStringAllocation_InitString(), ecorePackage.getEString(), "initString", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(implicitAllocationEClass, ImplicitAllocation.class, "ImplicitAllocation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getImplicitAllocation_Parent(), theEcorePackage.getEObject(), null, "parent", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getImplicitAllocation_Feature(), theEcorePackage.getEStructuralFeature(), null, "feature", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(parseTreeAllocationEClass, ParseTreeAllocation.class, "ParseTreeAllocation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getParseTreeAllocation_Expression(), this.getPTExpression(), null, "expression", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptExpressionEClass, PTExpression.class, "PTExpression", IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(ptArrayAccessEClass, PTArrayAccess.class, "PTArrayAccess", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTArrayAccess_Array(), this.getPTExpression(), null, "array", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTArrayAccess_Indexes(), this.getPTExpression(), null, "indexes", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptArrayCreationEClass, PTArrayCreation.class, "PTArrayCreation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTArrayCreation_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTArrayCreation_Dimensions(), this.getPTExpression(), null, "dimensions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTArrayCreation_Initializer(), this.getPTArrayInitializer(), null, "initializer", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptArrayInitializerEClass, PTArrayInitializer.class, "PTArrayInitializer", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTArrayInitializer_Expressions(), this.getPTExpression(), null, "expressions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptBooleanLiteralEClass, PTBooleanLiteral.class, "PTBooleanLiteral", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTBooleanLiteral_BooleanValue(), ecorePackage.getEBoolean(), "booleanValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptCastExpressionEClass, PTCastExpression.class, "PTCastExpression", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTCastExpression_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTCastExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptCharacterLiteralEClass, PTCharacterLiteral.class, "PTCharacterLiteral", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTCharacterLiteral_EscapedValue(), ecorePackage.getEString(), "escapedValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEAttribute(getPTCharacterLiteral_CharValue(), ecorePackage.getEChar(), "charValue", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptClassInstanceCreationEClass, PTClassInstanceCreation.class, "PTClassInstanceCreation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTClassInstanceCreation_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTClassInstanceCreation_Arguments(), this.getPTExpression(), null, "arguments", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptConditionalExpressionEClass, PTConditionalExpression.class, "PTConditionalExpression", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTConditionalExpression_Condition(), this.getPTExpression(), null, "condition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTConditionalExpression_True(), this.getPTExpression(), null, "true", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTConditionalExpression_False(), this.getPTExpression(), null, "false", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptFieldAccessEClass, PTFieldAccess.class, "PTFieldAccess", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTFieldAccess_Receiver(), this.getPTExpression(), null, "receiver", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEAttribute(getPTFieldAccess_Field(), ecorePackage.getEString(), "field", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptInfixExpressionEClass, PTInfixExpression.class, "PTInfixExpression", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTInfixExpression_LeftOperand(), this.getPTExpression(), null, "leftOperand", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEAttribute(getPTInfixExpression_Operator(), this.getPTInfixOperator(), "operator", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTInfixExpression_RightOperand(), this.getPTExpression(), null, "rightOperand", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTInfixExpression_ExtendedOperands(), this.getPTExpression(), null, "extendedOperands", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptInstanceofEClass, PTInstanceof.class, "PTInstanceof", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTInstanceof_Operand(), this.getPTExpression(), null, "operand", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEAttribute(getPTInstanceof_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptMethodInvocationEClass, PTMethodInvocation.class, "PTMethodInvocation", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTMethodInvocation_Receiver(), this.getPTExpression(), null, "receiver", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-		initEAttribute(getPTMethodInvocation_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTMethodInvocation_Arguments(), this.getPTExpression(), null, "arguments", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptNameEClass, PTName.class, "PTName", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTName_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptNullLiteralEClass, PTNullLiteral.class, "PTNullLiteral", !IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(ptNumberLiteralEClass, PTNumberLiteral.class, "PTNumberLiteral", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTNumberLiteral_Token(), ecorePackage.getEString(), "token", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptParenthesizedExpressionEClass, PTParenthesizedExpression.class, "PTParenthesizedExpression", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTParenthesizedExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptPrefixExpressionEClass, PTPrefixExpression.class, "PTPrefixExpression", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTPrefixExpression_Operator(), this.getPTPrefixOperator(), "operator", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEReference(getPTPrefixExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptStringLiteralEClass, PTStringLiteral.class, "PTStringLiteral", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTStringLiteral_EscapedValue(), ecorePackage.getEString(), "escapedValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-		initEAttribute(getPTStringLiteral_LiteralValue(), ecorePackage.getEString(), "literalValue", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptThisLiteralEClass, PTThisLiteral.class, "PTThisLiteral", !IS_ABSTRACT, !IS_INTERFACE);
-
-		initEClass(ptTypeLiteralEClass, PTTypeLiteral.class, "PTTypeLiteral", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTTypeLiteral_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptInvalidExpressionEClass, PTInvalidExpression.class, "PTInvalidExpression", !IS_ABSTRACT, !IS_INTERFACE);
-		initEAttribute(getPTInvalidExpression_Message(), ecorePackage.getEString(), "message", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);
-
-		initEClass(ptInstanceReferenceEClass, PTInstanceReference.class, "PTInstanceReference", !IS_ABSTRACT, !IS_INTERFACE);
-		initEReference(getPTInstanceReference_Object(), this.getIJavaObjectInstance(), null, "object", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);
-
-		// 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 634f39e..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
- *  $RCSfile: JavaAllocationImpl.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:36:09 $ 
- */
- 
-
-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();
-	}
-
-} //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 42415e2..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: NaiveExpressionFlattener.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:36:09 $ 
- */
-package org.eclipse.jem.internal.instantiation.impl;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTArrayAccess;
-import org.eclipse.jem.internal.instantiation.ParseVisitor;
- 
-/**
- * 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.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 type = handleQualifiedName(node.getType());
-		buffer.append("new "); //$NON-NLS-1$
-		int ob = type.indexOf('[');
-		buffer.append(type.substring(0, ob));
-		int realdims = 0;
-		while (ob != -1) {
-			realdims++;
-			ob = type.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.getString("NaiveExpressionFlattener.InvalidExpression"), new Object[]{node.getMessage()})); //$NON-NLS-1$
-		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/PTArrayAccessImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java
deleted file mode 100644
index 7c616be..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTArrayAccessImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 ebb36b9..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayCreationImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTArrayCreationImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 6ee4625..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayInitializerImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTArrayInitializerImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 690dffb..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTBooleanLiteralImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTBooleanLiteralImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 cached value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBooleanValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean booleanValue = BOOLEAN_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- 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 booleanValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBooleanValue(boolean newBooleanValue) {
-		boolean oldBooleanValue = booleanValue;
-		booleanValue = newBooleanValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE, oldBooleanValue, booleanValue));
-	}
-
-	/**
-	 * <!-- 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 booleanValue != 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 2bfab5c..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCastExpressionImpl.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTCastExpressionImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 05cded7..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTCharacterLiteralImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/05/11 22:41:08 $ 
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTCharacterLiteral;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Character Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl#getEscapedValue <em>Escaped Value</em>}</li>
- *   <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl#getCharValue <em>Char Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTCharacterLiteralImpl extends PTExpressionImpl implements PTCharacterLiteral {
-	/**
-	 * The default value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEscapedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ESCAPED_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEscapedValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String escapedValue = ESCAPED_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCharValue() <em>Char Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCharValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final char CHAR_VALUE_EDEFAULT = '\u0000';
-
-	/**
-	 * The cached value of the '{@link #getCharValue() <em>Char Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCharValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected char charValue = CHAR_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PTCharacterLiteralImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return InstantiationPackage.eINSTANCE.getPTCharacterLiteral();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEscapedValue() {
-		return escapedValue;
-	}
-
-	public void setEscapedValue(String newEscapedValue) {
-		charValueSet = false;
-		setCharValueGen(CHAR_VALUE_EDEFAULT);
-		setEscapedValueGen(newEscapedValue);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEscapedValueGen(String newEscapedValue) {
-		String oldEscapedValue = escapedValue;
-		escapedValue = newEscapedValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE, oldEscapedValue, escapedValue));
-	}
-
-	private boolean charValueSet;
-	
-	public char getCharValue() {
-		if (!charValueSet && escapedValue != ESCAPED_VALUE_EDEFAULT) {
-			String s = getEscapedValue();
-			int len = s.length();
-			if (len < 2 || s.charAt(0) != '\'' || s.charAt(len-1) != '\'' ) {
-				throw new IllegalArgumentException();
-			}
-			char c = s.charAt(1);
-			if (c == '\'') {
-				throw new IllegalArgumentException();
-			}
-			if (c == '\\') {
-				if (len == 4) {
-					setCharValueGen(getCharEscaped(s.charAt(2)));
-				} else if (len == 8) {
-					//handle the case of unicode.
-					int currentPosition = 2;
-					int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-					if (s.charAt(currentPosition++) == 'u') {
-						if ((c1 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c1 < 0
-								|| (c2 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c2 < 0
-								|| (c3 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c3 < 0
-								|| (c4 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
-								|| c4 < 0){
-							throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
-						} else {
-							setCharValueGen((char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4));
-						}
-					} else {
-						throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
-					}
-				} else {
-					throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
-				}
-			} else
-				setCharValueGen(c);
-			
-			charValueSet = true;
-		}
-		return getCharValueGen();
-	}
-	
-	public static char getCharEscaped(char nextChar) {
-		switch(nextChar) {
-			case 'b' :
-				return '\b';
-			case 't' :
-				return '\t';
-			case 'n' :
-				return '\n';
-			case 'f' :
-				return '\f';
-			case 'r' :
-				return '\r';
-			case '\"':
-				return '\"';
-			case '\'':
-				return '\'';
-			case '\\':
-				return '\\';
-			case '0' :
-				return '\0';
-			case '1' :
-				return '\1';
-			case '2' :
-				return '\2';
-			case '3' :
-				return '\3';
-			case '4' :
-				return '\4';
-			case '5' :
-				return '\5';
-			case '6' :
-				return '\6';
-			case '7' :
-				return '\7';
-			default:
-				throw new IllegalArgumentException("illegal character");//$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public char getCharValueGen() {
-		return charValue;
-	}
-
-	public void setCharValue(char newCharValue) {		
-		charValueSet = true;
-		setCharValueGen(newCharValue);
-		
-		StringBuffer b = new StringBuffer(8);
-		b.append('\''); // opening delimiter
-		appendCharacter(newCharValue, b);
-		b.append('\''); // closing delimiter
-		setEscapedValueGen(b.toString());
-	}
-	
-	public static void appendCharacter(char character, StringBuffer b) {
-		switch(character) {
-			case '\b' :
-				b.append("\\b"); //$NON-NLS-1$
-				break;
-			case '\t' :
-				b.append("\\t"); //$NON-NLS-1$
-				break;
-			case '\n' :
-				b.append("\\n"); //$NON-NLS-1$
-				break;
-			case '\f' :
-				b.append("\\f"); //$NON-NLS-1$
-				break;
-			case '\r' :
-				b.append("\\r"); //$NON-NLS-1$
-				break;
-			case '\"':
-				b.append("\\\""); //$NON-NLS-1$
-				break;
-			case '\'':
-				b.append("\\\'"); //$NON-NLS-1$
-				break;
-			case '\\':
-				b.append("\\\\"); //$NON-NLS-1$
-				break;
-			case '\0' :
-				b.append("\\0"); //$NON-NLS-1$
-				break;
-			case '\1' :
-				b.append("\\1"); //$NON-NLS-1$
-				break;
-			case '\2' :
-				b.append("\\2"); //$NON-NLS-1$
-				break;
-			case '\3' :
-				b.append("\\3"); //$NON-NLS-1$
-				break;
-			case '\4' :
-				b.append("\\4"); //$NON-NLS-1$
-				break;
-			case '\5' :
-				b.append("\\5"); //$NON-NLS-1$
-				break;
-			case '\6' :
-				b.append("\\6"); //$NON-NLS-1$
-				break;
-			case '\7' :
-				b.append("\\7"); //$NON-NLS-1$
-				break;			
-			default:
-				// use a simple algorithm, if char is < 255 then just use it, else use it as unicode.
-				if (character < 255)
-					b.append(character);
-				else {
-					b.append("\\u");
-					String s = Integer.toString(character, 16);
-					int zeros = 4-s.length();
-					while (zeros-- > 0) {
-						b.append('0');
-					}
-					b.append(s);
-				}	
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCharValueGen(char newCharValue) {
-		char oldCharValue = charValue;
-		charValue = newCharValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE, oldCharValue, charValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				return getEscapedValue();
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				return new Character(getCharValue());
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				setEscapedValue((String)newValue);
-				return;
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				setCharValue(((Character)newValue).charValue());
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				setEscapedValue(ESCAPED_VALUE_EDEFAULT);
-				return;
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				setCharValue(CHAR_VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
-				return ESCAPED_VALUE_EDEFAULT == null ? escapedValue != null : !ESCAPED_VALUE_EDEFAULT.equals(escapedValue);
-			case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
-				return charValue != CHAR_VALUE_EDEFAULT;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public String toString() {
-		return super.toString();	// Really want toString to be final at PTExpression, but EMF doesn't allow it.
-	}
-
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
-	 */
-	protected void accept0(ParseVisitor visitor) {
-		visitor.visit(this);
-		visitor.endVisit(this);
-	}
-} //CharacterLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java
deleted file mode 100644
index 9763ffd..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTClassInstanceCreationImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 36bef52..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTConditionalExpressionImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTConditionalExpressionImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 a8e09d0..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTExpressionImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTExpressionImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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) {
-		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 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
-	 */
-	protected final void acceptChild(ParseVisitor visitor, PTExpression child) {
-		if (child == null) {
-			return;
-		}
-		child.accept(visitor);
-	}
-	
-	/**
-	 * 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 44af5f8..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTFieldAccessImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTFieldAccessImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 3a05e80..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInfixExpressionImpl.java
+++ /dev/null
@@ -1,394 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInfixExpressionImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 99c794e..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceReferenceImpl.java
+++ /dev/null
@@ -1,167 +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.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTInstanceReference;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance;
-
-/**
- * <!-- 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#getObject <em>Object</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInstanceReferenceImpl extends PTExpressionImpl implements PTInstanceReference {
-	/**
-	 * The cached value of the '{@link #getObject() <em>Object</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObject()
-	 * @generated
-	 * @ordered
-	 */
-	protected IJavaObjectInstance object = 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 IJavaObjectInstance getObject() {
-		if (object != null && object.eIsProxy()) {
-			IJavaObjectInstance oldObject = object;
-			object = (IJavaObjectInstance)eResolveProxy((InternalEObject)object);
-			if (object != oldObject) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.PT_INSTANCE_REFERENCE__OBJECT, oldObject, object));
-			}
-		}
-		return object;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IJavaObjectInstance basicGetObject() {
-		return object;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setObject(IJavaObjectInstance newObject) {
-		IJavaObjectInstance oldObject = object;
-		object = newObject;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCE_REFERENCE__OBJECT, oldObject, object));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCE_REFERENCE__OBJECT:
-				if (resolve) return getObject();
-				return basicGetObject();
-		}
-		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__OBJECT:
-				setObject((IJavaObjectInstance)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__OBJECT:
-				setObject((IJavaObjectInstance)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case InstantiationPackage.PT_INSTANCE_REFERENCE__OBJECT:
-				return object != 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);
-	}
-
-} //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 495ef70..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceofImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInstanceofImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 0a3cb7a..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInvalidExpressionImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTInvalidExpressionImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 10eef4a..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTMethodInvocationImpl.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTMethodInvocationImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 f037950..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNameImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTNameImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 ec77d10..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNullLiteralImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTNullLiteralImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 52b4c6f..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNumberLiteralImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTNumberLiteralImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 b06880e..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTParenthesizedExpressionImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTParenthesizedExpressionImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 2b527e1..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTPrefixExpressionImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTPrefixExpressionImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 43ab6f8..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTStringLiteralImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTStringLiteralImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 fc96983..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTThisLiteralImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTThisLiteralImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 62d2b23..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTTypeLiteralImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: PTTypeLiteralImpl.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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 bd7c97e..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ParseTreeAllocationImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.eclipse.jem.internal.instantiation.impl;
-/*******************************************************************************
- * Copyright (c)  2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: ParseTreeAllocationImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:36:09 $ 
- */
-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();
-	}
-
-} //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 945a6a5..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 0c5723c..0000000
--- a/plugins/org.eclipse.jem/model/instance.ecore
+++ /dev/null
@@ -1,482 +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="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/src/model/Ecore.ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/src/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="object" lowerBound="1"
-        eType="#//IJavaObjectInstance"/>
-  </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 788ea34..0000000
--- a/plugins/org.eclipse.jem/model/instance.genmodel
+++ /dev/null
@@ -1,136 +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/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" usedGenPackages="../../org.eclipse.emf.ecore/src/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 ecoreFeature="ecore:EAttribute instance.ecore#//InitStringAllocation/initString"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//ImplicitAllocation">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference instance.ecore#//ImplicitAllocation/parent"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference instance.ecore#//ImplicitAllocation/feature"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//ParseTreeAllocation">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//ParseTreeAllocation/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTExpression"/>
-    <genClasses ecoreClass="instance.ecore#//PTArrayAccess">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayAccess/array"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayAccess/indexes"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTArrayCreation">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTArrayCreation/type"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayCreation/dimensions"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayCreation/initializer"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTArrayInitializer">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayInitializer/expressions"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTBooleanLiteral">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTBooleanLiteral/booleanValue"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTCastExpression">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTCastExpression/type"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTCastExpression/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTCharacterLiteral">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTCharacterLiteral/escapedValue"/>
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTCharacterLiteral/charValue"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTClassInstanceCreation">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTClassInstanceCreation/type"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTClassInstanceCreation/arguments"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTConditionalExpression">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/condition"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/true"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/false"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTFieldAccess">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTFieldAccess/receiver"/>
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTFieldAccess/field"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInfixExpression">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/leftOperand"/>
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTInfixExpression/operator"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/rightOperand"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/extendedOperands"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInstanceof">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTInstanceof/operand"/>
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTInstanceof/type"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTMethodInvocation">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTMethodInvocation/receiver"/>
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTMethodInvocation/name"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTMethodInvocation/arguments"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTName">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTName/name"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTNullLiteral"/>
-    <genClasses ecoreClass="instance.ecore#//PTNumberLiteral">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTNumberLiteral/token"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTParenthesizedExpression">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTParenthesizedExpression/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTPrefixExpression">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTPrefixExpression/operator"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference instance.ecore#//PTPrefixExpression/expression"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTStringLiteral">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTStringLiteral/escapedValue"/>
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTStringLiteral/literalValue"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTThisLiteral"/>
-    <genClasses ecoreClass="instance.ecore#//PTTypeLiteral">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTTypeLiteral/type"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInvalidExpression">
-      <genFeatures ecoreFeature="ecore:EAttribute instance.ecore#//PTInvalidExpression/message"/>
-    </genClasses>
-    <genClasses ecoreClass="instance.ecore#//PTInstanceReference">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference instance.ecore#//PTInstanceReference/object"/>
-    </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 6fa9b44..0000000
--- 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.internal.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/src/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/src/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/src/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/src/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/src/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/src/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/src/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/src/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 f939887..0000000
--- a/plugins/org.eclipse.jem/model/javaModel.genmodel
+++ /dev/null
@@ -1,173 +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"
-    usedGenPackages="../../org.eclipse.emf.ecore/src/model/Ecore.genmodel#//ecore">
-  <foreignModel>..\rose\javaModel.mdl</foreignModel>
-  <foreignModel>WorkspaceRoot</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="JavaRef" basePackage="org.eclipse.jem" 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 ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/kind"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/public"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/final"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/implementsInterfaces"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/classImport"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/packageImports"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/fields"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/methods"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/initializers"/>
-      <genFeatures property="None" ecoreFeature="ecore:EReference java.ecore#//JavaClass/declaredClasses"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/declaringClass"/>
-      <genFeatures property="Readonly" ecoreFeature="ecore:EReference java.ecore#//JavaClass/javaPackage"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/events"/>
-      <genFeatures property="None" notify="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 ecoreFeature="ecore:EAttribute java.ecore#//Initializer/isStatic"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//Initializer/javaClass"/>
-      <genFeatures property="Readonly" ecoreFeature="ecore:EReference java.ecore#//Initializer/source"/>
-    </genClasses>
-    <genClasses ecoreClass="java.ecore#//JavaParameter">
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//JavaParameter/final"/>
-      <genFeatures 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 ecoreFeature="ecore:EAttribute java.ecore#//Method/abstract"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Method/native"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Method/synchronized"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Method/final"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Method/constructor"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Method/static"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Method/javaVisibility"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference java.ecore#//Method/parameters"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//Method/javaExceptions"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//Method/javaClass"/>
-      <genFeatures property="Readonly" 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 ecoreFeature="ecore:EAttribute java.ecore#//Field/final"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Field/static"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Field/javaVisibility"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Field/transient"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Field/volatile"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference java.ecore#//Field/javaClass"/>
-      <genFeatures property="None" children="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 ecoreFeature="ecore:EAttribute java.ecore#//Block/source"/>
-      <genFeatures ecoreFeature="ecore:EAttribute java.ecore#//Block/name"/>
-      <genFeatures property="None" children="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" 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 ecoreFeature="ecore:EAttribute java.ecore#//ArrayType/arrayDimensions"/>
-      <genFeatures property="Readonly" 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 99c8ce3..0000000
--- a/plugins/org.eclipse.jem/mofjava/javaadapters.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/mofjava/javaadapters.properties,v $
-# $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $
-#
-
-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 1018ea0..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.java
+++ /dev/null
@@ -1,53 +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
- *******************************************************************************/
-/*
- *  $RCSfile: JEMPlugin.java,v $
- *  $Revision: 1.7 $  $Date: 2005/02/15 22:37:02 $ 
- */
-package org.eclipse.jem.internal.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
-
-/**
- * org.eclipse.jem plugin
- */
-public class JEMPlugin extends Plugin {
-
-	private static JEMPlugin PLUGIN;
-	private Logger logger;
-	
-	public JEMPlugin() {
-		PLUGIN = this;
-	}
-	
-	public static JEMPlugin getPlugin() {
-		return PLUGIN;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		logger = EclipseLogger.getEclipseLogger(this);		
-	}
-	
-	public Logger getLogger() {
-		return logger;
-	}
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java
deleted file mode 100644
index 467c3ef..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
- *  $RCSfile: IJavaClassAdaptor.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-/**
- * 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 0e7b96c..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaMethodAdapter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: IJavaMethodAdapter.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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/IJavaReflectionKeyExtension.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaReflectionKeyExtension.java
deleted file mode 100644
index 28bc6c4..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaReflectionKeyExtension.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jem.internal.java.adapters;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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.2 $  $Date: 2005/02/15 22:37:02 $ 
- */
-/**
- * Interface for JavaReflectionKeyExtensions.
- * They are registered with the JavaXMIFactoryImpl.
- * 
- * @version 	1.0
- * @author R. L. Kulp
- */
-public interface IJavaReflectionKeyExtension {
-
-	/**
-	 * Return object for the given id. Return null if this extension doesn't
-	 * process this type of id.
-	 */
-	public Object getObject(String id, JavaReflectionKey reflectionKey);
-	
-}
-
-
-
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 13926e6..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/InternalReadAdaptable.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jem.internal.java.adapters;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: InternalReadAdaptable.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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 45a6f60..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaArrayTypeReflectionAdapter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- *  $RCSfile: JavaArrayTypeReflectionAdapter.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 22:41:06 $ 
- */
-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.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()));
-		} catch (InheritanceCycleException e) {
-		}
-		List list = at.getImplementsInterfacesGen();
-		list.add(JavaRefFactory.eINSTANCE.createClassRef("java.lang.Cloneable"));
-		list.add(JavaRefFactory.eINSTANCE.createClassRef("java.io.Serializable"));
-		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();
-	}
-}
\ No newline at end of file
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 118cd2e..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java
+++ /dev/null
@@ -1,172 +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.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaReflectionAdapterFactory.java,v $
- *  $Revision: 1.6 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 534ac53..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java
+++ /dev/null
@@ -1,279 +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.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaReflectionAdaptor.java,v $
- *  $Revision: 1.11 $  $Date: 2005/02/15 22:37:02 $ 
- */
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.URI;
-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) {
-	JavaClass ref = org.eclipse.jem.java.impl.JavaRefFactoryImpl.getActiveFactory().createJavaClass();
-   JavaURL javaurl = new JavaURL(targetName);
-  ((InternalEObject) ref).eSetProxyURI(URI.createURI(javaurl.getFullString()));
-   return ref;
-}
-/**
- * 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 1fce782..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java
+++ /dev/null
@@ -1,393 +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.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaReflectionKey.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 22:41:06 $ 
- */
-import java.util.*;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.*;
-
-/**
- * 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 {
-	/* 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$
-	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.
- */
-public ArrayType createArrayType() {
-	return getJavaFactory().createArrayType();
-}
-/* 
- * Create a JavaClass instance in the current document
- * Handles the push and pop of the current document.
- */
-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.
- */
-public Field createJavaField() {
-	return getJavaFactory().createField();
-}
-/* 
- * Create a Method instance in the current document
- * Handles the push and pop of the current document.
- */
-public Method createJavaMethod() {
-	return getJavaFactory().createMethod();
-}
-/* 
- * Create a JavaParameter instance in the current document
- */
-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
-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.
- */
-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.
- */
-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;
-}
-/**
- * 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 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;
-}
-/**
- * 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 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) {
-		if (Character.isJavaIdentifierStart(typeName.charAt(0))) {
-			// Starts with a valid java identifier character.
-			// Now see if the rest are valid.
-			for (int i = 1; i < typeName.length(); i++) {
-				if (!Character.isJavaIdentifierPart(typeName.charAt(i)))
-					return false; // Not valid
-			}
-			return true;
-		}
-	}
-	return false;
-}
-
-/**
- * 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 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);
-}
-/**
- * Return true if the passed type represents a Java Array type
- */
-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 622c04a..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java
+++ /dev/null
@@ -1,162 +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.jem.internal.java.adapters;
-/*
- *  $RCSfile: JavaXMIFactoryImpl.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 19:01:16 $ 
- */
-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.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 {
-	private static final String SCHEMA_SEPERATOR = ":/"; //$NON-NLS-1$
-	public static final String SCHEME = "java"; //$NON-NLS-1$
-
-	protected List extensions = new ArrayList();
-
-	public static final JavaXMIFactoryImpl INSTANCE = new JavaXMIFactoryImpl();
-
-	/**
-	 * JavaXMIFactoryImpl constructor comment.
-	 */
-	public JavaXMIFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * Register an extension for java reflection key processing.
-	 */
-	public void registerReflectionKeyExtension(IJavaReflectionKeyExtension extension) {
-		extensions.add(extension);
-	}
-
-	/**
-	 * Deregister an extension for java reflection key processing.
-	 */
-	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 JavaReflectionKey reflectionKey;
-
-		public JavaXMIResource(URI uri) {
-			super(uri);
-		}
-
-		public void setReflectionKey(JavaReflectionKey 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(SCHEME, 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 ec8c266..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReadAdaptor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jem.internal.java.adapters;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ReadAdaptor.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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";
-	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 2db9f43..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java
+++ /dev/null
@@ -1,168 +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.jem.internal.java.adapters;
-/*
- *  $RCSfile: ReflectionAdaptor.java,v $
- *  $Revision: 1.10 $  $Date: 2005/05/11 22:41:06 $ 
- */
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.util.logger.proxy.Logger;
-/**
- * ReflectionAdaptor - a read adaptor base implementation which does a bulk
- * 	load of relflected values on the first request.
- * 	Subclasses can optimize to defer some properties.
- * 	Properties may also be deferred by setting their values with proxy references,
- * 	for example, for supertype and other referenced types.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public abstract class ReflectionAdaptor extends org.eclipse.emf.common.notify.impl.AdapterImpl implements ReadAdaptor {
-	public static final char C_CLASS_MEMBER_DELIMITER = '.';
-	public static final char C_METHOD_PARM_DELIMITER = '(';
-	public static final char C_METHODID_PARMID_DELIMITER = '-';
-	public static final char C_PARM_PARM_DELIMITER = ',';
-	public static final char PATH_DELIMITER = '/';
-	// SW id contains & in xml file casues exception throw during load
-        // public static final String S_CONSTRUCTOR_TOKEN = "&V";//$NON-NLS-1$
-	public static final String S_CONSTRUCTOR_TOKEN = "_V";//$NON-NLS-1$ // SW
-	// cache a static empty String[] for no parm methods
-	protected static String[] emptyStringArray = new String[0];
-	
-	
-	/**
-	 * Notification event type for special Reflection notifications. This will be the event type for the special ones, like REFLECTION_EVENT.
-	 * The listener should listen for this event type, and then check the feature for the type of special event (like REFLECTION_EVENT).
-	 * @since 1.1.0
-	 */
-	public static final int EVENT = -3456;	// Using a funny number to try to eliminate confliction with any other specials that may of occur from other code on the JavaClass.
-	
-	/**
-	 * Special notification event type. This is sent against a JavaClass (as the target) whenever reflection occurs. It will be
-	 * sent under the notification event type of REFLECTION_EVENT.
-	 * @since 1.1.0
-	 */
-	public static final EAttribute REFLECTION_EVENT = EcoreFactory.eINSTANCE.createEAttribute();
-
-	/*
-	 * Fill in the name. Not really needed but it would be nice.
-	 */
-	static {REFLECTION_EVENT.setName("reflectValues");}
-	
-	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;
-			if (!((EObject)getTarget()).eIsProxy())
-				hasReflected = reflectValues();
-			else
-				hasReflected = false;	// AS long we are a proxy, we won't reflect.
-		} catch (Throwable e) {
-			hasReflected = false;
-			Logger logger = Logger.getLogger();
-			if (logger.isLoggingLevel(Level.WARNING)) {
-				logger.log(ResourceHandler.getString("Failed_reflecting_values_ERROR_"), Level.WARNING); //$NON-NLS-1$ = "Failed reflecting values!!!"
-				logger.logWarning(e);
-			}
-		} finally {
-			isReflecting = false;
-			getTarget().eNotify(new ENotificationImpl((InternalEObject)getTarget(), EVENT, REFLECTION_EVENT, null, null, Notification.NO_INDEX));
-		}
-	}
-	return hasReflected;
-}
-public static ReflectionAdaptor retrieveAdaptorFrom(EObject object) {
-	synchronized (object) {
-		return (ReflectionAdaptor)EcoreUtil.getRegisteredAdapter(object, ReadAdaptor.TYPE_KEY);
-	}
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java
deleted file mode 100644
index b2b14f2..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.6 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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 5569359..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java
+++ /dev/null
@@ -1,341 +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
- *******************************************************************************/
-/*
- *  $RCSfile: JavaClassJDKAdaptor.java,v $
- *  $Revision: 1.11 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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.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().getESuperTypesGen();
-		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();
-				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 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 1a10b9f..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters.jdk;
-/*
- *  $RCSfile: JavaFieldJDKAdaptor.java,v $
- *  $Revision: 1.6 $  $Date: 2005/05/11 22:41:06 $ 
- */
-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 af18d33..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaJDKAdapterFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.jem.internal.java.adapters.jdk;
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: JavaJDKAdapterFactory.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 2c31f8f..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.7 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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.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 f99543a..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/nls/ResourceHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jem.internal.java.adapters.nls;
-/*******************************************************************************
- * Copyright (c)  2001, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.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: ResourceHandler.java,v $
- *  $Revision: 1.2 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 ac3ab8f..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.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.jem.internal.java.beaninfo;
-/*
- *  $RCSfile: IIntrospectionAdapter.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 0e4a39c..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java
+++ /dev/null
@@ -1,75 +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.jem.internal.java.init;
-/*
- *  $RCSfile: JavaInit.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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"))
-			EPackage.Registry.INSTANCE.put("ecore.xmi", new EPackage.Descriptor() {
-			public EPackage getEPackage() {
-				return EcorePackage.eINSTANCE;
-			}
-		});
-		//java
-		if (!EPackage.Registry.INSTANCE.containsKey("java.xmi"))
-			EPackage.Registry.INSTANCE.put("java.xmi", new EPackage.Descriptor() {
-			public EPackage getEPackage() {
-				return JavaRefPackage.eINSTANCE;
-			}
-		});
-	}
-	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 3c5b16f..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.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.jem.internal.java.instantiation;
-/*
- *  $RCSfile: IInstantiationHandler.java,v $
- *  $Revision: 1.5 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 ce7da94..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.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.jem.internal.java.instantiation;
-/*
- *  $RCSfile: IInstantiationHandlerFactoryAdapter.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-import org.eclipse.emf.common.notify.Adapter;
-
-import org.eclipse.jem.java.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 f58ec44..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.instantiation;
-/*
- *  $RCSfile: IInstantiationInstance.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 2bf8ca0..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java
+++ /dev/null
@@ -1,97 +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.jem.java;
-
-/*
- *  $RCSfile: ArrayType.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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 286b0a3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java
+++ /dev/null
@@ -1,60 +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.jem.java;
-
-/*
- *  $RCSfile: Block.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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 be8ce23..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java
+++ /dev/null
@@ -1,28 +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
- *******************************************************************************/
-/*
- *  $RCSfile: Comment.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 f1994aa..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java
+++ /dev/null
@@ -1,174 +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.jem.java;
-
-/*
- *  $RCSfile: Field.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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 ed9d820..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
+++ /dev/null
@@ -1,43 +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.jem.java;
-/*
- *  $RCSfile: InheritanceCycleException.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 {
-	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 c58af80..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.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.jem.java;
-
-/*
- *  $RCSfile: Initializer.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 33b0a2a..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
+++ /dev/null
@@ -1,420 +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.jem.java;
-/*
- *  $RCSfile: JavaClass.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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
-	 * @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 c0e4852..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: JavaDataType.java,v $
- *  $Revision: 1.4 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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 2cb786f..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
- *  $RCSfile: JavaEvent.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 b3cc8c1..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.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.jem.java;
-
-/*
- *  $RCSfile: JavaHelpers.java,v $
- *  $Revision: 1.5 $  $Date: 2005/05/11 19:01:16 $ 
- */
-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";
-	static final String CHARACTER_NAME = "java.lang.Character";
-	static final String BYTE_NAME = "java.lang.Byte";
-	static final String DOUBLE_NAME = "java.lang.Double";
-	static final String FLOAT_NAME = "java.lang.Float";
-	static final String INTEGER_NAME = "java.lang.Integer";
-	static final String LONG_NAME = "java.lang.Long";
-	static final String SHORT_NAME = "java.lang.Short";
-	static final String PRIM_BOOLEAN_NAME = "boolean";
-	static final String PRIM_CHARACTER_NAME = "char";
-	static final String PRIM_BYTE_NAME = "byte";
-	static final String PRIM_DOUBLE_NAME = "double";
-	static final String PRIM_FLOAT_NAME = "float";
-	static final String PRIM_INTEGER_NAME = "int";
-	static final String PRIM_LONG_NAME = "long";
-	static final String PRIM_SHORT_NAME = "short";
-	
-	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 52ddab1..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.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.jem.java;
-/*
- *  $RCSfile: JavaPackage.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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.)
-														// 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";
-	/**
-	 * @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 ae0e13c..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
- *  $RCSfile: JavaParameter.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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 4bd3d1d..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java
+++ /dev/null
@@ -1,202 +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.jem.java;
-
-/*
- *  $RCSfile: JavaParameterKind.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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 18fbda0..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java
+++ /dev/null
@@ -1,181 +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.jem.java;
-
-/*
- *  $RCSfile: JavaRefFactory.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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.impl.JavaRefFactoryImpl();
-
-
-	/**
-	 * Create a proxy reference to the class name.
-	 * @param targetName Classname to create a proxy reference too.
-	 * @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);
-	
-	/**
-	 * @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 e305ef9..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java
+++ /dev/null
@@ -1,1972 +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.jem.java;
-/*
- *  $RCSfile: JavaRefPackage.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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.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.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.internal.java";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JavaRefPackage eINSTANCE = org.eclipse.jem.java.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 21baba1..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.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.jem.java;
-/*
- *  $RCSfile: JavaURL.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-
-public class JavaURL extends org.eclipse.jem.java.impl.URL {
-	public static final String JAVA_PROTOCOL_URI_PREFIX = "java:/";
-	/**
-	 * JavaURL constructor comment.
-	 * @param urlString java.lang.String
-	 */
-	public JavaURL(String urlString) {
-		super(urlString);
-	}
-	/**
-	 * JavaURL constructor comment.
-	 * @param nameSpaceName java.lang.String
-	 * @param iD java.lang.String
-	 */
-	public JavaURL(String nameSpaceName, String iD) {
-		super(null, null);
-		initializeNamespaceString(nameSpaceName);
-		this.ID = iD;
-	}
-	public String getClassName() {
-		return ID;
-	}
-	/**
-	 * This method was created in VisualAge.
-	 * @return java.lang.String
-	 */
-	public String getFullString() {
-		StringBuffer buf = new StringBuffer();
-		if (namespaceName != null) {
-			buf.append(namespaceName);
-			if (ID != null)
-				buf.append("#");
-		}
-		if (ID != null)
-			buf.append(ID);
-		return buf.toString();
-	}
-	public String getPackageName() {
-		String internalName = namespaceName.substring(JAVA_PROTOCOL_URI_PREFIX.length(), namespaceName.length());
-		return JavaPackage.PRIMITIVE_PACKAGE_NAME.equals(internalName) ? "" : internalName;
-	}
-	/* 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)
-			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;
-	}
-	public static boolean isJavaURL(String aUrlString) {
-		if (aUrlString == null)
-			return false;
-		return aUrlString.startsWith(JAVA_PROTOCOL_URI_PREFIX);
-	}
-
-	public String toString() {
-		return "URL(" + getFullString() + ")";
-	}
-}
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 75e4da5..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java
+++ /dev/null
@@ -1,203 +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.jem.java;
-/*
- *  $RCSfile: JavaVisibilityKind.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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 fdf994d..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java
+++ /dev/null
@@ -1,279 +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.jem.java;
-
-/*
- *  $RCSfile: Method.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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 parameters="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 e881d2d..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.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
- *******************************************************************************/
-/*
- *  $RCSfile: Statement.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 55bed14..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java
+++ /dev/null
@@ -1,200 +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.jem.java;
-/*
- *  $RCSfile: TypeKind.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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/impl/ArrayTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/ArrayTypeImpl.java
deleted file mode 100644
index 5bf147f..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/ArrayTypeImpl.java
+++ /dev/null
@@ -1,688 +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.jem.java.impl;
-/*
- *  $RCSfile: ArrayTypeImpl.java,v $
- *  $Revision: 1.7 $  $Date: 2005/04/14 19:05:33 $ 
- */
-
-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 public_ != PUBLIC_EDEFAULT;
-			case JavaRefPackage.ARRAY_TYPE__FINAL:
-				return final_ != 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/impl/BlockImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/BlockImpl.java
deleted file mode 100644
index cfa49a6..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/BlockImpl.java
+++ /dev/null
@@ -1,243 +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.jem.java.impl;
-
-/*
- *  $RCSfile: BlockImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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/impl/CommentImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/CommentImpl.java
deleted file mode 100644
index a7d3485..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/CommentImpl.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.jem.java.impl;
-
-/*
- *  $RCSfile: CommentImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-
-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/impl/FieldImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/FieldImpl.java
deleted file mode 100644
index 9780908..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/FieldImpl.java
+++ /dev/null
@@ -1,739 +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
- *******************************************************************************/
-/*
- *  $RCSfile: FieldImpl.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/11 22:41:08 $ 
- */
-package org.eclipse.jem.java.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.Block;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.JavaURL;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-
-/**
- * @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 cached value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean final_ = FINAL_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isStatic() <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStatic()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean static_ = STATIC_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isTransient() <em>Transient</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isTransient()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transient_ = TRANSIENT_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isVolatile() <em>Volatile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVolatile()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean volatile_ = VOLATILE_EDEFAULT;
-
-	/**
-	 * 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"
-	 */
-	public static Field createFieldRef(String className, String fieldName) {
-		Field ref = JavaRefFactoryImpl.getActiveFactory().createField();
-		JavaURL javaurl = new JavaURL(className + "/" + fieldName);
-		((InternalEObject) ref).eSetProxyURI(URI.createURI(javaurl.getFullString()));
-		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 final_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = final_;
-		final_ = newFinal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__FINAL, oldFinal, final_));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isStaticGen() {
-		return static_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatic(boolean newStatic) {
-		boolean oldStatic = static_;
-		static_ = newStatic;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__STATIC, oldStatic, static_));
-	}
-
-	/**
-	 * <!-- 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 transient_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransient(boolean newTransient) {
-		boolean oldTransient = transient_;
-		transient_ = newTransient;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__TRANSIENT, oldTransient, transient_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isVolatileGen() {
-		return volatile_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVolatile(boolean newVolatile) {
-		boolean oldVolatile = volatile_;
-		volatile_ = newVolatile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__VOLATILE, oldVolatile, volatile_));
-	}
-
-	/**
-	 * @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 final_ != FINAL_EDEFAULT;
-			case JavaRefPackage.FIELD__STATIC:
-				return static_ != STATIC_EDEFAULT;
-			case JavaRefPackage.FIELD__JAVA_VISIBILITY:
-				return javaVisibility != JAVA_VISIBILITY_EDEFAULT;
-			case JavaRefPackage.FIELD__TRANSIENT:
-				return transient_ != TRANSIENT_EDEFAULT;
-			case JavaRefPackage.FIELD__VOLATILE:
-				return volatile_ != 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(final_);
-		result.append(", static: ");
-		result.append(static_);
-		result.append(", javaVisibility: ");
-		result.append(javaVisibility);
-		result.append(", transient: ");
-		result.append(transient_);
-		result.append(", volatile: ");
-		result.append(volatile_);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/InitializerImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/InitializerImpl.java
deleted file mode 100644
index 66fc66b..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/InitializerImpl.java
+++ /dev/null
@@ -1,297 +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.jem.java.impl;
-/*
- *  $RCSfile: InitializerImpl.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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/impl/JavaClassImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaClassImpl.java
deleted file mode 100644
index fff6941..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaClassImpl.java
+++ /dev/null
@@ -1,1931 +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
- *******************************************************************************/
-/*
- *  $RCSfile: JavaClassImpl.java,v $
- *  $Revision: 1.16 $  $Date: 2005/05/11 22:41:06 $ 
- */
-package org.eclipse.jem.java.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.Field;
-import org.eclipse.jem.java.Initializer;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaEvent;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.TypeKind;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.*;
-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;
-import org.eclipse.jem.java.*;
-
-/**
- * <!-- begin-user-doc -->
- * 
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#isPublic <em>Public</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#isFinal <em>Final</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getImplementsInterfaces <em>Implements Interfaces</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getClassImport <em>Class Import</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getPackageImports <em>Package Imports</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getFields <em>Fields</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getInitializers <em>Initializers</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getDeclaredClasses <em>Declared Classes</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getDeclaringClass <em>Declaring Class</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getJavaPackage <em>Java Package</em>}</li>
- *   <li>{@link org.eclipse.jem.java.impl.JavaClassImpl#getEvents <em>Events</em>}</li>
- *   <li>{@link org.eclipse.jem.java.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 cached value of the '{@link #isPublic() <em>Public</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isPublic()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean public_ = PUBLIC_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean final_ = FINAL_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getImplementsInterfaces() <em>Implements Interfaces</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplementsInterfaces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList implementsInterfaces = null;
-
-	/**
-	 * The cached value of the '{@link #getClassImport() <em>Class Import</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassImport()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList classImport = null;
-
-	/**
-	 * The cached value of the '{@link #getPackageImports() <em>Package Imports</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPackageImports()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList packageImports = null;
-
-	/**
-	 * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFields()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList fields = null;
-
-	/**
-	 * The cached value of the '{@link #getMethods() <em>Methods</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMethods()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList methods = null;
-
-	/**
-	 * The cached value of the '{@link #getInitializers() <em>Initializers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitializers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initializers = null;
-
-	/**
-	 * The cached value of the '{@link #getDeclaredClasses() <em>Declared Classes</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeclaredClasses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList declaredClasses = null;
-
-	/**
-	 * The cached value of the '{@link #getDeclaringClass() <em>Declaring Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDeclaringClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass declaringClass = null;
-
-	/**
-	 * The cached value of the '{@link #getEvents() <em>Events</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEvents()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList events = null;
-
-	protected JavaClassImpl() {
-		super();
-	}
-	
-	public EList getEAnnotationsInternal() {
-		return super.getEAnnotations();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JavaRefPackage.eINSTANCE.getJavaClass();
-	}
-
-	/**
-	 * Protected helper methods.
-	 */
-	protected void collectFieldsExtended(List fields) {
-		fields.addAll(getFields());
-		Iterator it;
-		it = getExtendedLookupIterator();
-		while (it.hasNext())
-			((JavaClassImpl) it.next()).collectFieldsExtended(fields);
-	}
-
-	protected void collectMethodsExtended(Map methods, boolean onlyPublic, List excludedClasses, List excludedMethods) {
-		Iterator it1, it2;
-		it2 = getExtendedLookupIterator();
-		JavaClassImpl javaClass;
-		while (it2.hasNext()) {
-			javaClass = (JavaClassImpl) it2.next();
-			if (!excludedClasses.contains(javaClass))
-				javaClass.collectMethodsExtended(methods, onlyPublic, excludedClasses, excludedMethods);
-		}
-		it1 = onlyPublic ? getPublicMethods().iterator() : getMethods().iterator();
-		Method nextMethod;
-		while (it1.hasNext()) {
-			nextMethod = (Method) it1.next();
-			if (!excludedMethods.contains(nextMethod))
-				methods.put(nextMethod.getMethodElementSignature(), nextMethod);
-		}
-	}
-
-	/**
-	 * createClassRef - return a JavaURL reference to the named Java class
-	 * 
-	 * @deprecated @see org.eclipse.jem.java.JavaRefFactory#createClassRef(java.lang.String)
-	 */
-	public static JavaClass createClassRef(String targetName) {
-		return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-	}
-
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 */
-	protected Method findClassMethodExtended(String methodName, List parameterTypes) {
-		Method method = getMethod(methodName, parameterTypes);
-		if (method != null)
-			return method;
-		else {
-			JavaClassImpl mySuper;
-			mySuper = (JavaClassImpl) getSupertype();
-			if (mySuper != null)
-				return mySuper.findClassMethodExtended(methodName, parameterTypes);
-		}
-		return null;
-	}
-
-	/**
-	 * Get the method of this name and these parameters. It will look up the supertype hierarchy.
-	 */
-	protected Method findInterfaceMethodExtended(String methodName, List parameterTypes) {
-		Method method = getMethod(methodName, parameterTypes);
-		if (method != null)
-			return method;
-		else {
-			JavaClassImpl superInterface;
-			List list = getImplementsInterfaces();
-			for (int i = 0; i < list.size(); i++) {
-				superInterface = (JavaClassImpl) list.get(i);
-				method = superInterface.findInterfaceMethodExtended(methodName, parameterTypes);
-				if (method != null)
-					return method;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @return
-	 * @deprecated If anyone is referencing this, please use getEAllSuperTypes() instead. This was placed here and misspelled by mistake.
-	 */
-	public EList getAllSupertypes() {
-		getESuperTypes(); //Force reflection, if needed, before getting all supertypes.
-		return super.getEAllSuperTypes();
-	}
-
-	/**
-	 * Overrides to perform reflection if necessary
-	 */
-	public EList getClassImport() {
-		reflectBase();
-		return getClassImportGen();
-	}
-
-	/**
-	 * MOF41, attribute, reference are changed to volatile Because of this we need to re-implement it here to do the merge within the introspection
-	 * adapter instead. The merge done in EClassImpl and above doesn't necessarily do what we need.
-	 */
-	public EList getEAllOperations() {
-		IIntrospectionAdapter ia = getIntrospectionAdapter();
-		if (ia == null)
-			return super.getEAllOperations(); // No introspection, do normal.
-		ESuperAdapter a = getESuperAdapter();
-		if (eAllOperations == null || a.isAllOperationsCollectionModified())
-			eAllOperations = ia.getEAllOperations();
-		return eAllOperations;
-	}
-
-	public EList getEOperations() {
-		IIntrospectionAdapter adapter = getIntrospectionAdapter();
-		if (adapter != null)
-			return adapter.getEOperations();
-		return super.getEOperations();
-	}
-
-	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()) {
-			JavaURL url = new JavaURL(eProxyURI().toString());
-			result = url.getClassName();
-		}
-		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()) {
-			JavaURL url = new JavaURL(eProxyURI().toString());
-			String internalName = url.getPackageName();
-			if (internalName != null && internalName.length() > 0)
-				result = internalName + "." + url.getClassName();
-			else
-				result = url.getClassName();
-		} 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 = "";
-		JavaPackage pack = getJavaPackage();
-		if (pack != null && pack.getPackageName().length() != 0)
-			result = pack.getPackageName() + "." + 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() {
-		ESuperAdapter adapter = ESuperAdapter.getESuperAdapter(this);
-		if (adapter != null)
-			return adapter.getSubclasses();
-		return Collections.EMPTY_LIST;
-	}
-
-	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 = public_;
-		public_ = newPublic;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__PUBLIC, oldPublic, public_));
-	}
-
-	public boolean isFinal() {
-		reflectBase();
-		return isFinalGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = final_;
-		final_ = newFinal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__FINAL, oldFinal, final_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypeKind getKindGen() {
-		return kind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isPublicGen() {
-		return public_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFinalGen() {
-		return final_;
-	}
-
-	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 public_ != PUBLIC_EDEFAULT;
-			case JavaRefPackage.JAVA_CLASS__FINAL:
-				return final_ != 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) {
-
-				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();
-	}
-
-	/**
-	 * <!-- 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(public_);
-		result.append(", final: ");
-		result.append(final_);
-		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/impl/JavaDataTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaDataTypeImpl.java
deleted file mode 100644
index a6912a6..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaDataTypeImpl.java
+++ /dev/null
@@ -1,426 +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.jem.java.impl;
-/*
- *  $RCSfile: JavaDataTypeImpl.java,v $
- *  $Revision: 1.8 $  $Date: 2005/05/11 19:01:16 $ 
- */
-
-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/impl/JavaEventImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaEventImpl.java
deleted file mode 100644
index 179d817..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaEventImpl.java
+++ /dev/null
@@ -1,309 +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.jem.java.impl;
-/*
- *  $RCSfile: JavaEventImpl.java,v $
- *  $Revision: 1.5 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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/impl/JavaFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaFactoryImpl.java
deleted file mode 100644
index 9428d69..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaFactoryImpl.java
+++ /dev/null
@@ -1,68 +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.jem.java.impl;
-/*
- *  $RCSfile: JavaFactoryImpl.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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/impl/JavaPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaPackageImpl.java
deleted file mode 100644
index e3d59ec..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaPackageImpl.java
+++ /dev/null
@@ -1,319 +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.jem.java.impl;
-/*
- *  $RCSfile: JavaPackageImpl.java,v $
- *  $Revision: 1.7 $  $Date: 2005/04/14 19:05:33 $ 
- */
-
-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/impl/JavaParameterImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaParameterImpl.java
deleted file mode 100644
index b1898f9..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaParameterImpl.java
+++ /dev/null
@@ -1,418 +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.jem.java.impl;
-
-/*
- *  $RCSfile: JavaParameterImpl.java,v $
- *  $Revision: 1.8 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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 cached value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean final_ = FINAL_EDEFAULT;
-
-	/**
-	 * 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 final_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = final_;
-		final_ = newFinal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_PARAMETER__FINAL, oldFinal, final_));
-	}
-
-	/**
-	 * @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 final_ != 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(final_);
-		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/impl/JavaRefFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefFactoryImpl.java
deleted file mode 100644
index 380f334..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefFactoryImpl.java
+++ /dev/null
@@ -1,382 +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.jem.java.impl;
-/*
- *  $RCSfile: JavaRefFactoryImpl.java,v $
- *  $Revision: 1.7 $  $Date: 2005/04/14 19:05:33 $ 
- */
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-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.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
-
-
-
-/**
- * @generated
- */
-public class JavaRefFactoryImpl extends EFactoryImpl implements JavaRefFactory {
-
-	
-	protected static Class ReflectionFactoryClass = JavaJDKAdapterFactory.class;
-	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;
-	}
-  public static ResourceSet createJavaContext() {
-    org.eclipse.jem.internal.java.init.JavaInit.init();
-    ResourceSet set = new ResourceSetImpl();
-    set.getAdapterFactories().add(createJavaReflectionAdapterFactory());
-    return set;
-  }
-	protected 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.
-	 */
-	public static Class getReflectionAdapterFactoryClass() {
-		return ReflectionFactoryClass;
-	}
-	/**
-	 * Set the Class for the Java refection adapter factory.
-	 * 
-	 * @see JavaPlugin.startup()
-	 */
-	public static void setReflectionAdapterFactoryClass(Class javaReflectionFactoryClass) {
-		ReflectionFactoryClass = 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();
-		JavaURL javaurl = new JavaURL(targetName);
-		((InternalEObject) ref).eSetProxyURI(URI.createURI(javaurl.getFullString()));
-		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();
-			JavaURL url = new JavaURL(aPackageName, aTypeName);
-			return (JavaHelpers) set.getEObject(URI.createURI(url.getFullString()), 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();
-			JavaURL url = new JavaURL(packageName, JavaPackage.PACKAGE_ID);
-			return (JavaPackage) set.getEObject(URI.createURI(url.getFullString()), true);
-		}
-		return null;
-	}
-
-}
-
-
-
-
-
-
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 d6f7467..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java
+++ /dev/null
@@ -1,1002 +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.jem.java.impl;
-/*
- *  $RCSfile: JavaRefPackageImpl.java,v $
- *  $Revision: 1.7 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static JavaRefPackage init() {
-		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);
-	}
-
-} //JavaRefPackageImpl
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/MethodImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/MethodImpl.java
deleted file mode 100644
index 0c622e9..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/MethodImpl.java
+++ /dev/null
@@ -1,1133 +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.jem.java.impl;
-
-/*
- *  $RCSfile: MethodImpl.java,v $
- *  $Revision: 1.10 $  $Date: 2005/05/11 22:41:06 $ 
- */
-
-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 cached value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isAbstract()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean abstract_ = ABSTRACT_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isNative() <em>Native</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNative()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean native_ = NATIVE_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isSynchronized() <em>Synchronized</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSynchronized()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean synchronized_ = SYNCHRONIZED_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isFinal() <em>Final</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFinal()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean final_ = FINAL_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isConstructor() <em>Constructor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isConstructor()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean constructor = CONSTRUCTOR_EDEFAULT;
-
-	/**
-	 * 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 cached value of the '{@link #isStatic() <em>Static</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStatic()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean static_ = STATIC_EDEFAULT;
-
-	/**
-	 * 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 abstract_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAbstract(boolean newAbstract) {
-		boolean oldAbstract = abstract_;
-		abstract_ = newAbstract;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__ABSTRACT, oldAbstract, abstract_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNativeGen() {
-		return native_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNative(boolean newNative) {
-		boolean oldNative = native_;
-		native_ = newNative;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__NATIVE, oldNative, native_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSynchronizedGen() {
-		return synchronized_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSynchronized(boolean newSynchronized) {
-		boolean oldSynchronized = synchronized_;
-		synchronized_ = newSynchronized;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__SYNCHRONIZED, oldSynchronized, synchronized_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFinalGen() {
-		return final_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFinal(boolean newFinal) {
-		boolean oldFinal = final_;
-		final_ = newFinal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__FINAL, oldFinal, final_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isConstructorGen() {
-		return constructor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConstructor(boolean newConstructor) {
-		boolean oldConstructor = constructor;
-		constructor = newConstructor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__CONSTRUCTOR, oldConstructor, constructor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isStaticGen() {
-		return static_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatic(boolean newStatic) {
-		boolean oldStatic = static_;
-		static_ = newStatic;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__STATIC, oldStatic, static_));
-	}
-
-	/**
-	 * 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 abstract_ != ABSTRACT_EDEFAULT;
-			case JavaRefPackage.METHOD__NATIVE:
-				return native_ != NATIVE_EDEFAULT;
-			case JavaRefPackage.METHOD__SYNCHRONIZED:
-				return synchronized_ != SYNCHRONIZED_EDEFAULT;
-			case JavaRefPackage.METHOD__FINAL:
-				return final_ != FINAL_EDEFAULT;
-			case JavaRefPackage.METHOD__CONSTRUCTOR:
-				return constructor != CONSTRUCTOR_EDEFAULT;
-			case JavaRefPackage.METHOD__STATIC:
-				return static_ != 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(abstract_);
-		result.append(", native: ");
-		result.append(native_);
-		result.append(", synchronized: ");
-		result.append(synchronized_);
-		result.append(", final: ");
-		result.append(final_);
-		result.append(", constructor: ");
-		result.append(constructor);
-		result.append(", static: ");
-		result.append(static_);
-		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/impl/StatementImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/StatementImpl.java
deleted file mode 100644
index fe40d2a..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/StatementImpl.java
+++ /dev/null
@@ -1,140 +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.jem.java.impl;
-/*
- *  $RCSfile: StatementImpl.java,v $
- *  $Revision: 1.4 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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/impl/URL.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/URL.java
deleted file mode 100644
index 26f534a..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/URL.java
+++ /dev/null
@@ -1,76 +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.jem.java.impl;
-/*
- *  $RCSfile: URL.java,v $
- *  $Revision: 1.3 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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("->");
-		if (dotIndex > -1) {
-			ID = urlString.substring(0, dotIndex);
-			String attributeNameString = urlString.substring(dotIndex + 2);
-			attributeNames = new ArrayList();
-			do {
-				dotIndex = attributeNameString.indexOf("->");
-				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")){
-			namespaceName = urlString;
-			ID = null;
-		} else {
-			namespaceName = "?defaultURL?";
-			ID = urlString;
-		}
-	}
-}
-public String toString() {
-	return "URL(" + ((namespaceName == null) ? "" : namespaceName + "#") + ((ID == null) ? "" : ID) + ")";
-}
-}
-
-
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 271d4c2..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.5 $  $Date: 2005/02/15 22:37:02 $ 
- */
-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 ad27664..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.6 $  $Date: 2005/04/14 19:05:33 $ 
- */
-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 c479002..0000000
--- 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 8c1ea3a..0000000
--- a/plugins/org.eclipse.jem/overrides/..ROOT...override
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<event:AddMany 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" xmlns:event="event.xmi" 
-    featureName="eStructuralFeatures">
-  <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-<!-- 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"/>
--->
-</event:AddMany>
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 fdbffdc..0000000
--- a/plugins/org.eclipse.jem/overrides/java/lang/Object.override
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI 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" xmlns:event="event.xmi">
-    
-  <!-- 
-      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. -->
-          
-  <event:Add notifierURI="java:/#boolean" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-  <event:Add notifierURI="java:/#char" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-  <event:Add notifierURI="java:/#int" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-  <event:Add notifierURI="java:/#float" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-  <event:Add notifierURI="java:/#short" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-  <event:Add notifierURI="java:/#long" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-  <event:Add notifierURI="java:/#double" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-  <event:Add notifierURI="java:/#byte" featureName="eStructuralFeatures">
-    <addedEObjects xsi:type="ecore:EReference" name="allocation" containment="true" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation"/>
-  </event:Add>
-</xmi:XMI>
diff --git a/plugins/org.eclipse.jem/plugin.properties b/plugins/org.eclipse.jem/plugin.properties
deleted file mode 100644
index 32046c1..0000000
--- a/plugins/org.eclipse.jem/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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.2 $  $Date: 2005/02/15 22:38:01 $
-#
-
-
-pluginName = Java EMF Model
-providerName = Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/plugin.xml b/plugins/org.eclipse.jem/plugin.xml
deleted file mode 100644
index 85be329..0000000
--- a/plugins/org.eclipse.jem/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jem"
-   name="%pluginName"
-   version="1.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.jem.internal.core.JEMPlugin">
-
-   <runtime>
-      <library name="javainst.jar">
-         <export name="*"/>
-      </library>
-      <library name="mofjava.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.jem.proxy" optional="true"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jem.util"/>
-   </requires>
-
-
-   <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 1be3a37..0000000
--- 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 25b1eec..0000000
--- 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 a519898..0000000
--- a/plugins/org.eclipse.jem/rose/instance.mdl
+++ /dev/null
@@ -1,8477 +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\\src\\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   	(333, 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   	(189, 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       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE))))
-	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 7376d22..0000000
--- a/plugins/org.eclipse.jem/rose/instantiation.cat
+++ /dev/null
@@ -1,3072 +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 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 "object"
-		    quid       	"4017DBE60006"
-		    label      	"object"
-		    supplier   	"Logical View::instantiation::IJavaObjectInstance"
-		    quidu      	"3B782D790296"
-		    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   	384
-	    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   	(1779, 605)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1760
-			justify    	0
-			label      	"IJavaDataTypeInstance")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@2
-			location   	(1779, 555)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	1760
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B8AB17802B1"
-		    compartment 	(object Compartment
-			Parent_View 	@2
-			location   	(1779, 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  	1499)
-		    width      	1778
-		    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  	1328)
-		    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   	(9, 607)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	1698
-			justify    	0
-			label      	"IJavaObjectInstance")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@7
-			location   	(9, 557)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	1698
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B782D790296"
-		    compartment 	(object Compartment
-			Parent_View 	@7
-			location   	(9, 668)
-			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  	1446)
-		    width      	1716
-		    height     	242
-		    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, 544)
-		    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"
-		    compartment 	(object Compartment
-			Parent_View 	@12
-			location   	(329, 475)
-			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  	353)
-		    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   	1081
-	    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   	(1877, 426)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	716
-			justify    	0
-			label      	"PTArrayAccess")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40082E140250"
-		    compartment 	(object Compartment
-			Parent_View 	@38
-			location   	(1877, 487)
-			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  	665)
-		    width      	734
-		    height     	258
-		    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   	(38, 379)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	792
-			justify    	0
-			label      	"PTArrayCreation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083712025A"
-		    compartment 	(object Compartment
-			Parent_View 	@39
-			location   	(38, 440)
-			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  	731)
-		    width      	810
-		    height     	302
-		    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   	(959, 446)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	804
-			justify    	0
-			label      	"PTArrayInitializer")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083968014C"
-		    compartment 	(object Compartment
-			Parent_View 	@40
-			location   	(959, 507)
-			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  	743)
-		    width      	822
-		    height     	168
-		    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   	(734, 789)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	527
-			justify    	0
-			label      	"PTBooleanLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083AE70247"
-		    compartment 	(object Compartment
-			Parent_View 	@41
-			location   	(734, 850)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	2
-			max_width  	481)
-		    width      	545
-		    height     	185
-		    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   	(1493, 771)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	596
-			justify    	0
-			label      	"PTCastExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40083B6F0058"
-		    compartment 	(object Compartment
-			Parent_View 	@42
-			location   	(1493, 832)
-			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  	546)
-		    width      	614
-		    height     	258
-		    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, 434)
-		    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, 760)
-		    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, 415)
-		    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   	(207, 1329)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	447
-			justify    	0
-			label      	"PTCharacterLiteral")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40084DF10277"
-		    compartment 	(object Compartment
-			Parent_View 	@49
-			location   	(207, 1390)
-			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      	465
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @50
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"400837210049"
-		    client     	@39
-		    supplier   	@37
-		    line_style 	3
-		    origin_attachment 	(561, 367)
-		    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   	(960, 1346)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	772
-			justify    	0
-			label      	"PTClassInstanceCreation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40084F40026F"
-		    compartment 	(object Compartment
-			Parent_View 	@51
-			location   	(960, 1407)
-			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  	715)
-		    width      	790
-		    height     	258
-		    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, 1317)
-		    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, 1334)
-		    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   	(1890, 1341)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	558
-			justify    	0
-			label      	"PTConditionalExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400851FB026A"
-		    compartment 	(object Compartment
-			Parent_View 	@55
-			location   	(1890, 1402)
-			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  	512)
-		    width      	576
-		    height     	302
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @56
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"40085274012E"
-		    client     	@55
-		    supplier   	@48
-		    line_style 	3
-		    origin_attachment 	(2168, 1330)
-		    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   	(492, 1676)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	538
-			justify    	0
-			label      	"PTFieldAccess")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400852DF0204"
-		    compartment 	(object Compartment
-			Parent_View 	@57
-			location   	(492, 1737)
-			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  	487)
-		    width      	556
-		    height     	258
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @58
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4008535D0241"
-		    client     	@57
-		    supplier   	@48
-		    line_style 	3
-		    origin_attachment 	(760, 1665)
-		    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   	(1316, 1682)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	948
-			justify    	0
-			label      	"PTInfixExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"4008538B0143"
-		    compartment 	(object Compartment
-			Parent_View 	@59
-			location   	(1316, 1743)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	5
-			max_width  	865)
-		    width      	966
-		    height     	348
-		    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"
-		    compartment 	(object Compartment
-			Parent_View 	@60
-			location   	(2345, 1760)
-			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     	20
-			max_width  	534)
-		    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, 1671)
-		    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   	(99, 3137)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	544
-			justify    	0
-			label      	"PTInstanceof")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"400857D303A2"
-		    compartment 	(object Compartment
-			Parent_View 	@63
-			location   	(99, 3198)
-			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  	493)
-		    width      	562
-		    height     	258
-		    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, 3126)
-		    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   	(318, 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, 4103)
-			fill_color 	13434879
-			nlines     	2
-			max_width  	618
-			justify    	0
-			label      	"PTPrefixExpression")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"40085FAD008B"
-		    compartment 	(object Compartment
-			Parent_View 	@77
-			location   	(9, 4164)
-			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  	553)
-		    width      	636
-		    height     	258
-		    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 	13434879
-			anchor     	2
-			nlines     	5
-			max_width  	334)
-		    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, 4092)
-		    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::PTInstanceReference" @89
-		    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 	@89
-			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 "" @90
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"4017DB4A0341"
-		    client     	@89
-		    supplier   	@72
-		    line_style 	3
-		    origin_attachment 	(1943, 4381)
-		    terminal_attachment 	(1943, 4020)
-		    drawSupplier 	@80)
-		(object ClassView "Class" "Logical View::instantiation::IJavaObjectInstance" @91
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2236, 4886)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@91
-			location   	(2005, 4856)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	462
-			justify    	0
-			label      	"IJavaObjectInstance")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@91
-			location   	(2005, 4806)
-			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"
-		    width      	480
-		    height     	184
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$6" @92
-		    location   	(2130, 4715)
-		    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 "object" @93
-			    Parent_View 	@92
-			    location   	(192, 244)
-			    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   	(2077, 4774)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	134
-				justify    	0
-				label      	"+object"
-				pctDist    	0.231960
-				height     	77
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4017DBE60006"
-			    client     	@92
-			    supplier   	@91
-			    line_style 	0
-			    label      	(object SegLabel @95
-				Parent_View 	@93
-				location   	(2220, 4757)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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   	(192, 244)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"4017DBE60164"
-			    client     	@92
-			    supplier   	@89
-			    line_style 	0)))))))
diff --git a/plugins/org.eclipse.jem/rose/javaModel.mdl b/plugins/org.eclipse.jem/rose/javaModel.mdl
deleted file mode 100644
index fc07501..0000000
--- a/plugins/org.eclipse.jem/rose/javaModel.mdl
+++ /dev/null
@@ -1,8567 +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\\src\\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, 488)
-			    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      	"809135966")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"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))
-	quid       	"39EDFBE003B9"))
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.classpath b/plugins/org.eclipse.jst.common.annotations.core/.classpath
deleted file mode 100644
index 66ade16..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore b/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
deleted file mode 100644
index d3fa362..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-annotations-core.jar
-build.xml
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.project b/plugins/org.eclipse.jst.common.annotations.core/.project
deleted file mode 100644
index 51f02e3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/build.properties b/plugins/org.eclipse.jst.common.annotations.core/build.properties
deleted file mode 100644
index 63eb0dd..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes=plugin.xml,\
-               annotations-core.jar.jar,\
-               annotations-core.jar
-src.includes=schema/
-source.annotations-core.jar=src/,\
-                              property_files/
-output.annotations-core.jar=bin/
diff --git a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml b/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
deleted file mode 100644
index 8f4b045..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.common.annotations.core"
-   name="Annotation Core Plug-in"
-   description="This plugin house core annotation features like the Annotation Tag Parser which is the base parser for reading annotated tags."
-   version="1.0.0"
-   provider-name="Eclipse.org" >
-
-   <runtime>
-      <library name="annotations-core.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires> 
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.wst.common.emf"/> 
-   </requires>
-
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
deleted file mode 100644
index 87718a6..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.core"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties b/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
deleted file mode 100644
index 92b4d62..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-TagSpec.3=Unknown tag scope:
-TagSpec.4=Null tag scope.
-AnnotationTagParser.0=Null event handler.
-AnnotationTagParser.1=
-AnnotationTagRegistry.0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry.9=parseTagAttribs: unknown 'use' value:
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
deleted file mode 100644
index 47767e3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotatedCommentHandler implements TagParseEventHandler {
-
-	private Map annotations;
-
-	private Token annotationToken;
-
-	/**
-	 *  
-	 */
-	public AnnotatedCommentHandler() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#annotationTag(org.eclipse.wst.common.internal.annotations.core.Token)
-	 */
-	public void annotationTag(Token tag) {
-		this.annotationToken = tag;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#endOfTag(int)
-	 */
-	public void endOfTag(int pos) {
-		// Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#attribute(org.eclipse.wst.common.internal.annotations.core.Token,
-	 *      int, org.eclipse.wst.common.internal.annotations.core.Token)
-	 */
-	public void attribute(Token name, int equalsPosition, Token value) {
-		if (value.getText() == null || value.getText().length() == 0)
-			getAnnotations().put(this.annotationToken.getText(), name.getText());
-		else
-			getAnnotations().put(name.getText(), value.getText());
-	}
-
-	/**
-	 * @return Returns the annotations.
-	 */
-	public Map getAnnotations() {
-		if (annotations == null)
-			annotations = new HashMap();
-		return annotations;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
deleted file mode 100644
index f87a38a..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class AnnotationTagParser {
-
-	private TagParseEventHandler handler;
-
-	private char[] input;
-
-	int pos;
-
-	int endOfLastGoodAttParse;
-
-	public AnnotationTagParser(TagParseEventHandler tp) {
-		if (tp == null) {
-			throw new IllegalArgumentException(AnnotationsCoreResources.getString("AnnotationTagParser.0")); //$NON-NLS-1$
-		}
-		handler = tp;
-	}
-
-	private boolean eos() {
-		return pos >= input.length;
-	}
-
-	private boolean isWS(char c) {
-		return c == ' ' || c == '\n' || c == '\r' || c == '\t';
-	}
-
-	private void skipWS() {
-		while (pos < input.length && (isWS(input[pos]) || input[pos] == '*')) {
-			pos++;
-		}
-	}
-
-	// Caller is expected to make sure the eos has not been reached.
-	private char peek() {
-		return input[pos];
-	}
-
-	// Caller is expected to check for EOS.
-	private char nextChar() {
-		return input[pos++];
-	}
-
-	private boolean isNextChar(char c) {
-		if (eos())
-			return false;
-		return peek() == c;
-	}
-
-	private boolean isIDChar(char c) {
-		return !isWS(c) && c != '=' && c != '@' && c != '\"';
-	}
-
-	private Token collectID() {
-		StringBuffer b = new StringBuffer(16);
-		Token t = new Token();
-
-		t.setBeginning(pos);
-		while (!eos() && isIDChar(peek())) {
-			b.append(nextChar());
-		}
-		t.setEnd(pos - 1);
-		t.setText(b.toString());
-		return t;
-	}
-
-	private Token expectAttribName() {
-		if (eos()) {
-			return null;
-		}
-		int save = pos;
-
-		Token retval = collectID();
-		if (retval.length() == 0) {
-			pos = save;
-			return null;
-		}
-		return retval;
-	}
-
-	private Token expectTag() {
-		if (eos()) {
-			return null;
-		}
-		int savePos = pos;
-
-		if (nextChar() != '@') {
-			return null;
-		}
-
-		if (eos() || isWS(peek())) {
-			return null;
-		}
-
-		Token retval = expectAttribName();
-
-		if (retval.length() == 0) {
-			pos = savePos + 1;
-		}
-		retval.setBeginning(savePos);
-
-		// Save end of parse so we can pass it as the end of the parsed tag.
-		endOfLastGoodAttParse = pos;
-		return retval;
-	}
-
-	private Token expectQuotedValue() {
-		skipWS();
-		if (eos()) {
-			return null;
-		}
-
-		Token tok = new Token();
-
-		tok.setBeginning(pos);
-		if (peek() != '\"') {
-			return null;
-		}
-		nextChar();
-
-		if (eos()) {
-			return null;
-		}
-
-		StringBuffer b = new StringBuffer(64);
-
-		while (!eos() && peek() != '\"') {
-			b.append(nextChar());
-		}
-		if (!eos()) {
-			nextChar();
-		}
-
-		tok.setEnd(pos - 1);
-		tok.setText(b.toString());
-		return tok;
-	}
-
-	private boolean expectAssign() {
-		if (eos()) {
-			return false;
-		}
-
-		if (nextChar() == '=') {
-			return true;
-		}
-		pos--;
-		return false;
-	}
-
-	private Token mkNullToken() {
-		Token retval = new Token();
-
-		retval.setBeginning(pos);
-		retval.setEnd(pos - 1);
-		retval.setText(""); //$NON-NLS-1$
-		return retval;
-	}
-
-	private boolean parseNextAttribute() {
-		skipWS();
-		if (eos()) {
-			return false;
-		}
-		Token key = collectID();
-
-		if (key == null || key.length() == 0) {
-			return false;
-		}
-
-		skipWS();
-		if (eos()) {
-			// Go ahead and report it, even though it is a partial attribute. (
-			// we still fail here )
-			handler.attribute(key, -1, mkNullToken());
-			return false;
-		}
-
-		int eqPos = pos;
-
-		if (!expectAssign()) {
-			// Even though we won't parse this as a full attribute, go ahead and
-			// call the handler with it. Some clients want to see partial
-			// attributes.
-			handler.attribute(key, -1, mkNullToken());
-			return false;
-		}
-		skipWS();
-
-		if (eos()) {
-			// Same here - we fail on it, but we report it anyway
-			handler.attribute(key, eqPos, mkNullToken());
-			return false;
-		}
-		Token value = expectQuotedValue();
-
-		if (value == null) {
-			value = collectID();
-			if (isNextChar('=')) {
-				pos = value.getBeginning();
-				value = mkNullToken();
-			}
-		}
-		endOfLastGoodAttParse = pos;
-		handler.attribute(key, eqPos, value);
-		return true;
-	}
-
-	private void parseAttributes() {
-		while (!eos() && parseNextAttribute()) {
-			// loop while not end of string
-		}
-	}
-
-	private void skipToTagChar() {
-		while (!eos() && peek() != '@') {
-			nextChar();
-		}
-	}
-
-	public void setParserInput(char[] text) {
-		input = text;
-		pos = 0;
-		endOfLastGoodAttParse = 0;
-	}
-
-	public void setParserInput(String text) {
-		setParserInput(text.toCharArray());
-	}
-
-	public void parse() {
-		while (!eos()) {
-			skipToTagChar();
-			Token tag = expectTag();
-			if (tag == null) {
-				break;
-			}
-			handler.annotationTag(tag);
-			parseAttributes();
-			handler.endOfTag(endOfLastGoodAttParse);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
deleted file mode 100644
index d9431cf..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.CloneablePublic;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsAdapter extends AdapterImpl implements CloneablePublic {
-
-	public static final String GENERATED = "generated"; //$NON-NLS-1$
-
-	protected final static String ADAPTER_TYPE = AnnotationsAdapter.class.getName();
-
-	public final static EStructuralFeature NOTIFICATION_FEATURE = new EStructuralFeatureImpl() {
-		// anonymous inner class
-	};
-
-	private Map annotationsMap;
-
-	/**
-	 *  
-	 */
-	public AnnotationsAdapter() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() { // throws CloneNotSupportedException {
-		//return super.clone();
-		return null;
-	}
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static void addAnnotations(EObject emfObject, String name, Object value) {
-		if (emfObject == null)
-			return;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		adapter.addAnnotations(name, value);
-	}
-
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static Object getAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		return internalGetAnnotations(emfObject, name);
-	}
-
-	protected static Object internalGetAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		return (adapter == null) ? internalGetAnnotations(emfObject.eContainer(), name) : adapter.getAnnotations(name);
-	}
-
-
-	/**
-	 * @param emfObject
-	 * @param string
-	 */
-	public static Object removeAnnotations(EObject emfObject, String name) {
-		if (emfObject == null)
-			return null;
-		AnnotationsAdapter adapter = getAdapter(emfObject);
-		return adapter.removeAnnotations(name);
-	}
-
-	/**
-	 * @param name
-	 * @param value
-	 */
-	protected void addAnnotations(String name, Object value) {
-		getAnnnotations().put(name, value);
-	}
-
-	protected Object getAnnotations(String name) {
-		return getAnnnotations().get(name);
-	}
-
-	protected Object removeAnnotations(String name) {
-		return getAnnnotations().remove(name);
-	}
-
-	/**
-	 * @return
-	 */
-	protected Map getAnnnotations() {
-		if (annotationsMap == null)
-			annotationsMap = new HashMap();
-		return annotationsMap;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter getAdapter(EObject emfObject) {
-		AnnotationsAdapter adapter = retrieveExistingAdapter(emfObject);
-		return adapter == null ? createAdapter(emfObject) : adapter;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter createAdapter(EObject emfObject) {
-		AnnotationsAdapter adapter = new AnnotationsAdapter();
-		adapter.setTarget(emfObject);
-		emfObject.eAdapters().add(adapter);
-		return adapter;
-	}
-
-	/**
-	 * @param emfObject
-	 * @return
-	 */
-	protected static AnnotationsAdapter retrieveExistingAdapter(EObject emfObject) {
-		return (AnnotationsAdapter) EcoreUtil.getExistingAdapter(emfObject, ADAPTER_TYPE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ADAPTER_TYPE.equals(type);
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
deleted file mode 100644
index e7fdec1..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author kkatyal
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationsCoreResources {
-
-	private static final String BUNDLE_NAME = "annotationcore";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/**
-	 *  
-	 */
-	private AnnotationsCoreResources() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
deleted file mode 100644
index b5a9b32..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.Iterator;
-import java.util.Map;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-/**
- * @author mdelder
- *  
- */
-public class AnnotationsTranslator extends Translator {
-
-	private AnnotatedCommentHandler handler;
-
-	private AnnotationTagParser parser;
-
-	public static final AnnotationsTranslator INSTANCE = new AnnotationsTranslator();
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AnnotationsTranslator() {
-		super("#comment", AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AnnotationsTranslator(String domNameAndPath) {
-		super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE);
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public AnnotationsTranslator(String domNameAndPath, int style) {
-		super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, style | Translator.COMMENT_FEATURE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.wtp.emf.xml.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
-	 *      java.lang.Object)
-	 */
-	public void setMOFValue(EObject emfObject, Object value) {
-		if (value == null)
-			return;
-		getHandler().getAnnotations().clear();
-		getParser().setParserInput(value.toString());
-		getParser().parse();
-		String name;
-		Map annotations = getHandler().getAnnotations();
-		for (Iterator keys = annotations.keySet().iterator(); keys.hasNext();) {
-			name = (String) keys.next();
-			AnnotationsAdapter.addAnnotations(emfObject, name, annotations.get(name));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean isSetMOFValue(EObject emfObject) {
-		return getMOFValue(emfObject) != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public Object getMOFValue(EObject emfObject) {
-		return AnnotationsAdapter.getAnnotations(emfObject, AnnotationsAdapter.GENERATED);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public void unSetMOFValue(EObject emfObject) {
-		AnnotationsAdapter.removeAnnotations(emfObject, AnnotationsAdapter.GENERATED);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean featureExists(EObject emfObject) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
-	 */
-	public boolean isDataType() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
-	 *      java.lang.Object)
-	 */
-	public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
-		return (aFeature == feature);
-	}
-
-	/**
-	 * @return Returns the handler.
-	 */
-	protected AnnotatedCommentHandler getHandler() {
-		if (handler == null)
-			handler = new AnnotatedCommentHandler();
-		return handler;
-	}
-
-	/**
-	 * @return Returns the parser.
-	 */
-	protected AnnotationTagParser getParser() {
-		if (parser == null)
-			parser = new AnnotationTagParser(getHandler());
-		return parser;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
deleted file mode 100644
index f979415..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-
-/**
- * Parser and interface for objects that want to receive parsing events. When parsing is started
- * through the <code>parse()</code> method, event methods are called for interesting features in
- * the parse. ( like a SAX ContentHandler )
- * 
- * @author Pat Kelley
- */
-public interface TagParseEventHandler {
-
-	/**
-	 * Called when the annotation tag is encountered. This will always be the first piece of content
-	 * encountered. Followed by a endOfTag( ) call when the end of the tag is reached.
-	 */
-	public void annotationTag(Token tag);
-
-	/**
-	 * Called when the entire annotation for a single tag has been parsed.
-	 * 
-	 * @param pos
-	 *            Position in the stream of the end of the annotation.
-	 */
-	public void endOfTag(int pos);
-
-	/**
-	 * Called for every attribute setting encountered for an annotation tag.
-	 * 
-	 * @param name
-	 *            Name of the attribute.
-	 * @param equalsPosition
-	 *            Source position of the equals sign, or -1 if no equals sign was found.
-	 * @param value
-	 *            Value of the attribute, with any quotes stripped off. Will be zero length token if
-	 *            no attribute was found.
-	 */
-	public void attribute(Token name, int equalsPosition, Token value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
deleted file mode 100644
index 9d03102..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * A string, and the range it was taken from in the source file. The range is inclusive. (ie, with
- * source "ABCD", the beginning and end for the Token "BC" would be (1,2) )
- * 
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class Token {
-	private String text;
-	private int beginning;
-	private int end;
-
-
-
-	/**
-	 * @return Position in original source of the first character of this token.
-	 */
-	public int getBeginning() {
-		return beginning;
-	}
-
-	/**
-	 * @return Position in the original source of the last character of this token.
-	 */
-	public int getEnd() {
-		return end;
-	}
-
-	/**
-	 * @return The token string.
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * @param i
-	 *            A source position
-	 */
-	public void setBeginning(int i) {
-		beginning = i;
-	}
-
-	/**
-	 * @param i
-	 *            A source position.
-	 */
-	public void setEnd(int i) {
-		end = i;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setText(String string) {
-		text = string;
-	}
-
-	public int length() {
-		return text.length();
-	}
-
-	/**
-	 * Tests whether <code>srcPos</code> comes immediately after the last character in this token.
-	 * 
-	 * @param srcPos
-	 *            A position in the original source the token came from.
-	 * @return true if srcPos comes immediately after this token.
-	 */
-	public boolean immediatelyPrecedes(int srcPos) {
-		return end + 1 == srcPos;
-	}
-
-	/**
-	 * Tests whether srcPos is within the original source range range of the token.
-	 * 
-	 * @param srcPos
-	 * @return
-	 */
-	public boolean contains(int srcPos) {
-		return srcPos >= beginning && srcPos <= end;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.classpath b/plugins/org.eclipse.jst.common.annotations.ui/.classpath
deleted file mode 100644
index 66ade16..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore b/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
deleted file mode 100644
index 2521e52..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.project b/plugins/org.eclipse.jst.common.annotations.ui/.project
deleted file mode 100644
index 04b8576..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.annotations.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/build.properties b/plugins/org.eclipse.jst.common.annotations.ui/build.properties
deleted file mode 100644
index 2f2fd04..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes=plugin.xml,\
-               ui.jar
-src.includes=schema/
-source.ui.jar=src/,\
-                property_files/
-output.ui.jar=bin/
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml b/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
deleted file mode 100644
index ffd9144..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.common.annotations.ui"
-   name="Ui Plug-in"
-   description="This plugin is used for the base annotations ui layer.  The function supplied here allows the code assist for the the annotated tag proposals and completion procedures while editing an annotated file."
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.jst.common.internal.annotations.ui.UiPlugin">
-
-   <runtime>
-      <library name="ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jst.common.annotations.core"/>
-      <import plugin="org.eclipse.jst.common.annotations.controller"/>
-   </requires>
-
-   <extension
-         point="org.eclipse.jdt.ui.javadocCompletionProcessor">
-      <javadocCompletionProcessor
-            name="AnnotationsCompletionProcessor"
-            class="org.eclipse.jst.common.internal.annotations.ui.AnnotationTagCompletionProc"
-            id="AnnotationsCompletionProcessor">
-      </javadocCompletionProcessor>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
deleted file mode 100644
index 9a4918e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.wtp.annotations.ui"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-		
-	
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/property_files" >
-			 <fileset dir="${plugindir}/property_files">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties b/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
deleted file mode 100644
index a184107..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-J2EEAnnotationsCompletionProcessor.3=Error parsing attributes - was expecing a '=' but found '
-J2EEAnnotationsCompletionProcessor.4=' instead.
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd b/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
deleted file mode 100644
index b3af9ec..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

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

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

-<annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

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

-      </documentation>

-   </annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

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

-         </sequence>

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

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

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

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

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

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="AutoCompleteData">

-      <annotation>

-         <documentation>

-            Enables content assist for a single tag set.

-         </documentation>

-      </annotation>

-      <complexType>

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

-            <annotation>

-               <documentation>

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

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

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

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

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

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

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

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
deleted file mode 100644
index 8870163..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
+++ /dev/null
@@ -1,726 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationTagParser;
-import org.eclipse.jst.common.internal.annotations.core.TagParseEventHandler;
-import org.eclipse.jst.common.internal.annotations.core.Token;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationTagRegistry;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValuesHelper;
-import org.eclipse.jst.common.internal.annotations.registry.TagAttribSpec;
-import org.eclipse.jst.common.internal.annotations.registry.TagSpec;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-
-/**
- * @author Pat Kelley
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagCompletionProc implements IJavadocCompletionProcessor, TagParseEventHandler {
-	private static final String[] BOOLEAN_VALID_VALUES = new String[]{"false", "true"}; //$NON-NLS-1$ //$NON-NLS-2$
-	ICompilationUnit m_icu;
-
-	IDocument m_doc;
-
-	List m_tags;
-
-	// Instance variables active when maybeCompleteAttribute is live.
-	Token m_tagName;
-
-	/**
-	 * Set of all attributes names encountered. Only live when maybeCompleteAttribute is live.
-	 */
-	Set m_attSet = new TreeSet();
-
-	/**
-	 * List of Attribute. Only live when maybeCompleAttribute is live.
-	 */
-	List m_attributes = new ArrayList();
-
-	AnnotationTagParser m_parser = new AnnotationTagParser(this);
-
-	/**
-	 * Scope of the tag. TagSpec.TYPE | TagSpec.METHOD | TagSpec.FIELD. Not valid until
-	 * getAnnotationArea has been called for a completions request, and only then if
-	 * getAnnotationArea() did not return null.
-	 */
-	int m_tagScope;
-
-	public AnnotationTagCompletionProc() {
-		initTagInfo();
-	}
-
-	private void initTagInfo() {
-		if (m_tags == null)
-			m_tags = AnnotationTagRegistry.getAllTagSpecs();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeContextInformation(org.eclipse.jdt.core.ICompilationUnit,
-	 *      int)
-	 */
-	public IContextInformation[] computeContextInformation(ICompilationUnit cu, int offset) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeCompletionProposals(org.eclipse.jdt.core.ICompilationUnit,
-	 *      int, int, int)
-	 */
-	public IJavaCompletionProposal[] computeCompletionProposals(ICompilationUnit cu, int offset, int length, int flags) {
-		IEditorInput editorInput = new FileEditorInput((IFile) cu.getResource());
-
-		// Set up completion processor state.
-		m_doc = JavaUI.getDocumentProvider().getDocument(editorInput);
-		m_icu = cu;
-
-		try {
-			AnnotationArea area = getAnnotationArea(offset);
-
-			if (area == null) {
-				return null;
-			}
-
-			// Check for tag completion first. ( the easier case )
-			String tsf = getTagSoFarIfNotCompleted(area.beginOffset, offset);
-
-			if (tsf != null) {
-				return getTagCompletionsFor(tsf, area, length);
-			}
-
-			// Ach, have to try the harder case now, where we parse the
-			// annotation
-			return maybeCompleteAttribute(area, offset);
-
-		} catch (JavaModelException e) {
-			// Silently fail.
-			return null;
-		} catch (BadLocationException ex) {
-			return null;
-		}
-	}
-
-	private IJavaCompletionProposal[] maybeCompleteAttribute(AnnotationArea area, int cursorPos) throws BadLocationException {
-		m_attSet.clear();
-		m_attributes.clear();
-
-		m_parser.setParserInput(m_doc.get(area.beginOffset, area.length()));
-		m_parser.parse();
-
-		TagSpec ts = getTagSpecForTagName(m_tagName.getText());
-
-		// Do we even recognize this tag?
-		if (ts == null) {
-			return null;
-		}
-
-		// Loop through and determine whether the cursor is within a attribute
-		// assignment, or between assignements.
-		Attribute target = null;
-		Attribute last = null;
-		Attribute before = null;
-		Attribute a = null;
-		boolean between = false;
-		int rCurPos = area.relativeCursorPos(cursorPos);
-		Iterator i = m_attributes.iterator();
-		while (i.hasNext()) {
-			a = (Attribute) i.next();
-
-			if (a.contains(rCurPos)) {
-				target = a;
-				break;
-			} else if (last != null) {
-				// See if the cursor is between, but not directly adjacent to
-				// the last two attributes.
-				if (rCurPos > last.maxExtent() + 1 && rCurPos < a.minExtent() - 1) {
-					between = true;
-					break;
-				} else if (a.immediatelyPrecedes(rCurPos)) {
-					before = a;
-					break;
-				}
-			}
-			last = a;
-		}
-
-		if (target == null) {
-			if (between) {
-				// If we're between attributes, suggest all possible attributes.
-				return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-			} else if (before != null) {
-				// We're right after the attribute named in 'before', so set the
-				// target to it, and fall
-				//  through to the target handling code.
-				target = before;
-			} else {
-				// not between and not immediately after an attribute. We are
-				// past the end of the parsed annotation.
-				//  Only offer suggestions if it looks like the last annotation
-				// attribute is valid.
-				if (a == null) {
-					// No annotations attributes, suggest everything.
-					return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-				} else if (rCurPos > a.maxExtent()) {
-					if (a.hasAssignment() && a.hasValue()) {
-						// Last annotation was good, and we're past it, so do
-						// completions for anything
-						return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-					} else if (a.hasAssignment())
-						return attributeValidValuesFor(ts, a, area, cursorPos);
-					else
-						return attributeCompletionsFor(ts, cursorPos - a.name.length(), 0, a.name.getText(), true);
-				} else {
-					// Didn't match anything, not past the end - we're probably
-					// the first attribute
-					// being added to the tag.
-					return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-				}
-			}
-		}
-
-		// Completion for a partial attribute name?
-		if (target.name.immediatelyPrecedes(rCurPos)) {
-			return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText(), !target.hasAssignment());
-		}
-
-		// Are we in the middle of a name?
-		if (target.name.contains(rCurPos)) {
-			// We've opted to replace the entire name for this case, which seems
-			// to make the most sense.
-			return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText().substring(0, rCurPos - target.name.getBeginning()), !target.hasAssignment());
-		}
-
-		// If we got this far, we're either in a value, or really confused.
-		// try and return valid values or bail?
-		if (a.value != null && (a.value.contains(rCurPos) || (target.hasAssignment() && area.relativeCursorPos(cursorPos) > a.name.getBeginning())))
-			return attributeValidValuesFor(ts, a, area, cursorPos);
-		return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
-	}
-
-	/**
-	 * @return valid values for the attribute
-	 */
-	private IJavaCompletionProposal[] attributeValidValuesFor(TagSpec ts, Attribute a, AnnotationArea area, int cursorPos) {
-		TagAttribSpec tas = ts.attributeNamed(a.name.getText());
-		if (tas == null)
-			return null;
-		String[] validValues = getValidValues(tas, a, area);
-		String partialValue = calculatePartialValue(a, area, cursorPos);
-		int valueOffset = calculateValueOffset(a, area, cursorPos);
-		if (validValues == null || validValues.length == 0)
-			return createCustomAttributeCompletionProposals(ts, tas, partialValue, valueOffset, a.value.getText(), area.javaElement);
-		return createAttributeCompletionProposals(partialValue, valueOffset, validValues);
-	}
-
-	/**
-	 * @param ts
-	 * @param tas
-	 * @param partialValue
-	 * @param valueOffset
-	 * @param value
-	 * @param javaElement
-	 * @return
-	 */
-	private IJavaCompletionProposal[] createCustomAttributeCompletionProposals(TagSpec ts, TagAttribSpec tas, String partialValue, int valueOffset, String value, IJavaElement javaElement) {
-		AttributeValuesHelper helper = ts.getValidValuesHelper();
-		if (helper == null)
-			return null;
-		AttributeValueProposalHelper[] proposalHelpers = helper.getAttributeValueProposalHelpers(tas, partialValue, valueOffset, javaElement);
-		if (proposalHelpers == null || proposalHelpers.length == 0)
-			return null;
-		IJavaCompletionProposal[] proposals = new IJavaCompletionProposal[proposalHelpers.length];
-		AnnotationTagProposal proposal;
-		for (int i = 0; i < proposalHelpers.length; i++) {
-			proposal = new AnnotationTagProposal(proposalHelpers[i]);
-			//proposal.setPartialValueString(partialValue);
-			proposals[i] = proposal;
-		}
-		return proposals;
-	}
-
-	private IJavaCompletionProposal[] createAttributeCompletionProposals(String partialValue, int valueOffset, String[] validValues) {
-		List resultingValues = new ArrayList();
-		for (int i = 0; i < validValues.length; i++) {
-			String rplString = validValues[i];
-			if (partialValue != null && !rplString.startsWith(partialValue))
-				continue;
-			AnnotationTagProposal prop = new AnnotationTagProposal(rplString, valueOffset, 0, null, rplString, 1);
-			prop.setEnsureQuoted(true);
-			//prop.setPartialValueString(partialValue);
-			resultingValues.add(prop);
-		}
-		if (resultingValues.isEmpty())
-			return null;
-		return (IJavaCompletionProposal[]) resultingValues.toArray(new IJavaCompletionProposal[resultingValues.size()]);
-	}
-
-	private String[] getValidValues(TagAttribSpec tas, Attribute a, AnnotationArea area) {
-		String[] validValues = tas.getValidValues();
-		if (validValues == null || validValues.length == 0) {
-			AttributeValuesHelper helper = tas.getTagSpec().getValidValuesHelper();
-			if (helper == null)
-				return null;
-			validValues = helper.getValidValues(tas, area.javaElement);
-			if ((validValues == null || validValues.length == 0) && tas.valueIsBool())
-				validValues = BOOLEAN_VALID_VALUES;
-		}
-		return validValues;
-	}
-
-	/**
-	 * @param a
-	 * @param area
-	 * @param cursorPos
-	 * @return
-	 */
-	private int calculateValueOffset(Attribute a, AnnotationArea area, int cursorPos) {
-		if (a.value == null)
-			return cursorPos;
-		int nameEnd = a.name.getEnd();
-		int valBeg = a.value.getBeginning();
-		if (valBeg > nameEnd + 2)
-			return area.relativeToAbs(nameEnd + 2); //Value too far away to be correct.
-		return area.relativeToAbs(valBeg);
-	}
-
-	/**
-	 * @param a
-	 * @param area
-	 * @param cursorPos
-	 * @return
-	 */
-	private String calculatePartialValue(Attribute a, AnnotationArea area, int cursorPos) {
-		if (a.value == null)
-			return null;
-		int nameEnd = a.name.getEnd();
-		int valueBeg = a.value.getBeginning();
-		if (valueBeg > nameEnd + 2)
-			return null; //Value is too far away so it must not be part of this attribute.
-		int relativePos = area.relativeCursorPos(cursorPos);
-		if (a.value.contains(relativePos)) {
-			boolean hasBeginQuote = valueBeg - nameEnd == 2;
-			String value = a.value.getText();
-			int end = relativePos - valueBeg;
-			if (hasBeginQuote)
-				end--;
-			if (end > -1) {
-				int length = value.length();
-				if (end < length)
-					return value.substring(0, end);
-				else if (end == length)
-					return value;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param tagName
-	 * @return
-	 */
-	private TagSpec getTagSpecForTagName(String tagName) {
-		String simpleName = tagName;
-		if (tagName != null && tagName.length() > 0 && tagName.charAt(0) == '@')
-			simpleName = tagName.length() == 2 ? "" : tagName.substring(1); //$NON-NLS-1$
-		switch (m_tagScope) {
-			case TagSpec.TYPE :
-				return AnnotationTagRegistry.getTypeTag(simpleName);
-			case TagSpec.METHOD :
-				return AnnotationTagRegistry.getMethodTag(simpleName);
-			case TagSpec.FIELD :
-				return AnnotationTagRegistry.getFieldTag(simpleName);
-		}
-		return null;
-	}
-
-	private IJavaCompletionProposal[] attributeCompletionsFor(TagSpec ts, int replaceOffset, int replaceLength, String partialAttributeName, boolean appendEquals) {
-		Iterator i = ts.getAttributes().iterator();
-		List props = new ArrayList();
-		while (i.hasNext()) {
-			TagAttribSpec tas = (TagAttribSpec) i.next();
-			String aname = tas.getAttribName();
-
-			// Don't suggest attributes that have already been specified.
-			if (!m_attSet.contains(aname)) {
-				if (aname.startsWith(partialAttributeName)) {
-					String rtxt = appendEquals ? aname + '=' : aname;
-					AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, replaceOffset, replaceLength, null, aname, 1);
-					prop.setHelpText(lookupAttHelp(tas));
-					props.add(prop);
-				}
-			}
-		}
-		if (props.isEmpty()) {
-			return null;
-		}
-		return (IJavaCompletionProposal[]) props.toArray(new IJavaCompletionProposal[props.size()]);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#annotationTag(com.ibm.ws.rd.annotations.Token)
-	 */
-	public void annotationTag(Token tag) {
-		m_tagName = tag;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#endOfTag(int)
-	 */
-	public void endOfTag(int pos) {
-		// Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.ws.rd.annotations.TagParseEventHandler#attribute(com.ibm.ws.rd.annotations.Token,
-	 *      int, com.ibm.ws.rd.annotations.Token)
-	 */
-	public void attribute(Token name, int equalsPosition, Token value) {
-		m_attributes.add(new Attribute(name, equalsPosition, value));
-		m_attSet.add(name.getText());
-	}
-
-	private String getReplacementForTag(TagSpec ts, int beginIndex) {
-		StringBuffer bud = new StringBuffer(32);
-
-		bud.append('@');
-		bud.append(ts.getTagName());
-
-		String prefix = getArrayPrefixForMultipleAttribs(beginIndex);
-		List attributes = ts.getAttributes();
-
-		for (int i = 0; i < attributes.size(); i++) {
-			TagAttribSpec tas = (TagAttribSpec) attributes.get(i);
-
-			if (tas.isRequired()) {
-				bud.append(prefix);
-				bud.append(tas.getAttribName());
-				bud.append('=');
-			}
-		}
-		return bud.toString();
-	}
-
-	private String getArrayPrefixForMultipleAttribs(int beginIndex) {
-		String result = null;
-		String source = null;
-		// Get source from compilation unit
-		try {
-			source = m_icu.getSource();
-			if (source == null || beginIndex < 0)
-				return result;
-			// trim off everything after our begin index
-			source = source.substring(0, beginIndex + 1);
-			int newLineIndex = source.lastIndexOf('\n');
-			//if we are on first line...
-			if (newLineIndex == -1)
-				newLineIndex = 0;
-			// Get the current line
-			String currentLine = source.substring(newLineIndex, beginIndex + 1);
-			// Currently we have to have the '@' sign to show our menu
-			int annotationIndex = currentLine.lastIndexOf('@');
-			result = currentLine.substring(0, annotationIndex);
-			result = result + "  "; //$NON-NLS-1$
-		} catch (Exception e) {
-			// Do nothing
-		}
-
-		return result;
-	}
-
-	private IJavaCompletionProposal[] getTagCompletionsFor(String partialTagName, AnnotationArea area, int selectLength) {
-		List found = new ArrayList();
-
-		for (int i = 0; i < m_tags.size(); i++) {
-			TagSpec ts = (TagSpec) m_tags.get(i);
-			String tname = ts.getTagName();
-
-			if (ts.getScope() == m_tagScope && tname.startsWith(partialTagName)) {
-				String rtxt = getReplacementForTag(ts, area.beginOffset);
-				String labl = '@' + tname;
-				AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, area.beginOffset, Math.max(selectLength, rtxt.length()), null, labl, 1);
-				prop.setHelpText(lookupTagHelp(ts));
-				found.add(prop);
-			}
-		}
-
-		if (!found.isEmpty()) {
-			return (IJavaCompletionProposal[]) found.toArray(new IJavaCompletionProposal[found.size()]);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	private static boolean isWS1(char c) {
-		return c == ' ' || c == '\t' || c == '*' || c == '\r' || c == '\n';
-	}
-
-	private String getTagSoFarIfNotCompleted(int startingAt, int cursorAt) throws BadLocationException {
-		if (m_doc.getChar(startingAt) != '@') {
-			return null;
-		}
-
-		int firstChar = startingAt + 1;
-
-		if (firstChar == cursorAt) {
-			return ""; //$NON-NLS-1$
-		}
-
-		for (int i = firstChar; i < cursorAt; i++) {
-			char c = m_doc.getChar(i);
-
-			if (isWS1(c)) {
-				return null;
-			}
-		}
-
-		return m_doc.get(firstChar, cursorAt - firstChar);
-	}
-
-	/**
-	 * Calculates the the area of the annotation we're trying to complete. Also initializes
-	 * m_tagScope.
-	 * 
-	 * @param fromOffset
-	 * @return
-	 * @throws JavaModelException
-	 */
-	private AnnotationArea getAnnotationArea(int fromOffset) throws JavaModelException {
-		// First, roughly calculate the end of the comment.
-		IJavaElement el = m_icu.getElementAt(fromOffset);
-		int absmax, absmin;
-		if (el == null)
-			return null;
-		int ty = el.getElementType();
-
-		switch (ty) {
-			case IJavaElement.FIELD :
-				IField f = (IField) el;
-				absmax = f.getNameRange().getOffset();
-				absmin = f.getSourceRange().getOffset();
-				m_tagScope = TagSpec.FIELD;
-				break;
-
-			case IJavaElement.TYPE :
-				IType t = (IType) el;
-				absmax = t.getNameRange().getOffset();
-				absmin = t.getSourceRange().getOffset();
-				m_tagScope = TagSpec.TYPE;
-				break;
-
-			case IJavaElement.METHOD :
-				IMethod m = (IMethod) el;
-				absmax = m.getNameRange().getOffset();
-				absmin = m.getSourceRange().getOffset();
-				m_tagScope = TagSpec.METHOD;
-				break;
-
-			default :
-				m_tagScope = -1;
-				return null;
-		}
-
-		// Make sure we're not after the name for the member.
-		if (absmax < fromOffset) {
-			return null;
-		}
-
-		int min = 0, max = 0;
-		try {
-			// Search backwards for the starting '@'.
-			boolean found = false;
-			for (min = fromOffset; min >= absmin; min--) {
-				if (m_doc.getChar(min) == '@') {
-					found = true;
-					break;
-				}
-			}
-			if (!found) {
-				return null;
-			}
-
-			// Search forwards for the next '@', or the end of the comment.
-			for (max = fromOffset + 1; max < absmax; max++) {
-				if (m_doc.getChar(max) == '@') {
-					break;
-				}
-			}
-		} catch (BadLocationException e) {
-			return null;
-		}
-
-		return new AnnotationArea(el, min, Math.min(absmax, max));
-	}
-
-	private String lookupTagHelp(TagSpec ts) {
-		if (ts != null)
-			try {
-				return ts.lookupTagHelp();
-			} catch (MissingResourceException e) {
-				// Do nothing, return null
-			}
-		return null;
-	}
-
-	private String lookupAttHelp(TagAttribSpec tas) {
-		if (tas != null)
-			try {
-				return tas.lookupTagHelp();
-			} catch (MissingResourceException e) {
-				// Do nothing, return null
-			}
-		return null;
-	}
-
-	/**
-	 * A range that goes from the beginning position up to, but not including, the end position.
-	 */
-	private static class AnnotationArea {
-		/**
-		 * Document offset of the beginning of the javadoc annotation.
-		 */
-		int beginOffset;
-
-		/**
-		 * Document offset of the end of the area that could contain an annotation.
-		 */
-		int endOffset;
-		/**
-		 * The Java element that this annotation is assigned.
-		 * 
-		 * @param beg
-		 * @param end
-		 */
-		IJavaElement javaElement;
-
-		public AnnotationArea(IJavaElement javaElement, int beg, int end) {
-			this.javaElement = javaElement;
-			beginOffset = beg;
-			endOffset = end;
-		}
-
-		public boolean contains(int offset) {
-			return offset >= beginOffset && offset < endOffset;
-		}
-
-		public int length() {
-			return endOffset - beginOffset;
-		}
-
-		/**
-		 * Returns the cursor position relative to the area. Only valid if
-		 * <code>this.contains( absCursorPos )</code>
-		 * 
-		 * @param absCursorPos
-		 * @return
-		 */
-		public int relativeCursorPos(int absCursorPos) {
-			return absCursorPos - beginOffset;
-		}
-
-		public int relativeToAbs(int relPos) {
-			return beginOffset + relPos;
-		}
-	}
-
-	private static class Attribute {
-		Token name;
-
-		Token value;
-
-		int equalsPos;
-
-		Attribute(Token n, int ep, Token v) {
-			name = n;
-			value = v;
-			equalsPos = ep;
-		}
-
-		public boolean hasAssignment() {
-			return equalsPos != -1;
-		}
-
-		public boolean hasValue() {
-			return value.length() != 0;
-		}
-
-		public boolean contains(int srcPos) {
-			return srcPos >= minExtent() && srcPos <= maxExtent();
-		}
-
-		public int minExtent() {
-			return name.getBeginning();
-		}
-
-		public int maxExtent() {
-			if (hasAssignment()) {
-				if (hasValue())
-					return value.getEnd();
-				return equalsPos;
-			}
-			return name.getEnd();
-		}
-
-		public boolean immediatelyPrecedes(int pos) {
-			return maxExtent() + 1 == pos;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
deleted file mode 100644
index 0ea5773..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 4, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author kelleyp
- * 
- * A completion proposal especially for Annotation tag completions. This problem this class was
- * created to solve was the problem of attaching help text to a proposal. The mechanism inside of
- * JavaCompletionProposal was useless to us, since it was tied to the idea that the proposal would
- * be for an actual java element, that has javadoc attached to it, etc... So here we subclass
- * JavaCompletionProposal and override <code>getAdditionalProposalInfo</code> for a more suitable
- * way of associating help text with a proposal.
- */
-public class AnnotationTagProposal extends JavaCompletionProposal {
-	private static final char QUOTE = '"';
-	private boolean ensureBeginQuote = false;
-	private boolean ensureEndQuote = false;
-	private String localString;
-	//private String partialValueString;
-	//private AttributeValueProposalHelper helper;
-
-	/**
-	 * Localized help text.
-	 */
-	private String locText;
-
-	/**
-	 * @see JavaCompletionProposal#JavaCompletionProposal(java.lang.String, int, int,
-	 *      org.eclipse.swt.graphics.Image, java.lang.String, int)
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param image
-	 * @param displayString
-	 * @param relevance
-	 */
-	public AnnotationTagProposal(String replacementString, int replacementOffset, int replacementLength, Image image, String displayString, int relevance) {
-		super(replacementString, replacementOffset, replacementLength, image, displayString, relevance);
-		this.localString = displayString;
-	}
-
-	/**
-	 * @see JavaCompletionProposal#JavaCompletionProposal(java.lang.String, int, int,
-	 *      org.eclipse.swt.graphics.Image, java.lang.String, int,
-	 *      org.eclipse.jface.text.ITextViewer)
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param image
-	 * @param displayString
-	 * @param relevance
-	 */
-
-	public AnnotationTagProposal(AttributeValueProposalHelper proposalHelper) {
-		this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), null, proposalHelper.getValueDisplayString(), 1);
-		if (proposalHelper instanceof UIAttributeValueProposalHelper)
-			setImage(((UIAttributeValueProposalHelper) proposalHelper).getImage());
-		setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
-		setEnsureEndQuote(proposalHelper.ensureEndQuote());
-	}
-
-	public AnnotationTagProposal(UIAttributeValueProposalHelper proposalHelper) {
-		this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), proposalHelper.getImage(), proposalHelper.getValueDisplayString(), 1);
-		setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
-		setEnsureEndQuote(proposalHelper.ensureEndQuote());
-	}
-
-	/**
-	 * Our override that uses <code>textHolder</code> to provide the help text.
-	 */
-	public String getAdditionalProposalInfo() {
-		return locText;
-	}
-
-	/**
-	 * Sets the holder of the help text that can be displayed with this proposal.
-	 * 
-	 * @param hld
-	 *            an LocalizedTextContainer
-	 */
-	public void setHelpText(String s) {
-		locText = s;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal#apply(org.eclipse.jface.text.IDocument,
-	 *      char, int)
-	 */
-	public void apply(IDocument document, char trigger, int offset) {
-		ensureQuotedIfNecessary(document, offset);
-		super.apply(document, trigger, offset);
-	}
-
-	/**
-	 * @param document
-	 * @param offset
-	 */
-	private void ensureQuotedIfNecessary(IDocument document, int offset) {
-		if (ensureBeginQuote || ensureEndQuote) {
-			try {
-				char begin = document.getChar(getReplacementOffset() - 1);
-				char end = document.getChar(offset);
-				if (ensureBeginQuote && ensureEndQuote && begin != QUOTE && end != QUOTE) {
-					StringBuffer b = new StringBuffer();
-					b.append(QUOTE).append(localString).append(QUOTE);
-					localString = b.toString();
-				} else if (ensureBeginQuote && begin != QUOTE)
-					localString = QUOTE + localString;
-				else if (ensureEndQuote && end != QUOTE)
-					localString = localString + QUOTE;
-				setReplacementString(localString);
-				setCursorPosition(localString.length());
-			} catch (BadLocationException e) {
-				// Do nothing
-			}
-		}
-	}
-
-	public void setEnsureQuoted(boolean ensureQuoted) {
-		setEnsureBeginQuote(ensureQuoted);
-		setEnsureEndQuote(ensureQuoted);
-	}
-
-	//public void setPartialValueString(String partialValueString) {
-	//	this.partialValueString = partialValueString;
-	//}
-	public void setEnsureBeginQuote(boolean ensureBeginQuote) {
-		this.ensureBeginQuote = ensureBeginQuote;
-	}
-
-	public void setEnsureEndQuote(boolean ensureEndQuote) {
-		this.ensureEndQuote = ensureEndQuote;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
deleted file mode 100644
index 5062b28..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author kkatyal
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class IWRDResources {
-
-	private static final String BUNDLE_NAME = "taghandlerui";//$NON-NLS-1$
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	/**
-	 *  
-	 */
-	private IWRDResources() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		// TODO Auto-generated method stub
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
deleted file mode 100644
index d595384..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author DABERG
- *  
- */
-public class UIAttributeValueProposalHelper extends AttributeValueProposalHelper {
-	private Image image;
-
-	/**
-	 * @param replacementString
-	 * @param valueOffset
-	 * @param replacementLength
-	 * @param valueDisplayString
-	 */
-	public UIAttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
-		super(replacementString, valueOffset, replacementLength, valueDisplayString);
-	}
-
-	public Image getImage() {
-		return image;
-	}
-
-	public void setImage(Image image) {
-		this.image = image;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java
deleted file mode 100644
index 6e96f4c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UiPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static UiPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public UiPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.internal.annotations.ui.UiPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UiPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = UiPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/.classpath b/plugins/org.eclipse.jst.common.frameworks/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.frameworks/.cvsignore b/plugins/org.eclipse.jst.common.frameworks/.cvsignore
deleted file mode 100644
index e483d25..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-jdt_integration.jar
diff --git a/plugins/org.eclipse.jst.common.frameworks/.project b/plugins/org.eclipse.jst.common.frameworks/.project
deleted file mode 100644
index 22c0bcb..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.common.frameworks</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.frameworks/build.properties b/plugins/org.eclipse.jst.common.frameworks/build.properties
deleted file mode 100644
index 4c471a4..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.jdt_integration.jar = src/
-output.jdt_integration.jar = bin/
-bin.includes = plugin.xml,\
-               jdt_integration.jar
diff --git a/plugins/org.eclipse.jst.common.frameworks/component.xml b/plugins/org.eclipse.jst.common.frameworks/component.xml
deleted file mode 100644
index 07a555f..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/component.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-	name="org.eclipse.jst.common.frameworks">
-	<component-depends unrestricted="true"></component-depends>
-	<plugin id="org.eclipse.jst.common.frameworks" fragment="false" />
-	<plugin id="org.eclipse.jst.common.frameworks.ui" fragment="false" />
-	<plugin id="org.eclipse.jst.common.launcher.ant" fragment="false" />
-	<plugin id="org.eclipse.jst.common.navigator.java" fragment="false" />
-	<plugin id="org.eclipse.jst.common.annotations.controller"
-		fragment="false" />
-	<plugin id="org.eclipse.jst.common.annotations.core"
-		fragment="false" />
-	<plugin id="org.eclipse.jst.common.annotations.ui" fragment="false" />
-</component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/plugin.xml b/plugins/org.eclipse.jst.common.frameworks/plugin.xml
deleted file mode 100644
index e336c65..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/plugin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.common.frameworks"
-   name="Integration Plug-in"
-   description="This plugin provides an integration layer with jdt. It provides function for the working copy manager and for java project creation."
-   version="1.0.0"
-   provider-name="Eclipse.org">
-
-   <runtime>
-      <library name="jdt_integration.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-      <import plugin="org.eclipse.jem.util"/>
-      <import plugin="org.eclipse.core.resources"/>
-   </requires>
-   
-  <extension
-         id="context.Sensitive.Class.workingCopyManager"
-         name="Working Copy Manager - Headless Context Class"
-         point="org.eclipse.jem.util.uiContextSensitiveClass">
-      <uiContextSensitiveClass
-            key="workingCopyManager"
-            context="Headless"
-            className="org.eclipse.jst.common.jdt.internal.integration.WTPWorkingCopyManager">
-      </uiContextSensitiveClass>
-   </extension>
-   
-   <extension
-        id="javaProjectValidationHandler"
-        name="javaProjectValidationHandler"
-        point="org.eclipse.wst.common.frameworks.validationSelectionHandler">
-      <validationSelectionHandler
-        id="javaProjectValidationHandler"
-        handlerClass="org.eclipse.jst.common.jdt.internal.integration.JavaProjectValidationHandler"
-        selectionType="org.eclipse.jdt.core.IJavaProject"/>
-   </extension>
-        
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/AbstractFlexibleProjectContainer.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/AbstractFlexibleProjectContainer.java
deleted file mode 100644
index 1e7f179..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/AbstractFlexibleProjectContainer.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.classpath;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IFlexibleProject;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public abstract class AbstractFlexibleProjectContainer
-
-    implements IClasspathContainer
-
-{
-    protected final IPath path;
-    protected final IProject project;
-    protected final String component;
-
-    public AbstractFlexibleProjectContainer( final IPath path,
-                                             final IProject project )
-    {
-        this.path = path;
-        this.project = project;
-        this.component = path.segment( 1 );
-    }
-    
-    public int getKind()
-    {
-        return K_APPLICATION;
-    }
-
-    public IPath getPath()
-    {
-        return this.path;
-    }
-    
-    protected static final class PathType
-    {
-        private final String type;
-        
-        private PathType( final String type )
-        {
-            this.type = type;
-        }
-        
-        public static final PathType 
-            LIB_DIRECTORY = new PathType( "lib" ),
-            CLASSES_DIRECTORY = new PathType( "classes" );
-    }
-
-    protected IClasspathEntry[] getClasspathEntries( final String component,
-                                                     final IPath[] paths,
-                                                     final PathType[] types )
-    {
-        final ArrayList cp = new ArrayList();
-        
-        if( ! isFlexibleProject( this.project ) )
-        {
-            final IClasspathEntry[] array = new IClasspathEntry[ cp.size() ];
-            return (IClasspathEntry[]) cp.toArray( array );
-        }
-        
-        final IFlexibleProject fp 
-            = ComponentCore.createFlexibleProject( this.project );
-        
-        final IVirtualComponent vc = fp.getComponent( component );
-        
-        for( int i = 0; i < paths.length; i++ )
-        {
-            final IVirtualFolder vf = vc.getFolder( paths[ i ] );
-            
-            if( types[ i ] == PathType.LIB_DIRECTORY )
-            {
-                final IVirtualResource[] contents;
-                
-                try
-                {
-                    contents = vf.members();
-                }
-                catch( CoreException e )
-                {
-                    // TODO: Should this be reported somehow?
-                    continue;
-                }
-
-                for( int j = 0; j < contents.length; j++ )
-                {
-					// No need to fetch the IResource here. Could use getWorkspaceRelativePath();
-                    final IResource r = contents[ j ].getUnderlyingResource();
-                    final IPath p = r.getFullPath();
-                    final File f = r.getLocation().toFile();
-                    final String fname = f.getName().toLowerCase();
-                    
-                    if( f.isFile() && fname.endsWith( ".jar" ) )
-                    {
-                        cp.add( JavaCore.newLibraryEntry( p, null, null ) );
-                    }
-                }
-            }
-            else
-            {
-                final IFolder[] uf = vf.getUnderlyingFolders();
-                
-                for( int j = 0; j < uf.length; j++ )
-                {
-                    final IPath p = uf[ j ].getFullPath();
-                    
-                    if( ! isSourceDirectory( p ) )
-                    {
-                        cp.add( JavaCore.newLibraryEntry( p, null, null ) );
-                    }
-                }
-            }
-        }
-            
-        final IClasspathEntry[] array = new IClasspathEntry[ cp.size() ];
-        return (IClasspathEntry[]) cp.toArray( array );
-    }
-    
-    private boolean isFlexibleProject( final IProject project )
-    {
-        try
-        {
-            final String nature 
-                = "org.eclipse.wst.common.modulecore.ModuleCoreNature";
-            
-            return project.getNature( nature ) != null;
-        }
-        catch( CoreException e )
-        {
-            return false;
-        }
-    }
-    
-    private boolean isSourceDirectory( final IPath path )
-    {
-        try
-        {
-            final IJavaProject jproject = JavaCore.create( this.project );
-            final IClasspathEntry[] cp = jproject.getRawClasspath();
-            
-            for( int i = 0; i < cp.length; i++ )
-            {
-                final IClasspathEntry cpe = cp[ i ];
-                
-                if( cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE &&
-                    cpe.getPath().equals( path ) )
-                {
-                    return true;
-                }
-            }
-            
-            return false;
-        }
-        catch( JavaModelException e )
-        {
-            // TODO: Handle this better.
-            return false;
-        }
-    }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/IJavaProjectCreationProperties.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/IJavaProjectCreationProperties.java
deleted file mode 100644
index 90a0d4b..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/IJavaProjectCreationProperties.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationProperties;
-
-public interface IJavaProjectCreationProperties extends IProjectCreationProperties {
-
-	/**
-	 * Optional, type String []. These names are relative.
-	 */
-	public static final String SOURCE_FOLDERS = "JavaProjectCreationDataModel.SOURCE_FOLDERS"; //$NON-NLS-1$
-	/**
-	 * Optional, type Boolean default is True
-	 */
-	public static final String CREATE_SOURCE_FOLDERS = "JavaProjectCreationDataModel.CREATE_SOURCE_FOLDERS"; //$NON-NLS-1$
-
-
-	/**
-	 * Optional, type IClasspathEntry[]
-	 */
-	public static final String CLASSPATH_ENTRIES = "JavaProjectCreationDataModel.CLASSPATH_ENTRIES"; //$NON-NLS-1$
-
-	/**
-	 * Optional, type String
-	 */
-	public static final String OUTPUT_LOCATION = "JavaProjectCreationDataModel.OUTPUT_LOCATION"; //$NON-NLS-1$
-	
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java
deleted file mode 100644
index abab902..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.jdom.DOMFactory;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-
-
-/**
- * @author DABERG
- * 
- * This class is used by the Java snippet support to capture the insertionString that is to be
- * inserted at the users selection point. It also provides the ability to define additional fields
- * and methods to support the insertionString.
- */
-public class JavaInsertionHelper {
-	protected DOMFactory domFactory = new DOMFactory();
-	protected List fields;
-	protected List methods;
-	protected List imports;
-	protected String insertionString;
-	protected List extendedOperations;
-
-	/**
-	 *  
-	 */
-	public JavaInsertionHelper() {
-		super();
-	}
-
-	/**
-	 * @return
-	 */
-	public List getFields() {
-		return fields;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getInsertionString() {
-		return insertionString;
-	}
-
-	/**
-	 * @return
-	 */
-	public List getMethods() {
-		return methods;
-	}
-
-	/**
-	 * This is required to be set by the client. This is the String that will be inserted at the
-	 * users selection point.
-	 * 
-	 * @param string
-	 */
-	public void setInsertionString(String string) {
-		insertionString = string;
-	}
-
-	/**
-	 * This is a utility method that will parse the methodString and create a IDOMMethod. The
-	 * DOMFactory will be used to create the method. This new method will be added to the list of
-	 * methods.
-	 * 
-	 * @param methodString
-	 * @see DOMFactory#createMethod(java.lang.String)
-	 * @link org.eclipse.jdt.core.jdom.IDOMMethod
-	 */
-	public void addMethodFromSourceString(String methodString) {
-		if (methodString != null && methodString.length() > 0) {
-			if (methods == null)
-				methods = new ArrayList();
-			methods.add(domFactory.createMethod(methodString));
-		}
-	}
-
-	/**
-	 * This is a utility method that will parse the fieldString and create a IDOMField. The
-	 * DOMFactory will be used to create the field. This new field will be added to the list of
-	 * fields.
-	 * 
-	 * @param fieldString
-	 * @see DOMFactory#createField(java.lang.String)
-	 * @link org.eclipse.jdt.core.jdom.IDOMField
-	 */
-	public void addFieldFromSourceString(String fieldString) {
-		if (fieldString != null && fieldString.length() > 0) {
-			if (fields == null)
-				fields = new ArrayList();
-			fields.add(domFactory.createField(fieldString));
-		}
-	}
-
-	/**
-	 * Add an import that is either the qualified name of a type or a package name with .* at the
-	 * end.
-	 * 
-	 * @param importString
-	 */
-	public void addImport(String importString) {
-		if (importString != null && importString.length() > 0) {
-			if (imports == null)
-				imports = new ArrayList();
-			imports.add(importString);
-		}
-	}
-
-	/**
-	 * Return true if the insertionString is set and not a zero length.
-	 * 
-	 * @return
-	 */
-	public boolean canInsertText() {
-		return insertionString != null && insertionString.length() > 0;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean hasFields() {
-		return fields != null && !fields.isEmpty();
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean hasMethods() {
-		return methods != null && !methods.isEmpty();
-	}
-
-	public boolean hasImports() {
-		return imports != null && !imports.isEmpty();
-	}
-
-	/**
-	 * @return Returns the imports.
-	 */
-	public List getImportStatements() {
-		return imports;
-	}
-
-	/**
-	 * @return Returns the extendedOperations.
-	 */
-	public List getExtendedOperations() {
-		return extendedOperations;
-	}
-
-	/**
-	 * This method allows you to add additional operations which will be performed after this
-	 * JavaInsertionHelper is processed by the JavaInsertionOperation.
-	 * 
-	 * @param operation
-	 * @link JavaInsertionOperation
-	 */
-	public void addExtendedOperation(IHeadlessRunnableWithProgress operation) {
-		if (operation != null) {
-			if (extendedOperations == null)
-				extendedOperations = new ArrayList();
-			extendedOperations.add(operation);
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModel.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModel.java
deleted file mode 100644
index 85c47c9..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModel.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 4, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-
-
-/**
- * @deprecated
- * @see org.eclipse.jst.common.jdt.internal.integration.IJavaProjectCreationProperties
- */
-public class JavaProjectCreationDataModel extends ProjectCreationDataModel {
-
-	/**
-	 * Optional, type String []. These names are relative.
-	 */
-	public static final String SOURCE_FOLDERS = "JavaProjectCreationDataModel.SOURCE_FOLDERS"; //$NON-NLS-1$
-	/**
-	 * Optional, type Boolean default is True
-	 */
-	public static final String CREATE_SOURCE_FOLDERS = "JavaProjectCreationDataModel.CREATE_SOURCE_FOLDERS"; //$NON-NLS-1$
-
-
-	/**
-	 * Optional, type IClasspathEntry[]
-	 */
-	public static final String CLASSPATH_ENTRIES = "JavaProjectCreationDataModel.CLASSPATH_ENTRIES"; //$NON-NLS-1$
-
-	/**
-	 * Optional, type String
-	 */
-	public static final String OUTPUT_LOCATION = "JavaProjectCreationDataModel.OUTPUT_LOCATION"; //$NON-NLS-1$
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#getDefaultOperation()
-	 */
-	public WTPOperation getDefaultOperation() {
-		return new JavaProjectCreationOperation(this);
-	}
-
-	protected void initValidBaseProperties() {
-		super.initValidBaseProperties();
-		addValidBaseProperty(OUTPUT_LOCATION);
-		addValidBaseProperty(SOURCE_FOLDERS);
-		addValidBaseProperty(CLASSPATH_ENTRIES);
-		addValidBaseProperty(CREATE_SOURCE_FOLDERS);
-	}
-
-	protected Object getDefaultProperty(String propertyName) {
-		// TODO pull these from the java preferences
-		if (propertyName.equals(OUTPUT_LOCATION)) {
-			return "bin"; //$NON-NLS-1$
-		}
-		if (propertyName.equals(SOURCE_FOLDERS)) {
-			return new String[0]; //$NON-NLS-1$
-		}
-		if (propertyName.equals(CREATE_SOURCE_FOLDERS))
-			return Boolean.TRUE;
-		return super.getDefaultProperty(propertyName);
-	}
-
-	public IPath getOutputPath() {
-		String outputLocation = getStringProperty(OUTPUT_LOCATION);
-		return getProject().getFullPath().append(outputLocation);
-	}
-
-	public IClasspathEntry[] getClasspathEntries() {
-		IClasspathEntry[] entries = (IClasspathEntry[]) getProperty(CLASSPATH_ENTRIES);
-		IClasspathEntry[] sourceEntries = null;
-		if (getBooleanProperty(CREATE_SOURCE_FOLDERS))
-			sourceEntries = getSourceClasspathEntries();
-		return combineArrays(sourceEntries, entries);
-	}
-
-	/**
-	 * @param sourceEntries
-	 * @param entries
-	 * @return
-	 */
-	private IClasspathEntry[] combineArrays(IClasspathEntry[] sourceEntries, IClasspathEntry[] entries) {
-		if (sourceEntries != null) {
-			if (entries == null)
-				return sourceEntries;
-			return doCombineArrays(sourceEntries, entries);
-		} else if (entries != null)
-			return entries;
-		return new IClasspathEntry[0];
-	}
-
-	/**
-	 * @param sourceEntries
-	 * @param entries
-	 * @return
-	 */
-	private IClasspathEntry[] doCombineArrays(IClasspathEntry[] sourceEntries, IClasspathEntry[] entries) {
-		IClasspathEntry[] result = new IClasspathEntry[sourceEntries.length + entries.length];
-		System.arraycopy(sourceEntries, 0, result, 0, sourceEntries.length);
-		System.arraycopy(entries, 0, result, sourceEntries.length, entries.length);
-		return result;
-	}
-
-	private IClasspathEntry[] getSourceClasspathEntries() {
-		String[] sourceFolders = (String[]) getProperty(SOURCE_FOLDERS);
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < sourceFolders.length; i++) {
-			list.add(JavaCore.newSourceEntry(getProject().getFullPath().append(sourceFolders[i])));
-		}
-		IClasspathEntry[] classpath = new IClasspathEntry[list.size()];
-		for (int i = 0; i < classpath.length; i++) {
-			classpath[i] = (IClasspathEntry) list.get(i);
-		}
-		return classpath;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModelProvider.java
deleted file mode 100644
index 2939fae..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProvider;
-
-public class JavaProjectCreationDataModelProvider extends ProjectCreationDataModelProvider implements IJavaProjectCreationProperties {
-
-
-	public String[] getPropertyNames() {
-		return combineProperties(super.getPropertyNames(), new String[]{OUTPUT_LOCATION, SOURCE_FOLDERS, CLASSPATH_ENTRIES, CREATE_SOURCE_FOLDERS});
-	}
-
-	public IDataModelOperation getDefaultOperation() {
-		return new JavaProjectCreationOp(model);
-	}
-
-	public Object getDefaultProperty(String propertyName) {
-		// TODO pull these from the java preferences
-		if (propertyName.equals(OUTPUT_LOCATION)) {
-			return "bin"; //$NON-NLS-1$
-		}
-		if (propertyName.equals(SOURCE_FOLDERS)) {
-			return new String[0];
-		}
-		if (propertyName.equals(CREATE_SOURCE_FOLDERS))
-			return Boolean.TRUE;
-		return null;
-	}
-
-	
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOp.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOp.java
deleted file mode 100644
index 7697f9d..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOp.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 4, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.WTPProjectUtilities;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationOp;
-
-public class JavaProjectCreationOp extends ProjectCreationOp {
-
-	public JavaProjectCreationOp(IDataModel dataModel) {
-		super(dataModel);
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		super.execute(monitor, info);
-		try {
-			createJavaProject(monitor);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return OK_STATUS;
-	}
-
-	private void createJavaProject(IProgressMonitor monitor) throws CoreException {
-		IProject project = (IProject) model.getProperty(IJavaProjectCreationProperties.PROJECT);
-		WTPProjectUtilities.addNatureToProjectLast(project, JavaCore.NATURE_ID);
-		IJavaProject javaProject = JavaCore.create(project);
-		javaProject.setOutputLocation(getOutputPath(project), monitor);
-		javaProject.setRawClasspath(getClasspathEntries(project), monitor);
-		if (model.getBooleanProperty(IJavaProjectCreationProperties.CREATE_SOURCE_FOLDERS)) {
-			String[] sourceFolders = (String[]) model.getProperty(IJavaProjectCreationProperties.SOURCE_FOLDERS);
-			IFolder folder = null;
-			for (int i = 0; i < sourceFolders.length; i++) {
-				folder = project.getFolder(sourceFolders[i]);
-				folder.create(true, true, monitor);
-			}
-		}
-	}
-
-	private IPath getOutputPath(IProject project) {
-		String outputLocation = model.getStringProperty(IJavaProjectCreationProperties.OUTPUT_LOCATION);
-		return project.getFullPath().append(outputLocation);
-	}
-
-	private IClasspathEntry[] getClasspathEntries(IProject project) {
-		IClasspathEntry[] entries = (IClasspathEntry[]) model.getProperty(IJavaProjectCreationProperties.CLASSPATH_ENTRIES);
-		IClasspathEntry[] sourceEntries = null;
-		if (model.getBooleanProperty(IJavaProjectCreationProperties.CREATE_SOURCE_FOLDERS))
-			sourceEntries = getSourceClasspathEntries(project);
-		return combineArrays(sourceEntries, entries);
-	}
-
-	private IClasspathEntry[] getSourceClasspathEntries(IProject project) {
-		String[] sourceFolders = (String[]) model.getProperty(IJavaProjectCreationProperties.SOURCE_FOLDERS);
-		ArrayList list = new ArrayList();
-		for (int i = 0; i < sourceFolders.length; i++) {
-			list.add(JavaCore.newSourceEntry(project.getFullPath().append(sourceFolders[i])));
-		}
-		IClasspathEntry[] classpath = new IClasspathEntry[list.size()];
-		for (int i = 0; i < classpath.length; i++) {
-			classpath[i] = (IClasspathEntry) list.get(i);
-		}
-		return classpath;
-	}
-
-	private IClasspathEntry[] combineArrays(IClasspathEntry[] sourceEntries, IClasspathEntry[] entries) {
-		if (sourceEntries != null) {
-			if (entries == null)
-				return sourceEntries;
-			return doCombineArrays(sourceEntries, entries);
-		} else if (entries != null)
-			return entries;
-		return new IClasspathEntry[0];
-	}
-
-	private IClasspathEntry[] doCombineArrays(IClasspathEntry[] sourceEntries, IClasspathEntry[] entries) {
-		IClasspathEntry[] result = new IClasspathEntry[sourceEntries.length + entries.length];
-		System.arraycopy(sourceEntries, 0, result, 0, sourceEntries.length);
-		System.arraycopy(entries, 0, result, sourceEntries.length, entries.length);
-		return result;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOperation.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOperation.java
deleted file mode 100644
index 90f7f95..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationOperation.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 4, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.wst.common.frameworks.internal.WTPProjectUtilities;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationOperation;
-
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class JavaProjectCreationOperation extends ProjectCreationOperation {
-
-	public JavaProjectCreationOperation(JavaProjectCreationDataModel dataModel) {
-		super(dataModel);
-	}
-
-	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-		super.execute(monitor);
-		createJavaProject(monitor);
-	}
-
-	private void createJavaProject(IProgressMonitor monitor) throws CoreException {
-		JavaProjectCreationDataModel model = (JavaProjectCreationDataModel) operationDataModel;
-		IProject project = model.getProject();
-		WTPProjectUtilities.addNatureToProjectLast(project, JavaCore.NATURE_ID);
-		IJavaProject javaProject = JavaCore.create(project);
-		javaProject.setOutputLocation(model.getOutputPath(), monitor);
-		javaProject.setRawClasspath(model.getClasspathEntries(), monitor);
-		if (model.getBooleanProperty(JavaProjectCreationDataModel.CREATE_SOURCE_FOLDERS)) {
-			String[] sourceFolders = (String[]) model.getProperty(JavaProjectCreationDataModel.SOURCE_FOLDERS);
-			IFolder folder = null;
-			for (int i = 0; i < sourceFolders.length; i++) {
-				folder = project.getFolder(sourceFolders[i]);
-				folder.create(true, true, monitor);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java
deleted file mode 100644
index a5f04eb..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler;
-
-/**
- * Java Project validation 
- */
-public class JavaProjectValidationHandler implements IValidationSelectionHandler {
-	
-	private String validationType = null;
-	
-	/**
-	 * Default constructor
-	 */
-	public JavaProjectValidationHandler() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getBaseValidationType(java.lang.Object)
-	 */
-	public IResource getBaseValidationType(Object selection) {
-		if (selection instanceof IJavaProject)
-			return ((IJavaProject)selection).getProject();
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getValidationTypeString()
-	 */
-	public String getValidationTypeString() {
-		return validationType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#setValidationTypeString(java.lang.String)
-	 */
-	public void setValidationTypeString(String validationType) {
-		this.validationType = validationType;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
deleted file mode 100644
index c656337..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-
-
-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;
-
-import org.eclipse.core.internal.resources.Workspace;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.frameworks.internal.ISaveHandler;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerHeadless;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerRegister;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Insert the type's description here. Creation date: (4/27/2001 4:14:30 PM)
- * 
- * @author: Administrator
- */
-public class WTPWorkingCopyManager implements WorkingCopyManager {
-
-	//New CUs that will need to be deleted upon dispose
-	private List originalNewCompilationUnits;
-	//New CUs that were created that need saved immediately (after each gen)
-	private List needsSavingCompilationUnits;
-	//A complete list of new CUs that is only cleared on save and dispose
-	private List newCompilationUnits;
-	private HashMap deletedCompilationUnits;
-	protected static final Class IRESOURCE_CLASS = IResource.class;
-
-	/**
-	 * WTPWorkingCopyManager constructor comment.
-	 */
-	public WTPWorkingCopyManager() {
-		super();
-	}
-
-	protected void addDeletedCompilationUnit(ICompilationUnit cu) {
-		getNeedsSavingCompilationUnits().remove(cu);
-		if (!getOriginalNewCompilationUnits().contains(cu) && !getDeletedCompilationUnits().containsKey(cu))
-			primAddDeletedCompilationUnit(cu);
-		getOriginalNewCompilationUnits().remove(cu);
-	}
-
-	protected void addNewCompilationUnit(ICompilationUnit cu, ICompilationUnit workingCopy) {
-		getNewCompilationUnits().add(cu);
-		getNeedsSavingCompilationUnits().add(workingCopy);
-		if (!getDeletedCompilationUnits().containsKey(cu))
-			getOriginalNewCompilationUnits().add(cu);
-	}
-
-	/**
-	 * This will save all of the new CompilationUnits to be saved.
-	 */
-	protected void commitWorkingCopy(ICompilationUnit wc, IProgressMonitor monitor) {
-		try {
-			try {
-				wc.commitWorkingCopy(false, monitor);
-			} catch (JavaModelException e) {
-				if (isFailedWriteFileFailure(e) && shouldSaveReadOnly(wc))
-					wc.commitWorkingCopy(false, monitor);
-				else
-					throw e;
-			}
-		} catch (JavaModelException e) {
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
-			throw new SaveFailedException(e);
-		} finally {
-			try {
-				wc.discardWorkingCopy();
-			} catch (JavaModelException e1) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e1);
-				throw new SaveFailedException(e1);
-			}
-		}
-	}
-
-	/**
-	 * This will delete
-	 * 
-	 * @cu from the workbench and fix the internal references for this working copy manager.
-	 */
-	public void delete(ICompilationUnit cu, IProgressMonitor monitor) {
-		if (cu.isWorkingCopy())
-			cu = cu.getPrimary();
-		addDeletedCompilationUnit(cu);
-		try {
-			cu.delete(false, monitor);
-		} catch (JavaModelException e) {
-			if (e.getStatus().getCode() != org.eclipse.jdt.core.IJavaModelStatusConstants.ELEMENT_DOES_NOT_EXIST)
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
-		}
-	}
-
-	protected void discardOriginalNewCompilationUnits() {
-		if (getOriginalNewCompilationUnits().isEmpty())
-			return;
-		List cus = getOriginalNewCompilationUnits();
-		ICompilationUnit cu;
-		ICompilationUnit wc = null;
-		for (int i = 0; i < cus.size(); i++) {
-			cu = (ICompilationUnit) cus.get(i);
-			if (cu.isWorkingCopy()) {
-				wc = cu;
-				cu = wc.getPrimary();
-			}
-			primDelete(cu);
-			if (wc != null)
-				try {
-					wc.discardWorkingCopy();
-				} catch (JavaModelException e) {
-					Logger.getLogger().logError(e);
-				}
-		}
-	}
-
-	public void dispose() {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor aMonitor) {
-				primDispose();
-			}
-		};
-		runOperation(runnable, null, true);
-	}
-
-	public void revert() {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor aMonitor) {
-				primRevert();
-			}
-		};
-		runOperation(runnable, null, true);
-	}
-
-	public Set getAffectedFiles() {
-		return Collections.EMPTY_SET;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/11/2001 6:43:37 PM)
-	 * 
-	 * @return java.util.HashMap
-	 */
-	protected HashMap getDeletedCompilationUnits() {
-		if (deletedCompilationUnits == null)
-			deletedCompilationUnits = new HashMap();
-		return deletedCompilationUnits;
-	}
-
-	/**
-	 * Returns the working copy remembered for the compilation unit encoded in the given editor
-	 * input. Does not connect the edit model to the working copy.
-	 * 
-	 * @param input
-	 *            ICompilationUnit
-	 * @return the working copy of the compilation unit, or <code>null</code> if the input does
-	 *         not encode an editor input, or if there is no remembered working copy for this
-	 *         compilation unit
-	 */
-	public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException {
-		ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(cu);
-		if (newCU != null)
-			return newCU;
-		return null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (7/19/2001 11:00:19 AM)
-	 * 
-	 * @return java.util.List
-	 */
-	protected java.util.List getNeedsSavingCompilationUnits() {
-		if (needsSavingCompilationUnits == null)
-			needsSavingCompilationUnits = new ArrayList();
-		return needsSavingCompilationUnits;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (4/26/2001 3:49:05 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	protected java.util.List getNewCompilationUnits() {
-		if (newCompilationUnits == null)
-			newCompilationUnits = new ArrayList();
-		return newCompilationUnits;
-	}
-
-	/**
-	 * It is possible that we have already created this CompilationUnit and its working copy. If
-	 * this is the case, return our new working copy and do not create a new one.
-	 */
-	protected ICompilationUnit getNewCompilationUnitWorkingCopy(ICompilationUnit cu) {
-		if (hasNewCompilationUnit(cu)) {
-			List list = getNeedsSavingCompilationUnits();
-			ICompilationUnit copy;
-			for (int i = 0; i < list.size(); i++) {
-				copy = (ICompilationUnit) list.get(i);
-				if (cu.equals(copy.getPrimary()))
-					return copy;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (4/26/2001 3:49:05 PM)
-	 * 
-	 * @return java.util.List
-	 */
-	protected java.util.List getOriginalNewCompilationUnits() {
-		if (originalNewCompilationUnits == null)
-			originalNewCompilationUnits = new ArrayList();
-		return originalNewCompilationUnits;
-	}
-
-	/**
-	 * Return the IPackageFragment for the given ICompilationUnit.
-	 */
-	protected IPackageFragment getPackageFragment(ICompilationUnit cu) {
-		if (cu == null)
-			return null;
-		IJavaElement parent = cu;
-		int elementType = cu.getElementType();
-		while (parent != null && elementType != IJavaElement.PACKAGE_FRAGMENT) {
-			parent = parent.getParent();
-			if (parent != null)
-				elementType = parent.getElementType();
-			else
-				elementType = -1;
-		}
-		return (IPackageFragment) parent;
-	}
-
-	protected ISaveHandler getSaveHandler() {
-		return SaveHandlerRegister.getSaveHandler();
-	}
-
-	/**
-	 * Returns the working copy remembered for the compilation unit.
-	 * 
-	 * @param input
-	 *            ICompilationUnit
-	 * @return the working copy of the compilation unit, or <code>null</code> if there is no
-	 *         remembered working copy for this compilation unit
-	 */
-	public ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
-		if (cu == null || cu.isWorkingCopy())
-			return cu;
-		ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(cu);
-		if (newCU != null)
-			return newCU;
-		ICompilationUnit workingCopy = cu.getWorkingCopy(null);
-		addNewCompilationUnit(cu, workingCopy);
-		return workingCopy;
-	}
-
-	/**
-	 * Has a new compilation unit already been created.
-	 */
-	protected boolean hasNewCompilationUnit(ICompilationUnit cu) {
-		return getNewCompilationUnits().contains(cu);
-	}
-
-	protected boolean isFailedWriteFileFailure(Exception ex) {
-		return SaveHandlerHeadless.isFailedWriteFileFailure(ex);
-	}
-
-	protected void primAddDeletedCompilationUnit(ICompilationUnit cu) {
-		if (cu == null)
-			return;
-		Object[] info = new Object[2];
-		info[0] = getPackageFragment(cu);
-		try {
-			info[1] = cu.getSource();
-		} catch (JavaModelException e) {
-			info[1] = null;
-		}
-		getDeletedCompilationUnits().put(cu, info);
-	}
-
-	// This is an internal delete call.
-	protected void primDelete(ICompilationUnit cu) {
-		try {
-			if (cu.exists())
-				cu.delete(true, new org.eclipse.core.runtime.NullProgressMonitor());
-		} catch (JavaModelException e) {
-			org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
-			//What to do here?
-		}
-	}
-
-	protected void primDispose() {
-		discardOriginalNewCompilationUnits();
-		reviveDeletedCompilationUnits();
-		newCompilationUnits = null;
-		needsSavingCompilationUnits = null;
-		originalNewCompilationUnits = null;
-		deletedCompilationUnits = null;
-	}
-
-	protected void primRevert() {
-		discardOriginalNewCompilationUnits();
-		reviveDeletedCompilationUnits();
-		newCompilationUnits = null;
-		needsSavingCompilationUnits = null;
-		originalNewCompilationUnits = null;
-		deletedCompilationUnits = null;
-	}
-
-	/**
-	 * Returns the working copy remembered for the compilation unit encoded in the given editor
-	 * input.
-	 * 
-	 * @param input
-	 *            ICompilationUnit
-	 * @return the working copy of the compilation unit, or <code>null</code> if the input does
-	 *         not encode an editor input, or if there is no remembered working copy for this
-	 *         compilation unit
-	 */
-	protected ICompilationUnit primGetWorkingCopy(ICompilationUnit cu) throws CoreException {
-		return null;
-	}
-
-	/**
-	 * This will save all of the referenced CompilationUnits to be saved.
-	 */
-	protected void primSaveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
-		saveNewCompilationUnits(monitor);
-		getDeletedCompilationUnits().clear();
-	}
-
-	/**
-	 * This will save all of the new CompilationUnits to be saved.
-	 */
-	protected void primSaveOnlyNewCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
-		List cus = getNeedsSavingCompilationUnits();
-		ICompilationUnit wc;
-		for (int i = 0; i < cus.size(); i++) {
-			wc = (ICompilationUnit) cus.get(i);
-			commitWorkingCopy(wc, monitor);
-		}
-		cus.clear();
-	}
-
-	protected void removeDeletedCompilationUnit(ICompilationUnit cu) {
-		if (getDeletedCompilationUnits().remove(cu) != null) {
-			if (cu.isWorkingCopy()) {
-				ICompilationUnit original, nextCU, testCU;
-				original = cu.getPrimary();
-				Set cus = getDeletedCompilationUnits().keySet();
-				Iterator it = cus.iterator();
-				while (it.hasNext()) {
-					nextCU = (ICompilationUnit) it.next();
-					testCU = nextCU.isWorkingCopy() ? (ICompilationUnit) nextCU.getPrimary() : nextCU;
-					if (testCU.equals(original)) {
-						cus.remove(nextCU);
-						return;
-					}
-				}
-			}
-		}
-	}
-
-	protected void reviveDeletedCompilationUnit(ICompilationUnit cu, Object[] info, IProgressMonitor pm) {
-		if (info[0] != null && info[1] != null) {
-			String typeName = cu.getElementName();
-			IPackageFragment pack = (IPackageFragment) info[0];
-			String source = (String) info[1];
-			try {
-				ICompilationUnit existingCU = pack.getCompilationUnit(typeName);
-				if (existingCU.exists() && getNewCompilationUnits().contains(existingCU))
-					existingCU.delete(false, pm);
-				pack.createCompilationUnit(typeName, source, false, pm);
-			} catch (JavaModelException e) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
-			}
-		}
-	}
-
-	protected void reviveDeletedCompilationUnits() {
-		if (getDeletedCompilationUnits().isEmpty())
-			return;
-		IProgressMonitor pm = new org.eclipse.core.runtime.NullProgressMonitor();
-		Iterator it = getDeletedCompilationUnits().entrySet().iterator();
-		Map.Entry entry;
-		ICompilationUnit cu;
-		Object[] info;
-		while (it.hasNext()) {
-			entry = (Map.Entry) it.next();
-			cu = (ICompilationUnit) entry.getKey();
-			info = (Object[]) entry.getValue();
-			reviveDeletedCompilationUnit(cu, info, pm);
-		}
-
-	}
-
-	protected void runOperation(IWorkspaceRunnable aRunnable, IProgressMonitor monitor, boolean validate) {
-		primRunOperation(aRunnable, monitor);
-
-		// TODO Break the validator depedency
-		//	if (validate)
-		//		primRunOperation(aRunnable, monitor);
-		//	else {
-		//		IProject proj = getValidationProject();
-		//			
-		//		ValidatorManager mgr = ValidatorManager.getManager();
-		//		boolean disableValidators = proj != null;
-		//		boolean wasSuspended = false;
-		//		if (disableValidators) {
-		//			wasSuspended = mgr.isSuspended(proj);
-		//			if (!wasSuspended)
-		//				mgr.suspendValidation(proj, true);
-		//		}
-		//		try {
-		//			primRunOperation(aRunnable, monitor);
-		//		} finally {
-		//			if (disableValidators && !wasSuspended)
-		//				mgr.suspendValidation(proj, false);
-		//		}
-		//	}
-	}
-
-	protected void primRunOperation(IWorkspaceRunnable aRunnable, IProgressMonitor monitor) {
-		Workspace workspace = (Workspace) WTPCommonPlugin.getWorkspace();
-		if (aRunnable != null) {
-			//if (workspace.isTreeLocked())
-			//Logger.getLogger().logTrace(ResourceHandler.getString("Cannot_run_J2EEUIWorkingCo_ERROR_"));
-			// //$NON-NLS-1$ = "Cannot run J2EEUIWorkingCopyManager operation because the Workspace
-			// tree is locked."
-			//else {
-			if (!workspace.isTreeLocked()) {
-				try {
-					WTPCommonPlugin.getWorkspace().run(aRunnable, monitor);
-				} catch (CoreException e) {
-					throw new SaveFailedException(e);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This will save all of the referenced CompilationUnits to be saved.
-	 */
-	public void saveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
-		getSaveHandler().access();
-		try {
-			IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-				public void run(IProgressMonitor aMonitor) {
-					primSaveCompilationUnits(aMonitor);
-				}
-			};
-			runOperation(runnable, monitor, true);
-		} catch (SaveFailedException ex) {
-			getSaveHandler().handleSaveFailed(ex, monitor);
-		} finally {
-			getSaveHandler().release();
-		}
-	}
-
-	/**
-	 * This will save all of the referenced CompilationUnits to be saved.
-	 */
-	protected void saveNewCompilationUnits(IProgressMonitor monitor) {
-		primSaveOnlyNewCompilationUnits(monitor);
-		getOriginalNewCompilationUnits().clear();
-		getNewCompilationUnits().clear();
-	}
-
-	/**
-	 * This will save all of the new CompilationUnits to be saved.
-	 */
-	public void saveOnlyNewCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
-		getSaveHandler().access();
-		try {
-			IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-				public void run(IProgressMonitor aMonitor) {
-					primSaveOnlyNewCompilationUnits(aMonitor);
-				}
-			};
-			runOperation(runnable, monitor, false);
-		} catch (SaveFailedException ex) {
-			getSaveHandler().handleSaveFailed(ex, monitor);
-		} finally {
-			getSaveHandler().release();
-		}
-	}
-
-	protected boolean shouldSaveReadOnly(ICompilationUnit wc) {
-		IResource resource = null;
-
-		resource = (IResource) wc.getPrimary().getAdapter(IRESOURCE_CLASS);
-
-		if (resource == null || resource.getType() != IResource.FILE || !resource.isReadOnly())
-			return false;
-
-		return getSaveHandler().shouldContinueAndMakeFileEditable((IFile) resource);
-	}
-
-	/**
-	 * @see com.ibm.etools.j2ee.workbench.IJ2EEWorkingCopyManager#hasWorkingCopies()
-	 */
-	public boolean hasWorkingCopies() {
-		return (deletedCompilationUnits != null && !deletedCompilationUnits.isEmpty()) || (needsSavingCompilationUnits != null && !needsSavingCompilationUnits.isEmpty()) || (newCompilationUnits != null && !newCompilationUnits.isEmpty());
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java
deleted file mode 100644
index 35ccc89..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-/**
- * @author Administrator
- * 
- *  
- */
-public interface WorkingCopyManager extends WorkingCopyProvider {
-
-	void dispose();
-
-	java.util.Set getAffectedFiles();
-
-	/**
-	 * This will save all of the referenced CompilationUnits to be saved.
-	 */
-	void saveCompilationUnits(IProgressMonitor monitor);
-
-	/**
-	 * This will save all of the new CompilationUnits to be saved.
-	 */
-	void saveOnlyNewCompilationUnits(IProgressMonitor monitor);
-
-	/**
-	 * Method hasWorkingCopies.
-	 * 
-	 * @return boolean
-	 */
-	boolean hasWorkingCopies();
-
-	/**
-	 * Revert all working copies.
-	 */
-	void revert();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java
deleted file mode 100644
index 3e98f8a..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.jem.util.UIContextDetermination;
-
-
-/**
- * @author mdelder
- * 
- *  
- */
-public class WorkingCopyManagerFactory {
-
-	//	protected static Class workingCopyManagerClass;
-
-	public static WorkingCopyManager newRegisteredInstance() {
-		return (WorkingCopyManager) UIContextDetermination.createInstance("workingCopyManager"); //$NON-NLS-1$
-	}
-
-	//	public static IWorkingCopyManager createWorkingCopyManager() {
-	//		if (getWorkingCopyManagerClass() != null)
-	//			try {
-	//				return (IWorkingCopyManager) getWorkingCopyManagerClass().newInstance();
-	//			} catch (InstantiationException e1) {
-	//			} catch (IllegalAccessException e2) {
-	//			}
-	//		return null;
-	//	}
-	//	
-	//	/**
-	//	 * Insert the method's description here.
-	//	 * Creation date: (4/26/2001 7:53:15 AM)
-	//	 * @return java.lang.Class
-	//	 */
-	//	public static java.lang.Class getWorkingCopyManagerClass() {
-	//		return workingCopyManagerClass;
-	//	}
-	//	
-	//	/**
-	//	 * Insert the method's description here.
-	//	 * Creation date: (4/26/2001 7:53:15 AM)
-	//	 * @param newWorkingCopyManagerClass java.lang.Class
-	//	 */
-	//	public static void setWorkingCopyManagerClass(java.lang.Class newWorkingCopyManagerClass) {
-	//		workingCopyManagerClass = newWorkingCopyManagerClass;
-	//	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java
deleted file mode 100644
index 2696f5c..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-
-
-/**
- * The user of the Java code generation framework must supply an implementation of this interface.
- * The framework will obtain compilation working copies from this interface. The supplier of the
- * implementation is responsible for committing the working copies when appropriate for the user's
- * edit model.
- */
-public interface WorkingCopyProvider {
-
-	/**
-	 * This will delete compilation unit from the workbench and fix the internal references for this
-	 * working copy manager.
-	 * 
-	 * @param cu
-	 *            the compilation unit to delete
-	 * @param monitor
-	 *            the progress monitor to use for the delete
-	 */
-	void delete(ICompilationUnit cu, IProgressMonitor monitor);
-
-	/**
-	 * Returns the working copy remembered for the compilation unit. That is, the manager already
-	 * has a working copy for this unit, it does not create a new working copy. Does not connect the
-	 * edit model to the working copy.
-	 * 
-	 * @param input
-	 *            the compilation unit
-	 * @return the working copy of the compilation unit, or <code>null</code> it there is no
-	 *         remembered working copy for this compilation unit
-	 */
-	ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException;
-
-	/**
-	 * Returns the working copy remembered for the compilation unit or creates a new working copy
-	 * for the compilation unit and returns it. If a working copy is passed in, it is returned.
-	 * 
-	 * @param input
-	 *            the compilation unit
-	 * @return the working copy of the compilation unit
-	 * @exception CoreException
-	 *                if the working copy can not be created
-	 */
-	ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws CoreException;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/.classpath b/plugins/org.eclipse.jst.j2ee.core/.classpath
deleted file mode 100644
index 197e06a..0000000
--- 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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 963bc29..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-runtime
diff --git a/plugins/org.eclipse.jst.j2ee.core/.project b/plugins/org.eclipse.jst.j2ee.core/.project
deleted file mode 100644
index fc4f457..0000000
--- 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/build.properties b/plugins/org.eclipse.jst.j2ee.core/build.properties
deleted file mode 100644
index 3315f0f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/build.properties
+++ /dev/null
@@ -1,30 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               runtime/commonArchive.jar,\
-               runtime/j2eeCorePlugin.jar,\
-               runtime/mofj2ee.jar,\
-               runtime/j2ee-validation.jar,\
-               changes.log
-src.includes = rose/
-source.runtime/j2ee-validation.jar = j2ee-validation/
-output.runtime/mofj2ee.jar = bin/
-source.runtime/mofj2ee.jar = mofj2ee/,\
-                             webservices/
-output.runtime/j2eeCorePlugin.jar = bin/
-output.runtime/j2ee-validation.jar = bin/
-source.runtime/commonArchive.jar = commonArchive/
-jars.compile.order = runtime/mofj2ee.jar,\
-                     runtime/commonArchive.jar,\
-                     runtime/j2eeCorePlugin.jar,\
-                     runtime/j2ee-validation.jar
-source.runtime/j2eeCorePlugin.jar = j2eeCorePlugin/
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 837df54..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-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/commonarchive_de.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_de.properties
deleted file mode 100644
index 817d73f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_de.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} muss in einer Unterklasse implementiert werden.
-key_class_reflection_ERROR_=IWAE0002E Die Klasse "{0}" kann zum Vergleichen des Prim\u00e4rschl\u00fcsselfelds "{1}" aus der Entit\u00e4t "{2}" nicht wiedergegeben werden.
-key_field_reflection_ERROR_=IWAE0003E Der Typs des Prim\u00e4rschl\u00fcsselfelds "{0}" aus der Entit\u00e4t "{1}" kann nicht wiedergegeben werden.
-removing_key_field_INFO_=IWAE0004I Das ung\u00fcltige Prim\u00e4rschl\u00fcsselfeld "{0}" wird aus der Entit\u00e4t "{1}" entfernt.
-repair_usage_ERROR_=IWAE0005E Syntax f\u00fcr RepairArchiveCommand: Schreiben in destinationPath {0} ist nicht m\u00f6glich.
-invalid_archive_EXC_=IWAE0006E Das Archiv ist kein g\u00fcltiger Wert f\u00fcr {0}, weil der Implementierungsdeskriptor nicht gefunden wurde (Gro\u00df-/Kleinschreibung muss beachtet werden): {1}
-load_resource_EXC_=IWAE0007E Das Laden der Ressource "{0}" in Archiv "{1}" ist nicht m\u00f6glich.
-nested_jar_EXC_=IWAE0008E Beim Lesen von {0} aus {1} ist ein Fehler aufgetreten.
-make_temp_dir_EXC_=IWAE0009E Das tempor\u00e4re Verzeichnis {0} kann nicht erstellt werden.
-invalid_classpath_WARN_=IWAE0010W Das Klassenpfadelement "{0}" ist kein Verzeichnis und keine komprimierte Datei.
-invalid_cp_file_WARN_=IWAE0011W Das Klassenpfadelement "{0}" verweist nicht auf eine lokale Datei.
-io_ex_loading_EXC_=IWAE0012E Beim Laden von {0} ist eine E/A-Ausnahmebedingung aufgetreten.
-tx_bean_mgd_WARN_=IWAE0013W Import mit EJB 1.0: Steuerungsdeskriptor TX_BEAN_MANAGED f\u00fcr {0} wird nicht zugeordnet.
-error_saving_EXC_=IWAE0014E Fehler beim Speichern von {0}.
-io_ex_manifest_EXC_=IWAE0015E Beim Lesen des Manifestes im Archiv {0} ist eine E/A-Ausnahmebedingung aufgetreten.
-io_ex_reopen_EXC_=IWAE0016E Beim erneuten \u00d6ffnen von {0} ist eine E/A-Ausnahmebedingung aufgetreten.
-unable_replace_EXC_=IWAE0017E Das Originalarchiv {0} kann nicht ersetzt werden.
-duplicate_file_EXC_=IWAE0018E Das Archiv mit dem Namen {0} enth\u00e4lt bereits eine Datei mit dem Namen {1}.
-duplicate_entry_EXC_=IWAE0019E Eine Datei oder Ressource mit der URI {0} ist bereits im Archiv mit dem Namen {1} vorhanden.
-file_exist_as_dir_EXC_=IWAE0020E Eine Datei mit dem Namen {0} ist vorhanden und ist ein Verzeichnis.
-uncontained_module_EXC_=IWAE0021E Das Modul {0} ist nicht in einer EAR-Datei enthalten.
-dd_in_ear_load_EXC_=IWAE0022E Beim Laden des Implementierungsdeskriptors f\u00fcr das Modul "{0}" in der EAR-Datei "{1}" ist eine Ausnahmebedingung aufgetreten.
-nested_open_fail_EXC_=IWAE0023E Die Moduldatei "{0}" in der EAR-Datei "{1}" kann nicht ge\u00f6ffnet werden.
-duplicate_module_EXC_=IWAE0024E Der Implementierungsdeskriptor f\u00fcr die EAR-Datei "{0}" enth\u00e4lt bereits ein Modul mit der URI "{1}".
-no_sec_role_EXC_=IWAE0025E {0}: Der Implementierungsdeskriptor f\u00fcr die EAR-Datei enth\u00e4lt keine Sicherheitsberechtigungsklasse mit dem Namen {1}.
-dup_sec_role_EXC_=IWAE0026E {0}: Der Implementierungsdeskriptor f\u00fcr die EAR-Datei enth\u00e4lt bereits eine Sicherheitsberechtigungsklasse mit dem Namen {1}.
-dup_sec_role_module_EXC_=IWAE0027E Der Implementierungsdeskriptor f\u00fcr {0} enth\u00e4lt bereits eine Sicherheitsberechtigungsklasse mit dem Namen {1}.
-dup_resource_EXC_=IWAE0028E Die Ressource mit dem Namen "{0}" ist im Archiv "{1}" bereits vorhanden.
-error_saving_EXC_=IWAE0030E Fehler beim Speichern von {0}.
-add_copy_class_dir_EXC_=IWAE0031E Die Methode "addCopyClass" wird f\u00fcr Verzeichnisse nicht unterst\u00fctzt. URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E Die Methode "addCopyLib" wird f\u00fcr Verzeichnisse nicht unterst\u00fctzt. URI: {0}
-list_components_war_EXC_=IWAE0033E Beim Auflisten der Komponenten in der WAR-Datei {0} ist eine Ausnahmebedingung aufgetreten.
-open_nested_EXC_=IWAE0034E Das verschachtelte Archiv "{0}" in "{1}" konnte nicht ge\u00f6ffnet werden.
-make_temp_file_WARN_=IWAE0035W Warnung: Die tempor\u00e4re Datei f\u00fcr {0} kann nicht erstellt werden.  Dies beeintr\u00e4chtigt die Leistung.
-file_not_found_EXC_=IWAE0036E URI-Name: {0}, Dateiname: {1}
-could_not_open_EXC_=IWAE0037E {0} konnte nicht ge\u00f6ffnet werden.
-could_not_find_dir_EXC_=IWAE0038E Das Verzeichnis {0} kann nicht ge\u00f6ffnet werden.
-not_a_dir_EXC_=IWAE0039E Das Verzeichnis kann nicht ge\u00f6ffnet werden, weil die Datei kein Verzeichnis ist: {0}
-inferred_dds_EXC_=IWAE0040E Es wurde festgestellt, dass die EJB-JAR-Datei "{0}" aus Version 1.0 stammt, weil das Manifest keine Enterprise-Beans deklariert, in der JAR jedoch serialisierte Implementierungsdeskriptoren vorhanden sind.
-filename_exception_EXC_=IWAE0041E Dateiname: {0}, Ausnahmebedingung: {1}
-no_dds_10_EXC_=IWAE0042E Keine Implementierungsdeskriptoren in EJB 1.0 JAR-Datei {0}
-manifest_dd_load_EXC_=IWAE0043E Das JAR-Manifest deklariert eine Enterprise-Bean, deren Implementierungsdeskriptordatei nicht geladen werden kann: {0}
-manifest_dd_find_EXC_=IWAE0044E Das JAR-Manifest deklariert eine Enterprise-Bean, deren Implementierungsdeskriptordatei nicht gefunden werden kann: {0}
-io_ex_reading_dd_EXC_=IWAE0045E Beim Lesen von {0} ist eine E/A-Ausnahmebedingung aufgetreten.
-ser_not_dd_EXC_=IWAE0046E Das serialisierte Objekt in der Datei "{0}" ist kein Exemplar von javax.ejb.deployment.DeploymentDescriptor.
-reading_dd_EXC_=IWAE0047E Beim Lesen von {0} ist eine E/A-Ausnahmebedingung aufgetreten.
-missing_class_EXC_=IWAE0048E {0} konnte nicht entserialisiert werden, weil eine erforderliche Klasse nicht gefunden wurde.  Ausnahmebedingung: {1}
-Converted=Konvertiert
-Stack_trace_of_nested_exce_EXC_=IWAE0049E Stack-Trace der verschachtelten Ausnahmebedingung:
-IOException_occurred_while_EXC_=IWAE0050E Beim Kopieren des Manifestes ist eine E/A-Ausnahmebedingung aufgetreten.
-Extract_destination_is_the_EXC_=IWAE0051E Das Extraktionsziel weist denselben Pfad auf wie die Quellendatei.
-Parameter_should_not_be_nu_EXC_=IWAE0052E Der Parameter sollte nicht Null sein.
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E Das Archiv ist keine g\u00fcltige EJB-JAR-Datei (1.0), weil weder im Manifest noch in Eintr\u00e4gen mit der Erweiterung ".ser" serialisierte Implementierungsdeskriptoren gefunden wurden.
-_The_following_files_could_EXC_=IWAE0056E Die folgenden Dateien konnten nicht geladen werden:
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand ist fehlgeschlagen - Stack-Trace f\u00fcr Ausnahmebedingung:
-FixPrimKeyCommand_usage___=Syntax f\u00fcr FixPrimKeyCommand:  <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E Syntax f\u00fcr FixPrimKeyCommand: sourceJarFilePath muss auf eine g\u00fcltige EJB-JAR-Datei oder das Verzeichnis einer komprimierten EJB-JAR-Datei verweisen.
-Repair_command_failed_-_ex_EXC_=IWAE0059E Befehl REPAIR ist fehlgeschlagen - Stack-Trace f\u00fcr Ausnahmebedingung:
-Repairs_all_entries_in_the=Alle Eintr\u00e4ge in den Verzeichnissen META-INF und/oder WEB-INF werden in die korrekte Schreibweise berichtigt.
-RepairArchiveCommand_usage=Syntax f\u00fcr RepairArchiveCommand: <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E Syntax f\u00fcr RepairArchiveCommand: sourceJarFilePath muss auf ein g\u00fcltiges Archiv oder ein Verzeichnis eines komprimierten Archivs verweisen.
-Application_Client_Jar_Fil=JAR-Datei f\u00fcr Anwendungsclient
-EAR_File=EAR-Datei
-EJB_Jar_File=EJB-JAR-Datei
-RAR_File=RAR-Datei
-WAR_File=WAR-Datei
-Error_occurred_iterating_f_EXC_=IWAE0061E Bie der Dateiiteration ist ein Fehler aufgetreten.
-End_of_list_reached_EXC_=IWAE0062E Das Ende der Liste wurde erreicht.
-Internal_Error__Iterator_o_EXC_=IWAE0063E Interner Fehler: Der Iterator ist nicht mehr mit den ZIP-Eintr\u00e4gen synchron.
-Error_iterating_the_archiv_EXC_=IWAE0064E Bei der Iteration des Archivs ist ein Fehler aufgetreten.
-Absolute_path_unknown_EXC_=IWAE0065E Der absolute Pfad ist unbekannt.
-Original_archive_is_not_a__EXC_=IWAE0066E Das Originalarchiv ist kein Verzeichnis.
-Null_uri_EXC_=IWAE0067E Null-URI
-Module_file=Moduldatei
-A_WAR_file=WAR-Datei
-An_EJB_JAR_file=EJB-JAR-Datei
-An_Application_Client_JAR_file=JAR-Datei f\u00fcr Anwendungsclient
-A_RAR_file=RAR-Datei
-A_Application_file=Anwendungsdatei
-A_file_does_not_exist_for_module=Eine Datei ist f\u00fcr das Modulelement mit der folgenden URI nicht vorhanden: {0}
-File_not_correct_type=Die Datei {0} in der EAR-Datei {1} weist nicht den korrekten Typ basierend auf dem Anwendungsimplementierungsdeskriptor auf.  Erwarteter Typ: {2}";
-Module_not_in_EAR=Das Modul ist nicht in einer EAR enthalten: {0}
-Module_file_does_not_exist_2=Die Moduldatei ist nicht f\u00fcr den Modulverweis vorhanden.  Modul = {0}
-FileImpl._Error_0=Rekursiver Einschluss nicht zul\u00e4ssig f\u00fcr
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_es.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_es.properties
deleted file mode 100644
index 395da1d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_es.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} debe implementarse en la subclase
-key_class_reflection_ERROR_=IWAE0002E No se puede reflejar la clase "{0}" para poder comparar el campo de clave primaria "{1}" de la entidad "{2}"
-key_field_reflection_ERROR_=IWAE0003E No se puede reflejar el tipo del campo de clave primaria "{0}" de la entidad "{1}"
-removing_key_field_INFO_=IWAE0004I Eliminando campo de clave primaria no v\u00e1lido "{0}" de la entidad "{1}"
-repair_usage_ERROR_=IWAE0005E Uso de RepairArchiveCommand: no se puede escribir en destinationPath: {0}
-invalid_archive_EXC_=IWAE0006E El archivador no es un {0} v\u00e1lido ya que el descriptor de despliegue no puede encontrarse (sensible a may\u00fasculas y min\u00fasculas): {1}
-load_resource_EXC_=IWAE0007E No se ha podido cargar el recurso "{0}" en el archivador "{1}"
-nested_jar_EXC_=IWAE0008E Se ha producido un error al leer {0} desde {1}
-make_temp_dir_EXC_=IWAE0009E No se puede crear el directorio temporal: {0}
-invalid_classpath_WARN_=IWAE0010W El elemento de la v\u00eda de acceso de clases "{0}" no es un directorio ni un archivo Zip
-invalid_cp_file_WARN_=IWAE0011W El elemento de la v\u00eda de acceso de clases "{0}" no apunta a un archivo local
-io_ex_loading_EXC_=IWAE0012E Se ha producido una excepci\u00f3n de E/S al cargar {0}
-tx_bean_mgd_WARN_=IWAE0013W Importaci\u00f3n de EJB 1.0: El descriptor de control TX_BEAN_MANAGED no se correlaciona para {0}
-error_saving_EXC_=IWAE0014E Error al guardar {0}
-io_ex_manifest_EXC_=IWAE0015E Se ha producido una excepci\u00f3n de E/S al leer el manifiesto en el archivador: {0}
-io_ex_reopen_EXC_=IWAE0016E Se ha producido una excepci\u00f3n de E/S al reabrir {0}
-unable_replace_EXC_=IWAE0017E No se puede sustituir el archivador original: {0}
-duplicate_file_EXC_=IWAE0018E El archivador denominado {0} ya contiene un archivo denominado {1}
-duplicate_entry_EXC_=IWAE0019E Un archivo o recurso con el uri {0} ya existe en el archivador denominado {1}
-file_exist_as_dir_EXC_=IWAE0020E Existe un archivo denominado {0} y es un directorio
-uncontained_module_EXC_=IWAE0021E El m\u00f3dulo {0} no est\u00e1 contenido dentro de un archivo EAR
-dd_in_ear_load_EXC_=IWAE0022E Se ha producido una excepci\u00f3n al cargar el descriptor de despliegue para el m\u00f3dulo "{0}" en el archivo EAR "{1}"
-nested_open_fail_EXC_=IWAE0023E No se puede abrir el archivo de m\u00f3dulo "{0}" en el archivo EAR "{1}"
-duplicate_module_EXC_=IWAE0024E El descriptor de despliegue del archivo EAR "{0}" ya contiene un m\u00f3dulo que tiene el uri "{1}"
-no_sec_role_EXC_=IWAE0025E {0}: El descriptor de despliegue del archivo EAR no contiene un cometido de seguridad denominado {1}
-dup_sec_role_EXC_=IWAE0026E {0}: El descriptor de despliegue del archivo EAR ya contiene un cometido de seguridad denominado {1}
-dup_sec_role_module_EXC_=IWAE0027E El descriptor de despliegue de {0} ya contiene un cometido de seguridad denominado {1}
-dup_resource_EXC_=IWAE0028E El recurso denominado "{0}" ya existe en el archivador "{1}"
-error_saving_EXC_=IWAE0030E Error al guardar {0}
-add_copy_class_dir_EXC_=IWAE0031E El m\u00e9todo "addCopyClass" no est\u00e1 soportado para directorios. URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E El m\u00e9todo "addCopyLib" no est\u00e1 soportado para directorios. URI: {0}
-list_components_war_EXC_=IWAE0033E Se ha producido una excepci\u00f3n al listar componentes del archivo WAR: {0}
-open_nested_EXC_=IWAE0034E No se ha podido abrir el archivador anidado "{0}" en "{1}"
-make_temp_file_WARN_=IWAE0035W Aviso: No se puede crear el archivo temporal para {0}.  Esto afectar\u00e1 al rendimiento.
-file_not_found_EXC_=IWAE0036E Nombre de URI: {0}; Nombre de archivo: {1}
-could_not_open_EXC_=IWAE0037E No se ha podido abrir {0}
-could_not_find_dir_EXC_=IWAE0038E No se puede abrir el directorio {0}
-not_a_dir_EXC_=IWAE0039E No se puede abrir el directorio ya que el archivo no es un directorio: {0}
-inferred_dds_EXC_=IWAE0040E Se ha inferido que el archivo JAR EJB "{0}" es de la versi\u00f3n 1.0 ya que el manifiesto no declara beans de empresa pero existen descriptores de despliegue serializados en el JAR.
-filename_exception_EXC_=IWAE0041E Nombre de archivo: {0}; Excepci\u00f3n: {1}
-no_dds_10_EXC_=IWAE0042E No hay descriptores de despliegue en el archivo JAR EJB 1.0: {0}
-manifest_dd_load_EXC_=IWAE0043E El manifiesto de JAR declara un bean de empresa para el que el archivo de descriptor de despliegue no puede cargarse: {0}
-manifest_dd_find_EXC_=IWAE0044E El manifiesto de JAR declara un bean de empresa para el que el archivo de descriptor de despliegue no puede encontrarse: {0}
-io_ex_reading_dd_EXC_=IWAE0045E Se ha producido una excepci\u00f3n de E/S al leer {0}
-ser_not_dd_EXC_=IWAE0046E El objeto serializado del archivo "{0}"  no es una instancia de javax.ejb.deployment.DeploymentDescriptor
-reading_dd_EXC_=IWAE0047E Se ha producido una excepci\u00f3n al leer {0}
-missing_class_EXC_=IWAE0048E No se ha podido deserializar {0} ya que no se ha podido encontrar una clase necesaria.  Excepci\u00f3n: {1}
-Converted=Convertido
-Stack_trace_of_nested_exce_EXC_=IWAE0049E Rastreo de pila de excepci\u00f3n anidada:
-IOException_occurred_while_EXC_=IWAE0050E Se ha producido una excepci\u00f3n de E/S al copiar el manifiesto
-Extract_destination_is_the_EXC_=IWAE0051E El destino de la extracci\u00f3n es la misma v\u00eda de acceso que el archivo fuente
-Parameter_should_not_be_nu_EXC_=IWAE0052E El par\u00e1metro no debe ser nulo
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E El archivador no es un archivo JAR EJB (1.0) v\u00e1lido ya que no se han podido encontrar descriptores de despliegue serializados, ya sea en el manifiesto o en las entradas con una extensi\u00f3n ".ser"
-_The_following_files_could_EXC_=IWAE0056E No se han podido cargar los siguientes archivos:
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand ha fallado - rastreo de pila de excepci\u00f3n:
-FixPrimKeyCommand_usage___=Uso de FixPrimKeyCommand:  <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E Uso de FixPrimKeyCommand: sourceJarFilePath debe apuntar a un archivo JAR EJB v\u00e1lido o a un directorio de un archivo JAR EJB inflado
-Repair_command_failed_-_ex_EXC_=IWAE0059E El mandato de reparaci\u00f3n ha fallado - rastreo de pila de excepci\u00f3n:
-Repairs_all_entries_in_the=Repara todas las entradas de los directorios META-INF y/o WEB-INF para que tengan las may\u00fasculas y min\u00fasculas correctas
-RepairArchiveCommand_usage=Uso de RepairArchiveCommand:  <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E Uso de RepairArchiveCommand: sourceJarFilePath debe apuntar a un archivador v\u00e1lido o a un directorio de un archivador inflado
-Application_Client_Jar_Fil=Archivo JAR de cliente de aplicaciones
-EAR_File=Archivo EAR
-EJB_Jar_File=Archivo JAR EJB
-RAR_File=Archivo RAR
-WAR_File=Archivo WAR
-Error_occurred_iterating_f_EXC_=IWAE0061E Se ha producido un error al iterar archivos
-End_of_list_reached_EXC_=IWAE0062E Se ha llegado al final de la lista
-Internal_Error__Iterator_o_EXC_=IWAE0063E Error interno: El iterador est\u00e1 desincronizado con las entradas zip
-Error_iterating_the_archiv_EXC_=IWAE0064E Error al iterar el archivador
-Absolute_path_unknown_EXC_=IWAE0065E V\u00eda de acceso absoluta desconocida
-Original_archive_is_not_a__EXC_=IWAE0066E El archivador original no es un directorio
-Null_uri_EXC_=IWAE0067E Uri nulo
-Module_file=Archivo de m\u00f3dulo
-A_WAR_file=Archivo WAR
-An_EJB_JAR_file=Archivo JAR EJB
-An_Application_Client_JAR_file=Archivo JAR de cliente de aplicaciones
-A_RAR_file=Archivo RAR
-A_Application_file=Archivo de aplicaci\u00f3n
-A_file_does_not_exist_for_module=No existe ning\u00fan archivo para el elemento del m\u00f3dulo que tiene el uri: {0}
-File_not_correct_type=El archivo {0} del archivo EAR {1} no es el tipo correcto de acuerdo con el descriptor de despliegue de aplicaci\u00f3n.  Tipo esperado: {2}";
-Module_not_in_EAR=El m\u00f3dulo no est\u00e1 en un EAR: {0}
-Module_file_does_not_exist_2=El archivo de m\u00f3dulo no existe para la referencia del m\u00f3dulo.  M\u00f3dulo = {0}
-FileImpl._Error_0=La contenci\u00f3n recurrente no est\u00e1 permitida para
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_fr.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_fr.properties
deleted file mode 100644
index 751fe1b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_fr.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} doit \u00eatre impl\u00e9ment\u00e9 dans la sous-classe
-key_class_reflection_ERROR_=IWAE0002E Impossible de refl\u00e9ter la classe "{0}" pour comparer la zone de cl\u00e9 primaire "{1}" du bean entity "{2}"
-key_field_reflection_ERROR_=IWAE0003E Impossible de refl\u00e9ter le type de la zone de cl\u00e9 primaire "{0}" du bean entity "{1}"
-removing_key_field_INFO_=IWAE0004I Suppression de la zone de cl\u00e9 primaire non valide "{0}" du bean entity "{1}"
-repair_usage_ERROR_=IWAE0005E Syntaxe de RepairArchiveCommand : impossible d''\u00e9crire dans le chemin de destination : {0}
-invalid_archive_EXC_=IWAE0006E L''archive n''est pas un {0} valide car le descripteur de d\u00e9ploiement est introuvable (respect maj/min) : {1}
-load_resource_EXC_=IWAE0007E Impossible de charger la ressource "{0}" dans l''archive "{1}"
-nested_jar_EXC_=IWAE0008E Une erreur s''est produite lors de la lecture de {0} \u00e0 partir de {1}
-make_temp_dir_EXC_=IWAE0009E Impossible de cr\u00e9er le r\u00e9pertoire temporaire : {0}
-invalid_classpath_WARN_=IWAE0010W L''\u00e9l\u00e9ment "{0}" du chemin d''acc\u00e8s n''est pas un r\u00e9pertoire ou un fichier zip
-invalid_cp_file_WARN_=IWAE0011W L''\u00e9l\u00e9ment "{0}" du chemin d''acc\u00e8s ne d\u00e9signe pas un fichier local
-io_ex_loading_EXC_=IWAE0012E Une exception E-S s''est produite lors du chargement de {0}
-tx_bean_mgd_WARN_=IWAE0013W Importation d''EJB 1.0 : pas de mappage du descripteur de contr\u00f4le TX_BEAN_MANAGED pour {0}
-error_saving_EXC_=IWAE0014E Erreur de sauvegarde de {0}
-io_ex_manifest_EXC_=IWAE0015E Une exception d''E-S s''est produite lors de la lecture du manifeste dans l''archive {0}
-io_ex_reopen_EXC_=IWAE0016E Une exception d''E-S s''est produite lors de la r\u00e9ouverture de {0}
-unable_replace_EXC_=IWAE0017E Impossible de remplacer l''archive d''origine {0}
-duplicate_file_EXC_=IWAE0018E L''archive nomm\u00e9e {0} contient d\u00e9j\u00e0 un fichier nomm\u00e9 {1}
-duplicate_entry_EXC_=IWAE0019E Un fichier ou une ressource avec l''uri {0} existe d\u00e9j\u00e0 dans l''archive nomm\u00e9e {1}
-file_exist_as_dir_EXC_=IWAE0020E Un fichier nomm\u00e9 {0} existe et est un r\u00e9pertoire
-uncontained_module_EXC_=IWAE0021E Le module {0} ne se trouve pas dans un fichier EAR
-dd_in_ear_load_EXC_=IWAE0022E Une exception s''est produite lors du chargement du descripteur de d\u00e9ploiement du module "{0}" dans le fichier EAR "{1}"
-nested_open_fail_EXC_=IWAE0023E Impossible d''ouvrir le fichier de module "{0}" dans le fichier EAR "{1}"
-duplicate_module_EXC_=IWAE0024E Le descripteur de d\u00e9ploiement du fichier EAR "{0}" contient d\u00e9j\u00e0 un module dont l''uri est "{1}"
-no_sec_role_EXC_=IWAE0025E {0} : le descripteur de d\u00e9ploiement du fichier EAR ne contient pas de r\u00f4le de s\u00e9curit\u00e9 nomm\u00e9 {1}
-dup_sec_role_EXC_=IWAE0026E {0} : le descripteur de d\u00e9ploiement du fichier EAR contient d\u00e9j\u00e0 un r\u00f4le de s\u00e9curit\u00e9 nomm\u00e9 {1}
-dup_sec_role_module_EXC_=IWAE0027E Le descripteur de d\u00e9ploiement de {0} contient d\u00e9j\u00e0 un r\u00f4le de s\u00e9curit\u00e9 nomm\u00e9 {1}
-dup_resource_EXC_=IWAE0028E La ressource nomm\u00e9e "{0}" existe d\u00e9j\u00e0 dans l''archive "{1}"
-error_saving_EXC_=IWAE0030E Erreur de sauvegarde de {0}
-add_copy_class_dir_EXC_=IWAE0031E La m\u00e9thode addCopyClass n''est pas prise en charge pour les r\u00e9pertoires. URI : {0}
-add_copy_lib_dir_EXC_=IWAE0032E La m\u00e9thode addCopyLib n''est pas prise en charge pour les r\u00e9pertoires. URI : {0}
-list_components_war_EXC_=IWAE0033E Une exception s''est produite lors du listage des composants dans le fichier WAR : {0}
-open_nested_EXC_=IWAE0034E Impossible d''ouvrir l''archive imbriqu\u00e9e "{0}" dans "{1}"
-make_temp_file_WARN_=IWAE0035W Avertissement : impossible de cr\u00e9er un fichier temporaire pour {0}.  Cela aura un impact sur les performances.
-file_not_found_EXC_=IWAE0036E Nom de l''URI : {0} ; nom du fichier : {1}
-could_not_open_EXC_=IWAE0037E Impossible d''ouvrir {0}
-could_not_find_dir_EXC_=IWAE0038E Impossible d''ouvrir le r\u00e9pertoire {0}
-not_a_dir_EXC_=IWAE0039E Impossible d''ouvrir le r\u00e9pertoire car le fichier {0} n''est pas un r\u00e9pertoire
-inferred_dds_EXC_=IWAE0040E Le fichier JAR d''EJB "{0}" est consid\u00e9r\u00e9 de version 1.0 car le manifeste ne d\u00e9clare pas les beans enterprise, mais il existe des descripteurs de d\u00e9ploiement dans ce fichier.
-filename_exception_EXC_=IWAE0041E Nom du fichier : {0} ; exception : {1}
-no_dds_10_EXC_=IWAE0042E Aucun descripteur de d\u00e9ploiement dans le fichier JAR d''EJB 1.0 : {0}
-manifest_dd_load_EXC_=IWAE0043E Le manifeste JAR d\u00e9clare un bean enterprise pour lequel un fichier de descripteur de d\u00e9ploiement ne peut pas \u00eatre charg\u00e9 : {0}
-manifest_dd_find_EXC_=IWAE0044E Le manifeste JAR d\u00e9clare un bean enterprise pour lequel le fichier de descripteur de d\u00e9ploiement est introuvable : {0}
-io_ex_reading_dd_EXC_=IWAE0045E Une exception d''E-S s''est produite lors de la lecture de {0}
-ser_not_dd_EXC_=IWAE0046E L''objet s\u00e9rialis\u00e9 dans le fichier "{0}" n''est pas une instance de javax.ejb.deployment.DeploymentDescriptor
-reading_dd_EXC_=IWAE0047E Une exception s''est produite lors de la lecture de {0}
-missing_class_EXC_=IWAE0048E Impossible de d\u00e9s\u00e9rialiser {0} car une classe requise est introuvable.  Exception : {1}
-Converted=Converti
-Stack_trace_of_nested_exce_EXC_=IWAE0049E Trace de pile de l'exception imbriqu\u00e9e :
-IOException_occurred_while_EXC_=IWAE0050E Une exception d'E-S s'est produite lors de la copie du manifeste
-Extract_destination_is_the_EXC_=IWAE0051E La destination d'extraction est identique au fichier source
-Parameter_should_not_be_nu_EXC_=IWAE0052E Le param\u00e8tre ne doit pas \u00eatre null
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E L'archive n'est pas un fichier JAR d'EJB (1.0) valide car aucun descripteur de d\u00e9ploiement ne peut \u00eatre trouv\u00e9 soit dans le manifeste, soit dans les entr\u00e9es poss\u00e9dant l'extension ".ser"
-_The_following_files_could_EXC_=IWAE0056E les fichiers suivants ne peuvent pas \u00eatre charg\u00e9s :
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E Echec de FixPrimKeyCommand ; trace de pile de l'exception :
-FixPrimKeyCommand_usage___=Syntaxe de FixPrimKeyCommand :  <cheminFichierJarSource> [cheminDestination]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E Syntaxe de FixPrimKeyCommand : sourceJarFilePath doit d\u00e9signer un fichier JAR d'EJB valide ou un r\u00e9pertoire contenant un fichier JAR d'EJB d\u00e9compress\u00e9
-Repair_command_failed_-_ex_EXC_=IWAE0059E Echec de la commande de r\u00e9paration ; trace de pile de l'exception :
-Repairs_all_entries_in_the=R\u00e9pare toutes les entr\u00e9es dans les r\u00e9pertoires META-INF et/ou WEB-INF afin de leur redonner la combinaison majuscules/minuscules correcte
-RepairArchiveCommand_usage=Syntaxe de RepairArchiveCommand :  <cheminFichierJarSource> <cheminDestination>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E Syntaxe de RepairArchiveCommand : sourceJarFilePath doit d\u00e9signer une archive valide ou un r\u00e9pertoire contenant une archive d\u00e9compress\u00e9e
-Application_Client_Jar_Fil=Fichier JAR de client d'application
-EAR_File=Fichier EAR
-EJB_Jar_File=Fichier JAR d'EJB
-RAR_File=Fichier RAR
-WAR_File=Fichier WAR
-Error_occurred_iterating_f_EXC_=IWAE0061E Une erreur est survenue lors de l'it\u00e9ration des fichiers
-End_of_list_reached_EXC_=IWAE0062E Fin de liste atteinte
-Internal_Error__Iterator_o_EXC_=IWAE0063E Erreur interne : it\u00e9rateur d\u00e9synchronis\u00e9 par rapport aux entr\u00e9es des fichiers zip
-Error_iterating_the_archiv_EXC_=IWAE0064E Erreur lors de l'it\u00e9ration de l'archive
-Absolute_path_unknown_EXC_=IWAE0065E Chemin absolu inconnu
-Original_archive_is_not_a__EXC_=IWAE0066E L'archive d'origine n'est pas un r\u00e9pertoire
-Null_uri_EXC_=IWAE0067E Uri ind\u00e9finie
-Module_file=Fichier du module
-A_WAR_file=Fichier WAR
-An_EJB_JAR_file=Fichier JAR d'EJB
-An_Application_Client_JAR_file=Fichier JAR de client d'application
-A_RAR_file=Fichier RAR
-A_Application_file=Fichier d'application
-A_file_does_not_exist_for_module=Aucun fichier n''existe pour l''\u00e9l\u00e9ment de module dont l''URI est : {0}
-File_not_correct_type=Le fichier {0} du fichier EAR {1} n''est pas de type correct par rapport au descripteur de d\u00e9ploiement de l''application.  Type attendu : {2}" ;
-Module_not_in_EAR=Le module ne se trouve pas dans un fichier EAR : {0}
-Module_file_does_not_exist_2=Le fichier de module n''existe pas pour la r\u00e9f\u00e9rence de module.  Module = {0}
-FileImpl._Error_0=Confinement r\u00e9cursif non autoris\u00e9 pour
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_it.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_it.properties
deleted file mode 100644
index 4d43efc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_it.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} deve essere implementato nella sottoclasse
-key_class_reflection_ERROR_=IWAE0002E Impossibile selezionare la classe "{0}" per confrontare il campo della chiave primaria "{1}" dell''entit\u00e0 "{2}"
-key_field_reflection_ERROR_=IWAE0003E Impossibile selezionare il tipo di campo della chiave primaria "{0}" dall''entit\u00e0 "{1}"
-removing_key_field_INFO_=IWAE0004I Rimozione del campo di chiave primaria "{0}" non valido dall''entit\u00e0 "{1}"
-repair_usage_ERROR_=IWAE0005E Utilizzo di RepairArchiveCommand: impossibile scrivere in destinationPath: {0}
-invalid_archive_EXC_=IWAE0006E L''archivio non \u00e8 un {0} valido. Impossibile trovare il descrittore di distribuzione (distinzione maiuscole/minuscole): {1}
-load_resource_EXC_=IWAE0007E Impossibile caricare la risorsa "{0}" nell''archivio "{1}"
-nested_jar_EXC_=IWAE0008E Errore durante la lettura di {0} da {1}
-make_temp_dir_EXC_=IWAE0009E Impossibile creare la directory temporanea: {0}
-invalid_classpath_WARN_=IWAE0010W L''elemento classpath "{0}" non \u00e8 una directory o un file Zip
-invalid_cp_file_WARN_=IWAE0011W L''elemento classpath "{0}" non punta a un file locale
-io_ex_loading_EXC_=IWAE0012E Si \u00e8 verificata un''eccezione IO durante il caricamento di {0}
-tx_bean_mgd_WARN_=IWAE0013W Importazione EJB 1.0: l'associazione del descrittore di controllo TX_BEAN_MANAGED per {0} non verr\u00e0 eseguita
-error_saving_EXC_=IWAE0014E Errore durante il salvataggio di {0}
-io_ex_manifest_EXC_=IWAE0015E Si \u00e8 verificata un''eccezione IO nella lettura del manifest nell''archivio: {0}
-io_ex_reopen_EXC_=IWAE0016E Si \u00e8 verificata un''eccezione IO durante la riapertura di {0}
-unable_replace_EXC_=IWAE0017E Impossibile sostituire l''archivio originale: {0}
-duplicate_file_EXC_=IWAE0018E L''archivio {0} contiene gi\u00e0 un file denominato {1}
-duplicate_entry_EXC_=IWAE0019E Un file o una risorsa con l''uri {0} esiste gi\u00e0 nell''archivio {1}
-file_exist_as_dir_EXC_=IWAE0020E Un file denominato {0} esiste gi\u00e0 ed \u00e8 una directory
-uncontained_module_EXC_=IWAE0021E Il modulo {0} non \u00e8 incluso in un file EAR
-dd_in_ear_load_EXC_=IWAE0022E Eccezione durante il caricamento del descrittore di distribuzione per il modulo "{0}" nel file EAR "{1}"
-nested_open_fail_EXC_=IWAE0023E Impossibile aprire il file "{0}" del modulo nel file EAR "{1}"
-duplicate_module_EXC_=IWAE0024E Il descrittore di distribuzione per il file EAR "{0}" contiene gi\u00e0 un modulo con l''uri "{1}"
-no_sec_role_EXC_=IWAE0025E {0}: il descrittore di distribuzione del file EAR non contiene un ruolo di protezione denominato {1}
-dup_sec_role_EXC_=IWAE0026E {0}: il descrittore di distribuzione del file EAR contiene gi\u00e0 un ruolo di protezione denominato {1}
-dup_sec_role_module_EXC_=IWAE0027E Il descrittore di distribuzione per {0} contiene gi\u00e0 un ruolo di protezione {1}
-dup_resource_EXC_=IWAE0028E La risorsa "{0}" esiste gi\u00e0 nell''archivio "{1}"
-error_saving_EXC_=IWAE0030E Errore durante il salvataggio di {0}
-add_copy_class_dir_EXC_=IWAE0031E Il metodo "addCopyClass" non \u00e8 supportato per le directory. URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E Il metodo "addCopyLib" non \u00e8 supportato per le directory. URI: {0}
-list_components_war_EXC_=IWAE0033E Eccezione durante l''elencazione dei componenti nel file WAR: {0}
-open_nested_EXC_=IWAE0034E Impossibile aprire l''archivio nidificato "{0}" in "{1}"
-make_temp_file_WARN_=IWAE0035W Avviso: impossibile creare il file temporaneo per {0}.  Ci\u00f2 incider\u00e0 sulle prestazioni.
-file_not_found_EXC_=IWAE0036E Nome URI: {0}; nome file: {1}
-could_not_open_EXC_=IWAE0037E Impossibile aprire {0}
-could_not_find_dir_EXC_=IWAE0038E Impossibile aprire la directory {0}
-not_a_dir_EXC_=IWAE0039E Impossibile aprire la directory, il file non \u00e8 una directory: {0}
-inferred_dds_EXC_=IWAE0040E Il file JAR EJB "{0}" sembra essere in versione 1.0 poich\u00e9 il manifest non dichiara bean enterprise, ma esistono descrittori di distribuzione serializzati nel file JAR.
-filename_exception_EXC_=IWAJ0052E Nome file: {0}; eccezione: {1}
-no_dds_10_EXC_=IWAE0042E Non esiste alcun descrittore di distribuzione nel file JAR EJB 1.0: {0}
-manifest_dd_load_EXC_=IWAE0043E Il manifest JAR dichiara un bean enterprise per il quale non \u00e8 possibile caricare il file del descrittore di distribuzione: {0}
-manifest_dd_find_EXC_=IWAE0044E Il manifest JAR dichiara un bean enterprise per il quale non \u00e8 possibile trovare il file del descrittore di distribuzione: {0}
-io_ex_reading_dd_EXC_=IWAE0045E Eccezione IO durante la lettura di {0}
-ser_not_dd_EXC_=IWAE0046E L''oggetto serializzato nel file "{0}" non \u00e8 un''istanza di javax.ejb.deployment.DeploymentDescriptor
-reading_dd_EXC_=IWAE0047E Eccezione durante la lettura di {0}
-missing_class_EXC_=IWAE0048E Impossibile deserializzare {0}. Non \u00e8 stato possibile trovare una classe richiesta.  Eccezione: {1}
-Converted=Convertito
-Stack_trace_of_nested_exce_EXC_=IWAE0049E Traccia nello stack dell'eccezione nidificata:
-IOException_occurred_while_EXC_=IWAE0050E Eccezione IO durante la copia del manifest
-Extract_destination_is_the_EXC_=IWAE0051E La destinazione di estrazione coincide con il percorso del file di origine
-Parameter_should_not_be_nu_EXC_=IWAE0052E Il parametro non deve essere Null
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E L'archivio non \u00e8 un file JAR EJB (1.0) valido. Non \u00e8 stato possibile trovare alcun descrittore di distribuzione nel manifest o nelle voci con estensione ".ser"
-_The_following_files_could_EXC_=IWAE0056E Impossibile caricare i seguenti file:
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand non riuscito. Traccia nello stack per l'eccezione:
-FixPrimKeyCommand_usage___=Utilizzo di FixPrimKeyCommand: <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E Utilizzo di FixPrimKeyCommand: sourceJarFilePath deve puntare a una directory o a un file JAR EJB valido di un file JAP EJB decompresso
-Repair_command_failed_-_ex_EXC_=IWAE0059E Comando Repair non riuscito. Traccia nello stack per l'eccezione:
-Repairs_all_entries_in_the=Corregge tutte le voci nelle directory META-INF e/o WEB-INF con le lettere maiuscole/minuscole appropriate
-RepairArchiveCommand_usage=Utilizzo di RepairArchiveCommand: <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E Utilizzo di RepairArchiveCommand: sourceJarFilePath deve puntare a un archivio o a una directory valida di un archivio decompresso
-Application_Client_Jar_Fil=File JAR del client di applicazioni
-EAR_File=File EAR
-EJB_Jar_File=File JAR EJB
-RAR_File=File RAR
-WAR_File=File WAR
-Error_occurred_iterating_f_EXC_=IWAE0061E Errore durante l'iterazione nei file
-End_of_list_reached_EXC_=IWAE0062E Raggiunta la fine dell'elenco
-Internal_Error__Iterator_o_EXC_=IWAE0063E Errore interno: iteratore non sincronizzato con le voci nel file zip
-Error_iterating_the_archiv_EXC_=IWAE0064E Errore durante l'iterazione nell'archivio
-Absolute_path_unknown_EXC_=IWAE0065E Percorso assoluto sconosciuto
-Original_archive_is_not_a__EXC_=IWAE0066E L'archivio originale non \u00e8 una directory
-Null_uri_EXC_=IWAE0067E URI null
-Module_file=File di modulo
-A_WAR_file=File WAR
-An_EJB_JAR_file=File JAR EJB
-An_Application_Client_JAR_file=File JAR del client di applicazioni
-A_RAR_file=File RAR
-A_Application_file=File di applicazioni
-A_file_does_not_exist_for_module=Non esiste un file per l'elemento del modulo con l'uri: {0}
-File_not_correct_type=Il file {0} nel file EAR {1} non \u00e8 di tipo corretto in base al descrittore di distribuzione dell''applicazione.  Tipo previsto: {2}";
-Module_not_in_EAR=Il modulo non si trova in un EAR: {0}
-Module_file_does_not_exist_2=Il file di modulo non esiste per il riferimento al modulo.  Modulo = {0}
-FileImpl._Error_0=Contenuto ricorsivo non consentito per
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_ja.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_ja.properties
deleted file mode 100644
index 5f025a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_ja.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} \u306f\u30b5\u30d6\u30af\u30e9\u30b9\u3067\u30a4\u30f3\u30d7\u30ea\u30e1\u30f3\u30c8\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059
-key_class_reflection_ERROR_=IWAE0002E \u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fc "{2}" \u304b\u3089\u306e\u4e3b\u30ad\u30fc\u30fb\u30d5\u30a3\u30fc\u30eb\u30c9 "{1}" \u3092\u6bd4\u8f03\u3059\u308b\u305f\u3081\u306b\u30af\u30e9\u30b9 "{0}" \u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093
-key_field_reflection_ERROR_=IWAE0003E \u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fc "{1}" \u304b\u3089\u306e\u4e3b\u30ad\u30fc\u30fb\u30d5\u30a3\u30fc\u30eb\u30c9 "{0}" \u306e\u30bf\u30a4\u30d7\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093
-removing_key_field_INFO_=IWAE0004I \u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30fc "{1}" \u304b\u3089\u7121\u52b9\u306a\u4e3b\u30ad\u30fc\u30fb\u30d5\u30a3\u30fc\u30eb\u30c9 "{0}" \u3092\u9664\u53bb\u4e2d
-repair_usage_ERROR_=IWAE0005E RepairArchiveCommand \u306e\u4f7f\u7528\u6cd5: destinationPath {0} \u306b\u66f8\u304d\u8fbc\u3081\u307e\u305b\u3093
-invalid_archive_EXC_=IWAE0006E \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50 {1} \u304c\u898b\u3064\u304b\u3089\u306a\u3044\u305f\u3081 (\u5927\u6587\u5b57\u5c0f\u6587\u5b57\u3092\u533a\u5225)\u3001\u30a2\u30fc\u30ab\u30a4\u30d6\u306f\u6709\u52b9\u306a {0} \u3067\u306f\u3042\u308a\u307e\u305b\u3093
-load_resource_EXC_=IWAE0007E \u30a2\u30fc\u30ab\u30a4\u30d6 "{1}" \u3067\u30ea\u30bd\u30fc\u30b9 "{0}" \u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
-nested_jar_EXC_=IWAE0008E {1} \u304b\u3089 {0} \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-make_temp_dir_EXC_=IWAE0009E \u4e00\u6642\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc {0} \u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093
-invalid_classpath_WARN_=IWAE0010W \u30af\u30e9\u30b9\u30d1\u30b9\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8 "{0}" \u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u307e\u305f\u306f Zip \u30d5\u30a1\u30a4\u30eb\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-invalid_cp_file_WARN_=IWAE0011W \u30af\u30e9\u30b9\u30d1\u30b9\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8 "{0}" \u306f\u30ed\u30fc\u30ab\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u3057\u3066\u3044\u307e\u305b\u3093
-io_ex_loading_EXC_=IWAE0012E {0} \u3092\u30ed\u30fc\u30c9\u4e2d\u306b I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-tx_bean_mgd_WARN_=IWAE0013W EJB 1.0 \u30a4\u30f3\u30dd\u30fc\u30c8: {0} \u7528\u306e TX_BEAN_MANAGED \u30b3\u30f3\u30c8\u30ed\u30fc\u30eb\u8a18\u8ff0\u5b50\u3092\u30de\u30c3\u30d7\u3057\u3066\u3044\u307e\u305b\u3093
-error_saving_EXC_=IWAE0014E {0} \u3092\u4fdd\u7ba1\u4e2d\u306e\u30a8\u30e9\u30fc
-io_ex_manifest_EXC_=IWAE0015E \u30a2\u30fc\u30ab\u30a4\u30d6\u5185\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8 {0} \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-io_ex_reopen_EXC_=IWAE0016E {0} \u3092\u518d\u30aa\u30fc\u30d7\u30f3\u4e2d\u306b I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-unable_replace_EXC_=IWAE0017E \u30aa\u30ea\u30b8\u30ca\u30eb\u30fb\u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u3092\u7f6e\u63db\u3067\u304d\u307e\u305b\u3093
-duplicate_file_EXC_=IWAE0018E {0} \u3068\u3044\u3046\u540d\u524d\u306e\u30a2\u30fc\u30ab\u30a4\u30d6\u306b\u306f\u3059\u3067\u306b\u3001{1} \u3068\u3044\u3046\u540d\u524d\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
-duplicate_entry_EXC_=IWAE0019E uri {0} \u3092\u6301\u3064\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30ea\u30bd\u30fc\u30b9\u306f\u3059\u3067\u306b\u3001{1} \u3068\u3044\u3046\u540d\u524d\u306e\u30a2\u30fc\u30ab\u30a4\u30d6\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059
-file_exist_as_dir_EXC_=IWAE0020E {0} \u3068\u3044\u3046\u540d\u524d\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u5b58\u5728\u3057\u3066\u304a\u308a\u3001\u3053\u308c\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3067\u3059
-uncontained_module_EXC_=IWAE0021E \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306f EAR \u30d5\u30a1\u30a4\u30eb\u306b\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093
-dd_in_ear_load_EXC_=IWAE0022E EAR \u30d5\u30a1\u30a4\u30eb "{1}" \u5185\u306e\u30e2\u30b8\u30e5\u30fc\u30eb "{0}" \u7528\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-nested_open_fail_EXC_=IWAE0023E EAR \u30d5\u30a1\u30a4\u30eb "{1}" \u5185\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb "{0}" \u3092\u958b\u304f\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093
-duplicate_module_EXC_=IWAE0024E EAR \u30d5\u30a1\u30a4\u30eb "{0}" \u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u306b\u306f\u3059\u3067\u306b\u3001uri "{1}" \u3092\u6301\u3064\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
-no_sec_role_EXC_=IWAE0025E {0}: EAR \u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u306b\u3001{1} \u3068\u3044\u3046\u540d\u524d\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u305b\u3093
-dup_sec_role_EXC_=IWAE0026E {0}: EAR \u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u306b\u306f\u3059\u3067\u306b\u3001{1} \u3068\u3044\u3046\u540d\u524d\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
-dup_sec_role_module_EXC_=IWAE0027E {0} \u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u306b\u306f\u3059\u3067\u306b\u3001{1} \u3068\u3044\u3046\u540d\u524d\u306e\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059
-dup_resource_EXC_=IWAE0028E "{0}" \u3068\u3044\u3046\u540d\u524d\u306e\u30ea\u30bd\u30fc\u30b9\u306f\u3059\u3067\u306b\u30a2\u30fc\u30ab\u30a4\u30d6 "{1}" \u5185\u306b\u5b58\u5728\u3057\u3066\u3044\u307e\u3059
-error_saving_EXC_=IWAE0030E {0} \u3092\u4fdd\u7ba1\u4e2d\u306e\u30a8\u30e9\u30fc
-add_copy_class_dir_EXC_=IWAE0031E \u30e1\u30bd\u30c3\u30c9 "addCopyClass" \u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u306b\u5bfe\u3057\u3066\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E \u30e1\u30bd\u30c3\u30c9 "addCopyLib" \u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u306b\u5bfe\u3057\u3066\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002 URI: {0}
-list_components_war_EXC_=IWAE0033E WAR \u30d5\u30a1\u30a4\u30eb {0} \u5185\u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u30ea\u30b9\u30c8\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-open_nested_EXC_=IWAE0034E "{1}" \u5185\u306e\u30cd\u30b9\u30c8\u3055\u308c\u305f\u30a2\u30fc\u30ab\u30a4\u30d6 "{0}" \u3092\u958b\u3051\u307e\u305b\u3093\u3067\u3057\u305f
-make_temp_file_WARN_=IWAE0035W \u8b66\u544a: {0} \u306e\u4e00\u6642\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002  \u3053\u308c\u306f\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u306b\u5f71\u97ff\u3057\u307e\u3059\u3002
-file_not_found_EXC_=IWAE0036E URI \u540d: {0}\u3001\u30d5\u30a1\u30a4\u30eb\u540d: {1}
-could_not_open_EXC_=IWAE0037E {0} \u3092\u958b\u3051\u307e\u305b\u3093\u3067\u3057\u305f
-could_not_find_dir_EXC_=IWAE0038E \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc {0} \u3092\u958b\u3051\u307e\u305b\u3093
-not_a_dir_EXC_=IWAE0039E \u30d5\u30a1\u30a4\u30eb {0} \u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3067\u306f\u306a\u3044\u305f\u3081\u3001\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3092\u958b\u3051\u307e\u305b\u3093
-inferred_dds_EXC_=IWAE0040E \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306f\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3092\u5ba3\u8a00\u3057\u3066\u3044\u306a\u3044\u304c\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u304c JAR \u5185\u306b\u5b58\u5728\u3059\u308b\u305f\u3081\u3001EJB JAR \u30d5\u30a1\u30a4\u30eb "{0}" \u306f\u30d0\u30fc\u30b8\u30e7\u30f3 1.0 \u3067\u3042\u308b\u3068\u63a8\u6e2c\u3055\u308c\u307e\u3057\u305f\u3002
-filename_exception_EXC_=IWAE0041E \u30d5\u30a1\u30a4\u30eb\u540d: {0}\u3001\u4f8b\u5916: {1}
-no_dds_10_EXC_=IWAE0042E EJB 1.0 Jar \u30d5\u30a1\u30a4\u30eb {0} \u5185\u306b\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u304c\u3042\u308a\u307e\u305b\u3093
-manifest_dd_load_EXC_=IWAE0043E JAR \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306f\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u306a\u3044\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3092\u5ba3\u8a00\u3057\u3066\u3044\u307e\u3059: {0}
-manifest_dd_find_EXC_=IWAE0044E JAR \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u306f\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3092\u5ba3\u8a00\u3057\u3066\u3044\u307e\u3059: {0}
-io_ex_reading_dd_EXC_=IWAE0045E {0} \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-ser_not_dd_EXC_=IWAE0046E \u30d5\u30a1\u30a4\u30eb "{0}" \u5185\u306e\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u5316\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u3001javax.ejb.deployment.DeploymentDescriptor \u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-reading_dd_EXC_=IWAE0047E {0} \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-missing_class_EXC_=IWAE0048E \u5fc5\u8981\u306a\u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u305f\u3081\u3001{0} \u3092\u30c7\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002  \u4f8b\u5916: {1}
-Converted=\u5909\u63db\u6e08\u307f
-Stack_trace_of_nested_exce_EXC_=IWAE0049E \u30cd\u30b9\u30c8\u3055\u308c\u305f\u4f8b\u5916\u306e\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9:
-IOException_occurred_while_EXC_=IWAE0050E \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3092\u30b3\u30d4\u30fc\u4e2d\u306b I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-Extract_destination_is_the_EXC_=IWAE0051E \u62bd\u51fa\u3055\u308c\u305f\u5b9b\u5148\u306f\u30bd\u30fc\u30b9\u30fb\u30d5\u30a1\u30a4\u30eb\u3068\u540c\u3058\u30d1\u30b9\u3067\u3059
-Parameter_should_not_be_nu_EXC_=IWAE0052E \u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092 NULL \u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E \u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u3067\u3082\u3001".ser" \u62e1\u5f35\u5b50\u3092\u6301\u3064\u9805\u76ee\u3067\u3082\u3001\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u5316\u3055\u308c\u305f\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u304c\u898b\u3064\u304b\u3089\u306a\u3044\u305f\u3081\u3001\u30a2\u30fc\u30ab\u30a4\u30d6\u306f\u6709\u52b9\u306a EJB JAR \u30d5\u30a1\u30a4\u30eb (1.0) \u3067\u306f\u3042\u308a\u307e\u305b\u3093
-_The_following_files_could_EXC_=IWAE0056E \u6b21\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand \u304c\u5931\u6557\u3057\u307e\u3057\u305f - \u4f8b\u5916\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9:
-FixPrimKeyCommand_usage___=FixPrimKeyCommand \u306e\u4f7f\u7528\u6cd5: <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E FixPrimKeyCommand \u306e\u4f7f\u7528\u6cd5: sourceJarFilePath \u306f\u3001\u6709\u52b9\u306a EJB JAR \u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u5145\u6e80\u3057\u305f EJB JAR \u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3092\u6307\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-Repair_command_failed_-_ex_EXC_=IWAE0059E \u4fee\u5fa9\u30b3\u30de\u30f3\u30c9\u304c\u5931\u6557\u3057\u307e\u3057\u305f - \u4f8b\u5916\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9:
-Repairs_all_entries_in_the=META-INF \u307e\u305f\u306f WEB-INF \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc (\u3042\u308b\u3044\u306f\u305d\u306e\u4e21\u65b9) \u5185\u306e\u3059\u3079\u3066\u306e\u9805\u76ee\u306e\u5927/\u5c0f\u6587\u5b57\u304c\u6b63\u3057\u304f\u306a\u308b\u3088\u3046\u306b\u4fee\u5fa9\u3057\u307e\u3059
-RepairArchiveCommand_usage=RepairArchiveCommand \u306e\u4f7f\u7528\u6cd5: <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E RepairArchiveCommand \u306e\u4f7f\u7528\u6cd5: sourceJarFilePath \u306f\u3001\u6709\u52b9\u306a\u30a2\u30fc\u30ab\u30a4\u30d6\u307e\u305f\u306f\u81a8\u5f35\u3057\u305f\u30a2\u30fc\u30ab\u30a4\u30d6\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3092\u6307\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-Application_Client_Jar_Fil=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8 Jar \u30d5\u30a1\u30a4\u30eb
-EAR_File=EAR \u30d5\u30a1\u30a4\u30eb
-EJB_Jar_File=EJB JAR \u30d5\u30a1\u30a4\u30eb
-RAR_File=RAR \u30d5\u30a1\u30a4\u30eb
-WAR_File=WAR \u30d5\u30a1\u30a4\u30eb
-Error_occurred_iterating_f_EXC_=IWAE0061E \u30d5\u30a1\u30a4\u30eb\u3092\u53cd\u5fa9\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-End_of_list_reached_EXC_=IWAE0062E \u30ea\u30b9\u30c8\u306e\u7d42\u308f\u308a\u306b\u9054\u3057\u307e\u3057\u305f
-Internal_Error__Iterator_o_EXC_=IWAE0063E \u5185\u90e8\u30a8\u30e9\u30fc: \u30a4\u30c6\u30ec\u30fc\u30bf\u30fc\u304c ZIP \u9805\u76ee\u3068\u975e\u540c\u671f\u3067\u3059
-Error_iterating_the_archiv_EXC_=IWAE0064E \u30a2\u30fc\u30ab\u30a4\u30d6\u3092\u53cd\u5fa9\u4e2d\u306e\u30a8\u30e9\u30fc
-Absolute_path_unknown_EXC_=IWAE0065E \u4e0d\u660e\u306a\u7d76\u5bfe\u30d1\u30b9
-Original_archive_is_not_a__EXC_=IWAE0066E \u30aa\u30ea\u30b8\u30ca\u30eb\u30fb\u30a2\u30fc\u30ab\u30a4\u30d6\u306f\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-Null_uri_EXC_=IWAE0067E NULL \u306e uri
-Module_file=\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb
-A_WAR_file=WAR \u30d5\u30a1\u30a4\u30eb
-An_EJB_JAR_file=EJB JAR \u30d5\u30a1\u30a4\u30eb
-An_Application_Client_JAR_file=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8 JAR \u30d5\u30a1\u30a4\u30eb
-A_RAR_file=RAR \u30d5\u30a1\u30a4\u30eb
-A_Application_file=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d5\u30a1\u30a4\u30eb
-A_file_does_not_exist_for_module=uri {0} \u3092\u6301\u3064\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u30d5\u30a1\u30a4\u30eb\u306f\u5b58\u5728\u3057\u307e\u305b\u3093
-File_not_correct_type=EAR \u30d5\u30a1\u30a4\u30eb {1} \u5185\u306e\u30d5\u30a1\u30a4\u30eb {0} \u306f\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u306b\u57fa\u3065\u3044\u305f\u6b63\u3057\u3044\u578b\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002  \u4e88\u671f\u3055\u308c\u308b\u578b: {2}
-Module_not_in_EAR=\u30e2\u30b8\u30e5\u30fc\u30eb\u306f EAR {0} \u5185\u306b\u3042\u308a\u307e\u305b\u3093
-Module_file_does_not_exist_2=\u30e2\u30b8\u30e5\u30fc\u30eb\u53c2\u7167\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb\u306f\u5b58\u5728\u3057\u307e\u305b\u3093\u3002  \u30e2\u30b8\u30e5\u30fc\u30eb = {0}
-FileImpl._Error_0=\u518d\u5e30\u7684\u5305\u542b\u306f\u8a31\u53ef\u3055\u308c\u3066\u3044\u307e\u305b\u3093
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_ko.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_ko.properties
deleted file mode 100644
index 724c248..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_ko.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0}\uc744(\ub97c) \uc11c\ube0c\ud074\ub798\uc2a4\uc5d0 \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4.
-key_class_reflection_ERROR_=IWAE0002E "{2}" \uc5d4\ud2f0\ud2f0\uc5d0\uc11c "{1}" 1\ucc28 \ud0a4 \ud544\ub4dc\ub97c \ube44\uad50\ud558\uae30 \uc704\ud574 "{0}" \ud074\ub798\uc2a4\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-key_field_reflection_ERROR_=IWAE0003E "{1}" \uc5d4\ud2f0\ud2f0\uc5d0\uc11c "{0}" 1\ucc28 \ud0a4 \ud544\ub4dc\uc758 \uc720\ud615\uc744 \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-removing_key_field_INFO_=IWAE0004I "{1}" \uc5d4\ud2f0\ud2f0\uc5d0\uc11c \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 "{0}" 1\ucc28 \ud0a4 \ud544\ub4dc \uc81c\uac70 \uc911
-repair_usage_ERROR_=IWAE0005E RepairArchiveCommand \uc0ac\uc6a9\ubc95: destinationPath\uc5d0 \uc4f8 \uc218 \uc5c6\uc74c: {0}
-invalid_archive_EXC_=IWAE0006E {1} \uc804\uac1c \uc124\uba85\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc73c\ubbc0\ub85c \uc544\uce74\uc774\ube0c\uac00 \uc62c\ubc14\ub978 {0}\uc774(\uac00) \uc544\ub2d9\ub2c8\ub2e4(\ub300\uc18c\ubb38\uc790 \uad6c\ubd84).
-load_resource_EXC_=IWAE0007E "{1}" \uc544\uce74\uc774\ube0c\uc5d0\uc11c "{0}" \uc790\uc6d0\uc744 \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc5c8\uc74c
-nested_jar_EXC_=IWAE0008E {1}\uc5d0\uc11c {0}\uc744(\ub97c) \uc77d\ub294 \uc911\uc5d0 \uc624\ub958 \ubc1c\uc0dd
-make_temp_dir_EXC_=IWAE0009E \uc784\uc2dc \ub514\ub809\ud1a0\ub9ac\ub97c \ub9cc\ub4e4 \uc218 \uc5c6\uc74c: {0}
-invalid_classpath_WARN_=IWAE0010W "{0}" \ud074\ub798\uc2a4 \uacbd\ub85c \uc694\uc18c\uac00 \ub514\ub809\ud1a0\ub9ac\ub098 Zip \ud30c\uc77c\uc774 \uc544\ub2d8
-invalid_cp_file_WARN_=IWAE0011W "{0}" \ud074\ub798\uc2a4 \uacbd\ub85c \uc694\uc18c\uac00 \ub85c\uceec \ud30c\uc77c\uc744 \uac00\ub9ac\ud0a4\uc9c0 \uc54a\uc74c
-io_ex_loading_EXC_=IWAE0012E {0}\uc744(\ub97c) \ub85c\ub4dc\ud558\ub294 \uc911\uc5d0 IO \uc608\uc678 \ubc1c\uc0dd
-tx_bean_mgd_WARN_=IWAE0013W EJB 1.0 \uac00\uc838\uc624\uae30: {0}\uc5d0 \ub300\ud574 TX_BEAN_MANAGED \uc81c\uc5b4 \uc124\uba85\uc790\ub97c \ub9f5\ud558\uc9c0 \uc54a\uc74c
-error_saving_EXC_=IWAE0014E {0} \uc800\uc7a5 \uc911\uc5d0 \uc624\ub958 \ubc1c\uc0dd
-io_ex_manifest_EXC_=IWAE0015E \uc544\uce74\uc774\ube0c\uc5d0\uc11c Manifest\ub97c \uc77d\ub294 \uc911\uc5d0 IOException \ubc1c\uc0dd: {0}
-io_ex_reopen_EXC_=IWAE0016E {0}\uc744(\ub97c) \ub2e4\uc2dc \uc5ec\ub294 \ub3d9\uc548 IOException \ubc1c\uc0dd
-unable_replace_EXC_=IWAE0017E \uc6d0\ub798\uc758 \uc544\uce74\uc774\ube0c\ub97c \ubc14\uafc0 \uc218 \uc5c6\uc74c: {0}
-duplicate_file_EXC_=IWAE0018E {0}(\uc774)\ub77c\ub294 \uc774\ub984\uc758 \uc544\uce74\uc774\ube0c\uac00 \uc774\ubbf8 {1}(\uc774)\ub77c\ub294 \uc774\ub984\uc758 \ud30c\uc77c \ud3ec\ud568
-duplicate_entry_EXC_=IWAE0019E  {0} uri\ub97c \uac00\uc9c0\ub294 \ud30c\uc77c\uc774\ub098 \uc790\uc6d0\uc774 \uc774\ubbf8 {1}(\uc774)\ub77c\ub294 \uc774\ub984\uc774 \uc9c0\uc815\ub41c \uc544\uce74\uc774\ube0c\uc5d0 \uc788\uc74c
-file_exist_as_dir_EXC_=IWAE0020E {0}(\uc774)\ub77c\ub294 \uc774\ub984\uc774 \uc9c0\uc815\ub41c \ud30c\uc77c\uc774 \uc788\uace0 \ub514\ub809\ud1a0\ub9ac\uc784
-uncontained_module_EXC_=IWAE0021E {0} \ubaa8\ub4c8\uc774 EAR \ud30c\uc77c\uc5d0 \uc788\uc74c
-dd_in_ear_load_EXC_=IWAE0022E "{1}" EAR \ud30c\uc77c\uc758 "{0}" \ubaa8\ub4c8\uc5d0 \ub300\ud55c \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud558\ub294 \uc911\uc5d0 \uc608\uc678 \ubc1c\uc0dd
-nested_open_fail_EXC_=IWAE0023E "{1}" EAR \ud30c\uc77c\uc758 "{0}" \ubaa8\ub4c8 \ud30c\uc77c\uc744 \uc5f4 \uc218 \uc5c6\uc74c
-duplicate_module_EXC_=IWAE0024E "{0}" EAR \ud30c\uc77c\uc758 \uc804\uac1c \uc124\uba85\uc790\uac00 "{1}" uri\ub97c \uac00\uc9c0\ub294 \ubaa8\ub4c8\uc744 \uc774\ubbf8 \ud3ec\ud568
-no_sec_role_EXC_=IWAE0025E {0}: EAR \ud30c\uc77c \uc804\uac1c \uc124\uba85\uc790\uc5d0 {1}(\uc774)\ub77c\ub294 \uc774\ub984\uc774 \uc9c0\uc815\ub41c \ubcf4\uc548 \uc5ed\ud560\uc774 \uc5c6\uc74c
-dup_sec_role_EXC_=IWAE0026E {0}: EAR \ud30c\uc77c \uc804\uac1c \uc124\uba85\uc790\uc5d0 {1}(\uc774)\ub77c\ub294 \uc774\ub984\uc774 \uc9c0\uc815\ub41c \ubcf4\uc548 \uc5ed\ud560\uc774 \uc774\ubbf8 \uc788\uc74c
-dup_sec_role_module_EXC_=IWAE0027E {0}\uc758 \uc804\uac1c \uc124\uba85\uc790\uc5d0 {1}(\uc774)\ub77c\ub294 \uc774\ub984\uc774 \uc9c0\uc815\ub41c \ubcf4\uc548 \uc5ed\ud560\uc774 \uc774\ubbf8 \uc788\uc74c
-dup_resource_EXC_=IWAE0028E "{1}" \uc544\uce74\uc774\ube0c\uc5d0 "{0}"(\uc774)\ub77c\ub294 \uc774\ub984\uc774 \uc9c0\uc815\ub41c \uc790\uc6d0\uc774 \uc774\ubbf8 \uc788\uc74c
-error_saving_EXC_=IWAE0030E {0} \uc800\uc7a5 \uc911\uc5d0 \uc624\ub958 \ubc1c\uc0dd
-add_copy_class_dir_EXC_=IWAE0031E "addCopyClass" \uba54\uc18c\ub4dc\ub294 \ub514\ub809\ud1a0\ub9ac\uc5d0\ub294 \uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E "addCopyLib" \uba54\uc18c\ub4dc\ub294 \ub514\ub809\ud1a0\ub9ac\uc5d0\ub294 \uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. URI: {0}
-list_components_war_EXC_=IWAE0033E WAR \ud30c\uc77c\uc758 \uad6c\uc131\uc694\uc18c\ub97c \ub098\uc5f4\ud558\ub294 \uc911\uc5d0 \uc608\uc678 \ubc1c\uc0dd: {0}
-open_nested_EXC_=IWAE0034E "{1}" \uc544\uce74\uc774\ube0c\uc5d0 \uc911\ucca9\ub418\uc5b4 \uc788\ub294 "{0}" \uc544\uce74\uc774\ube0c\ub97c \uc5f4 \uc218 \uc5c6\uc5c8\uc74c
-make_temp_file_WARN_=IWAE0035W \uacbd\uace0: {0}\uc5d0 \ub300\ud55c \uc784\uc2dc \ud30c\uc77c\uc744 \uc791\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.  \uc131\ub2a5\uc5d0 \uc601\ud5a5\uc744 \uc904 \uac83\uc785\ub2c8\ub2e4.
-file_not_found_EXC_=IWAE0036E URI \uc774\ub984: {0}, \ud30c\uc77c \uc774\ub984: {1}
-could_not_open_EXC_=IWAE0037E {0}\uc744(\ub97c) \uc5f4 \uc218 \uc5c6\uc5c8\uc74c
-could_not_find_dir_EXC_=IWAE0038E {0} \ub514\ub809\ud1a0\ub9ac\ub97c \uc5f4 \uc218 \uc5c6\uc74c
-not_a_dir_EXC_=IWAE0039E \ud30c\uc77c\uc774 \ub514\ub809\ud1a0\ub9ac\uac00 \uc544\ub2c8\uae30 \ub54c\ubb38\uc5d0 \ub514\ub809\ud1a0\ub9ac\ub97c \uc5f4 \uc218 \uc5c6\uc74c: {0}
-inferred_dds_EXC_=IWAE0040E Manifest\uac00 \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc744 \uc120\uc5b8\ud558\uc9c0 \uc54a\uc73c\ub098 \uc77c\ub828\ud654\ub41c \uc804\uac1c \uc124\uba85\uc790\uac00 JAR\uc5d0 \uc788\uae30 \ub54c\ubb38\uc5d0 "{0}" EJB JAR \ud30c\uc77c\uc740 \ubc84\uc804 1.0\uc774\ub77c\uace0 \uc720\ucd94\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-filename_exception_EXC_=IWAE0041E \ud30c\uc77c \uc774\ub984: {0}, \uc608\uc678: {1}
-no_dds_10_EXC_=IWAE0042E EJB 1.0 JAR \ud30c\uc77c\uc5d0 \uc804\uac1c \uc124\uba85\uc790 \uc5c6\uc74c: {0}
-manifest_dd_load_EXC_=IWAE0043E JAR Manifest\uac00 \uc804\uac1c \uc124\uba85\uc790 \ud30c\uc77c\uc744 \ub85c\ub4dc\ud560 \uc218 \uc5c6\ub294 \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc744 \uc120\uc5b8: {0}
-manifest_dd_find_EXC_=IWAE0044E JAR Manifest\uac00 \uc804\uac1c \uc124\uba85\uc790 \ud30c\uc77c\uc744 \ucc3e\uc744 \uc218 \uc5c6\ub294 \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc744 \uc120\uc5b8: {0}
-io_ex_reading_dd_EXC_=IWAE0045E {0}\uc744(\ub97c) \uc77d\ub294 \uc911\uc5d0 IO \uc608\uc678 \ubc1c\uc0dd
-ser_not_dd_EXC_=IWAE0046E "{0}" \ud30c\uc77c\uc5d0 \uc788\ub294 \uc77c\ub828\ud654\ub41c \uc624\ube0c\uc81d\ud2b8\uac00 javax.ejb.deployment.DeploymentDescriptor\uc758 \uc778\uc2a4\ud134\uc2a4\uac00 \uc544\ub2d8
-reading_dd_EXC_=IWAE0047E {0}\uc744(\ub97c) \uc77d\ub294 \uc911\uc5d0 \uc608\uc678 \ubc1c\uc0dd
-missing_class_EXC_=IWAE0048E \ud544\uc694\ud55c \ud074\ub798\uc2a4\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc5c8\uae30 \ub54c\ubb38\uc5d0 {0}\uc758 \uc77c\ub828\ud654\ub97c \ucde8\uc18c\ud560 \uc218 \uc5c6\uc5c8\uc2b5\ub2c8\ub2e4.  \uc608\uc678: {1}
-Converted=\ubcc0\ud658\ub428
-Stack_trace_of_nested_exce_EXC_=IWAE0049E \uc911\ucca9\ub41c \uc608\uc678\uc758 \uc2a4\ud0dd \ucd94\uc801:
-IOException_occurred_while_EXC_=IWAE0050E Manifest\ub97c \ubcf5\uc0ac\ud558\ub294 \ub3d9\uc548 IOException \ubc1c\uc0dd
-Extract_destination_is_the_EXC_=IWAE0051E \ucd94\ucd9c \ub300\uc0c1\uc774 \uc18c\uc2a4 \ud30c\uc77c\uacfc \uac19\uc740 \uacbd\ub85c\uc784
-Parameter_should_not_be_nu_EXC_=IWAE0052E \ub9e4\uac1c\ubcc0\uc218\uac00 \ub110\uc774\uba74 \uc548 \ub428
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E \uc77c\ub828\ud654\ub41c \uc804\uac1c \uc124\uba85\uc790\ub97c Manifest\ub098 ".ser" \ud655\uc7a5\uc790\ub97c \uac00\uc9c4 \uc5d4\ud2f0\ud2f0\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \uc544\uce74\uc774\ube0c\uac00 \uc62c\ubc14\ub978 EJB JAR \ud30c\uc77c(1.0)\uc774 \uc544\ub2d8
-_The_following_files_could_EXC_=IWAE0056E \ub2e4\uc74c \ud30c\uc77c\uc744 \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc5c8\uc74c:
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand \uc2e4\ud328 - \uc608\uc678 \uc2a4\ud0dd \ucd94\uc801:
-FixPrimKeyCommand_usage___=FixPrimKeyCommand \uc0ac\uc6a9\ubc95:  <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E FixPrimKeyCommand \uc0ac\uc6a9\ubc95: sourceJarFilePath\uac00 \uc62c\ubc14\ub978 EJB JAR \ud30c\uc77c\uc774\ub098 \ud3bc\uccd0\uc9c4 EJB JAR \ud30c\uc77c\uc758 \ub514\ub809\ud1a0\ub9ac\ub97c \uac00\ub9ac\ucf1c\uc57c \ud568
-Repair_command_failed_-_ex_EXC_=IWAE0059E \uc218\uc815 \uba85\ub839 \uc2e4\ud328 - \uc608\uc678 \uc2a4\ud0dd \ucd94\uc801:
-Repairs_all_entries_in_the=META-INF \ubc0f/\ub610\ub294 WEB-INF \ub514\ub809\ud1a0\ub9ac\uc758 \ubaa8\ub4e0 \ud56d\ubaa9\uc774 \uc815\ud655\ud55c \ub300\uc18c\ubb38\uc790\uac00 \ub418\ub3c4\ub85d \uc218\uc815
-RepairArchiveCommand_usage=RepairArchiveCommand \uc0ac\uc6a9\ubc95:  <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E RepairArchiveCommand \uc0ac\uc6a9\ubc95: sourceJarFilePath\uac00 \uc62c\ubc14\ub978 \uc544\uce74\uc774\ube0c\ub098 \ud3bc\uccd0\uc9c4 \uc544\uce74\uc774\ube0c\uc758 \ub514\ub809\ud1a0\ub9ac\ub97c \uac00\ub9ac\ucf1c\uc57c \ud568
-Application_Client_Jar_Fil=\uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 JAR \ud30c\uc77c
-EAR_File=EAR \ud30c\uc77c
-EJB_Jar_File=EJB JAR \ud30c\uc77c
-RAR_File=RAR \ud30c\uc77c
-WAR_File=WAR \ud30c\uc77c
-Error_occurred_iterating_f_EXC_=IWAE0061E \ud30c\uc77c\uc744 \ubc18\ubcf5\ud558\ub294 \uc911\uc5d0 \uc624\ub958 \ubc1c\uc0dd
-End_of_list_reached_EXC_=IWAE0062E \ubaa9\ub85d\uc758 \ub05d\uc5d0 \ub3c4\ub2ec
-Internal_Error__Iterator_o_EXC_=IWAE0063E \ub0b4\ubd80 \uc624\ub958: \ubc18\ubcf5\uae30\uac00 zip \ud56d\ubaa9\uacfc \ub3d9\uae30\ud654\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc74c
-Error_iterating_the_archiv_EXC_=IWAE0064E \uc544\uce74\uc774\ube0c\ub97c \ubc18\ubcf5\ud558\ub294 \uc911\uc5d0 \uc624\ub958 \ubc1c\uc0dd
-Absolute_path_unknown_EXC_=IWAE0065E \uc54c \uc218 \uc5c6\ub294 \uc808\ub300 \uacbd\ub85c
-Original_archive_is_not_a__EXC_=IWAE0066E \uc6d0\ub798\uc758 \uc544\uce74\uc774\ube0c\uac00 \ub514\ub809\ud1a0\ub9ac\uac00 \uc544\ub2d8
-Null_uri_EXC_=IWAE0067E \ub110 uri
-Module_file=\ubaa8\ub4c8 \ud30c\uc77c
-A_WAR_file=WAR \ud30c\uc77c
-An_EJB_JAR_file=EJB JAR \ud30c\uc77c
-An_Application_Client_JAR_file=\uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 JAR \ud30c\uc77c
-A_RAR_file=RAR \ud30c\uc77c
-A_Application_file=\uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud30c\uc77c
-A_file_does_not_exist_for_module=uri\uac00 \uc788\ub294 \ubaa8\ub4c8 \uc694\uc18c\uc5d0 \ub300\ud55c \ud30c\uc77c\uc774 \uc5c6\uc74c: {0}
-File_not_correct_type={1} EAR \ud30c\uc77c\uc758 {0} \ud30c\uc77c\uc774 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc804\uac1c \uc124\uba85\uc790\ub97c \uae30\ubcf8\uc73c\ub85c \ud558\ub294 \uc815\ud655\ud55c \uc720\ud615\uc774 \uc544\ub2d9\ub2c8\ub2e4.  \uc608\uc0c1\ud558\ub294 \uc720\ud615: {2}".
-Module_not_in_EAR=EAR\uc5d0 \ubaa8\ub4c8\uc774 \uc5c6\uc74c: {0}
-Module_file_does_not_exist_2=\ubaa8\ub4c8 \ucc38\uc870\uc5d0 \ub300\ud55c \ubaa8\ub4c8 \ud30c\uc77c\uc774 \uc5c6\uc2b5\ub2c8\ub2e4.  \ubaa8\ub4c8 = {0}
-FileImpl._Error_0=\ubc18\ubcf5\uc801\uc778 \ud3ec\ud568\uc774 \ud5c8\uc6a9\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_pt_BR.properties
deleted file mode 100644
index 485cbef..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_pt_BR.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} deve ser implementado na subclasse
-key_class_reflection_ERROR_=IWAE0002E N\u00e3o \u00e9 poss\u00edvel refletir a classe "{0}" para comparar o campo de chave principal "{1}" a partir da entidade "{2}"
-key_field_reflection_ERROR_=IWAE0003E N\u00e3o \u00e9 poss\u00edvel refletir o tipo de campo de chave principal "{0}" a partir da entidade "{1}"
-removing_key_field_INFO_=IWAE0004I Removendo campo de chave principal inv\u00e1lida "{0}" da entidade "{1}"
-repair_usage_ERROR_=IWAE0005E Uso de RepairArchiveCommand: n\u00e3o \u00e9 poss\u00edvel gravar em destinationPath: {0}
-invalid_archive_EXC_=IWAE0006E O archive n\u00e3o \u00e9 um {0} v\u00e1lido porque o descritor de implementa\u00e7\u00e3o n\u00e3o foi encontrado (distin\u00e7\u00e3o entre mai\u00fasculas e min\u00fasculas): {1}
-load_resource_EXC_=IWAE0007E N\u00e3o foi poss\u00edvel carregar o recurso "{0}" no archive "{1}"
-nested_jar_EXC_=IWAE0008E Ocorreu um erro ao ler {0} a partir de {1}
-make_temp_dir_EXC_=IWAE0009E N\u00e3o \u00e9 poss\u00edvel criar diret\u00f3rio temp: {0}
-invalid_classpath_WARN_=IWAE0010W O elemento do classpath "{0}" n\u00e3o \u00e9 um diret\u00f3rio ou um arquivo Zip
-invalid_cp_file_WARN_=IWAE0011W O elemento do classpath "{0}" n\u00e3o aponta para um arquivo local
-io_ex_loading_EXC_=IWAE0012E Ocorreu uma exce\u00e7\u00e3o ES ao carregar {0}
-tx_bean_mgd_WARN_=IWAE0013W Importa\u00e7\u00e3o de EJB 1.0: N\u00e3o mapear descritor de controle TX_BEAN_MANAGED para {0}
-error_saving_EXC_=IWAE0014E Erro ao salvar {0}
-io_ex_manifest_EXC_=IWAE0015E Ocorreu uma exce\u00e7\u00e3o ES ao ler o manifesto no archive: {0}
-io_ex_reopen_EXC_=IWAE0016E Ocorreu uma exce\u00e7\u00e3o ES ao reabrir {0}
-unable_replace_EXC_=IWAE0017E N\u00e3o \u00e9 poss\u00edvel substituir o archive original: {0}
-duplicate_file_EXC_=IWAE0018E O archive {0} j\u00e1 cont\u00e9m um arquivo denominado {1}
-duplicate_entry_EXC_=IWAE0019E O arquivo ou recurso com o uri {0} j\u00e1 existe no archive denominado {1}
-file_exist_as_dir_EXC_=IWAE0020E O arquivo {0} existe e \u00e9 um diret\u00f3rio
-uncontained_module_EXC_=IWAE0021E O m\u00f3dulo {0} n\u00e3o \u00e9 contido por um arquivo EAR
-dd_in_ear_load_EXC_=IWAE0022E Ocorreu uma exce\u00e7\u00e3o ao carregar o descritor de implementa\u00e7\u00e3o para o m\u00f3dulo "{0}" no arquivo EAR "{1}"
-nested_open_fail_EXC_=IWAE0023E N\u00e3o \u00e9 poss\u00edvel abrir o arquivo de m\u00f3dulo "{0}" no arquivo EAR "{1}"
-duplicate_module_EXC_=IWAE0024E O descritor de implementa\u00e7\u00e3o para o arquivo EAR "{0}" j\u00e1 cont\u00e9m um m\u00f3dulo que possui uri "{1}"
-no_sec_role_EXC_=IWAE0025E {0}: O descritor de implementa\u00e7\u00e3o do Arquivo EAR n\u00e3o cont\u00e9m uma fun\u00e7\u00e3o de seguran\u00e7a denominada {1}
-dup_sec_role_EXC_=IWAE0026E {0}: O descritor de implementa\u00e7\u00e3o do Arquivo EAR j\u00e1 cont\u00e9m uma fun\u00e7\u00e3o de seguran\u00e7a denominada {1}
-dup_sec_role_module_EXC_=IWAE0027E O descritor de implementa\u00e7\u00e3o para {0} j\u00e1 cont\u00e9m uma fun\u00e7\u00e3o de seguran\u00e7a denominada {1}
-dup_resource_EXC_=IWAE0028E O recurso denominado "{0}" j\u00e1 existe no archive "{1}"
-error_saving_EXC_=IWAE0030E Erro ao salvar {0}
-add_copy_class_dir_EXC_=IWAE0031E O m\u00e9todo "addCopyClass" n\u00e3o \u00e9 suportado para diret\u00f3rios. URI: {0}
-add_copy_lib_dir_EXC_=IWAE0032E O m\u00e9todo "addCopyLib" n\u00e3o \u00e9 suportado para diret\u00f3rios. URI: {0}
-list_components_war_EXC_=IWAE0033E Ocorreu uma exce\u00e7\u00e3o ao listar componentes no arquivo WAR: {0}
-open_nested_EXC_=IWAE0034E N\u00e3o foi poss\u00edvel abrir o archive aninhado "{0}" em "{1}"
-make_temp_file_WARN_=IWAE0035W Aviso: N\u00e3o \u00e9 poss\u00edvel criar arquivo temp para {0}.  Isto causar\u00e1 impacto no desempenho.
-file_not_found_EXC_=IWAE0036E Nome do URI: {0}; Nome do arquivo: {1}
-could_not_open_EXC_=IWAE0037E N\u00e3o foi poss\u00edvel abrir {0}
-could_not_find_dir_EXC_=IWAE0038E N\u00e3o \u00e9 poss\u00edvel abrir o diret\u00f3rio {0}
-not_a_dir_EXC_=IWAE0039E N\u00e3o \u00e9 poss\u00edvel abrir o diret\u00f3rio porque o arquivo n\u00e3o \u00e9 um diret\u00f3rio: {0}
-inferred_dds_EXC_=IWAE0040E Sup\u00f4s-se que o arquivo JAR EJB "{0}" tinha a vers\u00e3o 1.0, porque o manifesto n\u00e3o declara os beans corporativos, mas descritores de implementa\u00e7\u00e3o serializados existem no JAR.
-filename_exception_EXC_=IWAE0041E Nome do arquivo: {0}; Exce\u00e7\u00e3o: {1}
-no_dds_10_EXC_=IWAE0042E N\u00e3o h\u00e1 descritores de implementa\u00e7\u00e3o no arquivo JAR EJB 1.0: {0}
-manifest_dd_load_EXC_=IWAE0043E O manifesto JAR declara um bean corporativo para o qual o descritor de implementa\u00e7\u00e3o n\u00e3o pode ser carregado: {0}
-manifest_dd_find_EXC_=IWAE0044E O manifesto JAR declara um bean corporativo para o qual o descritor de implementa\u00e7\u00e3o n\u00e3o pode ser encontrado: {0}
-io_ex_reading_dd_EXC_=IWAE0045E Ocorreu uma Exce\u00e7\u00e3o ES ao ler {0}
-ser_not_dd_EXC_=IWAE0046E O objeto serializado no arquivo "{0}" n\u00e3o \u00e9 uma inst\u00e2ncia de javax.ejb.deployment.DeploymentDescriptor
-reading_dd_EXC_=IWAE0047E Ocorreu uma Exce\u00e7\u00e3o ao ler {0}
-missing_class_EXC_=IWAE0048E N\u00e3o foi poss\u00edvel desserializar {0} porque uma classe requerida n\u00e3o p\u00f4de ser encontrada. Exce\u00e7\u00e3o: {1}
-Converted=Convertido
-Stack_trace_of_nested_exce_EXC_=IWAE0049E Rastreio de exce\u00e7\u00e3o aninhada:
-IOException_occurred_while_EXC_=IWAE0050E Ocorreu uma Exce\u00e7\u00e3o ES ao copiar o manifesto
-Extract_destination_is_the_EXC_=IWAE0051E O destino da extra\u00e7\u00e3o \u00e9 o mesmo caminho que o arquivo de origem
-Parameter_should_not_be_nu_EXC_=IWAE0052E O par\u00e2metro n\u00e3o deve ser nulo
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E O archive n\u00e3o \u00e9 um arquivo JAR EJB v\u00e1lido (1.0) porque nenhum descritor de implementa\u00e7\u00e3o serializado pode ser encontrado no manifesto ou nas entradas com uma extens\u00e3o ".ser"
-_The_following_files_could_EXC_=IWAE0056E Os arquivos a seguir n\u00e3o puderam ser carregados:
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand falhou - rastreio da pilha de exce\u00e7\u00e3o:
-FixPrimKeyCommand_usage___=Utiliza\u00e7\u00e3o de FixPrimKeyCommand:  <sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E Uso de FixPrimKeyCommand: sourceJarFilePath deve apontar para um arquivo JAR EJB v\u00e1lido ou diret\u00f3rio de um arquivo JAR EJB expandido
-Repair_command_failed_-_ex_EXC_=IWAE0059E Falha no comando Reparar - rastreio da pilha de exce\u00e7\u00e3o:
-Repairs_all_entries_in_the=Repara todas as entradas nos diret\u00f3rios META-INF e/ou WEB-INF para que elas estejam com a caixa correta
-RepairArchiveCommand_usage=Utiliza\u00e7\u00e3o de RepairArchiveCommand:  <sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E Uso de RepairArchiveCommand: sourceJarFilePath deve apontar para um archive v\u00e1lido ou diret\u00f3rio de um archive expandido
-Application_Client_Jar_Fil=Arquivo JAR do Cliente do Aplicativo
-EAR_File=Arquivo EAR
-EJB_Jar_File=Arquivo JAR EJB
-RAR_File=Arquivo RAR
-WAR_File=Arquivo WAR
-Error_occurred_iterating_f_EXC_=IWAE0061E Ocorreu um erro ao iterar arquivos
-End_of_list_reached_EXC_=IWAE0062E Alcan\u00e7ado o fim da lista
-Internal_Error__Iterator_o_EXC_=IWAE0063E Erro Interno: Iterador n\u00e3o sincronizado com entradas zip
-Error_iterating_the_archiv_EXC_=IWAE0064E Erro ao iterar o archive
-Absolute_path_unknown_EXC_=IWAE0065E Caminho absoluto desconhecido
-Original_archive_is_not_a__EXC_=IWAE0066E O archive original n\u00e3o \u00e9 um diret\u00f3rio
-Null_uri_EXC_=IWAE0067E Uri nulo
-Module_file=Arquivo de m\u00f3dulo
-A_WAR_file=Arquivo WAR
-An_EJB_JAR_file=Arquivo JAR EJB
-An_Application_Client_JAR_file=Arquivo JAR do Cliente do Aplicativo
-A_RAR_file=Arquivo RAR
-A_Application_file=Arquivo do Aplicativo
-A_file_does_not_exist_for_module=Um arquivo n\u00e3o existe para o elemento de m\u00f3dulo que possui a uri: {0}
-File_not_correct_type=O arquivo {0} no arquivo EAR {1} n\u00e3o \u00e9 o tipo correto, baseado no descritor de implementa\u00e7\u00e3o de aplicativo. Tipo estendido: {2}";
-Module_not_in_EAR=O m\u00f3dulo n\u00e3o est\u00e1 em uma EAR: {0}
-Module_file_does_not_exist_2=O arquivo de m\u00f3dulo n\u00e3o existe para a refer\u00eancia de M\u00f3dulo. M\u00f3dulo = {0}
-FileImpl._Error_0=Conten\u00e7\u00e3o recursiva n\u00e3o permitida para
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_zh.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_zh.properties
deleted file mode 100644
index 05b5169..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_zh.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E {0} \u5fc5\u987b\u5728\u5b50\u7c7b\u4e2d\u5b9e\u73b0
-key_class_reflection_ERROR_=IWAE0002E \u672a\u80fd\u53cd\u6620\u7c7b\u201c{0}\u201d\u4ee5\u4fbf\u5bf9\u5b9e\u4f53\u201c{2}\u201d\u7684\u4e3b\u952e\u5b57\u6bb5\u201c{1}\u201d\u8fdb\u884c\u6bd4\u8f83
-key_field_reflection_ERROR_=IWAE0003E \u672a\u80fd\u53cd\u6620\u5b9e\u4f53\u201c{1}\u201d\u7684\u4e3b\u952e\u5b57\u6bb5\u201c{0}\u201d\u7684\u7c7b\u578b
-removing_key_field_INFO_=IWAE0004I \u4ece\u5b9e\u4f53\u201c{1}\u201d\u4e2d\u9664\u53bb\u65e0\u6548\u7684\u4e3b\u952e\u5b57\u6bb5\u201c{0}\u201d
-repair_usage_ERROR_=IWAE0005E RepairArchiveCommand \u7528\u6cd5\uff1a\u4e0d\u80fd\u5199\u5165 destinationPath\uff1a{0}
-invalid_archive_EXC_=IWAE0006E \u5f52\u6863\u4e0d\u662f\u6709\u6548\u7684 {0}\uff0c\u539f\u56e0\u662f\u627e\u4e0d\u5230\u90e8\u7f72\u63cf\u8ff0\u7b26\uff08\u533a\u5206\u5927\u5c0f\u5199\uff09\uff1a{1}
-load_resource_EXC_=IWAE0007E \u672a\u80fd\u88c5\u5165\u5f52\u6863\u201c{1}\u201d\u4e2d\u7684\u8d44\u6e90\u201c{0}\u201d
-nested_jar_EXC_=IWAE0008E \u4ece {1} \u4e2d\u8bfb\u53d6 {0} \u65f6\u53d1\u751f\u4e86\u9519\u8bef
-make_temp_dir_EXC_=IWAE0009E \u65e0\u6cd5\u5efa\u7acb\u4e34\u65f6\u76ee\u5f55\uff1a{0}
-invalid_classpath_WARN_=IWAE0010W \u7c7b\u8def\u5f84\u5143\u7d20\u201c{0}\u201d\u4e0d\u662f\u76ee\u5f55\u6216\u538b\u7f29\u6587\u4ef6
-invalid_cp_file_WARN_=IWAE0011W \u7c7b\u8def\u5f84\u5143\u7d20\u201c{0}\u201d\u4e0d\u6307\u5411\u672c\u5730\u6587\u4ef6
-io_ex_loading_EXC_=IWAE0012E \u88c5\u5165 {0} \u65f6\u53d1\u751f\u4e86 IO \u5f02\u5e38
-tx_bean_mgd_WARN_=IWAE0013W EJB 1.0 \u5bfc\u5165\uff1a\u6ca1\u6709\u5bf9 {0} \u6620\u5c04 TX_BEAN_MANAGED \u63a7\u5236\u63cf\u8ff0\u7b26
-error_saving_EXC_=IWAE0014E \u4fdd\u5b58 {0} \u65f6\u51fa\u9519
-io_ex_manifest_EXC_=IWAE0015E \u8bfb\u53d6\u5f52\u6863 {0} \u4e2d\u7684\u6e05\u5355\u65f6\u53d1\u751f IO \u5f02\u5e38
-io_ex_reopen_EXC_=IWAE0016E \u91cd\u65b0\u6253\u5f00 {0} \u65f6\u53d1\u751f IO \u5f02\u5e38
-unable_replace_EXC_=IWAE0017E \u65e0\u6cd5\u66ff\u6362\u539f\u59cb\u5f52\u6863\uff1a{0}
-duplicate_file_EXC_=IWAE0018E \u540d\u4e3a {0} \u7684\u5f52\u6863\u5df2\u7ecf\u5305\u542b\u540d\u4e3a {1} \u7684\u6587\u4ef6
-duplicate_entry_EXC_=IWAE0019E \u5177\u6709 uri {0} \u7684\u6587\u4ef6\u6216\u8d44\u6e90\u5df2\u5b58\u5728\u4e8e\u540d\u4e3a {1} \u7684\u5f52\u6863\u4e2d
-file_exist_as_dir_EXC_=IWAE0020E \u540d\u4e3a {0} \u7684\u6587\u4ef6\u5df2\u5b58\u5728\u5e76\u4e14\u8be5\u540d\u79f0\u662f\u4e00\u4e2a\u76ee\u5f55
-uncontained_module_EXC_=IWAE0021E \u6a21\u5757 {0} \u4e0d\u5305\u542b\u5728 EAR \u6587\u4ef6\u4e2d
-dd_in_ear_load_EXC_=IWAE0022E \u4e3a EAR \u6587\u4ef6\u201c{1}\u201d\u4e2d\u7684\u6a21\u5757\u201c{0}\u201d\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u65f6\u53d1\u751f\u4e86\u5f02\u5e38
-nested_open_fail_EXC_=IWAE0023E \u65e0\u6cd5\u6253\u5f00 EAR \u6587\u4ef6\u201c{1}\u201d\u4e2d\u7684\u6a21\u5757\u6587\u4ef6\u201c{0}\u201d
-duplicate_module_EXC_=IWAE0024E EAR \u6587\u4ef6\u201c{0}\u201d\u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u5df2\u7ecf\u5305\u542b\u5177\u6709 uri\u201c{1}\u201d\u7684\u6a21\u5757
-no_sec_role_EXC_=IWAE0025E {0}\uff1aEAR \u6587\u4ef6\u90e8\u7f72\u63cf\u8ff0\u7b26\u4e0d\u5305\u542b\u540d\u4e3a {1} \u7684\u5b89\u5168\u89d2\u8272
-dup_sec_role_EXC_=IWAE0026E {0}\uff1aEAR \u6587\u4ef6\u90e8\u7f72\u63cf\u8ff0\u7b26\u5df2\u7ecf\u5305\u542b\u540d\u4e3a {1} \u7684\u5b89\u5168\u89d2\u8272
-dup_sec_role_module_EXC_=IWAE0027E {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u5df2\u7ecf\u5305\u542b\u540d\u4e3a {1} \u7684\u5b89\u5168\u89d2\u8272
-dup_resource_EXC_=IWAE0028E \u540d\u4e3a\u201c{0}\u201d\u7684\u8d44\u6e90\u5728\u5f52\u6863\u201c{1}\u201d\u4e2d\u5df2\u7ecf\u5b58\u5728
-error_saving_EXC_=IWAE0030E \u4fdd\u5b58 {0} \u65f6\u51fa\u9519
-add_copy_class_dir_EXC_=IWAE0031E \u65b9\u6cd5\u201caddCopyClass\u201d\u5bf9\u4e8e\u76ee\u5f55\u4e0d\u53d7\u652f\u6301\u3002URI\uff1a{0}
-add_copy_lib_dir_EXC_=IWAE0032E \u65b9\u6cd5\u201caddCopyLib\u201d\u5bf9\u4e8e\u76ee\u5f55\u4e0d\u53d7\u652f\u6301\u3002URI\uff1a{0}
-list_components_war_EXC_=IWAE0033E \u5217\u793a WAR \u6587\u4ef6 {0} \u4e2d\u7684\u7ec4\u4ef6\u65f6\u53d1\u751f\u4e86\u5f02\u5e38
-open_nested_EXC_=IWAE0034E \u65e0\u6cd5\u6253\u5f00\u201c{1}\u201d\u4e2d\u7684\u5d4c\u5957\u5f52\u6863\u201c{0}\u201d
-make_temp_file_WARN_=IWAE0035W \u8b66\u544a\uff1a\u65e0\u6cd5\u4e3a {0} \u521b\u5efa\u4e34\u65f6\u6587\u4ef6\u3002\u8fd9\u5c06\u5f71\u54cd\u6027\u80fd\u3002
-file_not_found_EXC_=IWAE0036E URI \u540d\uff1a{0}\uff1b\u6587\u4ef6\u540d\uff1a{1}
-could_not_open_EXC_=IWAE0037E \u65e0\u6cd5\u6253\u5f00 {0}
-could_not_find_dir_EXC_=IWAE0038E \u65e0\u6cd5\u6253\u5f00\u76ee\u5f55 {0}
-not_a_dir_EXC_=IWAE0039E \u65e0\u6cd5\u6253\u5f00\u76ee\u5f55\uff0c\u539f\u56e0\u662f\u6587\u4ef6\u4e0d\u662f\u76ee\u5f55\uff1a{0}
-inferred_dds_EXC_=IWAE0040E \u63a8\u65ad EJB JAR \u6587\u4ef6\u201c{0}\u201d\u4e3a\u7248\u672c 1.0\uff0c\u539f\u56e0\u662f\u6e05\u5355\u6ca1\u6709\u58f0\u660e\u4f01\u4e1a bean\uff0c\u4f46 JAR \u4e2d\u6709\u5e8f\u5217\u5316\u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002
-filename_exception_EXC_=IWAE0041E \u6587\u4ef6\u540d\uff1a{0}\uff1b\u5f02\u5e38\uff1a{1}
-no_dds_10_EXC_=IWAE0042E EJB 1.0 JAR \u6587\u4ef6 {0} \u4e2d\u6ca1\u6709\u90e8\u7f72\u63cf\u8ff0\u7b26
-manifest_dd_load_EXC_=IWAE0043E JAR \u6e05\u5355\u58f0\u660e\u4e86\u4e00\u4e2a\u4e0d\u80fd\u4e3a\u5176\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u6587\u4ef6\u7684\u4f01\u4e1a bean\uff1a{0}
-manifest_dd_find_EXC_=IWAE0044E JAR \u6e05\u5355\u58f0\u660e\u4e86\u4e00\u4e2a\u4e0d\u80fd\u4e3a\u5176\u627e\u5230\u90e8\u7f72\u63cf\u8ff0\u7b26\u6587\u4ef6\u7684\u4f01\u4e1a bean\uff1a{0}
-io_ex_reading_dd_EXC_=IWAE0045E \u8bfb\u53d6 {0} \u65f6\u53d1\u751f\u4e86 IO \u5f02\u5e38
-ser_not_dd_EXC_=IWAE0046E \u6587\u4ef6\u201c{0}\u201d\u4e2d\u7684\u5e8f\u5217\u5316\u5bf9\u8c61\u4e0d\u662f javax.ejb.deployment.DeploymentDescriptor \u7684\u5b9e\u4f8b
-reading_dd_EXC_=IWAE0047E \u8bfb\u53d6 {0} \u65f6\u53d1\u751f\u4e86\u5f02\u5e38
-missing_class_EXC_=IWAE0048E \u672a\u80fd\u53cd\u5e8f\u5217\u5316 {0}\uff0c\u539f\u56e0\u662f\u627e\u4e0d\u5230\u6240\u9700\u7684\u7c7b\u3002\u5f02\u5e38\uff1a{1}
-Converted=\u5df2\u8f6c\u6362
-Stack_trace_of_nested_exce_EXC_=IWAE0049E \u5d4c\u5957\u5f02\u5e38\u7684\u5806\u6808\u8ddf\u8e2a\uff1a
-IOException_occurred_while_EXC_=IWAE0050E \u590d\u5236\u6e05\u5355\u65f6\u53d1\u751f IO \u5f02\u5e38
-Extract_destination_is_the_EXC_=IWAE0051E \u62bd\u53d6\u76ee\u6807\u8def\u5f84\u4e0e\u6e90\u6587\u4ef6\u8def\u5f84\u76f8\u540c
-Parameter_should_not_be_nu_EXC_=IWAE0052E \u53c2\u6570\u4e0d\u5e94\u4e3a\u7a7a
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E \u5f52\u6863\u4e0d\u662f\u6709\u6548\u7684 EJB JAR \u6587\u4ef6\uff081.0\uff09\uff0c\u539f\u56e0\u662f\u4e0d\u7ba1\u5728\u6e05\u5355\u4e2d\u8fd8\u662f\u5728\u6269\u5c55\u540d\u4e3a\u201c.ser\u201d\u7684\u6761\u76ee\u4e2d\u90fd\u627e\u4e0d\u5230\u5e8f\u5217\u5316\u90e8\u7f72\u63cf\u8ff0\u7b26
-_The_following_files_could_EXC_=IWAE0056E \u672a\u80fd\u88c5\u5165\u4e0b\u5217\u6587\u4ef6\uff1a
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand \u5931\u8d25 \uff0d \u5f02\u5e38\u5806\u6808\u8ddf\u8e2a\uff1a
-FixPrimKeyCommand_usage___=FixPrimKeyCommand \u7528\u6cd5\uff1a<sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E FixPrimKeyCommand \u7528\u6cd5\uff1asourceJarFilePath \u5fc5\u987b\u6307\u5411\u6709\u6548\u7684 EJB JAR \u6587\u4ef6\u6216\u5df2\u89e3\u538b\u7f29\u7684 EJB JAR \u6587\u4ef6\u7684\u76ee\u5f55
-Repair_command_failed_-_ex_EXC_=IWAE0059E \u4fee\u590d\u547d\u4ee4\u5931\u8d25 \uff0d \u5f02\u5e38\u5806\u6808\u8ddf\u8e2a\uff1a
-Repairs_all_entries_in_the=\u4fee\u590d META-INF \u548c\uff0f\u6216 WEB-INF \u76ee\u5f55\u4e2d\u7684\u6240\u6709\u6761\u76ee\u4ee5\u4f7f\u5b83\u4eec\u90fd\u662f\u6b63\u786e\u7684
-RepairArchiveCommand_usage=RepairArchiveCommand \u7528\u6cd5\uff1a<sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E RepairArchiveCommand \u7528\u6cd5\uff1asourceJarFilePath \u5fc5\u987b\u6307\u5411\u6709\u6548\u7684\u5f52\u6863\u6216\u5df2\u89e3\u538b\u7f29\u5f52\u6863\u7684\u76ee\u5f55
-Application_Client_Jar_Fil=\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a JAR \u6587\u4ef6
-EAR_File=EAR \u6587\u4ef6
-EJB_Jar_File=EJB JAR \u6587\u4ef6
-RAR_File=RAR \u6587\u4ef6
-WAR_File=WAR \u6587\u4ef6
-Error_occurred_iterating_f_EXC_=IWAE0061E \u8fed\u4ee3\u6587\u4ef6\u65f6\u53d1\u751f\u4e86\u9519\u8bef
-End_of_list_reached_EXC_=IWAE0062E \u5230\u8fbe\u4e86\u5217\u8868\u7684\u672b\u5c3e
-Internal_Error__Iterator_o_EXC_=IWAE0063E \u5185\u90e8\u9519\u8bef\uff1a\u8fed\u4ee3\u5668\u4e0e\u538b\u7f29\u6761\u76ee\u4e0d\u540c\u6b65
-Error_iterating_the_archiv_EXC_=IWAE0064E \u8fed\u4ee3\u5f52\u6863\u65f6\u51fa\u9519
-Absolute_path_unknown_EXC_=IWAE0065E \u7edd\u5bf9\u8def\u5f84\u672a\u77e5
-Original_archive_is_not_a__EXC_=IWAE0066E \u539f\u59cb\u5f52\u6863\u4e0d\u662f\u76ee\u5f55
-Null_uri_EXC_=IWAE0067E \u7a7a\u7684 uri
-Module_file=\u6a21\u5757\u6587\u4ef6
-A_WAR_file=WAR \u6587\u4ef6
-An_EJB_JAR_file=EJB JAR \u6587\u4ef6
-An_Application_Client_JAR_file=\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a JAR \u6587\u4ef6
-A_RAR_file=RAR \u6587\u4ef6
-A_Application_file=\u5e94\u7528\u7a0b\u5e8f\u6587\u4ef6
-A_file_does_not_exist_for_module=\u5bf9\u4e8e\u5177\u6709 uri {0} \u7684\u6a21\u5757\u5143\u7d20\uff0c\u6587\u4ef6\u4e0d\u5b58\u5728
-File_not_correct_type=\u6839\u636e\u5e94\u7528\u7a0b\u5e8f\u90e8\u7f72\u63cf\u8ff0\u7b26\uff0cEAR \u6587\u4ef6 {1} \u4e2d\u7684\u6587\u4ef6 {0} \u7c7b\u578b\u4e0d\u6b63\u786e\u3002\u671f\u671b\u7684\u7c7b\u578b\uff1a{2}\uff1b
-Module_not_in_EAR=\u6a21\u5757\u4e0d\u5728 EAR {0} \u4e2d
-Module_file_does_not_exist_2=\u6a21\u5757\u5f15\u7528\u7684\u6a21\u5757\u6587\u4ef6\u4e0d\u5b58\u5728\u3002\u6a21\u5757 = {0}
-FileImpl._Error_0=\u4e0d\u5141\u8bb8\u9012\u5f52\u5305\u542b
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_zh_TW.properties
deleted file mode 100644
index 25dc5a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/commonarchive_zh_TW.properties
+++ /dev/null
@@ -1,94 +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
-###############################################################################
-subclass_responsibilty_EXC_=IWAE0001E \u5fc5\u9808\u5728\u5b50\u985e\u5225\u4e2d\u5be6\u4f5c {0}
-key_class_reflection_ERROR_=IWAE0002E \u7121\u6cd5\u53cd\u6620\u985e\u5225 "{0}" \u4ee5\u4fbf\u5f9e\u5be6\u9ad4 "{2}" \u6bd4\u8f03\u4e3b\u9375\u6b04\u4f4d "{1}"
-key_field_reflection_ERROR_=IWAE0003E \u7121\u6cd5\u5f9e\u5be6\u9ad4 "{1}" \u53cd\u6620\u4e3b\u9375\u6b04\u4f4d "{0}" \u985e\u578b
-removing_key_field_INFO_=IWAE0004I \u5f9e\u5be6\u9ad4 "{1}" \u79fb\u9664\u7121\u6548\u7684\u4e3b\u9375\u6b04\u4f4d "{0}"
-repair_usage_ERROR_=IWAE0005E RepairArchiveCommand \u7528\u6cd5\uff1a\u7121\u6cd5\u5beb\u5165 destinationPath\uff1a{0}
-invalid_archive_EXC_=IWAE0006E \u4fdd\u5b58\u6a94\u662f\u7121\u6548\u7684 {0}\uff0c\u56e0\u70ba\u627e\u4e0d\u5230\u90e8\u7f72\u63cf\u8ff0\u5b50\uff08\u5340\u5206\u5927\u5c0f\u5beb\uff09\uff1a{1}
-load_resource_EXC_=IWAE0007E \u7121\u6cd5\u5c07\u8cc7\u6e90 "{0}" \u8f09\u5165\u4fdd\u5b58\u6a94 "{1}"
-nested_jar_EXC_=IWAE0008E \u5f9e {1} \u8b80\u53d6 {0} \u6642\u767c\u751f\u932f\u8aa4
-make_temp_dir_EXC_=IWAE0009E \u7121\u6cd5\u88fd\u4f5c\u66ab\u6642\u76ee\u9304\uff1a{0}
-invalid_classpath_WARN_=IWAE0010W \u985e\u5225\u8def\u5f91\u5143\u7d20 "{0}" \u4e0d\u662f\u76ee\u9304\u6216 Zip \u6a94
-invalid_cp_file_WARN_=IWAE0011W \u985e\u5225\u8def\u5f91\u5143\u7d20 "{0}" \u4e0d\u662f\u6307\u5411\u672c\u7aef\u6a94\u6848
-io_ex_loading_EXC_=IWAE0012E \u8f09\u5165 {0} \u6642\u767c\u751f IO \u7570\u5e38\u72c0\u6cc1
-tx_bean_mgd_WARN_=IWAE0013W EJB 1.0 \u532f\u5165\uff1a\u4e0d\u5c0d\u6620 {0} \u7684 TX_BEAN_MANAGED \u63a7\u5236\u63cf\u8ff0\u5b50
-error_saving_EXC_=IWAE0014E \u5132\u5b58 {0} \u6642\u767c\u751f\u932f\u8aa4
-io_ex_manifest_EXC_=IWAE0015E \u8b80\u53d6\u4fdd\u5b58\u6a94\u4e2d\u7684\u8655\u7406\u6642\u767c\u751f IOException\uff1a{0}
-io_ex_reopen_EXC_=IWAE0016E \u91cd\u65b0\u958b\u555f {0} \u6642\u767c\u751f IOException
-unable_replace_EXC_=IWAE0017E \u7121\u6cd5\u7f6e\u63db\u539f\u59cb\u4fdd\u5b58\u6a94\uff1a{0}
-duplicate_file_EXC_=IWAE0018E \u4fdd\u5b58\u6a94 {0} \u5df2\u5305\u542b\u540d\u7a31\u662f {1} \u7684\u6a94\u6848
-duplicate_entry_EXC_=IWAE0019E \u4fdd\u5b58\u6a94 {1} \u5df2\u5b58\u5728\u542b\u6709 uri {0} \u7684\u6a94\u6848\u6216\u8cc7\u6e90
-file_exist_as_dir_EXC_=IWAE0020E {0} \u6a94\u5b58\u5728\u800c\u4e14\u662f\u76ee\u9304
-uncontained_module_EXC_=IWAE0021E EAR \u6a94\u6c92\u6709\u5305\u542b\u6a21\u7d44 {0}
-dd_in_ear_load_EXC_=IWAE0022E \u5c07\u6a21\u7d44 "{0}" \u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u8f09\u5165 EAR \u6a94 "{1}" \u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1
-nested_open_fail_EXC_=IWAE0023E \u5728 EAR \u6a94 "{1}" \u4e2d\u7121\u6cd5\u958b\u555f\u6a21\u7d44\u6a94\u6848 "{0}"
-duplicate_module_EXC_=IWAE0024E EAR \u6a94 "{0}" \u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u5df2\u5305\u542b\u5177\u6709 uri "{1}" \u7684\u6a21\u7d44
-no_sec_role_EXC_=IWAE0025E {0}: EAR \u6a94\u90e8\u7f72\u63cf\u8ff0\u5b50\u4e0d\u542b\u5b89\u5168\u89d2\u8272 {1}
-dup_sec_role_EXC_=IWAE0026E {0}: EAR \u6a94\u90e8\u7f72\u63cf\u8ff0\u5b50\u5df2\u5305\u542b\u5b89\u5168\u89d2\u8272 {1}
-dup_sec_role_module_EXC_=IWAE0027E {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u5df2\u5305\u542b\u5b89\u5168\u89d2\u8272 {1}
-dup_resource_EXC_=IWAE0028E \u8cc7\u6e90 "{0}" \u5df2\u5b58\u5728\u65bc\u4fdd\u5b58\u6a94 "{1}" \u4e2d
-error_saving_EXC_=IWAE0030E \u5132\u5b58 {0} \u6642\u767c\u751f\u932f\u8aa4
-add_copy_class_dir_EXC_=IWAE0031E \u65b9\u6cd5 "addCopyClass" \u4e0d\u652f\u63f4\u76ee\u9304\u3002URI\uff1a{0}
-add_copy_lib_dir_EXC_=IWAE0032E \u65b9\u6cd5 "addCopyLib" \u4e0d\u652f\u63f4\u76ee\u9304\u3002URI\uff1a{0}
-list_components_war_EXC_=IWAE0033E \u5217\u51fa WAR \u6a94\u4e2d\u7684\u5143\u4ef6\u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1\uff1a{0}
-open_nested_EXC_=IWAE0034E \u7121\u6cd5\u958b\u555f "{1}" \u4e2d\u653e\u7f6e\u7684\u4fdd\u5b58\u6a94 "{0}"
-make_temp_file_WARN_=IWAE0035W \u8b66\u544a\uff1a\u7121\u6cd5\u5efa\u7acb {0} \u7684\u66ab\u5b58\u6a94\u3002\u9019\u6a23\u6703\u5f71\u97ff\u6548\u80fd\u3002
-file_not_found_EXC_=IWAE0036E URI \u540d\u7a31\uff1a{0}\uff1b\u6a94\u540d\uff1a{1}
-could_not_open_EXC_=IWAE0037E \u7121\u6cd5\u958b\u555f {0}
-could_not_find_dir_EXC_=IWAE0038E \u7121\u6cd5\u958b\u555f\u76ee\u9304 {0}
-not_a_dir_EXC_=IWAE0039E \u7121\u6cd5\u958b\u555f\u76ee\u9304\uff0c\u56e0\u70ba\u6a94\u6848\u4e0d\u662f\u76ee\u9304\uff1a{0}
-inferred_dds_EXC_=IWAE0040E \u63a8\u65b7 EJB JAR \u6a94 "{0}" \u662f\u7248\u672c 1.0\uff0c\u56e0\u70ba Manifest \u6c92\u6709\u5ba3\u544a Enterprise Bean\uff0c\u4f46\u662f\u5e8f\u5217\u5316\u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u5b58\u5728\u65bc JAR\u3002
-filename_exception_EXC_=IWAE0041E \u6a94\u540d\u7a31\uff1a{0}\uff1b\u7570\u5e38\u72c0\u6cc1\uff1a{1}
-no_dds_10_EXC_=IWAE0042E EJB 1.0 JAR \u6a94\u6c92\u6709\u90e8\u7f72\u63cf\u8ff0\u5b50\uff1a{0}
-manifest_dd_load_EXC_=IWAE0043E JAR \u8655\u7406\u5ba3\u544a\u7121\u6cd5\u8f09\u5165\u90e8\u7f72\u63cf\u8ff0\u5b50\u6a94\u7684 Enterprise Bean\uff1a{0}
-manifest_dd_find_EXC_=IWAE0044E JAR \u8655\u7406\u5ba3\u544a\u627e\u4e0d\u5230\u90e8\u7f72\u63cf\u8ff0\u5b50\u6a94\u7684 Enterprise Bean\uff1a{0}
-io_ex_reading_dd_EXC_=IWAE0045E \u8b80\u53d6 {0} \u6642\u767c\u751f IO \u7570\u5e38\u72c0\u6cc1
-ser_not_dd_EXC_=IWAE0046E \u6a94 "{0}" \u4e2d\u7684\u5e8f\u5217\u5316\u7269\u4ef6\u4e0d\u662f javax.ejb.deployment.DeploymentDescriptor \u5be6\u4f8b
-reading_dd_EXC_=IWAE0047E \u8b80\u53d6 {0} \u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1
-missing_class_EXC_=IWAE0048E \u7121\u6cd5\u53d6\u6d88\u5e8f\u5217\u5316 {0}\uff0c\u56e0\u70ba\u627e\u4e0d\u5230\u5fc5\u8981\u7684\u985e\u5225\u3002\u7570\u5e38\u72c0\u6cc1\uff1a{1}
-Converted=\u8f49\u63db
-Stack_trace_of_nested_exce_EXC_=IWAE0049E \u5de2\u72c0\u7570\u5e38\u72c0\u6cc1\u7684\u5806\u758a\u8ffd\u8e64\uff1a
-IOException_occurred_while_EXC_=IWAE0050E \u8907\u88fd\u8655\u7406\u6642\u767c\u751f IOException
-Extract_destination_is_the_EXC_=IWAE0051E \u53d6\u51fa\u76ee\u7684\u5730\u662f\u8207\u7a0b\u5f0f\u6a94\u76f8\u540c\u7684\u8def\u5f91
-Parameter_should_not_be_nu_EXC_=IWAE0052E \u53c3\u6578\u4e0d\u53ef\u4ee5\u662f\u7a7a\u503c
-Archive_is_not_a_valid_EJB_EXC_=IWAE0055E \u4fdd\u5b58\u6a94\u4e0d\u662f\u6709\u6548\u7684 EJB JAR \u6a94 (1.0)\uff0c\u56e0\u70ba\u5728 manifest \u6216\u542b\u6709 ".ser" \u526f\u6a94\u540d\u7684\u9805\u76ee\u4e2d\u627e\u4e0d\u5230\u5e8f\u5217\u5316\u7684\u90e8\u7f72\u63cf\u8ff0\u5b50
-_The_following_files_could_EXC_=IWAE0056E \u7121\u6cd5\u8f09\u5165\u4e0b\u5217\u6a94\u6848\uff1a
-FixPrimKeyCommand_failed_-_EXC_=IWAE0057E FixPrimKeyCommand \u5931\u6557 - \u7570\u5e38\u72c0\u6cc1\u5806\u758a\u8ffd\u8e64\uff1a
-FixPrimKeyCommand_usage___=FixPrimKeyCommand \u7528\u6cd5\uff1a<sourceJarFilePath> [destinationPath]
-FixPrimKeyCommand_usage__s_EXC_=IWAE0058E FixPrimKeyCommand \u7528\u6cd5\uff1asourceJarFilePath \u5fc5\u9808\u6307\u5411\u6709\u6548\u7684 EJB JAR \u6a94\u6216 inflated EJB JAR \u6a94\u7684\u76ee\u9304
-Repair_command_failed_-_ex_EXC_=IWAE0059E Repair \u6307\u4ee4\u5931\u6557 - \u7570\u5e38\u72c0\u6cc1\u5806\u758a\u8ffd\u8e64\uff1a
-Repairs_all_entries_in_the=\u4fee\u6b63 META-INF \u53ca/\u6216 WEB-INF \u76ee\u9304\u4e2d\u7684\u5168\u90e8\u9805\u76ee\u6210\u70ba\u6b63\u78ba\u5927\u5c0f\u5beb
-RepairArchiveCommand_usage=RepairArchiveCommand \u7528\u6cd5\uff1a<sourceJarFilePath> <destinationPath>
-RepairArchiveCommand_usage1_ERROR_=IWAE0060E RepairArchiveCommand \u7528\u6cd5\uff1asourceJarFilePath \u5fc5\u9808\u6307\u5411\u6709\u6548\u7684\u4fdd\u5b58\u6a94\u6216 inflated \u4fdd\u5b58\u6a94\u7684\u76ee\u9304
-Application_Client_Jar_Fil=\u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef JAR \u6a94
-EAR_File=EAR \u6a94
-EJB_Jar_File=EJB JAR \u6a94
-RAR_File=RAR \u6a94
-WAR_File=WAR \u6a94
-Error_occurred_iterating_f_EXC_=IWAE0061E \u758a\u4ee3\u6a94\u6848\u6642\u767c\u751f\u932f\u8aa4
-End_of_list_reached_EXC_=IWAE0062E \u5230\u9054\u6e05\u55ae\u7d50\u5c3e
-Internal_Error__Iterator_o_EXC_=IWAE0063E \u5167\u90e8\u932f\u8aa4\uff1a\u758a\u4ee3\u8207 zip \u9805\u76ee\u4e0d\u540c\u6b65
-Error_iterating_the_archiv_EXC_=IWAE0064E \u758a\u4ee3\u4fdd\u5b58\u6a94\u6642\u767c\u751f\u932f\u8aa4
-Absolute_path_unknown_EXC_=IWAE0065E \u7d55\u5c0d\u8def\u5f91\u4e0d\u660e
-Original_archive_is_not_a__EXC_=IWAE0066E \u539f\u59cb\u4fdd\u5b58\u6a94\u4e0d\u662f\u76ee\u9304
-Null_uri_EXC_=IWAE0067E \u7a7a\u503c uri
-Module_file=\u6a21\u7d44\u6a94
-A_WAR_file=WAR \u6a94
-An_EJB_JAR_file=EJB JAR \u6a94
-An_Application_Client_JAR_file=\u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef JAR \u6a94
-A_RAR_file=RAR \u6a94
-A_Application_file=\u61c9\u7528\u7a0b\u5f0f\u6a94\u6848
-A_file_does_not_exist_for_module=\u5177\u6709\u4e0b\u5217 URI \u4e4b\u6a21\u7d44\u5143\u7d20\u7684\u6a94\u6848\u4e0d\u5b58\u5728\uff1a{0}
-File_not_correct_type=EAR \u6a94 {1} \u4e2d\u7684 {0} \u6a94\u4e0d\u662f\u4ee5\u61c9\u7528\u7a0b\u5f0f\u90e8\u7f72\u63cf\u8ff0\u5b50\u70ba\u57fa\u790e\u7684\u6b63\u78ba\u985e\u578b\u3002\u9810\u671f\u7684\u985e\u578b\uff1a{2}";
-Module_not_in_EAR=\u6a21\u7d44\u4e0d\u5728 EAR \u4e2d\uff1a{0}
-Module_file_does_not_exist_2=\u6c92\u6709\u6a21\u7d44\u53c3\u7167\u7684\u6a21\u7d44\u6a94\u3002\u6a21\u7d44 = {0}
-FileImpl._Error_0=\u4e0d\u5141\u8a31\u4e0b\u5217\u7684\u905e\u8ff4\u5305\u542b
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 73b8498..0000000
--- 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 adccdc1..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
-
-
-/**
- * @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.internal.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 d0a7630..0000000
--- 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 9e48b06..0000000
--- 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;
-
-
-
-
-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 1530810..0000000
--- 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 06357a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonArchiveResourceHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jst.j2ee.commonarchivecore.internal;
-
-/*
- * Licensed Material - Property of IBM 
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. 
- * US Government Users Restricted Rights - Use, duplication or disclosure 
- * restricted by GSA ADP Schedule Contract with IBM Corp. 
- */
-
-/*
- * Licensed Materials - Property of IBM,
- * WebSphere Studio Workbench
- * (c) Copyright IBM Corp 2001
- */
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class CommonArchiveResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("commonarchive");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String, String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle = getResourceBundle();
-		}
-
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		}
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	public static String getString(String key, Object[] args) {
-
-		try {
-			return MessageFormat.format(getString(key), args);
-		} catch (IllegalArgumentException e) {
-			return getString(key);
-		}
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.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 3b80abb..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-
-
-/**
- * @generated
- */
-public interface CommonarchiveFactory extends EFactory {
-
-	/**
-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	CommonarchiveFactory eINSTANCE = new org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl();
-
-	/**
-	 * 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 83111e6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java
+++ /dev/null
@@ -1,1024 +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.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-
-/**
- * @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 = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__LAST_MODIFIED = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__SIZE = 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 = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__ORIGINAL_URI = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__LOADING_CONTAINER = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILE__CONTAINER = 6;
-
-	/**
-	 * The number of structural features of the the '<em>File</em>' class. <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int FILE_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 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 = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE_REF__EAR_FILE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Module</b></em>' reference. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_REF__MODULE = 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 = 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.internal.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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();
-
-} //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 b42d061..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ConnectorModuleRef.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;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.jca.Connector;
-
-
-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 cea334e..0000000
--- 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 20c7545..0000000
--- 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 e7bd0a7..0000000
--- 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 cec5071..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EJBModuleRef.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.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-
-
-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 650d9f1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java
+++ /dev/null
@@ -1,256 +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.InputStream;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @generated
- */
-public interface File extends EObject {
-
-	/**
-	 * 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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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.internal.commonarchivecore.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 c2acce7..0000000
--- 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 5704b82..0000000
--- 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 65678da..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java
+++ /dev/null
@@ -1,178 +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.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.Module;
-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;
-
-
-public interface ModuleRef extends EObject {
-
-	/**
-	 * 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.internal.commonarchivecore.CommonarchivePackage#getModuleRef_Module()
-	 * @model required="true"
-	 * @generated
-	 */
-	Module getModule();
-
-	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.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 22a3e5f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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.internal.commonarchivecore.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 83ef763..0000000
--- 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 d7cfe2d..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("Repairs_all_entries_in_the")); //$NON-NLS-2$ = "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.getString("Repair_command_failed_-_ex_EXC_")); //$NON-NLS-1$ = "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.getString("RepairArchiveCommand_usage")); //$NON-NLS-1$ = "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.getString("RepairArchiveCommand_usage1_ERROR_")); //$NON-NLS-1$ = "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("repair_usage_ERROR_", (new Object[]{args[1]}))); //$NON-NLS-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 19a6839..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 8807e6d..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 bd4a3d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WebModuleRef.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;
-
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-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 c559585..0000000
--- 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 fc458b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-
-/**
- * Base exception class for non-runtime exceptions occurring with manipulation of archives
- */
-public class ArchiveException extends Exception {
-	/**
-	 *  
-	 */
-	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 8b8ae78..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveRuntimeException.java
+++ /dev/null
@@ -1,60 +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.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 {
-	/**
-	 * 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 dc7fbe2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ArchiveWrappedException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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 {
-	/**
-	 * 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 19025f8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DeploymentDescriptorLoadException.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.exception;
-
-
-
-/**
- * Exception which can occur if an error/exception occurs while loading a deployment descriptor
- */
-public class DeploymentDescriptorLoadException extends ArchiveRuntimeException {
-	/**
-	 * 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 5d0ea62..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/DuplicateObjectException.java
+++ /dev/null
@@ -1,68 +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.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 {
-	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 a3c223a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/EmptyResourceException.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.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 {
-	/**
-	 * 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 a89b208..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 3eaad73..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ManifestException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-public class ManifestException extends ArchiveRuntimeException {
-
-	/**
-	 * 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 a2a7e3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NestedJarException.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.exception;
-
-
-
-/**
- * Runtime exception thrown when an error occurs reading a jar within a jar
- */
-public class NestedJarException extends ArchiveRuntimeException {
-
-	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 3b062c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoEJB10DescriptorsException.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.exception;
-
-
-
-/**
- * Insert the type's description here. Creation date: (06/05/01 7:31:27 PM)
- * 
- * @author: Administrator
- */
-public class NoEJB10DescriptorsException extends RuntimeException {
-	/**
-	 * 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 3351aa6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleElementException.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.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 {
-	/**
-	 * 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 76586b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NoModuleFileException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.exception;
-
-
-public class NoModuleFileException extends ArchiveRuntimeException {
-
-	/**
-	 * 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 5f9d32a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotADeploymentDescriptorException.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.exception;
-
-
-
-/**
- * Insert the type's description here. Creation date: (06/06/01 9:26:43 AM)
- * 
- * @author: Administrator
- */
-public class NotADeploymentDescriptorException extends Exception {
-	/**
-	 * 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 7433485..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/NotSupportedException.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.exception;
-
-
-
-public class NotSupportedException extends ArchiveWrappedException {
-	/**
-	 * 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 52a8170..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ObjectNotFoundException.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.exception;
-
-
-
-/**
- * Insert the type's description here. Creation date: (02/08/01 8:33:51 PM)
- * 
- * @author: Administrator
- */
-public class ObjectNotFoundException extends ArchiveException {
-	/**
-	 * 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 90b29d8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/OpenFailureException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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 {
-	/**
-	 * 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 566c788..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ReopenException.java
+++ /dev/null
@@ -1,60 +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.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 {
-	/**
-	 * 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 8e58df5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/ResourceLoadException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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 {
-	/**
-	 * 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 860565e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SaveFailureException.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.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 {
-	/**
-	 * 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 a9e9e5c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/SubclassResponsibilityException.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.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 {
-	/**
-	 * SubclassResponsibilityException constructor comment.
-	 */
-	public SubclassResponsibilityException() {
-		super();
-	}
-
-	/**
-	 * SubclassResponsibilityException constructor comment.
-	 * 
-	 * @param s
-	 *            java.lang.String
-	 */
-	public SubclassResponsibilityException(String methodName) {
-		super(CommonArchiveResourceHandler.getString("subclass_responsibilty_EXC_", (new Object[]{methodName}))); //$NON-NLS-1$ = " 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 5f69ebe..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/UncontainedModuleFileException.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.exception;
-
-
-/**
- * @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 {
-	/**
-	 * 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 47418ee..0000000
--- 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 17992ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers;
-
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.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;
-						}
-					});
-		ExtendedEcoreUtil.preRegisterPackage("commonarchive.looseconfig.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-						public EPackage getEPackage() {
-							return LooseconfigPackage.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 207ebe5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifest.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.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();
-
-	/**
-	 * 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);
-
-	/**
-	 * @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 75f2cda..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveManifestImpl.java
+++ /dev/null
@@ -1,323 +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.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.jar.Attributes;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-/**
- * Helper class for manifest files
- */
-public class ArchiveManifestImpl extends java.util.jar.Manifest implements org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest {
-	/**
-	 * ArchiveManifest constructor comment.
-	 */
-	public ArchiveManifestImpl() {
-		super();
-	}
-
-	/**
-	 * ArchiveManifest constructor comment.
-	 * 
-	 * @param is
-	 *            java.io.InputStream
-	 * @throws java.io.IOException
-	 *             The exception description.
-	 */
-	public ArchiveManifestImpl(java.io.InputStream is) throws java.io.IOException {
-		super(is);
-	}
-
-	/**
-	 * ArchiveManifest constructor comment.
-	 * 
-	 * @param man
-	 *            java.util.jar.Manifest
-	 */
-	public ArchiveManifestImpl(java.util.jar.Manifest man) {
-		super(man);
-	}
-
-	/**
-	 * Creates a new manifest entry (attributes) for the given name
-	 */
-	public void addEntry(String entryName) {
-		Attributes attr = new Attributes();
-		addEntry(entryName, attr);
-	}
-
-	public void addEntry(String entryName, Attributes attr) {
-		getEntries().put(entryName, attr);
-	}
-
-	/**
-	 * Adds the key/value pair to the attributes for the given entry name; if the entry does not
-	 * exist, creates a new attributes
-	 */
-	public void addEntryAttribute(String entryName, String key, String value) {
-		Attributes attr = getAttributes(entryName);
-		if (attr == null)
-			addEntry(entryName);
-		attr = getAttributes(entryName);
-		attr.putValue(key, value);
-	}
-
-	public void addVersionIfNecessary() {
-		//This is a hack because of the fact that the manifest does not serialize correctly if
-		//The version is not set. In addition to saves, the serialization is used for copy
-		if (getManifestVersion() == null || getManifestVersion().equals(""))//$NON-NLS-1$
-			setManifestVersion("1.0");//$NON-NLS-1$
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void appendClassPath(java.lang.String extension) {
-		String classPath = getClassPath();
-		if (classPath != null)
-			setClassPath(classPath + " " + extension);//$NON-NLS-1$
-		else
-			setClassPath(extension);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public java.lang.String getClassPath() {
-		return ArchiveUtil.getValueIgnoreKeyCase(Attributes.Name.CLASS_PATH.toString(), getMainAttributes());
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public java.lang.String[] getClassPathTokenized() {
-		String classPath = getClassPath();
-		if (classPath == null)
-			return new String[0];
-		return org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil.getTokens(classPath);
-	}
-
-	public String getEntryAttribute(String entryName, String key) {
-		Attributes attr = getAttributes(entryName);
-		if (attr == null)
-			return null;
-		return attr.getValue(key);
-	}
-
-	public String getMainClass() {
-		return ArchiveUtil.getValueIgnoreKeyCase(Attributes.Name.MAIN_CLASS.toString(), getMainAttributes());
-	}
-
-	public String getManifestVersion() {
-		return getMainAttributes().getValue(Attributes.Name.MANIFEST_VERSION);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void mergeClassPath(java.lang.String[] classPathEntries) {
-		StringBuffer sb = new StringBuffer();
-		java.util.List existing = java.util.Arrays.asList(getClassPathTokenized());
-		String cp = getClassPath();
-		if (cp != null)
-			sb.append(cp);
-		boolean empty = cp == null || "".equals(cp); //$NON-NLS-1$
-		for (int i = 0; i < classPathEntries.length; i++) {
-			if (!existing.contains(classPathEntries[i])) {
-				if (!empty)
-					sb.append(" "); //$NON-NLS-1$
-				else
-					empty = false;
-				sb.append(classPathEntries[i]);
-			}
-		}
-		setClassPath(sb.toString());
-	}
-
-	public void removeEntry(String entryName) {
-		getEntries().remove(entryName);
-	}
-
-	public void removeEntryAttribute(String entryName, Object key) {
-		Attributes attr = getAttributes(entryName);
-		if (attr != null)
-			attr.remove(key);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void setClassPath(java.lang.String aSpaceDelimitedPath) {
-		Attributes attributes = getMainAttributes();
-		if (aSpaceDelimitedPath == null)
-			attributes.remove(Attributes.Name.CLASS_PATH);
-		else
-			attributes.putValue(Attributes.Name.CLASS_PATH.toString(), aSpaceDelimitedPath);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void setMainClass(java.lang.String className) {
-		Attributes attributes = getMainAttributes();
-		if (className == null)
-			attributes.remove(Attributes.Name.MAIN_CLASS);
-		else
-			attributes.putValue(Attributes.Name.MAIN_CLASS.toString(), className);
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.ArchiveManifest
-	 */
-	public void setManifestVersion(java.lang.String version) {
-		Attributes attributes = getMainAttributes();
-		attributes.putValue(Attributes.Name.MANIFEST_VERSION.toString(), version);
-	}
-
-	/**
-	 * Writes the Manifest to the specified OutputStream, splitting each classpath entry on a line
-	 * by itself.
-	 * 
-	 * @param out
-	 *            the output stream
-	 * @exception IOException
-	 *                if an I/O error has occurred
-	 */
-	public void writeSplittingClasspath(OutputStream out) throws IOException {
-		DataOutputStream dos = new DataOutputStream(out);
-		// Write out the main attributes for the manifest
-		writeMainSplittingClasspath(getMainAttributes(), dos);
-		// Now write out the pre-entry attributes
-		Iterator it = getEntries().entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry e = (Map.Entry) it.next();
-			StringBuffer buffer = new StringBuffer("Name: "); //$NON-NLS-1$
-			buffer.append((String) e.getKey());
-			buffer.append("\r\n"); //$NON-NLS-1$
-			localMake72Safe(buffer);
-			dos.writeBytes(buffer.toString());
-			write((Attributes) e.getValue(), dos);
-		}
-		dos.flush();
-	}
-
-	/*
-	 * Writes the current attributes to the specified data output stream. XXX Need to handle UTF8
-	 * values and break up lines longer than 72 bytes
-	 * 
-	 * @see Attributes#write
-	 */
-	protected void write(Attributes attributes, DataOutputStream os) throws IOException {
-		Iterator it = attributes.entrySet().iterator();
-		while (it.hasNext()) {
-			Map.Entry e = (Map.Entry) it.next();
-			StringBuffer buffer = new StringBuffer(((Attributes.Name) e.getKey()).toString());
-			buffer.append(": "); //$NON-NLS-1$
-			buffer.append((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 = attributes.getValue(vername);
-		if (version == null) {
-			vername = Attributes.Name.SIGNATURE_VERSION.toString();
-			version = 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, (String) e.getValue());
-					continue;
-				}
-				StringBuffer buffer = new StringBuffer(name);
-				buffer.append(": "); //$NON-NLS-1$
-				buffer.append((String) e.getValue());
-				buffer.append("\r\n"); //$NON-NLS-1$
-				localMake72Safe(buffer);
-				out.writeBytes(buffer.toString());
-			}
-		}
-		out.writeBytes("\r\n"); //$NON-NLS-1$
-	}
-
-	protected void writeSplit(DataOutputStream out, String name, String value) throws IOException {
-		StringTokenizer tok = new StringTokenizer(value);
-		int inc = 0;
-		while (tok.hasMoreTokens()) {
-			StringBuffer buffer = null;
-			if (inc == 0) {
-				buffer = new StringBuffer(name);
-				buffer.append(": "); //$NON-NLS-1$
-			} else {
-				buffer = new StringBuffer();
-				buffer.append(' ');
-			}
-			buffer.append(tok.nextToken());
-			if (tok.countTokens() > 0)
-				buffer.append(" \r\n"); //$NON-NLS-1$
-			else
-				buffer.append("\r\n"); //$NON-NLS-1$
-			localMake72Safe(buffer);
-			out.writeBytes(buffer.toString());
-			inc++;
-		}
-	}
-
-	/**
-	 * Adds line breaks to enforce a maximum 72 bytes per line.
-	 */
-	protected static void localMake72Safe(StringBuffer line) {
-		int length = line.length();
-		if (length > 72) {
-			int index = 70;
-			while (index - 1 < length) {
-				line.insert(index, "\r\n "); //$NON-NLS-1$
-				index += 72;
-				length += 3;
-			}
-		}
-		return;
-	}
-
-
-}
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 92cdbcf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveOptions.java
+++ /dev/null
@@ -1,226 +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.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;
-
-	/**
-	 * 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;
-	}
-}
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 9236586..0000000
--- 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 7d7b268..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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("invalid_archive_EXC_", (new Object[]{archiveType, ddUri})); //$NON-NLS-1$ = "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 045ae8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveURIConverterImpl.java
+++ /dev/null
@@ -1,310 +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.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 java.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.Archive;
-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 89b0800..0000000
--- 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 7fb9b7c..0000000
--- 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 9502b61..0000000
--- 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 7433f94..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("End_of_list_reached_EXC_")); //$NON-NLS-1$ = "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 a3ef827..0000000
--- 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 7de9773..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("Internal_Error__Iterator_o_EXC_")); //$NON-NLS-1$ = "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.getString("Error_iterating_the_archiv_EXC_"), ex); //$NON-NLS-1$ = "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 a28a3b9..0000000
--- 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 3281c67..0000000
--- 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 caf60cb..0000000
--- 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 0adb97c..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 de041ec..0000000
--- 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 4b81f72..0000000
--- 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 3eef77b..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 d7ada6b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ApplicationClientFileImpl.java
+++ /dev/null
@@ -1,359 +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 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.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-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.eINSTANCE.getApplicationClientFile();
-	}
-
-	/**
-	 * @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);
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.APPLICATION_CLIENT_FILE__URI :
-				return getURI();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES :
-				return getFiles();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES :
-				return getTypes();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR :
-				if (resolve)
-					return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES :
-				return files != null && !files.isEmpty();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES :
-				return types != null && !types.isEmpty();
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR :
-				return deploymentDescriptor != 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 CommonarchivePackage.APPLICATION_CLIENT_FILE__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES :
-				getTypes().clear();
-				getTypes().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((ApplicationClient) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES :
-				getFiles().clear();
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES :
-				getTypes().clear();
-				return;
-			case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((ApplicationClient) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public ApplicationClient getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			ApplicationClient oldDeploymentDescriptor = deploymentDescriptor;
-			deploymentDescriptor = (ApplicationClient) EcoreUtil.resolve(deploymentDescriptor, this);
-			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));
-	}
-
-}
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 cf4868e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopySessionUtility.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.impl;
-
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopySession;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-/**
- * OverRide class to use the proper copying of XMLResource doctypes. Had to create this class Due to
- * the way it's handled in the copy commands of EtoolsCopyUtility
- * 
- * Creation date: (11/18/01 88888888:48 PM)
- * 
- * @author: Jared Jurkiewicz
- */
-public class ArchiveCopySessionUtility extends EtoolsCopySession {
-	public EObject copy(EObject aRefObject, String idSuffix) {
-		EObject copied = super.copy(aRefObject, idSuffix);
-		if (copied instanceof ContainerManagedEntity)
-			copyPrimKeyInfo((ContainerManagedEntity) aRefObject, (ContainerManagedEntity) copied);
-		return copied;
-	}
-
-	public EObject primCopy(EObject aRefObject, String idSuffix) {
-		EObject copied = super.primCopy(aRefObject, idSuffix);
-		if (copied instanceof ContainerManagedEntity)
-			copyPrimKeyInfo((ContainerManagedEntity) aRefObject, (ContainerManagedEntity) copied);
-		return copied;
-	}
-
-	public ArchiveCopySessionUtility(EtoolsCopyUtility aCopyUtility) {
-		super(aCopyUtility);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf.ecore.utilities.copy.EtoolsCopySession#newInstance(Resource, String)
-	 */
-	public Resource newInstance(Resource aResource, String newUri) {
-		Resource copyResource = super.newInstance(aResource, newUri);
-
-		if (aResource instanceof XMLResource)
-			((XMLResource) copyResource).setVersionID(((XMLResource) aResource).getVersionID());
-		return copyResource;
-	}
-
-	public EObject getCopyIfFound(EObject anObject) {
-		EObject copiedObject = super.getCopyIfFound(anObject);
-		if ((anObject instanceof JavaClass) && (anObject == copiedObject)) {
-			copiedObject = newInstance(anObject);
-			URI uri = EcoreUtil.getURI(anObject);
-			((InternalEObject) copiedObject).eSetProxyURI(uri);
-		}
-		return copiedObject;
-	}
-
-	public EObject copyObject(EObject aRefObject, String idSuffix) {
-		EObject copied = super.copyObject(aRefObject, idSuffix);
-		if (copied instanceof ContainerManagedEntity)
-			copyPrimKeyInfo((ContainerManagedEntity) aRefObject, (ContainerManagedEntity) copied);
-		return copied;
-	}
-
-	public void copyPrimKeyInfo(ContainerManagedEntity source, ContainerManagedEntity copied) {
-		CMPAttribute primKeyField = source.getPrimKeyField();
-		if (primKeyField != null)
-			copied.setPrimKeyField(primKeyField);
-	}
-
-	/*
-	 * Super class override to handle unresolvable proxies (JavaClass)
-	 */
-
-	protected void copyReference(EReference aReference, EObject aRefObject, String idSuffix, EObject copyRef) {
-		if (aReference.isMany()) {
-			List value = (List) aRefObject.eGet(aReference);
-			if (value != null)
-				copyManyReference(aReference, value, aRefObject, idSuffix, copyRef);
-		} else if (aRefObject.eIsSet(aReference)) {
-			Object value = aRefObject.eGet(aReference);
-			if (value == null)
-				value = ((InternalEObject) aRefObject).eGet(aReference, false);
-			copySingleReference(aReference, (EObject) value, aRefObject, idSuffix, copyRef);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java
deleted file mode 100644
index 95f6903..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.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.internal.common.util.Defaultable;
-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.getString("IOException_occurred_while_EXC_"), iox); //$NON-NLS-1$ = "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 8d53a80..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java
+++ /dev/null
@@ -1,1602 +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 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.notify.NotificationChain;
-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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-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.emf.ecore.util.InternalEList;
-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.looseconfig.LooseArchive;
-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.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.eINSTANCE.getArchive();
-	}
-
-	/**
-	 * <!-- 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 NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonarchivePackage.ARCHIVE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.ARCHIVE__CONTAINER, msgs);
-				case CommonarchivePackage.ARCHIVE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.ARCHIVE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.ARCHIVE__CONTAINER, msgs);
-				case CommonarchivePackage.ARCHIVE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.ARCHIVE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.ARCHIVE__URI :
-				return getURI();
-			case CommonarchivePackage.ARCHIVE__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.ARCHIVE__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.ARCHIVE__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.ARCHIVE__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.ARCHIVE__FILES :
-				return getFiles();
-			case CommonarchivePackage.ARCHIVE__TYPES :
-				return getTypes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.ARCHIVE__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.ARCHIVE__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.ARCHIVE__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.ARCHIVE__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.ARCHIVE__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.ARCHIVE__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.ARCHIVE__TYPES :
-				getTypes().clear();
-				getTypes().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.ARCHIVE__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.ARCHIVE__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.ARCHIVE__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.ARCHIVE__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.ARCHIVE__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.ARCHIVE__FILES :
-				getFiles().clear();
-				return;
-			case CommonarchivePackage.ARCHIVE__TYPES :
-				getTypes().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.ARCHIVE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.ARCHIVE__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.ARCHIVE__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.ARCHIVE__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.ARCHIVE__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.ARCHIVE__FILES :
-				return files != null && !files.isEmpty();
-			case CommonarchivePackage.ARCHIVE__TYPES :
-				return types != null && !types.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(" (types: "); //$NON-NLS-1$
-		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("duplicate_file_EXC_", (new Object[]{getURI(), aUri})), f); //$NON-NLS-1$ = "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("unable_replace_EXC_", (new Object[]{original.getAbsolutePath()}))); //$NON-NLS-1$ = "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("unable_replace_EXC_", (new Object[]{original.getAbsolutePath()}))); //$NON-NLS-1$ = "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("file_exist_as_dir_EXC_", (new Object[]{aFile.getAbsolutePath()})));//$NON-NLS-1$ = "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("error_saving_EXC_", (new Object[]{uri})), ex); //$NON-NLS-1$ = "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.getString("Extract_destination_is_the_EXC_")); //$NON-NLS-1$ = "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("error_saving_EXC_", (new Object[]{aUri})), ex); //$NON-NLS-1$ = "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("io_ex_manifest_EXC_", (new Object[]{getURI()})), ex); //$NON-NLS-1$ = "An IOException occurred reading the manifest: "
-			} catch (IOException ex) {
-				throw new ManifestException(CommonArchiveResourceHandler.getString("io_ex_manifest_EXC_", (new Object[]{getURI()})), ex); //$NON-NLS-1$ = "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("duplicate_entry_EXC_", (new Object[]{aUri, getURI()}))); //$NON-NLS-1$ = "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("io_ex_reopen_EXC_", (new Object[]{getURI()})), ex); //$NON-NLS-1$ = "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("error_saving_EXC_", (new Object[]{aUri})), ex); //$NON-NLS-1$ = "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("load_resource_EXC_", (new Object[]{resourceUri, getURI()})), ex); //$NON-NLS-1$ = "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 ae274d6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java
+++ /dev/null
@@ -1,193 +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.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.jst.j2ee.application.Module;
-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.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.ArchiveWrappedException;
-
-
-public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRef, ModuleRef {
-	/**
-	 * @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.eINSTANCE.getClientModuleRef();
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE :
-					return eBasicSetContainer(null, CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.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 CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE :
-				if (resolve)
-					return getModuleFile();
-				return basicGetModuleFile();
-			case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE :
-				return getEarFile();
-			case CommonarchivePackage.CLIENT_MODULE_REF__MODULE :
-				if (resolve)
-					return getModule();
-				return basicGetModule();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) newValue);
-				return;
-			case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) newValue);
-				return;
-			case CommonarchivePackage.CLIENT_MODULE_REF__MODULE :
-				setModule((Module) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) null);
-				return;
-			case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) null);
-				return;
-			case CommonarchivePackage.CLIENT_MODULE_REF__MODULE :
-				setModule((Module) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE :
-				return moduleFile != null;
-			case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE :
-				return getEarFile() != null;
-			case CommonarchivePackage.CLIENT_MODULE_REF__MODULE :
-				return module != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	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 a261590..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java
+++ /dev/null
@@ -1,1072 +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 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.impl.EFactoryImpl;
-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.looseconfig.LooseArchive;
-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.jem.util.logger.proxy.Logger;
-
-
-/**
- * @generated
- */
-public class CommonarchiveFactoryImpl extends EFactoryImpl implements CommonarchiveFactory {
-
-
-	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"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * @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("file_not_found_EXC_", (new Object[]{uri, file.getAbsolutePath()}))); //$NON-NLS-1$ = "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);
-			tempFile.deleteOnExit();
-			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("make_temp_file_WARN_", (new Object[]{uri})) + ex.getLocalizedMessage()); //$NON-NLS-1$ = "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 {
-			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("open_nested_EXC_", (new Object[]{uri, parent.getURI()})), ex); //$NON-NLS-1$ = "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("open_nested_EXC_", (new Object[]{uri, parent.getURI()})), ex); //$NON-NLS-1$ = "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("could_not_find_dir_EXC_", (new Object[]{uri}))); //$NON-NLS-1$ = "Unable to open directory "
-		if (!aFile.isDirectory())
-			throw new IOException(CommonArchiveResourceHandler.getString("not_a_dir_EXC_", (new Object[]{uri}))); //$NON-NLS-1$ = "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("could_not_open_EXC_", (new Object[]{uri})), ex); //$NON-NLS-1$ = "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 -->
-	 * 
-	 * @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 b641382..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java
+++ /dev/null
@@ -1,635 +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.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-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.looseconfig.LooseconfigPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl.LooseconfigPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-
-
-/**
- * @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 EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CommonarchivePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		JcaPackageImpl.init();
-		Webservice_clientPackageImpl.init();
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-		CommonPackageImpl.init();
-		ClientPackageImpl.init();
-		WebapplicationPackageImpl.init();
-		EjbPackageImpl.init();
-		JspPackageImpl.init();
-		ApplicationPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) : LooseconfigPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theCommonarchivePackage.createPackageContents();
-		theLooseconfigPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theCommonarchivePackage.initializePackageContents();
-		theLooseconfigPackage.initializePackageContents();
-
-		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.getEReferences().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.getEReferences().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.getEReferences().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEARFile_ModuleRefs() {
-		return (EReference) earFileEClass.getEReferences().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.getEReferences().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getModuleRef_EarFile() {
-		return (EReference) moduleRefEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EReference getModuleRef_Module() {
-		return (EReference) moduleRefEClass.getEReferences().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.getEReferences().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.getEReferences().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.getEReferences().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.getEAttributes().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.getEAttributes().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFile_LastModified() {
-		return (EAttribute) fileEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFile_Size() {
-		return (EAttribute) fileEClass.getEAttributes().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EAttribute getFile_DirectoryEntry() {
-		return (EAttribute) fileEClass.getEAttributes().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFile_OriginalURI() {
-		return (EAttribute) fileEClass.getEAttributes().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFile_LoadingContainer() {
-		return (EReference) fileEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFile_Container() {
-		return (EReference) fileEClass.getEReferences().get(1);
-	}
-
-	/**
-	 * @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
-		LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl) EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI);
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl) EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl) EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl) EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-
-		// Add subpackages
-		getESubpackages().add(theLooseconfigPackage);
-
-		// Add supertypes to classes
-		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());
-		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); //$NON-NLS-1$
-		initEAttribute(getFile_URI(), ecorePackage.getEString(), "URI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEAttribute(getFile_LastModified(), ecorePackage.getELong(), "lastModified", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEAttribute(getFile_Size(), ecorePackage.getELong(), "size", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEAttribute(getFile_DirectoryEntry(), ecorePackage.getEBoolean(), "directoryEntry", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEAttribute(getFile_OriginalURI(), ecorePackage.getEString(), "originalURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEReference(getFile_LoadingContainer(), this.getContainer(), null, "loadingContainer", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-		initEReference(getFile_Container(), this.getContainer(), this.getContainer_Files(), "container", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(archiveEClass, Archive.class, "Archive", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getArchive_Types(), ecorePackage.getEString(), "types", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(ejbJarFileEClass, EJBJarFile.class, "EJBJarFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getEJBJarFile_DeploymentDescriptor(), theEjbPackage.getEJBJar(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(warFileEClass, WARFile.class, "WARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getWARFile_DeploymentDescriptor(), theWebapplicationPackage.getWebApp(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(earFileEClass, EARFile.class, "EARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getEARFile_ModuleRefs(), this.getModuleRef(), this.getModuleRef_EarFile(), "moduleRefs", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-		initEReference(getEARFile_DeploymentDescriptor(), theApplicationPackage.getApplication(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(applicationClientFileEClass, ApplicationClientFile.class, "ApplicationClientFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getApplicationClientFile_DeploymentDescriptor(), theClientPackage.getApplicationClient(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(moduleFileEClass, ModuleFile.class, "ModuleFile", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(containerEClass, Container.class, "Container", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getContainer_Files(), this.getFile(), this.getFile_Container(), "files", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(readOnlyDirectoryEClass, ReadOnlyDirectory.class, "ReadOnlyDirectory", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(rarFileEClass, RARFile.class, "RARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getRARFile_DeploymentDescriptor(), theJcaPackage.getConnector(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(moduleRefEClass, ModuleRef.class, "ModuleRef", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getModuleRef_ModuleFile(), this.getModuleFile(), null, "moduleFile", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-		initEReference(getModuleRef_EarFile(), this.getEARFile(), this.getEARFile_ModuleRefs(), "earFile", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-		initEReference(getModuleRef_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(ejbModuleRefEClass, EJBModuleRef.class, "EJBModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(webModuleRefEClass, WebModuleRef.class, "WebModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(clientModuleRefEClass, ClientModuleRef.class, "ClientModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(connectorModuleRefEClass, ConnectorModuleRef.class, "ConnectorModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		// 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 dff058c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java
+++ /dev/null
@@ -1,192 +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.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.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ConnectorModuleRef;
-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.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.jca.Connector;
-
-
-public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorModuleRef, ModuleRef {
-	/**
-	 * @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.eINSTANCE.getConnectorModuleRef();
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE :
-					return eBasicSetContainer(null, CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.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 CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE :
-				if (resolve)
-					return getModuleFile();
-				return basicGetModuleFile();
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE :
-				return getEarFile();
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE :
-				if (resolve)
-					return getModule();
-				return basicGetModule();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) newValue);
-				return;
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) newValue);
-				return;
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE :
-				setModule((Module) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) null);
-				return;
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) null);
-				return;
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE :
-				setModule((Module) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE :
-				return moduleFile != null;
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE :
-				return getEarFile() != null;
-			case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE :
-				return module != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	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 d20d834..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java
+++ /dev/null
@@ -1,513 +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 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.EStructuralFeature;
-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.eINSTANCE.getContainer();
-	}
-
-	/**
-	 * @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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonarchivePackage.CONTAINER__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.CONTAINER__CONTAINER, msgs);
-				case CommonarchivePackage.CONTAINER__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.CONTAINER__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.CONTAINER__CONTAINER, msgs);
-				case CommonarchivePackage.CONTAINER__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.CONTAINER__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.CONTAINER__URI :
-				return getURI();
-			case CommonarchivePackage.CONTAINER__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.CONTAINER__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.CONTAINER__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.CONTAINER__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.CONTAINER__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.CONTAINER__FILES :
-				return getFiles();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CONTAINER__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.CONTAINER__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.CONTAINER__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.CONTAINER__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.CONTAINER__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.CONTAINER__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.CONTAINER__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CONTAINER__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.CONTAINER__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.CONTAINER__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.CONTAINER__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.CONTAINER__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.CONTAINER__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.CONTAINER__FILES :
-				getFiles().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.CONTAINER__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.CONTAINER__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.CONTAINER__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.CONTAINER__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.CONTAINER__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.CONTAINER__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.CONTAINER__FILES :
-				return files != null && !files.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	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 f24c112..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java
+++ /dev/null
@@ -1,1324 +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 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.EStructuralFeature;
-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.EcoreUtil;
-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.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.Archive;
-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.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.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-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.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-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.eINSTANCE.getEARFile();
-	}
-
-	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("dd_in_ear_load_EXC_", (new Object[]{aModule.getUri(), getURI()})), e); //$NON-NLS-1$ = "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("dup_sec_role_module_EXC_", (new Object[]{aModule.getUri(), roleName})), ejbJar.getAssemblyDescriptor().getSecurityRoleNamed(roleName)); //$NON-NLS-1$ = "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("dup_sec_role_module_EXC_", (new Object[]{aModule.getUri(), roleName})), webApp.getSecurityRoleNamed(roleName));//$NON-NLS-1$ = "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("dup_resource_EXC_", (new Object[]{aUri, getURI()}))); //$NON-NLS-1$ = "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 {
-		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("dd_in_ear_load_EXC_", (new Object[]{aModule.getUri(), getURI()})), e); //$NON-NLS-1$ = "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("nested_open_fail_EXC_", (new Object[]{aUri, getURI()})), ex); //$NON-NLS-1$ = "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.getString("Parameter_should_not_be_nu_EXC_")); //$NON-NLS-1$ = "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("dd_in_ear_load_EXC_", (new Object[]{aModule.getUri(), getURI()})), e); //$NON-NLS-1$ = "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();
-			((J2EEResourceFactoryRegistry) 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("dd_in_ear_load_EXC_", (new Object[]{m.getUri(), getURI()})), e); //$NON-NLS-1$ = "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("no_sec_role_EXC_", (new Object[]{getURI(), existingRoleName}))); //$NON-NLS-1$ = ": EAR File deployment descriptor does not contain a security role named "
-		if (app.getSecurityRoleNamed(newRoleName) != null)
-			throw new DuplicateObjectException(CommonArchiveResourceHandler.getString("dup_sec_role_EXC_", (new Object[]{getURI(), newRoleName})), app.getSecurityRoleNamed(newRoleName)); //$NON-NLS-1$ = ": 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("dd_in_ear_load_EXC_", (new Object[]{aModule.getUri(), getURI()})), e); //$NON-NLS-1$ = "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 boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.EAR_FILE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.EAR_FILE__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.EAR_FILE__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.EAR_FILE__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.EAR_FILE__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.EAR_FILE__FILES :
-				return files != null && !files.isEmpty();
-			case CommonarchivePackage.EAR_FILE__TYPES :
-				return types != null && !types.isEmpty();
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS :
-				return moduleRefs != null && !moduleRefs.isEmpty();
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				return deploymentDescriptor != 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 CommonarchivePackage.EAR_FILE__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.EAR_FILE__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.EAR_FILE__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__TYPES :
-				getTypes().clear();
-				getTypes().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS :
-				getModuleRefs().clear();
-				getModuleRefs().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((Application) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.EAR_FILE__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.EAR_FILE__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.EAR_FILE__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.EAR_FILE__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.EAR_FILE__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.EAR_FILE__FILES :
-				getFiles().clear();
-				return;
-			case CommonarchivePackage.EAR_FILE__TYPES :
-				getTypes().clear();
-				return;
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS :
-				getModuleRefs().clear();
-				return;
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((Application) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public Application getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			Application oldDeploymentDescriptor = deploymentDescriptor;
-			deploymentDescriptor = (Application) EcoreUtil.resolve(deploymentDescriptor, this);
-			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));
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.EAR_FILE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.EAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.EAR_FILE__FILES :
-					return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs);
-				case CommonarchivePackage.EAR_FILE__MODULE_REFS :
-					return ((InternalEList) getModuleRefs()).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 CommonarchivePackage.EAR_FILE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.EAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.EAR_FILE__FILES :
-					return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs);
-				case CommonarchivePackage.EAR_FILE__MODULE_REFS :
-					return ((InternalEList) getModuleRefs()).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 CommonarchivePackage.EAR_FILE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.EAR_FILE__URI :
-				return getURI();
-			case CommonarchivePackage.EAR_FILE__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.EAR_FILE__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.EAR_FILE__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.EAR_FILE__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.EAR_FILE__FILES :
-				return getFiles();
-			case CommonarchivePackage.EAR_FILE__TYPES :
-				return getTypes();
-			case CommonarchivePackage.EAR_FILE__MODULE_REFS :
-				return getModuleRefs();
-			case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				if (resolve)
-					return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	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 81b8404..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java
+++ /dev/null
@@ -1,418 +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 java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-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.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-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.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * @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.eINSTANCE.getEJBJarFile();
-	}
-
-	/**
-	 * 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 boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.EJB_JAR_FILE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.EJB_JAR_FILE__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.EJB_JAR_FILE__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.EJB_JAR_FILE__FILES :
-				return files != null && !files.isEmpty();
-			case CommonarchivePackage.EJB_JAR_FILE__TYPES :
-				return types != null && !types.isEmpty();
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				return deploymentDescriptor != 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 CommonarchivePackage.EJB_JAR_FILE__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__TYPES :
-				getTypes().clear();
-				getTypes().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((EJBJar) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.EJB_JAR_FILE__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__FILES :
-				getFiles().clear();
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__TYPES :
-				getTypes().clear();
-				return;
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((EJBJar) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public EJBJar getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			EJBJar oldDeploymentDescriptor = deploymentDescriptor;
-			deploymentDescriptor = (EJBJar) EcoreUtil.resolve(deploymentDescriptor, this);
-			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 NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonarchivePackage.EJB_JAR_FILE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.EJB_JAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.EJB_JAR_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.EJB_JAR_FILE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.EJB_JAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.EJB_JAR_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.EJB_JAR_FILE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.EJB_JAR_FILE__URI :
-				return getURI();
-			case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.EJB_JAR_FILE__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.EJB_JAR_FILE__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.EJB_JAR_FILE__FILES :
-				return getFiles();
-			case CommonarchivePackage.EJB_JAR_FILE__TYPES :
-				return getTypes();
-			case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				if (resolve)
-					return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-}
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 c1d6efa..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java
+++ /dev/null
@@ -1,194 +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.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.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-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.ejb.EJBJar;
-
-
-public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, ModuleRef {
-
-
-	/**
-	 * @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.eINSTANCE.getEJBModuleRef();
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.EJB_MODULE_REF__EAR_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.EJB_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.EJB_MODULE_REF__EAR_FILE :
-					return eBasicSetContainer(null, CommonarchivePackage.EJB_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.EJB_MODULE_REF__EAR_FILE :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.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 CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE :
-				if (resolve)
-					return getModuleFile();
-				return basicGetModuleFile();
-			case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE :
-				return getEarFile();
-			case CommonarchivePackage.EJB_MODULE_REF__MODULE :
-				if (resolve)
-					return getModule();
-				return basicGetModule();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) newValue);
-				return;
-			case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) newValue);
-				return;
-			case CommonarchivePackage.EJB_MODULE_REF__MODULE :
-				setModule((Module) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) null);
-				return;
-			case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) null);
-				return;
-			case CommonarchivePackage.EJB_MODULE_REF__MODULE :
-				setModule((Module) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE :
-				return moduleFile != null;
-			case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE :
-				return getEarFile() != null;
-			case CommonarchivePackage.EJB_MODULE_REF__MODULE :
-				return module != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	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 9ba124a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java
+++ /dev/null
@@ -1,680 +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.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.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.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-
-/**
- * @generated
- */
-public class FileImpl extends EObjectImpl 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.eINSTANCE.getFile();
-	}
-
-	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()) {
-			Container oldLoadingContainer = loadingContainer;
-			loadingContainer = (Container) EcoreUtil.resolve(loadingContainer, this);
-			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;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setContainer(Container newContainer) {
-		if (newContainer != eContainer || (eContainerFeatureID != CommonarchivePackage.FILE__CONTAINER && newContainer != null)) {
-			if (EcoreUtil.isAncestor(this, newContainer))
-				throw new IllegalArgumentException(CommonArchiveResourceHandler.getString("FileImpl._Error_0") + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject) newContainer).eInverseAdd(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newContainer, CommonarchivePackage.FILE__CONTAINER, 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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonarchivePackage.FILE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.FILE__CONTAINER, 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 CommonarchivePackage.FILE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.FILE__CONTAINER, 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 CommonarchivePackage.FILE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 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 eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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 eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		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(" (URI: "); //$NON-NLS-1$
-		result.append(uri);
-		result.append(", lastModified: "); //$NON-NLS-1$
-		if (lastModifiedESet)
-			result.append(lastModified);
-		else
-			result.append("<unset>"); //$NON-NLS-1$
-		result.append(", size: "); //$NON-NLS-1$
-		if (sizeESet)
-			result.append(size);
-		else
-			result.append("<unset>"); //$NON-NLS-1$
-		result.append(", directoryEntry: "); //$NON-NLS-1$
-		if (directoryEntryESet)
-			result.append(directoryEntry);
-		else
-			result.append("<unset>"); //$NON-NLS-1$
-		result.append(", originalURI: "); //$NON-NLS-1$
-		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 b5909a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java
+++ /dev/null
@@ -1,408 +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 java.io.FileNotFoundException;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-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.resource.Resource;
-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.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.eINSTANCE.getModuleFile();
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.MODULE_FILE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.MODULE_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.MODULE_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.MODULE_FILE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.MODULE_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.MODULE_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.MODULE_FILE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.MODULE_FILE__URI :
-				return getURI();
-			case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.MODULE_FILE__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.MODULE_FILE__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.MODULE_FILE__FILES :
-				return getFiles();
-			case CommonarchivePackage.MODULE_FILE__TYPES :
-				return getTypes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.MODULE_FILE__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.MODULE_FILE__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.MODULE_FILE__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.MODULE_FILE__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.MODULE_FILE__TYPES :
-				getTypes().clear();
-				getTypes().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.MODULE_FILE__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.MODULE_FILE__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.MODULE_FILE__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.MODULE_FILE__FILES :
-				getFiles().clear();
-				return;
-			case CommonarchivePackage.MODULE_FILE__TYPES :
-				getTypes().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.MODULE_FILE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.MODULE_FILE__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.MODULE_FILE__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.MODULE_FILE__FILES :
-				return files != null && !files.isEmpty();
-			case CommonarchivePackage.MODULE_FILE__TYPES :
-				return types != null && !types.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	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 fae767c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java
+++ /dev/null
@@ -1,545 +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 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.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.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.application.Module;
-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;
-
-
-public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject {
-	/**
-	 * @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()
-	 * @generated
-	 * @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.eINSTANCE.getModuleRef();
-	}
-
-	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()) {
-			ModuleFile oldModuleFile = moduleFile;
-			moduleFile = (ModuleFile) EcoreUtil.resolve(moduleFile, this);
-			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());
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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 eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	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;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEarFile(EARFile newEarFile) {
-		if (newEarFile != eContainer || (eContainerFeatureID != CommonarchivePackage.MODULE_REF__EAR_FILE && newEarFile != null)) {
-			if (EcoreUtil.isAncestor(this, newEarFile))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEarFile != null)
-				msgs = ((InternalEObject) newEarFile).eInverseAdd(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newEarFile, CommonarchivePackage.MODULE_REF__EAR_FILE, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.MODULE_REF__EAR_FILE, newEarFile, newEarFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonarchivePackage.MODULE_REF__EAR_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.MODULE_REF__EAR_FILE, 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 CommonarchivePackage.MODULE_REF__EAR_FILE :
-					return eBasicSetContainer(null, CommonarchivePackage.MODULE_REF__EAR_FILE, 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 CommonarchivePackage.MODULE_REF__EAR_FILE :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.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 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 eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * 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("Module_not_in_EAR", new Object[]{getUri()})); //$NON-NLS-1$
-	}
-
-	/**
-	 * @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("Module_file_does_not_exist_2", new Object[]{getUri()})); //$NON-NLS-1$
-	}
-
-	protected void checkType(Module moduleDescriptor, File aFile) {
-		if (aFile == null) {
-			String message = CommonArchiveResourceHandler.getString("A_file_does_not_exist_for_module", new Object[]{moduleDescriptor.getUri()}); //$NON-NLS-1$
-			throw new NoModuleFileException(message);
-		}
-		//Added for defect 113929
-		boolean isValid = true;
-		String type = CommonArchiveResourceHandler.getString("Module_file"); //$NON-NLS-1$
-		if (moduleDescriptor.isWebModule() && !aFile.isWARFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.getString("A_WAR_file"); //$NON-NLS-1$
-		} else if (moduleDescriptor.isEjbModule() && !aFile.isEJBJarFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.getString("An_EJB_JAR_file"); //$NON-NLS-1$
-		} else if (moduleDescriptor.isJavaModule() && !aFile.isApplicationClientFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.getString("An_Application_Client_JAR_file"); //$NON-NLS-1$
-		} else if (moduleDescriptor.isConnectorModule() && !aFile.isRARFile()) {
-			isValid = false;
-			type = CommonArchiveResourceHandler.getString("A_RAR_file"); //$NON-NLS-1$
-		} 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 947cdd4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java
+++ /dev/null
@@ -1,402 +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 java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.InternalEList;
-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.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.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-
-
-/**
- * @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.eINSTANCE.getRARFile();
-	}
-
-	/**
-	 * @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("add_copy_class_dir_EXC_", (new Object[]{aFile.getURI()}))); //$NON-NLS-1$ = "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.getString("Extract_destination_is_the_EXC_")); //$NON-NLS-1$ = "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("error_saving_EXC_", (new Object[]{uri})), ex); //$NON-NLS-1$ = "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 NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonarchivePackage.RAR_FILE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.RAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.RAR_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.RAR_FILE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.RAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.RAR_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.RAR_FILE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.RAR_FILE__URI :
-				return getURI();
-			case CommonarchivePackage.RAR_FILE__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.RAR_FILE__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.RAR_FILE__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.RAR_FILE__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.RAR_FILE__FILES :
-				return getFiles();
-			case CommonarchivePackage.RAR_FILE__TYPES :
-				return getTypes();
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				if (resolve)
-					return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.RAR_FILE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.RAR_FILE__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.RAR_FILE__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.RAR_FILE__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.RAR_FILE__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.RAR_FILE__FILES :
-				return files != null && !files.isEmpty();
-			case CommonarchivePackage.RAR_FILE__TYPES :
-				return types != null && !types.isEmpty();
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				return deploymentDescriptor != 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 CommonarchivePackage.RAR_FILE__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.RAR_FILE__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.RAR_FILE__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.RAR_FILE__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.RAR_FILE__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.RAR_FILE__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.RAR_FILE__TYPES :
-				getTypes().clear();
-				getTypes().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((Connector) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.RAR_FILE__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.RAR_FILE__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.RAR_FILE__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.RAR_FILE__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.RAR_FILE__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.RAR_FILE__FILES :
-				getFiles().clear();
-				return;
-			case CommonarchivePackage.RAR_FILE__TYPES :
-				getTypes().clear();
-				return;
-			case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((Connector) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	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 c87e1e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java
+++ /dev/null
@@ -1,304 +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 java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-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.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.ReadOnlyDirectory;
-
-/**
- * @generated
- */
-public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDirectory {
-
-	public ReadOnlyDirectoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonarchivePackage.eINSTANCE.getReadOnlyDirectory();
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER, msgs);
-				case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER, msgs);
-				case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.READ_ONLY_DIRECTORY__URI :
-				return getURI();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES :
-				return getFiles();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES :
-				getFiles().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES :
-				return files != null && !files.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @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 2635672..0000000
--- 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 ed9acc8..0000000
--- 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 5bf215e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java
+++ /dev/null
@@ -1,589 +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 java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-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.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-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.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.looseconfig.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.WarFileDynamicClassLoader;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @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.eINSTANCE.getWARFile();
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.WARFile
-	 */
-	public File addCopyClass(File aFile) throws DuplicateObjectException {
-		if (aFile.isReadOnlyDirectory())
-			throw new IllegalArgumentException(CommonArchiveResourceHandler.getString("add_copy_class_dir_EXC_", (new Object[]{aFile.getURI()}))); //$NON-NLS-1$ = "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("add_copy_lib_dir_EXC_", (new Object[]{aFile.getURI()}))); //$NON-NLS-1$ = "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());
-		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 boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.WAR_FILE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case CommonarchivePackage.WAR_FILE__LAST_MODIFIED :
-				return isSetLastModified();
-			case CommonarchivePackage.WAR_FILE__SIZE :
-				return isSetSize();
-			case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY :
-				return isSetDirectoryEntry();
-			case CommonarchivePackage.WAR_FILE__ORIGINAL_URI :
-				return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI);
-			case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER :
-				return loadingContainer != null;
-			case CommonarchivePackage.WAR_FILE__CONTAINER :
-				return getContainer() != null;
-			case CommonarchivePackage.WAR_FILE__FILES :
-				return files != null && !files.isEmpty();
-			case CommonarchivePackage.WAR_FILE__TYPES :
-				return types != null && !types.isEmpty();
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				return deploymentDescriptor != 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 CommonarchivePackage.WAR_FILE__URI :
-				setURI((String) newValue);
-				return;
-			case CommonarchivePackage.WAR_FILE__LAST_MODIFIED :
-				setLastModified(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.WAR_FILE__SIZE :
-				setSize(((Long) newValue).longValue());
-				return;
-			case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY :
-				setDirectoryEntry(((Boolean) newValue).booleanValue());
-				return;
-			case CommonarchivePackage.WAR_FILE__ORIGINAL_URI :
-				setOriginalURI((String) newValue);
-				return;
-			case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.WAR_FILE__CONTAINER :
-				setContainer((Container) newValue);
-				return;
-			case CommonarchivePackage.WAR_FILE__FILES :
-				getFiles().clear();
-				getFiles().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.WAR_FILE__TYPES :
-				getTypes().clear();
-				getTypes().addAll((Collection) newValue);
-				return;
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((WebApp) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.WAR_FILE__URI :
-				setURI(URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.WAR_FILE__LAST_MODIFIED :
-				unsetLastModified();
-				return;
-			case CommonarchivePackage.WAR_FILE__SIZE :
-				unsetSize();
-				return;
-			case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY :
-				unsetDirectoryEntry();
-				return;
-			case CommonarchivePackage.WAR_FILE__ORIGINAL_URI :
-				setOriginalURI(ORIGINAL_URI_EDEFAULT);
-				return;
-			case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER :
-				setLoadingContainer((Container) null);
-				return;
-			case CommonarchivePackage.WAR_FILE__CONTAINER :
-				setContainer((Container) null);
-				return;
-			case CommonarchivePackage.WAR_FILE__FILES :
-				getFiles().clear();
-				return;
-			case CommonarchivePackage.WAR_FILE__TYPES :
-				getTypes().clear();
-				return;
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				setDeploymentDescriptor((WebApp) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 */
-	public WebApp getDeploymentDescriptorGen() {
-		if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) {
-			WebApp oldDeploymentDescriptor = deploymentDescriptor;
-			deploymentDescriptor = (WebApp) EcoreUtil.resolve(deploymentDescriptor, this);
-			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 NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonarchivePackage.WAR_FILE__CONTAINER :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.WAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.WAR_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.WAR_FILE__CONTAINER :
-					return eBasicSetContainer(null, CommonarchivePackage.WAR_FILE__CONTAINER, msgs);
-				case CommonarchivePackage.WAR_FILE__FILES :
-					return ((InternalEList) getFiles()).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 CommonarchivePackage.WAR_FILE__CONTAINER :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.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 CommonarchivePackage.WAR_FILE__URI :
-				return getURI();
-			case CommonarchivePackage.WAR_FILE__LAST_MODIFIED :
-				return new Long(getLastModified());
-			case CommonarchivePackage.WAR_FILE__SIZE :
-				return new Long(getSize());
-			case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY :
-				return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE;
-			case CommonarchivePackage.WAR_FILE__ORIGINAL_URI :
-				return getOriginalURI();
-			case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER :
-				if (resolve)
-					return getLoadingContainer();
-				return basicGetLoadingContainer();
-			case CommonarchivePackage.WAR_FILE__CONTAINER :
-				return getContainer();
-			case CommonarchivePackage.WAR_FILE__FILES :
-				return getFiles();
-			case CommonarchivePackage.WAR_FILE__TYPES :
-				return getTypes();
-			case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR :
-				if (resolve)
-					return getDeploymentDescriptor();
-				return basicGetDeploymentDescriptor();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	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 17c5e4e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java
+++ /dev/null
@@ -1,197 +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.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.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-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.WebModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, ModuleRef {
-
-
-	/**
-	 * @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.eINSTANCE.getWebModuleRef();
-	}
-
-	/**
-	 * <!-- 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 CommonarchivePackage.WEB_MODULE_REF__EAR_FILE :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, CommonarchivePackage.WEB_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.WEB_MODULE_REF__EAR_FILE :
-					return eBasicSetContainer(null, CommonarchivePackage.WEB_MODULE_REF__EAR_FILE, 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 CommonarchivePackage.WEB_MODULE_REF__EAR_FILE :
-					return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.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 CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE :
-				if (resolve)
-					return getModuleFile();
-				return basicGetModuleFile();
-			case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE :
-				return getEarFile();
-			case CommonarchivePackage.WEB_MODULE_REF__MODULE :
-				if (resolve)
-					return getModule();
-				return basicGetModule();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) newValue);
-				return;
-			case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) newValue);
-				return;
-			case CommonarchivePackage.WEB_MODULE_REF__MODULE :
-				setModule((Module) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE :
-				setModuleFile((ModuleFile) null);
-				return;
-			case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE :
-				setEarFile((EARFile) null);
-				return;
-			case CommonarchivePackage.WEB_MODULE_REF__MODULE :
-				setModule((Module) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE :
-				return moduleFile != null;
-			case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE :
-				return getEarFile() != null;
-			case CommonarchivePackage.WEB_MODULE_REF__MODULE :
-				return module != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/*
-	 * @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/looseconfig/LooseApplication.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseApplication.java
deleted file mode 100644
index 738464a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseApplication.java
+++ /dev/null
@@ -1,28 +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.looseconfig;
-
-
-
-import org.eclipse.emf.common.util.EList;
-
-
-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/internal/looseconfig/LooseArchive.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseArchive.java
deleted file mode 100644
index 2fb9bc7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseArchive.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.looseconfig;
-
-
-
-import org.eclipse.emf.ecore.EObject;
-
-
-public interface LooseArchive extends EObject {
-	/**
-	 * @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/internal/looseconfig/LooseConfigRegister.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfigRegister.java
deleted file mode 100644
index 530cdbe..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfigRegister.java
+++ /dev/null
@@ -1,358 +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.looseconfig;
-
-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/internal/looseconfig/LooseConfiguration.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfiguration.java
deleted file mode 100644
index 6705649..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfiguration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig;
-
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-
-public interface LooseConfiguration extends EObject {
-	/**
-	 * @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/internal/looseconfig/LooseLibrary.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseLibrary.java
deleted file mode 100644
index 9d3d86c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseLibrary.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig;
-
-
-
-
-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/internal/looseconfig/LooseModule.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseModule.java
deleted file mode 100644
index 3f5b391..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig;
-
-
-
-
-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/internal/looseconfig/LooseWARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseWARFile.java
deleted file mode 100644
index 53b224a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseWARFile.java
+++ /dev/null
@@ -1,28 +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.looseconfig;
-
-
-
-import org.eclipse.emf.common.util.EList;
-
-
-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/internal/looseconfig/LooseconfigFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigFactory.java
deleted file mode 100644
index c6f94e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigFactory.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.commonarchivecore.internal.looseconfig;
-
-
-import org.eclipse.emf.ecore.EFactory;
-
-
-public interface LooseconfigFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	LooseconfigFactory eINSTANCE = new org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl.LooseconfigFactoryImpl();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseApplication value
-	 */
-	LooseApplication createLooseApplication();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseLibrary value
-	 */
-	LooseLibrary createLooseLibrary();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseWARFile value
-	 */
-	LooseWARFile createLooseWARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseModule value
-	 */
-	LooseModule createLooseModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseConfiguration value
-	 */
-	LooseConfiguration createLooseConfiguration();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	LooseconfigPackage getLooseconfigPackage();
-
-} //LooseconfigFactory
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigPackage.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigPackage.java
deleted file mode 100644
index a4949c5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigPackage.java
+++ /dev/null
@@ -1,334 +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.looseconfig;
-
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-
-/**
- * @lastgen interface LooseconfigPackage extends EPackage {}
- */
-public interface LooseconfigPackage extends EPackage {
-	/**
-	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	String eNAME = "looseconfig"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_APPLICATION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_ARCHIVE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_ARCHIVE__URI = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_ARCHIVE__BINARIES_PATH = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_ARCHIVE__RESOURCES_PATH = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_ARCHIVE__LOOSE_APP = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Loose Archive</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_ARCHIVE_FEATURE_COUNT = 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_APPLICATION__URI = LOOSE_ARCHIVE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_APPLICATION__BINARIES_PATH = LOOSE_ARCHIVE__BINARIES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_APPLICATION__RESOURCES_PATH = LOOSE_ARCHIVE__RESOURCES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_APPLICATION__LOOSE_APP = LOOSE_ARCHIVE__LOOSE_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_APPLICATION__LOOSE_ARCHIVES = LOOSE_ARCHIVE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Loose Application</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_APPLICATION_FEATURE_COUNT = LOOSE_ARCHIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_LIBRARY = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_LIBRARY__URI = LOOSE_ARCHIVE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_LIBRARY__BINARIES_PATH = LOOSE_ARCHIVE__BINARIES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_LIBRARY__RESOURCES_PATH = LOOSE_ARCHIVE__RESOURCES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_LIBRARY__LOOSE_APP = LOOSE_ARCHIVE__LOOSE_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_LIBRARY__LOOSE_WAR = LOOSE_ARCHIVE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Loose Library</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_LIBRARY_FEATURE_COUNT = LOOSE_ARCHIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_WAR_FILE = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_MODULE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_MODULE__URI = LOOSE_ARCHIVE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_MODULE__BINARIES_PATH = LOOSE_ARCHIVE__BINARIES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_MODULE__RESOURCES_PATH = LOOSE_ARCHIVE__RESOURCES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_MODULE__LOOSE_APP = LOOSE_ARCHIVE__LOOSE_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_MODULE__ALT_DD = LOOSE_ARCHIVE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Loose Module</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_MODULE_FEATURE_COUNT = LOOSE_ARCHIVE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_CONFIGURATION = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_CONFIGURATION__APPLICATIONS = 0;
-
-
-	/**
-	 * The number of structural features of the the '<em>Loose Configuration</em>' class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 * @ordered
-	 */
-	int LOOSE_CONFIGURATION_FEATURE_COUNT = 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_WAR_FILE__URI = LOOSE_MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_WAR_FILE__BINARIES_PATH = LOOSE_MODULE__BINARIES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_WAR_FILE__RESOURCES_PATH = LOOSE_MODULE__RESOURCES_PATH;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_WAR_FILE__LOOSE_APP = LOOSE_MODULE__LOOSE_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_WAR_FILE__ALT_DD = LOOSE_MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOOSE_WAR_FILE__LOOSE_LIBS = LOOSE_MODULE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the 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;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "commonarchive.looseconfig.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	LooseconfigPackage eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl.LooseconfigPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseApplication object
-	 */
-	EClass getLooseApplication();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLooseApplication_LooseArchives();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseArchive object
-	 */
-	EClass getLooseArchive();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLooseArchive_Uri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLooseArchive_BinariesPath();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLooseArchive_ResourcesPath();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLooseArchive_LooseApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseLibrary object
-	 */
-	EClass getLooseLibrary();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLooseLibrary_LooseWAR();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseWARFile object
-	 */
-	EClass getLooseWARFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLooseWARFile_LooseLibs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseModule object
-	 */
-	EClass getLooseModule();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLooseModule_AltDD();
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 * @return LooseConfiguration object
-	 */
-	EClass getLooseConfiguration();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLooseConfiguration_Applications();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	LooseconfigFactory getLooseconfigFactory();
-
-} //LooseconfigPackage
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseApplicationImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseApplicationImpl.java
deleted file mode 100644
index 0575f3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseApplicationImpl.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.commonarchivecore.internal.looseconfig.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.EStructuralFeature;
-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.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-
-public class LooseApplicationImpl extends LooseArchiveImpl implements LooseApplication, LooseArchive {
-	/**
-	 * @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.eINSTANCE.getLooseApplication();
-	}
-
-	/**
-	 * @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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP, msgs);
-				case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES :
-					return ((InternalEList) getLooseArchives()).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 LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP :
-					return eBasicSetContainer(null, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP, msgs);
-				case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES :
-					return ((InternalEList) getLooseArchives()).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 LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP :
-					return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.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 LooseconfigPackage.LOOSE_APPLICATION__URI :
-				return getUri();
-			case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH :
-				return getBinariesPath();
-			case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH :
-				return getResourcesPath();
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP :
-				return getLooseApp();
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES :
-				return getLooseArchives();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_APPLICATION__URI :
-				setUri((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH :
-				setBinariesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH :
-				setResourcesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP :
-				setLooseApp((LooseApplication) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES :
-				getLooseArchives().clear();
-				getLooseArchives().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_APPLICATION__URI :
-				setUri(URI_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH :
-				setBinariesPath(BINARIES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH :
-				setResourcesPath(RESOURCES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP :
-				setLooseApp((LooseApplication) null);
-				return;
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES :
-				getLooseArchives().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_APPLICATION__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH :
-				return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath);
-			case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH :
-				return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath);
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP :
-				return getLooseApp() != null;
-			case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES :
-				return looseArchives != null && !looseArchives.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	public boolean isEAR() {
-		return true;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseArchiveImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseArchiveImpl.java
deleted file mode 100644
index 0449059..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseArchiveImpl.java
+++ /dev/null
@@ -1,335 +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.looseconfig.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-
-public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObject {
-	/**
-	 * 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.eINSTANCE.getLooseArchive();
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLooseApp(LooseApplication newLooseApp) {
-		if (newLooseApp != eContainer || (eContainerFeatureID != LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP && newLooseApp != null)) {
-			if (EcoreUtil.isAncestor(this, newLooseApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newLooseApp != null)
-				msgs = ((InternalEObject) newLooseApp).eInverseAdd(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newLooseApp, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, 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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, 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 LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP :
-					return eBasicSetContainer(null, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, 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 LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP :
-					return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.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 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 eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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 eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		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(" (uri: "); //$NON-NLS-1$
-		result.append(uri);
-		result.append(", binariesPath: "); //$NON-NLS-1$
-		result.append(binariesPath);
-		result.append(", resourcesPath: "); //$NON-NLS-1$
-		result.append(resourcesPath);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LooseArchiveImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseConfigurationImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseConfigurationImpl.java
deleted file mode 100644
index 880a318..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseConfigurationImpl.java
+++ /dev/null
@@ -1,140 +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.looseconfig.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-
-
-public class LooseConfigurationImpl extends EObjectImpl implements LooseConfiguration, EObject {
-	/**
-	 * @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.eINSTANCE.getLooseConfiguration();
-	}
-
-	/**
-	 * @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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS :
-					return ((InternalEList) getApplications()).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 LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS :
-				return getApplications();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS :
-				getApplications().clear();
-				getApplications().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS :
-				getApplications().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS :
-				return applications != null && !applications.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //LooseConfigurationImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseLibraryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseLibraryImpl.java
deleted file mode 100644
index 5485f54..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseLibraryImpl.java
+++ /dev/null
@@ -1,227 +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.looseconfig.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-
-
-public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, LooseArchive {
-	/**
-	 * @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.eINSTANCE.getLooseLibrary();
-	}
-
-	/**
-	 * @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;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLooseWAR(LooseWARFile newLooseWAR) {
-		if (newLooseWAR != eContainer || (eContainerFeatureID != LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR && newLooseWAR != null)) {
-			if (EcoreUtil.isAncestor(this, newLooseWAR))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newLooseWAR != null)
-				msgs = ((InternalEObject) newLooseWAR).eInverseAdd(this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseWARFile.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject) newLooseWAR, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, 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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP, msgs);
-				case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, 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 LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP :
-					return eBasicSetContainer(null, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP, msgs);
-				case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR :
-					return eBasicSetContainer(null, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, 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 LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP :
-					return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs);
-				case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR :
-					return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseWARFile.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 LooseconfigPackage.LOOSE_LIBRARY__URI :
-				return getUri();
-			case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH :
-				return getBinariesPath();
-			case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH :
-				return getResourcesPath();
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP :
-				return getLooseApp();
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR :
-				return getLooseWAR();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_LIBRARY__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH :
-				return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath);
-			case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH :
-				return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath);
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP :
-				return getLooseApp() != null;
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR :
-				return getLooseWAR() != 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 LooseconfigPackage.LOOSE_LIBRARY__URI :
-				setUri((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH :
-				setBinariesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH :
-				setResourcesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP :
-				setLooseApp((LooseApplication) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR :
-				setLooseWAR((LooseWARFile) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_LIBRARY__URI :
-				setUri(URI_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH :
-				setBinariesPath(BINARIES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH :
-				setResourcesPath(RESOURCES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP :
-				setLooseApp((LooseApplication) null);
-				return;
-			case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR :
-				setLooseWAR((LooseWARFile) null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-} //LooseLibraryImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseModuleImpl.java
deleted file mode 100644
index b9463c4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseModuleImpl.java
+++ /dev/null
@@ -1,237 +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.looseconfig.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-
-public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, LooseArchive {
-	/**
-	 * 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.eINSTANCE.getLooseModule();
-	}
-
-	/**
-	 * @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 NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_MODULE__LOOSE_APP, 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 LooseconfigPackage.LOOSE_MODULE__LOOSE_APP :
-					return eBasicSetContainer(null, LooseconfigPackage.LOOSE_MODULE__LOOSE_APP, 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 LooseconfigPackage.LOOSE_MODULE__LOOSE_APP :
-					return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.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 LooseconfigPackage.LOOSE_MODULE__URI :
-				return getUri();
-			case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH :
-				return getBinariesPath();
-			case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH :
-				return getResourcesPath();
-			case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP :
-				return getLooseApp();
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD :
-				return getAltDD();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_MODULE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH :
-				return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath);
-			case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH :
-				return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath);
-			case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP :
-				return getLooseApp() != null;
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD :
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_MODULE__URI :
-				setUri((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH :
-				setBinariesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH :
-				setResourcesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP :
-				setLooseApp((LooseApplication) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD :
-				setAltDD((String) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_MODULE__URI :
-				setUri(URI_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH :
-				setBinariesPath(BINARIES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH :
-				setResourcesPath(RESOURCES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP :
-				setLooseApp((LooseApplication) null);
-				return;
-			case LooseconfigPackage.LOOSE_MODULE__ALT_DD :
-				setAltDD(ALT_DD_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(" (altDD: "); //$NON-NLS-1$
-		result.append(altDD);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LooseModuleImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseWARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseWARFileImpl.java
deleted file mode 100644
index 7aa670b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseWARFileImpl.java
+++ /dev/null
@@ -1,236 +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.looseconfig.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.EStructuralFeature;
-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.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-
-
-public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, LooseModule {
-	/**
-	 * @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.eINSTANCE.getLooseWARFile();
-	}
-
-	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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP :
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP, msgs);
-				case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS :
-					return ((InternalEList) getLooseLibs()).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 LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP :
-					return eBasicSetContainer(null, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP, msgs);
-				case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS :
-					return ((InternalEList) getLooseLibs()).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 LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP :
-					return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.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 LooseconfigPackage.LOOSE_WAR_FILE__URI :
-				return getUri();
-			case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH :
-				return getBinariesPath();
-			case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH :
-				return getResourcesPath();
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP :
-				return getLooseApp();
-			case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD :
-				return getAltDD();
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS :
-				return getLooseLibs();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__URI :
-				setUri((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH :
-				setBinariesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH :
-				setResourcesPath((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP :
-				setLooseApp((LooseApplication) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD :
-				setAltDD((String) newValue);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS :
-				getLooseLibs().clear();
-				getLooseLibs().addAll((Collection) newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__URI :
-				setUri(URI_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH :
-				setBinariesPath(BINARIES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH :
-				setResourcesPath(RESOURCES_PATH_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP :
-				setLooseApp((LooseApplication) null);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD :
-				setAltDD(ALT_DD_EDEFAULT);
-				return;
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS :
-				getLooseLibs().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case LooseconfigPackage.LOOSE_WAR_FILE__URI :
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH :
-				return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath);
-			case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH :
-				return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath);
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP :
-				return getLooseApp() != null;
-			case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD :
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-			case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS :
-				return looseLibs != null && !looseLibs.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //LooseWARFileImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigFactoryImpl.java
deleted file mode 100644
index 6ed7676..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigFactoryImpl.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.commonarchivecore.internal.looseconfig.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-
-
-public class LooseconfigFactoryImpl extends EFactoryImpl implements LooseconfigFactory, EFactory {
-	/**
-	 * @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"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * @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/internal/looseconfig/impl/LooseconfigPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java
deleted file mode 100644
index 6de7641..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java
+++ /dev/null
@@ -1,349 +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.looseconfig.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-
-
-/**
- * @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 EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LooseconfigPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		JcaPackageImpl.init();
-		Webservice_clientPackageImpl.init();
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-		CommonPackageImpl.init();
-		ClientPackageImpl.init();
-		WebapplicationPackageImpl.init();
-		EjbPackageImpl.init();
-		JspPackageImpl.init();
-		ApplicationPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		CommonarchivePackageImpl theCommonarchivePackage = (CommonarchivePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) : CommonarchivePackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theLooseconfigPackage.createPackageContents();
-		theCommonarchivePackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theLooseconfigPackage.initializePackageContents();
-		theCommonarchivePackage.initializePackageContents();
-
-		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.getEReferences().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.getEAttributes().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLooseArchive_BinariesPath() {
-		return (EAttribute) looseArchiveEClass.getEAttributes().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLooseArchive_ResourcesPath() {
-		return (EAttribute) looseArchiveEClass.getEAttributes().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLooseArchive_LooseApp() {
-		return (EReference) looseArchiveEClass.getEReferences().get(0);
-	}
-
-	/**
-	 * @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.getEReferences().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.getEReferences().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.getEAttributes().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.getEReferences().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);
-
-		// Add supertypes to classes
-		looseApplicationEClass.getESuperTypes().add(this.getLooseArchive());
-		looseLibraryEClass.getESuperTypes().add(this.getLooseArchive());
-		looseModuleEClass.getESuperTypes().add(this.getLooseArchive());
-		looseWARFileEClass.getESuperTypes().add(this.getLooseModule());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(looseApplicationEClass, LooseApplication.class, "LooseApplication", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getLooseApplication_LooseArchives(), this.getLooseArchive(), this.getLooseArchive_LooseApp(), "looseArchives", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(looseArchiveEClass, LooseArchive.class, "LooseArchive", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getLooseArchive_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEAttribute(getLooseArchive_BinariesPath(), ecorePackage.getEString(), "binariesPath", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEAttribute(getLooseArchive_ResourcesPath(), ecorePackage.getEString(), "resourcesPath", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-		initEReference(getLooseArchive_LooseApp(), this.getLooseApplication(), this.getLooseApplication_LooseArchives(), "looseApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		addEOperation(looseArchiveEClass, ecorePackage.getEBoolean(), "isModule"); //$NON-NLS-1$
-
-		initEClass(looseLibraryEClass, LooseLibrary.class, "LooseLibrary", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getLooseLibrary_LooseWAR(), this.getLooseWARFile(), this.getLooseWARFile_LooseLibs(), "looseWAR", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(looseModuleEClass, LooseModule.class, "LooseModule", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getLooseModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(looseConfigurationEClass, LooseConfiguration.class, "LooseConfiguration", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getLooseConfiguration_Applications(), this.getLooseApplication(), null, "applications", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-
-		initEClass(looseWARFileEClass, LooseWARFile.class, "LooseWARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getLooseWARFile_LooseLibs(), this.getLooseLibrary(), this.getLooseLibrary_LooseWAR(), "looseLibs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$
-	}
-} //LooseconfigPackageImpl
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigAdapterFactory.java
deleted file mode 100644
index 5bb720c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigAdapterFactory.java
+++ /dev/null
@@ -1,168 +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.looseconfig.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.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.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 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 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/internal/looseconfig/util/LooseconfigSwitch.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigSwitch.java
deleted file mode 100644
index 5e1933e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigSwitch.java
+++ /dev/null
@@ -1,156 +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.looseconfig.util;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.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) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case LooseconfigPackage.LOOSE_APPLICATION : {
-					LooseApplication looseApplication = (LooseApplication) theEObject;
-					Object result = caseLooseApplication(looseApplication);
-					if (result == null)
-						result = caseLooseArchive(looseApplication);
-					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 = 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 = defaultCase(theEObject);
-					return result;
-				}
-				case LooseconfigPackage.LOOSE_CONFIGURATION : {
-					LooseConfiguration looseConfiguration = (LooseConfiguration) theEObject;
-					Object result = caseLooseConfiguration(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 = defaultCase(theEObject);
-					return result;
-				}
-				default :
-					return defaultCase(theEObject);
-			}
-		}
-		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;
-	}
-
-	/**
-	 * @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/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 64e5916..0000000
--- 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 aa51be7..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("Application_Client_Jar_Fil"), J2EEConstants.APP_CLIENT_DD_URI); //$NON-NLS-1$ = "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 263ad14..0000000
--- 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 8352490..0000000
--- 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 b7587d0..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 b6549c3..0000000
--- 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 4ce76d8..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfigRegister;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-/**
- * 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 634c1d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java
+++ /dev/null
@@ -1,244 +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.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.looseconfig.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-
-
-/**
- * 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;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.io.InputStream getInputStream(java.lang.String uri) throws IOException, FileNotFoundException {
-		return new FileInputStream(getFileNameFrom(uri));
-	}
-
-	/**
-	 * Returns a relative uri from the java.io.File, to be used for a file entry; the separator will
-	 * be the zip standard (forward slash ("/")).
-	 */
-
-	protected String getURIFrom(File aFile) {
-		String name = ""; //$NON-NLS-1$
-		String relative = null;
-		String root = getDirectoryUriAsZipString();
-		try {
-			name = aFile.getCanonicalPath();
-			relative = makeRelative(name, root);
-		} catch (IOException iox) {
-			name = null;
-		}
-		if (relative == null) {
-			name = aFile.getAbsolutePath();
-			relative = makeRelative(name, root);
-		}
-		if (relative == null) {
-			name = aFile.getPath();
-			root = replaceSeparators(getDirectoryUri());
-			relative = makeRelative(name, root);
-		}
-		return relative;
-	}
-
-	private String replaceSeparators(String path) {
-		if (File.separatorChar != '/')
-			return path.replace(File.separatorChar, '/');
-		return path;
-	}
-
-	private String makeRelative(String fileName, String root) {
-		if (fileName == null || root == null)
-			return null;
-		String name = null;
-		for (; root.endsWith("/"); root = ArchiveUtil.truncateIgnoreCase(root, "/")); //$NON-NLS-1$ //$NON-NLS-2$
-		name = replaceSeparators(fileName);
-		if (name.startsWith(root))
-			name = name.substring(root.length() + 1);
-		else
-			name = null;
-		return name;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public boolean isDirectory() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public boolean isUsing(java.io.File aSystemFile) {
-		java.io.File dir = new java.io.File(getDirectoryUri());
-		return dir.equals(aSystemFile);
-	}
-
-	public void setDirectoryUri(java.lang.String newDirectoryUri) {
-		directoryUri = newDirectoryUri;
-	}
-
-	public void setDirectoryUriAsZipString(java.lang.String newDirectoryUriAsZipString) {
-		directoryUriAsZipString = newDirectoryUriAsZipString;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectorySaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectorySaveStrategyImpl.java
deleted file mode 100644
index dce6e70..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 cb02d19..0000000
--- 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 02913c9..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("EAR_File"), J2EEConstants.APPLICATION_DD_URI); //$NON-NLS-1$ = "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 cc944cf..0000000
--- 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 ae03129..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("EJB_Jar_File"), J2EEConstants.EJBJAR_DD_URI); //$NON-NLS-1$ = "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 46bdf49..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 b1d85cc..0000000
--- 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 1746173..0000000
--- 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 81a7037..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
+++ /dev/null
@@ -1,148 +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.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.internal.looseconfig.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 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 0b42d60..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
+++ /dev/null
@@ -1,557 +0,0 @@
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-/*
- * Licensed Material - Property of IBM 
- * (C) Copyright IBM Corp. 2002 - All Rights Reserved. 
- * US Government Users Restricted Rights - Use, duplication or disclosure 
- * restricted by GSA ADP Schedule Contract with IBM Corp. 
- */
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-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.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.looseconfig.LooseArchive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfigRegister;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResouceFactorySaxRegistry;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryDomRegistry;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-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;
-
-	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);
-	}
-
-	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 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 {
-		close();
-	}
-
-	/**
-	 * @see LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws FileNotFoundException {
-		throw new FileNotFoundException(CommonArchiveResourceHandler.getString("Absolute_path_unknown_EXC_")); //$NON-NLS-1$ = "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 = null;
-		return files;
-	}
-
-	protected void collectFilesFromLooseArchives() {
-		if (!canHaveLooseChildren() || getLooseArchive() == null) {
-			collectedLooseArchiveFiles = Collections.EMPTY_MAP;
-			return;
-		}
-
-		collectedLooseArchiveFiles = new HashMap();
-		List children = LooseConfigRegister.singleton().getLooseChildren(getLooseArchive());
-
-		for (int i = 0; i < children.size(); i++) {
-			LooseArchive loose = (LooseArchive) children.get(i);
-			String uri = loose.getUri();
-			if (!collectedLooseArchiveFiles.containsKey(uri)) {
-				Archive archive = openNestedArchive(loose);
-				if (archive != null) {
-					collectedLooseArchiveFiles.put(uri, archive);
-					archive.setLoadingContainer(getContainer());
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public abstract InputStream getInputStream(String uri) throws IOException, FileNotFoundException;
-
-	public InputStream getResourceInputStream(String uri) throws IOException {
-		return getResourceSet().getURIConverter().createInputStream(URI.createURI(uri));
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive returns an immutable collection of the loaded
-	 *      resources in the resource set
-	 */
-	public Collection getLoadedMofResources() {
-		Collection resources = getResourceSet().getResources();
-		if (resources.isEmpty())
-			return Collections.EMPTY_LIST;
-
-		List result = new ArrayList(resources.size());
-		Iterator iter = resources.iterator();
-		while (iter.hasNext()) {
-			Resource res = (Resource) iter.next();
-			if (res.isLoaded())
-				result.add(res);
-		}
-		return result;
-	}
-
-	/**
-	 * @see com.ibm.etools.commonarchive.Archive
-	 */
-	public Resource getMofResource(String uri) throws FileNotFoundException, ResourceLoadException {
-		try {
-			return getResourceSet().getResource(URI.createURI(uri), true);
-		} catch (WrappedException wrapEx) {
-			if ((ExtendedEcoreUtil.getFileNotFoundDetector().isFileNotFound(wrapEx))) {
-				FileNotFoundException fileNotFoundEx = ExtendedEcoreUtil.getInnerFileNotFoundException(wrapEx);
-				throw fileNotFoundEx;
-			}
-			throwResourceLoadException(uri, wrapEx);
-			return null; //never happens - compiler expects it though
-		}
-	}
-
-	protected void initializeResourceSet() {
-		//Not the best design here, because a load strategy should only know
-		// about
-		//container; however, this method will only get called when the
-		// container
-		//is an archive
-		Archive archive = (Archive) getContainer();
-		URIConverter converter = new ArchiveURIConverterImpl(archive, primGetResourcesPath());
-		ResourceSet rs = new ResourceSetImpl();
-		Resource.Factory.Registry reg = createResourceFactoryRegistry();
-		rs.setResourceFactoryRegistry(reg);
-		setResourceSet(rs);
-		rs.setURIConverter(converter);
-		if (archive.shouldUseJavaReflection()) {
-			rs.getAdapterFactories().add(new JavaJDKAdapterFactory());
-			archive.initializeClassLoader();
-		}
-	}
-
-	protected Resource.Factory.Registry createResourceFactoryRegistry() {
-		if (isReadOnly())
-			return new J2EEResouceFactorySaxRegistry();
-
-		Resource.Factory.Registry registry = null;
-		switch (getRendererType()) {
-			case ArchiveOptions.SAX :
-				registry = new J2EEResouceFactorySaxRegistry();
-				break;
-			case ArchiveOptions.DOM :
-				registry = new J2EEResourceFactoryDomRegistry();
-				break;
-			case ArchiveOptions.DEFAULT :
-			default :
-				registry = new J2EEResourceFactoryRegistry();
-				break;
-		}
-		return registry;
-	}
-
-	/**
-	 * @return
-	 */
-	public int getRendererType() {
-		return rendererType;
-	}
-
-	protected boolean isArchive(String uri) {
-		return ((Archive) getContainer()).isNestedArchive(uri);
-	}
-
-	/**
-	 * An archive uses a custom class loader for java reflection within a mof resourceSet;
-	 * implementers of LoadStrategy may supply a mof resourceSet for which this class loader is not
-	 * necessary, or could even cause breakage; this test gives the strategy the chance to "opt out"
-	 * of the class loading game
-	 */
-	public boolean isClassLoaderNeeded() {
-		return true;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy The default is false
-	 */
-	public boolean isDirectory() {
-		return false;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy#getExistingMofResource(String)
-	 */
-	public Resource getExistingMofResource(String uri) {
-		return getResourceSet().getResource(URI.createURI(uri), false);
-	}
-
-	public boolean isMofResourceLoaded(java.lang.String uri) {
-		Resource res = getExistingMofResource(uri);
-		return res != null && res.isLoaded();
-	}
-
-	public boolean isOpen() {
-		return isOpen;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy return false by default; subclasses should override
-	 *      if necessary
-	 */
-	public boolean isUsing(java.io.File aSystemFile) {
-		return false;
-	}
-
-	public Resource makeMofResource(String uri, EList extent) {
-		Resource existing = getExistingMofResource(uri);
-		if (existing != null)
-			return existing;
-		return getResourceSet().createResource(URI.createURI(uri));
-	}
-
-	protected Archive openNestedArchive(String uri) {
-
-		try {
-			return ((Archive) getContainer()).openNestedArchive(uri);
-		} catch (OpenFailureException e) {
-			//Caught an exception trying to open the nested archive
-			Logger.getLogger().logError(e);
-			return null;
-		}
-
-	}
-
-	protected Archive openNestedArchive(LooseArchive loose) {
-
-		try {
-			return ((Archive) getContainer()).openNestedArchive(loose);
-		} catch (OpenFailureException e) {
-			//Caught an exception trying to open the nested archive
-			Logger.getLogger().logError(e);
-			return null;
-		}
-
-	}
-
-	public void setContainer(Container newContainer) {
-		container = newContainer;
-	}
-
-	public void setResourceSet(org.eclipse.emf.ecore.resource.ResourceSet newResourceSet) {
-		// fixes problem in reopen
-		if (resourceSet != newResourceSet) {
-
-			// remove adapter from old resource set
-			if (resourceSet != null)
-				resourceSet.eAdapters().remove(this);
-
-			// add as adapter to new resource set if necessary
-			if (newResourceSet != null && !newResourceSet.eAdapters().contains(this))
-				newResourceSet.eAdapters().add(this);
-
-			resourceSet = newResourceSet;
-		} // no need to update if old set equals new set (by reference)
-	}
-
-	protected void setIsOpen(boolean newIsOpen) {
-		isOpen = newIsOpen;
-	}
-
-	protected void throwResourceLoadException(String resourceUri, Exception ex) throws ResourceLoadException {
-		throw new ResourceLoadException(CommonArchiveResourceHandler.getString("load_resource_EXC_", (new Object[]{resourceUri, getContainer().getURI()})), ex); //$NON-NLS-1$ = "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;
-	}
-}
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 ec211da..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("Null_uri_EXC_")); //$NON-NLS-1$ = "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("nested_jar_EXC_", (new Object[]{getContainer().getURI(), getParent().getContainer().getURI()})), caughtException);//$NON-NLS-1$ = "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 5ef61c3..0000000
--- 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 87e77e3..0000000
--- 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 10c35f8..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("RAR_File"), J2EEConstants.RAR_DD_URI); //$NON-NLS-1$ = "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 cf08edb..0000000
--- 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 d3bce2c..0000000
--- 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 19549c6..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("Error_occurred_iterating_f_EXC_"), iox); //$NON-NLS-1$ = "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 54a85d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/TempZipFileLoadStrategyImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy;
-
-
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-
-
-/**
- * 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();
-		getFile().delete();
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws java.io.FileNotFoundException {
-		throw new FileNotFoundException(CommonArchiveResourceHandler.getString("Absolute_path_unknown_EXC_")); //$NON-NLS-1$ = "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 2120efc..0000000
--- 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 3d14872..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.getString("WAR_File"), J2EEConstants.WEBAPP_DD_URI); //$NON-NLS-1$ = "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 f36bfe0..0000000
--- 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 2c03dbf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipFileLoadStrategyImpl.java
+++ /dev/null
@@ -1,153 +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.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-
-
-/**
- * Implementer that knows how to read files from a zip/jar file on the local file system
- * 
- * @see LoadStrategy
- */
-
-public class ZipFileLoadStrategyImpl extends LoadStrategyImpl {
-	protected java.io.File file;
-	protected ZipFile zipFile;
-
-	/**
-	 * ZipFileLoadStrategy constructor comment.
-	 */
-	public ZipFileLoadStrategyImpl() {
-		super();
-	}
-
-	/**
-	 * ZipFileLoadStrategy constructor comment.
-	 */
-	public ZipFileLoadStrategyImpl(java.io.File file) throws IOException {
-		super();
-		setFile(file);
-		setZipFile(new ZipFile(file));
-	}
-
-	public void close() {
-		super.close();
-		try {
-			getZipFile().close();
-		} catch (Throwable t) {
-			//Ignore
-		}
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	protected boolean primContains(java.lang.String uri) {
-		return getZipFile().getEntry(uri) != null;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public java.lang.String getAbsolutePath() throws java.io.FileNotFoundException {
-		return getFile().getAbsolutePath();
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/20/00 4:40:14 PM)
-	 * 
-	 * @return java.io.File
-	 */
-	public java.io.File getFile() {
-		return file;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.util.List getFiles() {
-		List list = new ArrayList();
-		Enumeration entries = getZipFile().entries();
-		while (entries.hasMoreElements()) {
-			ZipEntry entry = (ZipEntry) entries.nextElement();
-			if (!entry.isDirectory() && !collectedLooseArchiveFiles.containsKey(entry.getName())) {
-				File aFile = createFile(entry.getName());
-				aFile.setSize(entry.getSize());
-				aFile.setLastModified(entry.getTime());
-				list.add(aFile);
-			}
-		}
-		return list;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.impl.LoadStrategyImpl
-	 */
-	public java.io.InputStream getInputStream(java.lang.String uri) throws IOException, FileNotFoundException {
-		try {
-			ZipEntry entry = getZipFile().getEntry(uri);
-			if (entry == null)
-				throw new FileNotFoundException(uri);
-
-			return new java.io.BufferedInputStream(getZipFile().getInputStream(entry));
-		} catch (IllegalStateException zipClosed) {
-			throw new IOException(zipClosed.toString());
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (11/01/00 11:28:12 AM)
-	 * 
-	 * @return java.util.zip.ZipFile
-	 */
-	public java.util.zip.ZipFile getZipFile() {
-		return zipFile;
-	}
-
-	/**
-	 * @see com.ibm.etools.archive.LoadStrategy
-	 */
-	public boolean isUsing(java.io.File aSystemFile) {
-		return getFile() != null && getFile().equals(aSystemFile);
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/20/00 4:40:14 PM)
-	 * 
-	 * @param newFile
-	 *            java.io.File
-	 */
-	public void setFile(java.io.File newFile) {
-		file = newFile;
-	}
-
-
-	/**
-	 * Insert the method's description here. Creation date: (11/01/00 11:28:12 AM)
-	 * 
-	 * @param newZipFile
-	 *            java.util.zip.ZipFile
-	 */
-	public void setZipFile(java.util.zip.ZipFile newZipFile) {
-		zipFile = newZipFile;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipStreamSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/ZipStreamSaveStrategyImpl.java
deleted file mode 100644
index 445c878..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 eb86a98..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveFileDynamicClassLoader.java
+++ /dev/null
@@ -1,188 +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.util;
-
-
-import java.io.InputStream;
-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;
-
-	public ArchiveFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-		super(parentCl);
-		setArchive(anArchive);
-		setExtraClassLoader(extraCl);
-		inEARFile = anArchive.getContainer() != null && anArchive.getContainer().isEARFile();
-	}
-
-	/**
-	 * Loads a specified class. This gets called only after the parent class loader has had it's
-	 * chance, based on the Java2 delegation model
-	 */
-	protected Class findClass(String name) throws ClassNotFoundException {
-
-		Class result;
-		// Load class bytes from current set of class byte[]'s
-		byte[] bytes = getClassBytesFor(name);
-
-		if (bytes != null) {
-			result = defineClass(name, bytes, 0, bytes.length);
-			if (result == null) {
-				throw new ClassNotFoundException(name);
-			} // endif
-		} else {
-			throw new ClassNotFoundException(name);
-		} // endif
-		return result;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (12/17/00 9:59:57 PM)
-	 * 
-	 * @return com.ibm.etools.commonarchive.Archive
-	 */
-	public Archive getArchive() {
-		return archive;
-	}
-
-	protected byte[] getClassBytesFor(String className) {
-
-		if (className == null)
-			return null;
-		// Change the class name to a jar entry name
-		String jarEntryName = ArchiveUtil.classNameToUri(className);
-
-		try {
-			InputStream in = getArchive().getInputStream(jarEntryName);
-			return ArchiveUtil.inputStreamToBytes(in);
-		} catch (java.io.FileNotFoundException ex) {
-			return null;
-		} catch (java.io.IOException ex) {
-			throw new ArchiveRuntimeException(CommonArchiveResourceHandler.getString("io_ex_loading_EXC_", (new Object[]{className})), ex); //$NON-NLS-1$ = "An IO exception occurred loading "
-		}
-	}
-
-	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) throws ClassNotFoundException {
-
-		Set visitedArchives = new HashSet(5);
-		visitedArchives.add(getArchive());
-		return loadClassInDependentJarInEAR(name, visitedArchives);
-	}
-
-	protected Class loadClassInDependentJarInEAR(String name, Set visitedArchives) throws ClassNotFoundException {
-
-		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 file = getEARFile().getFile(uri);
-				if (file.isArchive()) {
-					Archive dep = (Archive) file;
-					try {
-						return ((ArchiveFileDynamicClassLoader) dep.getArchiveClassLoader()).loadClass(name, visitedArchives);
-					} catch (ClassNotFoundException noDice) {
-						continue;
-					}
-				}
-			} catch (java.io.FileNotFoundException depJarNotInEAR) {
-				//Ignore
-			}
-		}
-		throw new ClassNotFoundException(name);
-	}
-
-	/**
-	 * 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;
-	}
-}
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 9f4c32e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/ArchiveUtil.java
+++ /dev/null
@@ -1,865 +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.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.StringTokenizer;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.URIMappingRegistryImpl;
-import org.eclipse.jem.java.JavaURL;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.EmptyResourceException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveURIConverterImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.xml.GeneralXmlDocumentReader;
-import org.eclipse.jst.j2ee.internal.xml.XmlDocumentReader;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-
-/**
- * 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$
-
-	protected static boolean isRuntime = false;
-
-	/**
-	 * Flag to indicate whether the temp directory should be used for extracting nested jars for
-	 * read; defaults to true
-	 */
-	protected static boolean shouldUseTempDirectoryForRead = true;
-
-	/**
-	 * Settable name for the temp directory; must resolve to a valid file on the file system; if not
-	 * specified, defaults to the system temp directory
-	 */
-	protected static String tempDirectoryName;
-
-	protected static java.io.File tempDirectory;
-
-	public static String classNameToJavaUri(String className) {
-		return className.replace('.', '/').concat(DOT_JAVA);
-	}
-
-	public static String classNameToUri(String className) {
-		return className.replace('.', '/').concat(DOT_CLASS);
-	}
-
-	/**
-	 * For a given uri of a .class file, derive the uri of the .java file; takes into consideration
-	 * inner classes by splitting on the first occurrence of '$'
-	 * 
-	 * @return String a uri or null if the input is null or doesn't end with ".class"
-	 */
-	public static String classUriToJavaUri(String classUri) {
-		if (classUri == null || !classUri.endsWith(DOT_CLASS))
-			return null;
-
-		String truncated = truncateIgnoreCase(classUri, DOT_CLASS);
-		StringTokenizer tok = new StringTokenizer(truncated, "$"); //$NON-NLS-1$
-		return tok.nextToken().concat(DOT_JAVA);
-	}
-
-	/**
-	 * Concatenates the two strings with a separator, if necessary
-	 */
-	public static String concatUri(String directoryname, String filename, char separator) {
-		String uri = directoryname;
-		if (!directoryname.endsWith(separator + "") && !filename.startsWith(separator + "")) //$NON-NLS-2$//$NON-NLS-1$
-			uri = uri + separator;
-		return uri + filename;
-	}
-
-	/**
-	 * Copy all the data from the input stream to the output stream up until the first end of file
-	 * character, and close the two streams
-	 */
-	public static void copy(InputStream in, OutputStream out) throws IOException {
-		byte[] buffer = new byte[1024];
-		try {
-			int n = in.read(buffer);
-			while (n > 0) {
-				out.write(buffer, 0, n);
-				n = in.read(buffer);
-			}
-		} finally {
-			if (!(in instanceof ZipInputStream))
-				in.close();
-			if (!(out instanceof ZipOutputStream))
-				out.close();
-		}
-	}
-
-	public static File createTempDirectory(String baseName, File parentDirectory) throws IOException {
-
-		File tempFile = createTempFile(baseName, parentDirectory);
-		tempFile.delete();
-		tempFile.mkdir();
-		return tempFile;
-	}
-
-	public static File createTempFile(String baseName) throws IOException {
-		return createTempFile(baseName, getTempDirectory());
-	}
-
-	public static File createTempFile(String baseName, File directory) throws IOException {
-		String fileName = getFileNameTail(baseName);
-		if (fileName.length() < 3) {
-			fileName = "WSTMP" + fileName; //$NON-NLS-1$
-		}
-		File tempFile = File.createTempFile(fileName, null, directory);
-		return tempFile;
-	}
-
-	/**
-	 * deletes a file from the file system; for directories, recurse the subdirectories and delete
-	 * them as well
-	 * 
-	 * @return true if successful; false if any file or sub file could not be deleted
-	 */
-	public static boolean delete(File aFile) {
-		if (aFile.isDirectory()) {
-			File[] files = aFile.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				if (!delete(files[i]))
-					return false;
-			}
-		}
-		return aFile.delete();
-	}
-
-	/**
-	 * returns a list of all files, recursive, that can't be written
-	 */
-	public static List getWriteProtectedFiles(File aFile, List aList) {
-		if (aList == null)
-			aList = new ArrayList();
-		if (aFile.exists() && !aFile.canWrite())
-			aList.add(aFile);
-		if (aFile.isDirectory()) {
-			File[] files = aFile.listFiles();
-			for (int i = 0; i < files.length; i++) {
-				getWriteProtectedFiles(files[i], aList);
-			}
-		}
-		return aList;
-	}
-
-	/**
-	 * Leverage the java.io.File apis to resolve things like "./xxx" and "../xxx" into uris of
-	 * entries in the ear file
-	 * 
-	 * @param classpathEntry -
-	 *            a classpath entry from the manifest of
-	 * @anArchive
-	 * @param anArchive -
-	 *            the archive to which the dependent jar is relative
-	 * 
-	 * @return a cananonicalized relative uri of an entry in an ear file representing the dependent
-	 *         jar
-	 */
-	public static String deriveEARRelativeURI(String classpathEntry, Archive anArchive) {
-		return deriveEARRelativeURI(classpathEntry, anArchive.getURI());
-	}
-
-	/**
-	 * Leverage the java.io.File apis to resolve things like "./xxx" and "../xxx" into uris of
-	 * entries in the ear file
-	 * 
-	 * @param classpathEntry -
-	 *            a classpath entry from the manifest of an archive
-	 * @param String -
-	 *            the uri of the archive to which the dependent jar is relative
-	 * 
-	 * @return a cananonicalized relative uri of an entry in an ear file representing the dependent
-	 *         jar
-	 */
-	public static String deriveEARRelativeURI(String classpathEntry, String archiveUri) {
-		try {
-			String parent = getFileNameParent(archiveUri);
-			if (parent == null || parent.equals("")) //$NON-NLS-1$
-				parent = "."; //$NON-NLS-1$
-			String workingDir = new java.io.File(".").getCanonicalPath(); //$NON-NLS-1$
-
-			String resolvedPath = new java.io.File(parent, classpathEntry).getCanonicalPath();
-			if (!resolvedPath.startsWith(workingDir))
-				return null;
-			if (resolvedPath.equals(workingDir))
-				return null;
-			int start = workingDir.endsWith(java.io.File.separator) ? workingDir.length() : workingDir.length() + 1;
-			return resolvedPath.substring(start, resolvedPath.length()).replace(java.io.File.separatorChar, '/');
-		} catch (java.io.IOException ex) {
-			//getCanonicalPath could throw this
-			return null;
-		}
-	}
-
-	/**
-	 * Return "" if there is no extension
-	 */
-	public static String getFileNameExtension(String uri) {
-
-		if (uri != null) {
-			int index = uri.lastIndexOf("."); //$NON-NLS-1$
-			if (index != -1)
-				return uri.substring(index + 1);
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the directory from the uri, or the truncation of the segment after the last
-	 * occurrence of a separator
-	 */
-	public static String getFileNameParent(String uri) {
-		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.getString("A_Application_file"); //$NON-NLS-1$
-			case XMLResource.APP_CLIENT_TYPE :
-				return CommonArchiveResourceHandler.getString("An_Application_Client_JAR_file"); //$NON-NLS-1$
-			case XMLResource.EJB_TYPE :
-				return CommonArchiveResourceHandler.getString("An_EJB_JAR_file"); //$NON-NLS-1$
-			case XMLResource.WEB_APP_TYPE :
-				return CommonArchiveResourceHandler.getString("A_WAR_file"); //$NON-NLS-1$
-			case XMLResource.RAR_TYPE :
-				return CommonArchiveResourceHandler.getString("A_RAR_file"); //$NON-NLS-1$
-		}
-		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("make_temp_dir_EXC_", (new Object[]{newTempDirectoryName}))); //$NON-NLS-1$ = "Unable to make temp directory: "
-			dir.deleteOnExit();
-		}
-		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("invalid_classpath_WARN_", (new Object[]{pathEntry}))); //$NON-NLS-1$ = "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(); //$NON-NLS-1$
-				urls.add(aUrl);
-			} catch (java.net.MalformedURLException ex) {
-				inform(CommonArchiveResourceHandler.getString("invalid_cp_file_WARN_", (new Object[]{pathEntry}))); //$NON-NLS-1$ = "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)) {
-				version = J2EEVersionConstants.J2EE_1_3_ID;
-			} else if (publicID.equals(J2EEConstants.APPLICATION_PUBLICID_1_2) && systemID.equals(J2EEConstants.APPLICATION_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)) {
-				version = J2EEVersionConstants.EJB_2_0_ID;
-			} else if (publicID.equals(J2EEConstants.EJBJAR_PUBLICID_1_1) && systemID.equals(J2EEConstants.EJBJAR_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)) {
-				version = J2EEVersionConstants.J2EE_1_3_ID;
-			} else if (publicID.equals(J2EEConstants.APP_CLIENT_PUBLICID_1_2) && systemID.equals(J2EEConstants.APP_CLIENT_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)) {
-				version = J2EEVersionConstants.WEB_2_3_ID;
-			} else if (publicID.equals(J2EEConstants.WEBAPP_PUBLICID_2_2) && systemID.equals(J2EEConstants.WEBAPP_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)) {
-				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 57a3738..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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.StringTokenizer;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntryImpl;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-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 19c6bef..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java
+++ /dev/null
@@ -1,381 +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.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.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 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 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 1fb6e52..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java
+++ /dev/null
@@ -1,479 +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.util;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.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;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object doSwitchGen(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case CommonarchivePackage.FILE : {
-					File file = (File) theEObject;
-					Object result = caseFile(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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = 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 = defaultCase(theEObject);
-					return result;
-				}
-				default :
-					return defaultCase(theEObject);
-			}
-		}
-		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/EARFileUtil.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/EARFileUtil.java
deleted file mode 100644
index ef6ea52..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 fbb2081..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/FileDups.java
+++ /dev/null
@@ -1,201 +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.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.StringTokenizer;
-import java.util.TreeMap;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- * 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 b7ac91a..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 a882bc9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/RarFileDynamicClassLoader.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * 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.io.InputStream;
-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.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-
-
-public class RarFileDynamicClassLoader extends ArchiveFileDynamicClassLoader {
-
-
-	public RarFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-		super(anArchive, parentCl, extraCl);
-	}
-
-	protected byte[] getClassBytesFor(String className) {
-
-		if (className == null)
-			return null;
-		// Change the class name to a jar entry name
-		List children = getRarFile().getArchiveFiles();
-		String jarEntryName = ArchiveUtil.classNameToUri(className);
-		for (int i = 0; i < children.size(); i++) {
-			try {
-				InputStream in = ((Archive) children.get(i)).getInputStream(jarEntryName);
-				return ArchiveUtil.inputStreamToBytes(in);
-			} catch (java.io.FileNotFoundException ex) {
-				continue;
-			} catch (java.io.IOException ex) {
-				throw new ArchiveRuntimeException(CommonArchiveResourceHandler.getString("io_ex_loading_EXC_", (new Object[]{className})), ex); //$NON-NLS-1$ = "An IO exception occurred loading "
-			}
-		}
-		return null;
-	}
-
-	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 1a9a84a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/WarFileDynamicClassLoader.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
- *******************************************************************************/
-/*
- * 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.io.InputStream;
-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.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-
-
-/**
- * @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 {
-
-	public WarFileDynamicClassLoader(Archive anArchive, ClassLoader parentCl, ClassLoader extraCl) {
-		super(anArchive, parentCl, extraCl);
-	}
-
-	protected byte[] getClassBytesFor(String className) {
-
-		String jarEntryName = ArchiveUtil.classNameToUri(className);
-		String swizzledName = ArchiveUtil.concatUri(ArchiveConstants.WEBAPP_CLASSES_URI, jarEntryName, '/');
-
-		try {
-			InputStream in = getWarFile().getInputStream(swizzledName);
-			return ArchiveUtil.inputStreamToBytes(in);
-		} catch (java.io.FileNotFoundException ex) {
-			//Ignore
-		} catch (java.io.IOException ex) {
-			throw new ArchiveRuntimeException(CommonArchiveResourceHandler.getString("io_ex_loading_EXC_", (new Object[]{className})), ex); //$NON-NLS-1$ = "An IO exception occurred loading "
-		}
-
-		List children = getWarFile().getLibs();
-		for (int i = 0; i < children.size(); i++) {
-			try {
-				InputStream in = ((Archive) children.get(i)).getInputStream(jarEntryName);
-				return ArchiveUtil.inputStreamToBytes(in);
-			} catch (java.io.FileNotFoundException ex) {
-				continue;
-			} catch (java.io.IOException ex) {
-				throw new ArchiveRuntimeException(CommonArchiveResourceHandler.getString("io_ex_loading_EXC_", (new Object[]{className})), ex); //$NON-NLS-1$ = "An IO exception occurred loading "
-			}
-		}
-		return super.getClassBytesFor(className);
-	}
-
-	private WARFile getWarFile() {
-		return (WARFile) getArchive();
-	}
-}
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 2ca0715..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.core"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.core" fragment="false"/><package name="org.eclipse.jst.j2ee.webservice.jaxrpcmap"></package><package name="org.eclipse.jst.j2ee.webapplication"></package><package name="org.eclipse.jst.j2ee.webservice.jaxrpcmap.impl"></package><package name="org.eclipse.jst.j2ee.webservice.wsdd"></package><package name="org.eclipse.jst.j2ee.application"></package><package name="org.eclipse.jst.j2ee.common"></package><package name="org.eclipse.jst.j2ee.jca"></package><package name="org.eclipse.jst.j2ee.ejb"></package><package name="org.eclipse.jst.j2ee.webservice.wscommon"></package><package name="org.eclipse.jst.j2ee.client"></package><package name="org.eclipse.jst.j2ee.webservice.wsclient"></package><package name="org.eclipse.jst.j2ee.taglib"></package><package name="org.eclipse.jst.j2ee.webservice"></package><package name="org.eclipse.jst.j2ee.jsp"></package><package name="org.eclipse.jst.j2ee.webservice.jaxrpcmap.util"></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 9dd1995..0000000
--- 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/applicationclientvalidation_de.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_de.properties
deleted file mode 100644
index 8b8f8c0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_de.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: Die Pr\u00fcfung ist fehlgeschlagen, weil die Anwendungsclientdatei ung\u00fcltig ist. Pr\u00fcfen Sie, ob der Implementierungsdeskriptor g\u00fcltig ist.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: Die Pr\u00fcfung ist fehlgeschlagen:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: Nicht aufl\u00f6sbare EJB-Verweise in {0};
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: Das Anwendungsclientprojekt enth\u00e4lt einen ung\u00fcltigen Implementierungsdeskriptor.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: Die URI {0} stimmt mit keiner Angabe in der Anwendungsclientdatei \u00fcberein.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: Der Implementierungsdeskriptor konnte auf Grund eines unbekannten Syntaxfehlers nicht geladen werden. Der ung\u00fcltige Abschnitt beginnt bei Zeile {0}, Spalte {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: Der Implementierungsdeskriptor konnte auf Grund eines unbekannten Syntaxfehlers nicht geladen werden. Der ung\u00fcltige Abschnitt beginnt bei Zeile {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: Der Implementierungsdeskriptor konnte auf Grund eines unbekannten Syntaxfehlers nicht geladen werden. Der ung\u00fcltige Abschnitt konnte nicht identifiziert werden.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: Die Pr\u00fcfung konnte nicht abgeschlossen werden, weil der Implementierungsdeskriptor nicht ge\u00f6ffnet werden kann.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E Die Datei application-client.xml enth\u00e4lt den doppelten Umgebungsverweis "{0}".
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E Die Dokumenttypversion "{0}" f\u00fcr die Datei application-client.xml im Projekt "{1}" muss Version "{2}" sein.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E Die Datei application-client.xml enth\u00e4lt den doppelten Enterprise-Bean-Verweis "{0}".
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E Das Hauptklassenattribut muss im Anwendungsclientmodul definiert sein.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_es.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_es.properties
deleted file mode 100644
index 77be108..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_es.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: La validaci\u00f3n ha fallado porque el archivo del cliente de aplicaciones no es v\u00e1lido. Aseg\u00farese de que el descriptor de despliegue es v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: La validaci\u00f3n ha fallado:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: Hay referencias a EJB que no pueden resolverse en {0};
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: El proyecto de cliente de aplicaciones tiene un descriptor de despliegue no v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: El URI {0} no coincide con nada del archivo del cliente de aplicaciones.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: No se ha podido cargar el descriptor de despliegue debido a un error de sintaxis desconocido. La secci\u00f3n err\u00f3nea empieza en la l\u00ednea {0}, columna {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: No se ha podido cargar el descriptor de despliegue debido a un error de sintaxis desconocido. La secci\u00f3n err\u00f3nea empieza en la l\u00ednea {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: No se ha podido cargar el descriptor de despliegue debido a un error de sintaxis desconocido. No hay informaci\u00f3n disponible que ayude a identificar la secci\u00f3n err\u00f3nea.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: No se ha podido finalizar la validaci\u00f3n porque no se puede abrir el descriptor de despliegue.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E La referencia de entorno de recurso "{0}" est\u00e1 duplicada en el archivo application-client.xml.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E La versi\u00f3n de tipo de documento "{0}" del archivo application-client.xml del proyecto "{1}" tiene que ser de la versi\u00f3n "{2}".
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E La referencia de bean de empresa "{0}" est\u00e1 duplicada en el archivo application-client.xml.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E Hay que definir el atributo Main-Class en el m\u00f3dulo de cliente de aplicaciones.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_fr.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_fr.properties
deleted file mode 100644
index 2111202..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_fr.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: Echec de la validation car le fichier du client d'application n'est pas valide. V\u00e9rifiez que le descripteur de d\u00e9ploiement est valide.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: Echec de la validation :
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: R\u00e9f\u00e9rences d''EJB non r\u00e9solubles dans {0} ;
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: Le projet du client d'application contient un descripteur de d\u00e9ploiement non valide.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: L''URI, {0}, ne correspond \u00e0 aucun \u00e9l\u00e9ment dans le fichier du client d''application.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: Le descripteur de d\u00e9ploiement n''a pas pu \u00eatre charg\u00e9 en raison d''une erreur de syntaxe inconnue. La section incorrecte commence \u00e0 la ligne {0}, colonne {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: Le descripteur de d\u00e9ploiement n''a pas pu \u00eatre charg\u00e9 en raison d''une erreur de syntaxe inconnue. La section incorrecte commence \u00e0 la ligne {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: Le descripteur de d\u00e9ploiement n'a pas pu \u00eatre charg\u00e9 en raison d'une erreur de syntaxe inconnue. Aucune information n'est disponible pour permettre l'identification de la section incorrecte.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: La validation ne peut pas se terminer car le descripteur de d\u00e9ploiement ne peut pas \u00eatre ouvert.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E R\u00e9f\u00e9rence d''environnement de ressources "{0}" en double dans le fichier application-client.xml.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E La version de type de document "{0}" du fichier application-client.xml dans le projet "{1}" n''est pas correcte ; la version "{2}" est requise.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E R\u00e9f\u00e9rence de bean enterprise "{0}" en double dans le fichier application-client.xml.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E L'attribut Main-Class doit \u00eatre d\u00e9fini dans le module du client d'application.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_it.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_it.properties
deleted file mode 100644
index f9b8f57..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_it.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: convalida non riuscita. Il file Client di applicazioni non \u00e8 valido. Verificare che il descrittore di distribuzione sia valido.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: convalida non riuscita:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: riferimenti EJB non risolvibili in {0};
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: il progetto Client di applicazioni utilizza un descrittore di distribuzione non valido.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: l''URI {0} non corrisponde ad alcun elemento nel file del Client di applicazioni.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: impossibile caricare il descrittore di distribuzione a causa di un errore di sintassi sconosciuta. La sezione problematica inizia alla riga {0}, colonna {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: impossibile caricare il descrittore di distribuzione a causa di un errore di sintassi sconosciuta. La sezione problematica inizia alla riga {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: impossibile caricare il descrittore di distribuzione a causa di un errore di sintassi sconosciuta. Non sono disponibili informazioni che consentano di identificare la sezione problematica.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: impossibile completare la convalida. Il descrittore di distribuzione non pu\u00f2 essere aperto.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E Riferimento ambiente risorsa duplicato "{0}" in application-client.xml.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E La versione del tipo di documento "{0}" per application-client.xml nel progetto "{1}" deve essere in versione "{2}".
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E Riferimento al bean enterprise duplicato "{0}" nel file application-client.xml.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E L''attributo Classe principale deve essere definito nel modulo Client di applicazioni.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_ja.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_ja.properties
deleted file mode 100644
index 0de23bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_ja.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: \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u304c\u7121\u52b9\u3067\u3042\u308b\u305f\u3081\u3001\u59a5\u5f53\u6027\u691c\u67fb\u304c\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u304c\u6709\u52b9\u3067\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: \u59a5\u5f53\u6027\u691c\u67fb\u5931\u6557:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: {0} \u5185\u306b\u89e3\u6c7a\u4e0d\u53ef\u80fd\u306a EJB \u53c2\u7167\u304c\u3042\u308a\u307e\u3059
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u5185\u306b\u7121\u52b9\u306a\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u304c\u3042\u308a\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: URI {0} \u306f\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u5185\u306e\u9805\u76ee\u306b\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: \u4e0d\u660e\u306a\u69cb\u6587\u30a8\u30e9\u30fc\u304c\u539f\u56e0\u3067\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e0d\u6b63\u306a\u30bb\u30af\u30b7\u30e7\u30f3\u304c {0} \u884c {1} \u5217\u304b\u3089\u59cb\u307e\u3063\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: \u4e0d\u660e\u306a\u69cb\u6587\u30a8\u30e9\u30fc\u304c\u539f\u56e0\u3067\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e0d\u6b63\u306a\u30bb\u30af\u30b7\u30e7\u30f3\u304c {0} \u884c\u304b\u3089\u59cb\u307e\u3063\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: \u4e0d\u660e\u306a\u69cb\u6587\u30a8\u30e9\u30fc\u304c\u539f\u56e0\u3067\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e0d\u6b63\u306a\u30bb\u30af\u30b7\u30e7\u30f3\u306e\u8b58\u5225\u306b\u5f79\u7acb\u3064\u60c5\u5831\u304c\u3042\u308a\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u958b\u3051\u306a\u3044\u305f\u3081\u3001\u691c\u8a3c\u304c\u5b8c\u4e86\u3057\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E application-client.xml \u5185\u3067\u30ea\u30bd\u30fc\u30b9\u74b0\u5883\u53c2\u7167 "{0}" \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{1}" \u5185\u306e application-client.xml \u306e\u6587\u66f8\u30bf\u30a4\u30d7\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3 "{0}" \u306f\u30d0\u30fc\u30b8\u30e7\u30f3 "{2}" \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E application-client.xml \u5185\u306e\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u53c2\u7167 "{0}" \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u30e1\u30a4\u30f3\u30fb\u30af\u30e9\u30b9\u5c5e\u6027\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_ko.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_ko.properties
deleted file mode 100644
index 92bf39d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_ko.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: \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 \ud30c\uc77c\uc774 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc544 \uc720\ud6a8\uc131 \uac80\uc99d\uc5d0 \uc2e4\ud328\ud588\uc2b5\ub2c8\ub2e4. \uc804\uac1c \uc124\uba85\uc790\uac00 \uc62c\ubc14\ub978\uc9c0 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: \uc720\ud6a8\uc131 \uac80\uc99d \uc2e4\ud328:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: {0}\uc5d0\uc11c \ubd84\uc11d\ud560 \uc218 \uc5c6\ub294 EJB \ucc38\uc870;
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 \ud504\ub85c\uc81d\ud2b8\uc5d0 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc804\uac1c \uc124\uba85\uc790\uac00 \uc788\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: URI {0}\uc774(\uac00) \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 \ud30c\uc77c \ub0b4\uc758 \uc5b4\ub290 \ud56d\ubaa9\uacfc\ub3c4 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: \uc54c \uc218 \uc5c6\ub294 \uad6c\ubb38 \uc624\ub958\ub85c \uc778\ud574 \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {0} \ud589, {1} \uc5f4\uc5d0\uc11c \uc798\ubabb\ub41c \uc139\uc158\uc774 \uc2dc\uc791\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: \uc54c \uc218 \uc5c6\ub294 \uad6c\ubb38 \uc624\ub958\ub85c \uc778\ud574 \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {0} \ud589\uc5d0\uc11c \uc798\ubabb\ub41c \uc139\uc158\uc774 \uc2dc\uc791\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: \uc54c \uc218 \uc5c6\ub294 \uad6c\ubb38 \uc624\ub958\ub85c \uc778\ud574 \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc798\ubabb\ub41c \uc139\uc158\uc744 \uc2dd\ubcc4\ud558\ub294 \ub370 \uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 \uc815\ubcf4\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: \uc804\uac1c \uc124\uba85\uc790\ub97c \uc5f4 \uc218 \uc5c6\uc73c\ubbc0\ub85c \uc720\ud6a8\uc131 \uac80\uc99d\uc744 \uc644\ub8cc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E application-client.xml\uc5d0\uc11c \uc911\ubcf5\ub41c \uc790\uc6d0 \ud658\uacbd \ucc38\uc870 "{0}"\uc785\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_="{1}" \ud504\ub85c\uc81d\ud2b8\uc758 application-client.xml\uc5d0 \ub300\ud55c \ubb38\uc11c \uc720\ud615 \ubc84\uc804 "{0}"\uc740(\ub294) "{2}" \ubc84\uc804\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E application-client.xml\uc5d0 "{0}" \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean \ucc38\uc870\uac00 \uc911\ubcf5\ub418\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 \ubaa8\ub4c8\uc5d0 Main-Class \uc18d\uc131\uc744 \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_pt_BR.properties
deleted file mode 100644
index 0229a06..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_pt_BR.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: A valida\u00e7\u00e3o falhou porque o arquivo do cliente do aplicativo n\u00e3o \u00e9 v\u00e1lido. Verifique se o descritor de implementa\u00e7\u00e3o \u00e9 v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: A valida\u00e7\u00e3o falhou:
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: Refer\u00eancias EJB n\u00e3o-solucion\u00e1veis em {0};
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: O projeto do cliente do aplicativo tem um descritor de implementa\u00e7\u00e3o inv\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: O URI, {0}, corresponde a nada no arquivo do cliente do aplicativo.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: O descritor de implementa\u00e7\u00e3o n\u00e3o foi carregado devido a um erro de sintaxe desconhecido. A se\u00e7\u00e3o inv\u00e1lida inicia na linha {0}, coluna {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: O descritor de implementa\u00e7\u00e3o n\u00e3o p\u00f4de ser carregado devido a um erro de sintaxe desconhecido. A se\u00e7\u00e3o inv\u00e1lida inicia na linha {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: O descritor de implementa\u00e7\u00e3o n\u00e3o p\u00f4de ser carregado devido a um erro de sintaxe desconhecido. N\u00e3o h\u00e1 informa\u00e7\u00f5es dispon\u00edveis para ajudar a identificar a se\u00e7\u00e3o inv\u00e1lida.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: A valida\u00e7\u00e3o n\u00e3o pode ser conclu\u00edda porque o descritor de implementa\u00e7\u00e3o n\u00e3o pode ser aberto.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E Refer\u00eancia de ambiente de recurso duplicada "{0}" no application-client.xml.
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E A vers\u00e3o do tipo do documento "{0}" para application-client.xml no projeto "{1}" precisa ter a vers\u00e3o "{2}".
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E Refer\u00eancia do bean corporativo "{0}" em duplicata no application-client.xml.
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E O atributo Main-Class deve ser definido no m\u00f3dulo de cliente do aplicativo.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_zh.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_zh.properties
deleted file mode 100644
index 0cf9e8a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_zh.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\uff1a\u9a8c\u8bc1\u5931\u8d25\uff0c\u539f\u56e0\u662f\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a\u6587\u4ef6\u65e0\u6548\u3002\u786e\u4fdd\u90e8\u7f72\u63cf\u8ff0\u7b26\u6709\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E\uff1a\u9a8c\u8bc1\u5931\u8d25\uff1a
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E\uff1a{0} \u4e2d\u5b58\u5728\u4e0d\u80fd\u89e3\u6790\u7684 EJB \u5f15\u7528\uff1b
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E\uff1a\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a\u9879\u76ee\u5177\u6709\u65e0\u6548\u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E\uff1aURI {0} \u4e0e\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a\u6587\u4ef6\u4e2d\u7684\u4efb\u4f55\u5185\u5bb9\u90fd\u4e0d\u5339\u914d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E\uff1a\u7531\u4e8e\u5b58\u5728\u672a\u77e5\u7684\u8bed\u6cd5\u9519\u8bef\u800c\u4e0d\u80fd\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u9519\u8bef\u90e8\u5206\u4ece\u7b2c {0} \u884c\u7b2c {1} \u5217\u5f00\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E\uff1a\u7531\u4e8e\u5b58\u5728\u672a\u77e5\u7684\u8bed\u6cd5\u9519\u8bef\u800c\u4e0d\u80fd\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u9519\u8bef\u90e8\u5206\u4ece\u7b2c {0} \u884c\u5f00\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E\uff1a\u7531\u4e8e\u5b58\u5728\u672a\u77e5\u7684\u8bed\u6cd5\u9519\u8bef\u800c\u4e0d\u80fd\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u6ca1\u6709\u4efb\u4f55\u4fe1\u606f\u53ef\u7528\u4e8e\u5e2e\u52a9\u786e\u5b9a\u9519\u8bef\u90e8\u5206\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E\uff1a\u9a8c\u8bc1\u672a\u80fd\u5b8c\u6210\uff0c\u539f\u56e0\u662f\u65e0\u6cd5\u6253\u5f00\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E application-client.xml \u4e2d\u5b58\u5728\u91cd\u590d\u7684\u8d44\u6e90\u73af\u5883\u5f15\u7528\u201c{0}\u201d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E \u9879\u76ee\u201c{1}\u201d\u4e2d application-client.xml \u7684\u6587\u6863\u7c7b\u578b\u7248\u672c\u201c{0}\u201d\u5fc5\u987b\u4e3a\u7248\u672c\u201c{2}\u201d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E application-client.xml \u4e2d\u5b58\u5728\u91cd\u590d\u7684\u4f01\u4e1a bean \u5f15\u7528\u201c{0}\u201d\u3002
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E \u5fc5\u987b\u5728\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a\u6a21\u5757\u4e2d\u5b9a\u4e49 main \u7c7b\u5c5e\u6027\u3002
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_zh_TW.properties
deleted file mode 100644
index c73cc61..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/applicationclientvalidation_zh_TW.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: \u9a57\u8b49\u5931\u6557\uff0c\u56e0\u70ba\u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef\u6a94\u6848\u7121\u6548\u3002\u8acb\u78ba\u5b9a\u90e8\u7f72\u63cf\u8ff0\u5b50\u6709\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_APPCLIENT_VALIDATION_FAILED=CHKJ1001E: \u9a57\u8b49\u5931\u6557\uff1a
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EJB_REFS=CHKJ1002E: {0} \u6709\u7121\u6cd5\u5206\u8fa8\u7684 EJB \u53c3\u7167\uff1b
-#EXPLANATION None.
-#USERACTION None.
-
-INVALID_DD=CHKJ1003E: \u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef\u5c08\u6848\u6709\u7121\u6548\u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_APPCLIENT_MISSING_URI=CHKJ1004E: URI {0} \u8207\u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef\u6a94\u6848\u4e2d\u7684\u4efb\u4f55\u9805\u76ee\u4e0d\u7b26\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINECOL=CHKJ1005E: \u90e8\u7f72\u63cf\u8ff0\u5b50\u56e0\u4e0d\u660e\u8a9e\u6cd5\u932f\u8aa4\u800c\u7121\u6cd5\u8f09\u5165\u3002\u932f\u8aa4\u5340\u6bb5\u5f9e\u7b2c {0} \u884c\u7b2c {1} \u76f4\u6b04\u958b\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_LINE=CHKJ1006E: \u90e8\u7f72\u63cf\u8ff0\u5b50\u56e0\u4e0d\u660e\u8a9e\u6cd5\u932f\u8aa4\u800c\u7121\u6cd5\u8f09\u5165\u3002\u932f\u8aa4\u5340\u6bb5\u5f9e\u7b2c {0} \u884c\u958b\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_PARSE_NOINFO=CHKJ1007E: \u90e8\u7f72\u63cf\u8ff0\u5b50\u56e0\u4e0d\u660e\u8a9e\u6cd5\u932f\u8aa4\u800c\u7121\u6cd5\u8f09\u5165\u3002\u6c92\u6709\u8cc7\u8a0a\u53ef\u5354\u52a9\u8b58\u5225\u932f\u8aa4\u7684\u5340\u6bb5\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DD_CANNOT_OPEN_DD=CHKJ1008E: \u7121\u6cd5\u5b8c\u6210\u9a57\u8b49\uff0c\u56e0\u70ba\u7121\u6cd5\u958b\u555f\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_RES_ENV_REF_ERROR_=IWAE0002E \u5728 application-client.xml \u4e2d\uff0c\u6709\u91cd\u8907\u7684\u8cc7\u6e90\u74b0\u5883\u53c3\u7167 "{0}"\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_INVALID_DOC_TYPE_ERROR_=IWAE0003E "{1}" \u5c08\u6848\u4e2d\u7684 application-client.xml \u4e4b\u6587\u4ef6\u985e\u578b\u7248\u672c "{0}" \u5fc5\u9808\u662f "{2}" \u7248\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-APPCLIENT_DUP_EJB_REF_ERROR_=IWAE0004E  application-client.xml \u4e2d\uff0c\u6709\u91cd\u8907\u7684 Enterprise Bean \u53c3\u7167 "{0}"\u3002
-APPCLIENT_MAIN_CLASS_ERROR_=IWAE0035E \u4e3b\u8981\u985e\u5225\u5c6c\u6027\u5fc5\u9808\u5b9a\u7fa9\u65bc\u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef\u6a21\u7d44\u4e2d\u3002
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 b768fa8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation.properties
+++ /dev/null
@@ -1,139 +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} is not mapped to a workbench project.  Use the application editor to correct.
-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.
-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/earvalidation_de.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_de.properties
deleted file mode 100644
index dab03e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_de.properties
+++ /dev/null
@@ -1,139 +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-Pr\u00fcfprogramm
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: EAR-Auswertung ist fehlgeschlagen: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: Das EAR-Projekt {0} ist ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Die Sicherheitsberechtigungsklasse mit dem Namen {0} ist doppelt vorhanden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: Ein Modul wurde ohne URI definiert.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: Die URI {0} stimmt mit keiner Angabe in der EAR-Datei \u00fcberein.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: Der Implementierungsdeskriptor konnte nicht geladen werden. Der ung\u00fcltige Abschnitt beginnt bei Zeile {0}, Spalte {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: Der Implementierungsdeskriptor konnte nicht geladen werden. Der ung\u00fcltige Abschnitt beginnt bei Zeile {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: Der Implementierungsdeskriptor konnte nicht geladen werden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: Der Implementierungsdeskriptor kann nicht ge\u00f6ffnet werden. Die Pr\u00fcfung kann nicht abgeschlossen werden.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E Die URI {0} enth\u00e4lt ein Leerzeichen. Dies ist nicht ratsam, da in diesem Fall keine Verweise von einer Manifestdatei m\u00f6glich sind.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E Das Modul {0} enth\u00e4lt eine doppelte URI in der EAR: {1}.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E Das Kontextstammverzeichnis "{0}" ist sowohl im Webmodul "{1}" als auch im Webmodul "{2}" vorhanden.
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E Das Modul {0} enth\u00e4lt einen leeren <alt-dd>-Tag in der EAR {1}.  Der Tag sollte entweder entfernt werden oder der Wert muss g\u00fcltig sein.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =Das Projekt {0} im Unternehmensanwendungsprojekt {1} enth\u00e4lt die doppelte Dienstprogramm-JAR-URI {2}.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E Das Projekt {0} im Unternehmensanwendungsprojekt {1} enth\u00e4lt den doppelten Modulnamen {2}.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E Das Modul {0} im Unternehmensanwendungsprojekt {1} hat denselben Namen wie die Dienstprogramm-JAR-URI.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E Das Modul {0} im Unternehmensanwendungsprojekt {1} hat denselben Namen wie das Dienstprogramm-JAR-Projekt.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E Bei der Pr\u00fcfung der Datei MANIFEST.MF im Archiv {0} ist ein Fehler aufgetreten.
-MANIFEST_LINE_END_ERROR_=IWAE0015E Die Datei MANIFEST.MF im Archiv {0} endet nicht mit einer neuen Zeile (newline).
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E Die Zeile {0} in der Datei MANIFEST.MF im Archiv {1} \u00fcberschreitet die laut Spezifikation zul\u00e4ssige Grenze von 72 Byte.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E Das Modul {0} weist eine falsche Standarderweiterung auf (.jar ist die Standarderweiterung f\u00fcr EJB-Module, .war ist die Standarderweiterung f\u00fcr Webmodule).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E Die Dokumenttypversion "{0}" f\u00fcr die Datei application.xml im Projekt "{1}" muss Version "{2}" sein.
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E Der Implementierungsdeskriptor des Moduls {0} konnte nicht geladen werden. Der ung\u00fcltige Abschnitt beginnt bei Zeile {1}, Spalte {2}.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E Der Implementierungsdeskriptor des Moduls {0} konnte nicht geladen werden. Der ung\u00fcltige Abschnitt beginnt bei Zeile {1}.
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E Der Implementierungsdeskriptor des Moduls {0} konnte nicht geladen werden.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E Die Schnittstellen der verlinkten Enterprise-Bean {0} stimmen nicht mit denen des EJB-Verweises {1} im Modul {2} \u00fcberein.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: Der Metaordner {0} muss im Projekt {1} vorhanden sein.
-WARNING_FILE_MISSING=IWAJ0001W: {0} muss im Projekt {1} vorhanden sein.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W Das Modul {0} hat ALT-dd {1}, die Ressource ist jedoch nicht in EAR {2} vorhanden.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W Der Manifestklassenpfad im Archiv {0} enth\u00e4lt einen Eintrag, der in der EAR {1} nicht aufgel\u00f6st werden kann.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W Der Manifestklassenpfad f\u00fcr das Archiv {0} enth\u00e4lt den Eintrag {1}, der nicht in eine Datei oder ein Modul in der Unternehmensanwendung {2} aufgel\u00f6st werden kann.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W Der Manifestklassenpfad im Modul {0} enth\u00e4lt den Eintrag {1}, der in das Archiv {2} aufgel\u00f6st wird.  Diese Abh\u00e4ngigkeit ist mit der J2EE-Spezifikation nicht vereinbar.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W Die EAR-Pr\u00fcfung kann nicht auf dem geschlossenen Projekt {0} ausgef\u00fchrt werden. \u00d6ffnen Sie das Projekt und wiederholen Sie den Versuch.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W Das Projekt {0} f\u00fcr Modul oder Dienstprogramm-JAR {1} im Unternehmensanwendungsprojekt {2} ist nicht im Arbeitsbereich vorhanden.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W Das Webmodul {0} im Unternehmensanwendungsprojekt {1} ist kein J2EE-Webprojekt.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W Die IBM Erweiterungsdatei im Unternehmensanwendungsprojekt {0} enth\u00e4lt veraltete absolute Pfade.  Verwenden Sie den Anwendungseditor, um die Datei zu bereinigen.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W Das Kontextstammverzeichnis f\u00fcr das Webmodul {0} im Unternehmensanwendungsprojekt {1} stimmt nicht mit dem in den Webprojekteinstellungen von {2} \u00fcberein.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W Das Anwendungsclientmodul {0} im Unternehmensanwendungsprojekt {1} ist kein Anwendungsclientprojekt.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W Das EJB-Modul {0} im Unternehmensanwendungsprojekt {1} ist kein EJB-Projekt.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W Das Modul {0} im Unternehmensanwendungsprojekt {1} ist keinem Workbenchprojekt zugeordnet.  Korrigieren Sie dies mit dem Anwendungseditor.
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E Die Schreibweise des Manifestdateinamens "{0}" im Archiv {1} ist falsch.  Der Dateiname muss dem Format "META-INF/MANIFEST.MF" entsprechen und die Gro\u00df-/Kleinschreibung beachten.
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W Die Dienstprogramm-JAR-URI {0} des Projekts ist unvertr\u00e4glich mit einer vorhandenen Datei im Projekt {1}.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E Der Anwendungserweiterung in EAR-Projekt {0} fehlt die Modulerweiterung f\u00fcr Modulprojekt {1}.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=Der Zielserver des Modulprojekts "{0}" stimmt nicht mit dem Zielserver des enthaltenden Unternehmensanwendungsprojekts "{1}" \u00fcberein
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=Das Modulprojekt "{0}" ohne Zielserver geh\u00f6rt einem Unternehmensanwendungsprojekt "{1}" an, das \u00fcber einen Zielserver verf\u00fcgt
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=Das EAR-Projekt "{0}" ohne Zielserver hat das Modulprojekt "{1}", das \u00fcber einen Zielserver verf\u00fcgt
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=Das EAR-Projekt "{0}" nach J2EE-Spezifikation 1.4 hat einen inkompatiblen Zielserver "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=Das Modulprojekt "{0}" nach J2EE-Spezifikation 1.4 hat einen inkompatiblen Zielserver "{1}"
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E Das Modul "{0}" hat eine inkompatible J2EE-Spezifikationsstufe mit derjenigen der Unternehmensanwendung "{1}".
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E Beim Ausf\u00fchren der \u00dcberpr\u00fcfung von Projekt {0} ist ein interner Fehler aufgetreten. Details entnehmen Sie bitte der Protokolldatei.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_es.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_es.properties
deleted file mode 100644
index 14f0724..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_es.properties
+++ /dev/null
@@ -1,139 +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=Validador EAR
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: La validaci\u00f3n de EAR ha fallado: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: El proyecto EAR {0} no es v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Cometido de seguridad denominado {0} duplicado.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: Se ha definido un m\u00f3dulo sin un URI.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: El URI {0} no coincide con nada del archivo EAR.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: No se ha podido cargar el descriptor de despliegue. La secci\u00f3n err\u00f3nea empieza en la l\u00ednea {0}, columna {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: No se ha podido cargar el descriptor de despliegue. La secci\u00f3n err\u00f3nea empieza en la l\u00ednea {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: No se ha podido cargar el descriptor de despliegue.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: No se puede abrir el descriptor de despliegue. La validaci\u00f3n no puede completarse.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E El URI {0} contiene un espacio. No conviene que lo tenga porque no se podr\u00e1 hacer referencia a \u00e9l desde un archivo de manifiesto.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E El m\u00f3dulo {0} tiene un URI duplicado en el EAR: {1}.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E La ra\u00edz de contexto "{0}" existe en los m\u00f3dulos Web "{1}" y "{2}".
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E El m\u00f3dulo {0} tiene un c\u00f3digo <alt-dd> vac\u00edo en EAR {1}.  Hay que quitar el c\u00f3digo o bien darle un valor v\u00e1lido.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E El proyecto {0} del proyecto de aplicaci\u00f3n de empresa {1} tiene un URI de JAR de utilidades duplicado {2}.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E El proyecto {0} del proyecto de aplicaci\u00f3n de empresa {1} tiene un nombre de m\u00f3dulo duplicado {2}.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E El m\u00f3dulo {0} del proyecto de aplicaci\u00f3n de empresa {1} tiene el mismo nombre que el URI del JAR de utilidades.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E El m\u00f3dulo {0} del proyecto de aplicaci\u00f3n de empresa {1} tiene el mismo nombre que el proyecto de JAR de utilidades.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E Se produjo un error al validar el archivo MANIFEST.MF en el archivador {0}.
-MANIFEST_LINE_END_ERROR_=IWAE0015E El archivo MANIFEST.MF del archivador {0} no acaba en un car\u00e1cter de nueva l\u00ednea.
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E La l\u00ednea {0} del archivo MANIFEST.MF del archivador {1} tiene m\u00e1s de 72 bytes, que es el l\u00edmite de la especificaci\u00f3n.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E La extensi\u00f3n predeterminada del m\u00f3dulo {0} es incorrecta (.jar para m\u00f3dulos EJB y .war para m\u00f3dulos Web).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E La versi\u00f3n de tipo de documento "{0}" del archivo application.xml del proyecto "{1}" tiene que ser de la versi\u00f3n "{2}".
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E No se ha podido cargar el descriptor de despliegue del m\u00f3dulo {0}. La secci\u00f3n err\u00f3nea empieza en la l\u00ednea {1}, columna {2}.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E No se ha podido cargar el descriptor de despliegue del m\u00f3dulo {0}. La secci\u00f3n err\u00f3nea empieza en la l\u00ednea {1}.
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E No se ha podido cargar el descriptor de despliegue del m\u00f3dulo {0}.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E Las interfaces del bean de empresa enlazado {0} no coinciden con las de la referencia EJB {1} del m\u00f3dulo {2}.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: La metacarpeta {0} debe existir en el proyecto {1}.
-WARNING_FILE_MISSING=IWAJ0001W: {0} debe existir en el proyecto {1}.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W El m\u00f3dulo {0} tiene alt-dd {1}, pero el recurso no existe en EAR {2}.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W La v\u00eda de acceso de clases del archivador {0} contiene una entrada que no puede resolverse en el EAR {1}.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W La v\u00eda de acceso de clases del manifiesto del archivador {0} contiene una entrada, {1}, que no puede resolverse en un archivo o en un m\u00f3dulo del Enterprise {2}.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W La v\u00eda de clases del manifiesto del m\u00f3dulo {0} contiene una entrada, {1}, que se resuelve en el archivador {2}.  Esta dependencia no cumple la especificaci\u00f3n J2EE.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W La validaci\u00f3n de EAR no se puede ejecutar en un proyecto cerrado: {0}. Abra el proyecto y vuelva a intentarlo.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W El proyecto {0} del m\u00f3dulo o JAR de utilidades {1} del proyecto de aplicaci\u00f3n de empresa {2} no existe en el \u00e1rea de trabajo.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W El m\u00f3dulo Web {0} del proyecto de aplicaci\u00f3n de empresa {1} no es un proyecto Web J2EE.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W El archivo de extensiones IBM del proyecto de aplicaci\u00f3n de empresa {0} contiene v\u00edas absolutas obsoletas.  Utilice el editor de aplicaciones para hacer limpieza del archivo.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W La ra\u00edz del contexto para el m\u00f3dulo Web {0} del proyecto de aplicaci\u00f3n de empresa {1} no coincide con la ra\u00edz del contexto de los valores del proyecto Web de {2}.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W El m\u00f3dulo del cliente de aplicaciones {0} del proyecto de aplicaci\u00f3n de empresa {1} no es un proyecto de cliente de aplicaciones.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W El m\u00f3dulo EJB {0} del proyecto de aplicaci\u00f3n de empresa {1} no es un proyecto EJB.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W El m\u00f3dulo {0} del proyecto de aplicaci\u00f3n de empresa {1} no est\u00e1 correlacionado con un proyecto del entorno de trabajo.  Utilice el editor de aplicaciones para corregir esta situaci\u00f3n.
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E Las may\u00fasculas/min\u00fasculas del nombre de archivo de manifiesto "{0}" en el archivador {1} son incorrectas.  El nombre del archivo debe escribirse con may\u00fasculas: META-INF/MANIFEST.MF.
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W El URI del JAR de utilidades del proyecto {0} est\u00e1 en conflicto con un archivo existente en el proyecto {1}.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E En la extensi\u00f3n de aplicaci\u00f3n del proyecto EAR {0} falta una extensi\u00f3n de m\u00f3dulo para el proyecto de m\u00f3dulo {1}.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=El servidor destino del proyecto de m\u00f3dulo "{0}" no coincide con el servidor destino del proyecto de aplicaci\u00f3n de empresa "{1}" que lo contiene.
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=El proyecto de m\u00f3dulo "{0}" sin servidor destino pertenece a un proyecto de aplicaci\u00f3n de empresa "{1}" que tiene un servidor destino.
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=El proyecto ear "{0}" sin servidor destino tiene el m\u00f3dulo de proyecto "{1}" que posee un servidor destino
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=El proyecto EAR con especificaci\u00f3n J2EE 1.4 "{0}" tiene un servidor destino incompatible "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=El proyecto de m\u00f3dulo con especificaci\u00f3n J2EE 1.4 "{0}" tiene un servidor destino incompatible "{1}".
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E El m\u00f3dulo "{0}" est\u00e1 en un nivel de especificaci\u00f3n J2EE incompatible con el nivel de la aplicaci\u00f3n de empresa "{1}".
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E Se ha producido un error interno al ejecutar la validaci\u00f3n en el proyecto:{0}, consulte el archivo de anotaciones para conocer los detalles
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_fr.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_fr.properties
deleted file mode 100644
index 3066d04..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_fr.properties
+++ /dev/null
@@ -1,139 +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=Valideur EAR
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: Echec de la validation EAR : {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: Le projet EAR {0} n''est pas valide.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: R\u00f4le de s\u00e9curit\u00e9 nomm\u00e9 {0} en double.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: Un module a \u00e9t\u00e9 d\u00e9fini sans URI.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: L''URI, {0}, ne correspond \u00e0 aucun \u00e9l\u00e9ment dans le fichier EAR.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: Le descripteur de d\u00e9ploiement n''a pas pu \u00eatre charg\u00e9. La section incorrecte commence \u00e0 la ligne {0}, colonne {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: Le descripteur de d\u00e9ploiement n''a pas pu \u00eatre charg\u00e9. La section incorrecte commence \u00e0 la ligne {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: Le descripteur de d\u00e9ploiement n'a pas pu \u00eatre charg\u00e9.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: Impossible d'ouvrir le descripteur de d\u00e9ploiement. Validation non termin\u00e9e.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E L''URI {0} contient un espace. Cela n''est pas recommand\u00e9 car l''URI ne peut alors pas \u00eatre r\u00e9f\u00e9renc\u00e9e \u00e0 partir d''un fichier de manifeste.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E Le module {0} comporte un URI en double dans le projet EAR : {1}.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E Une racine du contexte identique \u00e0 "{0}" existe dans les modules Web "{1}" et "{2}".
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E Le module {0} comporte une balise <alt-dd> vide dans le projet EAR {1}.  La balise doit \u00eatre supprim\u00e9e ou comporter une valeur valide.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E Le projet {0} du projet d''application d''entreprise {1} comporte un URI du JAR d''utilitaire en double {2}.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E Le projet {0} du projet d''application d''entreprise {1} comporte un nom de module en double {2}.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E Le module {0} du projet d''application d''entreprise {1} porte le m\u00eame nom que l''URI du JAR d''utilitaire.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E Le module {0} du projet d''application d''entreprise {1} porte le m\u00eame nom que le projet du JAR d''utilitaire.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E Une erreur s''est produite lors de la validation du fichier MANIFEST.MF dans l''archive {0}.
-MANIFEST_LINE_END_ERROR_=IWAE0015E Le fichier MANIFEST.MF de l''archive {0} ne se termine pas par une nouvelle ligne.
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E La ligne {0} du fichier MANIFEST.MF de l''archive {1} d\u00e9passe la limite de sp\u00e9cification de 72 octets.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E L''extension par d\u00e9faut du module {0} n''est pas correcte (.jar pour les modules EJB et .war pour les modules Web).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E La version du type de document "{0}" pour application.xml dans le projet "{1}" doit \u00eatre "{2}".
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E Le descripteur de d\u00e9ploiement du module {0} n''a pas pu \u00eatre charg\u00e9. La section incorrecte commence \u00e0 la ligne {1}, colonne {2}.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E Le descripteur de d\u00e9ploiement du module {0} n''a pas pu \u00eatre charg\u00e9. La section incorrecte commence \u00e0 la ligne {1}
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E Le descripteur de d\u00e9ploiement du module {0} n''a pas pu \u00eatre charg\u00e9.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E Les interfaces du bean enterprise li\u00e9 {0} ne correspondent pas \u00e0 celles de la r\u00e9f\u00e9rence d''EJB {1} dans le module {2}.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: Le m\u00e9tadossier {0} doit exister dans le projet {1}.
-WARNING_FILE_MISSING=IWAJ0001W: {0} doit exister dans le projet {1}.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W Le module {0} comporte la balise alt-dd {1}, mais la ressource n''existe pas dans le projet EAR {2}.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W Le chemin d''acc\u00e8s aux classes du fichier de manifeste dans l''archive {0} contient une entr\u00e9e ne pouvant pas \u00eatre r\u00e9solue dans le projet EAR : {1}.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W Le chemin d''acc\u00e8s aux classes du fichier de manifeste pour l''archive {0} contient une entr\u00e9e, {1}, qui ne peut pas \u00eatre r\u00e9solue en fichier ou module dans le projet d''application d''enterprise : {2}.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W Le chemin d''acc\u00e8s aux classes du fichier de manifeste dans le module {0} contient une entr\u00e9e, {1}, qui est r\u00e9solue dans l''archive {2}.  Cette d\u00e9pendance n''est pas conforme \u00e0 la sp\u00e9cification J2EE.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W La validation EAR ne peut pas \u00eatre ex\u00e9cut\u00e9e dans un projet ferm\u00e9 : {0}. Ouvrez le projet et essayez \u00e0 nouveau.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W Le projet {0} du module ou du fichier JAR d''utilitaire {1} dans le projet d''application d''entreprise {2} n''existe pas dans l''espace de travail.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W Le module Web {0} du projet d''application d''entreprise {1} n''est pas un projet Web J2EE.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W Le fichier d''extensions IBM du projet d''application d''entreprise {0} contient des chemins absolus d\u00e9conseill\u00e9s.  Utilisez l''\u00e9diteur d''application pour nettoyer le fichier.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W La racine de contexte du module web : {0} dans le projet d''application d''entreprise : {1} ne correspond pas \u00e0 celle des param\u00e8tres du projet web de {2}.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W Le module de client d''application {0} du projet d''application d''entreprise : {1} n''est pas un projet de client d''application.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W Le module EJB {0} du projet d''application d''entreprise : {1} n''est pas un projet EJB.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W Le module {0} du projet d''application d''entreprise {1} n''est pas mapp\u00e9 \u00e0 un projet de plan de travail.  Utilisez l''\u00e9diteur d''applications pour y rem\u00e9dier.
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E La casse du nom de fichier de manifeste "{0}" dans l''archive {1} n''est pas correcte.  Le nom de fichier doit \u00eatre "META-INF/MANIFEST.MF" (en majuscules).
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W L''URI du fichier JAR de l''utilitaire de projet {0} est en conflit avec un fichier existant du projet {1}.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E L''extension d''application dans le projet ear : {0} ne comporte pas d''extension de module pour le projet de module : {1}.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=Le serveur cible du projet de module "{0}" ne correspond pas \u00e0 celui du projet d''application d''entreprise "{1}" qui le contient
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=Le projet de module "{0}" sans serveur cible appartient \u00e0 un projet d''application d''entreprise "{1}" qui poss\u00e8de un serveur cible
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=Le projet ear "{0}" sans serveur cible contient un projet de module "{1}" poss\u00e9dant un serveur cible
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=Le projet EAR J2EE 1.4 "{0}" a un serveur cible incompatible "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=Le projet de module J2EE 1.4 "{0}" a un serveur cible incompatible "{1}".
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E Le module "{0}" se trouve \u00e0 un niveau de sp\u00e9cification J2EE incompatible avec l''entreprise d''application "{1}".
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E Une erreur interne est survenue lors de la validation du projet {0} ; consultez le fichier journal pour plus de d\u00e9tails
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_it.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_it.properties
deleted file mode 100644
index 00d96c2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_it.properties
+++ /dev/null
@@ -1,139 +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=Validator EAR
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: convalida EAR non riuscita: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: il progetto EAR {0} non \u00e8 valido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: ruolo di protezione duplicato con il nome {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: un modulo \u00e8 stato definito senza URI.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: l''URI {0} non corrisponde ad alcun elemento nel file EAR.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: impossibile caricare il descrittore di distribuzione. La sezione problematica inizia alla riga {0}, colonna {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: impossibile caricare il descrittore di distribuzione. La sezione problematica inizia alla riga {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: impossibile caricare il descrittore di distribuzione.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: impossibile aprire il descrittore di distribuzione. La convalida non pu\u00f2 essere completata.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E L''URI {0} contiene uno spazio. Questa condizione non \u00e8 consigliabile perch\u00e9 non potr\u00e0 essere indicato come riferimento da un file manifest.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E Il modulo {0} ha un uri duplicato nell''EAR: {1}.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E La stessa cartella principale di contesto "{0}" esiste nei moduli Web "{1}" e "{2}".
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E Il modulo {0} ha un tag <alt-dd> vuoto in EAR {1}.  \u00c8 necessario rimuovere o fornire un valore valido.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =Il progetto {0} nel progetto Enterprise Application {1} ha un URI JAR di utilit\u00e0 {2} duplicato.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E Il progetto {0} nel progetto Enterprise Application {1} ha un nome di modulo {2} duplicato.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E =Il modulo {0} nel progetto Enterprise Application {1} ha lo stesso nome dell''URI JAR di utilit\u00e0.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E =Il modulo {0} nel progetto Enterprise Application {1} ha lo stesso nome del progetto JAR di utilit\u00e0.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E Errore durante la convalida del file MANIFEST.MF nell''archivio {0}.
-MANIFEST_LINE_END_ERROR_=IWAE0015E Il file MANIFEST.MF nell''archivio {0} non termina con un ritorno a capo.
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E La riga {0} nel file MANIFEST.MF dell''archivio {1} supera il limite della specifica di 72 byte.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E Il modulo {0} ha un''estensione predefinita errata (.jar per i moduli EJB e .war per i moduli Web).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E La versione del tipo di documento "{0}" per application.xml nel progetto "{1}" deve essere in versione "{2}".
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E Impossibile caricare il descrittore di distribuzione del modulo {0}. La sezione problematica inizia alla riga {1}, colonna {2}.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E Impossibile caricare il descrittore di distribuzione del modulo {0}. La sezione non valida inizia alla riga {1}
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E Impossibile caricare il descrittore di distribuzione del modulo {0}.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E Le interfacce del bean enterprise collegato {0} non corrispondono a quelle presenti nel riferimento EJB {1} del modulo {2}.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: La cartella meta {0} deve esistere nel progetto {1}.
-WARNING_FILE_MISSING=IWAJ0001W: {0} deve esistere nel progetto {1}.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W Il modulo {0} presenta il tag alt-dd {1}, ma la risorsa non esiste nell''EAR {2}.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W Il percorso classi del manifest nell''archivio {0} contiene una voce che non pu\u00f2 essere risolta nell''EAR: {1}.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W Il percorso classi del manifest nell''archivio {0} contiene una voce, {1}, che non pu\u00f2 essere risolta in un file o un modulo nell''Enterprise: {2}.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W Il percorso classi del manifest nel modulo {0} contiene una voce, {1}, che viene risolta nell''archivio {2}.  Questa dipendenza non \u00e8 conforme alla specifica J2EE.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W Impossibile eseguire la convalida EAR sul progetto chiuso: {0}. Aprire il progetto e ritentare.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W Il progetto {0} per il modulo o il JAR di utilit\u00e0 {1} nel progetto enterprise application {2} non esiste nello spazio di lavoro.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W Il modulo Web {0} nel progetto enterprise application {1} non \u00e8 un progetto Web J2EE.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W Il file di estensioni IBM nel progetto enterprise application {0} contiene percorsi assoluti non validi.  Utilizzare l''editor dell''applicazione per cancellare il file.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W La cartella principale di contesto per il modulo Web: {0} nel progetto enterprise application: {1} non corrisponde alla cartella principale di contesto nelle impostazioni del progetto Web di {2}.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W Il modulo del client di applicazioni {0} nel progetto enterprise application:{1} non \u00e8 un progetto client di applicazioni.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W Il modulo EJB {0} nel progetto enterprise application {1} non \u00e8 un progetto EJB.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W Il modulo Web {0} nel progetto enterprise application {1} non \u00e8 associato a un progetto workbench.  Utilizzare l''editor dell''applicazione per risolvere il problema.
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E La sequenza di maiuscole/minuscole del nome file manifest "{0}" nell''archivio {1} non \u00e8 corretta.  Il nome file deve essere "META-INF/MANIFEST.MF", ed applica la distinzione maiuscole/minuscole.
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W L''URI JAR di utilit\u00e0 del progetto {0} \u00e8 in conflitto  con un file esistente nel progetto {1}.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E All''estensione dell''applicazione nel progetto EAR: {0} manca l''estensione del modulo per il progetto: {1}.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=Il server di destinazione del progetto "{0}" non corrisponde al server di destinazione del progetto enterprise application "{1}"
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=Il progetto modulo "{0}" senza server di destinazione appartiene ad un progetto enterprise application "{1}" che dispone di server di destinazione
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=Il progetto ear "{0}" senza server di destinazione contiene il progetto modulo "{1}" che dispone di server di destinazione
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=Il progetto EAR con specifica J2EE 1.4 "{0}" ha un server di destinazione non compatibile, "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=Il progetto modulo con specifica J2EE 1.4 "{0}" ha un server di destinazione non compatibile, "{1}"
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E Il modulo "{0}" \u00e8 ad un livello di specifica J2EE incompatibile rispetto al livello di Enterprise Application "{1}".
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E Un errore interno si \u00e8 verificato durante l''esecuzione di una convalida del progetto:{0}, per i dettagli verificare il file di log.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_ja.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_ja.properties
deleted file mode 100644
index d1669fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_ja.properties
+++ /dev/null
@@ -1,139 +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 \u30d0\u30ea\u30c7\u30fc\u30bf\u30fc
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: EAR \u306e\u59a5\u5f53\u6027\u691c\u67fb\u304c\u5931\u6557\u3057\u307e\u3057\u305f: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u306f\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u540d {0} \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: \u30e2\u30b8\u30e5\u30fc\u30eb\u304c URI \u306a\u3057\u3067\u5b9a\u7fa9\u3055\u308c\u307e\u3057\u305f\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: URI {0} \u306f\u3001EAR \u30d5\u30a1\u30a4\u30eb\u5185\u306e\u9805\u76ee\u306b\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e0d\u6b63\u306a\u30bb\u30af\u30b7\u30e7\u30f3\u304c {0} \u884c {1} \u5217\u304b\u3089\u59cb\u307e\u3063\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e0d\u6b63\u306a\u30bb\u30af\u30b7\u30e7\u30f3\u304c {0} \u884c\u304b\u3089\u59cb\u307e\u3063\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u958b\u3051\u307e\u305b\u3093\u3002 \u691c\u8a3c\u306f\u5b8c\u4e86\u3057\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E URI {0} \u306b\u30b9\u30da\u30fc\u30b9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002 \u3053\u308c\u306f\u3001\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u53c2\u7167\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u63a8\u5968\u3055\u308c\u307e\u305b\u3093\u3002
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e EAR \u5185\u306e uri \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059: {1}\u3002
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E Web \u30e2\u30b8\u30e5\u30fc\u30eb "{1}" \u304a\u3088\u3073 "{2}" \u306b\u540c\u3058\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30eb\u30fc\u30c8 "{0}" \u304c\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e EAR {1} \u5185\u306b\u7a7a\u306e <alt-dd> \u30bf\u30b0\u304c\u3042\u308a\u307e\u3059\u3002  \u30bf\u30b0\u3092\u9664\u53bb\u3059\u308b\u304b\u3001\u307e\u305f\u306f\u6709\u52b9\u306a\u5024\u306b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u306b\u542b\u307e\u308c\u3066\u3044\u308b\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc JAR URI {2} \u306f\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u306b\u542b\u307e\u308c\u3066\u3044\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\u540d {2} \u306f\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e\u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e\u540d\u524d\u304c\u3001\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc JAR URI \u3068\u540c\u3058\u3067\u3059\u3002
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e\u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e\u540d\u524d\u304c\u3001\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc JAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d\u3068\u540c\u3058\u3067\u3059\u3002
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E \u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u5185\u306e MANIFEST.MF \u30d5\u30a1\u30a4\u30eb\u3092\u691c\u67fb\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-MANIFEST_LINE_END_ERROR_=IWAE0015E \u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u5185\u306e  MANIFEST.MF \u30d5\u30a1\u30a4\u30eb\u304c\u3001\u6539\u884c\u3067\u7d42\u308f\u3063\u3066\u3044\u307e\u305b\u3093\u3002
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E \u30a2\u30fc\u30ab\u30a4\u30d6 {1} \u5185\u306e MANIFEST.MF \u30d5\u30a1\u30a4\u30eb\u306e {0} \u884c\u76ee\u306f\u3001\u4ed5\u69d8\u9650\u754c\u306e 72 \u30d0\u30a4\u30c8\u3092\u8d85\u3048\u3066\u3044\u307e\u3059\u3002
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u62e1\u5f35\u5b50\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093 (EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5834\u5408\u306f .jar\u3001Web \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u5834\u5408\u306f .war)\u3002
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{1}" \u5185\u306e application.xml \u306e\u6587\u66f8\u30bf\u30a4\u30d7\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3 "{0}" \u306f\u30d0\u30fc\u30b8\u30e7\u30f3 "{2}" \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e0d\u6b63\u306a\u30bb\u30af\u30b7\u30e7\u30f3\u304c {1} \u884c {2} \u5217\u304b\u3089\u59cb\u307e\u3063\u3066\u3044\u307e\u3059\u3002
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u4e0d\u6b63\u306a\u30bb\u30af\u30b7\u30e7\u30f3\u304c {1} \u884c\u304b\u3089\u59cb\u307e\u3063\u3066\u3044\u307e\u3059\u3002
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E \u30ea\u30f3\u30af\u3055\u308c\u305f\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean {0} \u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u3001\u30e2\u30b8\u30e5\u30fc\u30eb {2} \u5185\u306e EJB \u53c2\u7167 {1} \u306b\u542b\u307e\u308c\u3066\u3044\u308b\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: \u30e1\u30bf\u30fb\u30d5\u30a9\u30eb\u30c0\u30fc {0} \u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-WARNING_FILE_MISSING=IWAJ0001W: {0} \u306f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306b alt-dd {1} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u304c\u3001\u30ea\u30bd\u30fc\u30b9\u306f EAR {2} \u5185\u306b\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W \u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u5185\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u30fb\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3001EAR \u3067\u89e3\u6c7a\u3067\u304d\u306a\u3044\u30a8\u30f3\u30c8\u30ea\u30fc\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059: {1}\u3002
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W \u30a2\u30fc\u30ab\u30a4\u30d6 {0} \u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u30fb\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3001EAR \u5185\u306e\u30d5\u30a1\u30a4\u30eb\u307e\u305f\u306f\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u89e3\u6c7a\u3067\u304d\u306a\u3044\u30a8\u30f3\u30c8\u30ea\u30fc {1} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059: {2}\u3002
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u5185\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u30fb\u30af\u30e9\u30b9\u30d1\u30b9\u306b\u3001\u30a2\u30fc\u30ab\u30a4\u30d6 {2} \u306b\u89e3\u6c7a\u3055\u308c\u308b\u30a8\u30f3\u30c8\u30ea\u30fc {1} \u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002  \u3053\u306e\u4f9d\u5b58\u95a2\u4fc2\u306f\u3001J2EE \u4ed5\u69d8\u306b\u9069\u5408\u3057\u307e\u305b\u3093\u3002
-PROJECT_IS_CLOSED_WARN_=IWAE0026W EAR \u691c\u8a3c\u306f\u9589\u3058\u305f\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u306b\u5bfe\u3057\u3066\u306f\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002 \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3092\u958b\u304d\u3001\u518d\u8a66\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {2} \u5185\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u307e\u305f\u306f\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc JAR {1} \u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u306f\u3001\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u5185\u306b\u5b58\u5728\u3057\u307e\u305b\u3093\u3002
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e Web \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306f J2EE Web \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u5185\u306e IBM \u62e1\u5f35\u30d5\u30a1\u30a4\u30eb\u306b\u306f\u3001\u4f7f\u7528\u3059\u3079\u304d\u3067\u306a\u3044\u7d76\u5bfe\u30d1\u30b9\u304c\u542b\u307e\u308c\u3066\u3044\u307e\u3059\u3002  \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30a8\u30c7\u30a3\u30bf\u30fc\u3092\u4f7f\u7528\u3057\u3066\u3001\u30d5\u30a1\u30a4\u30eb\u3092\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e Web \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30eb\u30fc\u30c8 {0} \u304c\u3001{2} \u306e Web \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u8a2d\u5b9a\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30eb\u30fc\u30c8\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306f\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e EJB \u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306f EJB \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e\u30e2\u30b8\u30e5\u30fc\u30eb {0} \u306f\u30ef\u30fc\u30af\u30d9\u30f3\u30c1\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306b\u30de\u30c3\u30d7\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002  \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30a8\u30c7\u30a3\u30bf\u30fc\u3092\u4f7f\u7528\u3057\u3066\u8a02\u6b63\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E \u30a2\u30fc\u30ab\u30a4\u30d6 {1} \u5185\u306e\u30de\u30cb\u30d5\u30a7\u30b9\u30c8\u30fb\u30d5\u30a1\u30a4\u30eb\u540d "{0}" \u306e\u5927/\u5c0f\u6587\u5b57\u304c\u8aa4\u3063\u3066\u3044\u307e\u3059\u3002  \u30d5\u30a1\u30a4\u30eb\u540d\u306f "META-INF/MANIFEST.MF" \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u3001\u5927\u6587\u5b57\u5c0f\u6587\u5b57\u304c\u533a\u5225\u3055\u308c\u307e\u3059\u3002
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30fb\u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc JAR URI {0} \u304c\u3001\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u5185\u306e\u65e2\u5b58\u30d5\u30a1\u30a4\u30eb\u3068\u885d\u7a81\u3057\u3066\u3044\u307e\u3059\u3002
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u5185\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u62e1\u5f35\u306f\u3001\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {1} \u306e\u6b20\u843d\u3057\u305f\u30e2\u30b8\u30e5\u30fc\u30eb\u62e1\u5f35\u3067\u3059\u3002
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{0}" \u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u306f\u3001\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{1}" \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u306e\u306a\u3044\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{0}" \u306f\u3001\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u306e\u3042\u308b\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{1}" \u306b\u5c5e\u3057\u3066\u3044\u307e\u3059\u3002
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u306e\u306a\u3044 EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{0}" \u306b\u306f\u3001\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u306e\u3042\u308b\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{1}" \u304c\u3042\u308a\u307e\u3059\u3002
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \u4ed5\u69d8\u306e EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{0}" \u306b\u306f\u3001\u975e\u4e92\u63db\u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc "{1}" \u304c\u3042\u308a\u307e\u3059
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \u4ed5\u69d8\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{0}" \u306b\u306f\u3001\u975e\u4e92\u63db\u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc "{1}" \u304c\u3042\u308a\u307e\u3059
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E \u30e2\u30b8\u30e5\u30fc\u30eb "{0}" \u306f\u3001"{1}" \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba\u30fb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3088\u308a\u3082 J2EE \u4ed5\u69d8\u30ec\u30d9\u30eb\u304c\u4f4e\u304f\u3001\u975e\u4e92\u63db\u3067\u3059\u3002
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u306b\u5bfe\u3059\u308b\u59a5\u5f53\u6027\u691c\u67fb\u3092\u5b9f\u884c\u4e2d\u306b\u5185\u90e8\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001\u30ed\u30b0\u30fb\u30d5\u30a1\u30a4\u30eb\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_ko.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_ko.properties
deleted file mode 100644
index 94abcc1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_ko.properties
+++ /dev/null
@@ -1,139 +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 \uc720\ud6a8\uc131 \uac80\uc99d\uae30
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: EAR \uc720\ud6a8\uc131 \uac80\uc99d \uc2e4\ud328: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: EAR \ud504\ub85c\uc81d\ud2b8 {0}\uc774(\uac00) \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: \ubcf4\uc548 \uc5ed\ud560 \uc774\ub984 {0}\uc774(\uac00) \uc911\ubcf5\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: \ubaa8\ub4c8\uc774 URI\ub97c \uc0ac\uc6a9\ud558\uc9c0 \uc54a\uace0 \uc815\uc758\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: URI({0})\uac00 EAR \ud30c\uc77c \ub0b4\uc758 \uc5b4\ub290 \ud56d\ubaa9\uacfc\ub3c4 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {0} \ud589, {1} \uc5f4\uc5d0\uc11c \uc798\ubabb\ub41c \uc139\uc158\uc774 \uc2dc\uc791\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {0} \ud589\uc5d0\uc11c \uc798\ubabb\ub41c \uc139\uc158\uc774 \uc2dc\uc791\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: \uc804\uac1c \uc124\uba85\uc790\ub97c \uc5f4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\uc131 \uac80\uc99d\uc744 \uc644\ub8cc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E URI {0}\uc5d0 \uacf5\ubc31\uc774 \uc788\uc2b5\ub2c8\ub2e4. Manifest \ud30c\uc77c\uc5d0\uc11c \ucc38\uc870\ud560 \uc218 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \uad8c\uc7a5\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E {0} \ubaa8\ub4c8\uc5d0 EAR: {1}\uc758 \uc911\ubcf5 uri\uac00 \uc788\uc2b5\ub2c8\ub2e4.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E \ub3d9\uc77c\ud55c \ucee8\ud14d\uc2a4\ud2b8 \ub8e8\ud2b8 "{0}"\uc774(\uac00) \uc6f9 \ubaa8\ub4c8 "{1}" \ubc0f "{2}"\uc5d0 \uc874\uc7ac\ud569\ub2c8\ub2e4.
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E {0} \ubaa8\ub4c8\uc5d0\ub294 EAR {1}\uc5d0\uc11c \ube44\uc5b4 \uc788\ub294 <alt-dd> \ud0dc\uadf8\uac00 \uc788\uc2b5\ub2c8\ub2e4.  \ud0dc\uadf8\ub97c \uc81c\uac70\ud558\uac70\ub098 \uac12\uc774 \uc720\ud6a8\ud574\uc57c \ud569\ub2c8\ub2e4.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =\uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 {0} \ud504\ub85c\uc81d\ud2b8\uc5d0 \uc720\ud2f8\ub9ac\ud2f0 JAR URI {2}\uc774(\uac00) \uc911\ubcf5\ub429\ub2c8\ub2e4.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 {0} \ud504\ub85c\uc81d\ud2b8\uc5d0 \ubaa8\ub4c8 \uc774\ub984 {2}\uc774(\uac00) \uc911\ubcf5\ub429\ub2c8\ub2e4.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 {0} \ubaa8\ub4c8 \uc774\ub984\uc774 \uc720\ud2f8\ub9ac\ud2f0 JAR URI\uc640 \ub3d9\uc77c\ud569\ub2c8\ub2e4.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 {0} \ubaa8\ub4c8 \uc774\ub984\uc774 \uc720\ud2f8\ub9ac\ud2f0 JAR \ud504\ub85c\uc81d\ud2b8 \uc774\ub984\uacfc \ub3d9\uc77c\ud569\ub2c8\ub2e4.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E {0} \uc544\uce74\uc774\ube0c\uc5d0\uc11c MANIFEST.MF \ud30c\uc77c\uc758 \uc720\ud6a8\uc131\uc744 \uac80\uc99d\ud558\ub294 \uc911\uc5d0 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
-MANIFEST_LINE_END_ERROR_=IWAE0015E {0} \uc544\uce74\uc774\ube0c\uc758 MANIFEST.MF \ud30c\uc77c\uc774 \uc904 \ubc14\uafb8\uae30\ub85c \ub05d\ub098\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E {1} \uc544\uce74\uc774\ube0c\uc5d0\uc11c MANIFEST.MF \ud30c\uc77c\uc758 {0}\ud589\uc774 \uc2a4\ud399 \ud55c\uacc4 72\ubc14\uc774\ud2b8\ub97c \ucd08\uacfc\ud569\ub2c8\ub2e4.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E {0} \ubaa8\ub4c8\uc5d0 \uc798\ubabb\ub41c \uae30\ubcf8 \ud655\uc7a5\uc790\uac00 \uc788\uc2b5\ub2c8\ub2e4(EJB \ubaa8\ub4c8\uc758 \uacbd\uc6b0 .jar \ubc0f \uc6f9 \ubaa8\ub4c8\uc758 \uacbd\uc6b0 .war).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E "{1}" \ud504\ub85c\uc81d\ud2b8\uc758 application.xml\uc5d0 \ub300\ud55c \ubb38\uc11c \uc720\ud615 \ubc84\uc804 "{0}"\uc740(\ub294) "{2}" \ubc84\uc804\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E {0} \ubaa8\ub4c8\uc758 \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {1} \ud589, {2} \uc5f4\uc5d0\uc11c \uc798\ubabb\ub41c \uc139\uc158\uc774 \uc2dc\uc791\ub429\ub2c8\ub2e4.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E {0} \ubaa8\ub4c8\uc758 \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {1} \ud589\uc5d0\uc11c \uc798\ubabb\ub41c \uc139\uc158\uc774 \uc2dc\uc791\ub429\ub2c8\ub2e4.
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E {0} \ubaa8\ub4c8\uc758 \uc804\uac1c \uc124\uba85\uc790\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E \ub9c1\ud06c\ub41c \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean {0}\uc758 \uc778\ud130\ud398\uc774\uc2a4\uac00 {2} \ubaa8\ub4c8\uc758 EJB ref {1}\uc5d0 \uc788\ub294 \uac83\uacfc \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: {0} \uba54\ud0c0 \ud3f4\ub354\uac00 {1} \ud504\ub85c\uc81d\ud2b8\uc5d0 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-WARNING_FILE_MISSING=IWAJ0001W: {0}\uc740(\ub294) {1} \ud504\ub85c\uc81d\ud2b8\uc5d0 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W {0} \ubaa8\ub4c8\uc5d0 alt-dd {1}\uc774(\uac00) \uc788\uc9c0\ub9cc \uc790\uc6d0\uc740 EAR {2}\uc5d0 \uc5c6\uc2b5\ub2c8\ub2e4.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W {0} \uc544\uce74\uc774\ube0c\uc758 Manifest \ud074\ub798\uc2a4 \uacbd\ub85c\uc5d0 EAR: {1}\uc5d0\uc11c \ud574\uc11d\ud560 \uc218 \uc5c6\ub294 \ud56d\ubaa9\uc774 \ub4e4\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W {0} \uc544\uce74\uc774\ube0c\uc758 Manifest \ud074\ub798\uc2a4 \uacbd\ub85c\uc5d0 \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 {2}\uc5d0\uc11c \ud30c\uc77c \ub610\ub294 \ubaa8\ub4c8\ub85c \ud574\uc11d\ud560 \uc218 \uc5c6\ub294 {1} \ud56d\ubaa9\uc774 \uc788\uc2b5\ub2c8\ub2e4.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W {0} \ubaa8\ub4c8\uc758 Manifest \ud074\ub798\uc2a4 \uacbd\ub85c\uc5d0 {2} \uc544\uce74\uc774\ube0c\ub85c \ud574\uc11d\ub418\ub294 {1} \ud56d\ubaa9\uc774 \ub4e4\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.  \uc774 \uc885\uc18d\uc131\uc740 J2EE \uc2a4\ud399\uc744 \uc900\uc218\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W \ucc98\ub9ac\uc644\ub8cc\ub41c \ud504\ub85c\uc81d\ud2b8\uc5d0 \ub300\ud574 EAR \uc720\ud6a8\uc131 \uac80\uc99d\uc744 \uc2e4\ud589\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: {0}. \ud504\ub85c\uc81d\ud2b8\ub97c \uc5f4\uace0 \ub2e4\uc2dc \uc2dc\ub3c4\ud558\uc2ed\uc2dc\uc624.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {2}\uc758 \ubaa8\ub4c8 \ub610\ub294 \uc720\ud2f8\ub9ac\ud2f0 JAR {1}\uc5d0 \ub300\ud55c \ud504\ub85c\uc81d\ud2b8 {0}\uc774(\uac00) \uc791\uc5c5\uacf5\uac04\uc5d0 \uc5c6\uc2b5\ub2c8\ub2e4.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 \uc6f9 \ubaa8\ub4c8 {0}\uc740(\ub294) J2EE \uc6f9 \ud504\ub85c\uc81d\ud2b8\uac00 \uc544\ub2d9\ub2c8\ub2e4.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {0}\uc758 IBM \ud655\uc7a5 \ud30c\uc77c\uc5d0 \ub354\uc774\uc0c1 \uc0ac\uc6a9\ub418\uc9c0 \uc54a\ub294 \uc808\ub300 \uacbd\ub85c\uac00 \uc788\uc2b5\ub2c8\ub2e4.  \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud3b8\uc9d1\uae30\ub97c \uc0ac\uc6a9\ud558\uc5ec \ud574\ub2f9 \ud30c\uc77c\uc744 \uc815\ub9ac\ud558\uc2ed\uc2dc\uc624.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc5d0\uc11c {0} \uc6f9 \ubaa8\ub4c8\uc5d0 \ub300\ud55c \ucee8\ud14d\uc2a4\ud2b8 \ub8e8\ud2b8\uac00 \uc6f9 \ud504\ub85c\uc81d\ud2b8 \uc124\uc815 {2}\uc758 \ucee8\ud14d\uc2a4\ud2b8 \ub8e8\ud2b8\uc640 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 \ubaa8\ub4c8 {0}\uc740(\ub294) \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud074\ub77c\uc774\uc5b8\ud2b8 \ud504\ub85c\uc81d\ud2b8\uac00 \uc544\ub2d9\ub2c8\ub2e4.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 EJB \ubaa8\ub4c8 {0}\uc740(\ub294) EJB \ud504\ub85c\uc81d\ud2b8\uac00 \uc544\ub2d9\ub2c8\ub2e4.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 {1}\uc758 {0} \ubaa8\ub4c8\uc774 Workbench \ud504\ub85c\uc81d\ud2b8\uc5d0 \ub9f5\ud551\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.  \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud3b8\uc9d1\uae30\ub97c \uc0ac\uc6a9\ud558\uc5ec \uc815\uc815\ud558\uc2ed\uc2dc\uc624.
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E \uc544\uce74\uc774\ube0c {1}\uc5d0 \uc788\ub294 manifest \ud30c\uc77c \uc774\ub984 "{0}"\uc758 \ub300\uc18c\ubb38\uc790\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.  \ud30c\uc77c \uc774\ub984\uc740 \ub300\uc18c\ubb38\uc790\ub97c \uad6c\ubd84\ud558\uc5ec "META-INF/MANIFEST.MF"\uc5ec\uc57c \ud569\ub2c8\ub2e4.
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W \ud504\ub85c\uc81d\ud2b8 \uc720\ud2f8\ub9ac\ud2f0 JAR URI {0}\uc774(\uac00) \ud504\ub85c\uc81d\ud2b8 {1}\uc758 \uae30\uc874 \ud30c\uc77c\uacfc \ucda9\ub3cc\ud588\uc2b5\ub2c8\ub2e4.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E EAR \ud504\ub85c\uc81d\ud2b8 {0}\uc758 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud655\uc7a5\uc774 \ubaa8\ub4c8 \ud504\ub85c\uc81d\ud2b8 {1}\uc5d0 \ub300\ud574 \ub204\ub77d\ub41c \ubaa8\ub4c8 \ud655\uc7a5\uc785\ub2c8\ub2e4.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=\ubaa8\ub4c8 \ud504\ub85c\uc81d\ud2b8 "{0}"\uc758 \ub300\uc0c1 \uc11c\ubc84\ub294 \ud3ec\ud568\ud558\ub294 \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 "{1}"\uc758 \ub300\uc0c1 \uc11c\ubc84\uc640 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=\ub300\uc0c1 \uc11c\ubc84\uac00 \uc5c6\ub294 "{0}" \ubaa8\ub4c8 \ud504\ub85c\uc81d\ud2b8\ub294 \ub300\uc0c1 \uc11c\ubc84\uac00 \uc5c6\ub294 \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \ud504\ub85c\uc81d\ud2b8 "{1}"\uc5d0 \uc18d\ud569\ub2c8\ub2e4.
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=\ub300\uc0c1 \uc11c\ubc84\uac00 \uc5c6\ub294 EAR \ud504\ub85c\uc81d\ud2b8 "{0}"\uc5d0 \ub300\uc0c1 \uc11c\ubc84\uac00 \uc788\ub294 \ubaa8\ub4c8 \ud504\ub85c\uc81d\ud2b8 "{1}"\uc774(\uac00) \uc788\uc2b5\ub2c8\ub2e4.
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \uc2a4\ud399 EAR \ud504\ub85c\uc81d\ud2b8 "{0}"\uc5d0 \ud638\ud658\ub418\uc9c0 \uc54a\ub294 \ub300\uc0c1 \uc11c\ubc84 "{1}"\uc774(\uac00) \uc788\uc2b5\ub2c8\ub2e4.
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \uc2a4\ud399 \ubaa8\ub4c8 \ud504\ub85c\uc81d\ud2b8 "{0}"\uc5d0 \ud638\ud658\ub418\uc9c0 \uc54a\ub294 \ub300\uc0c1 \uc11c\ubc84 "{1}"\uc774(\uac00) \uc788\uc2b5\ub2c8\ub2e4.
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E \ubaa8\ub4c8 "{0}"\uc740(\ub294) "{1}" \uc5d4\ud130\ud504\ub77c\uc774\uc988 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8\uc758 J2EE \uc2a4\ud399 \ub808\ubca8\uacfc \ud638\ud658 \uac00\ub2a5\ud558\uc9c0 \uc54a\uc73c\uba70 \ub354 \ub0ae\uc740 \ub808\ubca8\uc5d0 \uc788\uc2b5\ub2c8\ub2e4.
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E \ud504\ub85c\uc81d\ud2b8\uc5d0\uc11c \uc720\ud6a8\uc131 \uac80\uc99d\uc744 \uc2e4\ud589\ud558\ub294 \ub3d9\uc548 \ub0b4\ubd80 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: {0}, \uc790\uc138\ud55c \ub0b4\uc6a9\uc740 \ub85c\uadf8 \ud30c\uc77c\uc744 \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_pt_BR.properties
deleted file mode 100644
index 9aa02ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_pt_BR.properties
+++ /dev/null
@@ -1,139 +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=Validador do EAR
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: Falha na Valida\u00e7\u00e3o de EAR: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: O projeto EAR {0} \u00e9 inv\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Fun\u00e7\u00e3o de seguran\u00e7a duplicada nomeada {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: Um m\u00f3dulo foi definido sem URI.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: O URI, {0}, corresponde a nada no arquivo EAR.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: O descritor de implementa\u00e7\u00e3o n\u00e3o p\u00f4de ser carregado. O in\u00edcio da se\u00e7\u00e3o inv\u00e1lida est\u00e1 na linha {0}, coluna {1}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: O descritor de implementa\u00e7\u00e3o n\u00e3o foi carregado. O in\u00edcio da se\u00e7\u00e3o inv\u00e1lida est\u00e1 na linha {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: O descritor de implementa\u00e7\u00e3o n\u00e3o p\u00f4de ser carregado.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: N\u00e3o \u00e9 poss\u00edvel abrir o descritor de implementa\u00e7\u00e3o. A valida\u00e7\u00e3o n\u00e3o pode ser conclu\u00edda.
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E A URI {0} cont\u00e9m um espa\u00e7o. Isso n\u00e3o \u00e9 recomend\u00e1vel, porque ela n\u00e3o pode ser referenciada a partir de um arquivo de manifesto.
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E O m\u00f3dulo {0} tem uri duplicada no EAR: {1}.
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E A mesma raiz de contexto "{0}" existe nos m\u00f3dulos da Web "{1}" e "{2}".
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E O m\u00f3dulo {0} tem a tag <alt-dd> vazia no EAR {1}. A tag deve ser removida ou o valor deve ser v\u00e1lido.
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =O projeto {0} do projeto de Aplicativo Corporativo {1} tem utilit\u00e1rio URI JAR {2} duplicado.
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E O projeto {0} do projeto de Aplicativo Corporativo {1} tem nome de m\u00f3dulo {2} duplicado.
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E O m\u00f3dulo {0} no projeto de Aplicativo Corporativo {1} tem o mesmo nome que o utilit\u00e1rio URI JAR.
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E O m\u00f3dulo {0} no projeto de Aplicativo Corporativo {1} tem o mesmo nome que o utilit\u00e1rio projeto JAR.
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E Ocorreu um erro ao validar o arquivo MANIFEST.MF no archive {0}.
-MANIFEST_LINE_END_ERROR_=IWAE0015E O arquivo MANIFEST.MF no archive {0} n\u00e3o termina com uma nova linha.
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E A linha {0} no arquivo MANIFEST.MF no archive {1} excede o limite de especifica\u00e7\u00e3o de 72 bytes.
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E O m\u00f3dulo {0} tem uma extens\u00e3o padr\u00e3o errada (.jar para m\u00f3dulos EJB e .war para m\u00f3dulos da Web).
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E A vers\u00e3o do tipo do documento "{0}" para application.xml no projeto "{1}" precisa ter a vers\u00e3o "{2}".
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E O descritor de implementa\u00e7\u00e3o do m\u00f3dulo {0} n\u00e3o p\u00f4de ser carregado. A se\u00e7\u00e3o inv\u00e1lida inicia na linha {1}, coluna {2}.
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E O descritor de implementa\u00e7\u00e3o do m\u00f3dulo {0} n\u00e3o p\u00f4de ser carregado. A se\u00e7\u00e3o inv\u00e1lida inicia na linha {1}
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E O descritor de implementa\u00e7\u00e3o do m\u00f3dulo {0} n\u00e3o p\u00f4de ser carregado.
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E As interfaces do bean corporativo vinculado {0} n\u00e3o correspondem \u00e0s do ref EJB {1} no m\u00f3dulo {2}.
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: A pasta meta {0} deve existir no projeto {1}.
-WARNING_FILE_MISSING=IWAJ0001W: {0} deve existir no projeto {1}.
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W O m\u00f3dulo {0} tem alt-dd {1}, mas o recurso n\u00e3o existe no EAR {2}.
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W O Classpath do Manifesto no archive {0} cont\u00e9m uma entrada que n\u00e3o pode ser resolvida no EAR: {1}.
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W O Classpath do Manifesto no archive {0} cont\u00e9m uma entrada, {1}, que n\u00e3o pode ser resolvida em um arquivo ou m\u00f3dulo no Aplicativo Corporativo: {2}.
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWA@0025W O Classpath do Manifesto no m\u00f3dulo {0} cont\u00e9m uma entrada, {1}, que resolve no archive {2}. Essa depend\u00eancia n\u00e3o \u00e9 compat\u00edvel com a especifica\u00e7\u00e3o J2EE.
-PROJECT_IS_CLOSED_WARN_=IWAE0026W A Valida\u00e7\u00e3o do EAR n\u00e3o pode ser executada em projeto fechado: {0}. Abra o projeto e tente novamente.
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W O projeto {0} para o m\u00f3dulo ou utilit\u00e1rio JAR {1} no projeto de Aplicativo Corporativo {2} n\u00e3o existe no espa\u00e7o de trabalho.
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W O m\u00f3dulo da Web {0} no projeto de Aplicativo Corporativo {1} n\u00e3o \u00e9 um projeto da Web J2EE.
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W O arquivo de extens\u00f5es IBM no projeto de Aplicativo Corporativo {0} cont\u00e9m caminhos absolutos reprovados. Utilize o editor do aplicativo para limpar o arquivo.
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W A raiz de contexto do m\u00f3dulo da Web: {0} no projeto de Aplicativo Corporativo: {1} n\u00e3o corresponde \u00e0 raiz de contexto nas defini\u00e7\u00f5es do projeto da Web {2}.
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W O m\u00f3dulo de cliente do aplicativo {0} do projeto de Aplicativo Corporativo: {1} n\u00e3o \u00e9 um projeto de cliente do aplicativo.
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W O m\u00f3dulo EJB {0} no projeto de Aplicativo Corporativo {1} n\u00e3o \u00e9 um projeto EJB.
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W O m\u00f3dulo {0} no projeto de Aplicativo Corporativo {1} n\u00e3o est\u00e1 mapeado para um projeto do workbench. Utilize o editor do aplicativo para corre\u00e7\u00e3o.
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E As letras mai\u00fasculas e min\u00fasculas do nome do arquivo manifest "{0}" no archive {1} est\u00e3o incorretas. O nome do arquivo deve ser "META-INF/MANIFEST.MF", fazendo distin\u00e7\u00e3o entre mai\u00fasculas e min\u00fasculas.
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W O utilit\u00e1rio URI JAR do projeto {0} colide com um arquivo existente no projeto {1}.
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E A extens\u00e3o do aplicativo no projeto EAR: {0} n\u00e3o tem a extens\u00e3o do m\u00f3dulo para o projeto do m\u00f3dulo: {1}.
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=O servidor de destino do projeto do m\u00f3dulo "{0}" n\u00e3o corresponde ao servidor de destino do projeto de Aplicativo Corporativo contido "{1}"
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=O projeto do m\u00f3dulo "{0}" sem servidor de destino pertence a um projeto de Aplicativo Corporativo "{1}" que possui um servidor de destino
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=O projeto ear "{0}" sem servidor de destino possui projeto do m\u00f3dulo "{1}" que possui um servidor de destino
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=O projeto EAR de especifica\u00e7\u00e3o J2EE 1.4 "{0}" possui um servidor de destino incompat\u00edvel "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=O projeto de m\u00f3dulo de especifica\u00e7\u00e3o J2EE 1.4 "{0}" possui um servidor de destino incompat\u00edvel "{1}".
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E O m\u00f3dulo "{0}" est\u00e1 em um n\u00edvel de especifica\u00e7\u00e3o do J2EE incompat\u00edvel com aquele do "{1}" Enterprise Application.
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E Ocorreu um erro interno ao executar a valida\u00e7\u00e3o no projeto:{0}, verifique o arquivo de log, para obter detalhes.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_zh.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_zh.properties
deleted file mode 100644
index 03016ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_zh.properties
+++ /dev/null
@@ -1,139 +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 \u9a8c\u8bc1\u5668
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E\uff1aEAR \u9a8c\u8bc1\u5931\u8d25\uff1a{0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E\uff1aEAR \u9879\u76ee {0} \u65e0\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E\uff1a\u540d\u4e3a {0} \u7684\u5b89\u5168\u89d2\u8272\u91cd\u590d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E\uff1a\u672a\u4f7f\u7528 URI \u5b9a\u4e49\u4e86\u6a21\u5757\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E\uff1aURI {0} \u4e0e EAR \u6587\u4ef6\u4e2d\u7684\u4efb\u4f55\u5185\u5bb9\u90fd\u4e0d\u5339\u914d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E\uff1a\u672a\u80fd\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u9519\u8bef\u90e8\u5206\u4ece\u7b2c {0} \u884c\u7b2c {1} \u5217\u5f00\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E\uff1a\u672a\u80fd\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u9519\u8bef\u90e8\u5206\u4ece\u7b2c {0} \u884c\u5f00\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E\uff1a\u672a\u80fd\u88c5\u5165\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E\uff1a\u65e0\u6cd5\u6253\u5f00\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u4e0d\u80fd\u5b8c\u6210\u9a8c\u8bc1\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E URI {0} \u4e2d\u5305\u542b\u7a7a\u683c\u3002\u5efa\u8bae\u4e0d\u8981\u53d1\u751f\u8fd9\u79cd\u60c5\u51b5\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u4ece\u6e05\u5355\u6587\u4ef6\u4e2d\u5f15\u7528\u5b83\u3002
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E \u6a21\u5757 {0} \u5728 EAR {1} \u4e2d\u5b58\u5728\u91cd\u590d\u7684 URI\u3002
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E Web \u6a21\u5757\u201c{1}\u201d\u548c\u201c{2}\u201d\u4e2d\u5b58\u5728\u76f8\u540c\u7684\u4e0a\u4e0b\u6587\u6839\u201c{0}\u201d\u3002
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E \u6a21\u5757 {0} \u5728 EAR {1} \u4e2d\u5177\u6709\u7a7a\u7684 <alt-dd> \u6807\u8bb0\u3002\u5e94\u8be5\u9664\u53bb\u8be5\u6807\u8bb0\uff0c\u6216\u8005\u8be5\u503c\u5e94\u8be5\u662f\u6709\u6548\u7684\u3002
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E =\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684\u9879\u76ee {0} \u5177\u6709\u91cd\u590d\u7684\u5b9e\u7528\u7a0b\u5e8f JAR URI {2}\u3002
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684\u9879\u76ee {0} \u5177\u6709\u91cd\u590d\u7684\u6a21\u5757\u540d {2}\u3002
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684\u6a21\u5757 {0} \u7684\u540d\u79f0\u4e0e\u5b9e\u7528\u7a0b\u5e8f JAR URI \u7684\u540d\u79f0\u76f8\u540c\u3002
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684\u6a21\u5757 {0} \u7684\u540d\u79f0\u4e0e\u5b9e\u7528\u7a0b\u5e8f JAR \u7684\u9879\u76ee\u540d\u79f0\u76f8\u540c\u3002
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E \u9a8c\u8bc1\u5f52\u6863 {0} \u4e2d\u7684 MANIFEST.MF \u6587\u4ef6\u65f6\u51fa\u9519\u3002
-MANIFEST_LINE_END_ERROR_=IWAE0015E \u5f52\u6863 {0} \u4e2d\u7684 MANIFEST.MF \u6587\u4ef6\u6ca1\u6709\u4ee5\u6362\u884c\u7b26\u7ed3\u675f\u3002
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E \u5f52\u6863 {1} \u4e2d\u7684 MANIFEST.MF \u6587\u4ef6\u4e2d\u7684\u7b2c {0} \u884c\u8d85\u8fc7\u4e86 72 \u4e2a\u5b57\u8282\u7684\u89c4\u8303\u9650\u5236\u3002
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E \u6a21\u5757 {0} \u5177\u6709\u9519\u8bef\u7684\u7f3a\u7701\u6269\u5c55\u540d\uff08\u5bf9\u4e8e EJB \u6a21\u5757\uff0c\u7f3a\u7701\u6269\u5c55\u540d\u4e3a .jar\uff1b\u800c\u5bf9\u4e8e Web \u6a21\u5757\uff0c\u7f3a\u7701\u6269\u5c55\u540d\u4e3a .war\uff09\u3002
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E \u9879\u76ee\u201c{1}\u201d\u4e2d\u7684 application.xml \u7684\u6587\u6863\u7c7b\u578b\u7248\u672c\u201c{0}\u201d\u5fc5\u987b\u4e3a\u7248\u672c\u201c{2}\u201d\u3002
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E \u672a\u80fd\u88c5\u5165\u6a21\u5757 {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u9519\u8bef\u90e8\u5206\u4ece\u7b2c {1} \u884c\u7b2c {2} \u5217\u5f00\u59cb\u3002
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E \u672a\u80fd\u88c5\u5165\u6a21\u5757 {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u9519\u8bef\u90e8\u5206\u4ece\u7b2c {1} \u884c\u5f00\u59cb
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E \u672a\u80fd\u88c5\u5165\u6a21\u5757 {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E \u5df2\u94fe\u63a5\u7684\u4f01\u4e1a bean {0} \u7684\u63a5\u53e3\u4e0e\u6a21\u5757 {2} \u4e2d\u7684 EJB \u5f15\u7528 {1} \u4e2d\u7684\u90a3\u4e9b\u63a5\u53e3\u4e0d\u5339\u914d\u3002
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W\uff1a\u5143\u6587\u4ef6\u5939 {0} \u5fc5\u987b\u5728\u9879\u76ee {1} \u4e2d\u5b58\u5728\u3002
-WARNING_FILE_MISSING=IWAJ0001W\uff1a{0} \u5fc5\u987b\u5728\u9879\u76ee {1} \u4e2d\u5b58\u5728\u3002
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W \u6a21\u5757 {0} \u5177\u6709 alt-dd {1}\uff0c\u4f46\u662f\u5728 EAR {2} \u4e2d\u4e0d\u5b58\u5728\u8be5\u8d44\u6e90\u3002
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W \u5f52\u6863 {0} \u4e2d\u7684\u201c\u6e05\u5355\u7c7b\u8def\u5f84\u201d\u5305\u542b\u4e00\u4e2a\u5728 EAR {1} \u4e2d\u4e0d\u80fd\u89e3\u6790\u7684\u6761\u76ee\u3002
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W \u5f52\u6863 {0} \u7684\u201c\u6e05\u5355\u7c7b\u8def\u5f84\u201d\u5305\u542b\u4e00\u4e2a\u6761\u76ee {1}\uff0c\u5b83\u65e0\u6cd5\u89e3\u6790\u4e3a\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f {2} \u4e2d\u7684\u6587\u4ef6\u6216\u6a21\u5757\u3002
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W \u6a21\u5757 {0} \u4e2d\u7684\u201c\u6e05\u5355\u7c7b\u8def\u5f84\u201d\u5305\u542b\u4e00\u4e2a\u89e3\u6790\u4e3a\u5f52\u6863 {2} \u7684\u6761\u76ee {1}\u3002\u6b64\u4f9d\u8d56\u9879\u4e0e J2EE \u89c4\u8303\u4e0d\u7b26\u3002
-PROJECT_IS_CLOSED_WARN_=IWAE0026W \u4e0d\u80fd\u5bf9\u5df2\u5173\u95ed\u7684\u9879\u76ee {0} \u8fd0\u884c\u201cEAR \u9a8c\u8bc1\u201d\u3002\u6253\u5f00\u8be5\u9879\u76ee\uff0c\u7136\u540e\u518d\u8bd5\u3002
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {2} \u4e2d\u7684\u6a21\u5757\u6216\u5b9e\u7528\u7a0b\u5e8f JAR {1} \u7684\u9879\u76ee {0} \u5728\u5de5\u4f5c\u7a7a\u95f4\u4e2d\u4e0d\u5b58\u5728\u3002
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684 Web \u6a21\u5757 {0} \u4e0d\u662f J2EE Web \u9879\u76ee\u3002
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {0} \u4e2d\u7684 IBM \u6269\u5c55\u6587\u4ef6\u5305\u542b\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528\u7684\u7edd\u5bf9\u8def\u5f84\u3002\u4f7f\u7528\u5e94\u7528\u7a0b\u5e8f\u7f16\u8f91\u5668\u6765\u6574\u7406\u6587\u4ef6\u3002
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684 Web \u6a21\u5757 {0} \u7684\u4e0a\u4e0b\u6587\u6839\u4e0e {2} \u7684 Web \u9879\u76ee\u8bbe\u7f6e\u4e2d\u7684\u4e0a\u4e0b\u6587\u6839\u4e0d\u5339\u914d\u3002
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a\u6a21\u5757 {0} \u4e0d\u662f\u5e94\u7528\u7a0b\u5e8f\u5ba2\u6237\u673a\u9879\u76ee\u3002
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684 EJB \u6a21\u5757 {0} \u4e0d\u662f EJB \u9879\u76ee\u3002
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W \u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee {1} \u4e2d\u7684\u6a21\u5757 {0} \u672a\u6620\u5c04\u81f3\u5de5\u4f5c\u53f0\u9879\u76ee\u3002\u4f7f\u7528\u5e94\u7528\u7a0b\u5e8f\u7f16\u8f91\u5668\u6765\u8fdb\u884c\u66f4\u6b63\u3002
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E \u5f52\u6863 {1} \u4e2d\u7684\u6e05\u5355\u6587\u4ef6\u540d\u201c{0}\u201d\u7684\u5927\u5c0f\u5199\u4e0d\u6b63\u786e\u3002\u6587\u4ef6\u540d\u5fc5\u987b\u4e3a\u201cMETA-INF/MANIFEST.MF\u201d\uff0c\u5e76\u4e14\u533a\u5206\u5927\u5c0f\u5199\u3002
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W \u9879\u76ee\u5b9e\u7528\u7a0b\u5e8f JAR URI {0} \u4e0e\u9879\u76ee {1} \u4e2d\u7684\u73b0\u6709\u6587\u4ef6\u76f8\u51b2\u7a81\u3002
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E EAR \u9879\u76ee {0} \u4e2d\u7684\u5e94\u7528\u7a0b\u5e8f\u6269\u5c55\u4e22\u5931\u4e86\u6a21\u5757\u9879\u76ee {1} \u7684\u6a21\u5757\u6269\u5c55\u3002
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=\u6a21\u5757\u9879\u76ee\u201c{0}\u201d\u7684\u76ee\u6807\u670d\u52a1\u5668\u4e0e\u5305\u542b\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee\u201c{1}\u201d\u7684\u76ee\u6807\u670d\u52a1\u5668\u4e0d\u5339\u914d
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=\u6ca1\u6709\u76ee\u6807\u670d\u52a1\u5668\u7684\u6a21\u5757\u9879\u76ee\u201c{0}\u201d\u5c5e\u4e8e\u5177\u6709\u76ee\u6807\u670d\u52a1\u5668\u7684\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u9879\u76ee\u201c{1}\u201d
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=\u6ca1\u6709\u76ee\u6807\u670d\u52a1\u5668\u7684 EAR \u9879\u76ee\u201c{0}\u201d\u5177\u6709\u5e26\u76ee\u6807\u670d\u52a1\u5668\u7684\u6a21\u5757\u9879\u76ee\u201c{1}\u201d
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \u89c4\u8303 EAR \u9879\u76ee\u201c{0}\u201d\u5177\u6709\u4e0d\u517c\u5bb9\u7684\u76ee\u6807\u670d\u52a1\u5668\u201c{1}\u201d
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \u89c4\u8303\u6a21\u5757\u9879\u76ee\u201c{0}\u201d\u5177\u6709\u4e0d\u517c\u5bb9\u7684\u76ee\u6807\u670d\u52a1\u5668\u201c{1}\u201d\u3002
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E \u6a21\u5757\u201c{0}\u201d\u7684 J2EE \u89c4\u8303\u7ea7\u522b\u4e0e\u201c{1}\u201d\u4f01\u4e1a\u5e94\u7528\u7a0b\u5e8f\u7684 J2EE \u89c4\u8303\u7ea7\u522b\u4e0d\u517c\u5bb9\u3002
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E \u5bf9\u9879\u76ee {0} \u8fd0\u884c\u9a8c\u8bc1\u65f6\u53d1\u751f\u5185\u90e8\u9519\u8bef\uff0c\u8bf7\u68c0\u67e5\u65e5\u5fd7\u6587\u4ef6\u4ee5\u83b7\u53d6\u8be6\u7ec6\u4fe1\u606f
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_zh_TW.properties
deleted file mode 100644
index 3867553..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/earvalidation_zh_TW.properties
+++ /dev/null
@@ -1,139 +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 \u9a57\u8b49\u5668
-
-# --------------------------------
-ERROR_EAR_VALIDATION_FAILED=CHKJ1000E: EAR \u9a57\u8b49\u5931\u6557\uff1a{0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EAR_FILE=CHKJ1001E: EAR \u5c08\u6848 {0} \u7121\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: \u540d\u7a31 {0} \u7684\u5b89\u5168\u89d2\u8272\u91cd\u8907\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_NO_MODULE_URI=CHKJ1003E: \u5b9a\u7fa9\u7684\u6a21\u7d44\u4e0d\u542b URI\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_EAR_MISSING_URI=CHKJ1004E: URI {0} \u8207 EAR \u6a94\u4e2d\u7684\u4efb\u4f55\u9805\u76ee\u4e0d\u7b26\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINECOL=CHKJ1005E: \u7121\u6cd5\u8f09\u5165\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002\u932f\u8aa4\u5340\u6bb5\u5f9e\u7b2c {0} \u884c\u7b2c {1} \u76f4\u6b04\u958b\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_LINE=CHKJ1006E: \u7121\u6cd5\u8f09\u5165\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002\u932f\u8aa4\u5340\u6bb5\u5f9e\u7b2c {0} \u884c\u958b\u59cb\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_PARSE_NOINFO=CHKJ1007E: \u7121\u6cd5\u8f09\u5165\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-EAR_DD_CANNOT_OPEN_DD=CHKJ1008E: \u7121\u6cd5\u958b\u555f\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002\u9a57\u8b49\u7121\u6cd5\u5b8c\u6210\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# errors ---------------------------
-URI_CONTAINS_SPACES_ERROR_=IWAE0005E URI {0} \u542b\u6709\u7a7a\u683c\u3002\u4e0d\u5efa\u8b70\u5982\u6b64\uff0c\u56e0\u70ba\u5c07\u7121\u6cd5\u5f9e Manifest \u6a94\u53c3\u7167\u5b83\u3002
-MESSAGE_EAR_DUPLICATE_URI_ERROR_=IWAE0006E EAR \u4e2d\u7684\u6a21\u7d44 {0} \u6709\u91cd\u8907\u7684 uri\uff1a{1}\u3002
-MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_=IWAE0007E Web \u6a21\u7d44 "{1}" \u548c "{2}" \u4e2d\u5b58\u5728\u76f8\u540c\u7684\u74b0\u5883\u5b9a\u7fa9\u6839 "{0}"\u3002
-MESSAGE_EMPTY_ALT_DD_ERROR_=IWAE0009E \u5728 EAR {1} \u4e2d\u6a21\u7d44 {0} \u7684 <alt-dd> \u6a19\u793a\u70ba\u7a7a\u7684\u3002\u61c9\u79fb\u9664\u8a72\u6a19\u793a\uff0c\u6216\u8005\u61c9\u70ba\u6709\u6548\u503c\u3002
-DUPLICATE_UTILJAR_FOR_PROJECT_NAME_ERROR_=IWAE0010E \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684 {0} \u5c08\u6848\u6709\u91cd\u8907\u7684\u516c\u7528\u7a0b\u5f0f JAR URI {2}\u3002
-DUPLICATE_MODULE_FOR_PROJECT_NAME_ERROR_=IWAE0011E \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684 {0} \u5c08\u6848\u6709\u91cd\u8907\u7684\u6a21\u7d44\u540d\u7a31 {2}\u3002
-MESSAGE_UTIL_URI_NAME_COLLISION_ERROR_=IWAE0012E \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684 {0} \u6a21\u7d44\u6709\u8207\u516c\u7528\u7a0b\u5f0f JAR URI \u76f8\u540c\u7684\u540d\u7a31\u3002
-MESSAGE_UTIL_PROJECT_NAME_COLLISION_ERROR_=IWAE0013E \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684 {0} \u6a21\u7d44\u6709\u8207\u516c\u7528\u7a0b\u5f0f JAR \u5c08\u6848\u540d\u7a31\u76f8\u540c\u7684\u540d\u7a31\u3002
-ERROR_READING_MANIFEST_ERROR_=IWAE0014E \u5728\u9a57\u8b49\u4fdd\u5b58\u6a94 {0} \u4e2d\u7684 MANIFEST.MF \u6a94\u6642\u767c\u751f\u932f\u8aa4\u3002
-MANIFEST_LINE_END_ERROR_=IWAE0015E \u4fdd\u5b58\u6a94 {0} \u4e2d\u7684 MANIFEST.MF \u6a94\u4e0d\u662f\u4ee5\u63db\u884c\u7b26\u865f\u70ba\u7d50\u5c3e\u3002
-MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_=IWAE0016E \u4fdd\u5b58\u6a94 {1} \u4e2d\u4e4b MANIFEST.MF \u6a94\u7684\u7b2c {0} \u884c\u8d85\u904e 72 \u500b\u4f4d\u5143\u7d44\u7684\u898f\u683c\u9650\u5236\u3002
-
-INVALID_URI_FOR_MODULE_ERROR_=IWAE0017E \u6a21\u7d44 {0} \u7684\u9810\u8a2d\u526f\u6a94\u540d\u932f\u8aa4\uff08EJB \u6a21\u7d44\u4f7f\u7528 .jar\uff0cWeb \u6a21\u7d44\u4f7f\u7528 .war\uff09\u3002
-EAR_INVALID_DOC_TYPE_ERROR_=IWAE0018E \u5c08\u6848 "{1}" \u4e2d\u7684 application.xml \u4e4b\u6587\u4ef6\u985e\u578b\u7248\u672c "{0}" \u5fc5\u9808\u662f\u7248\u672c "{2}"\u3002
-
-MODULE_DD_PARSE_LINECOL_ERROR_=IWAE0019E \u7121\u6cd5\u8f09\u5165\u6a21\u7d44 {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002\u932f\u8aa4\u5340\u6bb5\u5f9e\u7b2c {1} \u884c\u7b2c {2} \u76f4\u6b04\u958b\u59cb\u3002
-MODULE_DD_PARSE_LINE_ERROR_=IWAE0020E \u7121\u6cd5\u8f09\u5165\u6a21\u7d44 {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002\u932f\u8aa4\u5340\u6bb5\u5f9e\u7b2c {1} \u884c\u958b\u59cb
-MODULE_DD_PARSE_NOINFO_ERROR_=IWAE0021E \u7121\u6cd5\u8f09\u5165\u6a21\u7d44 {0} \u7684\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002
-EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_=IWAE0037E \u93c8\u7d50 Enterprise Bean {0} \u7684\u4ecb\u9762\u8207\u6a21\u7d44 {2} \u4e2d EJB \u53c3\u7167 {1} \u7684\u4ecb\u9762\u4e0d\u76f8\u7b26\u3002
-
-# warnings ----------------------------
-WARNING_METAFOLDER_MISSING=IWAJ0000W: Meta \u8cc7\u6599\u593e {0} \u5fc5\u9808\u5b58\u5728\u65bc {1} \u5c08\u6848\u4e2d\u3002
-WARNING_FILE_MISSING=IWAJ0001W: {0} \u5fc5\u9808\u5b58\u5728\u65bc {1} \u5c08\u6848\u4e2d\u3002
-MESSAGE_INVALID_ALT_DD_WARN_=IWAE0022W {0} \u6a21\u7d44\u5177\u6709 alt-dd {1}\uff0c\u4f46 EAR {2} \u4e2d\u6c92\u6709\u8cc7\u6e90\u3002
-INVALID_MANIFEST_CLASSPATH_ONE_WARN_=IWAE0023W \u4fdd\u5b58\u6a94 {0} \u7684 Manifest \u985e\u5225\u8def\u5f91\u542b\u6709\u5728 EAR {1} \u4e2d\u7121\u6cd5\u89e3\u6790\u7684\u9805\u76ee\u3002
-INVALID_MANIFEST_CLASSPATH_TWO_WARN_=IWAE0024W \u4fdd\u5b58\u6a94 {0} \u7684 Manifest \u985e\u5225\u8def\u5f91\u542b\u6709\u5728\u4f01\u696d\u61c9\u7528\u7a0b\u5f0f {2} \u4e2d\u7121\u6cd5\u89e3\u6790\u6210\u6a94\u6848\u6216\u6a21\u7d44\u7684\u9805\u76ee {1}\u3002
-INVALID_MANIFEST_CLASSPATH_DEPENDENCY_WARN_=IWAE0025W {0} \u6a21\u7d44\u7684 Manifest \u985e\u5225\u8def\u5f91\u542b\u6709\u89e3\u6790\u4fdd\u5b58\u6a94 {2} \u7684\u9805\u76ee {1}\u3002\u9019\u500b\u76f8\u4f9d\u95dc\u4fc2\u4e0d\u7b26\u5408 J2EE \u898f\u683c\u3002
-PROJECT_IS_CLOSED_WARN_=IWAE0026W \u7121\u6cd5\u5c0d\u5df2\u95dc\u9589\u7684 {0} \u5c08\u6848\u57f7\u884c EAR \u9a57\u8b49\u5de5\u4f5c\u3002\u8acb\u958b\u555f\u5c08\u6848\uff0c\u7136\u5f8c\u91cd\u8a66\u3002
-PROJECT_DOES_NOT_EXIST_WARN_=IWAE0027W \u5de5\u4f5c\u5340\u4e2d\u6c92\u6709\u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {2} \u4e2d\u6a21\u7d44\u6216\u516c\u7528\u7a0b\u5f0f JAR {1} \u7684 {0} \u5c08\u6848\u3002
-MISSING_WEBNATURE_FORMODULE_WARN_=IWAE0028W \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684 Web \u6a21\u7d44 {0} \u4e0d\u662f J2EE Web \u5c08\u6848\u3002
-DEPRECATED_ABSPATHS_WARN_=IWAE0029W \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {0} \u4e2d\u7684 IBM \u5ef6\u4f38\u6a94\u6848\u4e2d\u542b\u6709\u4f5c\u5ee2\u7684\u7d55\u5c0d\u8def\u5f91\u3002\u8acb\u4f7f\u7528\u61c9\u7528\u7a0b\u5f0f\u7de8\u8f2f\u5668\u4f86\u6e05\u7406\u6a94\u6848\u3002
-INVALID_CONTEXTROOT_WEBMODULE_WARN_=IWAE0030W \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d Web \u6a21\u7d44 {0} \u7684\u74b0\u5883\u5b9a\u7fa9\u6839\u8207 {2} \u4e4b Web \u5c08\u6848\u8a2d\u5b9a\u4e2d\u7684\u74b0\u5883\u5b9a\u7fa9\u6839\u4e0d\u7b26\u3002
-MISSING_CLIENTNATURE_FORMODULE_WARN_=IWAE0031W \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684\u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef\u6a21\u7d44 {0} \u4e0d\u662f\u61c9\u7528\u7a0b\u5f0f\u7528\u6236\u7aef\u5c08\u6848\u3002
-MISSING_EJBNATURE_FORMODULE_WARN_=IWAE0032W \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684 EJB \u6a21\u7d44 {0} \u4e0d\u662f EJB \u5c08\u6848\u3002
-MISSING_PROJECT_FORMODULE_WARN_=IWAE0033W \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 {1} \u4e2d\u7684\u6a21\u7d44 {0} \u672a\u5c0d\u6620\u81f3\u5de5\u4f5c\u53f0\u5c08\u6848\u3002\u8acb\u4f7f\u7528\u61c9\u7528\u7a0b\u5f0f\u7de8\u8f2f\u5668\u4f86\u66f4\u6b63\u3002
-INVALID_CASE_FOR_MANIFEST_ERROR_=IWAE0038E \u4fdd\u5b58\u6a94 {1} \u4e2d\u7684 Manifest \u6a94\u540d\u7a31 "{0}" \u7684\u5927\u5c0f\u5beb\u4e0d\u6b63\u78ba\u3002\u6a94\u540d\u5fc5\u9808\u662f "META-INF/MANIFEST.MF"\uff0c\u9700\u5340\u5206\u5927\u5c0f\u5beb\u3002
-URI_ALREADY_EXISTS_IN_EAR_WARN_=IWAE0039W \u5c08\u6848\u516c\u7528\u7a0b\u5f0f JAR URI {0} \u8207 {1} \u5c08\u6848\u4e2d\u7684\u73fe\u6709\u6a94\u6848\u885d\u7a81\u3002
-MISSING_MODULE_EXTENSION_ERROR_=IWAE0040E EAR \u5c08\u6848\u4e2d\u7684\u61c9\u7528\u7a0b\u5f0f\u5ef6\u4f38\uff1a{0} \u907a\u6f0f\u6a21\u7d44\u5c08\u6848\u7684\u6a21\u7d44\u5ef6\u4f38\uff1a{1}\u3002
-PROJECT_SERVER_TARGET_DOES_NOT_MATCH_EAR=\u6a21\u7d44\u5c08\u6848 "{0}" \u7684\u76ee\u6a19\u4f3a\u670d\u5668\u4e0d\u7b26\u5408\u6240\u5728\u7684\u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 "{1}" \u7684\u76ee\u6a19\u4f3a\u670d\u5668
-NO_SERVER_TARGET_MODULE_IN_EAR_WITH_SERVER_TARGET=\u6c92\u6709\u76ee\u6a19\u4f3a\u670d\u5668\u7684\u6a21\u7d44\u5c08\u6848 "{0}" \u5c6c\u65bc\u6709\u76ee\u6a19\u4f3a\u670d\u5668\u7684\u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\u5c08\u6848 "{1}"
-NO_SERVER_TARGET_ON_EAR_WITH_MODULE_SERVER_TARGETS=ear \u5c08\u6848 "{0}" \u6c92\u6709\u76ee\u6a19\u4f3a\u670d\u5668\uff0c\u4f46\u5b83\u7684\u6a21\u7d44\u5c08\u6848 "{1}" \u6709\u76ee\u6a19\u4f3a\u670d\u5668
-INVALID_EAR_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \u898f\u683c EAR \u5c08\u6848 "{0}" \u6709\u4e0d\u76f8\u5bb9\u7684\u76ee\u6a19\u4f3a\u670d\u5668 "{1}"
-INVALID_MODULE_SERVER_TARGET_FOR_14_SPEC_LEVEL=J2EE 1.4 \u898f\u683c\u6a21\u7d44\u5c08\u6848 "{0}" \u6709\u4e0d\u76f8\u5bb9\u7684\u76ee\u6a19\u4f3a\u670d\u5668 "{1}"\u3002
-MESSAGE_INCOMPATIBLE_SPEC_WARNING_=IWAE0008E \u76f8\u8f03\u65bc "{1}" \u4f01\u696d\u61c9\u7528\u7a0b\u5f0f\uff0c"{0}" \u6a21\u7d44\u662f\u4e0d\u76f8\u5bb9\u7684 J2EE \u898f\u683c\u5c64\u6b21\u3002
-EAR_VALIDATION_INTERNAL_ERROR_UI_=IWAE0053E \u5728 {0} \u5c08\u6848\u4e0a\u57f7\u884c\u9a57\u8b49\u6642\uff0c\u767c\u751f\u5167\u90e8\u932f\u8aa4\uff0c\u8acb\u6aa2\u67e5\u65e5\u8a8c\u6a94\uff0c\u4ee5\u53d6\u5f97\u8a73\u7d30\u8cc7\u6599\u3002
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 4e132fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator.properties
+++ /dev/null
@@ -1,1528 +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.
-
-###########################################################################
-#
-# 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/ejbvalidator_de.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_de.properties
deleted file mode 100644
index 0f2883e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_de.properties
+++ /dev/null
@@ -1,1528 +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={0} wird ausgewertet.
-
-LOC_CLASS=Klasse: {0}
-LOC_FIELD=Feld: {0}, Klasse: {1}
-LOC_METHOD=Methode: {0}, Klasse: {1}
-LOC_BEAN=Enterprise-Bean: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, Enterprise-Bean: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=Element <method>: {0}
-LOC_METHODPERMISSION=Element <method-permission>: {0}
-LOC_METHODTRANSACTION=Element <container-transaction>: {0}
-LOC_EJBRELATION=Element <ejb-relation>: {0}
-LOC_EJBRELATIONSHIPROLE=Element <ejb-relationship-role>: {0}, Element <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: Interner Fehler beim Ausf\u00fchren des EJB-Pr\u00fcfprogramms. Im Protokoll sind Einzelheiten hierzu enthalten.
-CHKJ2852=CHKJ2852W: Interner fehler beim \u00dcberpr\u00fcfen von {0}. Die \u00fcberpr\u00fcfte Bean war {1}.
-CHKJ2433=CHKJ2433W: Die \u00dcberpr\u00fcfung von {0} ist nicht m\u00f6glich, da {1} nicht wiedergegeben werden kann. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2907=CHKJ2907E: Typ {0} oder eine seiner Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2905=CHKJ2905W: Das EJB-Pr\u00fcfprogramm wurde nicht ausgef\u00fchrt, da die Datei "ejb-jar.xml" nicht geladen werden konnte. Weitere Informationen erhalten Sie durch Ausf\u00fchren des XML-Pr\u00fcfprogramms.
-CHKJ2041=CHKJ2041I: Permanente Klassen und Schnittstellen m\u00fcssen sich in einem benannten Paket befinden. (JLS 2.0: 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: {0} muss {1} f\u00fcr {2} ausl\u00f6sen (throw), oder es sind Kompilierungsfehler im Implementierungscode vorhanden.
-CHKJ2456.m=CHKJ2456W: Diese Methode muss {0} f\u00fcr {1} ausl\u00f6sen (throw), oder es sind Kompilierungsfehler im Implementierungscode vorhanden.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: Die Schl\u00fcsselklasse {0} muss die Methode {1} implementieren. (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: Diese Klasse muss eine entsprechende Methode "ejbPostCreate" f\u00fcr {0} implementieren. (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: Diese Klasse muss eine entsprechende Methode "ejbPostCreate" f\u00fcr diese Methode implementieren. (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: Diese Klasse darf javax.ejb.SessionSynchronization nicht implementieren. (EJB 1.1: 6.5.3).
-CHKJ2003I.ejb11=CHKJ2003I: Zustandsbehaftete (stateful) Session-Beans f\u00fcr Bean-gesteuerte Transaktionen brauchen javax.ejb.SessionSynchronization nicht zu implementieren. (EJB 1.1: 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: Die Bean-Klasse {1} darf die ejbFind-Methode {0} nicht implementieren. (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: Die Bean-Klasse {0} darf eine ejbFind-Methode nicht implementieren. (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} muss entweder eine "create"- oder "find"-Methode sein. (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: Die Methode muss entweder eine "create"- oder "find"-Methode sein. (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: Die Bean-Klasse {0} muss einen \u00f6ffentlichen (public) Konstruktor haben, der keine Argumente annimmt. (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: Die Bean-Klasse {0} muss einen \u00f6ffentlichen (public) Konstruktor haben, der keine Argumente annimmt. (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007E: {0} darf die Methode "finalize()" nicht deklarieren. (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007E: {0} darf die Methode "finalize()" nicht deklarieren. (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: Die Bean-Klasse {0} muss mindestens eine Methode "ejbCreate" enthalten. (EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: Die Bean-Klasse {0} muss mindestens eine Methode "ejbFindByPrimaryKey" enthalten. (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: Die Home-Schnittstelle {0} muss mindestens eine Methode "create" enthalten. (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: Die Home-Schnittstelle {0} darf nur eine Methode "findByPrimaryKey" enthalten. (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: Dieser Typ muss eine Schnittstelle sein. (EJB 1.1: 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: Dieser Typ muss eine Schnittstelle sein. (EJB 1.1: 6.10.6).
-CHKJ2012.er.ejb11=CHKJ2012E: Dieser Typ muss eine Schnittstelle sein. (EJB 1.1: 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: Dieser Typ muss eine Schnittstelle sein. (EJB 1.1: 9.2.8).
-CHKJ2013.sb.ejb11=CHKJ2013E: Die Bean-Klasse {0} muss {1} implementieren. (EJB 1.1: 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: Die Bean-Klasse {0} muss {1} implementieren. (EJB 1.1: 9.2.2).
-CHKJ2014.sb.ejb11=CHKJ2014E: Die Bean-Klasse {0} kann nicht abstrakt (abstract) sein. (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: Die Bean-Klasse {0} kann nicht abstrakt (abstract) sein. (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: Die Bean-Klasse {0} kann nicht final (final) sein. (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: Die Bean-Klasse {0} kann nicht final (final) sein. (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: Die Schnittstelle muss {0} erweitern. (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: Die Schnittstelle muss {0} erweitern. (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: Die Schnittstelle muss {0} erweitern. (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: Die Schnittstelle muss {0} erweitern. (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: Die Schl\u00fcsselklasse {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 9.2.9) (RMI 1.3: 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: Die Schl\u00fcsselklasse {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: Die Schl\u00fcsselklasse {0} muss einen \u00f6ffentlichen (public) Standardkonstruktur definieren. (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: Die Bean-Klasse {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: Die Bean-Klasse {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: F\u00fcr {0} muss in der Bean-Klasse {1} eine entsprechende Methode vorhanden sein. (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: F\u00fcr diese Methode muss in der Bean-Klasse {0} eine entsprechende Methode vorhanden sein. (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: F\u00fcr {0} muss in der Bean-Klasse {1} eine entsprechende Methode vorhanden sein. (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: F\u00fcr diese Methode muss in der Bean-Klasse {0} eine entsprechende Methode vorhanden sein. (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} darf nicht vorhanden sein. Nur create() kann vorhanden sein (EJB 1.1: 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: Diese Methode darf nicht vorhanden sein. Nur create() kann vorhanden sein (EJB 1.1: 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} darf nicht vorhanden sein. Nur ejbCreate() kann vorhanden sein (EJB 1.1: 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: Diese Methode darf nicht vorhanden sein. Nur ejbCreate() kann vorhanden sein (EJB 1.1: 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: Die Bean-Klasse {1} muss eine entsprechende Methode "ejbCreate" f\u00fcr {0} implementieren. (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: Die Bean-Klasse {0} muss eine entsprechende Methode "ejbCreate" f\u00fcr diese Methode implementieren. (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: Die Bean-Klasse {1} muss eine entsprechende Methode "ejbCreate" f\u00fcr {0} implementieren. (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: Die Bean-Klasse {0} muss eine entsprechende Methode "ejbCreate" f\u00fcr diese Methode implementieren. (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: {0} wird erst dann aufgerufen, wenn eine entsprechende Methode "ejbCreate2 definiert wurde. (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: Diese Methode wird erst dann aufgerufen, wenn eine entsprechende Methode "ejbCreate2 definiert wurde. (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: {0} kann ohne eine entsprechende Methode "create" in der Home-Schnittstelle {1} nicht aufgerufen werden. (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: Diese Methode kann ohne eine entsprechende Methode "create" in der Home-Schnittstelle {0} nicht aufgerufen werden. (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: F\u00fcr {0} muss in der Bean-Klasse {1} eine entsprechende Methode "ejbFind" vorhanden sein. (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: F\u00fcr diese Methode muss in der Bean-Klasse {0} eine entsprechende Methode "ejbFind" vorhanden sein. (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: Die Bean-Klasse {0} muss mindestens ein containergesteuertes Feld deklarieren. (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: Die Methode setEntityContext(EntityContext ic) muss vorhanden sein. (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: Die Methode unsetEntityContext() muss vorhanden sein. (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: Die Methode ejbActivate() muss vorhanden sein. (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: Die Methode ejbPassivate() muss vorhanden sein. (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: Die Methode ejbRemove() muss vorhanden sein. (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: Die Methode ejbLoad() muss vorhanden sein. (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: Die Methode ejbStore() muss vorhanden sein. (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" darf nicht als Methodenargument oder Ergebnis \u00fcbergeben werden. (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: Beide Endpunkte der Berechtigungsklasse m\u00fcssen dieselbe Anzahl von Attributen verwenden.
-CHKJ2101.ejb11=CHKJ2101E: Beide Endpunkte der Berechtigungsklasse m\u00fcssen denselben Typ verwenden.
-CHKJ2102.eh.ejb11=CHKJ2102E: Es muss entweder ein Finder-Deskriptor oder eine \u00fcbereinstimmende angepasste Finder-Methode in der Klasse {0} definiert sein.
-CHKJ2103.ejb11=CHKJ2103E: In einer Komponentenvererbungshierarchie muss die Bean-Klasse {0} {1} erben. (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: In einer Komponentenvererbungshierarchie darf die Home-Schnittstelle {0} {1} nicht erben. (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: In einer Komponentenvererbungshierarchie muss die Remote-Schnittstelle {0} {1} erben. (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: Bean {0} muss {1} als ihre <prim-key-class> (prim\u00e4re Schl\u00fcsseklasse) verwenden. (EJB 1.1: B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: Das statische (static) Feld {0} muss "final" sein. (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: Dieses statische (static) Feld muss "final" sein. (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} darf nicht "transient" sein. (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: Das Feld darf nicht "transient" sein. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: Der Feldtyp von feld {0} ist f\u00fcr eine CMP-Bean ung\u00fcltig. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: Der Feldtyp ist f\u00fcr eine CMP-Bean ung\u00fcltig. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: Das Feld muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: Das Prim\u00e4rschl\u00fcsselfeld mit dem Namen {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: Das Prim\u00e4rschl\u00fcsselfeld muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} muss ein Element <cmp-field> von {1} und ein Feld der Bean-Klasse {2} sein. (EJB 1.1: 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: Dieses Feld muss ein Element <cmp-field> von {0} und ein Feld der Bean-Klasse {1} sein. (EJB 1.1: 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: Das Schl\u00fcsselfeld {0} muss denselben Typ wie der Prim\u00e4rschl\u00fcssel {1} haben. (EJB 1.1: 9.4.7.1).
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException bei Methode {0}. (EJB 1.1: 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException. (EJB 1.1: 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException bei Methode {0}. (EJB 1.1: 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException. (EJB 1.1: 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException bei {0}. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException bei {0}. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException bei {0}. (EJB 1.1: 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException. (EJB 1.1: 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException bei {0}. (EJB 1.1: 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: Veraltete Verwendung von java.rmi.RemoteException. (EJB 1.1: 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} muss "void" zur\u00fcckgeben. (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: Diese Methode muss "void" zur\u00fcckgeben. (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} muss den Typ der Remote-Schnittstelle {1} zur\u00fcckgeben.  (EJB 1.1: 6.10.6).
-CHKJ2402.sh.m.ejb11=CHKJ2402W: Diese Methode "create" muss den Typ der Remote-Schnittstelle {0} zur\u00fcckgeben.  (EJB 1.1: 6.10.6).
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} muss den Typ der Remote-Schnittstelle {1} zur\u00fcckgeben.  (EJB 1.1: 9.2.8).
-CHKJ2402.eh.m.ejb11=CHKJ2402W: Diese Methode "create" muss den Typ der Remote-Schnittstelle {0} zur\u00fcckgeben.  (EJB 1.1: 9.2.8).
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} muss {1} oder eine Collection davon zur\u00fcckgeben. (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: Die Methode muss {0} oder eine Collection davon zur\u00fcckgeben. (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: Die Reihenfolge und die Typen der Argumente in {0} m\u00fcssen mit der Reihenfolge und den Typen der Felder in der Schl\u00fcsselklasse {1} \u00fcbereinstimmen. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: Die Reihenfolge und die Typen der Argumente m\u00fcssen mit der Reihenfolge und den Typen der Felder in der Schl\u00fcsselklasse {0} \u00fcbereinstimmen. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} muss den Prim\u00e4rschl\u00fcsseltyp {1} zur\u00fcckgeben. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: Die Methode muss den Prim\u00e4rschl\u00fcsseltyp {0} zur\u00fcckgeben. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} muss entweder {1} oder eine Collection davon zur\u00fcckgeben.  (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: Diese Methode muss entweder {0} oder eine Collection davon zur\u00fcckgeben.  (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: Die Methode muss \u00f6ffentlich (public) sein. (EJB 1.1: 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 1.1: 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 1.1: 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} darf nicht final (final) sein. (EJB 1.1: 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: Diese Methode darf nicht final (final) sein. (EJB 1.1: 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} darf nicht final (final) sein. (EJB 1.1: 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: Diese Methode darf nicht final (final) sein. (EJB 1.1: 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} darf nicht final (final) sein. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: Diese Methode darf nicht final (final) sein. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} darf nicht final (final) sein. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: Diese Methode darf nicht final (final) sein. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} darf nicht final (final) sein. (EJB 1.1: 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: Diese Methode darf nicht final (final) sein. (EJB 1.1: 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} darf nicht final (final) sein. (EJB 1.1: 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: Diese Methode darf nicht final (final) sein. (EJB 1.1: 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} darf nicht statisch (static) sein. (EJB 1.1: 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: Diese Methode darf nicht statisch (static) sein. (EJB 1.1: 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} darf nicht statisch (static) sein. (EJB 1.1: 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: Diese Methode darf nicht statisch (static) sein. (EJB 1.1: 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} darf nicht statisch (static) sein. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: Diese Methode darf nicht statisch (static) sein. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} darf nicht statisch (static) sein. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: Diese Methode darf nicht statisch (static) sein. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} darf nicht statisch (static) sein. (EJB 1.1: 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: Diese Methode darf nicht statisch (static) sein. (EJB 1.1: 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} darf nicht statisch (static) sein. (EJB 1.1: 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: Diese Methode darf nicht statisch (static) sein. (EJB 1.1: 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: Der Name von {0}  darf nicht mit "ejb" beginnen. (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: Der Name der Methode darf nicht mit "ejb" beginnen. (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: Der Name von {0}  darf nicht mit "ejb" beginnen. (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: Der Name der Methode darf nicht mit "ejb" beginnen. (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: Der R\u00fcckgabetyp von {0} muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: Der R\u00fcckgabetyp muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: Der R\u00fcckgabetyp von {0} muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: Der R\u00fcckgabetyp muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: Der R\u00fcckgabetyp von {0} muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: Der R\u00fcckgabetyp muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: Der R\u00fcckgabetyp von {0} muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: Der R\u00fcckgabetyp muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: Der R\u00fcckgabetyp von {0} muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: Der R\u00fcckgabetyp muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: Der R\u00fcckgabetyp von {0} muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: Der R\u00fcckgabetyp muss zur Laufzeit serialisierbar sein.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: Argument {1} von {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: Argument {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: Argument {1} von {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: Argument {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: Argument {1} von {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: Argument {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: Argument {1} von {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: Argument {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: Argument {1} von {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: Argument {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: Argument {1} von {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: Argument {0} muss zur Laufzeit serialisierbar sein. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} muss {1} ausl\u00f6sen (throw). (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: Die Methode muss {0} ausl\u00f6sen (throw). (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} muss {1} ausl\u00f6sen (throw). (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: Die Methode muss {0} ausl\u00f6sen (throw). (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} muss {1} ausl\u00f6sen (throw). (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: Die Methode muss {0} ausl\u00f6sen (throw). (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} muss {1} ausl\u00f6sen (throw). (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: Die Methode muss {0} ausl\u00f6sen (throw). (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: Der R\u00fcckgabetyp von {0} muss mit dem R\u00fcckgabetyp {1} der entsprechenden Methode in der Bean-Klasse {2} \u00fcbereinstimmen. (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: Der R\u00fcckgabetyp muss mit dem R\u00fcckgabetyp {0} der entsprechenden Methode in der Bean-Klasse {1} \u00fcbereinstimmen. (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: Der R\u00fcckgabetyp von {0} muss mit dem R\u00fcckgabetyp {1} der entsprechenden Methode in der Bean-Klasse {2} \u00fcbereinstimmen. (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: Der R\u00fcckgabetyp muss mit dem R\u00fcckgabetyp {0} der entsprechenden Methode in der Bean-Klasse {1} \u00fcbereinstimmen. (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: Der R\u00fcckgabetyp von {0} muss mit dem R\u00fcckgabetyp {1} der entsprechenden Methode in der Bean-Klasse {2} \u00fcbereinstimmen. (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: Der R\u00fcckgabetyp muss mit dem R\u00fcckgabetyp {0} der entsprechenden Methode in der Bean-Klasse {1} \u00fcbereinstimmen. (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: Der R\u00fcckgabetyp von {0} muss mit dem R\u00fcckgabetyp {1} der entsprechenden Methode in der Bean-Klasse {2} \u00fcbereinstimmen. (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: Der R\u00fcckgabetyp muss mit dem R\u00fcckgabetyp {0} der entsprechenden Methode in der Bean-Klasse {1} \u00fcbereinstimmen. (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} muss "void" zur\u00fcckgeben. (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: Diese Methode muss "void" zur\u00fcckgeben. (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} muss eine Methode "create" sein. (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: Diese Methode muss eine Methode "create" sein. (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1} muss durch die entsprechende Methode {0} in der Home-Schnittstelle {2} ausgel\u00f6st werden. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0} muss durch die entsprechende Methode in der Home-Schnittstelle {1} ausgel\u00f6st werden. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1} muss durch die entsprechende Methode {0} in der Home-Schnittstelle {2} ausgel\u00f6st werden. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0} muss durch die entsprechende Methode in der Home-Schnittstelle {1} ausgel\u00f6st werden. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: Die entsprechende Methode von {0} in der Remote-Schnittstelle {1} muss {2} ausl\u00f6sen (throw). (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: Die entsprechende Methode in der Remote-Schnittstelle {0} muss {1} ausl\u00f6sen (throw). (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: Die entsprechende Methode von {0} in der Remote-Schnittstelle {1} muss {2} ausl\u00f6sen (throw). (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: Die entsprechende Methode in der Remote-Schnittstelle {0} muss {1} ausl\u00f6sen (throw). (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: Der Wert des Elements <ejb-name> muss angegeben werden. (EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: <ejb-class>-Klasse {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: Im Element <ejb-class> ist eine unbekannte Klasse angegeben. (EJB 1.1: 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: <home>-Schnittstelle {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: Im Element <home> ist eine unbekannte Schnittstelle angegeben. (EJB 1.1: 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: <remote>-Schnittstelle {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: Im Element <remote> ist eine unbekannte Schnittstelle angegeben. (EJB 1.1: 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2806E: Der Wert des Elements <reentrant> muss entweder "True" oder "False" sein. (EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: Der Wert des Elements <session-type> muss entweder "Stateful" oder "Stateless" sein. (EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: Der Wert des Elements <transaction-type> muss entweder "Container" oder "Bean" sein. (EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: Der Wert des Elements <persistence-type> muss entweder "Container" oder "Bean" sein.  (EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: <prim-key-class>-Klasse {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: Im Element <prim-key-class> ist eine unbekannte Klasse angegeben.  (EJB 1.1: 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> von {0} kann in der Bean-Klasse {1} nicht lokalisiert werden. (EJB 1.1: 16.5).
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> muss ein Element <field-name> angeben. (EJB 1.1: 16.5).
-CHKJ2812.ejb11=CHKJ2812E: Die Bean-Klasse {0} muss mindestens eines ihrer Felder als <cmp-field> angeben. (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814E: Das Element <ejb-name> in der Methode <method> muss eine bekannte Enterprise-Bean angeben. (EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: Der Verweis auf dien Sicherheitsberechtigungsklasse darf nur einmal definiert werden.
-CHKJ2822.ejb11=CHKJ2822W: Das Element <security-role-ref> f\u00fcr die Bean {0} muss das Element <role-name> definieren. (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: Das Element <security-role-ref> muss das Element <role-link> definieren. (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: Das Element <security-role-ref> verweist auf die unbekannte Berechtigungsklasse {0}. (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: Das Element <security-role> in "ejb-jar.xml" muss das Element <role-name> definieren. (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: Der Name der Sicherheitsberechtigungsklasse muss eindeutig sein. (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: Ein Element <role-link> kann nicht ohne Elemente <security-role> verwendet werden. (EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: Das Element <primkey-field> kann ohne einen Basiselementprim\u00e4rschl\u00fcssel (primitive) nicht verwendet werden. (EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: Die Schl\u00fcsselklasse {0} stimmt mit keinem Feld in der Enterprise-Bean {1} \u00fcberein. (EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: Der Typ des Felds {0} kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2831.ejb11=CHKJ2831W: {0} muss in einem Element <cmp-field> deklariert sein. (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: Home {0}, das im Element <ejb-ref> angegeben wurde, kann im EJB-Modul nicht gefunden werden. (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: Remote {0}, das im Element <ejb-ref> angegeben wurde, kann im EJB-Modul nicht gefunden werden. (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: Bean {0}, das im Element <ejb-ref> angegeben wurde, kann im EJB-Modul nicht gefunden werden. (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Bean {0} ist vom Typ {1}. Aktualisieren Sie das Element <ejb-ref-type> des Elements <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Bean {0} verwendet home {1}. Aktualisieren Sie das Element <ejb-ref> des Elements <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I:  Bean {0} verwendet remote {1}. Aktualisieren Sie das Element <ejb-ref> des Elements <ejb-ref>. (EJB 1.1: 14.3.2).
-CHKJ2838.ejb11=CHKJ2838I: Es wird empfohlen, alle Verweise auf Enterprise-Beans im Subkontext "ejb" zu verwalten. (EJB 1.1: 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: Das Element <env-entry-name> des Elements <env-entry> ist ung\u00fcltig. (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: Das Element <env-entry-type> des Elements <env-entry> ist ung\u00fcltig. (EJB 1.1: 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: Der Name von {0} im Element <env-entry-name> kann in der Bean nur ein Mal verwendet werden. (EJB 1.1: 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: <method-params> wird ignoriert, wenn <method-name> "*" ist. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: Keine Methoden in {0} stimmen mit diesem Element <method> \u00fcberein. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: Es muss mindestens ein Element <method> in einem Element <method-permission> definiert sein. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: Es muss mindestens ein Element <role-name> in einem Element <method-permission> definiert sein. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: F\u00fcr dieses Element <method-permission> wurden keine Methoden gefunden. (EJB 1.1: 15.3.2).
-CHKJ2847.ejb11=CHKJ2847W: F\u00fcr dieses Element <container-transaction> wurden keine Methoden gefunden. (EJB 1.1: 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: Die Komponentenvererbung von {0} kann nicht ausgewertet werden, da {1} oder einer der Supertypen nicht wiedergegeben werden kann. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2850.ejb11=CHKJ2802E: <method> kann nicht ausgewertet werden, da {0} oder einer der Supertypen nicht wiedergegeben werden kann. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2851.ejb11=CHKJ2851W: {0} kann nicht ausgewertet werden, da {1} oder einer der Supertypen nicht wiedergegeben werden kann. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2852.ejb11=CHKJ2852W: Bei dem Versuch, die Datei "ejb-jar.xml" auszuwerten, wurde ein Element der Throwable-Klasse abgefangen. Die ausgewertete Bean war {0}.
-CHKJ2853.ejb11=CHKJ2853W: Bei dem Versuch, die Datei "ibm-ejb-jar-ext.xmi" auszuwerten, wurde ein Element der Throwable-Klasse abgefangen. Die ausgewertete Bean war {0}.
-
-CHKJ2908.ejb11=CHKJ2908W: Eine Enterprise-Bean kann nicht richtig wiedergegeben werden. Weitere Informationen erhalten Sie durch Ausf\u00fchren des XML-Pr\u00fcfprogramms.
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} muss in der Datei ejb-jar.xml eindeutig sein. (EJB 1.1: 16.5).
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0} muss in jeder EAR-Datei vorhanden sein, die dieses EJB-Modul enth\u00e4lt (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: <primkey-field> kann ohne einen Basiselementprim\u00e4rschl\u00fcssel (primitive) nicht verwendet werden. (EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: Die Schl\u00fcsselklasse {0} stimmt mit keinem Feld in der Enterprise-Bean {1} \u00fcberein. (EJB 2.0: 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: Das Element <env-entry-name> des Elements <env-entry> ist ung\u00fcltig. (EJB 2.0: 20.2.1.2).
-CHKJ2840.ejb20=CHKJ2840W: Das Element <env-entry-type> des Elements <env-entry> ist ung\u00fcltig. (EJB 2.0: 20.2.1.2).
-CHKJ2841.ejb20=CHKJ2841W: Der Name von {0} im Element <env-entry-name> kann in der Bean nur ein Mal verwendet werden. (EJB 2.0: 20.2.1.2).
-CHKJ2830.ejb20=CHKJ2830W: Der Typ des Felds {0} kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2831.ejb20=CHKJ2831W: {0} muss in einem Element <cmp-field> deklariert sein. (EJB 2.0: 10.8.2).
-CHKJ2801.ejb20=CHKJ2801E: Der Wert des Elements <ejb-name> muss angegeben werden. (EJB 2.0 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: Der Wert des Elements <persistence-type> muss entweder "Container" oder "Bean" sein.  (EJB 2.0: 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2806E: Der Wert des Elements <reentrant> muss entweder "True" oder "False" sein. (EJB 2.0: 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: Der Wert des Elements <session-type> muss entweder "Stateful" oder "Stateless" sein. (EJB 2.0: 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: Der Wert des Elements <transaction-type> muss entweder "Container" oder "Bean" sein. (EJB 2.0: 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814E: Das Element <ejb-name> in der Methode <method> muss eine bekannte Enterprise-Bean angeben. (EJB 2.0: 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: <method-params> wird ignoriert, wenn <method-name> "*" ist. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: Keine Methoden in {0} stimmen mit diesem Element <method> \u00fcberein. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: Es muss mindestens ein Element <method> in einem Element <method-permission> definiert sein. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: Ein Element <role-name> oder <unchecked> muss in <method-permission> gesetzt werden. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: F\u00fcr dieses Element <method-permission> wurden keine Methoden gefunden. (EJB 2.0: 21.3.2).
-CHKJ2847.ejb20=CHKJ2847W: F\u00fcr dieses Element <container-transaction> wurden keine Methoden gefunden. (EJB 2.0: 17.4.1).
-CHKJ2812.ejb20=CHKJ2812E: Die Bean-Klasse {0} muss mindestens eines ihrer Felder als <cmp-field> angeben. (EJB 2.0: 22.5).
-CHKJ2832.ejb20=CHKJ2832I: Home {0}, das im Element <ejb-ref> angegeben wurde, kann im EJB-Modul nicht gefunden werden. (EJB 2.0: 20.3.1.2).
-CHKJ2833.ejb20=CHKJ2833I: Remote {0}, das im Element <ejb-ref> angegeben wurde, kann im EJB-Modul nicht gefunden werden. (EJB 2.0: 20.3.1.2).
-CHKJ2834.ejb20=CHKJ2834I: Bean {0}, das im Element <ejb-ref> angegeben wurde, kann im EJB-Modul nicht gefunden werden. (EJB 2.0: 20.3.2).
-CHKJ2835.ejb20=CHKJ2835I: Bean {0} ist vom Typ {1}. Aktualisieren Sie das Element <ejb-ref-type> des Elements <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2836.ejb20=CHKJ2836I: Bean {0} verwendet home {1}. Aktualisieren Sie das Element <ejb-ref> des Elements <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2837.ejb20=CHKJ2837I:  Bean {0} verwendet remote {1}. Aktualisieren Sie das Element <ejb-ref> des Elements <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2838.ejb20=CHKJ2838I: Es wird empfohlen, alle Verweise auf Enterprise-Beans im Subkontext "ejb" zu verwalten. (EJB 2.0: 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: Der Verweis auf dien Sicherheitsberechtigungsklasse ist mehrfach definiert.
-CHKJ2822.ejb20=CHKJ2822W: Das Element <security-role-ref> f\u00fcr die Bean {0} muss das Element <role-name> definieren. (EJB 2.0: 21.2.5.3).
-CHKJ2823.ejb20=CHKJ2823W: Das Element <security-role-ref> muss das Element <role-link> definieren. (EJB 2.0: 21.3.3).
-CHKJ2824.ejb20=CHKJ2824W: Das Element <security-role-ref> verweist auf die unbekannte Berechtigungsklasse {0}. (EJB 2.0: 21.3.3).
-CHKJ2825.ejb20=CHKJ2825W: Das Element <security-role> in "ejb-jar.xml" muss das Element <role-name> definieren. (EJB 2.0: 21.3.1).
-CHKJ2826.ejb20=CHKJ2826W: Der Name der Sicherheitsberechtigungsklasse muss eindeutig sein. (EJB 2.0: 21.3.1).
-CHKJ2827.ejb20=CHKJ2827W: Ein Element <role-link> kann nicht ohne Elemente <security-role> verwendet werden. (EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: Die \u00dcberpr\u00fcfung von <method> ist nicht m\u00f6glich, da der Typ {0} nicht wiedergegeben werden kann. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2851.ejb20=CHKJ2851W: Die \u00dcberpr\u00fcfung von {0} ist nicht m\u00f6glich, da Typ {1} nicht wiedergegeben werden kann. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0} muss in jeder EAR-Datei vorhanden sein, die dieses EJB-Modul enth\u00e4lt (EJB 2.0: 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: Diese Klasse darf javax.ejb.SessionSynchronization nicht implementieren (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: Stateful Session-Beans mit beanverwalteter Transaktion m\u00fcssen javax.ejb.SessionSynchronization nicht implementieren (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: <ejb-class>-Klasse {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: Die Bean-Klasse, die durch das Element <ejb-class> gekennzeichnet ist, kann nicht gefunden werden. (EJB 2.0: 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: <home>-Schnittstelle {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: Im Element <home> ist eine unbekannte Schnittstelle angegeben. (EJB 2.0: 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: <remote>-Schnittstelle {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: Im Element <remote> ist eine unbekannte Schnittstelle angegeben. (EJB 2.0: 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: <local-home>-Schnittstelle {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: Im Element <local-home> ist eine unbekannte Schnittstelle angegeben. (EJB 2.0: 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: <local>-Schnittstelle {0} oder eine ihrer Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: Im Element <local> ist eine unbekannte Schnittstelle angegeben. (EJB 2.0: 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: <prim-key-class>-Klasse {0} oder einer der Supertypen kann nicht wiedergegeben werden. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: Im Element <prim-key-class> ist eine unbekannte Klasse angegeben.  (EJB 2.0: 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: <field-name> von {0} kann in der Bean-Klasse {1} nicht lokalisiert werden. (EJB 2.0: 22.5).
-
-CHKJ2103.ejb20=CHKJ2103E: In einer Komponentenvererbungshierarchie muss die Bean-Klasse {0} {1} erben. (EJB 2.0: D.2).
-CHKJ2104.ejb20=CHKJ2104E: In einer Komponentenvererbungshierarchie darf die Home-Schnittstelle {0} {1} nicht erben. (EJB 2.0: D.2).
-CHKJ2105.ejb20=CHKJ2105E: In einer Komponentenvererbungshierarchie muss die Komponentenschnittstelle {0} {1} erben. (EJB 2.0: D.2).
-CHKJ2106.ejb20=CHKJ2106E: Bean {0} muss {1} als ihre <prim-key-class> (prim\u00e4re Schl\u00fcsseklasse) verwenden. (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: Die Komponentenvererbung von {0} kann nicht ausgewertet werden, da der Typ {1} oder einer seiner Abh\u00e4ngigkeiten nicht wiedergegeben werden kann. \u00dcberpr\u00fcfen Sie den Klassenpfad.
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} muss in der Datei ejb-jar.xml eindeutig sein. (EJB 2.0: 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: Diese Klasse muss {0} implementieren (EJB 2.0: 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: Diese Klasse muss {0} implementieren (EJB 2.0: 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: Diese Klasse muss {0} implementieren (EJB 2.0: 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: Diese Klasse muss {0} implementieren (EJB 2.0: 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBHome erweitern (EJB 2.0: 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBHome erweitern (EJB 2.0: 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBHome erweitern (EJB 2.0: 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBLocalHome erweitern (EJB 2.0: 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBLocalHome erweitern (EJB 2.0: 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBLocalHome erweitern (EJB 2.0: 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBObject erweitern (EJB 2.0: 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBObject erweitern (EJB 2.0: 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBObject erweitern (EJB 2.0: 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBLocalObject erweitern (EJB 2.0: 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBLocalObject erweitern (EJB 2.0: 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: Diese Schnittstelle muss javax.ejb.EJBLocalObject erweitern (EJB 2.0: 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" darf nicht als Methodenargument oder Ergebnis \u00fcbergeben werden. (EJB 2.0: 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" darf nicht als Methodenargument oder Ergebnis \u00fcbergeben werden. (EJB 2.0: 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" darf nicht als Methodenargument oder Ergebnis \u00fcbergeben werden. (EJB 2.0: 10.6.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: Diese Klasse darf nicht abstrakt sein. (EJB 2.0: 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: Diese Klasse darf nicht abstrakt sein. (EJB 2.0: 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: Diese Klasse darf nicht abstrakt sein. (EJB 2.0: 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: Diese Klasse darf nicht abstrakt sein. (EJB 2.0: 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: Diese Klasse muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: Diese Klasse muss \u00f6ffentlich (public) sein. (EJB 2.0: 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: Diese Klasse muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: Diese Klasse muss \u00f6ffentlich (public) sein. (EJB 2.0: 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: Diese Klasse muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: Diese Klasse darf nicht final sein. (EJB 2.0: 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: Diese Klasse darf nicht final sein. (EJB 2.0: 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: Diese Klasse darf nicht final sein. (EJB 2.0: 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: Diese Klasse darf nicht final sein. (EJB 2.0: 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: Diese Klasse muss serialisierbar sein. EJB 2.0: 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: Diese Klasse muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: Diese Klasse darf nicht abstrakt sein. (EJB 2.0: 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: Diese Klasse mus ein g\u00fcltiger Werttyp in RMI-IIOP sein. (EJB 2.0: 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: Diese Klasse mus ein g\u00fcltiger Werttyp in RMI-IIOP sein. (EJB 2.0: 9.8, 12.2.12).
-
-
-###
-# methods which must exist
-###
-# public default constructor with no parameters
-CHKJ2050.constr.sb.ejb20=CHKJ2050W: \u00d6ffentliches (public) Element {0} muss vorhanden sein (EJB 2.0: 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: \u00d6ffentliches (public) Element {0} muss vorhanden sein (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: \u00d6ffentliches (public) Element {0} muss vorhanden sein (EJB 2.0: 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: \u00d6ffentliches (public) Element {0} muss vorhanden sein (EJB 2.0: 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: \u00d6ffentliches (public) Element {0} muss vorhanden sein (EJB 2.0: 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: Diese Klasse muss {0} definieren. (EJB 2.0: 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) muss vorhanden sein. (EJB 2.0: 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: Mindestens eine ejbCreate-Methode muss vorhanden sein. (EJB 2.0: 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: Die ejbCreate()-Methode muss vorhanden sein. (EJB 2.0: 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: Die ejbCreate()-Methode muss vorhanden sein. (EJB 2.0: 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: Die Methode ejbFindByPrimaryKey muss vorhanden sein. (EJB 2.0: 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: Die setEntityContext(EntityContext)-Methode muss vorhanden sein. (EJB 2.0: 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: Die setEntityContext(EntityContext)-Methode muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: Die unsetEntityContext()-Methode muss vorhanden sein. (EJB 2.0: 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: Die unsetEntityContext()-Methode muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: Die ejbActivate()-Methode muss vorhanden sein. (EJB 2.0: 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: Die ejbActivate()-Methode muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: Die ejbPassivate()-Methode muss vorhanden sein. (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: Die ejbPassivate()-Methode muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: Die ejbPassivate()-Methode muss vorhanden sein. (EJB 2.0: 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: Die ejbRemove()-Methode muss vorhanden sein. (EJB 2.0: 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: Die ejbRemove()-Methode muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: Die ejbRemove()-Methode muss vorhanden sein. (EJB 2.0: 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: Die ejbRemove()-Methode muss vorhanden sein. (EJB 2.0: 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: Die ejbLoad()-Methode muss vorhanden sein. (EJB 2.0: 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: Die ejbLoad()-Methode muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: Die ejbStore()-Methode muss vorhanden sein. (EJB 2.0: 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: Die ejbStore()-Methode muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: Die create()-Methode muss vorhanden sein. (EJB 2.0: 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: Die create()-Methode muss vorhanden sein. (EJB 2.0: 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: Diese Schnittstelle muss mindestens eine "create"-Methode definieren. (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: Diese Schnittstelle muss mindestens eine "create"-Methode definieren. (EJB 2.0: 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: Mindestens eine "finder"-Methode muss vorhanden sein. (EJB 2.0: 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: Mindestens eine "finder"-Methode muss vorhanden sein. (EJB 2.0: 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: Mindestens eine "finder"-Methode muss vorhanden sein. (EJB 2.0: 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: Mindestens eine "finder"-Methode muss vorhanden sein. (EJB 2.0: 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: Diese Schnittstelle muss mindestens eine "home"-Methode definieren. (EJB 2.0: 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: Diese Schnittstelle muss mindestens eine "home"-Methode definieren. (EJB 2.0: 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: Diese Schnittstelle muss mindestens eine "home"-Methode definieren. (EJB 2.0: 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: Diese Schnittstelle muss mindestens eine "home"-Methode definieren. (EJB 2.0: 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: Diese Klasse muss mindestens eine "ejbHome"-Methode definieren. (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: Diese Klasse muss mindestens eine "ejbHome"-Methode definieren. (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: Diese Klasse muss mindestens eine "ejbHome"-Methode definieren. (EJB 2.0: 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: Diese Klasse muss mindestens eine "ejbHome"-Methode definieren. (EJB 2.0: 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() muss in dieser Klasse vorhanden sein. (EJB 2.0: 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() muss in dieser Klasse vorhanden sein. (EJB 2.0: 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) muss in dieser Klasse vorhanden sein. (EJB 2.0: 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) muss in dieser Klasse vorhanden sein. (EJB 2.0: 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: Eine ejbSelect-Methode muss vorhanden sein. (EJB 2.0: 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey muss vorhanden sein. (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey muss vorhanden sein. (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey muss vorhanden sein. (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey muss vorhanden sein. (EJB 2.0: 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} muss vorhanden sein. (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} muss vorhanden sein (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} muss vorhanden sein (EJB 2.0: 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: Anwendungsausnahmebedingung {1} f\u00fcr {0} muss java.lang.Exception erweitern (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: Anwendungsausnahmebedingung {0} muss java.lang.Exception erweitern (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: Anwendungsausnahmebedingung {1} f\u00fcr {0} darf java.lang.RuntimeException nicht erweitern (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: Anwendungsausnahmebedingung {0} darf java.lang.RuntimeException nicht erweitern (EJB 2.0: 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {0} auf {1} muss \u00f6ffentlich (public) sein. (EJB 2.0: 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {0} auf {1} muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {0} auf {1} muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {0} auf {1} muss \u00f6ffentlich (public) sein. (EJB 2.0: 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} darf nicht final sein. (EJB 2.0: 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: Diese Methode darf nicht final sein. (EJB 2.0: 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} darf nicht final sein. (EJB 2.0: 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: Diese Methode darf nicht final sein. (EJB 2.0: 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} darf nicht final sein. (EJB 2.0: 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: Diese Methode darf nicht final sein. (EJB 2.0: 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} darf nicht final sein. (EJB 2.0: 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: Diese Methode darf nicht final sein. (EJB 2.0: 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} darf nicht statisch (static) sein. (EJB 2.0: 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} darf nicht statisch (static) sein. (EJB 2.0: 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} darf nicht statisch (static) sein. (EJB 2.0: 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} darf nicht statisch (static) sein. (EJB 2.0: 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} darf nicht final sein. (EJB 2.0: 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} darf nicht final sein. (EJB 2.0: 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} darf nicht final sein. (EJB 2.0: 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} darf nicht final sein. (EJB 2.0: 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: Diese Methode darf nicht final sein. (EJB 2.0: 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: Diese Methode darf nicht final sein. (EJB 2.0: 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: Diese Methode darf nicht final sein. (EJB 2.0: 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: Diese Methode darf nicht final sein. (EJB 2.0: 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} darf nicht statisch (static) sein. (EJB 2.0: 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} darf nicht statisch (static) sein. (EJB 2.0: 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} darf nicht statisch (static) sein. (EJB 2.0: 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} darf nicht statisch (static) sein. (EJB 2.0: 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: Diese Methode muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} darf keine Anwendungsausnahmebedingungen ausl\u00f6sen (throw). (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: Diese Methode darf keine Anwendungsausnahmebedingungen ausl\u00f6sen (throw). (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} darf keine Anwendungsausnahmebedingungen ausl\u00f6sen (throw). (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: Diese Methode darf keine Anwendungsausnahmebedingungen ausl\u00f6sen (throw). (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} darf keine Anwendungsausnahmebedingungen ausl\u00f6sen (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: Diese Methode darf keine Anwendungsausnahmebedingungen ausl\u00f6sen (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} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} darf nicht final sein. (EJB 2.0: 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} darf nicht final sein. (EJB 2.0: 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: Diese Methode darf nicht final sein. (EJB 2.0: 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: Diese Methode darf nicht final sein. (EJB 2.0: 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} darf nicht statisch (static) sein. (EJB 2.0: 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} darf nicht statisch (static) sein. (EJB 2.0: 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} muss f\u00fcr {0} vorhanden sein, um aufgerufen werden zu k\u00f6nnen. (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} muss f\u00fcr {0} vorhanden sein, um aufgerufen werden zu k\u00f6nnen. (EJB 2.0: 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} muss f\u00fcr diese Methode vorhanden sein, um aufgerufen werden zu k\u00f6nnen. (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} muss f\u00fcr diese Methode vorhanden sein, um aufgerufen werden zu k\u00f6nnen. (EJB 2.0: 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} muss \u00f6ffentlich (public) sein.  (EJB 2.0: 12.2.6).
-CHKJ2431.cb.m.ejb20=CHKJ2431W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: Diese Methode muss \u00f6ffentlich (public) sein.  (EJB 2.0: 12.2.6).
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} darf nicht statisch (static) sein. (EJB 2.0: 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} darf nicht statisch (static) sein. (EJB 2.0: 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar (EJB 2.0: 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} darf nicht final sein. (EJB 2.0: 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: Diese Methode darf nicht final sein. (EJB 2.0: 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} darf nicht statisch (static) sein. (EJB 2.0: 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: {0} auf Methode {1} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} muss {1} oder entsprechende Objektgruppe zur\u00fcckgeben (EJB 2.0: 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: Diese Methode muss {0} oder eine entsprechende Objektgruppe zur\u00fcckgeben. (EJB 2.0: 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: Diese Methode darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. Der Container stellt diese Methodenimplementierung zur Verf\u00fcgung. (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. Der Container stellt diese Methodenimplementierung zur Verf\u00fcgung. (EJB 2.0: 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. Lediglich CMP-Beans d\u00fcrfen ejbSelect-Methoden haben. (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. Lediglich CMP-Beans d\u00fcrfen ejbSelect-Methoden haben. (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. Lediglich CMP-Beans d\u00fcrfen ejbSelect-Methoden haben. (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. Lediglich CMP-Beans d\u00fcrfen ejbSelect-Methoden haben. (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. Lediglich CMP-Beans d\u00fcrfen ejbSelect-Methoden haben. (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. Lediglich CMP-Beans d\u00fcrfen ejbSelect-Methoden haben. (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein. (EJB 2.0: 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() darf nicht vorhanden sein (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() darf nicht vorhanden sein (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() darf nicht vorhanden sein (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() darf nicht vorhanden sein (EJB 2.0: 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein (EJB 2.0: 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein (EJB 2.0: 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein (EJB 2.0: 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} darf nicht vorhanden sein (EJB 2.0: 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: Diese Methode darf nicht vorhanden sein (EJB 2.0: 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: Der Name der Methode {0} darf nicht mit "ejb" beginnen. (EJB 2.0: 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: Der Name der Methode {0} darf nicht mit "ejb" beginnen. (EJB 2.0: 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: Der Name der Methode {0} darf nicht mit "ejb" beginnen. (EJB 2.0: 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: Dieser Methodenname darf nicht mit "ejb" beginnen. (EJB 2.0: 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: Dieser Methodenname darf nicht mit "ejb" beginnen. (EJB 2.0: 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: Dieser Methodenname darf nicht mit "ejb" beginnen. (EJB 2.0: 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.7).
-CHKJ2441.sb.m.ejb20=CHKJ2441W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 7.10.4).
-CHKJ2441.cb.m.ejb20=CHKJ2441W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.8).
-CHKJ2441.bb.m.ejb20=CHKJ2441W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} darf nicht final sein. (EJB 2.0: 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} darf nicht final sein. (EJB 2.0: 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} darf nicht final sein. (EJB 2.0: 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: Diese Methode darf nicht final sein. (EJB 2.0: 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: Diese Methode darf nicht final sein. (EJB 2.0: 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: Diese Methode darf nicht final sein. (EJB 2.0: 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} darf nicht statisch (static) sein. (EJB 2.0: 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} darf nicht statisch (static) sein. (EJB 2.0: 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} darf nicht statisch (static) sein. (EJB 2.0: 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} darf nicht final sein. (EJB 2.0: 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: Diese Methode darf nicht final sein. (EJB 2.0: 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} darf nicht statisch (static) sein. (EJB 2.0: 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: Diese Methode darf nicht statisch (static) sein. (EJB 2.0: 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} muss void zur\u00fcckgeben. (EJB 2.0: 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: Diese Methode muss void zur\u00fcckgeben. (EJB 2.0: 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} muss abstrakt sein. (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: Diese Methode muss abstrakt sein. (EJB 2.0: 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0} darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: Diese Methode darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0} darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: Diese Methode darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: Diese Schnittstelle muss die RMI-IIOP-Regeln f\u00fcr ferne Schnittstellen befolgen. (EJB 2.0: 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: Diese Schnittstelle muss die RMI-IIOP-Regeln f\u00fcr ferne Schnittstellen befolgen. (EJB 2.0: 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: Diese Schnittstelle muss die RMI-IIOP-Regeln f\u00fcr ferne Schnittstellen befolgen. (EJB 2.0: 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: Der Name der Methode {0} darf nicht mit "create" beginnen. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: Der Name der Methode {0} darf nicht mit "create" beginnen. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: Der Name der Methode {0} darf nicht mit "create" beginnen. (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: Der Name der Methode {0} darf nicht mit "create" beginnen. (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: Dieser Methodenname darf nicht mit "create" beginnen. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: Dieser Methodenname darf nicht mit "create" beginnen. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: Dieser Methodenname darf nicht mit "create" beginnen. (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: Dieser Methodenname darf nicht mit "create" beginnen. (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: Der Name der Methode {0} darf nicht mit "find" beginnen. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: Der Name der Methode {0} darf nicht mit "find" beginnen. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: Der Name der Methode {0} darf nicht mit "find" beginnen. (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: Der Name der Methode {0} darf nicht mit "find" beginnen. (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: Dieser Methodenname darf nicht mit "find" beginnen. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: Dieser Methodenname darf nicht mit "find" beginnen. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: Dieser Methodenname darf nicht mit "find" beginnen. (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: Dieser Methodenname darf nicht mit "find" beginnen. (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: Der Name der Methode {0} darf nicht mit "remove" beginnen. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: Der Name der Methode {0} darf nicht mit "remove" beginnen. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: Der Name der Methode {0} darf nicht mit "remove" beginnen. (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: Der Name der Methode {0} darf nicht mit "remove" beginnen. (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: Dieser Methodenname darf nicht mit "remove" beginnen. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: Dieser Methodenname darf nicht mit "remove" beginnen. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: Dieser Methodenname darf nicht mit "remove" beginnen. (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: Dieser Methodenname darf nicht mit "remove" beginnen. (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: Diese Methode muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: Diese Methode muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: Diese Methode muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: Diese Methode muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: Diese Methode muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: Diese Methode muss javax.ejb.CreateException ausl\u00f6sen (throw). (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} muss Methode create() sein (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} muss Methode create() sein (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: Diese Methode muss die Methode create() sein (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: Diese Methode muss die Methode create() sein (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} muss die Methode ejbCreate() sein (EJB 2.0: 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: Diese Methode muss die Methode ejbCreate() sein (EJB 2.0: 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: Die \u00fcbereinstimmende Methode {1} f\u00fcr {0} muss auf {2} vorhanden sein. (EJB 2.0: 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: Diese Methode muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: Diese Methode muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: Diese Methode muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: Diese Methode muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: Diese Methode darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: Diese Methode darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: Diese Methode darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: Diese Methode darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: Diese Methode darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: Diese Methode darf nicht ObjectNotFoundException ausl\u00f6sen (throw). (EJB 2.0: 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} muss {1} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} muss {1} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} muss {1} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} muss {1} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: Diese Methode muss {0} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: Diese Methode muss {0} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: Diese Methode muss {0} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: Diese Methode muss {0} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} muss auf {2} f\u00fcr {0} vorhanden sein. (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} muss auf {2} f\u00fcr {0} vorhanden sein. (EJB 2.0: 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} muss auf {2} f\u00fcr {0} vorhanden sein. (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} muss auf {2} f\u00fcr {0} vorhanden sein. (EJB 2.0: 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} muss einem Abfrageelement in ejb-jar.xml zugeordnet sein (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: Diese Methode muss einem Abfrageelement in ejb-jar.xml zugeordnet sein (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} muss einem Abfrageelement in ejb-jar.xml zugeordnet sein (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: Diese Methode muss einem Abfrageelement in ejb-jar.xml zugeordnet sein (EJB 2.0: 10.5.6, 10.6.14).
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: Diese Methode muss java.rmi.RemoteException ausl\u00f6sen (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: Diese Methode darf nicht java.rmi.RemoteException ausl\u00f6sen (throw). (EJB 2.0: 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} muss {1} f\u00fcr {2} ausl\u00f6sen (throw). (EJB 2.0: 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} muss {1} f\u00fcr {2} ausl\u00f6sen (throw). (EJB 2.0: 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} muss {1} f\u00fcr {2} ausl\u00f6sen (throw). (EJB 2.0: 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} muss {1} f\u00fcr {2} ausl\u00f6sen (throw). (EJB 2.0: 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} muss {1} f\u00fcr {2} ausl\u00f6sen (throw). (EJB 2.0: 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} muss {1} f\u00fcr {2} ausl\u00f6sen (throw). (EJB 2.0: 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: Diese Methode muss {0} f\u00fcr {1} ausl\u00f6sen (throw). (EJB 2.0: 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: Diese Methode muss {0} f\u00fcr {1} ausl\u00f6sen (throw). (EJB 2.0: 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: Diese Methode muss {0} f\u00fcr {1} ausl\u00f6sen (throw). (EJB 2.0: 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: Diese Methode muss {0} f\u00fcr {1} ausl\u00f6sen (throw). (EJB 2.0: 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: Diese Methode muss {0} f\u00fcr {1} ausl\u00f6sen (throw). (EJB 2.0: 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: Diese Methode muss {0} f\u00fcr {1} ausl\u00f6sen (throw). (EJB 2.0: 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: {1} in Methode {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} darf nicht den Typ {1} aussetzen (EJB 2.0: 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} darf nicht den Typ {1} aussetzen (EJB 2.0: 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} darf nicht den Typ {1} aussetzen (EJB 2.0: 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: Diese Methode darf nicht den Typ {0} aussetzen (EJB 2.0: 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: Diese Methode darf nicht den Typ {0} aussetzen (EJB 2.0: 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: Diese Methode darf nicht den Typ {0} aussetzen (EJB 2.0: 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: Diese Schnittstelle muss die RMI-IIOP-Regeln f\u00fcr ferne Schnittstellen befolgen. (EJB 2.0: 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: Diese Schnittstelle muss die RMI-IIOP-Regeln f\u00fcr ferne Schnittstellen befolgen. (EJB 2.0: 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: Diese Schnittstelle muss die RMI-IIOP-Regeln f\u00fcr ferne Schnittstellen befolgen. (EJB 2.0: 12.2.8).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: {0} in Methode {1} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: {0} in Methode {1} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: {0} in Methode {1} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} muss zur Laufzeit serialisierbar sein. (EJB 2.0: 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: {1} in Methode {0} kann mein Argument oder kein Ergebnistyp sein. (EJB 2.0: 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} darf {1} nicht als Argument oder Ergebnis \u00fcbergeben. (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} darf {1} nicht als Argument oder Ergebnis \u00fcbergeben. (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: Diese Methode darf {0} nicht als Argument oder Ergebnis \u00fcbergeben. (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: Diese Methode darf {0} nicht als Argument oder Ergebnis \u00fcbergeben. (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} kann mein Argument oder kein Ergebnistyp sein. (EJB 2.0: 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} darf nicht {1} aussetzen (expose). (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: Diese Methode darf nicht {0} aussetzen (expose). (EJB 2.0: 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0} darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: Diese Methode darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} muss abstrakt sein. (EJB 2.0: 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: Diese Methode muss abstrakt sein. (EJB 2.0: 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: Diese Methode muss \u00f6ffentlich (public) sein. (EJB 2.0: 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: Diese Methode muss javax.ejb.FinderException ausl\u00f6sen (throw). (EJB 2.0: 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} muss {1} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: Diese Methode muss {0} oder eine Collection davon zur\u00fcckgeben. (EJB 2.0: 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} muss einem Abfrageelement in ejb-jar.xml zugeordnet sein. (EJB 2.0: 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: Diese Methode muss einem Abfrageelement in ejb-jar.xml zugeordnet sein. (EJB 2.0: 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: F\u00fcr die Methode {0} muss {1} auf {2} vorhanden sein. (EJB 2.0: 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: F\u00fcr die Methode {0} muss {1} auf {2} vorhanden sein. (EJB 2.0: 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: F\u00fcr die Methode {0} muss {1} auf {2} vorhanden sein. (EJB 2.0: 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: F\u00fcr die Methode {0} muss {1} auf {2} vorhanden sein. (EJB 2.0: 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: F\u00fcr die Methode {0} muss {1} auf {2} vorhanden sein. (EJB 2.0: 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: F\u00fcr die Methode {0} muss {1} auf {2} vorhanden sein. (EJB 2.0: 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: Die Methode {0} muss auf {1} vorhanden sein. (EJB 2.0: 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 12.2.10).
-CHKJ2470.src.m.ejb20=CHKJ2470E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 7.10.5).
-CHKJ2470.slc.m.ejb20=CHKJ2470E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 7.10.7).
-CHKJ2470.crc.m.ejb20=CHKJ2470E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 10.6.9).
-CHKJ2470.clc.m.ejb20=CHKJ2470E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 10.6.11).
-CHKJ2470.brc.m.ejb20=CHKJ2470E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 12.2.8).
-CHKJ2470.blc.m.ejb20=CHKJ2470E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} muss {1} ausl\u00f6sen (throw). (EJB 2.0: 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} muss {1} ausl\u00f6sen (throw). (EJB 2.0: 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} muss {1} ausl\u00f6sen (throw). (EJB 2.0: 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} muss {1} ausl\u00f6sen (throw). (EJB 2.0: 10.6.11).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} muss {1} ausl\u00f6sen (throw). (EJB 2.0: 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} muss {1} ausl\u00f6sen (throw). (EJB 2.0: 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: Diese Methode muss {0} ausl\u00f6sen (throw). (EJB 2.0: 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: Diese Methode muss {0} ausl\u00f6sen (throw). (EJB 2.0: 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: Diese Methode muss {0} ausl\u00f6sen (throw). (EJB 2.0: 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: Diese Methode muss {0} ausl\u00f6sen (throw). (EJB 2.0: 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: Diese Methode muss {0} ausl\u00f6sen (throw). (EJB 2.0: 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: Diese Methode muss {0} ausl\u00f6sen (throw). (EJB 2.0: 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0} wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0} wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0} wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0} wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0} wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0} wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: Diese Methode wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: Diese Methode wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: Diese Methode wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: Diese Methode wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: Diese Methode wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: Diese Methode wird durch den Container zur Verf\u00fcgung gestellt. (EJB 2.0: 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} muss findByPrimaryKey({1}) sein. (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} muss findByPrimaryKey({1}) sein. (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} muss findByPrimaryKey(Object) sein. (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} muss findByPrimaryKey(Object) sein. (EJB 2.0: 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} muss findByPrimaryKey({1}) sein. (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} muss findByPrimaryKey({1}) sein. (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: Diese Methode muss findByPrimaryKey({0}) sein. (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: Diese Methode muss findByPrimaryKey({0}) sein. (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: Diese Methode muss findByPrimaryKey(Object) sein. (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: Diese Methode muss findByPrimaryKey(Object) sein. (EJB 2.0: 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: Diese Methode muss findByPrimaryKey({0}) sein. (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: Diese Methode muss findByPrimaryKey({0}) sein. (EJB 2.0: 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} must muss {1} zur\u00fcckgeben. (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} muss {1} zur\u00fcckgeben. (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} must muss {1} zur\u00fcckgeben. (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=CHKJ2479E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=CHKJ2479E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=CHKJ2479E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=CHKJ2479E: Diese Methode muss {0} zur\u00fcckgeben. (EJB 2.0: 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: Das Transient-Feld {0} darf nicht den Typ {1} haben. (EJB 2.0: 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: Ein Transient-Feld darf nicht den Typ {0} haben. (EJB 2.0: 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: Transient-Felder ({0}) werden discouraged (EJB 2.0: 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: Transient-Felder werden 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} darf nicht definiert sein. (EJB 2.0: 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0} darf nicht definiert sein. (EJB 2.0: 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} muss mit einem Kleinbuchstaben beginnen. (EJB 2.0: 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} muss mit einem Kleinbuchstaben beginnen. (EJB 2.0: 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} muss als <cmp-field> deklariert sein. (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} muss als <cmp-field> deklariert sein. (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} muss als <cmr-field> deklariert sein. (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} muss als <cmr-field> deklariert sein. (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0} darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0} darf nicht ungesch\u00fctzt (exposed) sein. (EJB 2.0: 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} muss entweder ein Primitive oder ein serialisierbarer Typ sein. (EJB 2.0: 10.3.1).
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} muss entweder ein Primitive oder ein serialisierbarer Typ sein. (EJB 2.0: 10.3.1).
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: Feld {0} muss vom Typ {1} sein. (EJB 2.0: 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: Dieses Feld muss vom Typ {0} sein. (EJB 2.0: 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: Feld {0} muss \u00f6ffentlich (public) (EJB 2.0: 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: Dieses Feld muss \u00f6ffentlich (public) (EJB 2.0: 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: Feld {0} muss ein <cmp-field> sein. (EJB 2.0: 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: Dieses Feld muss ein <cmp-field> sein. (EJB 2.0: 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: Diese Bean muss ein <local-home> angeben. (EJB 2.0: 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: Diese Bean muss ein <home> angeben. (EJB 2.0: 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: Diese Bean muss ein <local> angeben. (EJB 2.0: 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: Diese Bean muss ein <remote> angeben. (EJB 2.0: 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: Diese Bean muss entweder <local-home> oder <home> angeben(EJB 2.0: 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: Diese Bean muss entweder <local> oder <remote> angeben (EJB 2.0: 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: Diese Bean muss ein <local-home> angeben. (EJB 2.0: 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: Diese Bean muss ein <home> angeben. (EJB 2.0: 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: Diese Bean muss ein <local> angeben. (EJB 2.0: 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: Diese Bean muss ein <remote> angeben. (EJB 2.0: 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: Diese Bean muss entweder <local-home> oder <home> angeben (EJB 2.0: 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: Diese Bean muss entweder <local> oder <remote> angeben (EJB 2.0: 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: Diese Bean muss ein <local-home> angeben. (EJB 2.0: 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: Diese Bean muss ein <home> angeben. (EJB 2.0: 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: Diese Bean muss ein <local> angeben. (EJB 2.0: 12.2.1).
-CHKJ2883.b.ejb20=CHKJ2883W: Diese Bean muss ein <remote> angeben. (EJB 2.0: 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: Diese Bean muss entweder <local-home> oder <home> angeben (EJB 2.0: 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: Diese Bean muss entweder <local> oder <remote> angeben (EJB 2.0: 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} muss eine g\u00fcltige Java-Kennung sein. (EJB 2.0: 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} muss eine g\u00fcltige Java-Kennung sein. (EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} muss in der Datei ejb-jar.xml eindeutig sein. (EJB 2.0: 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> muss vorhanden sein. (EJB 2.0: 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: Reservierte Kennung {0} kann nicht als ein <ejb-name> verwendet werden. (EJB 2.0: 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: Reservierte Kennung {0} kann nicht als ein <abstract-schema-name> verwendet werden. (EJB 2.0: 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} muss eine g\u00fcltige Java-Kennung sein und mit einem Kleinbuchstaben beginnen. (EJB 2.0: 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} muss eine g\u00fcltige Java-Kennung sein und mit einem Kleinbuchstaben beginnen. (EJB 2.0: 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} muss eine set-Methode haben. (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} muss eine get-Methode haben. (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} muss eine set-Methode haben. (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} muss eine get-Methode haben. (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} muss entweder ein Java-Primitive oder ein serialisierbarer Java-Typ sein. (EJB 2.0: 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} muss den Typ {1} oder eine Collection davon sein. (EJB 2.0: 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: Abh\u00e4ngige Werteklasse {0} kann kein <cmr-field> sein. (EJB 2.0: 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> muss in ejb-jar.xml eindeutig sein (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> muss in <ejb-relation> eindeutig sein (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: Der Wert des Elements <multiplicity> muss entweder "One" (= Einer) oder "Many" (= Viele) sein (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: <relationship-role-source> f\u00fcr die Berechtigungsklasse {0} muss auf eine bestehende CMP-Bean verweisen (EJB 2.0: 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> muss mit einem Element <multiplicity> des Werts "One" verwendet werden (EJB 2.0: 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} muss f\u00fcr {1} definiert sein (EJB 2.0: 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: Diese Bean kann nur unidirektionale Beziehungen zu anderen Beans aufweisen (EJB 2.0: 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: Der Wert des Elements <cmr-field-type> muss entweder "java.util.Collection" oder "java.util.Set" sein (EJB 2.0: 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: Mindestens ein Element <ejb-relationship-role> muss ein Element <cmr-field> definieren (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} muss vorhanden sein (EJB 2.0: 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} muss auf eine CMP-Bean verweisen (EJB 2.0: 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: Der Wert des Elements <cmp-version> muss entweder "1.x" oder "2.x" sein (EJB 2.0: 22.5).
-CHKJ2873.ejb20=CHKJ2873W: Migrieren Sie die Datenquellebindung dieser Bean auf eine Bindung f\u00fcr CMP-Verbindungsfactory.
-CHKJ2874.ejb20=CHKJ2874W: Migrieren Sie die Standarddatenquellenbindung dieses EJB-Moduls auf eine Standardbindung f\u00fcr CMP-Verbindungsfactory.
-
-###########################################################################
-#
-# 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/ejbvalidator_es.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_es.properties
deleted file mode 100644
index 66486ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_es.properties
+++ /dev/null
@@ -1,1528 +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=Se est\u00e1 validando {0}.
-
-LOC_CLASS=Clase: {0}
-LOC_FIELD=Campo: {0}, Clase: {1}
-LOC_METHOD=M\u00e9todo: {0}, Clase: {1}
-LOC_BEAN=Bean de empresa: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, Bean de empresa: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=Elemento <method>: {0}
-LOC_METHODPERMISSION=Elemento <method-permission>: {0}
-LOC_METHODTRANSACTION=Elemento <container-transaction>: {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: Error interno al ejecutar el validador EJB. Encontrar\u00e1 los detalles en el archivo de anotaciones.
-CHKJ2852=CHKJ2852W: Error interno mientras se validaba {0}. El bean que se estaba validando era {1}.
-CHKJ2433=CHKJ2433W: No se puede validar {0} porque no se puede reflejar {1}. Compruebe la v\u00eda de acceso de clases.
-CHKJ2907=CHKJ2907E: El tipo {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2905=CHKJ2905W: El validador EJB no se ha podido ejecutar porque no se pudo cargar el archivo ejb-jar.xml. Ejecute el validador XML para obtener m\u00e1s informaci\u00f3n.
-CHKJ2041=CHKJ2041I: Las clases e interfaces permanentes deben estar en un paquete con nombre. (JLS 2.0: 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: {0} debe lanzar {1} para {2} o puede haber errores de compilaci\u00f3n en el c\u00f3digo de despliegue.
-CHKJ2456.m=CHKJ2456W: Este m\u00e9todo debe lanzar {0} para {1} o puede haber errores de compilaci\u00f3n en el c\u00f3digo de despliegue.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: La clase de clave {0} debe implementar el m\u00e9todo {1}. (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: Esta clase debe implementar un m\u00e9todo ejbPostCreate correspondiente para {0}. (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: Esta clase debe implementar un m\u00e9todo ejbPostCreate correspondiente para este m\u00e9todo. (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: Esta clase no debe implementar javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2003I.ejb11=CHKJ2003I: Los beans de sesi\u00f3n con estado de transacci\u00f3n gestionados por bean no necesitan implementar javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: La clase de bean {1} no debe implementar el m\u00e9todo ejbFind de {0}. (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: La clase de bean {0} no debe implementar un m\u00e9todo ejbFind. (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} debe ser un m\u00e9todo de creaci\u00f3n o un m\u00e9todo de b\u00fasqueda. (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: El m\u00e9todo debe ser un m\u00e9todo de creaci\u00f3n o un m\u00e9todo de b\u00fasqueda. (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: La clase de bean {0} debe tener un constructor p\u00fablico que no tome argumentos. (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: La clase de bean {0} debe tener un constructor p\u00fablico que no tome argumentos. (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} no debe declarar el m\u00e9todo finalize(). (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} no debe declarar el m\u00e9todo finalize(). (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: La clase de bean {0} debe contener al menos un m\u00e9todo ejbCreate. (EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: La clase de bean {0} debe contener al menos un m\u00e9todo ejbFindByPrimaryKey. (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: La interfaz inicial {0} debe contener al menos un m\u00e9todo create. (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: La interfaz inicial {0} debe contener un m\u00e9todo findByPrimaryKey. (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: Este tipo debe ser una interfaz. (EJB 1.1: 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: Este tipo debe ser una interfaz. (EJB 1.1: 6.10.6).
-CHKJ2012.er.ejb11=CHKJ2012E: Este tipo debe ser una interfaz. (EJB 1.1: 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: Este tipo debe ser una interfaz. (EJB 1.1: 9.2.8).
-CHKJ2013.sb.ejb11=CHKJ2013E: La clase de bean {0} debe implementar {1}. (EJB 1.1: 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: La clase de bean {0} debe implementar {1}. (EJB 1.1: 9.2.2).
-CHKJ2014.sb.ejb11=CHKJ2014E: La clase de bean {0} no puede ser abstracta. (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: La clase de bean {0} no puede ser abstracta. (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: La clase de bean {0} no puede ser final. (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: La clase de bean {0} no puede ser final. (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: La interfaz no debe ampliar {0}. (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: La interfaz no debe ampliar {0}. (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: La interfaz no debe ampliar {0}. (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: La interfaz no debe ampliar {0}. (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: la clase de clave {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 9.2.9) (RMI 1.3: 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: La clase de clave {0} debe ser p\u00fablica. (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: La clase de clave {0} debe definir un constructor predeterminado p\u00fablico. (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: La clase de bean {0} debe ser p\u00fablica. (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: La clase de bean {0} debe ser p\u00fablica. (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: {0} debe tener su m\u00e9todo correspondiente en la clase de bean {1}. (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: Este m\u00e9todo debe tener su m\u00e9todo correspondiente en la clase de bean {0}. (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: {0} debe tener su m\u00e9todo correspondiente en la clase de bean {1}. (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: Este m\u00e9todo debe tener su m\u00e9todo correspondiente en la clase de bean {0}. (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} no debe existir. Solo puede existir create() (EJB 1.1: 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: Este m\u00e9todo no debe existir. Solo puede existir create() (EJB 1.1: 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} no debe existir. Solo puede existir ejbCreate() (EJB 1.1: 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: Este m\u00e9todo no debe existir. Solo puede existir ejbCreate() (EJB 1.1: 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: La clase de bean {1} debe implementar un m\u00e9todo ejbCreate correspondiente para {0}. (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: La clase de bean {0} debe implementar un m\u00e9todo ejbCreate correspondiente para este m\u00e9todo. (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: La clase de bean {1} debe implementar un m\u00e9todo ejbCreate correspondiente para {0}. (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: La clase de bean {0} debe implementar un m\u00e9todo ejbCreate correspondiente para este m\u00e9todo. (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: No se llamar\u00e1 a {0} a menos que se defina un m\u00e9todo ejbCreate correspondiente. (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: No se llamar\u00e1 a este m\u00e9todo a menos que se defina un m\u00e9todo ejbCreate correspondiente. (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: No se puede llamar a {0} sin el correspondiente m\u00e9todo create en la interfaz inicial {1}. (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: No se puede llamar a este m\u00e9todo sin el correspondiente m\u00e9todo create en la interfaz inicial {0}. (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: {0} debe tener su m\u00e9todo ejbFind correspondiente en la clase del bean {1}. (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: Este m\u00e9todo debe tener su m\u00e9todo ejbFind correspondiente en la clase del bean {0}. (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: La clase de bean {0} debe declarar al menos un campo gestionado por el contenedor. (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: El m\u00e9todo setEntityContext(EntityContext ic) debe existir. (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: El m\u00e9todo unsetEntityContext() debe existir. (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: El m\u00e9todo ejbActivate() debe existir. (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: El m\u00e9todo ejbPassivate() debe existir. (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: El m\u00e9todo ejbRemove() debe existir. (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: El m\u00e9todo ejbLoad() debe existir. (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: El m\u00e9todo ejbStore() debe existir. (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" no debe pasarse como un argumento de m\u00e9todo o resultado. (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: Los dos extremos del cometido deben utilizar el mismo n\u00famero de atributos.
-CHKJ2101.ejb11=CHKJ2101E: Los dos extremos del cometido deben utilizar el mismo tipo.
-CHKJ2102.eh.ejb11=CHKJ2102E: Debe definirse un descriptor finder o un m\u00e9todo finder personalizado correspondiente en la clase {0}.
-CHKJ2103.ejb11=CHKJ2103E: En una herencia de componentes, la clase de bean {0} debe heredar {1}. (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: En una herencia de componentes, la interfaz inicial {0} no debe heredar {1}. (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: En una herencia de componentes, la interfaz remota {0} debe heredar {1}. (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: El bean {0} debe utilizar {1} como su <prim-key-class> (EJB 1.1: B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: El campo est\u00e1tico {0} debe ser final. (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: Este campo est\u00e1tico debe ser final. (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} no  debe ser transitorio. (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: El campo no debe ser transitorio. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: El tipo del campo {0} no es v\u00e1lido para un bean CMP. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: El tipo del campo no es v\u00e1lido para un bean CMP. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} debe ser p\u00fablico. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: El campo debe ser p\u00fablico. (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: El campo de clave primaria llamado {0} debe ser p\u00fablico. (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: El campo de clave primaria debe ser p\u00fablico. (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} debe ser un elemento <cmp-field> de {1} y un campo de la clase de bean {2}. (EJB 1.1: 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: Este campo debe ser un elemento <cmp-field> de {0} y un campo de la clase de bean {1}. (EJB 1.1: 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: El campo de clave {0} debe tener el mismo tipo que la clave primaria {1}. (EJB 1.1: 9.4.7.1).
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException en el m\u00e9todo {0}. (EJB 1.1: 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException. (EJB 1.1: 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException en el m\u00e9todo {0}. (EJB 1.1: 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException. (EJB 1.1: 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException en {0}. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException en {0}. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException en {0}. (EJB 1.1: 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException. (EJB 1.1: 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException en {0}. (EJB 1.1: 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: Utilizaci\u00f3n obsoleta de una java.rmi.RemoteException. (EJB 1.1: 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} debe devolver void. (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: Este m\u00e9todo debe devolver void. (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} debe devolver el tipo de la interfaz remota {1}.  (EJB 1.1: 6.10.6).
-CHKJ2402.sh.m.ejb11=CHKJ2402W: Este m\u00e9todo create debe devolver el tipo de la interfaz remota {0}.  (EJB 1.1: 6.10.6).
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} debe devolver el tipo de la interfaz remota {1}.  (EJB 1.1: 9.2.8).
-CHKJ2402.eh.m.ejb11=CHKJ2402W: Este m\u00e9todo create debe devolver el tipo de la interfaz remota {0}.  (EJB 1.1: 9.2.8).
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo. (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: El m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo. (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: El orden y los tipos de los argumentos de {0} deben coincidir con el orden y los tipos de los campos de la clase de clave {1}. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: El orden y los tipos de los argumentos deben coincidir con el orden y los tipos de los campos de la clase de clave {0}. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} debe devolver el tipo de clave primaria {1}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: El m\u00e9todo debe devolver el tipo de clave primaria {0}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo.  (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: Este m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo.  (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} debe ser p\u00fablico. (EJB 1.1: 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: El m\u00e9todo debe ser p\u00fablico. (EJB 1.1: 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} debe ser p\u00fablico. (EJB 1.1: 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: Este m\u00e9todo debe ser p\u00fablico. (EJB 1.1: 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} debe ser p\u00fablico. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo debe ser p\u00fablico. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} debe ser p\u00fablico. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo debe ser p\u00fablico. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} debe ser p\u00fablico. (EJB 1.1: 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo debe ser p\u00fablico. (EJB 1.1: 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} debe ser p\u00fablico. (EJB 1.1: 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo debe ser p\u00fablico. (EJB 1.1: 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} no debe ser final. (EJB 1.1: 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: Este m\u00e9todo no debe ser final. (EJB 1.1: 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} no debe ser final. (EJB 1.1: 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: Este m\u00e9todo no debe ser final. (EJB 1.1: 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} no debe ser final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo no debe ser final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} no debe ser final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo no debe ser final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} no debe ser final. (EJB 1.1: 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo no debe ser final. (EJB 1.1: 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} no debe ser final. (EJB 1.1: 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo no debe ser final. (EJB 1.1: 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} no debe ser est\u00e1tico. (EJB 1.1: 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: Este m\u00e9todo no debe ser est\u00e1tico. (EJB 1.1: 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} no debe ser est\u00e1tico. (EJB 1.1: 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: Este m\u00e9todo no debe ser est\u00e1tico. (EJB 1.1: 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} no debe ser est\u00e1tico. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo no debe ser est\u00e1tico. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} no debe ser est\u00e1tico. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo no debe ser est\u00e1tico. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} no debe ser est\u00e1tico. (EJB 1.1: 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo no debe ser est\u00e1tico. (EJB 1.1: 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} no debe ser est\u00e1tico. (EJB 1.1: 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo no debe ser est\u00e1tico. (EJB 1.1: 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: El nombre de {0} no debe empezar por "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: El nombre del m\u00e9todo no debe empezar por "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: El nombre de {0} no debe empezar por "ejb". (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: El nombre del m\u00e9todo no debe empezar por "ejb". (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: El tipo de retorno de {0} debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: El tipo de retorno debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: El tipo de retorno de {0} debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: El tipo de retorno debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: El tipo de retorno de {0} debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: El tipo de retorno debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: El tipo de retorno de {0} debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: El tipo de retorno debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: El tipo de retorno de {0} debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: El tipo de retorno debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: El tipo de retorno de {0} debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: El tipo de retorno debe ser serializable en tiempo de ejecuci\u00f3n.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: El argumento {1} de {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: El argumento {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: El argumento {1} de {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: El argumento {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: El argumento {1} de {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: El argumento {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: El argumento {1} de {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: El argumento {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: El argumento {1} de {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: El argumento {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: El argumento {1} de {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: El argumento {0} debe ser serializable en tiempo de ejecuci\u00f3n. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} debe lanzar {1}. (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: El m\u00e9todo debe lanzar {0}. (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} debe lanzar {1}. (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: El m\u00e9todo debe lanzar {0}. (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} debe lanzar {1}. (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: El m\u00e9todo debe lanzar {0}. (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} debe lanzar {1}. (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: El m\u00e9todo debe lanzar {0}. (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: El tipo de retorno de {0} debe coincidir con el tipo de retorno {1} del m\u00e9todo correspondiente de la clase de bean {2}. (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: El tipo de retorno debe coincidir con el tipo de retorno {0} del m\u00e9todo correspondiente de la clase de bean {1}. (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: El tipo de retorno de {0} debe coincidir con el tipo de retorno {1} del m\u00e9todo correspondiente de la clase de bean {2}. (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: El tipo de retorno debe coincidir con el tipo de retorno {0} del m\u00e9todo correspondiente de la clase de bean {1}. (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: El tipo de retorno de {0} debe coincidir con el tipo de retorno {1} del m\u00e9todo correspondiente de la clase de bean {2}. (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: El tipo de retorno debe coincidir con el tipo de retorno {0} del m\u00e9todo correspondiente de la clase de bean {1}. (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: El tipo de retorno de {0} debe coincidir con el tipo de retorno {1} del m\u00e9todo correspondiente de la clase de bean {2}. (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: El tipo de retorno debe coincidir con el tipo de retorno {0} del m\u00e9todo correspondiente de la clase de bean {1}. (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} debe devolver void. (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: Este m\u00e9todo debe devolver void. (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} debe ser un m\u00e9todo create. (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: Este m\u00e9todo debe ser un m\u00e9todo create. (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: El m\u00e9todo correspondiente de {0} de la interfaz inicial {2} debe lanzar {1}. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: El m\u00e9todo correspondiente de la interfaz inicial {1} debe lanzar {0}. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: El m\u00e9todo correspondiente de {0} de la interfaz inicial {2} debe lanzar {1}. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: El m\u00e9todo correspondiente de la interfaz inicial {1} debe lanzar {0}. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: El m\u00e9todo correspondiente de {0} de la interfaz remota {1} debe lanzar {2}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: El m\u00e9todo correspondiente de la interfaz remota {0} debe lanzar {1}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: El m\u00e9todo correspondiente de {0} de la interfaz remota {1} debe lanzar {2}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: El m\u00e9todo correspondiente de la interfaz remota {0} debe lanzar {1}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: Debe especificarse el valor del elemento <ejb-name>. (EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: La clase <ejb-class> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: Se especifica una clase desconocida en el elemento <ejb-class>. (EJB 1.1: 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: La interfaz <home> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: Se especifica una interfaz desconocida en el elemento <home>. (EJB 1.1: 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: La interfaz <remote> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: Se ha especificado una interfaz desconocida en el elemento <remote>. (EJB 1.1: 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2806E: El valor del elemento <reentrant> debe ser "True" o "False". (EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: El valor del elemento <session-type> debe ser "Stateful" o "Stateless". (EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: El valor del elemento <transaction-type> debe ser "Container" o "Bean". (EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: El valor del elemento <persistence-type> debe ser "Container" o "Bean".  (EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: La clase <prim-key-class> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: Se especifica una clase desconocida en el elemento <prim-key-class>.  (EJB 1.1: 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> {0} no se puede localizar en la clase de bean {1}. (EJB 1.1: 16.5).
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> debe especificar <field-name>. (EJB 1.1: 16.5).
-CHKJ2812.ejb11=CHKJ2812E: La clase de bean {0} debe especificar al menos uno de sus campos como elemento <cmp-field>. (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W: <ejb-name>, de <method>, debe especificar un bean de empresa conocido. (EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: La referencia del cometido de seguridad solo debe estar definida una vez.
-CHKJ2822.ejb11=CHKJ2822W: El elemento <security-role-ref> del bean {0} debe definir el elemento <role-name>. (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: El elemento <security-role-ref> debe definir el elemento <role-link>. (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: El elemento <security-role-ref> hace referencia al cometido {0} desconocido. (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: El elemento <security-role> de ejb-jar.xml debe definir el elemento <role-name>. (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: El nombre del cometido de seguridad debe ser exclusivo. (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: No puede utilizarse un elemento <role-link> sin elementos <security-role>. (EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: No puede utilizarse un elemento <primkey-field> sin una clave primaria de tipo primitivo. (EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: La clase de clave {0} no se correlaciona con ninguno de los campos del bean de empresa {1}. (EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: El tipo del campo {0} no puede reflejarse. Compruebe la v\u00eda de acceso de clases.
-CHKJ2831.ejb11=CHKJ2831W: {0} debe declararse en un elemento <cmp-field>. (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: En el m\u00f3dulo EJB no se puede encontrar el Inicio {0} especificado en el elemento <ejb-ref>. (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: No se puede encontrar en el m\u00f3dulo EJB la interfaz remota {0} que se especifica en el elemento <ejb-ref>. (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: No se puede encontrar en el m\u00f3dulo EJB el bean {0} que se especifica en el elemento <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: El bean {0} es un tipo {1}. Actualice el elemento <ejb-ref-type> del elemento <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: El bean {0} utiliza el Inicio {1}. Actualice el elemento <ejb-ref> del elemento <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I: El bean {0} utiliza la interfaz remota {1}. Actualice el elemento <ejb-ref> del elemento <ejb-ref>. (EJB 1.1: 14.3.2).
-CHKJ2838.ejb11=CHKJ2838I: Es recomendable organizar todas las referencias a los beans de empresa en el subcontexto "ejb". (EJB 1.1: 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: El elemento <env-entry-name> del elemento <env-entry> no es v\u00e1lido. (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: El elemento <env-entry-type> del elemento <env-entry> no es v\u00e1lido. (EJB 1.1: 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: El nombre {0} del elemento <env-entry-name> solo puede utilizarse una vez en el bean. (EJB 1.1: 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: Se hace caso omiso de <method-params> cuando <method-name> es "*". (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: Ning\u00fan m\u00e9todo de {0} coincide con este <method>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: Debe establecerse al menos un <method> en un <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: Debe establecerse al menos un <role-name> en un <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: No se puede encontrar ning\u00fan m\u00e9todo para este <method-permission>. (EJB 1.1: 15.3.2).
-CHKJ2847.ejb11=CHKJ2847W: No se puede encontrar ning\u00fan m\u00e9todo para este <container-transaction>. (EJB 1.1: 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: No se puede validar la herencia de componentes de {0} porque {1}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2850.ejb11=CHKJ2850W: No se puede validar <method> porque {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2851.ejb11=CHKJ2851W: No se puede validar {0} porque {1}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2852.ejb11=CHKJ2852W: Se ha capturado Throwable al validar ejb-jar.xml. El bean que se estaba validando era {0}.
-CHKJ2853.ejb11=CHKJ2853W: Se ha capturado Throwable al validar ibm-ejb-jar-ext.xmi. El bean que se estaba validando era {0}.
-
-CHKJ2908.ejb11=CHKJ2908W: No puede reflejarse correctamente un bean de empresa. Ejecute el validador XML para obtener m\u00e1s informaci\u00f3n.
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} debe ser exclusivo dentro del archivo ejb-jar.xml (EJB 1.1: 16.5).
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0} debe existir en cada archivo EAR que contenga este m\u00f3dulo EJB (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: No se puede utilizar un <primkey-field> sin una clave primaria de tipo primitivo (EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: La clase de clave {0} no se correlaciona con ninguno de los campos del bean de empresa {1}. (EJB 2.0: 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: El elemento <env-entry-name> del elemento <env-entry> no es v\u00e1lido. (EJB 2.0: 20.2.1.2).
-CHKJ2840.ejb20=CHKJ2840W: El elemento <env-entry-type> del elemento <env-entry> no es v\u00e1lido. (EJB 2.0: 20.2.1.2).
-CHKJ2841.ejb20=CHKJ2841W: El nombre {0} del elemento <env-entry-name> solo puede utilizarse una vez en el bean. (EJB 2.0: 20.2.1.2).
-CHKJ2830.ejb20=CHKJ2830W: El tipo del campo {0} no puede reflejarse. Compruebe la v\u00eda de acceso de clases.
-CHKJ2831.ejb20=CHKJ2831W: {0} debe declararse en un elemento <cmp-field>. (EJB 2.0: 10.8.2).
-CHKJ2801.ejb20=CHKJ2801E: Debe especificarse el valor del elemento <ejb-name>. (EJB 2.0 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: El valor del elemento <persistence-type> debe ser "Container" o "Bean".  (EJB 2.0: 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2806E: El valor del elemento <reentrant> debe ser "True" o "False". (EJB 2.0: 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: El valor del elemento <session-type> debe ser "Stateful" o "Stateless". (EJB 2.0: 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: El valor del elemento <transaction-type> debe ser "Container" o "Bean". (EJB 2.0: 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814W: <ejb-name>, de <method>, debe especificar un bean de empresa conocido. (EJB 2.0: 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: Se hace caso omiso de <method-params> cuando <method-name> es "*". (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: Ning\u00fan m\u00e9todo de {0} coincide con este <method>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: Debe establecerse al menos un <method> en un <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: Debe establecerse un elemento <role-name> o <unchecked> en <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: No se puede encontrar ning\u00fan m\u00e9todo para este <method-permission>. (EJB 2.0: 21.3.2).
-CHKJ2847.ejb20=CHKJ2847W: No se puede encontrar ning\u00fan m\u00e9todo para este <container-transaction>. (EJB 2.0: 17.4.1).
-CHKJ2812.ejb20=CHKJ2812E: La clase de bean {0} debe especificar al menos uno de sus campos como elemento <cmp-field>. (EJB 2.0: 22.5).
-CHKJ2832.ejb20=CHKJ2832I: En el m\u00f3dulo EJB no se puede encontrar el Inicio {0} especificado en el elemento <ejb-ref>. (EJB 2.0: 20.3.1.2).
-CHKJ2833.ejb20=CHKJ2833I: No se puede encontrar en el m\u00f3dulo EJB la interfaz remota {0} que se especifica en el elemento <ejb-ref>. (EJB 2.0: 20.3.1.2).
-CHKJ2834.ejb20=CHKJ2834I: No se puede encontrar en el m\u00f3dulo EJB el bean {0} que se especifica en el elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2835.ejb20=CHKJ2835I: El bean {0} es un tipo {1}. Actualice el elemento <ejb-ref-type> del elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2836.ejb20=CHKJ2836I: El bean {0} utiliza el Inicio {1}. Actualice el elemento <ejb-ref> del elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2837.ejb20=CHKJ2837I: El bean {0} utiliza la interfaz remota {1}. Actualice el elemento <ejb-ref> del elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2838.ejb20=CHKJ2838I: Es recomendable organizar todas las referencias a los beans de empresa en el subcontexto "ejb". (EJB 2.0: 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: La referencia del cometido de seguridad se ha definido m\u00e1s de una vez.
-CHKJ2822.ejb20=CHKJ2822W: El elemento <security-role-ref> del bean {0} debe definir el elemento <role-name>. (EJB 2.0: 21.2.5.3).
-CHKJ2823.ejb20=CHKJ2823W: El elemento <security-role-ref> debe definir el elemento <role-link>. (EJB 2.0: 21.3.3).
-CHKJ2824.ejb20=CHKJ2824W: El elemento <security-role-ref> hace referencia al cometido {0} desconocido. (EJB 2.0: 21.3.3).
-CHKJ2825.ejb20=CHKJ2825W: El elemento <security-role> de ejb-jar.xml debe definir el elemento <role-name>. (EJB 2.0: 21.3.1).
-CHKJ2826.ejb20=CHKJ2826W: El nombre del cometido de seguridad debe ser exclusivo. (EJB 2.0: 21.3.1).
-CHKJ2827.ejb20=CHKJ2827W: No puede utilizarse un elemento <role-link> sin elementos <security-role>. (EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: No se puede validar <method> porque no se puede reflejar el tipo {0}. Compruebe la v\u00eda de acceso de clases.
-CHKJ2851.ejb20=CHKJ2851W: No se puede validar {0} porque no se puede reflejar el tipo {1}. Compruebe la v\u00eda de acceso de clases.
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0} debe existir en cada archivo EAR que contenga este m\u00f3dulo EJB (EJB 2.0: 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: Esta clase no debe implementar javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: Los beans de sesi\u00f3n con estado de transacci\u00f3n gestionados por bean no necesitan implementar javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: La clase <ejb-class> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: No se puede encontrar la clase de bean identificada mediante el elemento <ejb-class>. (EJB 2.0: 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: La interfaz <home> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: Se especifica una interfaz desconocida en el elemento <home>. (EJB 2.0: 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: La interfaz <remote> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: Se ha especificado una interfaz desconocida en el elemento <remote>. (EJB 2.0: 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: La interfaz <local-home> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: Se especifica una interfaz desconocida en el elemento <local-home>. (EJB 2.0: 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: La interfaz <local> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: Se ha especificado una interfaz desconocida en el elemento <local>. (EJB 2.0: 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: La clase <prim-key-class> {0}, o uno de sus supertipos, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: Se especifica una clase desconocida en el elemento <prim-key-class>.  (EJB 2.0: 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: <field-name> {0} no se puede localizar en la clase de bean {1}. (EJB 2.0: 22.5).
-
-CHKJ2103.ejb20=CHKJ2103E: En una herencia de componentes, la clase de bean {0} debe heredar {1} (EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E: En una herencia de componentes, la interfaz inicial {0} no debe heredar {1}. (EJB 2.0: D.2).
-CHKJ2105.ejb20=CHKJ2105E: En una herencia de componentes, la interfaz de componente {0} debe heredar {1}. (EJB 2.0: D.2).
-CHKJ2106.ejb20=CHKJ2106E: El bean {0} debe utilizar {1} como su <prim-key-class> (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: No se puede validar la herencia de componentes de {0} porque el tipo de {1}, o una de sus dependencias, no se puede reflejar. Compruebe la v\u00eda de acceso de clases.
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} debe ser exclusivo dentro del archivo ejb-jar.xml (EJB 2.0: 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: Esta clase debe implementar {0} (EJB 2.0: 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: Esta clase debe implementar {0} (EJB 2.0: 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: Esta clase debe implementar {0} (EJB 2.0: 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: Esta clase debe implementar {0} (EJB 2.0: 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBHome (EJB 2.0: 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBHome (EJB 2.0: 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBHome (EJB 2.0: 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBLocalHome (EJB 2.0: 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBObject (EJB 2.0: 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBObject (EJB 2.0: 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBObject (EJB 2.0: 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBLocalObject (EJB 2.0: 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: Esta interfaz debe ampliar javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" no debe pasarse como argumento de m\u00e9todo o resultado (EJB 2.0: 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" no debe pasarse como argumento de m\u00e9todo o resultado (EJB 2.0: 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" no debe pasarse como argumento de m\u00e9todo o resultado (EJB 2.0: 7.10.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: Esta clase debe ser abstracta (EJB 2.0: 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: Esta clase no debe ser abstracta (EJB 2.0: 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: Esta clase no debe ser abstracta (EJB 2.0: 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: Esta clase no debe ser abstracta (EJB 2.0: 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: Esta clase debe ser p\u00fablica (EJB 2.0: 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: Esta clase debe ser p\u00fablica (EJB 2.0: 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: Esta clase debe ser p\u00fablica (EJB 2.0: 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: Esta clase debe ser p\u00fablica (EJB 2.0: 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: Esta clase debe ser p\u00fablica (EJB 2.0: 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: Esta clase no debe ser final (EJB 2.0: 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: Esta clase no debe ser final (EJB 2.0: 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: Esta clase no debe ser final (EJB 2.0: 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: Esta clase no debe ser final (EJB 2.0: 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: Esta clase debe ser serializable (EJB 2.0: 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: Esta clase debe ser p\u00fablica (EJB 2.0: 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: Esta clase no debe ser abstracta (EJB 2.0: 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: Esta clase debe ser un tipo de valor permitido en RMI-IIOP (EJB 2.0: 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: Esta clase debe ser un tipo de valor permitido en 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} debe existir (EJB 2.0: 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: public {0} debe existir (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: public {0} debe existir (EJB 2.0: 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: public {0} debe existir (EJB 2.0: 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: public {0} debe existir (EJB 2.0: 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: Esta clase debe definir {0} (EJB 2.0: 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) debe existir (EJB 2.0: 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: Debe existir como m\u00ednimo un m\u00e9todo ejbCreate (EJB 2.0: 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: El m\u00e9todo ejbCreate() debe existir (EJB 2.0: 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: El m\u00e9todo ejbCreate() debe existir (EJB 2.0: 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: El m\u00e9todo ejbFindByPrimaryKey debe existir (EJB 2.0: 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: El m\u00e9todo setEntityContext(EntityContext) debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: El m\u00e9todo setEntityContext(EntityContext) debe existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: El m\u00e9todo unsetEntityContext() debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: El m\u00e9todo unsetEntityContext() debe existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: El m\u00e9todo ejbActivate() debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: El m\u00e9todo ejbActivate() debe existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: El m\u00e9todo ejbPassivate() debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: El m\u00e9todo ejbPassivate() debe existir (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: El m\u00e9todo ejbPassivate() debe existir (EJB 2.0: 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: El m\u00e9todo ejbRemove() debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: El m\u00e9todo ejbRemove() debe existir (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: El m\u00e9todo ejbRemove() debe existir (EJB 2.0: 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: El m\u00e9todo ejbRemove() debe existir (EJB 2.0: 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: El m\u00e9todo ejbLoad() debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: El m\u00e9todo ejbLoad() debe existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: El m\u00e9todo ejbStore() debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: El m\u00e9todo ejbStore() debe existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: El crear create() debe existir (EJB 2.0: 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: El crear create() debe existir (EJB 2.0: 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: Esta interfaz debe definir como m\u00ednimo un m\u00e9todo create (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: Esta interfaz debe definir como m\u00ednimo un m\u00e9todo create (EJB 2.0: 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: Debe existir como m\u00ednimo un m\u00e9todo finder (EJB 2.0: 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: Debe existir como m\u00ednimo un m\u00e9todo finder (EJB 2.0: 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: Debe existir como m\u00ednimo un m\u00e9todo finder (EJB 2.0: 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: Debe existir como m\u00ednimo un m\u00e9todo finder (EJB 2.0: 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: Esta interfaz debe definir como m\u00ednimo un m\u00e9todo home (EJB 2.0: 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: Esta interfaz debe definir como m\u00ednimo un m\u00e9todo home (EJB 2.0: 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: Esta interfaz debe definir como m\u00ednimo un m\u00e9todo home (EJB 2.0: 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: Esta interfaz debe definir como m\u00ednimo un m\u00e9todo home (EJB 2.0: 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: Esta clase debe definir como m\u00ednimo un m\u00e9todo ejbHome (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: Esta clase debe definir como m\u00ednimo un m\u00e9todo ejbHome (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: Esta clase debe definir como m\u00ednimo un m\u00e9todo ejbHome (EJB 2.0: 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: Esta clase debe definir como m\u00ednimo un m\u00e9todo ejbHome (EJB 2.0: 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() debe existir en esta clase (EJB 2.0: 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() debe existir en esta clase (EJB 2.0: 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) debe existir en esta clase (EJB 2.0: 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) debe existir en esta clase (EJB 2.0: 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: Debe existir un m\u00e9todo ejbSelect (EJB 2.0: 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey debe existir (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey debe existir (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey debe existir (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey debe existir (EJB 2.0: 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} debe existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} debe existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} debe existir (EJB 2.0: 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: La excepci\u00f3n de aplicaci\u00f3n {1} en {0} debe ampliar java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: La excepci\u00f3n de aplicaci\u00f3n {0} debe ampliar java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: La excepci\u00f3n de aplicaci\u00f3n {1} en {0} no debe ampliar java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: La excepci\u00f3n de aplicaci\u00f3n {0} no debe ampliar java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {0} en {1} debe ser p\u00fablico (EJB 2.0: 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {0} en {1} debe ser p\u00fablico (EJB 2.0: 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {0} en {1} debe ser p\u00fablico (EJB 2.0: 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {0} en {1} debe ser p\u00fablico (EJB 2.0: 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} no debe ser final (EJB 2.0: 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: Este m\u00e9todo no debe ser final (EJB 2.0: 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} no debe ser final (EJB 2.0: 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: Este m\u00e9todo no debe ser final (EJB 2.0: 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} no debe ser final (EJB 2.0: 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: Este m\u00e9todo no debe ser final (EJB 2.0: 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} no debe ser final (EJB 2.0: 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: Este m\u00e9todo no debe ser final (EJB 2.0: 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} no debe ser est\u00e1tico (EJB 2.0: 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} no debe ser est\u00e1tico (EJB 2.0: 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} no debe ser est\u00e1tico (EJB 2.0: 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} no debe ser est\u00e1tico (EJB 2.0: 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} debe devolver void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: Este m\u00e9todo debe devolver void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} debe devolver void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: Este m\u00e9todo debe devolver void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} debe devolver void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: Este m\u00e9todo debe devolver void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} debe devolver void (EJB 2.0: 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: Este m\u00e9todo debe devolver void (EJB 2.0: 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} debe ser p\u00fablico (EJB 2.0: 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} debe ser p\u00fablico (EJB 2.0: 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} debe ser p\u00fablico (EJB 2.0: 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} debe ser p\u00fablico (EJB 2.0: 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} no debe ser final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} no debe ser final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} no debe ser final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} no debe ser final (EJB 2.0: 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: Este m\u00e9todo no debe ser final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: Este m\u00e9todo no debe ser final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: Este m\u00e9todo no debe ser final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: Este m\u00e9todo no debe ser final (EJB 2.0: 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} no debe ser est\u00e1tico (EJB 2.0: 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} no debe ser est\u00e1tico (EJB 2.0: 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} no debe ser est\u00e1tico (EJB 2.0: 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} no debe ser est\u00e1tico (EJB 2.0: 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} debe devolver {1} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} debe devolver {1} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} debe devolver void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} debe devolver void (EJB 2.0: 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: Este m\u00e9todo debe devolver {0} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: Este m\u00e9todo debe devolver {0} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: Este m\u00e9todo debe devolver void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: Este m\u00e9todo debe devolver void (EJB 2.0: 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} debe lanzar javax.ejb.CreateException (EJB 2.0: 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: Este m\u00e9todo debe lanzar javax.ejb.CreateException (EJB 2.0: 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} no debe lanzar excepciones de aplicaci\u00f3n (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: Este m\u00e9todo no debe lanzar excepciones de aplicaci\u00f3n (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} no debe lanzar excepciones de aplicaci\u00f3n (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: Este m\u00e9todo no debe lanzar excepciones de aplicaci\u00f3n (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} no debe lanzar excepciones de aplicaci\u00f3n (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: Este m\u00e9todo no debe lanzar excepciones de aplicaci\u00f3n (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} no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} debe ser p\u00fablico (EJB 2.0: 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} debe ser p\u00fablico (EJB 2.0: 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} no debe ser final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} no debe ser final (EJB 2.0: 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: Este m\u00e9todo no debe ser final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: Este m\u00e9todo no debe ser final (EJB 2.0: 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} no debe ser est\u00e1tico (EJB 2.0: 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} no debe ser est\u00e1tico (EJB 2.0: 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} debe devolver void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} debe devolver void (EJB 2.0: 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: Este m\u00e9todo debe devolver void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: Este m\u00e9todo debe devolver void (EJB 2.0: 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} debe existir para poder llamar a {0} (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} debe existir para poder llamar a {0} (EJB 2.0: 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} debe existir para poder llamar a este m\u00e9todo (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} debe existir para poder llamar a este m\u00e9todo (EJB 2.0: 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} debe ser p\u00fablico (EJB 2.0: 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} debe ser p\u00fablico.  (EJB 2.0: 12.2.6).
-CHKJ2431.cb.m.ejb20=CHKJ2431W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: Este m\u00e9todo debe ser p\u00fablico.  (EJB 2.0: 12.2.6).
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} no debe ser est\u00e1tico (EJB 2.0: 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} no debe ser est\u00e1tico (EJB 2.0: 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} debe ser p\u00fablico (EJB 2.0: 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} no debe ser final (EJB 2.0: 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: Este m\u00e9todo no debe ser final (EJB 2.0: 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} no debe ser est\u00e1tico (EJB 2.0: 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: {0} en el m\u00e9todo {1} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo (EJB 2.0: 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: Este m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo (EJB 2.0: 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: Este m\u00e9todo no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} no debe existir. El contenedor proporciona la implementaci\u00f3n de este m\u00e9todo (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir. El contenedor proporciona la implementaci\u00f3n de este m\u00e9todo (EJB 2.0: 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} no debe existir. Solo los beans CMP pueden tener m\u00e9todos ejbSelect (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir. Solo los beans CMP pueden tener m\u00e9todos ejbSelect (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} no debe existir. Solo los beans CMP pueden tener m\u00e9todos ejbSelect (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir. Solo los beans CMP pueden tener m\u00e9todos ejbSelect (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} no debe existir. Solo los beans CMP pueden tener m\u00e9todos ejbSelect (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir. Solo los beans CMP pueden tener m\u00e9todos ejbSelect (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() no debe existir (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() no debe existir (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() no debe existir (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() no debe existir (EJB 2.0: 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} no debe existir (EJB 2.0: 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} no debe existir (EJB 2.0: 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: Este m\u00e9todo no debe existir (EJB 2.0: 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: El nombre del m\u00e9todo {0} no debe empezar por "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: El nombre del m\u00e9todo {0} no debe empezar por "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: El nombre del m\u00e9todo {0} no debe empezar por "ejb" (EJB 2.0: 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: El nombre de este m\u00e9todo no debe empezar por "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: El nombre de este m\u00e9todo no debe empezar por "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: El nombre de este m\u00e9todo no debe empezar por "ejb" (EJB 2.0: 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} debe ser p\u00fablico (EJB 2.0: 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} debe ser p\u00fablico (EJB 2.0: 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} debe ser p\u00fablico (EJB 2.0: 12.2.7).
-CHKJ2441.sb.m.ejb20=CHKJ2441W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 7.10.4).
-CHKJ2441.cb.m.ejb20=CHKJ2441W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 10.6.8).
-CHKJ2441.bb.m.ejb20=CHKJ2441W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} no debe ser final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} no debe ser final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} no debe ser final (EJB 2.0: 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: Este m\u00e9todo no debe ser final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: Este m\u00e9todo no debe ser final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: Este m\u00e9todo no debe ser final (EJB 2.0: 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} no debe ser est\u00e1tico (EJB 2.0: 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} no debe ser est\u00e1tico (EJB 2.0: 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} no debe ser est\u00e1tico (EJB 2.0: 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} debe ser p\u00fablico (EJB 2.0: 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} no debe ser final (EJB 2.0: 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: Este m\u00e9todo no debe ser final (EJB 2.0: 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} no debe ser est\u00e1tico (EJB 2.0: 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: Este m\u00e9todo no debe ser est\u00e1tico (EJB 2.0: 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} debe devolver void (EJB 2.0: 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: Este m\u00e9todo debe devolver void (EJB 2.0: 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} debe ser p\u00fablico (EJB 2.0: 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} debe ser abstracto (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: Este m\u00e9todo debe ser abstracto (EJB 2.0: 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0} no se debe exponer (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: Este m\u00e9todo no se debe exponer (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0} no se debe exponer (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: Este m\u00e9todo no se debe exponer (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: Esta interfaz debe seguir las reglas RMI-IIOP de las interfaces remotas (EJB 2.0: 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: Esta interfaz debe seguir las reglas RMI-IIOP de las interfaces remotas (EJB 2.0: 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: Esta interfaz debe seguir las reglas RMI-IIOP de las interfaces remotas (EJB 2.0: 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: El nombre del m\u00e9todo {0} no debe empezar por "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: El nombre del m\u00e9todo {0} no debe empezar por "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: El nombre del m\u00e9todo {0} no debe empezar por "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: El nombre del m\u00e9todo {0} no debe empezar por "create" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: El nombre de este m\u00e9todo no debe empezar por "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: El nombre de este m\u00e9todo no debe empezar por "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: El nombre de este m\u00e9todo no debe empezar por "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: El nombre de este m\u00e9todo no debe empezar por "create" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: El nombre del m\u00e9todo {0} no debe empezar por "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: El nombre del m\u00e9todo {0} no debe empezar por "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: El nombre del m\u00e9todo {0} no debe empezar por "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: El nombre del m\u00e9todo {0} no debe empezar por "find" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: El nombre de este m\u00e9todo no debe empezar por "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: El nombre de este m\u00e9todo no debe empezar por "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: El nombre de este m\u00e9todo no debe empezar por "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: El nombre de este m\u00e9todo no debe empezar por "find" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: El nombre del m\u00e9todo {0} no debe empezar por "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: El nombre del m\u00e9todo {0} no debe empezar por "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: El nombre del m\u00e9todo {0} no debe empezar por "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: El nombre del m\u00e9todo {0} no debe empezar por "remove" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: El nombre de este m\u00e9todo no debe empezar por "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: El nombre de este m\u00e9todo no debe empezar por "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: El nombre de este m\u00e9todo no debe empezar por "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: El nombre de este m\u00e9todo no debe empezar por "remove" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} debe lanzar javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} debe lanzar javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} debe lanzar javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} debe lanzar javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} debe lanzar javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} debe lanzar javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: Este m\u00e9todo debe lanzar javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: Este m\u00e9todo debe lanzar javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: Este m\u00e9todo debe lanzar javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: Este m\u00e9todo debe lanzar javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: Este m\u00e9todo debe lanzar javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: Este m\u00e9todo debe lanzar javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} debe devolver {1} (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} debe ser el m\u00e9todo create() (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} debe ser el m\u00e9todo create() (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: Este m\u00e9todo debe ser el m\u00e9todo create() (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: Este m\u00e9todo debe ser el m\u00e9todo create() (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} debe ser el m\u00e9todo ejbCreate() (EJB 2.0: 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: Este m\u00e9todo debe ser el m\u00e9todo ejbCreate() (EJB 2.0: 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: El m\u00e9todo coincidente {0} debe existir en {1} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: El m\u00e9todo coincidente {0} debe existir en {1} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: El m\u00e9todo coincidente {0} debe existir en {1} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: El m\u00e9todo coincidente {0} debe existir en {1} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: El m\u00e9todo coincidente {0} debe existir en {1} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: El m\u00e9todo coincidente {0} debe existir en {1} (EJB 2.0: 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: El m\u00e9todo coincidente {1} para {0} debe existir en {2} (EJB 2.0: 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} debe lanzar javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} debe lanzar javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} debe lanzar javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} debe lanzar javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: Este m\u00e9todo debe lanzar javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: Este m\u00e9todo debe lanzar javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: Este m\u00e9todo debe lanzar javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: Este m\u00e9todo debe lanzar javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} no debe lanzar ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: Este m\u00e9todo no debe lanzar ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} no debe lanzar ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: Este m\u00e9todo no debe lanzar ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: Este m\u00e9todo no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: Este m\u00e9todo no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} no debe lanzar ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: Este m\u00e9todo no debe lanzar ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: Este m\u00e9todo no debe lanzar ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: Este m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: Este m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: Este m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: Este m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} debe existir en {2} para {0} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} debe existir en {2} para {0} (EJB 2.0: 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} debe existir en {1} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} debe existir en {1} (EJB 2.0: 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} debe existir en {2} para {0} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} debe existir en {2} para {0} (EJB 2.0: 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} debe existir en {1} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} debe existir en {1} (EJB 2.0: 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} debe estar asociado a un elemento de consulta del archivo ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: Este m\u00e9todo debe estar asociado a un elemento de consulta del archivo ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} debe estar asociado a un elemento de consulta del archivo ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: Este m\u00e9todo debe estar asociado a un elemento de consulta del archivo ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: Este m\u00e9todo debe lanzar java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: Este m\u00e9todo no debe lanzar java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} debe lanzar {1} para {2} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} debe lanzar {1} para {2} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} debe lanzar {1} para {2} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} debe lanzar {1} para {2} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} debe lanzar {1} para {2} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} debe lanzar {1} para {2} (EJB 2.0: 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: Este m\u00e9todo debe lanzar {0} para {1} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: Este m\u00e9todo debe lanzar {0} para {1} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: Este m\u00e9todo debe lanzar {0} para {1} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: Este m\u00e9todo debe lanzar {0} para {1} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: Este m\u00e9todo debe lanzar {0} para {1} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: Este m\u00e9todo debe lanzar {0} para {1} (EJB 2.0: 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: {1} en el m\u00e9todo {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} no debe exponer el tipo {1} (EJB 2.0: 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} no debe exponer el tipo {1} (EJB 2.0: 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} no debe exponer el tipo {1} (EJB 2.0: 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: Este m\u00e9todo no debe exponer el tipo {0} (EJB 2.0: 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: Este m\u00e9todo no debe exponer el tipo {0} (EJB 2.0: 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: Este m\u00e9todo no debe exponer el tipo {0} (EJB 2.0: 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: Esta interfaz debe seguir las reglas RMI-IIOP de las interfaces remotas (EJB 2.0: 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: Esta interfaz debe seguir las reglas RMI-IIOP de las interfaces remotas (EJB 2.0: 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: Esta interfaz debe seguir las reglas RMI-IIOP de las interfaces remotas (EJB 2.0: 12.2.8).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: {0} En el m\u00e9todo {1} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: {0} en el m\u00e9todo {1} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: {0} en el m\u00e9todo {1} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} debe ser serializable en tiempo de ejecuci\u00f3n (EJB 2.0: 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: {1} en el m\u00e9todo {0} no puede ser un argumento ni un tipo de resultado (EJB 2.0: 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} no debe pasar {1} como argumento o resultado (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0}  no debe pasar {1} como argumento o resultado (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: Este m\u00e9todo no debe pasar {0} como argumento o resultado (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: Este m\u00e9todo no debe pasar {0} como argumento o resultado (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} no puede ser un argumento ni un tipo de resultado (EJB 2.0: 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} no debe exponer {1} (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: Este m\u00e9todo no debe exponer {0} (EJB 2.0: 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0} no se debe exponer (EJB 2.0: 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: Este m\u00e9todo no se debe exponer (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} debe ser abstracto (EJB 2.0: 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: Este m\u00e9todo debe ser abstracto (EJB 2.0: 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} debe ser p\u00fablico (EJB 2.0: 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: Este m\u00e9todo debe ser p\u00fablico (EJB 2.0: 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} debe lanzar javax.ejb.FinderException (EJB 2.0: 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: Este m\u00e9todo debe lanzar javax.ejb.FinderException (EJB 2.0: 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} debe devolver {1} o una colecci\u00f3n de lo mismo (EJB 2.0: 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: Este m\u00e9todo debe devolver {0} o una colecci\u00f3n de lo mismo (EJB 2.0: 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} debe estar asociado a un elemento de consulta del archivo ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: Este m\u00e9todo debe estar asociado a un elemento de consulta del archivo ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: El m\u00e9todo {0} necesita {1} para existir en {2} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: El m\u00e9todo {0} necesita {1} para existir en {2} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: El m\u00e9todo {0} necesita {1} para existir en {2} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: El m\u00e9todo {0} necesita {1} para existir en {2} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: El m\u00e9todo {0} necesita {1} para existir en {2} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: El m\u00e9todo {0} necesita {1} para existir en {2} (EJB 2.0: 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: El m\u00e9todo {0} debe existir en {1} (EJB 2.0: 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} debe devolver {1} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} debe devolver {1} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} debe devolver {1} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} debe devolver {1} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} debe devolver {1} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} debe devolver {1} (EJB 2.0: 12.2.10).
-CHKJ2470.src.m.ejb20=CHKJ2470E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.m.ejb20=CHKJ2470E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.m.ejb20=CHKJ2470E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.m.ejb20=CHKJ2470E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.m.ejb20=CHKJ2470E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.m.ejb20=CHKJ2470E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} debe lanzar {1} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} debe lanzar {1} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} debe lanzar {1} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} debe lanzar {1} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} debe lanzar {1} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} debe lanzar {1} (EJB 2.0: 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: Este m\u00e9todo debe lanzar {0} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: Este m\u00e9todo debe lanzar {0} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: Este m\u00e9todo debe lanzar {0} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: Este m\u00e9todo debe lanzar {0} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: Este m\u00e9todo debe lanzar {0} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: Este m\u00e9todo debe lanzar {0} (EJB 2.0: 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: El contenedor proporciona {0} (EJB 2.0: 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: El contenedor proporciona {0} (EJB 2.0: 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: El contenedor proporciona {0} (EJB 2.0: 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: El contenedor proporciona {0} (EJB 2.0: 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: El contenedor proporciona {0} (EJB 2.0: 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: El contenedor proporciona {0} (EJB 2.0: 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: El contenedor proporciona este m\u00e9todo (EJB 2.0: 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: El contenedor proporciona este m\u00e9todo (EJB 2.0: 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: El contenedor proporciona este m\u00e9todo (EJB 2.0: 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: El contenedor proporciona este m\u00e9todo (EJB 2.0: 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: El contenedor proporciona este m\u00e9todo (EJB 2.0: 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: El contenedor proporciona este m\u00e9todo (EJB 2.0: 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} debe ser findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} debe ser findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} debe ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} debe ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} debe ser findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} debe ser findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: Este m\u00e9todo debe ser findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: Este m\u00e9todo debe ser findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: Este m\u00e9todo debe ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: Este m\u00e9todo debe ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: Este m\u00e9todo debe ser findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: Este m\u00e9todo debe ser findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} debe devolver {1} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} debe devolver {1} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} debe devolver {1} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} debe devolver {1} (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=CHKJ2479E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=CHKJ2479E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=CHKJ2479E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=CHKJ2479E: Este m\u00e9todo debe devolver {0} (EJB 2.0: 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: El campo transitorio {0} no debe ser el tipo {1} (EJB 2.0: 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: Un campo transitorio no debe ser el tipo {0} (EJB 2.0: 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: No conviene utilizar campos transitorios ({0}) (EJB 2.0: 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: No conviene utilizar campos transitorios (EJB 2.0: 7.4.1).
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: {0} no debe estar definido (EJB 2.0: 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0} no debe estar definido (EJB 2.0: 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} debe empezar por una letra min\u00fascula (EJB 2.0: 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} debe empezar por una letra min\u00fascula (EJB 2.0: 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} debe estar declarado como <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} debe estar declarado como <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} debe estar declarado como <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} debe estar declarado como <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0} no se debe exponer (EJB 2.0: 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0} no se debe exponer (EJB 2.0: 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} debe ser un tipo primitivo o serializable (EJB 2.0: 10.3.1).
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} debe ser un tipo primitivo o serializable (EJB 2.0: 10.3.1).
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: El campo {0} debe ser el tipo {1} (EJB 2.0: 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: Este campo debe ser el tipo {0} (EJB 2.0: 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: El campo {0} debe ser p\u00fablico (EJB 2.0: 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: Este campo debe ser p\u00fablico (EJB 2.0: 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: El campo {0} debe ser <cmp-field> (EJB 2.0: 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: Este campo debe ser <cmp-field> (EJB 2.0: 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: Este bean debe proporcionar un <local-home> (EJB 2.0: 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: Este bean debe proporcionar un <home> (EJB 2.0: 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: Este bean debe proporcionar un <local> (EJB 2.0: 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: Este bean debe proporcionar un <remote> (EJB 2.0: 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: Este bean debe proporcionar un <local-home> o un <home> (EJB 2.0: 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: Este bean debe proporcionar un <local> o un <remote> (EJB 2.0: 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: Este bean debe proporcionar un <local-home> (EJB 2.0: 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: Este bean debe proporcionar un <home> (EJB 2.0: 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: Este bean debe proporcionar un <local> (EJB 2.0: 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: Este bean debe proporcionar un <remote> (EJB 2.0: 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: Este bean debe proporcionar un <local-home> o un <home> (EJB 2.0: 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: Este bean debe proporcionar un <local> o un <remote> (EJB 2.0: 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: Este bean debe proporcionar un <local-home> (EJB 2.0: 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: Este bean debe proporcionar un <home> (EJB 2.0: 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: Este bean debe proporcionar un <local> (EJB 2.0: 12.2.1).
-CHKJ2883.b.ejb20=CHKJ2883W: Este bean debe proporcionar un <remote> (EJB 2.0: 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: Este bean debe proporcionar un <local-home> o un <home> (EJB 2.0: 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: Este bean debe proporcionar un <local> o un <remote> (EJB 2.0: 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} debe ser un identificador Java v\u00e1lido (EJB 2.0: 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} debe ser un identificador Java v\u00e1lido (EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} debe ser exclusivo dentro del archivo ejb-jar.xml (EJB 2.0: 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> debe existir (EJB 2.0: 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: El identificador reservado {0} no se puede utilizar como <ejb-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: El identificador reservado {0} no se puede utilizar como <abstract-schema-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} debe ser un identificador v\u00e1lido y empezar por una letra min\u00fascula (EJB 2.0: 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} debe ser un identificador v\u00e1lido y empezar por una letra min\u00fascula (EJB 2.0: 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} debe tener un m\u00e9todo set (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} debe tener un m\u00e9todo get (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} debe tener un m\u00e9todo set (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} debe tener un m\u00e9todo get (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} debe ser un tipo Java primitivo o un tipo Java serializable (EJB 2.0: 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} debe ser el tipo {1} o una colecci\u00f3n de lo mismo (EJB 2.0: 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: La clase de valor dependiente {0} no puede ser un <cmr-field> (EJB 2.0: 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> debe ser exclusivo en ejb-jar.xml (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> debe ser exclusivo en <ejb-relation> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: El valor del elemento <multiplicity> debe ser "One" o "Many" (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: <relationship-role-source> con el rol {0} debe hacer referencia a un bean CMP existente (EJB 2.0: 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> debe utilizarse con una <multiplicity> "One" (EJB 2.0: 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} debe definirse en {1} (EJB 2.0: 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: Este bean puede tener solamente relaciones unidireccionales con otros beans (EJB 2.0: 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: El valor del elemento <cmr-field-type> debe ser "java.util.Collection" o "java.util.Set" (EJB 2.0: 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: Debe haber como m\u00ednimo un <ejb-relationship-role> que defina un <cmr-field> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} debe existir (EJB 2.0: 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} debe hacer referencia a un bean CMP (EJB 2.0: 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: El valor del elemento <cmp-version> debe ser "1.x" o "2.x" (EJB 2.0: 22.5).
-CHKJ2873.ejb20=CHKJ2873W: Migre el enlace de origen de datos de este bean a un enlace de f\u00e1brica de conexiones CMP.
-CHKJ2874.ejb20=CHKJ2874W: Migre el enlace de origen de datos predeterminado de este m\u00f3dulo EJB a un enlace de f\u00e1brica de conexiones CMP predeterminado.
-
-###########################################################################
-#
-# 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/ejbvalidator_fr.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_fr.properties
deleted file mode 100644
index e2c9cdf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_fr.properties
+++ /dev/null
@@ -1,1528 +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=Validation de {0}.
-
-LOC_CLASS=Classe : {0}
-LOC_FIELD=Zone : {0}, classe : {1}
-LOC_METHOD=M\u00e9thode : {0}, classe : {1}
-LOC_BEAN=Bean enterprise : {0}
-LOC_ROLE=<localRelationshipRoles> : {0}, bean enterprise : {1}
-LOC_ROLEREF=<security-role-ref> : {0}
-LOC_METHODELEMENT=El\u00e9ment <method> : {0}
-LOC_METHODPERMISSION=El\u00e9ment <method-permission> : {0}
-LOC_METHODTRANSACTION=El\u00e9ment <container-transaction> : {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: Erreur interne lors de l'ex\u00e9cution du valideur d'EJB. Consultez le journal pour plus de d\u00e9tails.
-CHKJ2852=CHKJ2852W: Erreur interne lors de la validation de {0}. Le bean valid\u00e9 \u00e9tait {1}.
-CHKJ2433=CHKJ2433W: Impossible de valider {0} car {1} ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2907=CHKJ2907E: Le type {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2905=CHKJ2905W: Le valideur d'EJB n'a pas \u00e9t\u00e9 ex\u00e9cut\u00e9 car le fichier ejb-jar.xml n'a pas pu \u00eatre charg\u00e9. Pour plus d'informations, ex\u00e9cutez le valideur XML.
-CHKJ2041=CHKJ2041I: Les interfaces et les classes permanentes doivent se trouver dans un package nomm\u00e9. (JLS 2.0 : 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} pour {2} afin d''\u00e9viter les erreurs de compilation dans le code de d\u00e9ploiement.
-CHKJ2456.m=CHKJ2456W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} pour {1} afin d''\u00e9viter les erreurs de compilation dans le code de d\u00e9ploiement.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: La classe de cl\u00e9 {0} doit impl\u00e9menter la m\u00e9thode {1}. (EJB 1.1 : 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: Cette classe doit impl\u00e9menter une m\u00e9thode ejbPostCreate correspondante pour la m\u00e9thode {0}. (EJB 1.1 : 9.2.4).
-CHKJ2002.eb.m.ejb11=CHKJ2002W: Cette classe doit impl\u00e9menter une m\u00e9thode ejbPostCreate correspondante pour cette m\u00e9thode. (EJB 1.1 : 9.2.4).
-CHKJ2003E.ejb11=CHKJ2003E: Cette classe ne doit pas impl\u00e9menter javax.ejb.SessionSynchronization. (EJB 1.1 : 6.5.3)
-CHKJ2003I.ejb11=CHKJ2003I: Les beans session avec \u00e9tat des transactions g\u00e9r\u00e9es par bean n'ont pas besoin d'impl\u00e9menter javax.ejb.SessionSynchronization. (EJB 1.1 : 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: La classe de bean {1} ne doit pas impl\u00e9menter la m\u00e9thode ejbFind {0}. (EJB 1.1 : 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: La classe de bean {0} ne doit pas impl\u00e9menter de m\u00e9thode ejbFind. (EJB 1.1 : 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: La m\u00e9thode {0} doit correspondre \u00e0 une m\u00e9thode create ou find. (EJB 1.1 : 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: Cette m\u00e9thode doit correspondre \u00e0 une m\u00e9thode create ou find. (EJB 1.1 : 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: La classe de bean {0} doit contenir un constructeur public sans argument. (EJB 1.1 : 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: La classe de bean {0} doit contenir un constructeur public sans argument. (EJB 1.1 : 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} ne doit pas d\u00e9clarer la m\u00e9thode finalize(). (EJB 1.1 : 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} ne doit pas d\u00e9clarer la m\u00e9thode finalize(). (EJB 1.1 : 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: La classe de bean {0} doit contenir au moins une m\u00e9thode ejbCreate. (EJB 1.1 : 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: La classe de bean {0} doit contenir au moins une m\u00e9thode ejbFindByPrimaryKey. (EJB 1.1 : 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: L''interface home {0} doit contenir au moins une m\u00e9thode create. (EJB 1.1 : 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: L''interface home {0} doit contenir au moins une m\u00e9thode findByPrimaryKey. (EJB 1.1 : 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: Ce type doit correspondre \u00e0 une interface. (EJB 1.1 : 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: Ce type doit correspondre \u00e0 une interface. (EJB 1.1 : 6.10.6)
-CHKJ2012.er.ejb11=CHKJ2012E: Ce type doit correspondre \u00e0 une interface. (EJB 1.1 : 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: Ce type doit correspondre \u00e0 une interface. (EJB 1.1 : 9.2.8)
-CHKJ2013.sb.ejb11=CHKJ2013E: La classe de bean {0} doit impl\u00e9menter {1}. (EJB 1.1 : 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: La classe de bean {0} doit impl\u00e9menter {1}. (EJB 1.1 : 9.2.2)
-CHKJ2014.sb.ejb11=CHKJ2014E: La classe de bean {0} ne peut pas \u00eatre abstraite. (EJB 1.1 : 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: La classe de bean {0} ne peut pas \u00eatre abstraite. (EJB 1.1 : 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: La classe de bean {0} ne peut pas \u00eatre finale. (EJB 1.1 : 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: La classe de bean {0} ne peut pas \u00eatre finale. (EJB 1.1 : 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: L''interface doit \u00e9tendre {0}. (EJB 1.1 : 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: L''interface doit \u00e9tendre {0}. (EJB 1.1 : 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: L''interface doit \u00e9tendre {0}. (EJB 1.1 : 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: L''interface doit \u00e9tendre {0}. (EJB 1.1 : 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: La classe de cl\u00e9 {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 9.2.9) (RMI 1.3 : 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: La classe de cl\u00e9 {0} doit \u00eatre publique. (EJB 1.1 : 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: La classe de cl\u00e9 {0} doit d\u00e9finir un constructeur par d\u00e9faut public. (EJB 1.1 : 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: La classe de bean {0} doit \u00eatre publique. (EJB 1.1 : 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: La classe de bean {0} doit \u00eatre publique. (EJB 1.1 : 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: La classe de bean {1} doit contenir une m\u00e9thode correspondant \u00e0 la m\u00e9thode {0}. (EJB 1.1 : 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: La classe de bean {0} doit contenir une m\u00e9thode correspondant \u00e0 cette m\u00e9thode. (EJB 1.1 : 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: La classe de bean {1} doit contenir une m\u00e9thode correspondant \u00e0 la m\u00e9thode {0}. (EJB 1.1 : 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: La classe de bean {0} doit contenir une m\u00e9thode correspondant \u00e0 cette m\u00e9thode. (EJB 1.1 : 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: La m\u00e9thode {0} ne doit pas exister. Seule la m\u00e9thode create() peut exister (EJB 1.1 : 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: Cette m\u00e9thode ne doit pas exister. Seule la m\u00e9thode create() peut exister (EJB 1.1 : 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: La m\u00e9thode {0} ne doit pas exister. Seule la m\u00e9thode ejbCreate() peut exister (EJB 1.1 : 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: Cette m\u00e9thode ne doit pas exister. Seule la m\u00e9thode ejbCreate() peut exister (EJB 1.1 : 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: La classe de bean {1} doit impl\u00e9menter une m\u00e9thode ejbCreate correspondante pour {0}. (EJB 1.1 : 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: La classe de bean {0} doit impl\u00e9menter une m\u00e9thode ejbCreate correspondante pour cette m\u00e9thode. (EJB 1.1 : 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: La classe de bean {1} doit impl\u00e9menter une m\u00e9thode ejbCreate correspondante pour {0}. (EJB 1.1 : 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: La classe de bean {0} doit impl\u00e9menter une m\u00e9thode ejbCreate correspondante pour cette m\u00e9thode. (EJB 1.1 : 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: La m\u00e9thode {0} n''est pas appel\u00e9e sauf si une m\u00e9thode ejbCreate correspondante est d\u00e9finie. (EJB 1.1 : 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: Cette m\u00e9thode n'est pas appel\u00e9e sauf si une m\u00e9thode ejbCreate correspondante est d\u00e9finie. (EJB 1.1 : 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: La m\u00e9thode {0} ne peut pas \u00eatre appel\u00e9e sans la m\u00e9thode create correspondante de l''interface home {1}. (EJB 1.1 : 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: Cette m\u00e9thode ne peut pas \u00eatre appel\u00e9e sans la m\u00e9thode create correspondante de l''interface home {0}. (EJB 1.1 : 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: La classe de bean {1} doit contenir une m\u00e9thode ejbFind correspondant \u00e0 la m\u00e9thode {0}. (EJB 1.1 : 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: La classe de bean {0} doit contenir une m\u00e9thode ejbFind correspondant \u00e0 cette m\u00e9thode. (EJB 1.1 : 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: La classe de bean {0} doit d\u00e9clarer au moins une zone g\u00e9r\u00e9e par conteneur. (EJB 1.1 : 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: La m\u00e9thode setEntityContext(EntityContext ic) doit exister. (EJB 1.1 : 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: La m\u00e9thode unsetEntityContext() doit exister. (EJB 1.1 : 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: La m\u00e9thode ejbActivate() doit exister. (EJB 1.1 : 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: La m\u00e9thode ejbPassivate() doit exister. (EJB 1.1 : 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: La m\u00e9thode ejbRemove() doit exister. (EJB 1.1 : 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: La m\u00e9thode ejbLoad() doit exister. (EJB 1.1 : 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: La m\u00e9thode ejbStore() doit exister. (EJB 1.1 : 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" ne doit pas \u00eatre transmis comme argument de m\u00e9thode ou r\u00e9sultat. (EJB 1.1 : 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: Les deux extr\u00e9mit\u00e9s du r\u00f4le doivent utiliser le m\u00eame nombre d'attributs.
-CHKJ2101.ejb11=CHKJ2101E: Les deux extr\u00e9mit\u00e9s du r\u00f4le doivent utiliser le m\u00eame type.
-CHKJ2102.eh.ejb11=CHKJ2102E: Un descripteur finder ou une m\u00e9thode finder personnalis\u00e9e correspondante dans la classe {0} doit \u00eatre d\u00e9finie.
-CHKJ2103.ejb11=CHKJ2103E: Dans l''h\u00e9ritage des composants, la classe de bean {0} doit h\u00e9riter de {1}. (EJB 1.1 : B.2)
-CHKJ2104.ejb11=CHKJ2104E: Dans l''h\u00e9ritage des composants, l''interface home {0} ne doit pas h\u00e9riter de {1}. (EJB 1.1 : B.2)
-CHKJ2105.ejb11=CHKJ2105E: Dans l''h\u00e9ritage des composants, l''interface \u00e9loign\u00e9e {0} doit h\u00e9riter de {1}. (EJB 1.1 : B.2)
-CHKJ2106.ejb11=CHKJ2106E: Le bean {0} doit utiliser {1} comme \u00e9l\u00e9ment <prim-key-class> (EJB 1.1 : B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: La zone statique {0} doit \u00eatre finale. (EJB 1.1 : 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: Cette zone statique doit \u00eatre finale. (EJB 1.1 : 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} ne doit pas \u00eatre transitoire. (EJB 1.1 : 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: Cette zone ne doit pas \u00eatre transitoire. (EJB 1.1 : 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: Le type de la zone {0} n''est pas valide pour un bean CMP. (EJB 1.1 : 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: Le type de la zone n'est pas valide pour un bean CMP. (EJB 1.1 : 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: La zone {0} doit \u00eatre publique. (EJB 1.1 : 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: La zone doit \u00eatre publique. (EJB 1.1 : 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: La zone de cl\u00e9 principale {0} doit \u00eatre publique. (EJB 1.1 : 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: La zone de cl\u00e9 principale doit \u00eatre publique. (EJB 1.1 : 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: La zone {0} doit \u00eatre un \u00e9l\u00e9ment <cmp-field> de {1} et une zone de la classe de bean {2}. (EJB 1.1 : 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: Cette zone doit \u00eatre un \u00e9l\u00e9ment <cmp-field> de {0} et une zone de la classe de bean {1}. (EJB 1.1 : 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: Le type de la zone cl\u00e9 {0} doit \u00eatre identique \u00e0 celui de la cl\u00e9 principale {1}. (EJB 1.1 : 9.4.7.1)
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e dans la m\u00e9thode {0}. (EJB 1.1 : 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e. (EJB 1.1 : 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e dans la m\u00e9thode {0}. (EJB 1.1 : 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e. (EJB 1.1 : 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e dans la m\u00e9thode {0}. (EJB 1.1 : 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e. (EJB 1.1 : 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e dans la m\u00e9thode {0}. (EJB 1.1 : 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e. (EJB 1.1 : 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e dans la m\u00e9thode {0}. (EJB 1.1 : 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e. (EJB 1.1 : 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e dans la m\u00e9thode {0}. (EJB 1.1 : 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: Utilisation de la classe java.rmi.RemoteException d\u00e9conseill\u00e9e. (EJB 1.1 : 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: La m\u00e9thode {0} ne doit rien renvoyer. (EJB 1.1 : 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: Cette m\u00e9thode ne doit rien renvoyer. (EJB 1.1 : 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: La m\u00e9thode {0} doit renvoyer le type d''interface \u00e9loign\u00e9e {1}.  (EJB 1.1 : 6.10.6)
-CHKJ2402.sh.m.ejb11=CHKJ2402W: Cette m\u00e9thode create doit renvoyer le type d''interface \u00e9loign\u00e9e {0}.  (EJB 1.1 : 6.10.6)
-CHKJ2402.eh.i.ejb11=CHKJ2402W: La m\u00e9thode {0} doit renvoyer le type d''interface \u00e9loign\u00e9e {1}.  (EJB 1.1 : 9.2.8)
-CHKJ2402.eh.m.ejb11=CHKJ2402W: Cette m\u00e9thode create doit renvoyer le type d''interface \u00e9loign\u00e9e {0}.  (EJB 1.1 : 9.2.8)
-CHKJ2403.eh.i.ejb11=CHKJ2403W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re. (EJB 1.1 : 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re. (EJB 1.1 : 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: L''ordre et les types des arguments de {0} doivent correspondre \u00e0 ceux des zones de la classe de cl\u00e9 {1}. (EJB 1.1 : 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: L''ordre et les types des arguments doivent correspondre \u00e0 ceux des zones de la classe de cl\u00e9 {0}. (EJB 1.1 : 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: La m\u00e9thode {0} doit renvoyer le type de cl\u00e9 principale {1}. (EJB 1.1 : 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: Cette m\u00e9thode doit renvoyer le type de cl\u00e9 principale {0}. (EJB 1.1 : 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re.  (EJB 1.1 : 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re.  (EJB 1.1 : 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: La m\u00e9thode {0} doit \u00eatre publique. (EJB 1.1 : 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: Cette m\u00e9thode doit \u00eatre publique. (EJB 1.1 : 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: La m\u00e9thode {0} doit \u00eatre publique. (EJB 1.1 : 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: Cette m\u00e9thode doit \u00eatre publique. (EJB 1.1 : 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: La m\u00e9thode {0} doit \u00eatre publique. (EJB 1.1 : 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: Cette m\u00e9thode doit \u00eatre publique. (EJB 1.1 : 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: La m\u00e9thode {0} doit \u00eatre publique. (EJB 1.1 : 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: Cette m\u00e9thode doit \u00eatre publique. (EJB 1.1 : 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: La m\u00e9thode {0} doit \u00eatre publique. (EJB 1.1 : 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: Cette m\u00e9thode doit \u00eatre publique. (EJB 1.1 : 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: La m\u00e9thode {0} doit \u00eatre publique. (EJB 1.1 : 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: Cette m\u00e9thode doit \u00eatre publique. (EJB 1.1 : 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: La m\u00e9thode {0} ne doit pas \u00eatre finale. (EJB 1.1 : 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: Cette m\u00e9thode ne doit pas \u00eatre finale. (EJB 1.1 : 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: La m\u00e9thode {0} ne doit pas \u00eatre finale. (EJB 1.1 : 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: Cette m\u00e9thode ne doit pas \u00eatre finale. (EJB 1.1 : 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: La m\u00e9thode {0} ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: Cette m\u00e9thode ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: La m\u00e9thode {0} ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: Cette m\u00e9thode ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: La m\u00e9thode {0} ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: Cette m\u00e9thode ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: La m\u00e9thode {0} ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: Cette m\u00e9thode ne doit pas \u00eatre finale. (EJB 1.1 : 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} ne doit pas \u00eatre statique. (EJB 1.1 : 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: Cette m\u00e9thode ne doit pas \u00eatre statique. (EJB 1.1 : 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} ne doit pas \u00eatre statique. (EJB 1.1 : 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: Cette m\u00e9thode ne doit pas \u00eatre statique. (EJB 1.1 : 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: Cette m\u00e9thode ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: Cette m\u00e9thode ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: Cette m\u00e9thode ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: Cette m\u00e9thode ne doit pas \u00eatre statique. (EJB 1.1 : 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: Le nom de la m\u00e9thode {0} ne doit pas commencer par "ejb". (EJB 1.1 : 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: Le nom de la m\u00e9thode ne doit pas commencer par "ejb". (EJB 1.1 : 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: Le nom de la m\u00e9thode {0} ne doit pas commencer par "ejb". (EJB 1.1 : 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: Le nom de la m\u00e9thode ne doit pas commencer par "ejb". (EJB 1.1 : 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: Le type de retour {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 6.10) (RMI 1.3 : 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: Le type de retour doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 6.10) (RMI 1.3 : 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: Le type de retour {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 9.2) (RMI 1.3 : 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: Le type de retour doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 9.2) (RMI 1.3 : 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: Le type de retour {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 6.10.5) (RMI 1.3 : 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: Le type de retour doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 6.10.5) (RMI 1.3 : 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: Le type de retour {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 9.2.7) (RMI 1.3 : 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: Le type de retour doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 9.2.7) (RMI 1.3 : 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: Le type de retour {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 6.10.6) (RMI 1.3 : 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: Le type de retour doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 6.10.6) (RMI 1.3 : 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: Le type de retour {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 9.2.8) (RMI 1.3 : 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: Le type de retour doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution.  (EJB 1.1 : 9.2.8) (RMI 1.3 : 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: L''argument {1} de {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 6.10) (RMI 1.3 : 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: L''argument {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 6.10) (RMI 1.3 : 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: L''argument {1} de {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 9.2) (RMI 1.3 : 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: L''argument {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 9.2) (RMI 1.3 : 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: L''argument {1} de {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 6.10.5) (RMI 1.3 : 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: L''argument {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 6.10.5) (RMI 1.3 : 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: L''argument {1} de {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 9.2.7) (RMI 1.3 : 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: L''argument {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 9.2.7) (RMI 1.3 : 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: L''argument {1} de {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 6.10.6) (RMI 1.3 : 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: L''argument {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 6.10.6) (RMI 1.3 : 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: L''argument {1} de {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 9.2.8) (RMI 1.3 : 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: L''argument {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution. (EJB 1.1 : 9.2.8) (RMI 1.3 : 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} doit g\u00e9n\u00e9rer {1}. (EJB 1.1 : 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: La m\u00e9thode doit g\u00e9n\u00e9rer {0}. (EJB 1.1 : 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} doit g\u00e9n\u00e9rer {1}. (EJB 1.1 : 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: La m\u00e9thode doit g\u00e9n\u00e9rer {0}. (EJB 1.1 : 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} doit g\u00e9n\u00e9rer {1}. (EJB 1.1 : 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: La m\u00e9thode doit g\u00e9n\u00e9rer {0}. (EJB 1.1 : 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} doit g\u00e9n\u00e9rer {1}. (EJB 1.1 : 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: La m\u00e9thode doit g\u00e9n\u00e9rer {0}. (EJB 1.1 : 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: Le type de retour {0} doit correspondre au type de retour {1} de la m\u00e9thode correspondante dans la classe de bean {2}. (EJB 1.1 : 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: Ce type de retour doit correspondre au type de retour {0} de la m\u00e9thode correspondante dans la classe de bean {1}. (EJB 1.1 : 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: Le type de retour {0} doit correspondre au type de retour {1} de la m\u00e9thode correspondante dans la classe de bean {2}. (EJB 1.1 : 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: Ce type de retour doit correspondre au type de retour {0} de la m\u00e9thode correspondante dans la classe de bean {1}. (EJB 1.1 : 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: Le type de retour {0} doit correspondre au type de retour {1} de la m\u00e9thode correspondante dans la classe de bean {2}. (EJB 1.1 : 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: Ce type de retour doit correspondre au type de retour {0} de la m\u00e9thode correspondante dans la classe de bean {1}. (EJB 1.1 : 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: Le type de retour {0} doit correspondre au type de retour {1} de la m\u00e9thode correspondante dans la classe de bean {2}. (EJB 1.1 : 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: Ce type de retour doit correspondre au type de retour {0} de la m\u00e9thode correspondante dans la classe de bean {1}. (EJB 1.1 : 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: La m\u00e9thode {0} ne doit rien renvoyer. (EJB 1.1 : 9.2.4).
-CHKJ2418.eb.m.ejb11=CHKJ2418E: Cette m\u00e9thode ne doit rien renvoyer. (EJB 1.1 : 9.2.4).
-CHKJ2419.sh.i.ejb11=CHKJ2419E: La m\u00e9thode {0} doit correspondre \u00e0 une m\u00e9thode create. (EJB 1.1 : 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: Cette m\u00e9thode doit correspondre \u00e0 une m\u00e9thode create. (EJB 1.1 : 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1} doit \u00eatre g\u00e9n\u00e9r\u00e9e par la m\u00e9thode correspondante de {0} dans l''interface home {2}. (EJB 1.1 : 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0} doit \u00eatre g\u00e9n\u00e9r\u00e9e par la m\u00e9thode correspondante dans l''interface home {1}. (EJB 1.1 : 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1} doit \u00eatre g\u00e9n\u00e9r\u00e9e par la m\u00e9thode correspondante de {0} dans l''interface home {2}. (EJB 1.1 : 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0} doit \u00eatre g\u00e9n\u00e9r\u00e9e par la m\u00e9thode correspondante dans l''interface home {1}. (EJB 1.1 : 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: La m\u00e9thode correspondante de {0} dans l''interface \u00e9loign\u00e9e {1} doit g\u00e9n\u00e9rer {2}. (EJB 1.1 : 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: La m\u00e9thode correspondante dans l''interface \u00e9loign\u00e9e {0} doit g\u00e9n\u00e9rer {1}. (EJB 1.1 : 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: La m\u00e9thode correspondante de {0} dans l''interface \u00e9loign\u00e9e {1} doit g\u00e9n\u00e9rer {2}. (EJB 1.1 : 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: La m\u00e9thode correspondante dans l''interface \u00e9loign\u00e9e {0} doit g\u00e9n\u00e9rer {1}. (EJB 1.1 : 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: La valeur de l'\u00e9l\u00e9ment <ejb-name> doit \u00eatre sp\u00e9cifi\u00e9e. (EJB 1.1 : 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: La classe <ejb-class> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: Classe inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <ejb-class>. (EJB 1.1 : 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: L''interface <home> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: Interface inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <home>. (EJB 1.1 : 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: L''interface <remote> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: Interface inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <remote>. (EJB 1.1 : 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2806E: La valeur de l'\u00e9l\u00e9ment <reentrant> doit \u00eatre "True" ou "False". (EJB 1.1 : 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: La valeur de l'\u00e9l\u00e9ment <session-type> doit \u00eatre "Stateful" ou "Stateless". (EJB 1.1 : 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: La valeur de l'\u00e9l\u00e9ment <transaction-type> doit \u00eatre "Container" ou "Bean". (EJB 1.1 : 11.3.5, 16.2, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: La valeur de l'\u00e9l\u00e9ment <persistence-type> doit \u00eatre "Container" ou "Bean".  (EJB 1.1 : 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: La classe <prim-key-class> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: Classe inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <prim-key-class>.  (EJB 1.1 : 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: La zone <field-name> {0} est introuvable dans la classe de bean {1}. (EJB 1.1 : 16.5)
-CHKJ2811.unnamed.ejb11=CHKJ2811E: La zone <cmp-field> doit sp\u00e9cifier une zone <field-name>. (EJB 1.1 : 16.5)
-CHKJ2812.ejb11=CHKJ2812E: La classe de bean {0} doit sp\u00e9cifier au moins l''une de ses zones comme zone <cmp-field>. (EJB 1.1 : 16.5)
-CHKJ2814.ejb11=CHKJ2814W: Le nom <ejb-name>, dans la m\u00e9thode <method>, doit sp\u00e9cifier un bean enterprise connu. (EJB 1.1 : 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: La r\u00e9f\u00e9rence de r\u00f4le de s\u00e9curit\u00e9 ne doit \u00eatre d\u00e9finie qu'une seule fois.
-CHKJ2822.ejb11=CHKJ2822W: L''\u00e9l\u00e9ment <security-role-ref> du bean {0} doit d\u00e9finir l''\u00e9l\u00e9ment <role-name>. (EJB 1.1 : 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: L'\u00e9l\u00e9ment <security-role-ref> doit d\u00e9finir l'\u00e9l\u00e9ment <role-link>. (EJB 1.1 : 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: L''\u00e9l\u00e9ment <security-role-ref> fait r\u00e9f\u00e9rence au r\u00f4le inconnu {0}. (EJB 1.1 : 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: L''\u00e9l\u00e9ment <security-role> du fichier ejb-jar.xml doit d\u00e9finir l''\u00e9l\u00e9ment <role-name>. (EJB 1.1 : 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: Le nom du r\u00f4le de s\u00e9curit\u00e9 doit \u00eatre unique. (EJB 1.1 : 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: Impossible d'utiliser un \u00e9l\u00e9ment <role-link> sans \u00e9l\u00e9ments <security-role>. (EJB 1.1 : 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: Impossible d'utiliser un \u00e9l\u00e9ment <primkey-field> sans cl\u00e9 principale primitive. (EJB 1.1 : 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: La classe de cl\u00e9 {0} n''est associ\u00e9e \u00e0 aucune zone du bean enterprise {1}. (EJB 1.1 : 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: Le type de la zone {0} ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2831.ejb11=CHKJ2831W: {0} doit \u00eatre d\u00e9clar\u00e9e dans un \u00e9l\u00e9ment <cmp-field>. (EJB 1.1 : 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: L''interface home {0}, sp\u00e9cifi\u00e9e dans l''\u00e9l\u00e9ment <ejb-ref>, est introuvable dans le module EJB. (EJB 1.1 : 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: L''interface \u00e9loign\u00e9e {0}, sp\u00e9cifi\u00e9e dans l''\u00e9l\u00e9ment <ejb-ref>, est introuvable dans le module EJB. (EJB 1.1 : 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: Le bean {0}, sp\u00e9cifi\u00e9 dans l''\u00e9l\u00e9ment <ejb-ref>, est introuvable dans le module EJB. (EJB 1.1 : 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Le bean {0} est de type {1}. Mettez \u00e0 jour l''\u00e9l\u00e9ment <ejb-ref-type> de l''\u00e9l\u00e9ment <ejb-ref>. (EJB 1.1 : 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Le bean {0} utilise l''interface home {1}. Mettez \u00e0 jour l''\u00e9l\u00e9ment <ejb-ref> de l''\u00e9l\u00e9ment <ejb-ref>. (EJB 1.1 : 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I: Le bean {0} utilise l''interface \u00e9loign\u00e9e {1}. Mettez \u00e0 jour l''\u00e9l\u00e9ment <ejb-ref> de l''\u00e9l\u00e9ment <ejb-ref>. (EJB 1.1 : 14.3.2)
-CHKJ2838.ejb11=CHKJ2838I: Il est recommand\u00e9 d'organiser toutes les r\u00e9f\u00e9rences aux beans enterprise dans le sous-contexte "ejb". (EJB 1.1 : 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: L'\u00e9l\u00e9ment <env-entry-name> de l'\u00e9l\u00e9ment <env-entry> n'est pas valide. (EJB 1.1 : 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: L'\u00e9l\u00e9ment <env-entry-type> de l'\u00e9l\u00e9ment <env-entry> n'est pas valide. (EJB 1.1 : 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: Le nom {0}, dans l''\u00e9l\u00e9ment <env-entry-name>, ne peut \u00eatre utilis\u00e9 qu''une seule fois dans le bean. (EJB 1.1 : 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: L'\u00e9l\u00e9ment <method-params> est ignor\u00e9 lorsque l'\u00e9l\u00e9ment <method-name> a la valeur "*". (EJB 1.1 : 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: Aucune m\u00e9thode de {0} ne correspond \u00e0 cet \u00e9l\u00e9ment <method>. (EJB 1.1 : 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: Au moins un \u00e9l\u00e9ment <method> doit \u00eatre d\u00e9fini dans un \u00e9l\u00e9ment <method-permission>. (EJB 1.1 : 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: Au moins un \u00e9l\u00e9ment <role-name> doit \u00eatre d\u00e9fini dans un \u00e9l\u00e9ment <method-permission>. (EJB 1.1 : 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: Aucune m\u00e9thode n'a \u00e9t\u00e9 d\u00e9tect\u00e9e dans cet \u00e9l\u00e9ment <method-permission>. (EJB 1.1 : 15.3.2)
-CHKJ2847.ejb11=CHKJ2847W: Aucune m\u00e9thode n'a \u00e9t\u00e9 d\u00e9tect\u00e9e dans cet \u00e9l\u00e9ment <container-transaction>. (EJB 1.1 : 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: Impossible de valider l''h\u00e9ritage des composants de {0} car {1} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2850.ejb11=CHKJ2850W: Impossible de valider l''\u00e9l\u00e9ment <method> car {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2851.ejb11=CHKJ2851W: Impossible de valider {0} car {1} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2852.ejb11=CHKJ2852W: Exception d\u00e9tect\u00e9e lors de la validation du fichier ejb-jar.xml. Le bean valid\u00e9 \u00e9tait {0}.
-CHKJ2853.ejb11=CHKJ2853W: Exception d\u00e9tect\u00e9e lors de la validation du fichier ibm-ejb-jar-ext.xmi. Le bean valid\u00e9 \u00e9tait {0}.
-
-CHKJ2908.ejb11=CHKJ2908W: Un bean enterprise ne peut pas \u00eatre refl\u00e9t\u00e9 correctement. Pour plus d'informations, ex\u00e9cutez le valideur XML.
-
-CHKJ2895.ejb11=CHKJ2895W: L''\u00e9l\u00e9ment <ejb-name> {0} doit \u00eatre unique dans le fichier ejb-jar.xml (EJB 1.1 : 16.5).
-CHKJ2875.ejb11=CHKJ2875E: Tous les fichiers EAR contenant ce module EJB doivent contenir l''\u00e9l\u00e9ment <ejb-client-jar> {0} (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: Impossible d'utiliser un \u00e9l\u00e9ment <primkey-field> sans cl\u00e9 principale primitive (EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: La classe de cl\u00e9 {0} n''est associ\u00e9e \u00e0 aucune zone du bean enterprise {1}. (EJB 2.0 : 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: L'\u00e9l\u00e9ment <env-entry-name> de l'\u00e9l\u00e9ment <env-entry> n'est pas valide. (EJB 2.0 : 20.2.1.2)
-CHKJ2840.ejb20=CHKJ2840W: L'\u00e9l\u00e9ment <env-entry-type> de l'\u00e9l\u00e9ment <env-entry> n'est pas valide. (EJB 2.0 : 20.2.1.2)
-CHKJ2841.ejb20=CHKJ2841W: Le nom {0}, dans l''\u00e9l\u00e9ment <env-entry-name>, ne peut \u00eatre utilis\u00e9 qu''une seule fois dans le bean. (EJB 2.0 : 20.2.1.2)
-CHKJ2830.ejb20=CHKJ2830W: Le type de la zone {0} ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2831.ejb20=CHKJ2831W: {0} doit \u00eatre d\u00e9clar\u00e9e dans un \u00e9l\u00e9ment <cmp-field>. (EJB 2.0 : 10.8.2)
-CHKJ2801.ejb20=CHKJ2801E: La valeur de l'\u00e9l\u00e9ment <ejb-name> doit \u00eatre sp\u00e9cifi\u00e9e. (EJB 2.0 : 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: La valeur de l'\u00e9l\u00e9ment <persistence-type> doit \u00eatre "Container" ou "Bean".  (EJB 2.0 : 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2806E: La valeur de l'\u00e9l\u00e9ment <reentrant> doit \u00eatre "True" ou "False". (EJB 2.0 : 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: La valeur de l'\u00e9l\u00e9ment <session-type> doit \u00eatre "Stateful" ou "Stateless". (EJB 2.0 : 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: La valeur de l'\u00e9l\u00e9ment <transaction-type> doit \u00eatre "Container" ou "Bean". (EJB 2.0 : 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814W: Le nom <ejb-name>, dans la m\u00e9thode <method>, doit sp\u00e9cifier un bean enterprise connu. (EJB 2.0 : 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: L'\u00e9l\u00e9ment <method-params> est ignor\u00e9 lorsque l'\u00e9l\u00e9ment <method-name> a la valeur "*". (EJB 2.0 : 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: Aucune m\u00e9thode de {0} ne correspond \u00e0 cet \u00e9l\u00e9ment <method>. (EJB 2.0 : 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: Au moins un \u00e9l\u00e9ment <method> doit \u00eatre d\u00e9fini dans un \u00e9l\u00e9ment <method-permission>. (EJB 2.0 : 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: Un \u00e9l\u00e9ment <role-name> ou <unchecked> doit \u00eatre d\u00e9fini dans un \u00e9l\u00e9ment <method-permission>. (EJB 2.0 : 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: Aucune m\u00e9thode n'a \u00e9t\u00e9 d\u00e9tect\u00e9e dans cet \u00e9l\u00e9ment <method-permission>. (EJB 2.0 : 21.3.2)
-CHKJ2847.ejb20=CHKJ2847W: Aucune m\u00e9thode n'a \u00e9t\u00e9 d\u00e9tect\u00e9e dans cet \u00e9l\u00e9ment <container-transaction>. (EJB 2.0 : 17.4.1)
-CHKJ2812.ejb20=CHKJ2812E: La classe de bean {0} doit sp\u00e9cifier au moins l''une de ses zones comme zone <cmp-field>. (EJB 2.0 : 22.5)
-CHKJ2832.ejb20=CHKJ2832I: L''interface home {0}, sp\u00e9cifi\u00e9e dans l''\u00e9l\u00e9ment <ejb-ref>, est introuvable dans le module EJB. (EJB 2.0 : 20.3.1.2)
-CHKJ2833.ejb20=CHKJ2833I: L''interface \u00e9loign\u00e9e {0}, sp\u00e9cifi\u00e9e dans l''\u00e9l\u00e9ment <ejb-ref>, est introuvable dans le module EJB. (EJB 2.0 : 20.3.1.2)
-CHKJ2834.ejb20=CHKJ2834I: Le bean {0}, sp\u00e9cifi\u00e9 dans l''\u00e9l\u00e9ment <ejb-ref>, est introuvable dans le module EJB. (EJB 2.0 : 20.3.2)
-CHKJ2835.ejb20=CHKJ2835I: Le bean {0} est de type {1}. Mettez \u00e0 jour l''\u00e9l\u00e9ment <ejb-ref-type> de l''\u00e9l\u00e9ment <ejb-ref>. (EJB 2.0 : 20.3.2)
-CHKJ2836.ejb20=CHKJ2836I: Le bean {0} utilise l''interface home {1}. Mettez \u00e0 jour l''\u00e9l\u00e9ment <ejb-ref> de l''\u00e9l\u00e9ment <ejb-ref>. (EJB 2.0 : 20.3.2)
-CHKJ2837.ejb20=CHKJ2837I: Le bean {0} utilise l''interface \u00e9loign\u00e9e {1}. Mettez \u00e0 jour l''\u00e9l\u00e9ment <ejb-ref> de l''\u00e9l\u00e9ment <ejb-ref>. (EJB 2.0 : 20.3.2)
-CHKJ2838.ejb20=CHKJ2838I: Il est recommand\u00e9 d'organiser toutes les r\u00e9f\u00e9rences aux beans enterprise dans le sous-contexte "ejb". (EJB 2.0 : 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: La r\u00e9f\u00e9rence de r\u00f4le de s\u00e9curit\u00e9 est d\u00e9finie plusieurs fois.
-CHKJ2822.ejb20=CHKJ2822W: L''\u00e9l\u00e9ment <security-role-ref> du bean {0} doit d\u00e9finir l''\u00e9l\u00e9ment <role-name>. (EJB 2.0 : 21.2.5.3)
-CHKJ2823.ejb20=CHKJ2823W: L'\u00e9l\u00e9ment <security-role-ref> doit d\u00e9finir l'\u00e9l\u00e9ment <role-link>. (EJB 2.0 : 21.3.3)
-CHKJ2824.ejb20=CHKJ2824W: L''\u00e9l\u00e9ment <security-role-ref> fait r\u00e9f\u00e9rence au r\u00f4le inconnu {0}. (EJB 2.0 : 21.3.3)
-CHKJ2825.ejb20=CHKJ2825W: L''\u00e9l\u00e9ment <security-role> du fichier ejb-jar.xml doit d\u00e9finir l''\u00e9l\u00e9ment <role-name>. (EJB 2.0 : 21.3.1)
-CHKJ2826.ejb20=CHKJ2826W: Le nom du r\u00f4le de s\u00e9curit\u00e9 doit \u00eatre unique. (EJB 2.0 : 21.3.1)
-CHKJ2827.ejb20=CHKJ2827W: Impossible d'utiliser un \u00e9l\u00e9ment <role-link> sans \u00e9l\u00e9ments <security-role>. (EJB 2.0 : 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: Impossible de valider l''\u00e9l\u00e9ment <method> car le type {0} ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2851.ejb20=CHKJ2851W: Impossible de valider {0} car le type {1} ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2875.ejb20=CHKJ2875E: Tous les fichiers EAR contenant ce module EJB doivent contenir l''\u00e9l\u00e9ment <ejb-client-jar> {0} (EJB 2.0 : 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: Cette classe ne doit pas impl\u00e9menter javax.ejb.SessionSynchronization (EJB 2.0 : 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: Les beans session avec \u00e9tat des transactions g\u00e9r\u00e9es par bean n'ont pas besoin d'impl\u00e9menter javax.ejb.SessionSynchronization (EJB 2.0 : 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: La classe <ejb-class> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: La classe de bean, identifi\u00e9e par l'\u00e9l\u00e9ment <ejb-class>, est introuvable. (EJB 2.0 : 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: L''interface <home> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: Interface inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <home>. (EJB 2.0 : 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: L''interface <remote> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: Interface inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <remote>. (EJB 2.0 : 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: L''interface <local-home> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: Interface inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <local-home>. (EJB 2.0 : 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: L''interface <local> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: Interface inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <local>. (EJB 2.0 : 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: La classe <prim-key-class> {0} ou l''un de ses supertypes ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: Classe inconnue sp\u00e9cifi\u00e9e dans l'\u00e9l\u00e9ment <prim-key-class>.  (EJB 2.0 : 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: La zone <field-name> {0} est introuvable dans la classe de bean {1}. (EJB 2.0 : 22.5)
-
-CHKJ2103.ejb20=CHKJ2103E: Dans l''h\u00e9ritage des composants, la classe de bean {0} doit h\u00e9riter de {1} (EJB 2.0 : D.2)
-CHKJ2104.ejb20=CHKJ2104E: Dans l''h\u00e9ritage des composants, l''interface home {0} ne doit pas h\u00e9riter de {1}. (EJB 2.0 : D.2).
-CHKJ2105.ejb20=CHKJ2105E: Dans l''h\u00e9ritage des composants, l''interface des composants {0} doit h\u00e9riter de {1}. (EJB 2.0 : D.2).
-CHKJ2106.ejb20=CHKJ2106E: Le bean {0} doit utiliser {1} comme \u00e9l\u00e9ment <prim-key-class> (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: Impossible de valider l''h\u00e9ritage des composants de {0} car le type {1} ou l''une de ses d\u00e9pendances ne peut pas \u00eatre refl\u00e9t\u00e9. V\u00e9rifiez le chemin d''acc\u00e8s aux classes.
-
-CHKJ2895.ejb20=CHKJ2895W: L''\u00e9l\u00e9ment <ejb-name> {0} doit \u00eatre unique dans le fichier ejb-jar.xml (EJB 2.0 : 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: Cette classe doit impl\u00e9menter {0} (EJB 2.0 : 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: Cette classe doit impl\u00e9menter {0} (EJB 2.0 : 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: Cette classe doit impl\u00e9menter {0} (EJB 2.0 : 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: Cette classe doit impl\u00e9menter {0} (EJB 2.0 : 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBHome (EJB 2.0 : 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBHome (EJB 2.0 : 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBHome (EJB 2.0 : 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBLocalHome (EJB 2.0 : 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBLocalHome (EJB 2.0 : 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBLocalHome (EJB 2.0 : 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBObject (EJB 2.0 : 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBObject (EJB 2.0 : 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBObject (EJB 2.0 : 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBLocalObject (EJB 2.0 : 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBLocalObject (EJB 2.0 : 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: Cette interface doit \u00e9tendre javax.ejb.EJBLocalObject (EJB 2.0 : 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" ne doit pas \u00eatre transmis comme argument de m\u00e9thode ou r\u00e9sultat (EJB 2.0 : 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" ne doit pas \u00eatre transmis comme argument de m\u00e9thode ou r\u00e9sultat (EJB 2.0 : 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" ne doit pas \u00eatre transmis comme argument de m\u00e9thode ou r\u00e9sultat (EJB 2.0 : 7.10.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: Cette classe doit \u00eatre abstraite (EJB 2.0 : 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: Cette classe ne doit pas \u00eatre abstraite (EJB 2.0 : 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: Cette classe ne doit pas \u00eatre abstraite (EJB 2.0 : 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: Cette classe ne doit pas \u00eatre abstraite (EJB 2.0 : 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: Cette classe doit \u00eatre publique (EJB 2.0 : 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: Cette classe doit \u00eatre publique (EJB 2.0 : 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: Cette classe doit \u00eatre publique (EJB 2.0 : 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: Cette classe doit \u00eatre publique (EJB 2.0 : 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: Cette classe doit \u00eatre publique (EJB 2.0 : 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: Cette classe ne doit pas \u00eatre finale (EJB 2.0 : 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: Cette classe ne doit pas \u00eatre finale (EJB 2.0 : 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: Cette classe ne doit pas \u00eatre finale (EJB 2.0 : 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: Cette classe ne doit pas \u00eatre finale (EJB 2.0 : 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: Cette classe doit \u00eatre s\u00e9rialisable (EJB 2.0 : 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: Cette classe doit \u00eatre publique (EJB 2.0 : 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: Cette classe ne doit pas \u00eatre abstraite (EJB 2.0 : 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: Cette classe doit correspondre \u00e0 un type de valeur autoris\u00e9 dans les r\u00e8gles RMI-IIOP (EJB 2.0 : 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: Cette classe doit correspondre \u00e0 un type de valeur autoris\u00e9 dans les r\u00e8gles 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: La m\u00e9thode publique {0} doit exister (EJB 2.0 : 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: La m\u00e9thode publique {0} doit exister (EJB 2.0 : 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: La m\u00e9thode publique {0} doit exister (EJB 2.0 : 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: La m\u00e9thode publique {0} doit exister (EJB 2.0 : 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: La m\u00e9thode publique {0} doit exister (EJB 2.0 : 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: Cette classe doit d\u00e9finir {0} (EJB 2.0 : 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) doit exister (EJB 2.0 : 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: Il doit exister au moins une m\u00e9thode ejbCreate (EJB 2.0 : 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: La m\u00e9thode ejbCreate() doit exister (EJB 2.0 : 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: La m\u00e9thode ejbCreate() doit exister (EJB 2.0 : 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: La m\u00e9thode ejbFindByPrimaryKey doit exister (EJB 2.0 : 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: La m\u00e9thode setEntityContext(EntityContext) doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: La m\u00e9thode setEntityContext(EntityContext) doit exister (EJB 2.0 : 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: La m\u00e9thode unsetEntityContext() doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: La m\u00e9thode unsetEntityContext() doit exister (EJB 2.0 : 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: La m\u00e9thode ejbActivate() doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: La m\u00e9thode ejbActivate() doit exister (EJB 2.0 : 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: La m\u00e9thode ejbPassivate() doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: La m\u00e9thode ejbPassivate() doit exister (EJB 2.0 : 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: La m\u00e9thode ejbPassivate() doit exister (EJB 2.0 : 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: La m\u00e9thode ejbRemove() doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: La m\u00e9thode ejbRemove() doit exister (EJB 2.0 : 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: La m\u00e9thode ejbRemove() doit exister (EJB 2.0 : 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: La m\u00e9thode ejbRemove() doit exister (EJB 2.0 : 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: La m\u00e9thode ejbLoad() doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: La m\u00e9thode ejbLoad() doit exister (EJB 2.0 : 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: La m\u00e9thode ejbStore() doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: La m\u00e9thode ejbStore() doit exister (EJB 2.0 : 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: La m\u00e9thode create() doit exister (EJB 2.0 : 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: La m\u00e9thode create() doit exister (EJB 2.0 : 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: Cette interface doit d\u00e9finir au moins une m\u00e9thode create() (EJB 2.0 : 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: Cette interface doit d\u00e9finir au moins une m\u00e9thode create() (EJB 2.0 : 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: Il doit exister au moins une m\u00e9thode finder (EJB 2.0 : 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: Il doit exister au moins une m\u00e9thode finder (EJB 2.0 : 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: Il doit exister au moins une m\u00e9thode finder (EJB 2.0 : 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: Il doit exister au moins une m\u00e9thode finder (EJB 2.0 : 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: Cette interface doit d\u00e9finir au moins une m\u00e9thode home (EJB 2.0 : 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: Cette interface doit d\u00e9finir au moins une m\u00e9thode home (EJB 2.0 : 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: Cette interface doit d\u00e9finir au moins une m\u00e9thode home (EJB 2.0 : 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: Cette interface doit d\u00e9finir au moins une m\u00e9thode home (EJB 2.0 : 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: Cette classe doit d\u00e9finir au moins une m\u00e9thode ejbHome (EJB 2.0 : 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: Cette classe doit d\u00e9finir au moins une m\u00e9thode ejbHome (EJB 2.0 : 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: Cette classe doit d\u00e9finir au moins une m\u00e9thode ejbHome (EJB 2.0 : 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: Cette classe doit d\u00e9finir au moins une m\u00e9thode ejbHome (EJB 2.0 : 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() doit exister dans cette classe (EJB 2.0 : 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() doit exister dans cette classe (EJB 2.0 : 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) doit exister dans cette classe (EJB 2.0 : 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) doit exister dans cette classe (EJB 2.0 : 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: Une m\u00e9thode ejbSelect doit exister (EJB 2.0 : 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey doit exister (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey doit exister (EJB 2.0 : 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey doit exister (EJB 2.0 : 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey doit exister (EJB 2.0 : 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} doit exister (EJB 2.0 : 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} doit exister (EJB 2.0 : 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} doit exister (EJB 2.0 : 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: L''exception d''application {1} sur {0} doit \u00e9tendre java.lang.Exception (EJB 2.0 : 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: L''exception d''application {0} doit \u00e9tendre java.lang.Exception (EJB 2.0 : 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: L''exception d''application {1} sur {0} ne doit pas \u00e9tendre java.lang.RuntimeException (EJB 2.0 : 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: L''exception d''application {0} ne doit pas \u00e9tendre java.lang.RuntimeException (EJB 2.0 : 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: La m\u00e9thode {0} sur {1} doit \u00eatre publique (EJB 2.0 : 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: La m\u00e9thode {0} sur {1} doit \u00eatre publique (EJB 2.0 : 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: La m\u00e9thode {0} sur {1} doit \u00eatre publique (EJB 2.0 : 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: La m\u00e9thode {0} sur {1} doit \u00eatre publique (EJB 2.0 : 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer d''exceptions d''application (EJB 2.0 : 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer d''exceptions d''application (EJB 2.0 : 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer d''exceptions d''application (EJB 2.0 : 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer d''exceptions d''application (EJB 2.0 : 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer d''exceptions d''application (EJB 2.0 : 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer d''exceptions d''application (EJB 2.0 : 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-
-
-CHKJ2503.ejbCreate.sb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} doit exister pour que la m\u00e9thode {0} puisse \u00eatre appel\u00e9e (EJB 2.0 : 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} doit exister pour que la m\u00e9thode {0} puisse \u00eatre appel\u00e9e (EJB 2.0 : 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} doit exister pour que cette m\u00e9thode puisse \u00eatre appel\u00e9e (EJB 2.0 : 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} doit exister pour que cette m\u00e9thode puisse \u00eatre appel\u00e9e (EJB 2.0 : 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: La m\u00e9thode {0} doit \u00eatre publique.  (EJB 2.0 : 12.2.6)
-CHKJ2431.cb.m.ejb20=CHKJ2431W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: Cette m\u00e9thode doit \u00eatre publique.  (EJB 2.0 : 12.2.6)
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: Le param\u00e8tre {0} de la m\u00e9thode {1} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re (EJB 2.0 : 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re (EJB 2.0 : 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister. Le conteneur fournit cette impl\u00e9mentation de m\u00e9thode (EJB 2.0 : 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister. Le conteneur fournit cette impl\u00e9mentation de m\u00e9thode (EJB 2.0 : 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister. Seuls les beans CMP peuvent comporter des m\u00e9thodes ejbSelect (EJB 2.0 : 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister. Seuls les beans CMP peuvent comporter des m\u00e9thodes ejbSelect (EJB 2.0 : 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister. Seuls les beans CMP peuvent comporter des m\u00e9thodes ejbSelect (EJB 2.0 : 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister. Seuls les beans CMP peuvent comporter des m\u00e9thodes ejbSelect (EJB 2.0 : 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister. Seuls les beans CMP peuvent comporter des m\u00e9thodes ejbSelect (EJB 2.0 : 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister. Seuls les beans CMP peuvent comporter des m\u00e9thodes ejbSelect (EJB 2.0 : 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: La m\u00e9thode finalize() ne doit pas exister (EJB 2.0 : 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: La m\u00e9thode finalize() ne doit pas exister (EJB 2.0 : 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: La m\u00e9thode finalize() ne doit pas exister (EJB 2.0 : 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: La m\u00e9thode finalize() ne doit pas exister (EJB 2.0 : 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister (EJB 2.0 : 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: La m\u00e9thode {0} ne doit pas exister (EJB 2.0 : 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: Cette m\u00e9thode ne doit pas exister (EJB 2.0 : 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: Le nom de la m\u00e9thode {0} ne doit pas commencer par "ejb" (EJB 2.0 : 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: Le nom de la m\u00e9thode {0} ne doit pas commencer par "ejb" (EJB 2.0 : 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: Le nom de la m\u00e9thode {0} ne doit pas commencer par "ejb" (EJB 2.0 : 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: Ce nom de m\u00e9thode ne doit pas commencer par "ejb" (EJB 2.0 : 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: Ce nom de m\u00e9thode ne doit pas commencer par "ejb" (EJB 2.0 : 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: Ce nom de m\u00e9thode ne doit pas commencer par "ejb" (EJB 2.0 : 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 12.2.7).
-CHKJ2441.sb.m.ejb20=CHKJ2441W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 7.10.4).
-CHKJ2441.cb.m.ejb20=CHKJ2441W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 10.6.8).
-CHKJ2441.bb.m.ejb20=CHKJ2441W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: La m\u00e9thode {0} ne doit pas \u00eatre finale (EJB 2.0 : 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: Cette m\u00e9thode ne doit pas \u00eatre finale (EJB 2.0 : 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: La m\u00e9thode {0} ne doit pas \u00eatre statique (EJB 2.0 : 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: Cette m\u00e9thode ne doit pas \u00eatre statique (EJB 2.0 : 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: La m\u00e9thode {0} ne doit rien renvoyer (EJB 2.0 : 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: Cette m\u00e9thode ne doit rien renvoyer (EJB 2.0 : 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: La m\u00e9thode {0} doit \u00eatre abstraite (EJB 2.0 : 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: Cette m\u00e9thode doit \u00eatre abstraite (EJB 2.0 : 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: La m\u00e9thode {0} ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: Cette m\u00e9thode ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: La m\u00e9thode {0} ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: Cette m\u00e9thode ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: Cette interface doit respecter les r\u00e8gles RMI-IIOP des interfaces \u00e9loign\u00e9es (EJB 2.0 : 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: Cette interface doit respecter les r\u00e8gles RMI-IIOP des interfaces \u00e9loign\u00e9es (EJB 2.0 : 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: Cette interface doit respecter les r\u00e8gles RMI-IIOP des interfaces \u00e9loign\u00e9es (EJB 2.0 : 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "create" (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "create" (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "create" (EJB 2.0 : 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "create" (EJB 2.0 : 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: Ce nom de m\u00e9thode ne doit pas commencer par "create" (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: Ce nom de m\u00e9thode ne doit pas commencer par "create" (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: Ce nom de m\u00e9thode ne doit pas commencer par "create" (EJB 2.0 : 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: Ce nom de m\u00e9thode ne doit pas commencer par "create" (EJB 2.0 : 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "find" (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "find" (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "find" (EJB 2.0 : 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "find" (EJB 2.0 : 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: Ce nom de m\u00e9thode ne doit pas commencer par "find" (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: Ce nom de m\u00e9thode ne doit pas commencer par "find" (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: Ce nom de m\u00e9thode ne doit pas commencer par "find" (EJB 2.0 : 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: Ce nom de m\u00e9thode ne doit pas commencer par "find" (EJB 2.0 : 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "remove" (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "remove" (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "remove" (EJB 2.0 : 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: Le nom de la m\u00e9thode {0} ne doit pas commencer par "remove" (EJB 2.0 : 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: Ce nom de m\u00e9thode ne doit pas commencer par "remove" (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: Ce nom de m\u00e9thode ne doit pas commencer par "remove" (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: Ce nom de m\u00e9thode ne doit pas commencer par "remove" (EJB 2.0 : 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: Ce nom de m\u00e9thode ne doit pas commencer par "remove" (EJB 2.0 : 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: La m\u00e9thode {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: La m\u00e9thode {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: La m\u00e9thode {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: La m\u00e9thode {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.5.1, 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.5.1, 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.CreateException (EJB 2.0 : 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: La m\u00e9thode {0} doit correspondre \u00e0 la m\u00e9thode create() (EJB 2.0 : 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: La m\u00e9thode {0} doit correspondre \u00e0 la m\u00e9thode create() (EJB 2.0 : 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: Cette m\u00e9thode doit correspondre \u00e0 la m\u00e9thode create() (EJB 2.0 : 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: Cette m\u00e9thode doit correspondre \u00e0 la m\u00e9thode create() (EJB 2.0 : 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: La m\u00e9thode {0} doit correspondre \u00e0 la m\u00e9thode ejbCreate() (EJB 2.0 : 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: Cette m\u00e9thode doit correspondre \u00e0 la m\u00e9thode ejbCreate() (EJB 2.0 : 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: La m\u00e9thode correspondante {0} doit exister dans {1} (EJB 2.0 : 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: La m\u00e9thode correspondante {0} doit exister dans {1} (EJB 2.0 : 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: La m\u00e9thode correspondante {0} doit exister dans {1} (EJB 2.0 : 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: La m\u00e9thode correspondante {0} doit exister dans {1} (EJB 2.0 : 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: La m\u00e9thode correspondante {0} doit exister dans {1} (EJB 2.0 : 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: La m\u00e9thode correspondante {0} doit exister dans {1} (EJB 2.0 : 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: La m\u00e9thode correspondante {1} de {0} doit exister dans {2} (EJB 2.0 : 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: La m\u00e9thode {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: La m\u00e9thode {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer ObjectNotFoundException (EJB 2.0 : 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re (EJB 2.0 : 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} doit exister dans {2} pour {0} (EJB 2.0 : 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} doit exister dans {2} pour {0} (EJB 2.0 : 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} doit exister dans {1} (EJB 2.0 : 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} doit exister dans {1} (EJB 2.0 : 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} doit exister dans {2} pour {0} (EJB 2.0 : 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} doit exister dans {2} pour {0} (EJB 2.0 : 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} doit exister dans {1} (EJB 2.0 : 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} doit exister dans {1} (EJB 2.0 : 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: La m\u00e9thode {0} doit \u00eatre associ\u00e9e \u00e0 un \u00e9l\u00e9ment de requ\u00eate dans le fichier ejb-jar.xml (EJB 2.0 : 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: Cette m\u00e9thode doit \u00eatre associ\u00e9e \u00e0 un \u00e9l\u00e9ment de requ\u00eate dans le fichier ejb-jar.xml (EJB 2.0 : 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: La m\u00e9thode {0} doit \u00eatre associ\u00e9e \u00e0 un \u00e9l\u00e9ment de requ\u00eate dans le fichier ejb-jar.xml (EJB 2.0 : 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: Cette m\u00e9thode doit \u00eatre associ\u00e9e \u00e0 un \u00e9l\u00e9ment de requ\u00eate dans le fichier ejb-jar.xml (EJB 2.0 : 10.5.6, 10.6.14).
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: La m\u00e9thode {0} ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: Cette m\u00e9thode doit g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: Cette m\u00e9thode ne doit pas g\u00e9n\u00e9rer java.rmi.RemoteException (EJB 2.0 : 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} pour {2} (EJB 2.0 : 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} pour {2} (EJB 2.0 : 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} pour {2} (EJB 2.0 : 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} pour {2} (EJB 2.0 : 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} pour {2} (EJB 2.0 : 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} pour {2} (EJB 2.0 : 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} pour {1} (EJB 2.0 : 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} pour {1} (EJB 2.0 : 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} pour {1} (EJB 2.0 : 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} pour {1} (EJB 2.0 : 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} pour {1} (EJB 2.0 : 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} pour {1} (EJB 2.0 : 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: Le param\u00e8tre {1} de la m\u00e9thode {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: La m\u00e9thode {0} ne doit pas exposer le type {1} (EJB 2.0 : 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: La m\u00e9thode {0} ne doit pas exposer le type {1} (EJB 2.0 : 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: La m\u00e9thode {0} ne doit pas exposer le type {1} (EJB 2.0 : 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: Cette m\u00e9thode ne doit pas exposer le type {0} (EJB 2.0 : 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: Cette m\u00e9thode ne doit pas exposer le type {0} (EJB 2.0 : 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: Cette m\u00e9thode ne doit pas exposer le type {0} (EJB 2.0 : 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: Cette interface doit respecter les r\u00e8gles RMI-IIOP des interfaces \u00e9loign\u00e9es (EJB 2.0 : 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: Cette interface doit respecter les r\u00e8gles RMI-IIOP des interfaces \u00e9loign\u00e9es (EJB 2.0 : 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: Cette interface doit respecter les r\u00e8gles RMI-IIOP des interfaces \u00e9loign\u00e9es (EJB 2.0 : 12.2.8).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: Le param\u00e8tre {0} de la m\u00e9thode {1} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: Le param\u00e8tre {0} de la m\u00e9thode {1} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: Le param\u00e8tre {0} de la m\u00e9thode {1} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} doit \u00eatre s\u00e9rialisable lors de l''ex\u00e9cution (EJB 2.0 : 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: Le param\u00e8tre {1} de la m\u00e9thode {0} ne peut pas correspondre \u00e0 un argument ou un type de r\u00e9sultat (EJB 2.0 : 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} ne doit pas transmettre {1} comme argument ou r\u00e9sultat (EJB 2.0 : 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} ne doit pas transmettre {1} comme argument ou r\u00e9sultat (EJB 2.0 : 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: Cette m\u00e9thode ne doit pas transmettre {0} comme argument ou r\u00e9sultat (EJB 2.0 : 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: Cette m\u00e9thode ne doit pas transmettre {0} comme argument ou r\u00e9sultat (EJB 2.0 : 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} ne peut pas correspondre \u00e0 un argument ou un type de r\u00e9sultat (EJB 2.0 : 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: La m\u00e9thode {0} ne doit pas exposer {1} (EJB 2.0 : 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: Cette m\u00e9thode ne doit pas exposer {0} (EJB 2.0 : 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: La m\u00e9thode {0} ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: Cette m\u00e9thode ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: La m\u00e9thode {0} doit \u00eatre abstraite (EJB 2.0 : 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: Cette m\u00e9thode doit \u00eatre abstraite (EJB 2.0 : 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: La m\u00e9thode {0} doit \u00eatre publique (EJB 2.0 : 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: Cette m\u00e9thode doit \u00eatre publique (EJB 2.0 : 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: Cette m\u00e9thode doit g\u00e9n\u00e9rer javax.ejb.FinderException (EJB 2.0 : 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: La m\u00e9thode {0} doit renvoyer {1} ou une collection de cette derni\u00e8re (EJB 2.0 : 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: Cette m\u00e9thode doit renvoyer {0} ou une collection de cette derni\u00e8re (EJB 2.0 : 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: La m\u00e9thode {0} doit \u00eatre associ\u00e9e \u00e0 un \u00e9l\u00e9ment de requ\u00eate dans le fichier ejb-jar.xml (EJB 2.0 : 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: Cette m\u00e9thode doit \u00eatre associ\u00e9e \u00e0 un \u00e9l\u00e9ment de requ\u00eate dans le fichier ejb-jar.xml (EJB 2.0 : 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: La m\u00e9thode {0} requiert {1} pour exister dans {2} (EJB 2.0 : 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: La m\u00e9thode {0} requiert {1} pour exister dans {2} (EJB 2.0 : 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: La m\u00e9thode {0} requiert {1} pour exister dans {2} (EJB 2.0 : 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: La m\u00e9thode {0} requiert {1} pour exister dans {2} (EJB 2.0 : 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: La m\u00e9thode {0} requiert {1} pour exister dans {2} (EJB 2.0 : 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: La m\u00e9thode {0} requiert {1} pour exister dans {2} (EJB 2.0 : 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: La m\u00e9thode {0} doit exister dans {1} (EJB 2.0 : 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 12.2.10).
-CHKJ2470.src.m.ejb20=CHKJ2470E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 7.10.5).
-CHKJ2470.slc.m.ejb20=CHKJ2470E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 7.10.7).
-CHKJ2470.crc.m.ejb20=CHKJ2470E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 10.6.9).
-CHKJ2470.clc.m.ejb20=CHKJ2470E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 10.6.11).
-CHKJ2470.brc.m.ejb20=CHKJ2470E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 12.2.8).
-CHKJ2470.blc.m.ejb20=CHKJ2470E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} (EJB 2.0 : 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} (EJB 2.0 : 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} (EJB 2.0 : 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} (EJB 2.0 : 10.6.11).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} (EJB 2.0 : 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: La m\u00e9thode {0} doit g\u00e9n\u00e9rer {1} (EJB 2.0 : 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} (EJB 2.0 : 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} (EJB 2.0 : 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} (EJB 2.0 : 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} (EJB 2.0 : 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} (EJB 2.0 : 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: Cette m\u00e9thode doit g\u00e9n\u00e9rer {0} (EJB 2.0 : 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: La m\u00e9thode {0} est fournie par le conteneur (EJB 2.0 : 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: La m\u00e9thode {0} est fournie par le conteneur (EJB 2.0 : 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: La m\u00e9thode {0} est fournie par le conteneur (EJB 2.0 : 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: La m\u00e9thode {0} est fournie par le conteneur (EJB 2.0 : 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: La m\u00e9thode {0} est fournie par le conteneur (EJB 2.0 : 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: La m\u00e9thode {0} est fournie par le conteneur (EJB 2.0 : 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: Cette m\u00e9thode est fournie par le conteneur (EJB 2.0 : 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: Cette m\u00e9thode est fournie par le conteneur (EJB 2.0 : 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: Cette m\u00e9thode est fournie par le conteneur (EJB 2.0 : 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: Cette m\u00e9thode est fournie par le conteneur (EJB 2.0 : 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: Cette m\u00e9thode est fournie par le conteneur (EJB 2.0 : 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: Cette m\u00e9thode est fournie par le conteneur (EJB 2.0 : 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: La m\u00e9thode {0} doit correspondre \u00e0 findByPrimaryKey({1}) (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: La m\u00e9thode {0} doit correspondre \u00e0 findByPrimaryKey({1}) (EJB 2.0 : 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: La m\u00e9thode {0} doit correspondre \u00e0 findByPrimaryKey(Object) (EJB 2.0 : 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: La m\u00e9thode {0} doit correspondre \u00e0 findByPrimaryKey(Object) (EJB 2.0 : 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: La m\u00e9thode {0} doit correspondre \u00e0 findByPrimaryKey({1}) (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: La m\u00e9thode {0} doit correspondre \u00e0 findByPrimaryKey({1}) (EJB 2.0 : 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: Cette m\u00e9thode doit correspondre \u00e0 findByPrimaryKey({0}) (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: Cette m\u00e9thode doit correspondre \u00e0 findByPrimaryKey({0}) (EJB 2.0 : 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: Cette m\u00e9thode doit correspondre \u00e0 findByPrimaryKey(Object) (EJB 2.0 : 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: Cette m\u00e9thode doit correspondre \u00e0 findByPrimaryKey(Object) (EJB 2.0 : 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: Cette m\u00e9thode doit correspondre \u00e0 findByPrimaryKey({0}) (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: Cette m\u00e9thode doit correspondre \u00e0 findByPrimaryKey({0}) (EJB 2.0 : 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: La m\u00e9thode {0} doit renvoyer {1} (EJB 2.0 : 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=CHKJ2479E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=CHKJ2479E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=CHKJ2479E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=CHKJ2479E: Cette m\u00e9thode doit renvoyer {0} (EJB 2.0 : 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: La zone transitoire {0} ne doit pas correspondre au type {1} (EJB 2.0 : 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: Une zone transitoire ne doit pas correspondre au type {0} (EJB 2.0 : 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: Les zones transitoires ({0}) sont d\u00e9conseill\u00e9es (EJB 2.0 : 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: Les zones transitoires sont d\u00e9conseill\u00e9es (EJB 2.0 : 7.4.1).
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: La zone {0} ne doit pas \u00eatre d\u00e9finie (EJB 2.0 : 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: La zone {0} ne doit pas \u00eatre d\u00e9finie (EJB 2.0 : 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: La zone {0} doit commencer par une minuscule (EJB 2.0 : 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: La zone {0} doit commencer par une minuscule (EJB 2.0 : 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: La zone {0} doit \u00eatre d\u00e9clar\u00e9e comme \u00e9l\u00e9ment <cmp-field> (EJB 2.0 : 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: La zone {0} doit \u00eatre d\u00e9clar\u00e9e comme \u00e9l\u00e9ment <cmp-field> (EJB 2.0 : 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: La zone {0} doit \u00eatre d\u00e9clar\u00e9e comme \u00e9l\u00e9ment <cmr-field> (EJB 2.0 : 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: La zone {0} doit \u00eatre d\u00e9clar\u00e9e comme \u00e9l\u00e9ment <cmr-field> (EJB 2.0 : 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: La zone {0} ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: La zone {0} ne doit pas \u00eatre expos\u00e9e (EJB 2.0 : 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: La zone {0} doit correspondre \u00e0 une primitive ou \u00e0 un type s\u00e9rialisable (EJB 2.0 : 10.3.1).
-CHKJ2484.cb.m.ejb20=CHKJ2484W: La zone {0} doit correspondre \u00e0 une primitive ou \u00e0 un type s\u00e9rialisable (EJB 2.0 : 10.3.1).
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: La zone {0} doit correspondre au type {1} (EJB 2.0 : 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: Cette zone doit correspondre au type {0} (EJB 2.0 : 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: La zone {0} doit \u00eatre publique (EJB 2.0 : 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: Cette zone doit \u00eatre publique (EJB 2.0 : 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: La zone {0} doit correspondre \u00e0 un \u00e9l\u00e9ment <cmp-field> (EJB 2.0 : 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: Cette zone doit correspondre \u00e0 un \u00e9l\u00e9ment <cmp-field> (EJB 2.0 : 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: Ce bean doit fournir un \u00e9l\u00e9ment <local-home> (EJB 2.0 : 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: Ce bean doit fournir un \u00e9l\u00e9ment <home> (EJB 2.0 : 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: Ce bean doit fournir un \u00e9l\u00e9ment <local> (EJB 2.0 : 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: Ce bean doit fournir un \u00e9l\u00e9ment <remote> (EJB 2.0 : 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: Ce bean doit fournir un \u00e9l\u00e9ment <local-home> ou <home> (EJB 2.0 : 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: Ce bean doit fournir un \u00e9l\u00e9ment <local> ou <remote> (EJB 2.0 : 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: Ce bean doit fournir un \u00e9l\u00e9ment <local-home> (EJB 2.0 : 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: Ce bean doit fournir un \u00e9l\u00e9ment <home> (EJB 2.0 : 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: Ce bean doit fournir un \u00e9l\u00e9ment <local> (EJB 2.0 : 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: Ce bean doit fournir un \u00e9l\u00e9ment <remote> (EJB 2.0 : 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: Ce bean doit fournir un \u00e9l\u00e9ment <local-home> ou <home> (EJB 2.0 : 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: Ce bean doit fournir un \u00e9l\u00e9ment <local> ou <remote> (EJB 2.0 : 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: Ce bean doit fournir un \u00e9l\u00e9ment <local-home> (EJB 2.0 : 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: Ce bean doit fournir un \u00e9l\u00e9ment <home> (EJB 2.0 : 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: Ce bean doit fournir un \u00e9l\u00e9ment <local> (EJB 2.0 : 12.2.1).
-CHKJ2883.b.ejb20=CHKJ2883W: Ce bean doit fournir un \u00e9l\u00e9ment <remote> (EJB 2.0 : 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: Ce bean doit fournir un \u00e9l\u00e9ment <local-home> ou <home> (EJB 2.0 : 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: Ce bean doit fournir un \u00e9l\u00e9ment <local> ou <remote> (EJB 2.0 : 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: L''\u00e9l\u00e9ment <ejb-name> {0} doit correspondre \u00e0 un identificateur Java valide (EJB 2.0 : 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: L''\u00e9l\u00e9ment <abstract-schema-name> {0} doit correspondre \u00e0 un identificateur Java valide (EJB 2.0 : 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: L''\u00e9l\u00e9ment <abstract-schema-name> {0} doit \u00eatre unique dans le fichier ejb-jar.xml (EJB 2.0 : 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: L''\u00e9l\u00e9ment <abstract-schema-name> doit exister (EJB 2.0 : 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: L''identificateur r\u00e9serv\u00e9 {0} ne peut pas \u00eatre utilis\u00e9 comme \u00e9l\u00e9ment <ejb-name> (EJB 2.0 : 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: L''identificateur r\u00e9serv\u00e9 {0} ne peut pas \u00eatre utilis\u00e9 comme \u00e9l\u00e9ment <abstract-schema-name> (EJB 2.0 : 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: L''\u00e9l\u00e9ment <cmp-field> {0} doit correspondre \u00e0 un identificateur Java valide et commencer par une minuscule (EJB 2.0 : 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: L''\u00e9l\u00e9ment <cmr-field> {0} doit correspondre \u00e0 un identificateur Java valide et commencer par une minuscule (EJB 2.0 : 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: L''\u00e9l\u00e9ment <cmp-field> {0}doit contenir une m\u00e9thode set (EJB 2.0 : 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: L''\u00e9l\u00e9ment <cmp-field> {0}doit contenir une m\u00e9thode get (EJB 2.0 : 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: L''\u00e9l\u00e9ment <cmr-field> {0}doit contenir une m\u00e9thode set (EJB 2.0 : 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: L''\u00e9l\u00e9ment <cmr-field> {0}doit contenir une m\u00e9thode get (EJB 2.0 : 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: L''\u00e9l\u00e9ment <cmp-field> {0} doit correspondre \u00e0 une primitive Java ou \u00e0 un type s\u00e9rialisable Java (EJB 2.0 : 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: L''\u00e9l\u00e9ment <cmr-field> {0} doit correspondre au type {1} ou \u00e0 une collection de ce dernier (EJB 2.0 : 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: La classe de valeurs d\u00e9pendantes {0} ne peut pas correspondre \u00e0 un \u00e9l\u00e9ment <cmr-field> (EJB 2.0 : 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: L'\u00e9l\u00e9ment <ejb-relation-name> doit \u00eatre unique dans le fichier ejb-jar.xml (EJB 2.0 : 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: L'\u00e9l\u00e9ment <ejb-relationship-role-name> doit \u00eatre unique dans un \u00e9l\u00e9ment <ejb-relation> (EJB 2.0 : 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: La valeur de l'\u00e9l\u00e9ment <multiplicity> doit \u00eatre "One" ou "Many" (EJB 2.0 : 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: L''\u00e9l\u00e9ment <relationship-role-source> du r\u00f4le {0} doit faire r\u00e9f\u00e9rence \u00e0 un bean CMP existant (EJB 2.0 : 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: L'\u00e9l\u00e9ment <cascade-delete> doit \u00eatre utilis\u00e9 avec un \u00e9l\u00e9ment <multiplicity> dont la valeur est "One" (EJB 2.0 : 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: L''\u00e9l\u00e9ment <cmr-field> {0} doit \u00eatre d\u00e9fini dans {1} (EJB 2.0 : 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: Ce bean ne peut avoir que des relations unidirectionnelles avec les autres beans (EJB 2.0 : 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: La valeur de l'\u00e9l\u00e9ment <cmr-field-type> doit \u00eatre "java.util.Collection" ou "java.util.Set" (EJB 2.0 : 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: Au moins un \u00e9l\u00e9ment <ejb-relationship-role> doit d\u00e9finir un \u00e9l\u00e9ment <cmr-field> (EJB 2.0 : 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: L''\u00e9l\u00e9ment <ejb-name> {0} doit exister (EJB 2.0 : 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: L''\u00e9l\u00e9ment <ejb-name> {0} doit faire r\u00e9f\u00e9rence \u00e0 un bean CMP (EJB 2.0 : 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: La valeur de l'\u00e9l\u00e9ment <cmp-version> doit \u00eatre "1.x" ou "2.x" (EJB 2.0 : 22.5).
-CHKJ2873.ejb20=CHKJ2873W: Migrez la liaison \u00e0 la source de donn\u00e9es de ce bean vers une liaison \u00e0 la fabrique de connexions CMP.
-CHKJ2874.ejb20=CHKJ2874W: Migrez la liaison \u00e0 la source de donn\u00e9es par d\u00e9faut de ce module EJB vers une liaison \u00e0 la fabrique de connexions CMP.
-
-###########################################################################
-#
-# 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/ejbvalidator_it.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_it.properties
deleted file mode 100644
index 5752a63..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_it.properties
+++ /dev/null
@@ -1,1528 +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=Convalida di {0} in corso.
-
-LOC_CLASS=Classe: {0}
-LOC_FIELD=Campo: {0}, Classe: {1}
-LOC_METHOD=Metodo: {0}, Classe: {1}
-LOC_BEAN=Bean enterprise: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, Bean enterprise: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=elemento <method>: {0}
-LOC_METHODPERMISSION=elemento <method-permission>: {0}
-LOC_METHODTRANSACTION=elemento <container-transaction>: {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: Errore interno durante l'esecuzione del validator EJB. Leggere il log per i dettagli.
-CHKJ2852=CHKJ2852W: Errore interno durante la convalida di {0}. Il bean sottoposto a convalida era {1}.
-CHKJ2433=CHKJ2433W: Impossibile eseguire la convalida di {0} perch\u00e9 {1} non pu\u00f2 essere riflesso. Verificare il percorso classi.
-CHKJ2907=CHKJ2907E: Impossibile riflettere il tipo {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2905=CHKJ2905W: Impossibile eseguire il validator EJB poich\u00e9 il file ejb-jar.xml non pu\u00f2 essere caricato. Per ulteriori informazioni eseguire il validator XML.
-CHKJ2041=CHKJ2041I: Le classi e le interfacce permanenti devono essere incluse in un pacchetto con nome. (JLS 2.0: 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: {0} deve generare {1} per {2} o potrebbero verificarsi errori di compilazione nel codice di distribuzione.
-CHKJ2456.m=CHKJ2456W: Questo metodo deve generare {0} per {1} o potrebbero verificarsi errori di compilazione nel codice di distribuzione.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: La classe chiave {0} deve implementare il metodo {1}. (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: Questa classe deve implementare un metodo ejbPostCreate corrispondente per {0}. (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: Questa classe deve implementare un metodo ejbPostCreate corrispondente per questo metodo. (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: Questa classe non pu\u00f2 implementare javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2003I.ejb11=CHKJ2003I: I bean session con stato per transazioni gestite da bean non richiedono l'implementazione di javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: La classe bean {1} non deve implementare il metodo ejbFind {0}. (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: La classe bean {0} non deve implementare un metodo ejbFind. (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} deve essere un metodo di tipo create o find. (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: Il metodo deve essere di tipo create o find. (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: La classe bean {0} deve avere un costruttore pubblico che non richieda argomenti. (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: La classe bean {0} deve avere un costruttore pubblico che non richieda argomenti. (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} non deve dichiarare il metodo finalize(). (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} non deve dichiarare il metodo finalize(). (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: La classe bean {0} deve contenere almeno un metodo ejbCreate. (EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: La classe bean {0} deve contenere almeno un metodo ejbFindByPrimaryKey. (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: L''interfaccia locale {0} deve contenere solo un metodo create. (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: L''interfaccia locale {0} deve contenere solo un metodo findByPrimaryKey. (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: Questo tipo deve essere un'interfaccia. (EJB 1.1: 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: Questo tipo deve essere un'interfaccia. (EJB 1.1: 6.10.6).
-CHKJ2012.er.ejb11=CHKJ2012E: Questo tipo deve essere un'interfaccia. (EJB 1.1: 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: Questo tipo deve essere un'interfaccia. (EJB 1.1: 9.2.8).
-CHKJ2013.sb.ejb11=CHKJ2013E: La classe bean {0} deve implementare {1}. (EJB 1.1: 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: La classe bean {0} deve implementare {1}. (EJB 1.1: 9.2.2).
-CHKJ2014.sb.ejb11=CHKJ2014E: La classe bean {0} non pu\u00f2 essere astratta. (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: La classe bean {0} non pu\u00f2 essere astratta. (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: La classe bean {0} non pu\u00f2 essere finale. (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: La classe bean {0} non pu\u00f2 essere finale. (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: L''interfaccia deve estendere {0}. (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: L''interfaccia deve estendere {0}. (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: L''interfaccia deve estendere {0}. (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: L''interfaccia deve estendere {0}. (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: La classe chiave {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 9.2.9) (RMI 1.3: 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: La classe chiave {0} deve essere pubblica. (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: La classe chiave {0} deve definire un costruttore predefinito pubblico. (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: La classe bean {0} deve essere pubblica. (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: La classe bean {0} deve essere pubblica. (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: {0} deve avere un metodo corrispondente nella classe bean {1}. (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: Questo metodo deve avere un metodo corrispondente nella classe di bean {0}. (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: {0} deve avere un metodo corrispondente nella classe bean {1}. (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: Questo metodo deve avere un metodo corrispondente nella classe di bean {0}. (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} non esiste. Solamente il metodo create() pu\u00f2 esistere (EJB 1.1: 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: Questo metodo non pu\u00f2 esistere. Solamente il metodo create() pu\u00f2 esistere (EJB 1.1: 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} non pu\u00f2 esistere. Solamente il metodo ejbCreate() pu\u00f2 esistere (EJB 1.1: 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: Questo metodo non pu\u00f2 esistere. Solamente il metodo ejbCreate() pu\u00f2 esistere (EJB 1.1: 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: La classe bean {1} deve implementare un metodo ejbCreate corrispondente per {0}. (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: La classe bean {0} deve implementare un metodo ejbCreate corrispondente per questo metodo. (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: La classe bean {1} deve implementare un metodo ejbCreate corrispondente per {0}. (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: La classe bean {0} deve implementare un metodo ejbCreate corrispondente per questo metodo. (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: {0} non verr\u00e0 richiamato a meno che non sia stato definito un metodo ejbCreate corrispondente. (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: Questo metodo non verr\u00e0 richiamato a meno che non sia stato definito un metodo ejbCreate corrispondente. (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: {0} non pu\u00f2 essere richiamato sull''interfaccia locale {1} senza il metodo create corrispondente. (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: Questo metodo non pu\u00f2 essere richiamato sull''interfaccia locale {0} senza il metodo create corrispondente. (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: {0} deve avere un metodo ejbFind corrispondente nella classe bean {1}. (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: Questo metodo deve avere un metodo ejbFind corrispondente nella classe bean {0}. (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: La classe bean {0} deve dichiarare almeno un campo gestito nel contenitore. (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: il metodo setEntityContext(EntityContext ic) deve essere presente. (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: il metodo unsetEntityContext() deve essere presente. (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: il metodo ejbActivate() deve essere presente. (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: il metodo ejbPassivate() deve essere presente. (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: il metodo ejbRemove() deve essere presente. (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: il metodo ejbLoad() deve essere presente. (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: il metodo ejbStore() deve essere presente. (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" non deve essere passato come un risultato o un argomento di metodo. (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: Entrambe le parti del ruolo devono utilizzare lo stesso numero di attributi.
-CHKJ2101.ejb11=CHKJ2101E: Entrambe le parti del ruolo devono utilizzare lo stesso tipo.
-CHKJ2102.eh.ejb11=CHKJ2102E: \u00c8 necessario definire un descrittore finder o un metodo finder personalizzato corrispondente sulla classe {0}.
-CHKJ2103.ejb11=CHKJ2103E: In una eredit\u00e0 di componenti, la classe bean {0} deve ereditare {1}. (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: In una eredit\u00e0 componenti, l''interfaccia locale {0} non deve ereditare {1}. (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: In una eredit\u00e0 componenti, l''interfaccia remota {0} deve ereditare {1}. (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: Bean {0} deve utilizzare {1} come <prim-key-class> (EJB 1.1: B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: Il campo statico {0} deve essere finale. (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: Questo campo statico deve essere finale. (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} non pu\u00f2 essere transitorio. (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: Il campo non pu\u00f2 essere transitorio. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: Il tipo di campo del campo {0} non \u00e8 valido per un bean CMP. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: Il tipo di campo non \u00e8 valido per un bean CMP. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} deve essere pubblico. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: Il campo deve essere pubblico. (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: Il campo di chiave primaria denominato {0} deve essere pubblico. (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: Il campo di chiave primaria deve essere pubblico. (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} deve essere un <cmp-field> di {1} e un campo della classe bean {2}. (EJB 1.1: 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: Questo campo deve essere un <cmp-field> di {0} e un campo della classe bean {1}. (EJB 1.1: 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: Il campo chiave {0} deve essere dello stesso tipo della chiave primaria, {1}. (EJB 1.1: 9.4.7.1).
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException sul metodo {0}. (EJB 1.1: 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException. (EJB 1.1: 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException sul metodo {0}. (EJB 1.1: 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException. (EJB 1.1: 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException su {0}. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException su {0}. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException su {0}. (EJB 1.1: 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException. (EJB 1.1: 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException su {0}. (EJB 1.1: 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: Uso sconsigliato di java.rmi.RemoteException. (EJB 1.1: 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} deve restituire void. (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: Questo metodo deve restituire void. (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} deve restituire il tipo di interfaccia remota {1}.  (EJB 1.1: 6.10.6).
-CHKJ2402.sh.m.ejb11=CHKJ2402W: Questo metodo create deve restituire il tipo di interfaccia remota {0}.  (EJB 1.1: 6.10.6).
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} deve restituire il tipo di interfaccia remota {1}.  (EJB 1.1: 9.2.8).
-CHKJ2402.eh.m.ejb11=CHKJ2402W: Questo metodo create deve restituire il tipo di interfaccia remota {0}.  (EJB 1.1: 9.2.8).
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} deve restituire {1} o una sua raccolta. (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: Il metodo deve restituire {0} o una sua raccolta. (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: L''ordine e i tipi di argomenti in {0} devono corrispondere all''ordine e ai tipi di campi nella classe di chiavi {1}. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: L''ordine e i tipi di argomenti devono corrispondere all''ordine e ai tipi di campi nella classe di chiavi {0}. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} deve restituire il tipo di chiave primaria {1}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: Il metodo deve restituire il tipo di chiave primaria {0}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} deve restituire {1} o una sua raccolta.  (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: Questo metodo deve restituire {0} o una sua raccolta.  (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} deve essere pubblico. (EJB 1.1: 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: Il metodo deve essere pubblico. (EJB 1.1: 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} deve essere pubblico. (EJB 1.1: 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: Questo metodo deve essere pubblico. (EJB 1.1: 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} deve essere pubblico. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: Questo metodo deve essere pubblico. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} deve essere pubblico. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: Questo metodo deve essere pubblico. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} deve essere pubblico. (EJB 1.1: 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: Questo metodo deve essere pubblico. (EJB 1.1: 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} deve essere pubblico. (EJB 1.1: 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: Questo metodo deve essere pubblico. (EJB 1.1: 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} non pu\u00f2 essere finale. (EJB 1.1: 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: Questo metodo non pu\u00f2 essere finale. (EJB 1.1: 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} non pu\u00f2 essere finale. (EJB 1.1: 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: Questo metodo non pu\u00f2 essere finale. (EJB 1.1: 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} non pu\u00f2 essere finale. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: Questo metodo non pu\u00f2 essere finale. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} non pu\u00f2 essere finale. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: Questo metodo non pu\u00f2 essere finale. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} non pu\u00f2 essere finale. (EJB 1.1: 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: Questo metodo non pu\u00f2 essere finale. (EJB 1.1: 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} non pu\u00f2 essere finale. (EJB 1.1: 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: Questo metodo non pu\u00f2 essere finale. (EJB 1.1: 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} non pu\u00f2 essere statico. (EJB 1.1: 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: Questo metodo non pu\u00f2 essere statico. (EJB 1.1: 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} non pu\u00f2 essere statico. (EJB 1.1: 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: Questo metodo non pu\u00f2 essere statico. (EJB 1.1: 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} non pu\u00f2 essere statico. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: Questo metodo non pu\u00f2 essere statico. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} non pu\u00f2 essere statico. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: Questo metodo non pu\u00f2 essere statico. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} non pu\u00f2 essere statico. (EJB 1.1: 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: Questo metodo non pu\u00f2 essere statico. (EJB 1.1: 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} non pu\u00f2 essere statico. (EJB 1.1: 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: Questo metodo non pu\u00f2 essere statico. (EJB 1.1: 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: Il nome di {0} non pu\u00f2 iniziare con "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: Il nome del metodo non pu\u00f2 iniziare con "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: Il nome di {0} non pu\u00f2 iniziare con "ejb". (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: Il nome del metodo non pu\u00f2 iniziare con "ejb". (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: Il tipo restituito di {0} deve essere serializzabile in fase di run-time.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: Il tipo restituito deve essere serializzabile in fase di run-time.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: Il tipo restituito di {0} deve essere serializzabile in fase di run-time.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: Il tipo restituito deve essere serializzabile in fase di run-time.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: Il tipo restituito di {0} deve essere serializzabile in fase di run-time.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: Il tipo restituito deve essere serializzabile in fase di run-time.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: Il tipo restituito di {0} deve essere serializzabile in fase di run-time.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: Il tipo restituito deve essere serializzabile in fase di run-time.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: Il tipo restituito di {0} deve essere serializzabile in fase di run-time.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: Il tipo restituito deve essere serializzabile in fase di run-time.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: Il tipo restituito di {0} deve essere serializzabile in fase di run-time.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: Il tipo restituito deve essere serializzabile in fase di run-time.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: L''argomento {1} di {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: L''argomento {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: L''argomento {1} di {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: L''argomento {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: L''argomento {1} di {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: L''argomento {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: L''argomento {1} di {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: L''argomento {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: L''argomento {1} di {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: L''argomento {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: L''argomento {1} di {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: L''argomento {0} deve essere serializzabile in fase di run-time. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} deve generare {1}. (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: Il metodo deve generare {0}. (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} deve generare {1}. (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: Il metodo deve generare {0}. (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} deve generare {1}. (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: Il metodo deve generare {0}. (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} deve generare {1}. (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: Il metodo deve generare {0}. (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: Il tipo di restituzione di {0} deve corrispondere al tipo di restituzione {1}, del metodo corrispondente nella classe di bean {2}. (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: Il tipo di restituzione deve corrispondere al tipo di restituzione {0}, del metodo corrispondente nella classe di bean {1}. (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: Il tipo di restituzione di {0} deve corrispondere al tipo di restituzione {1}, del metodo corrispondente nella classe di bean {2}. (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: Il tipo di restituzione deve corrispondere al tipo di restituzione {0}, del metodo corrispondente nella classe di bean {1}. (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: Il tipo di restituzione di {0} deve corrispondere al tipo di restituzione {1}, del metodo corrispondente nella classe di bean {2}. (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: Il tipo di restituzione deve corrispondere al tipo di restituzione {0}, del metodo corrispondente nella classe di bean {1}. (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: Il tipo di restituzione di {0} deve corrispondere al tipo di restituzione {1}, del metodo corrispondente nella classe di bean {2}. (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: Il tipo di restituzione deve corrispondere al tipo di restituzione {0}, del metodo corrispondente nella classe di bean {1}. (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} deve restituire void. (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: Questo metodo deve restituire void. (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} deve essere un metodo create. (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: Questo metodo deve essere di tipo create. (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1} deve essere generato dal metodo corrispondente di {0} sull''interfaccia locale {2}. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0} deve essere generato dal metodo corrispondente sull''interfaccia locale {1}. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1} deve essere generato dal metodo corrispondente di {0} sull''interfaccia locale {2}. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0} deve essere generato dal metodo corrispondente sull''interfaccia locale {1}. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: Il metodo corrispondente di {0} sull''interfaccia remota {1} deve generare {2}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: Il metodo corrispondente sull''interfaccia remota {0} deve generare {1}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: Il metodo corrispondente di {0} sull''interfaccia remota {1} deve generare {2}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: Il metodo corrispondente sull''interfaccia remota {0} deve generare {1}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: Il valore dell'elemento <ejb-name> deve essere specificato. (EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: Impossibile riflettere la classe <ejb-class> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: Classe sconosciuta specificata nell'elemento <ejb-class>. (EJB 1.1: 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: Impossibile riflettere l''interfaccia <home> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: Interfaccia sconosciuta specificata nell'elemento <home>. (EJB 1.1: 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: Impossibile riflettere l''interfaccia <remote> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: Interfaccia sconosciuta specificata nell'elemento <remote>. (EJB 1.1: 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2809E: Il valore dell'elemento <reentrant> deve essere "True" o "False". (EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: Il valore dell'elemento <session-type> deve essere "Stateful" o "Stateless". (EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: Il valore dell'elemento <transaction-type> deve essere "Container" o "Bean". (EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: Il valore dell'elemento <persistence-type> deve essere "Container" o "Bean".  (EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: Impossibile riflettere la classe <prim-key-class> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: Classe sconosciuta specificata nell'elemento <prim-key-class>.  (EJB 1.1: 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: Il <field-name> {0} non pu\u00f2 essere posizionato nella classe bean {1}. (EJB 1.1: 16.5).
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> deve specificare un <field-name>. (EJB 1.1: 16.5).
-CHKJ2812.ejb11=CHKJ2812E: La classe bean {0} deve specificare almeno uno dei rispettivi campi come <cmp-field>. (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814E: <ejb-name>, nel <method>, deve specificare un bean enterprise conosciuto. (EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: Il riferimento al ruolo di protezione deve essere definito una sola volta.
-CHKJ2822.ejb11=CHKJ2822W: L''elemento <security-role-ref> per il bean {0} deve definire l'elemento <role-name>. (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: L'elemento <security-role-ref> deve definire l'elemento <role-link>. (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: L''elemento <security-role-ref> fa riferimento al ruolo sconosciuto {0}. (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: L'elemento <security-role> in ejb-jar.xml deve definire l'elemento <role-name>. (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: Il nome del ruolo di protezione deve essere univoco. (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: Impossibile utilizzare un elemento <role-link> senza elementi <security-role>. (EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: Impossibile utilizzare un elemento <primkey-field> senza una chiave primaria primitiva. (EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: La classe chiave {0} non corrisponde ad alcun campo nel bean enterprise {1}. (EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: Il tipo di campo {0} non pu\u00f2 essere riflesso. Verificare il percorso classi.
-CHKJ2831.ejb11=CHKJ2831W: {0} deve essere dichiarato in un elemento <cmp-field>. (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: Impossibile trovare l''interfaccia locale {0}, specificata nell''elemento <ejb-ref>, nel modulo EJB. (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: Impossibile trovare l''interfaccia remota {0}, specificata nell''elemento <ejb-ref>, nel modulo EJB. (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: Impossibile trovare il bean {0}, specificato nell''elemento <ejb-ref>, nel modulo EJB. (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Il bean {0} \u00e8 di tipo {1}. Aggiornare l''elemento <ejb-ref-type> dell''elemento <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Il bean {0} utilizza l''interfaccia home {1}. Aggiornare l''elemento <ejb-ref> dell''elemento <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I:  Il bean {0} utilizza l''interfaccia remota {1}. Aggiornare l''elemento <ejb-ref> dell''elemento <ejb-ref>. (EJB 1.1: 14.3.2).
-CHKJ2838.ejb11=CHKJ2838I: Si consiglia di organizzare tutti i riferimenti ai bean enterprise nel contesto secondario "ejb". (EJB 1.1: 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: L'elemento <env-entry-name> dell'elemento <env-entry> non \u00e8 valido. (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: L'elemento <env-entry-type> dell'elemento <env-entry> non \u00e8 valido. (EJB 1.1: 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: Il nome {0} nell''elemento <env-entry-name> pu\u00f2 essere utilizzato solo una volta nel bean. (EJB 1.1: 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: <method-params> viene ignorato quando <method-name> \u00e8 "*". (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: Nessun metodo in {0} corrisponde all''elemento <method>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: Almeno un <method> deve essere impostato in un <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: Almeno un <role-name> deve essere impostato in un <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: Nessun metodo rilevato per questo <method-permission>. (EJB 1.1: 15.3.2).
-CHKJ2847.ejb11=CHKJ2847W: Nessun metodo rilevato per questo <container-transaction>. (EJB 1.1: 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: Impossibile convalidare l''eredit\u00e0 dei componenti di {0} perch\u00e9 non \u00e8 possibile riflettere {1} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2850.ejb11=CHKJ2850W: Impossibile convalidare <method> perch\u00e9 non \u00e8 possibile riflettere {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2851.ejb11=CHKJ2851W: Impossibile convalidare {0} perch\u00e9 non \u00e8 possibile riflettere {1} o uno di rispettivi supertipi. Verificare il percorso classi.
-CHKJ2852.ejb11=CHKJ2852W: Throwable rilevato durante il tentativo di convalidare ejb-jar.xml. Il bean sottoposto a convalida era {0}.
-CHKJ2853.ejb11=CHKJ2853W: Throwable rilevato durante la convalida di ibm-ejb-jar-ext.xmi. Il bean sottoposto a convalida era {0}.
-
-CHKJ2908.ejb11=CHKJ2908W: Impossibile riflettere correttamente un bean enterprise. Per ulteriori informazioni eseguire il validator XML.
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} deve essere univoco all''interno del file ejb-jar.xml (EJB 1.1: 16.5).
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0} deve essere presente in ciascun file EAR che contiene questo modulo EJB (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: Impossibile utilizzare un <primkey-field> senza una chiave primaria primitiva (EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: La classe chiave {0} non corrisponde ad alcun campo nel bean enterprise {1}. (EJB 2.0: 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: L'elemento <env-entry-name> dell'elemento <env-entry> non \u00e8 valido. (EJB 2.0: 20.2.1.2).
-CHKJ2840.ejb20=CHKJ2840W: L'elemento <env-entry-type> dell'elemento <env-entry> non \u00e8 valido. (EJB 2.0: 20.2.1.2).
-CHKJ2841.ejb20=CHKJ2841W: Il nome {0} nell''elemento <env-entry-name> pu\u00f2 essere utilizzato solo una volta nel bean. (EJB 2.0: 20.2.1.2).
-CHKJ2830.ejb20=CHKJ2830W: Il tipo di campo {0} non pu\u00f2 essere riflesso. Verificare il percorso classi.
-CHKJ2831.ejb20=CHKJ2831W: {0} deve essere dichiarato in un elemento <cmp-field>. (EJB 2.0: 10.8.2).
-CHKJ2801.ejb20=CHKJ2801E: Il valore dell'elemento <ejb-name> deve essere specificato. (EJB 2.0 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: Il valore dell'elemento <persistence-type> deve essere "Container" o "Bean".  (EJB 2.0: 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2809E: Il valore dell'elemento <reentrant> deve essere "True" o "False". (EJB 2.0: 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: Il valore dell'elemento <session-type> deve essere "Stateful" o "Stateless". (EJB 2.0: 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: Il valore dell'elemento <transaction-type> deve essere "Container" o "Bean". (EJB 2.0: 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814E: <ejb-name>, nel <method>, deve specificare un bean enterprise conosciuto. (EJB 2.0: 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: <method-params> viene ignorato quando <method-name> \u00e8 "*". (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: Nessun metodo in {0} corrisponde all''elemento <method>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: Almeno un <method> deve essere impostato in un <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: Un elemento <role-name> o <unchecked> deve essere impostato in un <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: Nessun metodo rilevato per questo <method-permission>. (EJB 2.0: 21.3.2).
-CHKJ2847.ejb20=CHKJ2847W: Nessun metodo rilevato per questo <container-transaction>. (EJB 2.0: 17.4.1).
-CHKJ2812.ejb20=CHKJ2812E: La classe bean {0} deve specificare almeno uno dei rispettivi campi come <cmp-field>. (EJB 2.0: 22.5).
-CHKJ2832.ejb20=CHKJ2832I: Impossibile trovare l''interfaccia locale {0}, specificata nell''elemento <ejb-ref>, nel modulo EJB. (EJB 2.0: 20.3.1.2).
-CHKJ2833.ejb20=CHKJ2833I: Impossibile trovare l''interfaccia remota {0}, specificata nell''elemento <ejb-ref>, nel modulo EJB. (EJB 2.0: 20.3.1.2).
-CHKJ2834.ejb20=CHKJ2834I: Impossibile trovare il bean {0}, specificato nell''elemento <ejb-ref>, nel modulo EJB. (EJB 2.0: 20.3.2).
-CHKJ2835.ejb20=CHKJ2835I: Il bean {0} \u00e8 di tipo {1}. Aggiornare l''elemento <ejb-ref-type> dell''elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2836.ejb20=CHKJ2836I: Il bean {0} utilizza l''interfaccia home {1}. Aggiornare l''elemento <ejb-ref> dell''elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2837.ejb20=CHKJ2837I:  Il bean {0} utilizza l''interfaccia remota {1}. Aggiornare l''elemento <ejb-ref> dell''elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2838.ejb20=CHKJ2838I: Si consiglia di organizzare tutti i riferimenti ai bean enterprise nel contesto secondario "ejb". (EJB 2.0: 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: Il riferimento al ruolo di protezione \u00e8 definito pi\u00f9 di una volta.
-CHKJ2822.ejb20=CHKJ2822W: L''elemento <security-role-ref> per il bean {0} deve definire l'elemento <role-name>. (EJB 2.0: 21.2.5.3).
-CHKJ2823.ejb20=CHKJ2823W: L'elemento <security-role-ref> deve definire l'elemento <role-link>. (EJB 2.0: 21.3.3).
-CHKJ2824.ejb20=CHKJ2824W: L''elemento <security-role-ref> fa riferimento al ruolo sconosciuto {0}. (EJB 2.0: 21.3.3).
-CHKJ2825.ejb20=CHKJ2825W: L'elemento <security-role> in ejb-jar.xml deve definire l'elemento <role-name>. (EJB 2.0: 21.3.1).
-CHKJ2826.ejb20=CHKJ2826W: Il nome del ruolo di protezione deve essere univoco. (EJB 2.0: 21.3.1).
-CHKJ2827.ejb20=CHKJ2827W: Impossibile utilizzare un elemento <role-link> senza elementi <security-role>. (EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: La convalida di <method> non pu\u00f2 essere eseguita poich\u00e9 il tipo {0} non pu\u00f2 essere riflesso. Verificare il percorso classi.
-CHKJ2851.ejb20=CHKJ2851W: Impossibile eseguire la convalida di {0} perch\u00e9 il tipo {1} non pu\u00f2 essere riflesso. Verificare il percorso classi.
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0} deve essere presente in ciascun file EAR che contiene questo modulo EJB (EJB 2.0, 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: Questa classe non pu\u00f2 implementare javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: i bean session con stato per transazioni gestite dai bean non richiedono l'implementazione di javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: Impossibile riflettere la classe <ejb-class> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: Impossibile trovare la classe bean, identificata dall'elemento <ejb-class>. (EJB 2.0: 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: Impossibile riflettere l''interfaccia <home> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: Interfaccia sconosciuta specificata nell'elemento <home>. (EJB 2.0: 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: Impossibile riflettere l''interfaccia <remote> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: Interfaccia sconosciuta specificata nell'elemento <remote>. (EJB 2.0: 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: Impossibile riflettere l''interfaccia <local-home> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: Interfaccia sconosciuta specificata nell'elemento <local-home>. (EJB 2.0: 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: Impossibile riflettere l''interfaccia <local> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: Interfaccia sconosciuta specificata nell'elemento <local>. (EJB 2.0: 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: Impossibile riflettere la classe <prim-key-class> {0} o uno dei rispettivi supertipi. Verificare il percorso classi.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: Classe sconosciuta specificata nell'elemento <prim-key-class>.  (EJB 2.0: 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: Il <field-name> {0} non pu\u00f2 essere posizionato nella classe bean {1}. (EJB 2.0: 22.5).
-
-CHKJ2103.ejb20=CHKJ2103E: In una eredit\u00e0 di componenti, la classe bean {0} deve ereditare {1} (EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E: In una eredit\u00e0 componenti, l''interfaccia locale {0} non deve ereditare {1}. (EJB 2.0: D.2).
-CHKJ2105.ejb20=CHKJ2105E: In una eredit\u00e0 componenti, l''interfaccia componente {0} deve ereditare {1}. (EJB 2.0: D.2).
-CHKJ2106.ejb20=CHKJ2106E:  Il bean {0} deve utilizzare {1} come <prim-key-class> (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: Impossibile eseguire la convalida dell''eredit\u00e0 componenti di {0} perch\u00e9 non \u00e8 possibile riflettere il tipo {1} o uno dei rispettivi supertipi. Verificare il percorso classi.
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} deve essere univoco all''interno del file ejb-jar.xml (EJB 2.0: 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: Questa classe deve implementare {0} (EJB 2.0: 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: Questa classe deve implementare {0} (EJB 2.0: 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: Questa classe deve implementare {0} (EJB 2.0: 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: Questa classe deve implementare {0} (EJB 2.0: 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBHome (EJB 2.0: 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBHome (EJB 2.0: 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBHome (EJB 2.0: 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBLocalHome (EJB 2.0: 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBObject (EJB 2.0: 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBObject (EJB 2.0: 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBObject (EJB 2.0: 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBLocalObject (EJB 2.0: 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: Questa interfaccia deve estendere javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" non pu\u00f2 essere passato come un argomento di metodo o un risultato (EJB 2.0: 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" non pu\u00f2 essere passato come un argomento di metodo o un risultato (EJB 2.0: 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" non pu\u00f2 essere passato come un argomento di metodo o un risultato (EJB 2.0: 7.10.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: Questa classe deve essere astratta (EJB 2.0: 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: Questa classe non deve essere astratta (EJB 2.0: 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: Questa classe non deve essere astratta (EJB 2.0: 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: Questa classe non deve essere astratta (EJB 2.0: 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: Questa classe deve essere pubblica (EJB 2.0: 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: Questa classe deve essere pubblica (EJB 2.0: 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: Questa classe deve essere pubblica (EJB 2.0: 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: Questa classe deve essere pubblica (EJB 2.0: 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: Questa classe deve essere pubblica (EJB 2.0: 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: Questa classe non deve essere finale (EJB 2.0: 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: Questa classe non deve essere finale (EJB 2.0: 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: Questa classe non deve essere finale (EJB 2.0: 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: Questa classe non deve essere finale (EJB 2.0: 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: Questa classe deve essere serializzabile (EJB 2.0: 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: Questa classe deve essere pubblica (EJB 2.0: 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: Questa classe non deve essere astratta (EJB 2.0: 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: Questa classe deve essere un Tipo valore valido in RMI-IIOP (EJB 2.0: 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: Questa classe deve essere un Tipo valore valido 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: Il metodo public {0} deve essere presente (EJB 2.0: 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: Il metodo public {0} deve essere presente (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: Il metodo public {0} deve essere presente (EJB 2.0: 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: Il metodo public {0} deve essere presente (EJB 2.0: 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: Il metodo public {0} deve essere presente (EJB 2.0: 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: Questa classe deve definire {0} (EJB 2.0: 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) deve essere presente (EJB 2.0: 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: \u00c8 necessario che almeno un metodo ejbCreate sia presente (EJB 2.0: 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: Il metodo ejbCreate() deve essere presente (EJB 2.0: 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: Il metodo ejbCreate() deve essere presente (EJB 2.0: 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: Il metodo ejbFindByPrimaryKey deve essere presente (EJB 2.0: 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: Il metodo setEntityContext(EntityContext) deve essere presente (EJB 2.0: 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: Il metodo setEntityContext(EntityContext) deve essere presente (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: Il metodo unsetEntityContext() deve esistere (EJB 2.0: 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: Il metodo unsetEntityContext() deve esistere (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: Il metodo ejbActivate() deve essere presente (EJB 2.0: 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: Il metodo ejbActivate() deve essere presente (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: Il metodo ejbPassivate() deve essere presente (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: Il metodo ejbPassivate() deve essere presente (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: Il metodo ejbPassivate() deve essere presente (EJB 2.0: 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: Il metodo ejbRemove() deve essere presente (EJB 2.0: 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: Il metodo ejbRemove() deve essere presente (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: Il metodo ejbRemove() deve essere presente (EJB 2.0: 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: Il metodo ejbRemove() deve essere presente (EJB 2.0: 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: Il metodo ejbLoad() deve essere presente (EJB 2.0: 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: Il metodo ejbLoad() deve essere presente (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: Il metodo ejbStore() deve essere presente (EJB 2.0: 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: Il metodo ejbStore() deve essere presente (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: Il metodo create() deve essere presente (EJB 2.0: 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: Il metodo create() deve essere presente (EJB 2.0: 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: Questa interfaccia deve definire almeno un metodo create (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: Questa interfaccia deve definire almeno un metodo create (EJB 2.0: 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: \u00c8 necessario che almeno un metodo finder sia esistente (EJB 2.0: 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: \u00c8 necessario che almeno un metodo finder sia esistente (EJB 2.0: 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: \u00c8 necessario che almeno un metodo finder sia esistente (EJB 2.0: 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: \u00c8 necessario che almeno un metodo finder sia esistente (EJB 2.0: 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: Questa interfaccia deve definire almeno un metodo locale (EJB 2.0: 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: Questa interfaccia deve definire almeno un metodo locale (EJB 2.0: 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: Questa interfaccia deve definire almeno un metodo locale (EJB 2.0: 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: Questa interfaccia deve definire almeno un metodo locale (EJB 2.0: 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: Questa classe deve definire almeno un metodo ejbHome (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: Questa classe deve definire almeno un metodo ejbHome (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: Questa classe deve definire almeno un metodo ejbHome (EJB 2.0: 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: Questa classe deve definire almeno un metodo ejbHome (EJB 2.0: 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() deve essere presente su questa classe (EJB 2.0: 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() deve essere presente su questa classe (EJB 2.0: 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals() deve essere presente su questa classe (EJB 2.0: 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) deve essere presente su questa classe (EJB 2.0: 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: E' necessario che un metodo ejbSelect sia presente (EJB 2.0: 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey deve essere presente (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey deve essere presente (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey deve essere presente (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey deve essere presente (EJB 2.0: 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} deve essere presente (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} deve essere presente (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} deve essere presente (EJB 2.0: 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: l''eccezione di applicazione {1} su {0} deve estendere java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: l''eccezione di applicazione {0} deve estendere java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: l''eccezione di applicazione {1} su {0} non deve estendere  java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: l''eccezione di applicazione {0} non deve estendere  java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {0} su {1} deve essere pubblico (EJB 2.0: 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: Questo metodo deve essere pubblico (EJB 2.0: 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {0} su {1} deve essere pubblico (EJB 2.0: 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: Questo metodo deve essere pubblico (EJB 2.0: 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {0} su {1} deve essere pubblico (EJB 2.0: 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: Questo metodo deve essere pubblico (EJB 2.0: 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {0} su {1} deve essere pubblico (EJB 2.0: 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: Questo metodo deve essere pubblico (EJB 2.0: 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} non deve essere finale (EJB 2.0: 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: Questo metodo non deve essere finale (EJB 2.0: 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} non deve essere finale (EJB 2.0: 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: Questo metodo non deve essere finale (EJB 2.0: 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} non deve essere finale (EJB 2.0: 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: Questo metodo non deve essere finale (EJB 2.0: 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} non deve essere finale (EJB 2.0: 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: Questo metodo non deve essere finale (EJB 2.0: 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} non deve essere statico (EJB 2.0: 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: Questo metodo non deve essere statico (EJB 2.0: 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} non deve essere statico (EJB 2.0: 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: Questo metodo non deve essere statico (EJB 2.0: 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} non deve essere statico (EJB 2.0: 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: Questo metodo non deve essere statico (EJB 2.0: 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} non deve essere statico (EJB 2.0: 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: Questo metodo non deve essere statico (EJB 2.0: 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} deve restituire void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: Questo metodo deve restituire void (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} deve restituire void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: Questo metodo deve restituire void (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} deve restituire void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: Questo metodo deve restituire void (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} deve restituire void (EJB 2.0: 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: Questo metodo deve restituire void (EJB 2.0: 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} deve essere pubblico (EJB 2.0: 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} deve essere pubblico (EJB 2.0: 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} deve essere pubblico (EJB 2.0: 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} deve essere pubblico (EJB 2.0: 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: Questo metodo deve essere pubblico (EJB 2.0: 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: Questo metodo deve essere pubblico (EJB 2.0: 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: Questo metodo deve essere pubblico (EJB 2.0: 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: Questo metodo deve essere pubblico (EJB 2.0: 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} non deve essere finale (EJB 2.0: 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} non deve essere finale (EJB 2.0: 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} non deve essere finale (EJB 2.0: 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} non deve essere finale (EJB 2.0: 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: Questo metodo non deve essere finale (EJB 2.0: 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: Questo metodo non deve essere finale (EJB 2.0: 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: Questo metodo non deve essere finale (EJB 2.0: 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: Questo metodo non deve essere finale (EJB 2.0: 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} non deve essere statico (EJB 2.0: 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} non deve essere statico (EJB 2.0: 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} non deve essere statico (EJB 2.0: 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} non deve essere statico (EJB 2.0: 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: Questo metodo non deve essere statico (EJB 2.0: 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: Questo metodo non deve essere statico (EJB 2.0: 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: Questo metodo non deve essere statico (EJB 2.0: 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: Questo metodo non deve essere statico (EJB 2.0: 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} deve restituire {1} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} deve restituire {1} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} deve restituire void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} deve restituire void (EJB 2.0: 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: Questo metodo deve restituire {0} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: Questo metodo deve restituire {0} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: Questo metodo deve restituire void (EJB 2.0: 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: Questo metodo deve restituire void (EJB 2.0: 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time(EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} deve generare javax.ejb.CreateException (EJB 2.0: 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: Questo metodo deve generare javax.ejb.CreateException (EJB 2.0: 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} non deve generare eccezioni di applicazione (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: Questo metodo non deve generare  eccezioni di applicazione (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} non deve generare eccezioni di applicazione (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: Questo metodo non deve generare eccezioni di applicazione (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} non deve generare eccezioni di applicazione (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: Questo metodo non deve generare eccezioni di applicazione (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} non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} deve essere pubblico (EJB 2.0: 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} deve essere pubblico (EJB 2.0: 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: Questo metodo deve essere pubblico (EJB 2.0: 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: Questo metodo deve essere pubblico (EJB 2.0: 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} non deve essere finale (EJB 2.0: 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} non deve essere finale (EJB 2.0: 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: Questo metodo non deve essere finale (EJB 2.0: 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: Questo metodo non deve essere finale (EJB 2.0: 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} non deve essere statico (EJB 2.0: 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} non deve essere statico (EJB 2.0: 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: Questo metodo non deve essere statico (EJB 2.0: 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: Questo metodo non deve essere statico (EJB 2.0: 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} deve restituire void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} deve restituire void (EJB 2.0: 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: Questo metodo deve restituire void (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: Questo metodo deve restituire void (EJB 2.0: 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} deve essere presente perch\u00e9 {0} sia richiamato (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} deve essere presente perch\u00e9 {0} sia richiamato (EJB 2.0: 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} deve essere presente perch\u00e9 questo metodo sia richiamato (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} deve essere presente perch\u00e9 questo metodo sia richiamato (EJB 2.0: 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} deve essere pubblico (EJB 2.0: 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} deve essere pubblico.  (EJB 2.0: 12.2.6).
-CHKJ2431.cb.m.ejb20=CHKJ2431W: Questo metodo deve essere pubblico (EJB 2.0: 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: Questo metodo deve essere pubblico.  (EJB 2.0: 12.2.6).
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} non deve essere statico (EJB 2.0: 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} non deve essere statico (EJB 2.0: 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: Questo metodo non deve essere statico (EJB 2.0: 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: Questo metodo non deve essere statico (EJB 2.0: 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} deve essere pubblico (EJB 2.0: 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: Questo metodo deve essere pubblico (EJB 2.0: 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} non deve essere finale (EJB 2.0: 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: Questo metodo non deve essere finale (EJB 2.0: 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} non deve essere statico (EJB 2.0: 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: Questo metodo non deve essere statico (EJB 2.0: 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: {0} sul metodo {1} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time(EJB 2.0: 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} deve restituire {1} o un suo insieme (EJB 2.0: 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: Questo metodo deve restituire {0} o un suo insieme (EJB 2.0: 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: Questo metodo non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} non deve essere presente. Il contenitore provvede all''implementazione di questo metodo (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente. Il contenitore provvede all'implementazione di questo metodo (EJB 2.0: 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} non deve essere presente. Soltanto i bean CMP possono avere metodi ejbSelect (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente. Soltanto i bean CMP possono avere metodi ejbSelect (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} non deve essere presente. Soltanto i bean CMP possono avere metodi ejbSelect (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente. Soltanto i bean CMP possono avere metodi ejbSelect (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} non deve essere presente. Soltanto i bean CMP possono avere metodi ejbSelect (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente. Soltanto i bean CMP possono avere metodi ejbSelect (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() non deve essere presente (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() non deve essere presente (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() non deve essere presente (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() non deve essere presente (EJB 2.0: 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} non deve essere presente (EJB 2.0: 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} non deve essere presente (EJB 2.0: 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: Questo metodo non deve essere presente (EJB 2.0: 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: Il nome del metodo {0} non pu\u00f2 iniziare con "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: Il nome del metodo {0} non pu\u00f2 iniziare con "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: Il nome del metodo {0} non pu\u00f2 iniziare con "ejb" (EJB 2.0: 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: Questo nome di metodo non pu\u00f2 iniziare con "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: Questo nome di metodo non pu\u00f2 iniziare con "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: Questo nome di metodo non pu\u00f2 iniziare con "ejb" (EJB 2.0: 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} deve essere pubblico (EJB 2.0: 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} deve essere pubblico (EJB 2.0: 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} deve essere pubblico (EJB 2.0: 12.2.7).
-CHKJ2441.sb.m.ejb20=CHKJ2441W: Questo metodo deve essere pubblico (EJB 2.0: 7.10.4).
-CHKJ2441.cb.m.ejb20=CHKJ2441W: Questo metodo deve essere pubblico (EJB 2.0: 10.6.8).
-CHKJ2441.bb.m.ejb20=CHKJ2441W: Questo metodo deve essere pubblico (EJB 2.0: 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} non deve essere finale (EJB 2.0: 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} non deve essere finale (EJB 2.0: 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} non deve essere finale (EJB 2.0: 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: Questo metodo non deve essere finale (EJB 2.0: 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: Questo metodo non deve essere finale (EJB 2.0: 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: Questo metodo non deve essere finale (EJB 2.0: 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} non deve essere statico (EJB 2.0: 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} non deve essere statico (EJB 2.0: 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} non deve essere statico (EJB 2.0: 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: Questo metodo non deve essere statico (EJB 2.0: 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: Questo metodo non deve essere statico (EJB 2.0: 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: Questo metodo non deve essere statico (EJB 2.0: 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase  di run-time (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} deve essere pubblico (EJB 2.0: 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: Questo metodo deve essere pubblico (EJB 2.0: 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} non deve essere finale (EJB 2.0: 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: Questo metodo non deve essere finale (EJB 2.0: 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} non deve essere statico (EJB 2.0: 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: Questo metodo non deve essere statico (EJB 2.0: 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} deve restituire void (EJB 2.0: 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: Questo metodo deve restituire void (EJB 2.0: 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} deve essere pubblico (EJB 2.0: 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: Questo metodo deve essere pubblico (EJB 2.0: 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} deve essere astratto (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: Questo metodo deve essere astratto (EJB 2.0: 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0} non deve essere esposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: Questo metodo non deve essere esposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0} non deve essere esposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: Questo metodo non deve essere esposto (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: Questa interfaccia deve seguire le regole RMI-IIOP per le interfacce remote (EJB 2.0: 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: Questa interfaccia deve seguire le regole RMI-IIOP per le interfacce remote (EJB 2.0: 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: Questa interfaccia deve seguire le regole RMI-IIOP per le interfacce remote (EJB 2.0: 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: Il nome del metodo {0} non pu\u00f2 iniziare con "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: Il nome del metodo {0} non pu\u00f2 iniziare con "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: Il nome del metodo {0} non pu\u00f2 iniziare con "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: Il nome del metodo {0} non pu\u00f2 iniziare con "create" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: Questo nome di metodo non pu\u00f2 iniziare con "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: Questo nome di metodo non pu\u00f2 iniziare con "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: Questo nome di metodo non pu\u00f2 iniziare con "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: Questo nome di metodo non pu\u00f2 iniziare con "create" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: Il nome del metodo {0} non pu\u00f2 iniziare con "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: Il nome del metodo {0} non pu\u00f2 iniziare con "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: Il nome del metodo {0} non pu\u00f2 iniziare con "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: Il nome del metodo {0} non pu\u00f2 iniziare con "find" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: Questo nome di metodo non pu\u00f2 iniziare con "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: Questo nome di metodo non pu\u00f2 iniziare con "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: Questo nome di metodo non pu\u00f2 iniziare con "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: Questo nome di metodo non pu\u00f2 iniziare con "find" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: Il nome del metodo {0} non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: Il nome del metodo {0} non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: Il nome del metodo {0} non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: Il nome del metodo {0} non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: Questo nome di metodo non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: Questo nome di metodo non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: Questo nome di metodo non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: Questo nome di metodo non pu\u00f2 iniziare con "remove" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} deve generare javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} deve generare javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} deve generare javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} deve generare javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} deve generare javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} deve generare javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: Questo metodo deve generare javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: Questo metodo deve generare javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: Questo metodo deve generare javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: Questo metodo deve generare javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: Questo metodo deve generare javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: Questo metodo deve generare javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} deve restituire {1} (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: Questo metodo deve restituire {0} (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} deve essere il metodo create() (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} deve essere il metodo create() (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: Questo metodo deve essere il metodo create() (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: Questo metodo deve essere il metodo create() (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} deve essere il metodo ejbCreate() (EJB 2.0: 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: Questo metodo deve essere il metodo ejbCreate() (EJB 2.0: 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: Il metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: Il metodo {1} corrispondente  a {0} deve essere presente su {2} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: Il metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: Il metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: Il  metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: Il  metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: Il metodo corrispondente {0} a deve essere presente su {1} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: Il metodo corrispondente {0} deve essere presente su {1} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: Il metodo corrispondente {0} deve essere presente su {1} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: Il metodo corrispondente {0} deve essere presente {1} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: Il metodo corrispondente {0} deve essere presente su {1} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: Il metodo corrispondente {0} deve essere presente su {1} (EJB 2.0: 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile run-time (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: Il metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: Il metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: Il  metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: Il  metodo {1} corrispondente a {0} deve essere presente su {2} (EJB 2.0: 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: Il metodo {0} deve essere presente su {1} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: Il metodo {0} deve essere presente su {1} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: Il metodo {0} deve essere presente su {1} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: Il metodo {0} deve essere presente su {1} (EJB 2.0: 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} deve generare javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} deve generare javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} deve generare javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} deve generare javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: Questo metodo deve generare javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: Questo metodo deve generare javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: Questo metodo deve generare javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: Questo metodo deve generare javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} non deve generare ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: Questo metodo non deve generare ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} non deve generare ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: Questo metodo non deve generare ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: Questo metodo non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: Questo metodo non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} non deve generare ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: Questo metodo non deve generare ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: Questo metodo non deve generare ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} deve restituire {1} o un suo insieme (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} deve restituire {1} o un suo insieme (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} deve restituire {1} o un suo insieme (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} deve restituire {1} o un suo insieme (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: Questo metodo deve restituire {0} o un suo insieme (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: Questo metodo deve restituire {0} o un suo insieme (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: Questo metodo deve restituire {0} o un suo insieme (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: Questo metodo deve restituire {0} o un suo insieme (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} deve essere presente su {2} per {0} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} deve essere presente su {2} per {0} (EJB 2.0: 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} deve essere presente su {1} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} deve essere presente su {1} (EJB 2.0: 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} deve essere presente su {2} per {0} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} deve essere presente su {2} per {0} (EJB 2.0: 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} deve essere presente su {1} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} deve essere presente su {1} (EJB 2.0: 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile run-time (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} deve essere associato a un elemento query in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: Questo metodo deve essere associato a un elemento query in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} deve essere associato a un elemento query in ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: Questo metodo deve essere associato a un elemento query 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} deve generare java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} deve generare java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} non deve generare java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: Questo metodo deve generare java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: Questo metodo non deve generare java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} deve generare {1} per {2} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} deve generare {1} per {2} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} deve generare {1} per {2} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} deve generare {1} per {2} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} deve generare {1} per {2} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} deve generare {1} per {2} (EJB 2.0: 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: Questo metodo deve generare {0} per {1} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: Questo metodo deve generare {0} per {1} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: Questo metodo deve generare {0} per {1} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: Questo metodo deve generare {0} per {1} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: Questo metodo deve generare {0} per {1} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: Questo metodo deve generare {0} per {1} (EJB 2.0: 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: {1} nel metodo {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile run-time (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} non deve esporre il tipo {1} (EJB 2.0: 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} non deve esporre il tipo {1} (EJB 2.0: 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} non deve esporre il tipo {1} (EJB 2.0: 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: Questo metodo non deve esporre il tipo {0} (EJB 2.0: 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: Questo metodo non deve esporre il tipo {0} (EJB 2.0: 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: Questo metodo non deve esporre il tipo {0} (EJB 2.0: 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: Questa interfaccia deve seguire le regole RMI-IIOP per le interfacce remote (EJB 2.0: 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: Questa interfaccia deve seguire le regole RMI-IIOP per le interfacce remote (EJB 2.0: 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: Questa interfaccia deve seguire le regole RMI-IIOP per le interfacce remote (EJB 2.0: 12.2.8).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: {0} nel metodo {1} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: {0} nel metodo {1} deve essere serializzabile in fase di run-time (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: {0} nel metodo {1} deve essere serializzabile in fase di run-time (EJB 2.0: 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time(EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} deve essere serializzabile in fase di run-time(EJB 2.0: 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: {1} nel metodo {0} non pu\u00f2 essere un tipo di argomento o di risultato (EJB 2.0: 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} non deve passare {1} come argomento o risultato (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} non deve passare {1} come argomento o risultato (EJB 2.0: 9.7.2, 10.3.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: Questo metodo non deve passare {0} come argomento o risultato (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: Questo metodo non deve passare {0} come argomento o risultato (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} non pu\u00f2 essere un tipo di argomento o di risultato (EJB 2.0: 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} non deve esporre {1} (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: Questo metodo non deve esporre {0} (EJB 2.0: 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0} non deve essere esposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: Questo metodo non deve essere esposto (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} deve essere astratto (EJB 2.0: 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: Questo metodo deve essere astratto (EJB 2.0: 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} deve essere pubblico (EJB 2.0: 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: Questo metodo deve essere pubblico (EJB 2.0: 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} deve generare javax.ejb.FinderException (EJB 2.0: 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: Questo metodo deve generare javax.ejb.FinderException (EJB 2.0: 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} deve restituire {1} o un suo insieme (EJB 2.0: 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: Questo metodo deve restituire {0} o un suo insieme (EJB 2.0: 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} deve essere associato a un elemento query in ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: Questo metodo deve essere associato a un elemento query in ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: Il metodo {0} richiede {1} per essere applicato a {2} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: Il metodo {0} richiede {1} per essere applicato a {2} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: Il metodo {0} richiede {1} per essere applicato a {2} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: Il metodo {0} richiede {1} per essere applicato a {2} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: Il metodo {0} richiede {1} per essere applicato a {2} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: Il metodo {0} richiede {1} per essere applicato a {2} (EJB 2.0: 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: Il {0} metodo deve essere presente su {1} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: Il {0} metodo deve essere presente {1} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: Il {0} metodo deve essere presente su {1} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: Il {0} metodo deve essere presente su {1} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: Il {0} metodo deve essere presente su {1} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: Il {0} metodo deve essere presente su {1} (EJB 2.0: 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} deve restituire {1} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} deve restituire {1} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} deve restituire {1} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} deve restituire {1} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} deve restituire {1} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} deve restituire {1} (EJB 2.0: 12.2.10).
-CHKJ2470.src.m.ejb20=CHKJ2470E: Questo metodo deve restituire {0} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.m.ejb20=CHKJ2470E: Questo metodo deve restituire {0} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.m.ejb20=CHKJ2470E: Questo metodo deve restituire {0} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.m.ejb20=CHKJ2470E: Questo metodo deve restituire {0} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.m.ejb20=CHKJ2470E: Questo metodo deve restituire {0} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.m.ejb20=CHKJ2470E: Questo metodo deve restituire {0} (EJB 2.0: 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} deve generare {1} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} deve generare {1} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} deve generare {1} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} deve generare {1} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} deve generare {1} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} deve generare {1} (EJB 2.0: 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: Questo metodo deve generare {0} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: Questo metodo deve generare {0} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: Questo metodo deve generare {0} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: Questo metodo deve generare {0} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: Questo metodo deve generare {0} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: Questo metodo deve generare {0} (EJB 2.0: 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0} \u00e8 fornito dal contenitore (EJB 2.0: 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0} \u00e8 fornito dal contenitore (EJB 2.0: 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0} \u00e8 fornito dal contenitore (EJB 2.0: 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0} \u00e8 fornito dal contenitore (EJB 2.0: 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0} \u00e8 fornito dal contenitore (EJB 2.0: 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0} \u00e8 fornito dal contenitore (EJB 2.0: 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: Questo metodo \u00e8 fornito dal contenitore (EJB 2.0: 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: Questo metodo \u00e8 fornito dal contenitore (EJB 2.0: 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: Questo metodo \u00e8 fornito dal contenitore (EJB 2.0: 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: Questo metodo \u00e8 fornito dal contenitore (EJB 2.0: 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: Questo metodo \u00e8 fornito dal contenitore (EJB 2.0: 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: Questo metodo \u00e8 fornito dal contenitore (EJB 2.0: 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} deve essere findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} deve essere findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} deve essere findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} deve essere findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} deve essere findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} deve essere findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: Questo metodo deve essere findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: Questo metodo deve essere findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: Questo metodo deve essere findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: Questo metodo deve essere findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: Questo metodo deve essere findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: Questo metodo deve essere findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} deve restituire {1} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} deve restituire {1} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} deve restituire {1} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} deve restituire {1} (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=CHKJ2479E: Questo metodo deve restituire {0} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=CHKJ2479E: Questo metodo deve restituire {0} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=CHKJ2479E: Questo metodo deve restituire {0} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=CHKJ2479E: Questo metodo deve restituire {0} (EJB 2.0: 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: Il campo transitorio {0} non deve essere il tipo {1} (EJB 2.0: 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: Un campo transitorio non deve essere di tipo {0} (EJB 2.0: 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: I campi transitori ({0}) sono sconsigliati (EJB 2.0: 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: I campi transitori sono sconsigliati (EJB 2.0: 7.4.1).
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: {0} non deve essere definito (EJB 2.0: 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0} non deve essere definito (EJB 2.0: 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} deve iniziare con una lettera minuscola (EJB 2.0: 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} deve iniziare con una lettera minuscola (EJB 2.0: 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} deve essere dichiarato come un <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} deve essere dichiarato come un <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} deve essere dichiarato come un <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} deve essere dichiarato come un <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0} non deve essere esposto (EJB 2.0: 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0} non deve essere esposto (EJB 2.0: 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} deve essere un tipo primitivo o serializzabile (EJB 2.0: 10.3.1).
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} deve essere un tipo primitivo o serializzabile (EJB 2.0: 10.3.1).
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: Il campo {0} deve essere il tipo {1} (EJB 2.0: 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: Questo campo deve essere il tipo {0} (EJB 2.0: 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: Il campo {0} deve essere pubblico (EJB 2.0: 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: Questo campo deve essere pubblico (EJB 2.0: 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: Il campo {0} deve essere un <cmp-field> (EJB 2.0: 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: Questo campo deve essere un <cmp-field> (EJB 2.0: 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: Questo bean deve fornire un <local-home> (EJB 2.0: 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: Questo bean deve fornire un <local-home> (EJB 2.0: 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: Questo bean deve fornire un <local> (EJB 2.0: 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: Questo bean deve fornire un <remote> (EJB 2.0: 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: Questo bean deve fornire un <local-home> o un <home> (EJB 2.0: 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: questo bean deve fornire un <local> o un <remote> (EJB 2.0: 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: Questo bean deve fornire un <local-home> (EJB 2.0: 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: Questo bean deve fornire un <home> (EJB 2.0: 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: Questo bean deve fornire un <local> (EJB 2.0: 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: Questo bean deve fornire un <remote> (EJB 2.0: 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: Questo bean deve fornire un <local-home> o un <home> (EJB 2.0: 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: questo bean deve fornire un <local> o un <remote> (EJB 2.0: 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: Questo bean deve fornire un <local-home> (EJB 2.0: 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: Questo bean deve fornire un <home> (EJB 2.0: 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: Questo bean deve fornire un <local> (EJB 2.0: 12.2.1).
-CHKJ2883.b.ejb20=CHKJ2883W: Questo bean deve fornire un <remote> (EJB 2.0: 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: Questo bean deve fornire un <local-home> o un <home> (EJB 2.0: 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: questo bean deve fornire un <local> o un <remote> (EJB 2.0: 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} deve essere un identificativo Java valido (EJB 2.0: 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} deve essere un identificativo Java valido (EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} deve essere univoco nel file ejb-jar.xml (EJB 2.0: 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> deve essere presente (EJB 2.0: 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: L''identificativo riservato {0} non pu\u00f2 essere utilizzato come un <ejb-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: L''identificativo riservato {0} non pu\u00f2 essere utilizzato come un <abstract-schema-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} deve essere un identificativo Java valido e deve iniziare con una lettera minuscola (EJB 2.0: 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} deve essere un identificativo Java valido e deve iniziare con una lettera minuscola (EJB 2.0: 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} deve avere un metodo set (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} deve avere un metodo get (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} deve avere un metodo set (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} deve avere un metodo get (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} deve essere un tipo primitivo Java o un tipo serializzabile Java (EJB 2.0: 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} deve essere il tipo {1} o un suo insieme (EJB 2.0: 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: La classe di valore dipendente {0} non pu\u00f2 essere un <cmr-field> (EJB 2.0: 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> deve essere univoco in ejb-jar.xml (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> deve essere univoco all'interno di  <ejb-relation> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: il valore dell'elemento <multiplicity> deve essere "One" o "Many" (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: <relationship-role-source> nel ruolo {0} deve fare riferimento ad un bean CMP esistente (EJB 2.0: 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> deve essere utilizzato con <multiplicity> di "One" (EJB 2.0: 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} deve essere definito su {1} (EJB 2.0: 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: questo bean pu\u00f2 avere solo relazioni unidirezionali con altri bean (EJB 2.0: 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: il valore dell'elemento <cmr-field-type> deve essere "java.util.Collection" o "java.util.Set" (EJB 2.0: 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: almeno un <ejb-relationship-role> deve definire un <cmr-field> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} deve essere presente (EJB 2.0: 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} deve fare riferimento a un bean CMP (EJB 2.0: 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: il valore dell'elemento <cmp-version> deve essere "1.x" o "2.x" (EJB 2.0: 22.5).
-CHKJ2873.ejb20=CHKJ2873W: eseguire migrazione di questa binding origine dati del bean verso la binding del factory di connessione CMP.
-CHKJ2874.ejb20=CHKJ2874W: eseguire la migrazione di questa binding di origine dati predefinita del modulo EJB verso la binding di un factory di connessione predefinito CMP.
-
-###########################################################################
-#
-# 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/ejbvalidator_ja.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_ja.properties
deleted file mode 100644
index 1a0b5a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_ja.properties
+++ /dev/null
@@ -1,1528 +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={0} \u3092\u691c\u67fb\u4e2d\u3067\u3059\u3002
-
-LOC_CLASS=\u30af\u30e9\u30b9: {0}
-LOC_FIELD=\u30d5\u30a3\u30fc\u30eb\u30c9: {0}\u3001\u30af\u30e9\u30b9: {1}
-LOC_METHOD=\u30e1\u30bd\u30c3\u30c9: {0}\u3001\u30af\u30e9\u30b9: {1}
-LOC_BEAN=\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}\u3001\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=<method> \u30a8\u30ec\u30e1\u30f3\u30c8: {0}
-LOC_METHODPERMISSION=<method-permission> \u30a8\u30ec\u30e1\u30f3\u30c8: {0}
-LOC_METHODTRANSACTION=<container-transaction> \u30a8\u30ec\u30e1\u30f3\u30c8: {0}
-LOC_EJBRELATION=<ejb-relation>: {0}
-LOC_EJBRELATIONSHIPROLE=<ejb-relationship-role>: {0}\u3001<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: EJB \u30d0\u30ea\u30c7\u30fc\u30bf\u30fc\u3092\u5b9f\u884c\u4e2d\u306b\u5185\u90e8\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 \u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u30ed\u30b0\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2852=CHKJ2852W: {0} \u306e\u59a5\u5f53\u6027\u691c\u67fb\u4e2d\u306b\u5185\u90e8\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 \u59a5\u5f53\u6027\u691c\u67fb\u4e2d\u306e Bean \u306f {1} \u3067\u3057\u305f\u3002
-CHKJ2433=CHKJ2433W: {1} \u3092\u53cd\u6620\u3067\u304d\u306a\u3044\u305f\u3081\u3001{0} \u3092\u59a5\u5f53\u6027\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2907=CHKJ2907E: \u30bf\u30a4\u30d7 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2905=CHKJ2905W: ejb-jar.xml \u3092\u30ed\u30fc\u30c9\u3067\u304d\u306a\u304b\u3063\u305f\u305f\u3081\u3001EJB \u30d0\u30ea\u30c7\u30fc\u30bf\u30fc\u306f\u5b9f\u884c\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001XML \u30d0\u30ea\u30c7\u30fc\u30bf\u30fc\u3092\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2041=CHKJ2041I: \u6c38\u7d9a\u30af\u30e9\u30b9\u304a\u3088\u3073\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u6307\u5b9a\u30d1\u30c3\u30b1\u30fc\u30b8\u5185\u306b\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (JLS 2.0: 7.4.2)
-
-CHKJ2456.i=CHKJ2456W: {0} \u304c {2} \u306b\u5bfe\u3057\u3066 {1} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3044\u5834\u5408\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30b3\u30fc\u30c9\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u30fb\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3059\u3002
-CHKJ2456.m=CHKJ2456W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c {1} \u306b\u5bfe\u3057\u3066 {0} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3044\u5834\u5408\u3001\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u30fb\u30b3\u30fc\u30c9\u306b\u30b3\u30f3\u30d1\u30a4\u30eb\u30fb\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3059\u3002
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: {0} \u30ad\u30fc\u30fb\u30af\u30e9\u30b9\u306f {1} \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: \u3053\u306e\u30af\u30e9\u30b9\u306f\u3001{0} \u306b\u4e00\u81f4\u3059\u308b ejbPostCreate \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: \u3053\u306e\u30af\u30e9\u30b9\u306f\u3001\u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306b\u4e00\u81f4\u3059\u308b ejbPostCreate \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: \u3053\u306e\u30af\u30e9\u30b9\u306f javax.ejb.SessionSynchronization \u3092\u5b9f\u88c5\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.5.3)
-CHKJ2003I.ejb11=CHKJ2003I: Bean \u7ba1\u7406\u4e0b\u306e\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3 Stateful Session Bean \u306f javax.ejb.SessionSynchronization \u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.5.3)
-CHKJ2004.eb.i.ejb11=CHKJ2004W: {1} Bean \u30af\u30e9\u30b9\u306f {0} ejbFind \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: {0} Bean \u30af\u30e9\u30b9\u306f ejbFind \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} \u306f create \u30e1\u30bd\u30c3\u30c9\u307e\u305f\u306f\u691c\u7d22\u30e1\u30bd\u30c3\u30c9\u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f create \u30e1\u30bd\u30c3\u30c9\u307e\u305f\u306f\u691c\u7d22\u30e1\u30bd\u30c3\u30c9\u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: {0} Bean \u30af\u30e9\u30b9\u306b\u306f\u5f15\u304d\u6570\u304c\u4e0d\u8981\u306a public \u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf\u30fc\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: {0} Bean \u30af\u30e9\u30b9\u306b\u306f\u5f15\u304d\u6570\u304c\u4e0d\u8981\u306a public \u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf\u30fc\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} \u306f finalize() \u30e1\u30bd\u30c3\u30c9\u3092\u5ba3\u8a00\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} \u306f finalize() \u30e1\u30bd\u30c3\u30c9\u3092\u5ba3\u8a00\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: {0} Bean \u30af\u30e9\u30b9\u306b\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e ejbCreate \u30e1\u30bd\u30c3\u30c9\u304c\u542b\u307e\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.5.5\u30016.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: {0} Bean \u30af\u30e9\u30b9\u306b\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e ejbFindByPrimaryKey \u30e1\u30bd\u30c3\u30c9\u304c\u542b\u307e\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: {0} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e create \u30e1\u30bd\u30c3\u30c9\u304c\u542b\u307e\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: {0} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u306f 1 \u3064\u306e findByPrimaryKey \u30e1\u30bd\u30c3\u30c9\u304c\u542b\u307e\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: \u3053\u306e\u578b\u306f\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2012.sh.ejb11=CHKJ2012E: \u3053\u306e\u578b\u306f\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-CHKJ2012.er.ejb11=CHKJ2012E: \u3053\u306e\u578b\u306f\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-CHKJ2012.eh.ejb11=CHKJ2012E: \u3053\u306e\u578b\u306f\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2013.sb.ejb11=CHKJ2013E: {0} Bean \u30af\u30e9\u30b9\u306f {1} \u3092\u5b9f\u88c5\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.2)
-CHKJ2013.eb.ejb11=CHKJ2013E: {0} Bean \u30af\u30e9\u30b9\u306f {1} \u3092\u5b9f\u88c5\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.2)
-CHKJ2014.sb.ejb11=CHKJ2014E: {0} Bean \u30af\u30e9\u30b9\u306f abstract \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: {0} Bean \u30af\u30e9\u30b9\u306f abstract \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: {0} Bean \u30af\u30e9\u30b9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: {0} Bean \u30af\u30e9\u30b9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {0} \u3092\u62e1\u5f35\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {0} \u3092\u62e1\u5f35\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {0} \u3092\u62e1\u5f35\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {0} \u3092\u62e1\u5f35\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: {0} \u30ad\u30fc\u30fb\u30af\u30e9\u30b9\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.9) (RMI 1.3: 2.6)
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: {0} \u30ad\u30fc\u30fb\u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: {0} \u30ad\u30fc\u30fb\u30af\u30e9\u30b9\u306f public \u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30b3\u30f3\u30b9\u30c8\u30e9\u30af\u30bf\u30fc\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: {0} Bean \u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: {0} Bean \u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: {0} \u306b\u306f {1} Bean \u30af\u30e9\u30b9\u5185\u306b\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306b\u306f {0} Bean \u30af\u30e9\u30b9\u5185\u306b\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: {0} \u306b\u306f {1} Bean \u30af\u30e9\u30b9\u5185\u306b\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306b\u306f {0} Bean \u30af\u30e9\u30b9\u5185\u306b\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 create() \u306e\u307f\u304c\u5b58\u5728\u53ef\u80fd\u3067\u3059\u3002(EJB 1.1: 6.8)
-CHKJ2024.sh.m.ejb11=CHKJ2024E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 create() \u306e\u307f\u304c\u5b58\u5728\u53ef\u80fd\u3067\u3059\u3002(EJB 1.1: 6.8)
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 ejbCreate() \u306e\u307f\u304c\u5b58\u5728\u53ef\u80fd\u3067\u3059\u3002(EJB 1.1: 6.8)
-CHKJ2025.sb.m.ejb11=CHKJ2025E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 ejbCreate() \u306e\u307f\u304c\u5b58\u5728\u53ef\u80fd\u3067\u3059\u3002(EJB 1.1: 6.8)
-CHKJ2026.sh.i.ejb11=CHKJ2026E: Bean \u30af\u30e9\u30b9 {1} \u306f\u3001{0} \u306b\u4e00\u81f4\u3059\u308b ejbCreate \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: Bean \u30af\u30e9\u30b9 {0} \u306f\u3001\u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306b\u4e00\u81f4\u3059\u308b ejbCreate \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: Bean \u30af\u30e9\u30b9 {1} \u306f\u3001{0} \u306b\u4e00\u81f4\u3059\u308b ejbCreate \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: Bean \u30af\u30e9\u30b9 {0} \u306f\u3001\u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306b\u4e00\u81f4\u3059\u308b ejbCreate \u30e1\u30bd\u30c3\u30c9\u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: {0} \u306f\u3001\u4e00\u81f4\u3059\u308b ejbCreate \u30e1\u30bd\u30c3\u30c9\u304c\u5b9a\u7fa9\u3055\u308c\u306a\u3044\u9650\u308a\u547c\u3073\u51fa\u3055\u308c\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u3001\u4e00\u81f4\u3059\u308b ejbCreate \u30e1\u30bd\u30c3\u30c9\u304c\u5b9a\u7fa9\u3055\u308c\u306a\u3044\u9650\u308a\u547c\u3073\u51fa\u3055\u308c\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: {0} \u306f\u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {1} \u306b\u4e00\u81f4\u3059\u308b create \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3044\u3068\u547c\u3073\u51fa\u3055\u308c\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {0} \u306b\u4e00\u81f4\u3059\u308b create \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3044\u3068\u547c\u3073\u51fa\u3055\u308c\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: {0} \u306f {1} Bean \u30af\u30e9\u30b9\u5185\u306b\u4e00\u81f4\u3059\u308b ejbFind \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3063\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} Bean \u30af\u30e9\u30b9\u5185\u306b\u4e00\u81f4\u3059\u308b ejbFind \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3063\u3066\u3044\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: Bean \u30af\u30e9\u30b9 {0} \u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30b3\u30f3\u30c6\u30ca\u30fc\u7ba1\u7406\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u5ba3\u8a00\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: setEntityContext(EntityContext ic) \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: unsetEntityContext() \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: ejbActivate() \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: ejbPassivate() \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: ejbRemove() \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: ejbLoad() \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: ejbStore() \u30e1\u30bd\u30c3\u30c9\u304c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" \u3092\u30e1\u30bd\u30c3\u30c9\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u3059\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: \u5f79\u5272\u306e\u4e21\u7aef\u306f\u540c\u3058\u6570\u306e\u5c5e\u6027\u3092\u4f7f\u7528\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-CHKJ2101.ejb11=CHKJ2101E: \u5f79\u5272\u306e\u4e21\u7aef\u306f\u540c\u3058\u578b\u3092\u4f7f\u7528\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-CHKJ2102.eh.ejb11=CHKJ2102E: \u30d5\u30a1\u30a4\u30f3\u30c0\u30fc\u8a18\u8ff0\u5b50\u3001\u307e\u305f\u306f {0} \u30af\u30e9\u30b9\u3067\u306e\u4e00\u81f4\u3059\u308b\u30ab\u30b9\u30bf\u30e0\u30fb\u30d5\u30a1\u30a4\u30f3\u30c0\u30fc\u30fb\u30e1\u30bd\u30c3\u30c9\u306e\u3044\u305a\u308c\u304b\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-CHKJ2103.ejb11=CHKJ2103E: \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3067\u306f\u3001{0} Bean \u30af\u30e9\u30b9\u306f {1} \u3092\u7d99\u627f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3067\u306f\u3001{0} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {1} \u3092\u7d99\u627f\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3067\u306f\u3001{0} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {1} \u3092\u7d99\u627f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: Bean {0} \u306f\u305d\u306e <prim-key-class> \u3068\u3057\u3066 {1} \u3092\u4f7f\u7528\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 1.1: B.2)
-
-CHKJ2200.i.ejb11=CHKJ2200W: {0} \u9759\u7684\u30d5\u30a3\u30fc\u30eb\u30c9\u306f final \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: \u3053\u306e\u9759\u7684\u30d5\u30a3\u30fc\u30eb\u30c9\u306f final \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} \u306f\u4e00\u6642\u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: \u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306f\u4e00\u6642\u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: \u30d5\u30a3\u30fc\u30eb\u30c9 {0} \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u30fb\u30bf\u30a4\u30d7\u306f CMP Bean \u306b\u306f\u7121\u52b9\u3067\u3059\u3002 (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: \u30d5\u30a3\u30fc\u30eb\u30c9\u30fb\u30bf\u30a4\u30d7\u304c CMP Bean \u306b\u306f\u7121\u52b9\u3067\u3059\u3002 (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: \u30d5\u30a3\u30fc\u30eb\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: {0} \u3068\u3044\u3046\u540d\u524d\u306e\u4e3b\u30ad\u30fc\u30fb\u30d5\u30a3\u30fc\u30eb\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: \u4e3b\u30ad\u30fc\u30fb\u30d5\u30a3\u30fc\u30eb\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} \u306f {1} \u306e <cmp-field> \u3067\u3001Bean \u30af\u30e9\u30b9 {2} \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.m.ejb11=CHKJ2206W: \u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306f {0} \u306e <cmp-field> \u3067\u3001Bean \u30af\u30e9\u30b9 {1} \u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7.2)
-CHKJ2207.eb.ejb11=CHKJ2207E: \u30ad\u30fc\u30fb\u30d5\u30a3\u30fc\u30eb\u30c9 {0} \u306f\u4e3b\u30ad\u30fc\u3068\u540c\u3058\u30bf\u30a4\u30d7 {1} \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7.1)
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: \u30e1\u30bd\u30c3\u30c9 {0} \u3067\u306e java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 6.10.3)
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 6.10.3)
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: \u30e1\u30bd\u30c3\u30c9 {0} \u3067\u306e java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 6.10.4)
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 6.10.4)
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: {0} \u3067\u306e java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.3)
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.3)
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: {0} \u3067\u306e java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.4)
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.4)
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: {0} \u3067\u306e java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.5)
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.5)
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: {0} \u3067\u306e java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.6)
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u306e\u63a8\u5968\u3055\u308c\u306a\u3044\u4f7f\u7528\u3067\u3059\u3002 (EJB 1.1: 9.2.6)
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} \u306f {1} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u30fb\u30bf\u30a4\u30d7\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002  (EJB 1.1: 6.10.6)
-CHKJ2402.sh.m.ejb11=CHKJ2402W: \u3053\u306e create \u30e1\u30bd\u30c3\u30c9\u306f {0} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u30fb\u30bf\u30a4\u30d7\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002  (EJB 1.1: 6.10.6)
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} \u306f {1} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u30fb\u30bf\u30a4\u30d7\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002  (EJB 1.1: 9.2.8)
-CHKJ2402.eh.m.ejb11=CHKJ2402W: \u3053\u306e create \u30e1\u30bd\u30c3\u30c9\u306f {0} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u30fb\u30bf\u30a4\u30d7\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002  (EJB 1.1: 9.2.8)
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: {0} \u5185\u306e\u5f15\u304d\u6570\u306e\u9806\u5e8f\u304a\u3088\u3073\u30bf\u30a4\u30d7\u306f\u3001{1} \u30ad\u30fc\u30fb\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u9806\u5e8f\u304a\u3088\u3073\u30bf\u30a4\u30d7\u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8\u30019.4.7.3\u300116.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: \u5f15\u304d\u6570\u306e\u9806\u5e8f\u304a\u3088\u3073\u30bf\u30a4\u30d7\u306f {0} \u30ad\u30fc\u30fb\u30af\u30e9\u30b9\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u9806\u5e8f\u304a\u3088\u3073\u30bf\u30a4\u30d7\u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8\u30019.4.7.3\u300116.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} \u306f\u4e3b\u9375\u306e\u578b {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.3\u30019.4.2\u30019.4.7.3)
-CHKJ2406.eb.m.ejb11=CHKJ2406W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u4e3b\u9375\u306e\u578b {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.3\u30019.4.2\u30019.4.7.3)
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002  (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002  (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.5)
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.5)
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.5)
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.5)
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.3)
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.3)
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.5)
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.5)
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: {0} \u306e\u540d\u524d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306e\u540d\u524d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: {0} \u306e\u540d\u524d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306e\u540d\u524d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 6.10) (RMI 1.3: 2.6)
-CHKJ2412.sb.m.ejb11=CHKJ2412I: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 6.10) (RMI 1.3: 2.6)
-CHKJ2412.eb.i.ejb11=CHKJ2412I: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 9.2) (RMI 1.3: 2.6)
-CHKJ2412.eb.m.ejb11=CHKJ2412I: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 9.2) (RMI 1.3: 2.6)
-CHKJ2412.sr.i.ejb11=CHKJ2412I: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6)
-CHKJ2412.sr.m.ejb11=CHKJ2412I: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6)
-CHKJ2412.er.i.ejb11=CHKJ2412I: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6)
-CHKJ2412.er.m.ejb11=CHKJ2412I: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6)
-CHKJ2412.sh.i.ejb11=CHKJ2412I: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6)
-CHKJ2412.sh.m.ejb11=CHKJ2412I: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6)
-CHKJ2412.eh.i.ejb11=CHKJ2412I: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6)
-CHKJ2412.eh.m.ejb11=CHKJ2412I: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6)
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: {0} \u306e\u5f15\u304d\u6570 {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10) (RMI 1.3: 2.6)
-CHKJ2413.sb.m.ejb11=CHKJ2413I: \u5f15\u304d\u6570 {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10) (RMI 1.3: 2.6)
-CHKJ2413.eb.i.ejb11=CHKJ2413I: {0} \u306e\u5f15\u304d\u6570 {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2) (RMI 1.3: 2.6)
-CHKJ2413.eb.m.ejb11=CHKJ2413I: \u5f15\u304d\u6570 {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2) (RMI 1.3: 2.6)
-CHKJ2413.sr.i.ejb11=CHKJ2413I: {0} \u306e\u5f15\u304d\u6570 {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5) (RMI 1.3: 2.6)
-CHKJ2413.sr.m.ejb11=CHKJ2413I: \u5f15\u304d\u6570 {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5) (RMI 1.3: 2.6)
-CHKJ2413.er.i.ejb11=CHKJ2413I: {0} \u306e\u5f15\u304d\u6570 {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7) (RMI 1.3: 2.6)
-CHKJ2413.er.m.ejb11=CHKJ2413I: \u5f15\u304d\u6570 {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7) (RMI 1.3: 2.6)
-CHKJ2413.sh.i.ejb11=CHKJ2413I: {0} \u306e\u5f15\u304d\u6570 {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6) (RMI 1.3: 2.6)
-CHKJ2413.sh.m.ejb11=CHKJ2413I: \u5f15\u304d\u6570 {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6) (RMI 1.3: 2.6)
-CHKJ2413.eh.i.ejb11=CHKJ2413I: {0} \u306e\u5f15\u304d\u6570 {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8) (RMI 1.3: 2.6)
-CHKJ2413.eh.m.ejb11=CHKJ2413I: \u5f15\u304d\u6570 {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8) (RMI 1.3: 2.6)
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u3001{2} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {1} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u3001{1} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {0} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u3001{2} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {1} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u3001{1} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {0} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u3001{2} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {1} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u3001{1} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {0} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: {0} \u306e\u623b\u308a\u306e\u578b\u306f\u3001{2} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {1} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: \u3053\u306e\u623b\u308a\u306e\u578b\u306f\u3001{1} Bean \u30af\u30e9\u30b9\u5185\u306e\u4e00\u81f4\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306e\u623b\u308a\u306e\u578b {0} \u3068\u4e00\u81f4\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} \u306f create \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f create \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {2} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b {0} \u306e\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306b\u3088\u3063\u3066 {1} \u304c\u30b9\u30ed\u30fc\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.10.6\u300112.2.1\u300112.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {1} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306b\u3088\u3063\u3066 {0} \u304c\u30b9\u30ed\u30fc\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.10.6\u300112.2.1\u300112.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {2} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b {0} \u306e\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306b\u3088\u3063\u3066 {1} \u304c\u30b9\u30ed\u30fc\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.8\u300112.2.1\u300112.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {1} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u306b\u3088\u3063\u3066 {0} \u304c\u30b9\u30ed\u30fc\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.8\u300112.2.1\u300112.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: {1} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b {0} \u306e\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c {2} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.10.5\u300112.2.1\u300112.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: {0} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 6.10.5\u300112.2.1\u300112.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: {1} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b {0} \u306e\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c {2} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.7\u300112.2.1\u300112.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: {0} \u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306b\u3042\u308b\u5bfe\u5fdc\u3059\u308b\u30e1\u30bd\u30c3\u30c9\u304c {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 9.2.7\u300112.2.1\u300112.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: <ejb-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 16.2\u300116.5)
-CHKJ2802.named.ejb11=CHKJ2802E: <ejb-class> \u30af\u30e9\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2802.unnamed.ejb11=CHKJ2802E: <ejb-class> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30af\u30e9\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 (EJB 1.1: 16.2\u300116.5)
-CHKJ2803.named.ejb11=CHKJ2803E: <home> \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2803.unnamed.ejb11=CHKJ2803E: <home> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 (EJB 1.1: 16.2\u300116.5)
-CHKJ2804.named.ejb11=CHKJ2804E: <remote> \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2804.unnamed.ejb11=CHKJ2804E: <remote> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 (EJB 1.1: 16.2\u300116.5)
-CHKJ2806.ejb11=CHKJ2806E: <reentrant> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "True" \u307e\u305f\u306f "False" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 16.2\u300116.5)
-CHKJ2807.ejb11=CHKJ2807E: <session-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "Stateful" \u307e\u305f\u306f "Stateless" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 16.2\u300116.5)
-CHKJ2808.ejb11=CHKJ2808E: <transaction-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "Container" \u307e\u305f\u306f "Bean" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 11.3.5\u300116.2\u300116.5)
-CHKJ2809.ejb11=CHKJ2809E: <persistence-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "Container" \u307e\u305f\u306f "Bean" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 1.1: 16.2\u300116.5)
-CHKJ2810.named.ejb11=CHKJ2810E: <prim-key-class> \u30af\u30e9\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2810.unnamed.ejb11=CHKJ2810E: <prim-key-class> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30af\u30e9\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002  (EJB 1.1: 16.2\u300116.5)
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> {0} \u304c Bean \u30af\u30e9\u30b9 {1} \u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 16.5)
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> \u306f <field-name> \u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 16.5)
-CHKJ2812.ejb11=CHKJ2812E: Bean \u30af\u30e9\u30b9 {0} \u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092 <cmp-field> \u3068\u3057\u3066\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W: <method> \u5185\u306e <ejb-name> \u306f\u3001\u65e2\u77e5\u306e\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 11.4.1\u300115.3.2\u300116.5)
-
-CHKJ2820.ejb11=CHKJ2820W: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u53c2\u7167\u306f 1 \u5ea6\u3060\u3051\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-CHKJ2822.ejb11=CHKJ2822W: Bean {0} \u306e <security-role-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f\u3001<role-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: <security-role-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f <role-link> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: <security-role-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u4e0d\u660e\u306a\u5f79\u5272 {0} \u3092\u53c2\u7167\u3057\u3066\u3044\u307e\u3059\u3002 (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: ejb-jar.xml \u5185\u306e <security-role> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f\u3001<role-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u540d\u306f\u56fa\u6709\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: <role-link> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f\u3001<security-role> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u306a\u3044\u3068\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 15.2.5.3\u300115.3.1\u300115.3.3)
-CHKJ2828.ejb11=CHKJ2828E: <primkey-field> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f\u3001\u30d7\u30ea\u30df\u30c6\u30a3\u30d6\u4e3b\u30ad\u30fc\u304c\u306a\u3044\u3068\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7\u300116.5)
-CHKJ2829.ejb11=CHKJ2829E: \u30ad\u30fc\u30fb\u30af\u30e9\u30b9 {0} \u304c\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean {1} \u306e\u3069\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u3082\u30de\u30c3\u30d7\u3057\u3066\u3044\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7\u300116.5)
-
-CHKJ2830.ejb11=CHKJ2830W: {0} \u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u30bf\u30a4\u30d7\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2831.ejb11=CHKJ2831W: {0} \u306f <cmp-field> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u5ba3\u8a00\u3055\u308c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u6307\u5b9a\u3055\u308c\u305f\u30db\u30fc\u30e0 {0} \u304c EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u6307\u5b9a\u3055\u308c\u305f\u30ea\u30e2\u30fc\u30c8 {0} \u304c EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u6307\u5b9a\u3055\u308c\u305f Bean {0} \u304c EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Bean {0} \u306f {1} \u30bf\u30a4\u30d7\u3067\u3059\u3002 <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <ejb-ref-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Bean {0} \u306f\u30db\u30fc\u30e0 {1} \u3092\u4f7f\u7528\u3057\u307e\u3059\u3002 <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I: Bean {0} \u306f\u30ea\u30e2\u30fc\u30c8 {1} \u3092\u4f7f\u7528\u3057\u307e\u3059\u3002 <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 (EJB 1.1: 14.3.2)
-CHKJ2838.ejb11=CHKJ2838I: \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3078\u306e\u3059\u3079\u3066\u306e\u53c2\u7167\u306f "ejb" \u30b5\u30d6\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u7de8\u6210\u3059\u308b\u3053\u3068\u3092\u63a8\u5968\u3057\u307e\u3059\u3002 (EJB 1.1: 14.3.1.1)
-CHKJ2839.ejb11=CHKJ2839W: <env-entry> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <env-entry-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002 (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: <env-entry> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <env-entry-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002 (EJB 1.1: 14.2.1.2)
-CHKJ2841.ejb11=CHKJ2841W: <env-entry-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u306e {0} \u540d\u306f Bean \u3067\u4e00\u5ea6\u3057\u304b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 1.1: 14.2.1.2)
-CHKJ2842.ejb11=CHKJ2842W: <method-params> \u306f <method-name> \u304c "*" \u306e\u5834\u5408\u306f\u7121\u8996\u3055\u308c\u307e\u3059\u3002 (EJB 1.1: 11.4.1\u300115.3.2)
-CHKJ2843.ejb11=CHKJ2843W: {0} \u306e\u30e1\u30bd\u30c3\u30c9\u3067\u3053\u306e <method> \u306b\u4e00\u81f4\u3059\u308b\u3082\u306e\u306f\u3042\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 11.4.1\u300115.3.2)
-CHKJ2844.ejb11=CHKJ2844W: <method-permission> \u306b\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e <method> \u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 11.4.1\u300115.3.2)
-CHKJ2845.ejb11=CHKJ2845W: <method-permission> \u306b\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e <role-name> \u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 1.1: 11.4.1\u300115.3.2)
-CHKJ2846.ejb11=CHKJ2846W: \u3053\u306e <method-permission> \u306e\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 15.3.2)
-CHKJ2847.ejb11=CHKJ2847W: \u3053\u306e <container-transaction> \u306e\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 1.1: 11.4.1)
-CHKJ2849.ejb11=CHKJ2849W: {1} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u306a\u3044\u305f\u3081\u3001{0} \u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3092\u59a5\u5f53\u6027\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2850.ejb11=CHKJ2850W: {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u306a\u3044\u305f\u3081\u3001<method> \u3092\u59a5\u5f53\u6027\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2851.ejb11=CHKJ2851W: {1} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u306a\u3044\u305f\u3081\u3001{0} \u3092\u59a5\u5f53\u6027\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2852.ejb11=CHKJ2852W: ejb-jar.xml \u306e\u59a5\u5f53\u6027\u691c\u67fb\u4e2d\u306b throw \u53ef\u80fd\u3092\u30ad\u30e3\u30c3\u30c1\u3057\u307e\u3057\u305f\u3002 \u59a5\u5f53\u6027\u691c\u67fb\u4e2d\u306e Bean \u306f {0} \u3067\u3057\u305f\u3002
-CHKJ2853.ejb11=CHKJ2853W: ibm-ejb-jar-ext.xmi \u306e\u59a5\u5f53\u6027\u691c\u67fb\u4e2d\u306b throw \u53ef\u80fd\u3092\u30ad\u30e3\u30c3\u30c1\u3057\u307e\u3057\u305f\u3002 \u59a5\u5f53\u6027\u691c\u67fb\u4e2d\u306e Bean \u306f {0} \u3067\u3057\u305f\u3002
-
-CHKJ2908.ejb11=CHKJ2908W: \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3092\u6b63\u3057\u304f\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u8a73\u7d30\u306b\u3064\u3044\u3066\u306f\u3001XML \u30d0\u30ea\u30c7\u30fc\u30bf\u30fc\u3092\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} \u306f ejb-jar.xml \u30d5\u30a1\u30a4\u30eb\u5185\u3067\u56fa\u6709\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 1.1: 16.5)
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0} \u306f\u3001\u3053\u306e EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u542b\u3080\u3059\u3079\u3066\u306e EAR \u30d5\u30a1\u30a4\u30eb\u306b\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 1.1: 16.5\u300117.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: <primkey-field> \u306f\u30d7\u30ea\u30df\u30c6\u30a3\u30d6\u4e3b\u30ad\u30fc\u304c\u306a\u3044\u3068\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.1\u300122.5)
-CHKJ2829.ejb20=CHKJ2829E: \u30ad\u30fc\u30fb\u30af\u30e9\u30b9 {0} \u304c\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean {1} \u306e\u3069\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306b\u3082\u30de\u30c3\u30d7\u3057\u3066\u3044\u307e\u305b\u3093\u3002 (EJB 2.0: 10.8\u300122.5)
-CHKJ2839.ejb20=CHKJ2839W: <env-entry> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <env-entry-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002 (EJB 2.0: 20.2.1.2)
-CHKJ2840.ejb20=CHKJ2840W: <env-entry> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <env-entry-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002 (EJB 2.0: 20.2.1.2)
-CHKJ2841.ejb20=CHKJ2841W: <env-entry-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u306e {0} \u540d\u306f Bean \u3067\u4e00\u5ea6\u3057\u304b\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 2.0: 20.2.1.2)
-CHKJ2830.ejb20=CHKJ2830W: {0} \u30d5\u30a3\u30fc\u30eb\u30c9\u306e\u30bf\u30a4\u30d7\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2831.ejb20=CHKJ2831W: {0} \u306f <cmp-field> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u5ba3\u8a00\u3055\u308c\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 10.8.2)
-CHKJ2801.ejb20=CHKJ2801E: <ejb-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0 22.2\u300122.5)
-CHKJ2809.ejb20=CHKJ2809E: <persistence-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "Container" \u307e\u305f\u306f "Bean" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 2.0: 22.2\u300122.5)
-CHKJ2806.ejb20=CHKJ2806E: <reentrant> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "True" \u307e\u305f\u306f "False" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 22.2\u300122.5)
-CHKJ2807.ejb20=CHKJ2807E: <session-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "Stateful" \u307e\u305f\u306f "Stateless" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 22.2\u300122.5)
-CHKJ2808.ejb20=CHKJ2808E: <transaction-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "Container" \u307e\u305f\u306f "Bean" \u306e\u3044\u305a\u308c\u304b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 17.3.6\u300122.2\u300122.5)
-CHKJ2814.ejb20=CHKJ2814W: <method> \u5185\u306e <ejb-name> \u306f\u3001\u65e2\u77e5\u306e\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: 17.4.1\u300121.3.2\u300122.5)
-CHKJ2842.ejb20=CHKJ2842W: <method-params> \u306f <method-name> \u304c "*" \u306e\u5834\u5408\u306f\u7121\u8996\u3055\u308c\u307e\u3059\u3002 (EJB 2.0: 17.4.1\u300121.3.2)
-CHKJ2843.ejb20=CHKJ2843W: {0} \u306e\u30e1\u30bd\u30c3\u30c9\u3067\u3053\u306e <method> \u306b\u4e00\u81f4\u3059\u308b\u3082\u306e\u306f\u3042\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 17.4.1\u300121.3.2)
-CHKJ2844.ejb20=CHKJ2844W: <method-permission> \u306b\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e <method> \u3092\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: 17.4.1\u300121.3.2)
-CHKJ2845.ejb20=CHKJ2845W: <role-name> \u307e\u305f\u306f <unchecked> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092 <method-permission> \u5185\u306b\u8a2d\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: 17.4.1\u300121.3.2)
-CHKJ2846.ejb20=CHKJ2846W: \u3053\u306e <method-permission> \u306e\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 21.3.2)
-CHKJ2847.ejb20=CHKJ2847W: \u3053\u306e <container-transaction> \u306e\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 17.4.1)
-CHKJ2812.ejb20=CHKJ2812E: Bean \u30af\u30e9\u30b9 {0} \u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092 <cmp-field> \u3068\u3057\u3066\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: 22.5)
-CHKJ2832.ejb20=CHKJ2832I: <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u6307\u5b9a\u3055\u308c\u305f\u30db\u30fc\u30e0 {0} \u304c EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 20.3.1.2)
-CHKJ2833.ejb20=CHKJ2833I: <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u6307\u5b9a\u3055\u308c\u305f\u30ea\u30e2\u30fc\u30c8 {0} \u304c EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 20.3.1.2)
-CHKJ2834.ejb20=CHKJ2834I: <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u5185\u3067\u6307\u5b9a\u3055\u308c\u305f Bean {0} \u304c EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u5185\u306b\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 20.3.2)
-CHKJ2835.ejb20=CHKJ2835I: Bean {0} \u306f {1} \u30bf\u30a4\u30d7\u3067\u3059\u3002 <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <ejb-ref-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 (EJB 2.0: 20.3.2)
-CHKJ2836.ejb20=CHKJ2836I: Bean {0} \u306f\u30db\u30fc\u30e0 {1} \u3092\u4f7f\u7528\u3057\u307e\u3059\u3002 <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 (EJB 2.0: 20.3.2)
-CHKJ2837.ejb20=CHKJ2837I: Bean {0} \u306f\u30ea\u30e2\u30fc\u30c8 {1} \u3092\u4f7f\u7528\u3057\u307e\u3059\u3002 <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e <ejb-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 (EJB 2.0: 20.3.2)
-CHKJ2838.ejb20=CHKJ2838I: \u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u3078\u306e\u3059\u3079\u3066\u306e\u53c2\u7167\u306f "ejb" \u30b5\u30d6\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u306b\u7de8\u6210\u3059\u308b\u3053\u3068\u3092\u63a8\u5968\u3057\u307e\u3059\u3002 (EJB 2.0: 20.3.1.1)
-CHKJ2820.ejb20=CHKJ2820W: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u53c2\u7167\u304c\u8907\u6570\u56de\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u307e\u3059\u3002
-CHKJ2822.ejb20=CHKJ2822W: Bean {0} \u306e <security-role-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f\u3001<role-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: 21.2.5.3)
-CHKJ2823.ejb20=CHKJ2823W: <security-role-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f <role-link> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: 21.3.3)
-CHKJ2824.ejb20=CHKJ2824W: <security-role-ref> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u4e0d\u660e\u306a\u5f79\u5272 {0} \u3092\u53c2\u7167\u3057\u3066\u3044\u307e\u3059\u3002 (EJB 2.0: 21.3.3)
-CHKJ2825.ejb20=CHKJ2825W: ejb-jar.xml \u5185\u306e <security-role> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f\u3001<role-name> \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: 21.3.1)
-CHKJ2826.ejb20=CHKJ2826W: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u540d\u306f\u56fa\u6709\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 21.3.1)
-CHKJ2827.ejb20=CHKJ2827W: <role-link> \u30a8\u30ec\u30e1\u30f3\u30c8\u306f\u3001<security-role> \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u306a\u3044\u3068\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002 (EJB 2.0: 21.2.5.3\u300121.3.1\u300121.3.3)
-CHKJ2850.ejb20=CHKJ2850W: {0} \u30bf\u30a4\u30d7\u3092\u53cd\u6620\u3067\u304d\u306a\u3044\u305f\u3081\u3001<method> \u3092\u59a5\u5f53\u6027\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2851.ejb20=CHKJ2851W: \u30bf\u30a4\u30d7 {1} \u3092\u53cd\u6620\u3067\u304d\u306a\u3044\u305f\u3081\u3001{0} \u3092\u59a5\u5f53\u6027\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0} \u306f\u3001\u3053\u306e EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u542b\u3080\u3059\u3079\u3066\u306e EAR \u30d5\u30a1\u30a4\u30eb\u306b\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 22.5\u300123.4\u300123.6)
-
-CHKJ2003E.ejb20=CHKJ2003E: \u3053\u306e\u30af\u30e9\u30b9\u306f javax.ejb.SessionSynchronization \u3092\u5b9f\u88c5\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.5.3\u30017.10.2\u300117.3.4.1)
-CHKJ2003I.ejb20=CHKJ2003I: Bean \u7ba1\u7406\u4e0b\u306e\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3 Stateful Session Bean \u306f javax.ejb.SessionSynchronization \u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.5.3\u30017.10.2\u300117.3.4.1)
-CHKJ2802.named.ejb20=CHKJ2802E: <ejb-class> \u30af\u30e9\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2802.unnamed.ejb20=CHKJ2802E: <ejb-class> \u30a8\u30ec\u30e1\u30f3\u30c8\u3067\u8b58\u5225\u3055\u308c\u3066\u3044\u308b Bean \u30af\u30e9\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 22.2\u300122.5)
-CHKJ2803.named.ejb20=CHKJ2803E: <home> \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2803.unnamed.ejb20=CHKJ2803E: <home> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 (EJB 2.0: 22.2\u300122.5)
-CHKJ2804.named.ejb20=CHKJ2804E: <remote> \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2804.unnamed.ejb20=CHKJ2804E: <remote> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 (EJB 2.0: 22.2\u300122.5)
-CHKJ2805.named.ejb20=CHKJ2805E: <local-home> \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2805.unnamed.ejb20=CHKJ2805E: <local-home> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 (EJB 2.0: 22.2\u300122.5)
-CHKJ2800.named.ejb20=CHKJ2800E: <local> \u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2800.unnamed.ejb20=CHKJ2800E: <local> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 (EJB 2.0: 22.2\u300122.5)
-CHKJ2810.named.ejb20=CHKJ2810E: <prim-key-class> \u30af\u30e9\u30b9 {0} \u307e\u305f\u306f\u305d\u306e\u30b9\u30fc\u30d1\u30fc\u30bf\u30a4\u30d7\u306e\u3044\u305a\u308c\u304b\u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2810.unnamed.ejb20=CHKJ2810E: <prim-key-class> \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u4e0d\u660e\u306a\u30af\u30e9\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002  (EJB 2.0: 22.2\u300122.5)
-CHKJ2811.ejb20=CHKJ2811E: <field-name> {0} \u304c Bean \u30af\u30e9\u30b9 {1} \u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: 22.5)
-
-CHKJ2103.ejb20=CHKJ2103E: \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3067\u306f\u3001{0} Bean \u30af\u30e9\u30b9\u306f {1} \u3092\u7d99\u627f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E: \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3067\u306f\u3001{0} \u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {1} \u3092\u7d99\u627f\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 (EJB 2.0: D.2)
-CHKJ2105.ejb20=CHKJ2105E: \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3067\u306f\u3001{0} \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f {1} \u3092\u7d99\u627f\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 (EJB 2.0: D.2)
-CHKJ2106.ejb20=CHKJ2106E: Bean {0} \u306f\u305d\u306e <prim-key-class> \u3068\u3057\u3066 {1} \u3092\u4f7f\u7528\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: D.2)
-CHKJ2849.ejb20=CHKJ2849W: {1} \u30bf\u30a4\u30d7\u307e\u305f\u306f\u305d\u306e\u4f9d\u5b58\u95a2\u4fc2\u306e 1 \u3064\u3092\u53cd\u6620\u3067\u304d\u306a\u3044\u305f\u3081\u3001{0} \u306e\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u7d99\u627f\u3092\u59a5\u5f53\u6027\u691c\u67fb\u3067\u304d\u307e\u305b\u3093\u3002 \u30af\u30e9\u30b9\u30d1\u30b9\u3092\u8abf\u3079\u3066\u304f\u3060\u3055\u3044\u3002
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} \u306f ejb-jar.xml \u30d5\u30a1\u30a4\u30eb\u5185\u3067\u56fa\u6709\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 22.5)
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: \u3053\u306e\u30af\u30e9\u30b9\u306f {0} \u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.5.1\u30017.10.2)
-CHKJ2017.mb.ejb20=CHKJ2017E: \u3053\u306e\u30af\u30e9\u30b9\u306f {0} \u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 15.4.1\u300115.7.2)
-CHKJ2017.cb.ejb20=CHKJ2017E: \u3053\u306e\u30af\u30e9\u30b9\u306f {0} \u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.2)
-CHKJ2017.bb.ejb20=CHKJ2017E: \u3053\u306e\u30af\u30e9\u30b9\u306f {0} \u3092\u5b9f\u88c5\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.2)
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBHome \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.3\u30017.10.6)
-CHKJ2017.crh.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBHome \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5\u300110.6.10)
-CHKJ2017.brh.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBHome \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5\u300112.2.9)
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBLocalHome \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.4\u30017.10.8)
-CHKJ2017.clh.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBLocalHome \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6\u300110.6.12)
-CHKJ2017.blh.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBLocalHome \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6\u300112.2.11)
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBObject \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.5\u30017.10.5)
-CHKJ2017.crc.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBObject \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.9\u300110.6.9)
-CHKJ2017.brc.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBObject \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.9\u300112.2.8)
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBLocalObject \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.7)
-CHKJ2017.clc.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBLocalObject \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.10\u300110.6.10)
-CHKJ2017.blc.ejb20=CHKJ2017E: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f javax.ejb.EJBLocalObject \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.10\u300112.2.10)
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" \u3092\u30e1\u30bd\u30c3\u30c9\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u3059\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.2)
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" \u3092\u30e1\u30bd\u30c3\u30c9\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u3059\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.2)
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" \u3092\u30e1\u30bd\u30c3\u30c9\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u3059\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.2)
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: \u3053\u306e\u30af\u30e9\u30b9\u306f abstract \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.4.1\u300110.6.2)
-CHKJ2014.mb.ejb20=CHKJ2014W: \u3053\u306e\u30af\u30e9\u30b9\u306f abstract \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.2)
-CHKJ2014.bb.ejb20=CHKJ2014W: \u3053\u306e\u30af\u30e9\u30b9\u306f abstract \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.2)
-CHKJ2014.sb.ejb20=CHKJ2014W: \u3053\u306e\u30af\u30e9\u30b9\u306f abstract \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.1)
-
-CHKJ2022.cb.ejb20=CHKJ2022W: \u3053\u306e\u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.2)
-CHKJ2022.mb.ejb20=CHKJ2022W: \u3053\u306e\u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.2)
-CHKJ2022.bb.ejb20=CHKJ2022W: \u3053\u306e\u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.2)
-CHKJ2022.sb.ejb20=CHKJ2022W: \u3053\u306e\u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.1)
-CHKJ2022.kc.ejb20=CHKJ2022W: \u3053\u306e\u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.2)
-
-CHKJ2015.cb.ejb20=CHKJ2015W: \u3053\u306e\u30af\u30e9\u30b9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.2)
-CHKJ2015.mb.ejb20=CHKJ2015W: \u3053\u306e\u30af\u30e9\u30b9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.2)
-CHKJ2015.bb.ejb20=CHKJ2015W: \u3053\u306e\u30af\u30e9\u30b9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.2)
-CHKJ2015.sb.ejb20=CHKJ2015W: \u3053\u306e\u30af\u30e9\u30b9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.1)
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: \u3053\u306e\u30af\u30e9\u30b9\u306f\u9806\u5e8f\u4ed8\u3051\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.3\u300110.6.3)
-CHKJ2043.ejb20=CHKJ2043W: \u3053\u306e\u30af\u30e9\u30b9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.3)
-CHKJ2044.ejb20=CHKJ2044W: \u3053\u306e\u30af\u30e9\u30b9\u306f abstract \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.3)
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: \u3053\u306e\u30af\u30e9\u30b9\u306f RMI-IIOP \u3067\u9069\u5207\u306a\u5024\u30bf\u30a4\u30d7\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.8\u300110.6.13)
-CHKJ2019.kb.ejb20=CHKJ2019W: \u3053\u306e\u30af\u30e9\u30b9\u306f RMI-IIOP \u3067\u9069\u5207\u306a\u5024\u30bf\u30a4\u30d7\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(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} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.2)
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: public {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.2)
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: public {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1\u300112.2.2)
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: public {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 15.7.2)
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: public {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.8.2)
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: \u3053\u306e\u30af\u30e9\u30b9\u306f {0} \u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1)
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 15.4.2\u300115.7.4)
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e ejbCreate \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.5.5)
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: ejbCreate() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.8)
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: ejbCreate() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 15.4.4\u300115.7.2)
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: ejbFindByPrimaryKey \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.5)
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: setEntityContext(EntityContext) \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: setEntityContext(EntityContext) \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1)
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: unsetEntityContext() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: unsetEntityContext() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1)
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: ejbActivate() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: ejbActivate() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1)
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: ejbPassivate() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: ejbPassivate() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: ejbPassivate() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.5.1)
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: ejbRemove() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: ejbRemove() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: ejbRemove() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 15.7.5)
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: ejbRemove() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 4.2.2\u30017.5.1)
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: ejbLoad() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: ejbLoad() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059(EJB 2.0: 12.1.4.1)
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: ejbStore() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: ejbStore() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1)
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: create() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.8\u30017.10.6)
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: create() \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.8\u30017.10.8)
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e create \u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.3.1\u30017.10.6)
-CHKJ2050.create.slh.ejb20=CHKJ2050W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e create \u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.4.1\u30017.10.8)
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30d5\u30a1\u30a4\u30f3\u30c0\u30fc\u30fb\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2)
-CHKJ2050.find.brh.ejb20=CHKJ2050W: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30d5\u30a1\u30a4\u30f3\u30c0\u30fc\u30fb\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2)
-CHKJ2050.find.clh.ejb20=CHKJ2050W: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30d5\u30a1\u30a4\u30f3\u30c0\u30fc\u30fb\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2)
-CHKJ2050.find.blh.ejb20=CHKJ2050W: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30d5\u30a1\u30a4\u30f3\u30c0\u30fc\u30fb\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2)
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30db\u30fc\u30e0\u30fb\u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4)
-CHKJ2050.home.brh.ejb20=CHKJ2050W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30db\u30fc\u30e0\u30fb\u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4)
-CHKJ2050.home.clh.ejb20=CHKJ2050W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30db\u30fc\u30e0\u30fb\u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.4)
-CHKJ2050.home.blh.ejb20=CHKJ2050W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u30db\u30fc\u30e0\u30fb\u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.4)
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: \u3053\u306e\u30af\u30e9\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e ejbHome \u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4)
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: \u3053\u306e\u30af\u30e9\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e ejbHome \u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4)
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: \u3053\u306e\u30af\u30e9\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e ejbHome \u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.4)
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: \u3053\u306e\u30af\u30e9\u30b9\u306f\u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e ejbHome \u30e1\u30bd\u30c3\u30c9\u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.4)
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() \u304c\u3053\u306e\u30af\u30e9\u30b9\u306b\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.12)
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() \u304c\u3053\u306e\u30af\u30e9\u30b9\u306b\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.13)
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) \u304c\u3053\u306e\u30af\u30e9\u30b9\u306b\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.12)
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) \u304c\u3053\u306e\u30af\u30e9\u30b9\u306b\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.13)
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: ejbSelect \u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.7)
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300110.6.12)
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300112.2.11)
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1)
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2)
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.1.4.1\u300112.2.4)
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: {0} \u3067\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916 {1} \u306f java.lang.Exception \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 18.1.1\u300118.2.1)
-CHKJ2404.m.ejb20=CHKJ2404W: \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916 {0} \u306f java.lang.Exception \u3092\u62e1\u5f35\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 18.1.1\u300118.2.1)
-CHKJ2416.i.ejb20=CHKJ2416W: {0} \u3067\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916 {1} \u306f java.lang.RuntimeException \u3092\u62e1\u5f35\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 18.1.1\u300118.2.1)
-CHKJ2416.m.ejb20=CHKJ2416W: \u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916 {0} \u306f java.lang.RuntimeException \u3092\u62e1\u5f35\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 18.1.1\u300118.2.1)
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {1} \u306e {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2492.mb.m.ejb20=CHKJ2492W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {1} \u306e {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2492.cb.m.ejb20=CHKJ2492W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {1} \u306e {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2492.bb.m.ejb20=CHKJ2492W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {1} \u306e {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-CHKJ2492.sb.m.ejb20=CHKJ2492W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2493.mb.m.ejb20=CHKJ2493W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2493.cb.m.ejb20=CHKJ2493W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2493.bb.m.ejb20=CHKJ2493W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-CHKJ2493.sb.m.ejb20=CHKJ2493W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2494.mb.m.ejb20=CHKJ2494W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2494.cb.m.ejb20=CHKJ2494W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2494.bb.m.ejb20=CHKJ2494W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-CHKJ2494.sb.m.ejb20=CHKJ2494W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5)
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2)
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.6)
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2421.mb.m.ejb20=CHKJ2421W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-CHKJ2421.cb.m.ejb20=CHKJ2421W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2421.bb.m.ejb20=CHKJ2421W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-CHKJ2421.sb.m.ejb20=CHKJ2421W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-CHKJ2422.sb.m.ejb20=CHKJ2422W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2422.cb.m.ejb20=CHKJ2422W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2422.bb.m.ejb20=CHKJ2422W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-CHKJ2422.mb.m.ejb20=CHKJ2422W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-CHKJ2423.sb.m.ejb20=CHKJ2423W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2423.cb.m.ejb20=CHKJ2423W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2423.bb.m.ejb20=CHKJ2423W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-CHKJ2423.mb.m.ejb20=CHKJ2423W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.4)
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.3)
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-CHKJ2424.cb.m.ejb20=CHKJ2424W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.4)
-CHKJ2424.bb.m.ejb20=CHKJ2424W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.3)
-CHKJ2424.sb.m.ejb20=CHKJ2424W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2424.mb.m.ejb20=CHKJ2424W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3)
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3)
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4)
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3)
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} \u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.4)
-CHKJ2497.cb.m.ejb20=CHKJ2497W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.4)
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} \u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916\u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3\u300118.1.1\u300118.2.1\u300118.3.2)
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916\u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.3\u300118.1.1\u300118.2.1\u300118.3.2)
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} \u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916\u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5\u300118.1.1\u300118.2.1\u300118.3.2)
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916\u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.5\u300118.1.1\u300118.2.1\u300118.3.2)
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} \u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916\u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.4.10\u300115.7.4\u300118.1.1\u300118.2.1\u300118.3.2)
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u4f8b\u5916\u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.4.10\u300115.7.4\u300118.1.1\u300118.2.1\u300118.3.2)
-
-
-CHKJ2503.ejbCreate.sb.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3\u300118.3.8\u300118.6)
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4\u300118.3.8\u300118.6)
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3\u300118.3.8\u300118.6)
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.3\u300118.3.8\u300118.6)
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.4\u300118.3.8\u300118.6)
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.3\u300118.3.8\u300118.6)
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-CHKJ2426.cb.m.ejb20=CHKJ2426W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2426.bb.m.ejb20=CHKJ2426W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-CHKJ2427.cb.m.ejb20=CHKJ2427W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2427.bb.m.ejb20=CHKJ2427W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-CHKJ2428.cb.m.ejb20=CHKJ2428W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2428.bb.m.ejb20=CHKJ2428W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5)
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4)
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5\u300118.3.8\u300118.6)
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4\u300118.3.8\u300118.6)
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.5\u300118.3.8\u300118.6)
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.4\u300118.3.8\u300118.6)
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {0} \u304c\u547c\u3073\u51fa\u3055\u308c\u308b\u306b\u306f\u3001{1} \u304c\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.6.6)
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {0} \u304c\u547c\u3073\u51fa\u3055\u308c\u308b\u306b\u306f\u3001{1} \u304c\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-CHKJ2430.cb.m.ejb20=CHKJ2430I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u547c\u3073\u51fa\u3055\u308c\u308b\u306b\u306f\u3001{0} \u304c\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.6.6)
-CHKJ2430.bb.m.ejb20=CHKJ2430I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u547c\u3073\u51fa\u3055\u308c\u308b\u306b\u306f\u3001{0} \u304c\u5b58\u5728\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.4.1)
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.6)
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 2.0: 12.2.6)
-CHKJ2431.cb.m.ejb20=CHKJ2431W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0:10.6.6)
-CHKJ2431.bb.m.ejb20=CHKJ2431W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002  (EJB 2.0: 12.2.6)
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.6)
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.6)
-CHKJ2439.cb.m.ejb20=CHKJ2439W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.6)
-CHKJ2439.bb.m.ejb20=CHKJ2439W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.6)
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.6)
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.6)
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.6)
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.6)
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.6\u300118.3.8\u300118.6)
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.6\u300118.3.8\u300118.6)
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.6\u300118.3.8\u300118.6)
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.6\u300118.3.8\u300118.6)
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-CHKJ2457.bb.m.ejb20=CHKJ2457W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-CHKJ2458.bb.m.ejb20=CHKJ2458W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-CHKJ2459.bb.m.ejb20=CHKJ2459W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {1} \u306e {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5)
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.5)
-CHKJ2407.bb.m.ejb20=CHKJ2407W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.5)
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5\u300118.3.8\u300118.6)
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.5\u300118.3.8\u300118.6)
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} \u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-CHKJ2498.bb.m.ejb20=CHKJ2498W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 \u30b3\u30f3\u30c6\u30ca\u30fc\u304c\u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306e\u5b9f\u88c5\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.2)
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 \u30b3\u30f3\u30c6\u30ca\u30fc\u304c\u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306e\u5b9f\u88c5\u3092\u63d0\u4f9b\u3057\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.2)
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 CMP Bean \u306e\u307f\u304c ejbSelect \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3061\u307e\u3059\u3002(EJB 2.0: 12.1.5)
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 CMP Bean \u306e\u307f\u304c ejbSelect \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3061\u307e\u3059\u3002(EJB 2.0: 12.1.5)
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 CMP Bean \u306e\u307f\u304c ejbSelect \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3061\u307e\u3059\u3002(EJB 2.0: 7.6.1)
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 CMP Bean \u306e\u307f\u304c ejbSelect \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3061\u307e\u3059\u3002(EJB 2.0: 7.6.1)
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 CMP Bean \u306e\u307f\u304c ejbSelect \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3061\u307e\u3059\u3002(EJB 2.0: 7.8.2)
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002 CMP Bean \u306e\u307f\u304c ejbSelect \u30e1\u30bd\u30c3\u30c9\u3092\u6301\u3061\u307e\u3059\u3002(EJB 2.0: 7.8.2)
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.2\u300110.5.7)
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.2)
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.2)
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.2)
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.2)
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.2)
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.2)
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.2)
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.2)
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8)
-CHKJ2502.slh.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8)
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} \u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-CHKJ2502.srh.m.ejb20=CHKJ2502I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u5b58\u5728\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2411.cb.i.ejb20=CHKJ2411W: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2411.bb.i.ejb20=CHKJ2411W: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-CHKJ2411.sb.m.ejb20=CHKJ2411W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2411.cb.m.ejb20=CHKJ2411W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2411.bb.m.ejb20=CHKJ2411W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "ejb" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-CHKJ2441.sb.m.ejb20=CHKJ2441W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2441.cb.m.ejb20=CHKJ2441W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2441.bb.m.ejb20=CHKJ2441W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-CHKJ2442.sb.m.ejb20=CHKJ2442W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2442.cb.m.ejb20=CHKJ2442W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2442.bb.m.ejb20=CHKJ2442W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-CHKJ2443.sb.m.ejb20=CHKJ2443W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2443.cb.m.ejb20=CHKJ2443W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2443.bb.m.ejb20=CHKJ2443W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4)
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8)
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7)
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4\u300118.3.8\u300118.6)
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8\u300118.3.8\u300118.6)
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7\u300118.3.8\u300118.6)
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.4\u300118.3.8\u300118.6)
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.8\u300118.3.8\u300118.6)
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.7\u300118.3.8\u300118.6)
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} \u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.4.10\u300118.3.8\u300118.6)
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u304c java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.4.10\u300118.3.8\u300118.6)
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-CHKJ2445.mb.m.ejb20=CHKJ2445W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} \u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-CHKJ2446.mb.m.ejb20=CHKJ2446W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f final \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} \u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-CHKJ2447.mb.m.ejb20=CHKJ2447W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f static \u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} \u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f void \u3092\u623b\u3055\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 15.7.4)
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-CHKJ2449.cb.m.ejb20=CHKJ2449W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} \u306f abstract \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.6.2)
-CHKJ2450.cb.m.ejb20=CHKJ2450W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f abstract \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.6.2)
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0} \u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-CHKJ2473.crc.m.ejb20=CHKJ2473W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0} \u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-CHKJ2473.crh.m.ejb20=CHKJ2473W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e RMI-IIOP \u898f\u5247\u306b\u5f93\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2461.home.crh.ejb20=CHKJ2461W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e RMI-IIOP \u898f\u5247\u306b\u5f93\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.10)
-CHKJ2461.home.srh.ejb20=CHKJ2461W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e RMI-IIOP \u898f\u5247\u306b\u5f93\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2462.brh.i.ejb20=CHKJ2462I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2462.crh.i.ejb20=CHKJ2462I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12)
-CHKJ2462.blh.i.ejb20=CHKJ2462I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.11)
-CHKJ2462.clh.m.ejb20=CHKJ2462I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2462.brh.m.ejb20=CHKJ2462I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2462.crh.m.ejb20=CHKJ2462I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12)
-CHKJ2462.blh.m.ejb20=CHKJ2462I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "create" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.11)
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2463.brh.i.ejb20=CHKJ2463I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2463.crh.i.ejb20=CHKJ2463I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12)
-CHKJ2463.blh.i.ejb20=CHKJ2463I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.11)
-CHKJ2463.clh.m.ejb20=CHKJ2463I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2463.brh.m.ejb20=CHKJ2463I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2463.crh.m.ejb20=CHKJ2463I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12)
-CHKJ2463.blh.m.ejb20=CHKJ2463I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "find" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.11)
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2464.brh.i.ejb20=CHKJ2464I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2464.crh.i.ejb20=CHKJ2464I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12)
-CHKJ2464.blh.i.ejb20=CHKJ2464I: \u30e1\u30bd\u30c3\u30c9 {0} \u306e\u540d\u524d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.11)
-CHKJ2464.clh.m.ejb20=CHKJ2464I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2464.brh.m.ejb20=CHKJ2464I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2464.crh.m.ejb20=CHKJ2464I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12)
-CHKJ2464.blh.m.ejb20=CHKJ2464I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u540d\u3092 "remove" \u3067\u59cb\u3081\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.11)
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300112.2.11\u300118.3.8\u300118.6)
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12\u300118.3.8\u300118.6)
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8\u300118.3.8\u300118.6)
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300112.2.11\u300118.3.8\u300118.6)
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.4\u300110.6.12\u300118.3.8\u300118.6)
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8\u300118.3.8\u300118.6)
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300112.2.9)
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300110.6.10)
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.1\u300112.2.11\u300118.3.8\u300118.6)
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.1\u300110.6.12\u300118.3.8\u300118.6)
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8\u300118.3.8\u300118.6)
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300112.2.9)
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300110.6.10)
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.1\u300112.2.11\u300118.3.8\u300118.6)
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.1\u300110.6.12\u300118.3.8\u300118.6)
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8\u300118.3.8\u300118.6)
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} \u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} \u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.8)
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} \u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300110.6.10)
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} \u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300110.6.12)
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} \u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300112.2.9)
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} \u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300112.2.11)
-CHKJ2467.srh.m.ejb20=CHKJ2467W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2467.slh.m.ejb20=CHKJ2467W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.8)
-CHKJ2467.crh.m.ejb20=CHKJ2467W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300110.6.10)
-CHKJ2467.clh.m.ejb20=CHKJ2467W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300110.6.12)
-CHKJ2467.brh.m.ejb20=CHKJ2467W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300112.2.9)
-CHKJ2467.blh.m.ejb20=CHKJ2467W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.CreateException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300112.2.11)
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.3.1\u30017.10.6)
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.4.1\u30017.10.8)
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.3.1\u30017.8\u30017.10.6)
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.4.1\u30017.8\u30017.10.8)
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300110.6.10)
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300110.6.12)
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300112.2.9)
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300112.2.11)
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.3.1\u30017.10.6)
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.4.1\u30017.10.8)
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.3.1\u30017.8\u30017.10.6)
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 6.4.1\u30017.8\u30017.10.8)
-CHKJ2402.crh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300110.6.10)
-CHKJ2402.clh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300110.6.12)
-CHKJ2402.brh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.1\u300112.2.9)
-CHKJ2402.blh.m.ejb20=CHKJ2402E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.1\u300112.2.11)
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} \u306f create() \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.8\u30017.10.6)
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} \u306f create() \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.8\u30017.10.8)
-CHKJ2476.srh.m.ejb20=CHKJ2476E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f create() \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.8\u30017.10.6)
-CHKJ2476.slh.m.ejb20=CHKJ2476E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f create() \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.8\u30017.10.8)
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} \u306f ejbCreate() \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.8)
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ejbCreate() \u30e1\u30bd\u30c3\u30c9\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.8)
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.8)
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.10)
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.12)
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: {0} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: {0} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.8)
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: {0} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.10)
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: {0} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.12)
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: {0} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: {0} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.10)
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.12)
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: {0} \u306e {1} \u30de\u30c3\u30c1\u30f3\u30b0\u30fb\u30e1\u30bd\u30c3\u30c9\u306f {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.10)
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.2\u300110.6.12)
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300112.2.11\u300118.3.8\u300118.6)
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300110.6.12\u300118.3.8\u300118.6)
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8\u300118.3.8\u300118.6)
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300112.2.11\u300118.3.8\u300118.6)
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300110.6.12\u300118.3.8\u300118.6)
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.8\u300118.3.8\u300118.6)
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} \u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} \u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300112.2.11)
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} \u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} \u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300110.6.12)
-CHKJ2477.crh.m.ejb20=CHKJ2477W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2477.brh.m.ejb20=CHKJ2477W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300112.2.11)
-CHKJ2477.clh.m.ejb20=CHKJ2477W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2477.blh.m.ejb20=CHKJ2477W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300110.6.12)
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} \u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.8.4)
-CHKJ2478.crh.m.ejb20=CHKJ2478I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.8.4)
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} \u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.8.4)
-CHKJ2478.clh.m.ejb20=CHKJ2478I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.8.4)
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} \u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-CHKJ2478.brh.m.ejb20=CHKJ2478I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} \u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-CHKJ2478.blh.m.ejb20=CHKJ2478I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} \u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.8.4)
-CHKJ2478.cb.m.ejb20=CHKJ2478I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.8.4)
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} \u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-CHKJ2478.bb.m.ejb20=CHKJ2478I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ObjectNotFoundException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.1.8.4)
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.1.7\u300112.2.9)
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300112.1.7\u300112.2.11)
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.5.6\u300110.6.10\u300111.2.2)
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300110.5.6\u300110.6.12\u300111.2.2)
-CHKJ2403.brh.m.ejb20=CHKJ2403W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.1.7\u300112.2.9)
-CHKJ2403.blh.m.ejb20=CHKJ2403W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300112.1.7\u300112.2.11)
-CHKJ2403.crh.m.ejb20=CHKJ2403W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.5.6\u300110.6.10\u300111.2.2)
-CHKJ2403.clh.m.ejb20=CHKJ2403W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300110.5.6\u30010.6.12\u300111.2.2)
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} \u306f {0} \u306e {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} \u306f {0} \u306e {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.10)
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} \u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} \u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.10)
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} \u306f {0} \u306e {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} \u306f {0} \u306e {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.2)
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} \u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} \u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.2)
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} \u306f ejb-jar.xml \u5185\u306e\u30af\u30a8\u30ea\u30fc\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8\u3068\u95a2\u9023\u4ed8\u3051\u3089\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.6\u300110.6.14)
-CHKJ2495.clh.m.ejb20=CHKJ2495I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ejb-jar.xml \u5185\u306e\u30af\u30a8\u30ea\u30fc\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8\u3068\u95a2\u9023\u4ed8\u3051\u3089\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.6\u300110.6.14)
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} \u306f ejb-jar.xml \u5185\u306e\u30af\u30a8\u30ea\u30fc\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8\u3068\u95a2\u9023\u4ed8\u3051\u3089\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.6\u300110.6.14)
-CHKJ2495.crh.m.ejb20=CHKJ2495I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ejb-jar.xml \u5185\u306e\u30af\u30a8\u30ea\u30fc\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8\u3068\u95a2\u9023\u4ed8\u3051\u3089\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.6\u300110.6.14)
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.7\u300118.3.8\u300118.6)
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.10\u300112.2.10\u300118.3.8\u300118.6)
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} \u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.10\u300118.3.8\u300118.6)
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.7\u300118.3.8\u300118.6)
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.10\u300112.2.10\u300118.3.8\u300118.6)
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f java.rmi.RemoteException \u3092\u30b9\u30ed\u30fc\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.10\u300118.3.8\u300118.6)
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} \u306f {2} \u306e {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} \u306f {2} \u306e {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} \u306f {2} \u306e {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.10)
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} \u306f {2} \u306e {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.12)
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} \u306f {2} \u306e {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} \u306f {2} \u306e {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.8)
-CHKJ2465.brh.m.ejb20=CHKJ2465W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306e {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.9)
-CHKJ2465.blh.m.ejb20=CHKJ2465W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306e {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.11)
-CHKJ2465.crh.m.ejb20=CHKJ2465W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306e {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.10)
-CHKJ2465.clh.m.ejb20=CHKJ2465W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306e {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.12)
-CHKJ2465.srh.m.ejb20=CHKJ2465W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306e {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.6)
-CHKJ2465.slh.m.ejb20=CHKJ2465W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {1} \u306e {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.8)
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.6)
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300110.6.10)
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.4\u300112.2.9)
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} \u306f {1} \u30bf\u30a4\u30d7\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.5)
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} \u306f {1} \u30bf\u30a4\u30d7\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.10)
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} \u306f {1} \u30bf\u30a4\u30d7\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.9)
-CHKJ2466.crh.m.ejb20=CHKJ2466I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u30bf\u30a4\u30d7\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.10)
-CHKJ2466.brh.m.ejb20=CHKJ2466I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u30bf\u30a4\u30d7\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.9)
-CHKJ2466.src.m.ejb20=CHKJ2466I: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u30bf\u30a4\u30d7\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.5)
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e RMI-IIOP \u898f\u5247\u306b\u5f93\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2468.crc.ejb20=CHKJ2468W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e RMI-IIOP \u898f\u5247\u306b\u5f93\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2468.brc.ejb20=CHKJ2468W: \u3053\u306e\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306f\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u306e RMI-IIOP \u898f\u5247\u306b\u5f93\u3046\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {1} \u5185\u306e {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.5)
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {1} \u5185\u306e {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.9)
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: \u30e1\u30bd\u30c3\u30c9 {1} \u5185\u306e {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.8)
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.10.5)
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.9)
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} \u306f\u30e9\u30f3\u30bf\u30a4\u30e0\u306b\u30b7\u30ea\u30a2\u30e9\u30a4\u30ba\u53ef\u80fd\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 12.2.8)
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: \u30e1\u30bd\u30c3\u30c9 {0} \u5185\u306e {1} \u306f\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u306e\u578b\u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 6.7.2)
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} \u306f {1} \u3092\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u305b\u307e\u305b\u3093\u3002(EJB 2.0: 9.7.2\u300112.2.8)
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} \u306f {1} \u3092\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u305b\u307e\u305b\u3093\u3002(EJB 2.0: 9.7.2\u300110.3.1\u300110.3.10.1)
-CHKJ2472.brc.m.ejb20=CHKJ2472W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u305b\u307e\u305b\u3093\u3002(EJB 2.0: 9.7.2\u300112.2.8)
-CHKJ2472.crc.m.ejb20=CHKJ2472W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u3068\u3057\u3066\u6e21\u305b\u307e\u305b\u3093\u3002(EJB 2.0: 9.7.2\u300110.3.1\u300110.3.10.1)
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} \u306f\u5f15\u304d\u6570\u307e\u305f\u306f\u7d50\u679c\u306e\u578b\u306b\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 6.7.2)
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} \u306f {1} \u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-CHKJ2474.crc.m.ejb20=CHKJ2474W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0} \u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-CJKJ2490.crc.m.ejb20=CHKJ2490W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1\u300110.3.10.1)
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} \u306f abstract \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.7\u300110.6.7)
-CHKJ2485.cb.m.ejb20=CHKJ2485W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f abstract \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.5.7\u300110.6.7)
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.7)
-CHKJ2487.cb.m.ejb20=CHKJ2487W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.7)
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} \u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.7)
-CHKJ2488.cb.m.ejb20=CHKJ2488W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f javax.ejb.FinderException \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.7)
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} \u306f {1} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.7\u300111.2.2)
-CHKJ2486.cb.m.ejb20=CHKJ2486W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.7\u300111.2.2)
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} \u306f ejb-jar.xml \u5185\u306e\u30af\u30a8\u30ea\u30fc\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8\u3068\u95a2\u9023\u4ed8\u3051\u3089\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.7\u300110.6.14)
-CHKJ2496.cb.m.ejb20=CHKJ2496W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f ejb-jar.xml \u5185\u306e\u30af\u30a8\u30ea\u30fc\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8\u3068\u95a2\u9023\u4ed8\u3051\u3089\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.5.7\u300110.6.14)
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306b\u306f\u3001{1} \u304c {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2023.slc.i.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306b\u306f\u3001{1} \u304c {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.7)
-CHKJ2023.brc.i.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306b\u306f\u3001{1} \u304c {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2023.blc.i.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306b\u306f\u3001{1} \u304c {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.10)
-CHKJ2023.crc.i.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306b\u306f\u3001{1} \u304c {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2023.clc.i.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306b\u306f\u3001{1} \u304c {2} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.11)
-CHKJ2023.src.m.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2023.slc.m.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.7)
-CHKJ2023.brc.m.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2023.blc.m.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.10)
-CHKJ2023.crc.m.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2023.clc.m.ejb20=CHKJ2023W: {0} \u30e1\u30bd\u30c3\u30c9\u306f {1} \u306b\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.11)
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.7)
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.11)
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.10)
-CHKJ2470.src.m.ejb20=CHKJ2470E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2470.slc.m.ejb20=CHKJ2470E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.7)
-CHKJ2470.crc.m.ejb20=CHKJ2470E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2470.clc.m.ejb20=CHKJ2470E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.11)
-CHKJ2470.brc.m.ejb20=CHKJ2470E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2470.blc.m.ejb20=CHKJ2470E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.10)
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.7)
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.11)
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} \u306f {1} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.10)
-CHKJ2471.src.m.ejb20=CHKJ2471W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.5)
-CHKJ2471.slc.m.ejb20=CHKJ2471W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.7)
-CHKJ2471.crc.m.ejb20=CHKJ2471W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.9)
-CHKJ2471.clc.m.ejb20=CHKJ2471W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.11)
-CHKJ2471.brc.m.ejb20=CHKJ2471W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.8)
-CHKJ2471.blc.m.ejb20=CHKJ2471W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u30b9\u30ed\u30fc\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.10)
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0} \u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 6.5)
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0} \u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 6.5)
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0} \u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.9)
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0} \u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.10)
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0} \u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.9)
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0} \u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.10)
-CHKJ2469.src.m.ejb20=CHKJ2469W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 6.5)
-CHKJ2469.slc.m.ejb20=CHKJ2469W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 6.5)
-CHKJ2469.crc.m.ejb20=CHKJ2469W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.9)
-CHKJ2469.clc.m.ejb20=CHKJ2469W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.10)
-CHKJ2469.brc.m.ejb20=CHKJ2469W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.9)
-CHKJ2469.blc.m.ejb20=CHKJ2469W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f\u30b3\u30f3\u30c6\u30ca\u30fc\u306b\u3088\u3063\u3066\u63d0\u4f9b\u3055\u308c\u307e\u3059\u3002(EJB 2.0: 9.10)
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} \u306f findByPrimaryKey({1}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} \u306f findByPrimaryKey({1}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300110.6.12)
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} \u306f findByPrimaryKey(Object) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.3)
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} \u306f findByPrimaryKey(Object) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.3)
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} \u306f findByPrimaryKey({1}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} \u306f findByPrimaryKey({1}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300112.2.11)
-CHKJ2475.crh.m.ejb20=CHKJ2475W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f findByPrimaryKey({0}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2475.clh.m.ejb20=CHKJ2475W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f findByPrimaryKey({0}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300110.6.12)
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f findByPrimaryKey(Object) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.3)
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f findByPrimaryKey(Object) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.3)
-CHKJ2475.brh.m.ejb20=CHKJ2475W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f findByPrimaryKey({0}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2475.blh.m.ejb20=CHKJ2475W: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f findByPrimaryKey({0}) \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 9.6.2\u300112.2.11)
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300110.6.12)
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} \u306f {1} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300112.2.11)
-CHKJ2479.crh.m.ejb20=CHKJ2479E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300110.6.10)
-CHKJ2479.clh.m.ejb20=CHKJ2479E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300110.6.12)
-CHKJ2479.brh.m.ejb20=CHKJ2479E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.5.2\u300112.2.9)
-CHKJ2479.blh.m.ejb20=CHKJ2479E: \u3053\u306e\u30e1\u30bd\u30c3\u30c9\u306f {0} \u3092\u623b\u3059\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 9.6.2\u300112.2.11)
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: \u4e00\u6642\u30d5\u30a3\u30fc\u30eb\u30c9 {0} \u306f {1} \u30bf\u30a4\u30d7\u306b\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.4.1)
-CHKJ2452.sb.m.ejb20=CHKJ2452W: \u4e00\u6642\u30d5\u30a3\u30fc\u30eb\u30c9\u306f {0} \u30bf\u30a4\u30d7\u306b\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 7.4.1)
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: \u4e00\u6642\u30d5\u30a3\u30fc\u30eb\u30c9 ({0}) \u304c\u9069\u5207\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.4.1)
-CHKJ2453.sb.m.ejb20=CHKJ2453W: \u4e00\u6642\u30d5\u30a3\u30fc\u30eb\u30c9\u304c\u9069\u5207\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 7.4.1)
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: {0} \u3092\u5b9a\u7fa9\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0} \u3092\u5b9a\u7fa9\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} \u306f\u5c0f\u6587\u5b57\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} \u306f\u5c0f\u6587\u5b57\u3067\u59cb\u307e\u3089\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} \u306f <cmp-field> \u3068\u3057\u3066\u5ba3\u8a00\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1\u300110.3.13)
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} \u306f <cmp-field> \u3068\u3057\u3066\u5ba3\u8a00\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1\u300110.3.13)
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} \u306f <cmr-field> \u3068\u3057\u3066\u5ba3\u8a00\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1\u300110.3.13)
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} \u306f <cmr-field> \u3068\u3057\u3066\u5ba3\u8a00\u3055\u308c\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1\u300110.3.13)
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0} \u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0} \u3092\u516c\u958b\u3057\u3066\u306f\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} \u306f\u30d7\u30ea\u30df\u30c6\u30a3\u30d6\u307e\u305f\u306f\u9806\u5e8f\u4ed8\u3051\u53ef\u80fd\u306a\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} \u306f\u30d7\u30ea\u30df\u30c6\u30a3\u30d6\u307e\u305f\u306f\u9806\u5e8f\u4ed8\u3051\u53ef\u80fd\u306a\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: \u30d5\u30a3\u30fc\u30eb\u30c9 {0} \u306f {1} \u30bf\u30a4\u30d7\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.1)
-CHKJ2489.cb.m.ejb20=CHKJ2489W: \u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306f {0} \u30bf\u30a4\u30d7\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.1)
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: \u30d5\u30a3\u30fc\u30eb\u30c9 {0} \u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.2)
-CHKJ2205.kc.m.ejb20=CHKJ2205W: \u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306f public \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.2)
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: \u30d5\u30a3\u30fc\u30eb\u30c9 {0} \u306f <cmp-field> \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.2)
-CHKJ2206.kc.m.ejb20=CHKJ2206W: \u3053\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u306f <cmp-field> \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.8.2)
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: \u3053\u306e Bean \u306f <local-home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.1)
-CHKJ2881.s.ejb20=CHKJ2881W: \u3053\u306e Bean \u306f <home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.1)
-CHKJ2882.s.ejb20=CHKJ2882W: \u3053\u306e Bean \u306f <local> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.1)
-CHKJ2883.s.ejb20=CHKJ2883W: \u3053\u306e Bean \u306f <remote> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.1)
-CHKJ2884.s.ejb20=CHKJ2884W: \u3053\u306e Bean \u306f <local-home> \u307e\u305f\u306f <home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.1)
-CHKJ2885.s.ejb20=CHKJ2885W: \u3053\u306e Bean \u306f <local> \u307e\u305f\u306f <remote> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 7.10.1)
-CHKJ2880.c.ejb20=CHKJ2880W: \u3053\u306e Bean \u306f <local-home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.1)
-CHKJ2881.c.ejb20=CHKJ2881W: \u3053\u306e Bean \u306f <home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.1)
-CHKJ2882.c.ejb20=CHKJ2882W: \u3053\u306e Bean \u306f <local> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.1)
-CHKJ2883.c.ejb20=CHKJ2883W: \u3053\u306e Bean \u306f <remote> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.1)
-CHKJ2884.c.ejb20=CHKJ2884W: \u3053\u306e Bean \u306f <local-home> \u307e\u305f\u306f <home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.1)
-CHKJ2885.c.ejb20=CHKJ2885W: \u3053\u306e Bean \u306f <local> \u307e\u305f\u306f <remote> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.6.1)
-CHKJ2880.b.ejb20=CHKJ2880W: \u3053\u306e Bean \u306f <local-home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.1)
-CHKJ2881.b.ejb20=CHKJ2881W: \u3053\u306e Bean \u306f <home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.1)
-CHKJ2882.b.ejb20=CHKJ2882W: \u3053\u306e Bean \u306f <local> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.1)
-CHKJ2883.b.ejb20=CHKJ2883W: \u3053\u306e Bean \u306f <remote> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.1)
-CHKJ2884.b.ejb20=CHKJ2884W: \u3053\u306e Bean \u306f <local-home> \u307e\u305f\u306f <home> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.1)
-CHKJ2885.b.ejb20=CHKJ2885W: \u3053\u306e Bean \u306f <local> \u307e\u305f\u306f <remote> \u3092\u63d0\u4f9b\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 12.2.1)
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} \u306f\u6709\u52b9\u306a Java \u8b58\u5225\u5b50\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.13\u300111.2.6.1)
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} \u306f\u6709\u52b9\u306a Java \u8b58\u5225\u5b50\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.13\u300110.6.14\u300111.2.6.1)
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} \u306f ejb-jar.xml \u30d5\u30a1\u30a4\u30eb\u5185\u3067\u56fa\u6709\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.13\u300110.6.14\u300111.2.2)
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 22.2\u300122.5)
-CHKJ2859.ejb20=CHKJ2859W: \u4e88\u7d04\u6e08\u307f ID {0} \u3092 <ejb-name> \u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.14\u300111.2.6.1)
-CHKJ2860.ejb20=CHKJ2860W: \u4e88\u7d04\u6e08\u307f ID {0} \u3092 <abstract-schema-name> \u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.6.14\u300111.2.6.1)
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} \u306f\u6709\u52b9\u306a Java \u8b58\u5225\u5b50\u3067\u3042\u308a\u3001\u5c0f\u6587\u5b57\u3067\u59cb\u307e\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1\u300111.2.6.1)
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} \u306f\u6709\u52b9\u306a Java \u8b58\u5225\u5b50\u3067\u3042\u308a\u3001\u5c0f\u6587\u5b57\u3067\u59cb\u307e\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1\u300111.2.6.1)
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} \u306b\u306f set \u30e1\u30bd\u30c3\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002(EJB 2.0: 10.3.1\u300110.6.2)
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} \u306b\u306f get \u30e1\u30bd\u30c3\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002(EJB 2.0: 10.3.1\u300110.6.2)
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} \u306b\u306f set \u30e1\u30bd\u30c3\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002(EJB 2.0: 10.3.1\u300110.6.2)
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} \u306b\u306f get \u30e1\u30bd\u30c3\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002(EJB 2.0: 10.3.1\u300110.6.2)
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} \u306f Java \u30d7\u30ea\u30df\u30c6\u30a3\u30d6\u307e\u305f\u306f Java \u9806\u5e8f\u4ed8\u3051\u53ef\u80fd\u30bf\u30a4\u30d7\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.1)
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} \u306f {1} \u30bf\u30a4\u30d7\u307e\u305f\u306f\u305d\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.1)
-
-CHKJ2815.ejb20=CHKJ2815W: \u5f93\u5c5e\u5024\u30af\u30e9\u30b9 {0} \u3092 <cmr-field> \u306b\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.3)
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> \u306f ejb-jar.xml \u5185\u3067\u56fa\u6709\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.2\u300110.3.13\u300122.5)
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> \u306f <ejb-relation> \u5185\u3067\u56fa\u6709\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.2\u300110.3.13\u300122.5)
-CHKJ2818.ejb20=CHKJ2818I: <multiplicity> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "One" \u307e\u305f\u306f "Many"\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.2\u300110.3.13\u300122.5)
-CHKJ2821.ejb20=CHKJ2821I: \u5f79\u5272 {0} \u5185\u306e <relationship-role-source> \u306f\u65e2\u5b58\u306e CMP Bean \u3092\u53c2\u7167\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.2\u300122.5)
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> \u306f "One" \u306e <multiplicity> \u3068\u3068\u3082\u306b\u4f7f\u7528\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.4.2\u300122.5)
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} \u306f {1} \u3067\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.2\u300122.5)
-CHKJ2867.ejb20=CHKJ2867I: \u3053\u306e Bean \u306f\u3001\u4ed6\u306e Bean \u3078\u306e\u5358\u4e00\u65b9\u5411\u306e\u95a2\u4fc2\u3057\u304b\u6301\u3066\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.2)
-CHKJ2868.ejb20=CHKJ2868I: <cmr-field-type> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "java.util.Collection" \u307e\u305f\u306f "java.util.Set" \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.13\u300122.5)
-CHKJ2869.ejb20=CHKJ2869I: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e <ejb-relationship-role> \u304c <cmr-field> \u3092\u5b9a\u7fa9\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.2\u300110.3.13\u300122.5)
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} \u304c\u5b58\u5728\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002(EJB 2.0: 10.3.13)
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} \u306f CMP Bean \u3092\u53c2\u7167\u3057\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 10.3.2\u300110.3.13)
-
-CHKJ2872.ejb20=CHKJ2872E: <cmp-version> \u30a8\u30ec\u30e1\u30f3\u30c8\u306e\u5024\u306f "1.x" \u307e\u305f\u306f "2.x" \u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002(EJB 2.0: 22.5)
-CHKJ2873.ejb20=CHKJ2873W: \u3053\u306e Bean \u306e\u30c7\u30fc\u30bf\u30fb\u30bd\u30fc\u30b9\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092 CMP \u63a5\u7d9a\u30d5\u30a1\u30af\u30c8\u30ea\u30fc\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306b\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-CHKJ2874.ejb20=CHKJ2874W: \u3053\u306e EJB \u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u30fb\u30c7\u30fc\u30bf\u30fb\u30bd\u30fc\u30b9\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u30c7\u30d5\u30a9\u30eb\u30c8 CMP \u63a5\u7d9a\u30d5\u30a1\u30af\u30c8\u30ea\u30fc\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306b\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-
-###########################################################################
-#
-# 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/ejbvalidator_ko.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_ko.properties
deleted file mode 100644
index 5d1facd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_ko.properties
+++ /dev/null
@@ -1,1528 +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={0} \uc720\ud6a8\uc131 \uac80\uc99d.
-
-LOC_CLASS=\ud074\ub798\uc2a4: {0}
-LOC_FIELD=\ud544\ub4dc: {0}, \ud074\ub798\uc2a4: {1}
-LOC_METHOD=\uba54\uc18c\ub4dc: {0}, \ud074\ub798\uc2a4: {1}
-LOC_BEAN=\uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=<method> \uc694\uc18c: {0}
-LOC_METHODPERMISSION=<method-permission> \uc694\uc18c: {0}
-LOC_METHODTRANSACTION=<container-transaction> \uc694\uc18c: {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: EJB \uc720\ud6a8\uc131 \uac80\uc99d\uae30 \uc2e4\ud589 \uc2dc \ub0b4\ubd80 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \uc790\uc138\ud55c \ub0b4\uc6a9\uc740 \ub85c\uadf8\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.
-CHKJ2852=CHKJ2852W: {0} \uc720\ud6a8\uc131\uc744 \uac80\uc99d\ud558\ub294 \ub3d9\uc548 \ub0b4\ubd80 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\uc131 \uac80\uc99d \uc911\uc778 Bean\uc740 {1}\uc785\ub2c8\ub2e4.
-CHKJ2433=CHKJ2433W: {1}\uc774(\uac00) \ubc18\uc601\ub420 \uc218 \uc5c6\uc73c\ubbc0\ub85c {0}\uc744(\ub97c) \uc720\ud6a8\uc131 \uac80\uc99d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2907=CHKJ2907E: \uc720\ud615 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2905=CHKJ2905W: ejb-jar.xml\uc744 \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c EJB \uc720\ud6a8\uc131 \uac80\uc99d\uae30\uac00 \uc2e4\ud589\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc790\uc138\ud55c \uc815\ubcf4\ub294 XML \uc720\ud6a8\uc131 \uac80\uc99d\uae30\ub97c \uc2e4\ud589\ud558\uc2ed\uc2dc\uc624.
-CHKJ2041=CHKJ2041I: \uc601\uad6c \ud074\ub798\uc2a4 \ubc0f \uc778\ud130\ud398\uc774\uc2a4\uac00 \uc774\ub984 \uc9c0\uc815\ub41c \ud328\ud0a4\uc9c0\uc5d0 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. (JLS 2.0: 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: {0}\uc774(\uac00) {2}\uc758 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud558\uac70\ub098 \uc804\uac1c \ucf54\ub4dc\uc5d0 \ucef4\ud30c\uc77c \uc624\ub958\uac00 \uc788\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
-CHKJ2456.m=CHKJ2456W: \uc774 \uba54\uc18c\ub4dc\uac00 {1}\uc758 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud558\uac70\ub098 \uc804\uac1c \ucf54\ub4dc\uc5d0 \ucef4\ud30c\uc77c \uc624\ub958\uac00 \uc788\uc744 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: {0} \ud0a4 \ud074\ub798\uc2a4\ub294 {1} \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: \uc774 \ud074\ub798\uc2a4\ub294 {0}\uc758 \uc77c\uce58\ud558\ub294 ejbPostCreate \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: \uc774 \ud074\ub798\uc2a4\ub294 \uc774 \uba54\uc18c\ub4dc\uc758 \uc77c\uce58\ud558\ub294 ejbPostCreate \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: \uc774 \ud074\ub798\uc2a4\ub294 javax.ejb.SessionSynchronization\uc744 \uad6c\ud604\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.5.3).
-CHKJ2003I.ejb11=CHKJ2003I: Bean \uad00\ub9ac \ud2b8\ub79c\uc7ad\uc158 stateful \uc138\uc158 Bean\uc740 javax.ejb.SessionSynchronization\uc744 \uad6c\ud604\ud560 \ud544\uc694\uac00 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: {1} bean \ud074\ub798\uc2a4\ub294 {0} ejbFind \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: {0} bean \ud074\ub798\uc2a4\ub294 ejbFind \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0}\uc740(\ub294) create \uba54\uc18c\ub4dc \ub610\ub294 find \uba54\uc18c\ub4dc \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: \uba54\uc18c\ub4dc\ub294 create \uba54\uc18c\ub4dc \ub610\ub294 find \uba54\uc18c\ub4dc \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: {0} bean \ud074\ub798\uc2a4\ub294 \uc778\uc218\uac00 \uc5c6\ub294 public \uc0dd\uc131\uc790\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: {0} bean \ud074\ub798\uc2a4\ub294 \uc778\uc218\uac00 \uc5c6\ub294 public \uc0dd\uc131\uc790\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0}\uc740(\ub294) finalize() \uba54\uc18c\ub4dc\ub97c \uc120\uc5b8\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0}\uc740(\ub294) finalize() \uba54\uc18c\ub4dc\ub97c \uc120\uc5b8\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: {0} bean \ud074\ub798\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 ejbCreate \uba54\uc18c\ub4dc\ub97c \ud3ec\ud568\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: {0} bean \ud074\ub798\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 ejbFindByPrimaryKey \uba54\uc18c\ub4dc\ub97c \ud3ec\ud568\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: {0} \ud648 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 create \uba54\uc18c\ub4dc\ub97c \ud3ec\ud568\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: {0} \ud648 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ud558\ub098\uc758 findByPrimaryKey \uba54\uc18c\ub4dc\ub97c \ud3ec\ud568\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: \uc774 \uc720\ud615\uc740 \uc778\ud130\ud398\uc774\uc2a4\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: \uc774 \uc720\ud615\uc740 \uc778\ud130\ud398\uc774\uc2a4\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6).
-CHKJ2012.er.ejb11=CHKJ2012E: \uc774 \uc720\ud615\uc740 \uc778\ud130\ud398\uc774\uc2a4\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: \uc774 \uc720\ud615\uc740 \uc778\ud130\ud398\uc774\uc2a4\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8).
-CHKJ2013.sb.ejb11=CHKJ2013E: {0} bean \ud074\ub798\uc2a4\ub294 {1}\uc744(\ub97c) \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: {0} bean \ud074\ub798\uc2a4\ub294 {1}\uc744(\ub97c) \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.2).
-CHKJ2014.sb.ejb11=CHKJ2014E: {0} bean \ud074\ub798\uc2a4\ub294 abstract\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: {0} bean \ud074\ub798\uc2a4\ub294 abstract\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: {0} bean \ud074\ub798\uc2a4\ub294 final\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: {0} bean \ud074\ub798\uc2a4\ub294 final\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: \uc778\ud130\ud398\uc774\uc2a4\ub294 {0}\uc744(\ub97c) \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: \uc778\ud130\ud398\uc774\uc2a4\ub294 {0}\uc744(\ub97c) \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: \uc778\ud130\ud398\uc774\uc2a4\ub294 {0}\uc744(\ub97c) \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: \uc778\ud130\ud398\uc774\uc2a4\ub294 {0}\uc744(\ub97c) \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: {0} \ud0a4 \ud074\ub798\uc2a4\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.9) (RMI 1.3: 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: {0} \ud0a4 \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: {0} \ud0a4 \ud074\ub798\uc2a4\ub294 public \uae30\ubcf8 \uc0dd\uc131\uc790\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: {0} bean \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: {0} bean \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: {0}\uc740(\ub294) {1} bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: \uc774 \uba54\uc18c\ub4dc\ub294 {0} bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: {0}\uc740(\ub294) {1} bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: \uc774 \uba54\uc18c\ub4dc\ub294 {0} bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. create()\ub9cc\uc774 \uc874\uc7ac\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 1.1: 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: \uc774 \uba54\uc18c\ub4dc\ub294 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. create()\ub9cc\uc774 \uc874\uc7ac\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 1.1: 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0}\uc740(\ub294) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. ejbCreate()\ub9cc\uc774 \uc874\uc7ac\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 1.1: 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: \uc774 \uba54\uc18c\ub4dc\ub294 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. ejbCreate()\ub9cc\uc774 \uc874\uc7ac\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 1.1: 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: Bean \ud074\ub798\uc2a4 {1}\uc774(\uac00) {0}\uc758 \uc77c\uce58\ud558\ub294 ejbCreate \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: Bean \ud074\ub798\uc2a4 {0}\uc774(\uac00) \uc774 \uba54\uc18c\ub4dc\uc758 \uc77c\uce58\ud558\ub294 ejbCreate \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: Bean \ud074\ub798\uc2a4 {1}\uc774(\uac00) {0}\uc758 \uc77c\uce58\ud558\ub294 ejbCreate \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: Bean \ud074\ub798\uc2a4 {0}\uc774(\uac00) \uc774 \uba54\uc18c\ub4dc\uc758 \uc77c\uce58\ud558\ub294 ejbCreate \uba54\uc18c\ub4dc\ub97c \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: \uc77c\uce58\ud558\ub294 ejbCreate \uba54\uc18c\ub4dc\uac00 \uc815\uc758\ub41c \uacbd\uc6b0\ub97c \uc81c\uc678\ud558\uace0\ub294 {0}\uc744(\ub97c) \ud638\ucd9c\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: \uc77c\uce58\ud558\ub294 ejbCreate \uba54\uc18c\ub4dc\uac00 \uc815\uc758\ub41c \uacbd\uc6b0\ub97c \uc81c\uc678\ud558\uace0\ub294 \uc774 \uba54\uc18c\ub4dc\ub97c \ud638\ucd9c\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: {0}\uc740(\ub294) \ud648 \uc778\ud130\ud398\uc774\uc2a4 {1}\uc5d0\uc11c \uc77c\uce58\ud558\ub294 create \uba54\uc18c\ub4dc \uc5c6\uc774 \ud638\ucd9c\ub420 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: \uc774 \uba54\uc18c\ub4dc\ub294 \ud648 \uc778\ud130\ud398\uc774\uc2a4 {0}\uc5d0\uc11c \uc77c\uce58\ud558\ub294 create \uba54\uc18c\ub4dc \uc5c6\uc774 \ud638\ucd9c\ub420 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: {0}\uc740(\ub294) {1} bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 ejbFind \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: \uc774 \uba54\uc18c\ub4dc\ub294 {0} bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 ejbFind \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: Bean \ud074\ub798\uc2a4 {0}\uc740(\ub294) \ucd5c\uc18c\ud55c \ud558\ub098\uc758 \ucee8\ud14c\uc774\ub108 \uad00\ub9ac \ud544\ub4dc\ub97c \uc120\uc5b8\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: setEntityContext(EntityContext ic) \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: unsetEntityContext() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: ejbActivate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: ejbPassivate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: ejbRemove() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: ejbLoad() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: ejbStore() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "\uc774\uac83\uc740" \uba54\uc18c\ub4dc \uc778\uc218\ub098 \uacb0\uacfc\ub85c \uc804\ub2ec\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: \uc5ed\ud560\uc758 \ub05d \ub458 \ub2e4 \ub3d9\uc77c\ud55c \uc218\uc758 \uc18d\uc131\uc744 \uc0ac\uc6a9\ud574\uc57c \ud569\ub2c8\ub2e4.
-CHKJ2101.ejb11=CHKJ2101E: \uc5ed\ud560\uc758 \ub05d \ub458 \ub2e4 \ub3d9\uc77c\ud55c \uc720\ud615\uc744 \uc0ac\uc6a9\ud574\uc57c \ud569\ub2c8\ub2e4.
-CHKJ2102.eh.ejb11=CHKJ2102E: \ud30c\uc778\ub354 \uc124\uba85\uc790 \ub610\ub294 {0} \ud074\ub798\uc2a4\uc758 \uc77c\uce58\ud558\ub294 \uc0ac\uc6a9\uc790 \uc81c\uc5b4 \ud30c\uc778\ub354 \uba54\uc18c\ub4dc\uac00 \uc815\uc758\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-CHKJ2103.ejb11=CHKJ2103E: \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc5d0\uc11c, {0} bean \ud074\ub798\uc2a4\uac00 {1}\uc744(\ub97c) \uacc4\uc2b9\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc5d0\uc11c, {0} \ud648 \uc778\ud130\ud398\uc774\uc2a4\uac00 {1}\uc744(\ub97c) \uacc4\uc2b9\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc5d0\uc11c, {0} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uac00 {1}\uc744(\ub97c) \uacc4\uc2b9\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: Bean {0}\uc740(\ub294)  <prim-key-class>\ub85c {1}\uc744(\ub97c) \uc0ac\uc6a9\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: {0} static \ud544\ub4dc\ub294 final\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: \uc774 static \ud544\ub4dc\ub294 final\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0}\uc740(\ub294) \uc784\uc2dc\uac00 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: \ud544\ub4dc\ub294 \uc784\uc2dc\uac00 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: \ud544\ub4dc {0}\uc758 \ud544\ub4dc \uc720\ud615\uc774 CMP bean\uc5d0 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: \ud544\ub4dc \uc720\ud615\uc774 CMP bean\uc5d0 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: \ud544\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: 1\ucc28 \ud0a4 \ud544\ub4dc {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: 1\ucc28 \ud0a4 \ud544\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0}\uc740(\ub294) {1}\uc758 <cmp-field>\uc5ec\uc57c \ud558\uba70 bean \ud074\ub798\uc2a4 {2}\uc758 \ud544\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: \uc774 \ud544\ub4dc\ub294 {0}\uc758 <cmp-field>\uc5ec\uc57c \ud558\uba70 bean \ud074\ub798\uc2a4 {1}\uc758 \ud544\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: \ud0a4 \ud544\ub4dc {0}\uc740(\ub294) 1\ucc28 \ud0a4 {1}\uc640 \ub3d9\uc77c\ud55c \uc720\ud615\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.1).
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: \uba54\uc18c\ub4dc {0}\uc5d0\uc11c java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: \uba54\uc18c\ub4dc {0}\uc5d0\uc11c java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: {0}\uc5d0\uc11c java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: {0}\uc5d0\uc11c java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: {0}\uc5d0\uc11c java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: {0}\uc5d0\uc11c java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException\uc758 \uc0ac\uc6a9\uc744 \uac70\ubd80\ud588\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0}\uc740(\ub294) {1} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4 \uc720\ud615\uc744 \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10.6).
-CHKJ2402.sh.m.ejb11=CHKJ2402W: \uc774 create \uba54\uc18c\ub4dc\ub294 {0} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4 \uc720\ud615\uc744 \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10.6).
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0}\uc740(\ub294) {1} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4 \uc720\ud615\uc744 \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.8).
-CHKJ2402.eh.m.ejb11=CHKJ2402W: \uc774 create \uba54\uc18c\ub4dc\ub294 {0} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4 \uc720\ud615\uc744 \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.8).
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0}\uc740(\ub294) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: \uba54\uc18c\ub4dc\uac00 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: {0}\uc758 \uc778\uc218 \uc21c\uc11c \ubc0f \uc720\ud615\uc740 {1} \ud0a4 \ud074\ub798\uc2a4\uc758 \ud544\ub4dc \uc21c\uc11c \ubc0f \uc720\ud615\uacfc \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: \uc778\uc218 \uc21c\uc11c \ubc0f \uc720\ud615\uc740 {0} \ud0a4 \ud074\ub798\uc2a4\uc758 \ud544\ub4dc \uc21c\uc11c \ubc0f \uc720\ud615\uacfc \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0}\uc740(\ub294) 1\ucc28 \ud0a4 \uc720\ud615 {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: \uba54\uc18c\ub4dc\ub294 1\ucc28 \ud0a4 \uc720\ud615 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0}\uc740(\ub294) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof \uc911 \ud558\ub098\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof \uc911 \ud558\ub098\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: {0}\uc758 \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: \uba54\uc18c\ub4dc\uc758 \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: {0}\uc758 \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: \uba54\uc18c\ub4dc\uc758 \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0\uc11c \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0\uc11c \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0\uc11c \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0\uc11c \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0\uc11c \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0\uc11c \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: \ub9ac\ud134 \uc720\ud615\uc740 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: {0}\uc758 {1} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: {0} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: {0}\uc758 {1} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: {0} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: {0}\uc758 {1} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: {0} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: {0}\uc758 {1} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: {0} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: {0}\uc758 {1} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: {0} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: {0}\uc758 {1} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: {0} \uc778\uc218\ub294 \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 {2} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {1}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: \ub9ac\ud134 \uc720\ud615\uc740 {1} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {0}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 {2} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {1}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: \ub9ac\ud134 \uc720\ud615\uc740 {1} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {0}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 {2} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {1}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: \ub9ac\ud134 \uc720\ud615\uc740 {1} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {0}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: {0}\uc758 \ub9ac\ud134 \uc720\ud615\uc740 {2} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {1}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: \ub9ac\ud134 \uc720\ud615\uc740 {1} Bean \ud074\ub798\uc2a4\uc5d0\uc11c \uc77c\uce58\ud558\ub294 \uba54\uc18c\ub4dc\uc758 \ub9ac\ud134 \uc720\ud615 {0}\uc640(\uacfc) \uc77c\uce58\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0}\uc740(\ub294) create \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: \uc774 \uba54\uc18c\ub4dc\ub294 create \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1}\uc740(\ub294) {2} \ud648 \uc778\ud130\ud398\uc774\uc2a4\uc5d0\uc11c {0}\uc758 \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0}\uc740(\ub294) {1} \ud648 \uc778\ud130\ud398\uc774\uc2a4\uc5d0\uc11c \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1}\uc740(\ub294) {2} \ud648 \uc778\ud130\ud398\uc774\uc2a4\uc5d0\uc11c {0}\uc758 \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0}\uc740(\ub294) {1} \ud648 \uc778\ud130\ud398\uc774\uc2a4\uc5d0\uc11c \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: {1} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc5d0\uc11c {0}\uc758 \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 {2}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: {0} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: {1} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc5d0\uc11c {0}\uc758 \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 {2}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: {0} \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 \ud574\ub2f9 \uba54\uc18c\ub4dc\uac00 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: <ejb-name> \uc694\uc18c\uc758 \uac12\uc774 \uc9c0\uc815\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: <ejb-class> \ud074\ub798\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: \uc54c \uc218 \uc5c6\ub294 \ud074\ub798\uc2a4\uac00 <ejb-class> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4. (EJB 1.1: 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: <home> \uc778\ud130\ud398\uc774\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: \uc54c \uc218 \uc5c6\ub294 \uc778\ud130\ud398\uc774\uc2a4\uac00 <home> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4. (EJB 1.1: 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: <remote> \uc778\ud130\ud398\uc774\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: \uc54c \uc218 \uc5c6\ub294 \uc778\ud130\ud398\uc774\uc2a4\uac00 <remote> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4. (EJB 1.1: 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2806E: <reentrant> \uc694\uc18c\uc758 \uac12\uc740 "True" \ub610\ub294 "False" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: <session-type> \uc694\uc18c\uc758 \uac12\uc740 "Stateful" \ub610\ub294 "Stateless" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: <transaction-type> \uc694\uc18c\uc758 \uac12\uc740 "Container" \ub610\ub294 "Bean" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: <persistence-type> \uc694\uc18c\uc758 \uac12\uc740 "Container" \ub610\ub294 "Bean" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4.  (EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: <prim-key-class> \ud074\ub798\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: \uc54c \uc218 \uc5c6\ub294 \ud074\ub798\uc2a4\uac00 <prim-key-class> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4.  (EJB 1.1: 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> {0}\uc744(\ub97c) Bean \ud074\ub798\uc2a4 {1}\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 16.5).
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field>\ub294 <field-name>\uc744(\ub97c) \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 16.5).
-CHKJ2812.ejb11=CHKJ2812E: Bean \ud074\ub798\uc2a4 {0}\uc740(\ub294) \uad00\ub828 \ud544\ub4dc \uc911 \ucd5c\uc18c\ud55c \ud558\ub098\ub97c <cmp-field>\ub85c \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W: <method>\uc5d0\uc11c <ejb-name>\uc740 \uc54c \uc218 \uc788\ub294 \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc744 \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: \ubcf4\uc548 \uc5ed\ud560 \ucc38\uc870\uac00 \uc624\uc9c1 \ud55c \ubc88 \uc815\uc758\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-CHKJ2822.ejb11=CHKJ2822W: bean {0}\uc758 <security-role-ref>\uac00 <role-name> \uc694\uc18c\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: <security-role-ref> \uc694\uc18c\uac00 <role-link> \uc694\uc18c\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: <security-role-ref> \uc694\uc18c\uac00 \uc54c \uc218 \uc5c6\ub294 \uc5ed\ud560 {0}\uc744(\ub97c) \ub098\ud0c0\ub0c5\ub2c8\ub2e4. (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: ejb-jar.xml\uc758 <security-role> \uc694\uc18c\uac00 <role-name> \uc694\uc18c\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: security-role \uc774\ub984\uc740 \uace0\uc720\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: <security-role> \uc694\uc18c \uc5c6\uc774 <role-link> \uc694\uc18c\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: \uae30\ubcf8 1\ucc28 \ud0a4 \uc5c6\uc774 <primkey-field> \uc694\uc18c\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: \ud0a4 \ud074\ub798\uc2a4 {0}\uc740(\ub294) \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean {1}\uc5d0\uc11c \uc784\uc758 \ud544\ub4dc\ub85c \ub9f5\ud551\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: {0} \ud544\ub4dc\uc758 \uc720\ud615\uc744 \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2831.ejb11=CHKJ2831W: {0}\uc744(\ub97c) <cmp-field> \uc694\uc18c\uc5d0\uc11c \uc120\uc5b8\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: <ejb-ref> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub41c {0} \ud648\uc744 EJB \ubaa8\ub4c8\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=HKJ2I322: <ejb-ref> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub41c \uc6d0\uaca9 {0}\uc744(\ub97c) EJB \ubaa8\ub4c8\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: <ejb-ref> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub41c {0} Bean\uc744 EJB \ubaa8\ub4c8\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Bean {0}\uc740(\ub294) {1} \uc720\ud615\uc785\ub2c8\ub2e4. <ejb-ref> \uc694\uc18c \uc911 <ejb-ref-type> \uc694\uc18c\ub97c \uac31\uc2e0\ud558\uc2ed\uc2dc\uc624. (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Bean {0}\uc740(\ub294) \ud648 {1}\uc744(\ub97c) \uc0ac\uc6a9\ud569\ub2c8\ub2e4. <ejb-ref> \uc694\uc18c \uc911 <ejb-ref> \uc694\uc18c\ub97c \uac31\uc2e0\ud558\uc2ed\uc2dc\uc624. (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I: Bean {0}\uc740(\ub294) \uc6d0\uaca9 {1}\uc744(\ub97c) \uc0ac\uc6a9\ud569\ub2c8\ub2e4. <ejb-ref> \uc694\uc18c \uc911 <ejb-ref> \uc694\uc18c\ub97c \uac31\uc2e0\ud558\uc2ed\uc2dc\uc624. (EJB 1.1: 14.3.2).
-CHKJ2838.ejb11=CHKJ2838I: \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc5d0 \ub300\ud55c \ubaa8\ub4e0 \ucc38\uc870\uac00 "ejb" \uc11c\ube0c\ucee8\ud14d\uc2a4\ud2b8\uc5d0\uc11c \uad6c\uc131\ub418\ub294 \uac83\uc774 \uc88b\uc2b5\ub2c8\ub2e4. (EJB 1.1: 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: <env-entry> \uc694\uc18c \uc911 <env-entry-name> \uc694\uc18c\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: <env-entry> \uc694\uc18c \uc911 <env-entry-type> \uc694\uc18c\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: <env-entry-name> \uc694\uc18c\uc758 {0} \uc774\ub984\uc740 Bean\uc5d0\uc11c \uc624\uc9c1 \ud55c \ubc88\ub9cc \uc0ac\uc6a9\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4. (EJB 1.1: 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: <method-name>\uc774 "*"\uc778 \uacbd\uc6b0 <method-params>\ub294 \ubb34\uc2dc\ub429\ub2c8\ub2e4. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: {0}\uc758 \uc5b4\ub5a4 \uba54\uc18c\ub4dc\ub3c4 \uc774 <method>\uc640 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 <method>\ub97c <method-permission>\uc5d0 \uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 <role-name>\uc744 <method-permission>\uc5d0 \uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: \uc774 <method-permission>\uc758 \uc5b4\ub5a4 \uba54\uc18c\ub4dc\ub3c4 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 15.3.2).
-CHKJ2847.ejb11=CHKJ2847W: \uc774 <container-transaction>\uc758 \uc5b4\ub5a4 \uba54\uc18c\ub4dc\ub3c4 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 1.1: 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: {1} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c {0}\uc758 \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc744 \uc720\ud6a8\uc131 \uac80\uc99d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2850.ejb11=CHKJ2850W: {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c <method>\ub97c \uc720\ud6a8\uc131 \uac80\uc99d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2851.ejb11=CHKJ2851W: {1} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c {0}\uc744(\ub97c) \uc720\ud6a8\uc131 \uac80\uc99d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2852.ejb11=CHKJ2852W: ejb-jar.xml\uc744 \uc720\ud6a8\uc131 \uac80\uc99d\ud558\ub294 \ub3d9\uc548 throwable\uc744 \ubc1c\uacac\ud588\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\uc131 \uac80\uc99d \uc911\uc778 Bean\uc740 {0}\uc785\ub2c8\ub2e4.
-CHKJ2853.ejb11=CHKJ2853W: ibm-ejb-jar-ext.xmi\ub97c \uc720\ud6a8\uc131 \uac80\uc99d\ud558\ub294 \ub3d9\uc548 throwable\uc744 \ubc1c\uacac\ud588\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\uc131 \uac80\uc99d \uc911\uc778 Bean\uc740 {0}\uc785\ub2c8\ub2e4.
-
-CHKJ2908.ejb11=CHKJ2908W: \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc744 \uc81c\ub300\ub85c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc790\uc138\ud55c \uc815\ubcf4\ub294 XML \uc720\ud6a8\uc131 \uac80\uc99d\uae30\ub97c \uc2e4\ud589\ud558\uc2ed\uc2dc\uc624.
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0}\uc740(\ub294) ejb-jar.xml \ud30c\uc77c(EJB 1.1: 16.5)\uc5d0\uc11c \uace0\uc720\ud574\uc57c \ud569\ub2c8\ub2e4.
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0}\uc740(\ub294) \uc774 EIB \ubaa8\ub4c8\uc744 \ud3ec\ud568\ud558\ub294 \ubaa8\ub4e0 EAR \ud30c\uc77c\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(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: \uae30\ubcf8 1\ucc28 \ud0a4 \uc5c6\uc774 <primkey-field>\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: \ud0a4 \ud074\ub798\uc2a4 {0}\uc740(\ub294) \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean {1}\uc5d0\uc11c \uc784\uc758 \ud544\ub4dc\ub85c \ub9f5\ud551\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 2.0: 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: <env-entry> \uc694\uc18c \uc911 <env-entry-name> \uc694\uc18c\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 2.0: 20.2.1.2).
-CHKJ2840.ejb20=CHKJ2840W: <env-entry> \uc694\uc18c \uc911 <env-entry-type> \uc694\uc18c\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 2.0: 20.2.1.2).
-CHKJ2841.ejb20=CHKJ2841W: <env-entry-name> \uc694\uc18c\uc758 {0} \uc774\ub984\uc740 Bean\uc5d0\uc11c \uc624\uc9c1 \ud55c \ubc88\ub9cc \uc0ac\uc6a9\ub420 \uc218 \uc788\uc2b5\ub2c8\ub2e4. (EJB 2.0: 20.2.1.2).
-CHKJ2830.ejb20=CHKJ2830W: {0} \ud544\ub4dc\uc758 \uc720\ud615\uc744 \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2831.ejb20=CHKJ2831W: {0}\uc744(\ub97c) <cmp-field> \uc694\uc18c\uc5d0\uc11c \uc120\uc5b8\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 10.8.2).
-CHKJ2801.ejb20=CHKJ2801E: <ejb-name> \uc694\uc18c\uc758 \uac12\uc774 \uc9c0\uc815\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: <persistence-type> \uc694\uc18c\uc758 \uac12\uc740 "Container" \ub610\ub294 "Bean" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4.  (EJB 2.0: 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2806E: <reentrant> \uc694\uc18c\uc758 \uac12\uc740 "True" \ub610\ub294 "False" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: <session-type> \uc694\uc18c\uc758 \uac12\uc740 "Stateful" \ub610\ub294 "Stateless" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: <transaction-type> \uc694\uc18c\uc758 \uac12\uc740 "Container" \ub610\ub294 "Bean" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814W: <method>\uc5d0\uc11c <ejb-name>\uc740 \uc54c \uc218 \uc788\ub294 \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc744 \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: <method-name>\uc774 "*"\uc778 \uacbd\uc6b0 <method-params>\ub294 \ubb34\uc2dc\ub429\ub2c8\ub2e4. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: {0}\uc758 \uc5b4\ub5a4 \uba54\uc18c\ub4dc\ub3c4 \uc774 <method>\uc640 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 <method>\ub97c <method-permission>\uc5d0 \uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: <role-name> \ub610\ub294 <unchecked> \uc694\uc18c\ub97c <method-permission>\uc5d0 \uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: \uc774 <method-permission>\uc758 \uc5b4\ub5a4 \uba54\uc18c\ub4dc\ub3c4 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 21.3.2).
-CHKJ2847.ejb20=CHKJ2847W: \uc774 <container-transaction>\uc758 \uc5b4\ub5a4 \uba54\uc18c\ub4dc\ub3c4 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 17.4.1).
-CHKJ2812.ejb20=CHKJ2812E: Bean \ud074\ub798\uc2a4 {0}\uc740(\ub294) \uad00\ub828 \ud544\ub4dc \uc911 \ucd5c\uc18c\ud55c \ud558\ub098\ub97c <cmp-field>\ub85c \uc9c0\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 22.5).
-CHKJ2832.ejb20=CHKJ2832I: <ejb-ref> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub41c {0} \ud648\uc744 EJB \ubaa8\ub4c8\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 20.3.1.2).
-CHKJ2833.ejb20=HKJ2I322: <ejb-ref> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub41c \uc6d0\uaca9 {0}\uc744(\ub97c) EJB \ubaa8\ub4c8\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 20.3.1.2).
-CHKJ2834.ejb20=CHKJ2834I: <ejb-ref> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub41c {0} Bean\uc744 EJB \ubaa8\ub4c8\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 20.3.2).
-CHKJ2835.ejb20=CHKJ2835I: Bean {0}\uc740(\ub294) {1} \uc720\ud615\uc785\ub2c8\ub2e4. <ejb-ref> \uc694\uc18c \uc911 <ejb-ref-type> \uc694\uc18c\ub97c \uac31\uc2e0\ud558\uc2ed\uc2dc\uc624. (EJB 2.0: 20.3.2).
-CHKJ2836.ejb20=CHKJ2836I: Bean {0}\uc740(\ub294) \ud648 {1}\uc744(\ub97c) \uc0ac\uc6a9\ud569\ub2c8\ub2e4. <ejb-ref> \uc694\uc18c \uc911 <ejb-ref> \uc694\uc18c\ub97c \uac31\uc2e0\ud558\uc2ed\uc2dc\uc624. (EJB 2.0: 20.3.2).
-CHKJ2837.ejb20=CHKJ2837I: Bean {0}\uc740(\ub294) \uc6d0\uaca9 {1}\uc744(\ub97c) \uc0ac\uc6a9\ud569\ub2c8\ub2e4. <ejb-ref> \uc694\uc18c \uc911 <ejb-ref> \uc694\uc18c\ub97c \uac31\uc2e0\ud558\uc2ed\uc2dc\uc624. (EJB 2.0: 20.3.2).
-CHKJ2838.ejb20=CHKJ2838I: \uc5d4\ud130\ud504\ub77c\uc774\uc988 Bean\uc5d0 \ub300\ud55c \ubaa8\ub4e0 \ucc38\uc870\uac00 "ejb" \uc11c\ube0c\ucee8\ud14d\uc2a4\ud2b8\uc5d0\uc11c \uad6c\uc131\ub418\ub294 \uac83\uc774 \uc88b\uc2b5\ub2c8\ub2e4. (EJB 2.0: 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: \ubcf4\uc548 \uc5ed\ud560 \ucc38\uc870\uac00 \ub450 \ubc88 \uc774\uc0c1 \uc815\uc758\ub429\ub2c8\ub2e4.
-CHKJ2822.ejb20=CHKJ2822W: bean {0}\uc758 <security-role-ref>\uac00 <role-name> \uc694\uc18c\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 21.2.5.3).
-CHKJ2823.ejb20=CHKJ2823W: <security-role-ref> \uc694\uc18c\uac00 <role-link> \uc694\uc18c\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 21.3.3).
-CHKJ2824.ejb20=CHKJ2824W: <security-role-ref> \uc694\uc18c\uac00 \uc54c \uc218 \uc5c6\ub294 \uc5ed\ud560 {0}\uc744(\ub97c) \ub098\ud0c0\ub0c5\ub2c8\ub2e4. (EJB 2.0: 21.3.3).
-CHKJ2825.ejb20=CHKJ2825W: ejb-jar.xml\uc758 <security-role> \uc694\uc18c\uac00 <role-name> \uc694\uc18c\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 21.3.1).
-CHKJ2826.ejb20=CHKJ2826W: security-role \uc774\ub984\uc740 \uace0\uc720\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: 21.3.1).
-CHKJ2827.ejb20=CHKJ2827W: <security-role> \uc694\uc18c \uc5c6\uc774 <role-link> \uc694\uc18c\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: {0} \uc720\ud615\uc744 \ubc18\uc601\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c <method>\ub97c \uc720\ud6a8\uc131 \uac80\uc99d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2851.ejb20=CHKJ2851W: {1} \uc720\ud615\uc744 \ubc18\uc601\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c {0}\uc744(\ub97c) \uc720\ud6a8\uc131 \uac80\uc99d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0}\uc740(\ub294) \uc774 EIB \ubaa8\ub4c8\uc744 \ud3ec\ud568\ud558\ub294 \ubaa8\ub4e0 EAR \ud30c\uc77c\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: \uc774 \ud074\ub798\uc2a4\ub294 javax.ejb.SessionSynchronization\uc744 \uad6c\ud604\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4 (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: Bean \uad00\ub9ac \ud2b8\ub79c\uc7ad\uc158 stateful \uc138\uc158 Bean\uc740 javax.ejb.SessionSynchronization\uc744 \uad6c\ud604\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4 (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: <ejb-class> \ud074\ub798\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: <ejb-class> \uc694\uc18c\ub85c \uc2dd\ubcc4\ub41c Bean \ud074\ub798\uc2a4\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: <home> \uc778\ud130\ud398\uc774\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: \uc54c \uc218 \uc5c6\ub294 \uc778\ud130\ud398\uc774\uc2a4\uac00 <home> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4. (EJB 2.0: 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: <remote> \uc778\ud130\ud398\uc774\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: \uc54c \uc218 \uc5c6\ub294 \uc778\ud130\ud398\uc774\uc2a4\uac00 <remote> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4. (EJB 2.0: 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: <local-home> \uc778\ud130\ud398\uc774\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: \uc54c \uc218 \uc5c6\ub294 \uc778\ud130\ud398\uc774\uc2a4\uac00 <local-home> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4. (EJB 2.0: 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: <local> \uc778\ud130\ud398\uc774\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: \uc54c \uc218 \uc5c6\ub294 \uc778\ud130\ud398\uc774\uc2a4\uac00 <local> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4. (EJB 2.0: 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: <prim-key-class> \ud074\ub798\uc2a4 {0} \ub610\ub294 \uad00\ub828 \uc218\ud37c\uc720\ud615 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: \uc54c \uc218 \uc5c6\ub294 \ud074\ub798\uc2a4\uac00 <prim-key-class> \uc694\uc18c\uc5d0 \uc9c0\uc815\ub418\uc5c8\uc2b5\ub2c8\ub2e4.  (EJB 2.0: 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: <field-name> {0}\uc744(\ub97c) Bean \ud074\ub798\uc2a4 {1}\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. (EJB 2.0: 22.5).
-
-CHKJ2103.ejb20=CHKJ2103E: \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc5d0\uc11c, {0} Bean \ud074\ub798\uc2a4\uac00 {1}\uc744(\ub97c) \uacc4\uc2b9\ud574\uc57c \ud569\ub2c8\ub2e4 (EJB 2.0:D.2)
-CHKJ2104.ejb20=CHKJ2104E: \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc5d0\uc11c, {0} \ud648 \uc778\ud130\ud398\uc774\uc2a4\uac00 {1}\uc744(\ub97c) \uacc4\uc2b9\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: D.2).
-CHKJ2105.ejb20=CHKJ2105E: \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc5d0\uc11c, {0} \uad6c\uc131\uc694\uc18c \uc778\ud130\ud398\uc774\uc2a4\uac00 {1}\uc744(\ub97c) \uacc4\uc2b9\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: D.2).
-CHKJ2106.ejb20=CHKJ2106E:  Bean {0}\uc740(\ub294) <prim-key-class>\ub85c {1}\uc744(\ub97c) \uc0ac\uc6a9\ud574\uc57c \ud569\ub2c8\ub2e4. (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: {1} \ub610\ub294 \uad00\ub828 \uc885\uc18d\uc131 \uc911 \ud558\ub098\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc73c\ubbc0\ub85c {0}\uc758 \uad6c\uc131\uc694\uc18c \uacc4\uc2b9\uc744 \uc720\ud6a8\uc131 \uac80\uc99d\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ud074\ub798\uc2a4 \uacbd\ub85c\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0}\uc740(\ub294) ejb-jar.xml \ud30c\uc77c(EJB 210 225)\uc5d0\uc11c \uace0\uc720\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: \uc774 \ud074\ub798\uc2a4\ub294 {0}\uc744(\ub97c) \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: \uc774 \ud074\ub798\uc2a4\ub294 {0}\uc744(\ub97c) \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: \uc774 \ud074\ub798\uc2a4\ub294 {0}\uc744(\ub97c) \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: \uc774 \ud074\ub798\uc2a4\ub294 {0}\uc744(\ub97c) \uad6c\ud604\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBHome\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBHome\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBHome\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBLocalHome\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBLocalHome\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBLocalHome\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBObject\ub97c \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBObject\ub97c \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBObject\ub97c \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBLocalObject\ub97c \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBLocalObject\ub97c \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 javax.ejb.EJBLocalObject\ub97c \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "\uc774\uac83\uc740" \uba54\uc18c\ub4dc \uc778\uc218\ub098 \uacb0\uacfc\ub85c \uc804\ub2ec\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "\uc774\uac83\uc740" \uba54\uc18c\ub4dc \uc778\uc218\ub098 \uacb0\uacfc\ub85c \uc804\ub2ec\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "\uc774\uac83\uc740" \uba54\uc18c\ub4dc \uc778\uc218\ub098 \uacb0\uacfc\ub85c \uc804\ub2ec\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: \uc774 \ud074\ub798\uc2a4\ub294 abstract\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: \uc774 \ud074\ub798\uc2a4\ub294 abstract\uac00 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: \uc774 \ud074\ub798\uc2a4\ub294 abstract\uac00 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: \uc774 \ud074\ub798\uc2a4\ub294 abstract\uac00 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: \uc774 \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: \uc774 \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: \uc774 \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: \uc774 \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: \uc774 \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: \uc774 \ud074\ub798\uc2a4\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: \uc774 \ud074\ub798\uc2a4\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: \uc774 \ud074\ub798\uc2a4\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: \uc774 \ud074\ub798\uc2a4\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: \uc774 \ud074\ub798\uc2a4\ub294 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: \uc774 \ud074\ub798\uc2a4\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: \uc774 \ud074\ub798\uc2a4\ub294 abstract\uac00 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: \uc774 \ud074\ub798\uc2a4\ub294 RMI-IIOP\uc5d0\uc11c \ubc95\uc801 \uac12 \uc720\ud615\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: \uc774 \ud074\ub798\uc2a4\ub294 RMI-IIOP\uc5d0\uc11c \ubc95\uc801 \uac12 \uc720\ud615\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(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}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: public {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: public {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: public {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: public {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: \uc774 \ud074\ub798\uc2a4\ub294 {0}\uc744(\ub97c) \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message)\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 ejbCreate \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: ejbCreate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: ejbCreate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: ejbFindByPrimaryKey \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: setEntityContext(EntityContext) \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: setEntityContext(EntityContext) \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: unsetEntityContext() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: unsetEntityContext() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: ejbActivate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: ejbActivate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: ejbPassivate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: ejbPassivate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: ejbPassivate() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: ejbRemove() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: ejbRemove() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: ejbRemove() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: ejbRemove() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: ejbLoad() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: ejbLoad() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: ejbStore() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: ejbStore() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: create() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: create() \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 create \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 create \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 finder \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 finder \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 finder \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 finder \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 \ud648 \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 \ud648 \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 \ud648 \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 \ud648 \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: \uc774 \ud074\ub798\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 ejbHome \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: \uc774 \ud074\ub798\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 ejbHome \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: \uc774 \ud074\ub798\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 ejbHome \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: \uc774 \ud074\ub798\uc2a4\ub294 \ucd5c\uc18c\ud55c \ud558\ub098\uc758 ejbHome \uba54\uc18c\ub4dc\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode()\uac00 \uc774 \ud074\ub798\uc2a4\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode()\uac00 \uc774 \ud074\ub798\uc2a4\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object)\uac00 \uc774 \ud074\ub798\uc2a4\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object)\uac00 \uc774 \ud074\ub798\uc2a4\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: ejbSelect \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey\uac00 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: {0}\uc758 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678 {1}\uc774(\uac00) java.lang.Exception\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678 {0}\uc774(\uac00) java.lang.Exception\uc744 \ud655\uc7a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: {0}\uc758 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678 {1}\uc774(\uac00) java.lang.RuntimeException\uc744 \ud655\uc7a5\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678 {0}\uc774(\uac00) java.lang.RuntimeException\uc744 \ud655\uc7a5\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {1}\uc758 {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: \uc774 \uba54\uc18c\ub4dc\uac00 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {1}\uc758 {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: \uc774 \uba54\uc18c\ub4dc\uac00 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {1}\uc758 {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: \uc774 \uba54\uc18c\ub4dc\uac00 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {1}\uc758 {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: \uc774 \uba54\uc18c\ub4dc\uac00 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: \uc774 \uba54\uc18c\ub4dc\uac00 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: \uc774 \uba54\uc18c\ub4dc\uac00 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: \uc774 \uba54\uc18c\ub4dc\uac00 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: \uc774 \uba54\uc18c\ub4dc\uac00 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0}\uc740(\ub294) javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0}\uc740(\ub294) \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678\ub97c \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: \uc774 \uba54\uc18c\ub4dc\ub294 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678\ub97c \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0}\uc740(\ub294) \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678\ub97c \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: \uc774 \uba54\uc18c\ub4dc\ub294 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678\ub97c \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0}\uc740(\ub294) \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678\ub97c \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: \uc774 \uba54\uc18c\ub4dc\ub294 \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc608\uc678\ub97c \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(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}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0}\uc740(\ub294) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0}\uc740(\ub294) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 2.3.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: \ud638\ucd9c\ub418\ub294 {0}\uc5d0 \ub300\ud574 {1}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: \ud638\ucd9c\ub418\ub294 {0}\uc5d0 \ub300\ud574 {1}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: \ud638\ucd9c\ub418\ub294 \uc774 \uba54\uc18c\ub4dc\uc5d0 \ub300\ud574 {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: \ud638\ucd9c\ub418\ub294 \uc774 \uba54\uc18c\ub4dc\uc5d0 \ub300\ud574 {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.  (EJB 2.0: 12.2.6).
-CHKJ2431.cb.m.ejb20=CHKJ2431W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.  (EJB 2.0: 12.2.6).
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {1}\uc758 {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0}\uc740(\ub294) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0}\uc774(\uac00) ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: \uc774 \uba54\uc18c\ub4dc\uac00 ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. \ucee8\ud14c\uc774\ub108\ub294 \uc774 \uba54\uc18c\ub4dc \uad6c\ud604\uc744 \uc81c\uacf5\ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\ub294 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. \ucee8\ud14c\uc774\ub108\ub294 \uc774 \uba54\uc18c\ub4dc \uad6c\ud604\uc744 \uc81c\uacf5\ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. CMP bean\ub9cc\uc774 ejbSelect \uba54\uc18c\ub4dc\ub97c \uac00\uc9c8 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\ub294 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. CMP bean\ub9cc\uc774 ejbSelect \uba54\uc18c\ub4dc\ub97c \uac00\uc9c8 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. CMP bean\ub9cc\uc774 ejbSelect \uba54\uc18c\ub4dc\ub97c \uac00\uc9c8 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\ub294 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. CMP bean\ub9cc\uc774 ejbSelect \uba54\uc18c\ub4dc\ub97c \uac00\uc9c8 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. CMP bean\ub9cc\uc774 ejbSelect \uba54\uc18c\ub4dc\ub97c \uac00\uc9c8 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\ub294 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4. CMP bean\ub9cc\uc774 ejbSelect \uba54\uc18c\ub4dc\ub97c \uac00\uc9c8 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize()\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize()\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize()\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize()\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0}\uc774(\uac00) \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: \uc774 \uba54\uc18c\ub4dc\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "ejb"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-CHKJ2441.sb.m.ejb20=HKJ24551: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2441.cb.m.ejb20=HKJ24551: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2441.bb.m.ejb20=HKJ24551: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0}\uc774(\uac00) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: \uc774 \uba54\uc18c\ub4dc\uac00 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: \uc774 \uba54\uc18c\ub4dc\uac00 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: \uc774 \uba54\uc18c\ub4dc\uac00 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: \uc774 \uba54\uc18c\ub4dc\uac00 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: \uc774 \uba54\uc18c\ub4dc\uac00 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: \uc774 \uba54\uc18c\ub4dc\uac00 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0}\uc740(\ub294) final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: \uc774 \uba54\uc18c\ub4dc\ub294 final\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0}\uc774(\uac00) static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: \uc774 \uba54\uc18c\ub4dc\ub294 static\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0}\uc740(\ub294) void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: \uc774 \uba54\uc18c\ub4dc\ub294 void\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: \uc774 \uba54\uc18c\ub4dc\uac00 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0}\uc774(\uac00) abstract\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: \uc774 \uba54\uc18c\ub4dc\uac00 abstract\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0}\uc774(\uac00) \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: \uc774 \uba54\uc18c\ub4dc\ub294 \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0}\uc774(\uac00) \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: \uc774 \uba54\uc18c\ub4dc\ub294 \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 RMI-IIOP \uaddc\uce59\uc744 \ub530\ub77c\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 RMI-IIOP \uaddc\uce59\uc744 \ub530\ub77c\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 RMI-IIOP \uaddc\uce59\uc744 \ub530\ub77c\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "create"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "find"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: \uba54\uc18c\ub4dc {0}\uc758 \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: \uc774 \uba54\uc18c\ub4dc \uc774\ub984\uc740 "remove"\ub85c \uc2dc\uc791\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 12.2.1, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 12.2.1, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 12.2.1, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 12.2.1, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0}\uc774(\uac00) javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0}\uc774(\uac00) javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0}\uc774(\uac00) javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0}\uc774(\uac00) javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0}\uc774(\uac00) javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0}\uc774(\uac00) javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.CreateException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0}\uc774(\uac00) create() \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0}\uc774(\uac00) create() \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: \uc774 \uba54\uc18c\ub4dc\ub294 create() \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: \uc774 \uba54\uc18c\ub4dc\ub294 create() \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0}\uc774(\uac00) create() \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: \uc774 \uba54\uc18c\ub4dc\ub294 create() \uba54\uc18c\ub4dc\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: {0} \uc77c\uce58 \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: {0} \uc77c\uce58 \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: {0} \uc77c\uce58 \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: {0} \uc77c\uce58 \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: {0} \uc77c\uce58 \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: {0} \uc77c\uce58 \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0}\uc774(\uac00) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0}\uc774(\uac00) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: {0}\uc758 {1} \uc77c\uce58 \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: {0} \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: {0} \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: {0} \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: {0} \uba54\uc18c\ub4dc\ub294 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.1, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0}\uc774(\uac00) javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0}\uc774(\uac00) javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0}\uc774(\uac00) javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0}\uc774(\uac00) javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0}\uc774(\uac00) ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: \uc774 \uba54\uc18c\ub4dc\uac00 ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0}\uc774(\uac00) ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: \uc774 \uba54\uc18c\ub4dc\uac00 ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0}\uc774(\uac00) ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: \uc774 \uba54\uc18c\ub4dc\uac00 ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0}\uc774(\uac00) ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: \uc774 \uba54\uc18c\ub4dc\uac00 ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0}\uc774(\uac00) ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: \uc774 \uba54\uc18c\ub4dc\uac00 ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0}\uc774(\uac00) ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: \uc774 \uba54\uc18c\ub4dc\uac00 ObjectNotFoundException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0}\uc774(\uac00) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0}\uc774(\uac00) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0}\uc774(\uac00) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0}\uc774(\uac00) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1}\uc774(\uac00) {0}\uc758 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1}\uc774(\uac00) {0}\uc758 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0}\uc774(\uac00) {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0}\uc774(\uac00) {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1}\uc774(\uac00) {0}\uc758 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1}\uc774(\uac00) {0}\uc758 {2}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0}\uc774(\uac00) {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0}\uc774(\uac00) {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0}\uc774(\uac00) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0}\uc774(\uac00) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0}\uc774(\uac00) ejb-jar.xml\uc758 \uc870\ud68c \uc694\uc18c\uc640 \uc5f0\uad00\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: \uc774 \uba54\uc18c\ub4dc\ub294 ejb-jar.xml\uc758 \uc870\ud68c \uc694\uc18c\uc640 \uc5f0\uad00\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0}\uc774(\uac00) ejb-jar.xml\uc758 \uc870\ud68c \uc694\uc18c\uc640 \uc5f0\uad00\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: \uc774 \uba54\uc18c\ub4dc\ub294 ejb-jar.xml\uc758 \uc870\ud68c \uc694\uc18c\uc640 \uc5f0\uad00\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.6, 10.6.14).
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0}\uc740(\ub294) java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: \uc774 \uba54\uc18c\ub4dc\ub294 java.rmi.RemoteException\uc744 \ucc98\ub9ac\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0}\uc774(\uac00) {2}\uc758 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0}\uc774(\uac00) {2}\uc758 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0}\uc774(\uac00) {2}\uc758 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0}\uc774(\uac00) {2}\uc758 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0}\uc774(\uac00) {2}\uc758 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0}\uc774(\uac00) {2}\uc758 {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: \uc774 \uba54\uc18c\ub4dc\ub294 {1}\uc758 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: \uc774 \uba54\uc18c\ub4dc\ub294 {1}\uc758 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: \uc774 \uba54\uc18c\ub4dc\ub294 {1}\uc758 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: \uc774 \uba54\uc18c\ub4dc\ub294 {1}\uc758 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: \uc774 \uba54\uc18c\ub4dc\ub294 {1}\uc758 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: \uc774 \uba54\uc18c\ub4dc\ub294 {1}\uc758 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0}\uc774(\uac00) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0}\uc774(\uac00) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0}\uc774(\uac00) {1} \uc720\ud615\uc744 \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0}\uc774(\uac00) {1} \uc720\ud615\uc744 \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0}\uc774(\uac00) {1} \uc720\ud615\uc744 \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \uc720\ud615\uc744 \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \uc720\ud615\uc744 \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \uc720\ud615\uc744 \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 RMI-IIOP \uaddc\uce59\uc744 \ub530\ub77c\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 RMI-IIOP \uaddc\uce59\uc744 \ub530\ub77c\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: \uc774 \uc778\ud130\ud398\uc774\uc2a4\ub294 \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uc758 RMI-IIOP \uaddc\uce59\uc744 \ub530\ub77c\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {1}\uc758 {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {1}\uc758 {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {1}\uc758 {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: \uba54\uc18c\ub4dc {0}\uc740(\ub294) \ub7f0\ud0c0\uc784\uc5d0 \uc77c\ub828\ud654 \uac00\ub2a5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: \uba54\uc18c\ub4dc {0}\uc758 {1}\uc740(\ub294) \uc778\uc218\uc774\uac70\ub098 \uacb0\uacfc \uc720\ud615\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(EJB 2.0: 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0}\uc740(\ub294) \uc778\uc218 \ub610\ub294 \uacb0\uacfc\ub85c\uc11c {1}\uc744(\ub97c) \ud328\uc2a4\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0}\uc740(\ub294) \uc778\uc218 \ub610\ub294 \uacb0\uacfc\ub85c\uc11c {1}\uc744(\ub97c) \ud328\uc2a4\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: \uc774 \uba54\uc18c\ub4dc\ub294 \uc778\uc218 \ub610\ub294 \uacb0\uacfc\ub85c\uc11c {0}\uc744(\ub97c) \ud328\uc2a4\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: \uc774 \uba54\uc18c\ub4dc\ub294 \uc778\uc218 \ub610\ub294 \uacb0\uacfc\ub85c\uc11c {0}\uc744(\ub97c) \ud328\uc2a4\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0}\uc740(\ub294) \uc778\uc218\uc774\uac70\ub098 \uacb0\uacfc \uc720\ud615\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(EJB 2.0: 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub178\ucd9c\uc2dc\ud0a4\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0}\uc774(\uac00) \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: \uc774 \uba54\uc18c\ub4dc\uac00 \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0}\uc774(\uac00) abstract\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: \uc774 \uba54\uc18c\ub4dc\ub294 abstract\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0}\uc774(\uac00) public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: \uc774 \uba54\uc18c\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0}\uc740(\ub294) javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: \uc774 \uba54\uc18c\ub4dc\ub294 javax.ejb.FinderException\uc744 \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0}\uc740(\ub294) {1} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: \uc774 \uba54\uc18c\ub4dc\ub294 {0} \ub610\ub294 \ucf5c\ub809\uc158 thereof\ub97c \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0}\uc740(\ub294) ejb-jar.xml\uc5d0\uc11c \uc870\ud68c \uc694\uc18c\uc640 \uc5f0\uad00\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: \uc774 \uba54\uc18c\ub4dc\ub294 ejb-jar.xml\uc5d0\uc11c \uc870\ud68c \uc694\uc18c\uc640 \uc5f0\uad00\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud558\ub824\uba74 {1}\uc774(\uac00) \ud544\uc694\ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud558\ub824\uba74 {1}\uc774(\uac00) \ud544\uc694\ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud558\ub824\uba74 {1}\uc774(\uac00) \ud544\uc694\ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud558\ub824\uba74 {1}\uc774(\uac00) \ud544\uc694\ud569\ub2c8\ub2e4(EJB 2.0: 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud558\ub824\uba74 {1}\uc774(\uac00) \ud544\uc694\ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {2}\uc5d0 \uc874\uc7ac\ud558\ub824\uba74 {1}\uc774(\uac00) \ud544\uc694\ud569\ub2c8\ub2e4(EJB 2.0: 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: {0} \uba54\uc18c\ub4dc\uac00 {1}\uc5d0 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.10).
-CHKJ2470.src.m.ejb20=HKJ24W70E \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2470.slc.m.ejb20=HKJ24W70E \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7).
-CHKJ2470.crc.m.ejb20=HKJ24W70E \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2470.clc.m.ejb20=HKJ24W70E \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.11).
-CHKJ2470.brc.m.ejb20=HKJ24W70E \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2470.blc.m.ejb20=HKJ24W70E \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0}\uc740(\ub294) {1}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ucc98\ub9ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0}\uc774(\uac00) \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0}\uc774(\uac00) \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0}\uc774(\uac00) \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0}\uc774(\uac00) \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0}\uc774(\uac00) \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0}\uc774(\uac00) \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: \uc774 \uba54\uc18c\ub4dc\ub294 \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: \uc774 \uba54\uc18c\ub4dc\ub294 \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: \uc774 \uba54\uc18c\ub4dc\ub294 \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: \uc774 \uba54\uc18c\ub4dc\ub294 \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: \uc774 \uba54\uc18c\ub4dc\ub294 \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: \uc774 \uba54\uc18c\ub4dc\ub294 \ucee8\ud14c\uc774\ub108\uc5d0 \uc758\ud574 \uc81c\uacf5\ub429\ub2c8\ub2e4(EJB 2.0: 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0}\uc740(\ub294) findByPrimaryKey({1})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0}\uc740(\ub294) findByPrimaryKey({1})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0}\uc740(\ub294) findByPrimaryKey(Object)\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0}\uc740(\ub294) findByPrimaryKey(Object)\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0}\uc740(\ub294) findByPrimaryKey({1})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0}\uc740(\ub294) findByPrimaryKey({1})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: \uc774 \uba54\uc18c\ub4dc\ub294 findByPrimaryKey({0})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: \uc774 \uba54\uc18c\ub4dc\ub294 findByPrimaryKey({0})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: \uc774 \uba54\uc18c\ub4dc\ub294 findByPrimaryKey(Object)\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: \uc774 \uba54\uc18c\ub4dc\ub294 findByPrimaryKey(Object)\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: \uc774 \uba54\uc18c\ub4dc\ub294 findByPrimaryKey({0})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: \uc774 \uba54\uc18c\ub4dc\ub294 findByPrimaryKey({0})\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0}\uc774(\uac00) {1}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=HKJ2E079: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=HKJ2E079: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=HKJ2E079: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=HKJ2E079: \uc774 \uba54\uc18c\ub4dc\ub294 {0}\uc744(\ub97c) \ub9ac\ud134\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: \uc784\uc2dc \ud544\ub4dc {0}\uc740(\ub294) {1} \uc720\ud615\uc774 \uc544\ub2c8\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: \uc784\uc2dc \ud544\ub4dc\ub294 {0} \uc720\ud615\uc774 \uc544\ub2c8\ub108\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: \uc784\uc2dc \ud544\ub4dc({0})\ub294 \uad8c\uc7a5\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4(EJB 2.0: 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: \uc784\uc2dc \ud544\ub4dc\ub294 \uad8c\uc7a5\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4(EJB 2.0: 7.4.1).
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: {0}\uc744(\ub97c) \uc815\uc758\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0}\uc744(\ub97c) \uc815\uc758\ud558\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0}\uc740(\ub294) \uc18c\ubb38\uc790\ub85c \uc2dc\uc791\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0}\uc740(\ub294) \uc18c\ubb38\uc790\ub85c \uc2dc\uc791\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0}\uc740(\ub294) <cmp-field>\ub85c \uc120\uc5b8\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0}\uc740(\ub294) <cmp-field>\ub85c \uc120\uc5b8\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0}\uc740(\ub294) <cmr-field>\ub85c \uc120\uc5b8\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0}\uc740(\ub294) <cmr-field>\ub85c \uc120\uc5b8\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0}\uc740(\ub294) \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0}\uc740(\ub294) \ub178\ucd9c\ub418\uc9c0 \uc54a\uc544\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0}\uc740(\ub294) \uae30\ubcf8 \ub610\ub294 \uc77c\ub828\ud654 \uac00\ub2a5 \uc720\ud615 \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1). primitive
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0}\uc740(\ub294) \uae30\ubcf8 \ub610\ub294 \uc77c\ub828\ud654 \uac00\ub2a5 \uc720\ud615 \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1). primitive
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: {0} \ud544\ub4dc\ub294 {1} \uc720\ud615\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: \uc774 \ud544\ub4dc\ub294 {0} \uc720\ud615\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: {0} \ud544\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: \uc774 \ud544\ub4dc\ub294 public\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: {0} \ud544\ub4dc\ub294 <cmp-field>\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: \uc774 \ud544\ub4dc\ub294 <cmp-field>\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: \uc774 bean\uc740 <local-home>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: \uc774 bean\uc740 <home>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: \uc774 bean\uc740 <local>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: \uc774 bean\uc740 <remote>\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: \uc774 bean\uc740 <local-home> \ub610\ub294 <home> \uc911 \ud558\ub098\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: \uc774 bean\uc740 <local> \ub610\ub294 <remote> \uc911 \ud558\ub098\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: \uc774 bean\uc740 <local-home>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: \uc774 bean\uc740 <home>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: \uc774 bean\uc740 <local>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: \uc774 bean\uc740 <remote>\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: \uc774 bean\uc740 <local-home> \ub610\ub294 <home> \uc911 \ud558\ub098\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: \uc774 bean\uc740 <local> \ub610\ub294 <remote> \uc911 \ud558\ub098\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: \uc774 bean\uc740 <local-home>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: \uc774 bean\uc740 <home>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: \uc774 bean\uc740 <local>\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.1)
-CHKJ2883.b.ejb20=CHKJ2883W: \uc774 bean\uc740 <remote>\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: \uc774 bean\uc740 <local-home> \ub610\ub294 <home> \uc911 \ud558\ub098\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: \uc774 bean\uc740 <local> \ub610\ub294 <remote> \uc911 \ud558\ub098\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0}\uc740(\ub294) \uc62c\ubc14\ub978 Java ID\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0}\uc740(\ub294) \uc62c\ubc14\ub978 Java ID\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0}\uc740(\ub294) ejb-jar.xml \ud30c\uc77c\uc5d0\uc11c \uace0\uc720\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name>\uc774 \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: \uc608\uc57d ID {0}\uc744(\ub97c) <ejb-name>\uc73c\ub85c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(EJB 2.0: 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: \uc608\uc57d ID {0}\uc744(\ub97c) <abstract-schema-name>\uc73c\ub85c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(EJB 2.0: 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0}\uc740(\ub294) \uc62c\ubc14\ub978 Java ID\uc5ec\uc57c \ud558\uba70 \uc18c\ubb38\uc790\ub85c \uc2dc\uc791\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0}\uc740(\ub294) \uc62c\ubc14\ub978 Java ID\uc5ec\uc57c \ud558\uba70 \uc18c\ubb38\uc790\ub85c \uc2dc\uc791\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0}\uc740(\ub294) set \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0}\uc740(\ub294) get \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0}\uc740(\ub294) set \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0}\uc740(\ub294) get \uba54\uc18c\ub4dc\ub97c \uac00\uc838\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0}\uc740(\ub294) Java \uae30\ubcf8 \ub610\ub294 Java \uc77c\ub828\ud654 \uac00\ub2a5 \uc720\ud615\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0}\uc740(\ub294) {1} \uc720\ud615 \ub610\ub294 \ucf5c\ub809\uc158 thereof\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: \uc885\uc18d \uac12 \ud074\ub798\uc2a4 {0}\uc740(\ub294) <cmr-field>\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4(EJB 2.0: 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name>\uc740 ejb-jar.xml\uc5d0\uc11c \uace0\uc720\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name>\uc740 <ejb-relation>\uc5d0\uc11c \uace0\uc720\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: <multiplicity> \uc694\uc18c\uc758 \uac12\uc740 "One" \ub610\ub294 "Many" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: \uc5ed\ud560 {0}\uc758 <relationship-role-source>\ub294 \uae30\uc874\uc758 CMP bean\uc744 \ub098\ud0c0\ub0b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete>\ub294 "One"\uc758 <multiplicity>\uc640 \ud568\uaed8 \uc0ac\uc6a9\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0}\uc740(\ub294) {1}\uc5d0 \uc815\uc758\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: \uc774 bean\uc740 \ub2e4\ub978 Bean\uc5d0 \ub2e8\ubc29\ud5a5 \uad00\uacc4\ub9cc\uc744 \uac00\uc9c8 \uc218 \uc788\uc2b5\ub2c8\ub2e4(EJB 2.0: 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: <cmr-field-type> \uc694\uc18c\uc758 \uac12\uc740 "java.util.Collection" \ub610\ub294  "java.util.Set" \uc911 \ud558\ub098\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: \ucd5c\uc18c\ud55c \ud558\ub098\uc758 <ejb-relationship-role>\uc774 <cmr-field>\ub97c \uc815\uc758\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0}\uc774(\uac00) \uc874\uc7ac\ud574\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0}\uc740(\ub294) CMP bean\uc744 \ub098\ud0c0\ub0b4\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: <cmp-version> \uc694\uc18c\uc758 \uac12\uc740 "1.x" \ub610\ub294 "2.x"\uc5ec\uc57c \ud569\ub2c8\ub2e4(EJB 2.0: 22.5).
-CHKJ2873.ejb20=CHKJ2873W: \uc774 bean\uc758 datasource \ubc14\uc778\ub529\uc744 CMP \uc5f0\uacb0 \ud329\ud1a0\ub9ac \ubc14\uc778\ub529\uc73c\ub85c \uc774\uc8fc\uc2dc\ud0a4\uc2ed\uc2dc\uc624.
-CHKJ2874.ejb20=CHKJ2874W: \uc774 EJB \ubaa8\ub4c8\uc758 \uae30\ubcf8 datasource \ubc14\uc778\ub529\uc744 \uae30\ubcf8 CMP \uc5f0\uacb0 \ud329\ud1a0\ub9ac \ubc14\uc778\ub529\uc73c\ub85c \uc774\uc8fc\uc2dc\ud0a4\uc2ed\uc2dc\uc624.
-
-###########################################################################
-#
-# 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/ejbvalidator_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_pt_BR.properties
deleted file mode 100644
index 987e9a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_pt_BR.properties
+++ /dev/null
@@ -1,1528 +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=Validando {0}.
-
-LOC_CLASS=Classe: {0}
-LOC_FIELD=Campo: {0}, Classe: {1}
-LOC_METHOD=M\u00e9todo: {0}, Classe: {1}
-LOC_BEAN=Bean corporativo: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, Bean corporativo: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=<method> elemento: {0}
-LOC_METHODPERMISSION=<method-permission> elemento: {0}
-LOC_METHODTRANSACTION=<container-transaction> elemento: {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: Erro interno ao executar o validador EJB. Leia o log para obter detalhes.
-CHKJ2852=CHKJ2852W: Erro interno ao validar {0}. O bean validado foi {1}.
-CHKJ2433=CHKJ2433W: N\u00e3o \u00e9 poss\u00edvel validar {0} porque {1} n\u00e3o pode ser refletido. Verifique o classpath.
-CHKJ2907=CHKJ2907E: O tipo {0} ou um de seus supertipos, n\u00e3o podem ser refletidos. Verifique o classpath.
-CHKJ2905=CHKJ2905W: O Validador EJB n\u00e3o foi executado porque ejb-jar.xml n\u00e3o p\u00f4de ser carregado. Execute o validador XML para obter mais informa\u00e7\u00f5es.
-CHKJ2041=CHKJ2041I: Classes e interfaces permanentes devem estar em um pacote nomeado. (JLS 2.0: 7.4.2).
-
-CHKJ2456.i=CHKJ2456W: {0} deve emitir {1} para {2} ou pode haver erros de compila\u00e7\u00e3o no c\u00f3digo de implementa\u00e7\u00e3o.
-CHKJ2456.m=CHKJ2456W: Este m\u00e9todo deve emitir {0} para {1} ou pode haver erros de compila\u00e7\u00e3o no c\u00f3digo de implementa\u00e7\u00e3o.
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: A classe da chave {0} deve implementar o m\u00e9todo {1}. (EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: Esta classe deve implementar um m\u00e9todo ejbPostCreate correspondente para {0}. (EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: Essa classe deve implementar um m\u00e9todo ejbPostCreate correspondente para esse m\u00e9todo. (EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: Essa classe n\u00e3o deve implementar javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2003I.ejb11=CHKJ2003I: Os beans de sess\u00e3o com estado de transa\u00e7\u00e3o gerenciados por bean n\u00e3o precisam implementar javax.ejb.SessionSynchronization. (EJB 1.1: 6.5.3).
-CHKJ2004.eb.i.ejb11=CHKJ2004W: A classe de bean {1} n\u00e3o deve implementar o m\u00e9todo {0} ejbFind. (EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: A classe de bean {0} n\u00e3o deve implementar um m\u00e9todo ejbFind. (EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} deve ser um m\u00e9todo create ou um m\u00e9todo find. (EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: O m\u00e9todo deve ser um m\u00e9todo create ou um m\u00e9todo find. (EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: A classe de bean {0} deve ter um construtor p\u00fablico sem argumentos. (EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: A classe de bean {0} deve ter um construtor p\u00fablico sem argumentos. (EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} n\u00e3o deve declarar o m\u00e9todo finalize(). (EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} n\u00e3o deve declarar o m\u00e9todo finalize(). (EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: A classe de bean {0} deve conter pelo menos um m\u00e9todo ejbCreate.  (EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: A classe de bean {0} deve conter pelo menos um m\u00e9todo ejbFindByPrimaryKey.  (EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: Uma interface de posi\u00e7\u00e3o inicial {0} deve conter pelo menos um m\u00e9todo de cria\u00e7\u00e3o. (EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: Uma interface de posi\u00e7\u00e3o inicial {0} deve conter um m\u00e9todo findByPrimaryKey. (EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: Esse tipo deve ser uma interface. (EJB 1.1: 6.10.5).
-CHKJ2012.sh.ejb11=CHKJ2012E: Esse tipo deve ser uma interface. (EJB 1.1: 6.10.6).
-CHKJ2012.er.ejb11=CHKJ2012E: Esse tipo deve ser uma interface. (EJB 1.1: 9.2.7).
-CHKJ2012.eh.ejb11=CHKJ2012E: Esse tipo deve ser uma interface. (EJB 1.1: 9.2.8).
-CHKJ2013.sb.ejb11=CHKJ2013E: A classe de bean {0} deve ser implantada {1}. (EJB 1.1: 6.10.2).
-CHKJ2013.eb.ejb11=CHKJ2013E: A classe de bean {0} deve ser implantada {1}. (EJB 1.1: 9.2.2).
-CHKJ2014.sb.ejb11=CHKJ2014E: A classe de bean {0} n\u00e3o pode ser abstrata. (EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: A classe de bean {0} n\u00e3o pode ser abstrata. (EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: A classe de bean {0} n\u00e3o pode ser final. (EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: A classe de bean {0} n\u00e3o pode ser final. (EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: A interface deve estender {0}. (EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: A interface deve estender {0}. (EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: A interface deve estender {0}. (EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: A interface deve estender {0}. (EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: A classe de chave {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.9) (RMI 1.3: 2.6).
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: A classe da chave {0} deve ser p\u00fablica. (EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: A classe da chave {0} deve definir um construtor padr\u00e3o p\u00fablico. (EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: A classe de bean {0} deve ser p\u00fablica. (EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: A classe de bean {0} deve ser p\u00fablica. (EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: {0} deve ser um m\u00e9todo correspondente na classe de bean {1}. (EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: Este m\u00e9todo deve ter um m\u00e9todo correspondente na classe de bean {0}. (EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: {0} deve ser um m\u00e9todo correspondente na classe de bean {1}. (EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: Este m\u00e9todo deve ter um m\u00e9todo correspondente na classe de bean {0}. (EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} n\u00e3o deve existir. Apenas create() pode existir (EJB 1.1: 6.8).
-CHKJ2024.sh.m.ejb11=CHKJ2024E: Este m\u00e9todo n\u00e3o deve existir. Apenas create() pode existir (EJB 1.1: 6.8).
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} n\u00e3o deve existir. Apenas ejbCreate() pode existir (EJB 1.1: 6.8).
-CHKJ2025.sb.m.ejb11=CHKJ2025E: Este m\u00e9todo n\u00e3o deve existir. Apenas ejbCreate() pode existir (EJB 1.1: 6.8).
-CHKJ2026.sh.i.ejb11=CHKJ2026E: A classe de bean {1} deve implementar um m\u00e9todo ejbCreate correspondente para {0}. (EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E: A classe de bean {0} deve implementar um m\u00e9todoejbCreate correspondente a este m\u00e9todo. (EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E: A classe de bean {1} deve implementar um m\u00e9todo ejbCreate correspondente para {0}. (EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E: A classe de bean {0} deve implementar um m\u00e9todoejbCreate correspondente a este m\u00e9todo. (EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: {0} n\u00e3o ser\u00e1 chamado, a menos que um m\u00e9todo ejbCreate correspondente seja definido. (EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: Esse m\u00e9todo n\u00e3o ser\u00e1 chamado se um m\u00e9todo ejbCreate correspondente n\u00e3o for definido. (EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: {0} n\u00e3o pode ser chamado sem o m\u00e9todo create correspondente na interface inicial {1}. (EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: Este m\u00e9todo n\u00e3o pode ser chamado sem o m\u00e9todo create correspondente na interface inicial {0}. (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: {0} deve ter um m\u00e9todo ejbFind correspondente na classe de bean {1}. (EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: Este m\u00e9todo deve ter um m\u00e9todo correspondente ejbFind na classe de java bean {0}. (EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W: A classe do bean {0} deve declarar ao menos um campo gerenciado em cont\u00eainer. (EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: O m\u00e9todo setEntityContext(EntityContext ic) deve existir. (EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: O m\u00e9todo unsetEntityContext() deve existir. (EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: O m\u00e9todo ejbActivate() deve existir. (EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: O m\u00e9todo ejbPassivate() deve existir. (EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: O m\u00e9todo ejbRemove() deve existir. (EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: O m\u00e9todo ejbLoad() deve existir. (EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: O m\u00e9todo ejbStore() deve existir. (EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I: "this" n\u00e3o deve ser passado como um argumento ou um resultado. (EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: Ambas as extremidades da fun\u00e7\u00e3o devem utilizar o mesmo n\u00famero de atributos.
-CHKJ2101.ejb11=CHKJ2101E: Both ends of the role must use the same type.
-CHKJ2102.eh.ejb11=CHKJ2102E: Um descritor do localizador ou um m\u00e9todo de localizador personalizado correspondente deve ser definido na classe {0}.
-CHKJ2103.ejb11=CHKJ2103E: Na heran\u00e7a de componente, a classe do bean {0} deve herdar o {1}. (EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: Na heran\u00e7a de componente, a interface de in\u00edcio {0} n\u00e3o deve herdar o {1}. (EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: Na heran\u00e7a de componente, a interface remota {0} deve herdar o {1}. (EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: O bean {0} deve utilizar {1} como sua <prim-key-class> (EJB 1.1: B.2).
-
-CHKJ2200.i.ejb11=CHKJ2200W: O campo est\u00e1tico {0} deve ser final. (EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: Este campo est\u00e1tico deve ser final. (EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} n\u00e3o deve ser transit\u00f3rio. (EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: O campo n\u00e3o deve ser transit\u00f3rio. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: O campo de campo do campo {0} \u00e9 inv\u00e1lido para um bean CMP. (EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: O tipo de campo \u00e9 inv\u00e1lido para um bean CMP. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} deve ser p\u00fablico. (EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: O campo deve ser p\u00fablico. (EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: O campo de chave prim\u00e1ria denominado {0} deve ser p\u00fablico. (EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: O campo de chave prim\u00e1ria deve ser p\u00fablico. (EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} deve ser um <cmp-field> de {1} e um campo de classe de bean {2}. (EJB 1.1: 9.4.7.2).
-CHKJ2206.eb.m.ejb11=CHKJ2206W: Este campo deve ser um <cmp-field> de {0} e um campo da classe bean {1}. (EJB 1.1: 9.4.7.2).
-CHKJ2207.eb.ejb11=CHKJ2207E: O campo da chave {0} deve ser do mesmo tipo da chave prim\u00e1ria {1}. (EJB 1.1: 9.4.7.1).
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o reprovada de um java.rmi.RemoteException no m\u00e9todo {0}. (EJB 1.1: 6.10.3).
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o invalidada de java.rmi.RemoteException. (EJB 1.1: 6.10.3).
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o reprovada de um java.rmi.RemoteException no m\u00e9todo {0}. (EJB 1.1: 6.10.4).
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o invalidada de java.rmi.RemoteException. (EJB 1.1: 6.10.4).
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o reprovada de um java.rmi.RemoteException no {0}. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o invalidada de java.rmi.RemoteException. (EJB 1.1: 9.2.3).
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o reprovada de um java.rmi.RemoteException no {0}. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o invalidada de java.rmi.RemoteException. (EJB 1.1: 9.2.4).
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o reprovada de um java.rmi.RemoteException no {0}. (EJB 1.1: 9.2.5).
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o invalidada de java.rmi.RemoteException. (EJB 1.1: 9.2.5).
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o reprovada de um java.rmi.RemoteException no {0}. (EJB 1.1: 9.2.6).
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: Utiliza\u00e7\u00e3o invalidada de java.rmi.RemoteException. (EJB 1.1: 9.2.6).
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} deve retornar vazio. (EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: Este m\u00e9todo deve retornar vazio. (EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} deve retornar o tipo de interface remota {1}. (EJB 1.1: 6.10.6).
-CHKJ2402.sh.m.ejb11=CHKJ2402W: Este m\u00e9todo create deve retornar o tipo de interface remota {0}. (EJB 1.1: 6.10.6).
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} deve retornar o tipo de interface remota {1}. (EJB 1.1: 9.2.8).
-CHKJ2402.eh.m.ejb11=CHKJ2402W: Este m\u00e9todo create deve retornar o tipo de interface remota {0}. (EJB 1.1: 9.2.8).
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} deve retornar {1} ou uma coleta deles. (EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: O m\u00e9todo deve retornar {0} ou uma coleta deles. (EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: A ordem e os tipos dos argumentos em {0} devem corresponder \u00e0 ordem e tipos dos campos na classe da chave {1}. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: A ordem e os tipos dos argumentos devem corresponder \u00e0 ordem e tipos dos campos na classe da chave {0}. (EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} deve retornar o tipo de chave prim\u00e1ria {1}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2406.eb.m.ejb11=CHKJ2406W: O m\u00e9todo deve retornar o tipo de chave principal {0}. (EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3).
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} deve retornar {1} ou uma coleta deles. (EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: Este m\u00e9todo deve retornar {0} ou uma coleta deles. (EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} deve ser p\u00fablico. (EJB 1.1: 6.10.3).
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: O m\u00e9todo deve ser p\u00fablico. (EJB 1.1: 6.10.3).
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} deve ser p\u00fablico. (EJB 1.1: 6.10.4).
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: Este m\u00e9todo deve ser p\u00fablico. (EJB 1.1: 6.10.4).
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} deve ser p\u00fablico. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo deve ser p\u00fablico. (EJB 1.1: 9.2.3).
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} deve ser p\u00fablico. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo deve ser p\u00fablico. (EJB 1.1: 9.2.4).
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} deve ser p\u00fablico. (EJB 1.1: 9.2.5).
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo deve ser p\u00fablico. (EJB 1.1: 9.2.5).
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} deve ser p\u00fablico. (EJB 1.1: 9.2.6).
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: Este m\u00e9todo deve ser p\u00fablico. (EJB 1.1: 9.2.6).
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} n\u00e3o deve ser final. (EJB 1.1: 6.10.3).
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: Este m\u00e9todo n\u00e3o deve ser final. (EJB 1.1: 6.10.3).
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} n\u00e3o deve ser final. (EJB 1.1: 6.10.4).
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: Este m\u00e9todo n\u00e3o deve ser final. (EJB 1.1: 6.10.4).
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} n\u00e3o deve ser final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo n\u00e3o deve ser final. (EJB 1.1: 9.2.3).
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} n\u00e3o deve ser final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo n\u00e3o deve ser final. (EJB 1.1: 9.2.4).
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} n\u00e3o deve ser final. (EJB 1.1: 9.2.5).
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo n\u00e3o deve ser final. (EJB 1.1: 9.2.5).
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} n\u00e3o deve ser final. (EJB 1.1: 9.2.6).
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: Este m\u00e9todo n\u00e3o deve ser final. (EJB 1.1: 9.2.6).
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 6.10.3).
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 6.10.3).
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 6.10.4).
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 6.10.4).
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.3).
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.4).
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.5).
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.5).
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.6).
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico. (EJB 1.1: 9.2.6).
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: O nome do {0} n\u00e3o deve come\u00e7ar com "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: O nome do m\u00e9todo n\u00e3o deve iniciar com "ejb". (EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: O nome do {0} n\u00e3o deve come\u00e7ar com "ejb". (EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: O nome do m\u00e9todo n\u00e3o deve iniciar com "ejb". (EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: O tipo de retorno de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.sb.m.ejb11=CHKJ2412I: O tipo de retorno deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2412.eb.i.ejb11=CHKJ2412I: O tipo de retorno de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.eb.m.ejb11=CHKJ2412I: O tipo de retorno deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2412.sr.i.ejb11=CHKJ2412I: O tipo de retorno de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.sr.m.ejb11=CHKJ2412I: O tipo de retorno deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2412.er.i.ejb11=CHKJ2412I: O tipo de retorno de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.er.m.ejb11=CHKJ2412I: O tipo de retorno deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2412.sh.i.ejb11=CHKJ2412I: O tipo de retorno de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.sh.m.ejb11=CHKJ2412I: O tipo de retorno deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2412.eh.i.ejb11=CHKJ2412I: O tipo de retorno de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2412.eh.m.ejb11=CHKJ2412I: O tipo de retorno deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: O argumento {1} de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.sb.m.ejb11=CHKJ2413I: O argumento {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10) (RMI 1.3: 2.6).
-CHKJ2413.eb.i.ejb11=CHKJ2413I: O argumento {1} de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.eb.m.ejb11=CHKJ2413I: O argumento {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2) (RMI 1.3: 2.6).
-CHKJ2413.sr.i.ejb11=CHKJ2413I: O argumento {1} de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.sr.m.ejb11=CHKJ2413I: O argumento {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.5) (RMI 1.3: 2.6).
-CHKJ2413.er.i.ejb11=CHKJ2413I: O argumento {1} de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.er.m.ejb11=CHKJ2413I: O argumento {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.7) (RMI 1.3: 2.6).
-CHKJ2413.sh.i.ejb11=CHKJ2413I: O argumento {1} de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.sh.m.ejb11=CHKJ2413I: O argumento {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 6.10.6) (RMI 1.3: 2.6).
-CHKJ2413.eh.i.ejb11=CHKJ2413I: O argumento {1} de {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-CHKJ2413.eh.m.ejb11=CHKJ2413I: O argumento {0} deve ser serializ\u00e1vel no runtime. (EJB 1.1: 9.2.8) (RMI 1.3: 2.6).
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} deve emitir {1}. (EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: O m\u00e9todo deve lan\u00e7ar {0}. (EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} deve emitir {1}. (EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: O m\u00e9todo deve lan\u00e7ar {0}. (EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} deve emitir {1}. (EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: O m\u00e9todo deve lan\u00e7ar {0}. (EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} deve emitir {1}. (EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: O m\u00e9todo deve lan\u00e7ar {0}. (EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: O tipo de retorno de {0} deve corresponder ao tipo de retorno, {1}, do m\u00e9todo correspondente na classe de bean {2}. (EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: O tipo de retorno deve corresponder ao tipo de retorno {0} do m\u00e9todo correspondente na classe de bean {1}. (EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: O tipo de retorno de {0} deve corresponder ao tipo de retorno, {1}, do m\u00e9todo correspondente na classe de bean {2}. (EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: O tipo de retorno deve corresponder ao tipo de retorno {0} do m\u00e9todo correspondente na classe de bean {1}. (EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: O tipo de retorno de {0} deve corresponder ao tipo de retorno, {1}, do m\u00e9todo correspondente na classe de bean {2}. (EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: O tipo de retorno deve corresponder ao tipo de retorno {0} do m\u00e9todo correspondente na classe de bean {1}. (EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: O tipo de retorno de {0} deve corresponder ao tipo de retorno, {1}, do m\u00e9todo correspondente na classe de bean {2}. (EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: O tipo de retorno deve corresponder ao tipo de retorno {0} do m\u00e9todo correspondente na classe de bean {1}. (EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} deve retornar vazio. (EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: Este m\u00e9todo deve retornar vazio. (EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} deve ser um m\u00e9todo create. (EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: Esse m\u00e9todo deve ser um m\u00e9todo de cria\u00e7\u00e3o. (EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1} deve ser emitido pelo m\u00e9todo correspondente de {0} na interface inicial {2}. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0} deve ser lan\u00e7ado pelo m\u00e9todo correspondente na interface de posi\u00e7\u00e3o inicial {1}. (EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1} deve ser emitido pelo m\u00e9todo correspondente de {0} na interface inicial {2}. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0} deve ser lan\u00e7ado pelo m\u00e9todo correspondente na interface de posi\u00e7\u00e3o inicial {1}. (EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: O m\u00e9todo correspondente de {0} na interface remota {1} deve emitir {2}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: O m\u00e9todo correspondente na interface remota {0} deve emitir {1}. (EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: O m\u00e9todo correspondente de {0} na interface remota {1} deve emitir {2}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: O m\u00e9todo correspondente na interface remota {0} deve emitir {1}. (EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: O valor do elemento <ejb-name> deve ser especificado. (EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E: A classe <ejb-class> {0} ou um de seus supertipos, n\u00e3o p\u00f4de ser refletido. Verifique o classpath.
-CHKJ2802.unnamed.ejb11=CHKJ2802E: Classe desconhecida sem especifica\u00e7\u00e3o no elemento <ejb-class>. (EJB 1.1: 16.2, 16.5).
-CHKJ2803.named.ejb11=CHKJ2803E: A interface <home> {0} ou um de seus supertipos, n\u00e3o p\u00f4de ser refletida. Verifique o classpath.
-CHKJ2803.unnamed.ejb11=CHKJ2803E: Interface desconhecida especificada no elemento <home>. (EJB 1.1: 16.2, 16.5).
-CHKJ2804.named.ejb11=CHKJ2804E: A inteface <remote> {0} ou um de seus supertipos, n\u00e3o pode ser refletida . Verifique o classpath.
-CHKJ2804.unnamed.ejb11=CHKJ2804E: Interface desconhecida especificada no elemento <remote>. (EJB 1.1: 16.2, 16.5).
-CHKJ2806.ejb11=CHKJ2806E: O valor do elemento <reentrant> deve ser "Verdadeiro" ou "Falso".  (EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E: O valor do elemento <session-type> deve ser "Com op\u00e7\u00f5es do estado" ou "Sem op\u00e7\u00f5es do estado". (EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E: O valor do elemento <transaction-type> deve ser "Cont\u00eainer" ou "Bean". (EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E: O valor do elemento <persistence-type> deve ser "Cont\u00eainer" ou "Bean".  (EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E: A classe <prim-key-class> {0} ou um de seus supertipos, n\u00e3o p\u00f4de ser refletida. Verifique o classpath.
-CHKJ2810.unnamed.ejb11=CHKJ2810E: Classe desconhecida especificada no elemento <prim-key-class>.  (EJB 1.1: 16.2, 16.5).
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> {0} n\u00e3o pode ser localizado na classe do bean {1}. (EJB 1.1: 16.5).
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> deve especificar um <field-name>. (EJB 1.1: 16.5).
-CHKJ2812.ejb11=CHKJ2812E: Classe de bean {0} deve especificar pelo menos um de seus campos como um <cmp-field>. (EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W: <ejb-name>, em <method>, especifica um bean corporativo desconhecido. (EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W: A ref da fun\u00e7\u00e3o de seguran\u00e7a deve ser definida somente uma vez.
-CHKJ2822.ejb11=CHKJ2822W: O elemento <security-role-ref> para o bean {0} deve definir o elemento <role-name>. (EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: O elemento <security-role-ref> deve definir o elemento <role-link>. (EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: O elemento <security-role-ref> refere-se \u00e0 fun\u00e7\u00e3o desconhecida {0}. (EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: O elemento <security-role> em ejb-jar.xml deve definir o elemento <role-name>. (EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: O nome da fun\u00e7\u00e3o de seguran\u00e7a deve ser exclusivo. (EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: N\u00e3o \u00e9 poss\u00edvel utilizar um elemento <role-link> sem elementos <security-role>. (EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E: N\u00e3o \u00e9 poss\u00edvel utilizar um elemento <primkey-field> sem uma chave prim\u00e1ria primitiva. (EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E: A classe da chave {0} n\u00e3o mapeia para nenhum campo no bean corporativo {1}. (EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W: O tipo de campo {0} n\u00e3o pode ser refletido. Verifique o classpath.
-CHKJ2831.ejb11=CHKJ2831W: {0} deve ser declarado em um elemento <cmp-field>. (EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: A posi\u00e7\u00e3o inicial {0}, especificada em um elemento <ejb-ref>, n\u00e3o p\u00f4de ser encontrada no m\u00f3dulo EJB. (EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: O remoto {0}, especificado no elemento <ejb-ref>, n\u00e3o p\u00f4de ser encontrado no m\u00f3dulo EJB. (EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: O bean {0}, especificado no elemento <ejb-ref>, n\u00e3o p\u00f4de ser encontrado no m\u00f3dulo EJB. (EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: O bean {0} \u00e9 um tipo {1}. Atualize o elemento <ejb-ref-type> do elemento <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: O bean {0} utiliza a p\u00e1gina inicial {1}. Atualize o elemento <ejb-ref> do elemento <ejb-ref>. (EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I:  O bean {0} utiliza a p\u00e1gina inicial {1}. Atualize o elemento <ejb-ref> do elemento <ejb-ref>. (EJB 1.1: 14.3.2).
-CHKJ2838.ejb11=CHKJ2838I: Recomenda-se que todas as refer\u00eancias aos beans corporativos sejam organizadas no subcontexto "ejb". (EJB 1.1: 14.3.1.1).
-CHKJ2839.ejb11=CHKJ2839W: O elemento <env-entry-name>, do elemento <env-entry>, \u00e9 inv\u00e1lido. (EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: O elemento <env-entry-type>, do elemento <env-entry>, \u00e9 inv\u00e1lido. (EJB 1.1: 14.2.1.2).
-CHKJ2841.ejb11=CHKJ2841W: O nome {0}, no elemento <env-entry-name>, pode ser utilizado somente uma vez no bean. (EJB 1.1: 14.2.1.2).
-CHKJ2842.ejb11=CHKJ2842W: <method-params> \u00e9 ignorado quando <method-name> \u00e9 "*". (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2843.ejb11=CHKJ2843W: Nenhum m\u00e9todo, no {0}, corresponde a este <method>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2844.ejb11=CHKJ2844W: Pelo menos um <method> deve ser definido em uma <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2845.ejb11=CHKJ2845W: Pelo menos um <role-name> deve ser definido em uma <method-permission>. (EJB 1.1: 11.4.1, 15.3.2).
-CHKJ2846.ejb11=CHKJ2846W: Nenhum m\u00e9todo encontrado para este<method-permission>. (EJB 1.1: 15.3.2).
-CHKJ2847.ejb11=CHKJ2847W: Nenhum m\u00e9todo pode ser encontrado para esse<container-transaction>. (EJB 1.1: 11.4.1).
-CHKJ2849.ejb11=CHKJ2849W: N\u00e3o \u00e9 poss\u00edvel validar a heran\u00e7a do componente de {0} porque {1} ou um de seus supertipos n\u00e3o podem ser refletidos. Verifique o classpath.
-CHKJ2850.ejb11=CHKJ2850W: N\u00e3o \u00e9 poss\u00edvel validar <method> porque {0} ou um de seus supertipos, n\u00e3o podem ser refletidos. Verifique o classpath.
-CHKJ2851.ejb11=CHKJ2851W: N\u00e3o \u00e9 poss\u00edvel validar {0} porque {1} ou um de seus supertipos n\u00e3o podem ser refletidos. Verifique o classpath.
-CHKJ2852.ejb11=CHKJ2852W: Throwable capturado ao tentar validar o ejb-jar.xml. O bean validado foi {0}.
-CHKJ2853.ejb11=CHKJ2853W: Throwable capturado ao tentar validar o ibm-ejb-jar-ext.xmi. O bean validado foi {0}.
-
-CHKJ2908.ejb11=CHKJ2908W: Um bean corporativo n\u00e3o pode ser refletido corretamente. Execute o validador XML para obter mais informa\u00e7\u00f5es.
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} deve ser exclusivo no arquivo ejb-jar.xml (EJB 1.1: 16.5).
-CHKJ2875.ejb11=CHKJ2875E: <ejb-client-jar> {0} deve existir em todo arquivo EAR que cont\u00e9m esse m\u00f3dulo EJB (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: N\u00e3o \u00e9 poss\u00edvel utilizar um <primkey-field> sem uma chave prim\u00e1ria primitiva (EJB 2.0: 10.8.1, 22.5).
-CHKJ2829.ejb20=CHKJ2829E: A classe da chave {0} n\u00e3o mapeia para nenhum campo no bean corporativo {1}. (EJB 2.0: 10.8, 22.5).
-CHKJ2839.ejb20=CHKJ2839W: O elemento <env-entry-name>, do elemento <env-entry>, \u00e9 inv\u00e1lido. (EJB 2.0: 20.2.1.2).
-CHKJ2840.ejb20=CHKJ2840W: O elemento <env-entry-type>, do elemento <env-entry>, \u00e9 inv\u00e1lido. (EJB 2.0: 20.2.1.2).
-CHKJ2841.ejb20=CHKJ2841W: O nome {0}, no elemento <env-entry-name>, pode ser utilizado somente uma vez no bean. (EJB 2.0: 20.2.1.2).
-CHKJ2830.ejb20=CHKJ2830W: O tipo de campo {0} n\u00e3o pode ser refletido. Verifique o classpath.
-CHKJ2831.ejb20=CHKJ2831W: {0} deve ser declarado em um elemento <cmp-field>. (EJB 2.0: 10.8.2).
-CHKJ2801.ejb20=CHKJ2801E: O valor do elemento <ejb-name> deve ser especificado. (EJB 2.0 22.2, 22.5).
-CHKJ2809.ejb20=CHKJ2809E: O valor do elemento <persistence-type> deve ser "Cont\u00eainer" ou "Bean".  (EJB 2.0: 22.2, 22.5).
-CHKJ2806.ejb20=CHKJ2806E: O valor do elemento <reentrant> deve ser "Verdadeiro" ou "Falso".  (EJB 2.0: 22.2, 22.5).
-CHKJ2807.ejb20=CHKJ2807E: O valor do elemento <session-type> deve ser "Com op\u00e7\u00f5es do estado" ou "Sem op\u00e7\u00f5es do estado". (EJB 2.0: 22.2, 22.5).
-CHKJ2808.ejb20=CHKJ2808E: O valor do elemento <transaction-type> deve ser "Cont\u00eainer" ou "Bean". (EJB 2.0: 17.3.6, 22.2, 22.5).
-CHKJ2814.ejb20=CHKJ2814W: <ejb-name>, em <method>, especifica um bean corporativo desconhecido. (EJB 2.0: 17.4.1, 21.3.2, 22.5).
-CHKJ2842.ejb20=CHKJ2842W: <method-params> \u00e9 ignorado quando <method-name> \u00e9 "*". (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2843.ejb20=CHKJ2843W: Nenhum m\u00e9todo, no {0}, corresponde a este <method>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2844.ejb20=CHKJ2844W: Pelo menos um <method> deve ser definido em uma <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2845.ejb20=CHKJ2845W: Uma <role-name> ou um elemento <unchecked> deve ser definido em uma <method-permission>. (EJB 2.0: 17.4.1, 21.3.2).
-CHKJ2846.ejb20=CHKJ2846W: Nenhum m\u00e9todo encontrado para este<method-permission>. (EJB 2.0: 21.3.2).
-CHKJ2847.ejb20=CHKJ2847W: Nenhum m\u00e9todo pode ser encontrado para esse<container-transaction>. (EJB 2.0: 17.4.1).
-CHKJ2812.ejb20=CHKJ2812E: Classe de bean {0} deve especificar pelo menos um de seus campos como um <cmp-field>. (EJB 2.0: 22.5).
-CHKJ2832.ejb20=CHKJ2832I: A posi\u00e7\u00e3o inicial {0}, especificada em um elemento <ejb-ref>, n\u00e3o p\u00f4de ser encontrada no m\u00f3dulo EJB. (EJB 2.0: 20.3.1.2).
-CHKJ2833.ejb20=CHKJ2833I: O remoto {0}, especificado no elemento <ejb-ref>, n\u00e3o p\u00f4de ser encontrado no m\u00f3dulo EJB. (EJB 2.0: 20.3.1.2).
-CHKJ2834.ejb20=CHKJ2834I: O bean {0}, especificado no elemento <ejb-ref>, n\u00e3o p\u00f4de ser encontrado no m\u00f3dulo EJB. (EJB 2.0: 20.3.2).
-CHKJ2835.ejb20=CHKJ2835I: O bean {0} \u00e9 um tipo {1}. Atualize o elemento <ejb-ref-type> do elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2836.ejb20=CHKJ2836I: O bean {0} utiliza a p\u00e1gina inicial {1}. Atualize o elemento <ejb-ref> do elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2837.ejb20=CHKJ2837I:  O bean {0} utiliza a p\u00e1gina inicial {1}. Atualize o elemento <ejb-ref> do elemento <ejb-ref>. (EJB 2.0: 20.3.2).
-CHKJ2838.ejb20=CHKJ2838I: Recomenda-se que todas as refer\u00eancias aos beans corporativos sejam organizadas no subcontexto "ejb". (EJB 2.0: 20.3.1.1).
-CHKJ2820.ejb20=CHKJ2820W: A fun\u00e7\u00e3o de seguran\u00e7a ref \u00e9 definida mais de uma vez.
-CHKJ2822.ejb20=CHKJ2822W: O elemento <security-role-ref> para o bean {0} deve definir o elemento <role-name>. (EJB 2.0: 21.2.5.3).
-CHKJ2823.ejb20=CHKJ2823W: O elemento <security-role-ref> deve definir o elemento <role-link>. (EJB 2.0: 21.3.3).
-CHKJ2824.ejb20=CHKJ2824W: O elemento <security-role-ref> refere-se \u00e0 fun\u00e7\u00e3o desconhecida {0}. (EJB 2.0: 21.3.3).
-CHKJ2825.ejb20=CHKJ2825W: O elemento <security-role> em ejb-jar.xml deve definir o elemento <role-name>. (EJB 2.0: 21.3.1).
-CHKJ2826.ejb20=CHKJ2826W: O nome da fun\u00e7\u00e3o de seguran\u00e7a deve ser exclusivo. (EJB 2.0: 21.3.1).
-CHKJ2827.ejb20=CHKJ2827W: N\u00e3o \u00e9 poss\u00edvel utilizar um elemento <role-link> sem elementos <security-role>. (EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3).
-CHKJ2850.ejb20=CHKJ2850W: N\u00e3o \u00e9 poss\u00edvel validar <method> porque o tipo {0} n\u00e3o pode ser refletido. Verifique o classpath.
-CHKJ2851.ejb20=CHKJ2851W: N\u00e3o \u00e9 poss\u00edvel validar {0} porque o tipo {1} n\u00e3o pode ser refletido. Verifique o classpath.
-CHKJ2875.ejb20=CHKJ2875E: <ejb-client-jar> {0} deve existir em todo arquivo EAR que cont\u00e9m esse m\u00f3dulo EJB (EJB 2.0: 22.5, 23.4, 23.6).
-
-CHKJ2003E.ejb20=CHKJ2003E: Esta classe n\u00e3o deve implementar javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2003I.ejb20=CHKJ2003I: Os beans de sess\u00e3o com estado de transa\u00e7\u00e3o gerenciados por bean n\u00e3o precisam implementar javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1).
-CHKJ2802.named.ejb20=CHKJ2802E: A classe <ejb-class> {0} ou um de seus supertipos, n\u00e3o p\u00f4de ser refletido. Verifique o classpath.
-CHKJ2802.unnamed.ejb20=CHKJ2802E: A classe do bean, identificada pelo elemento <ejb-class>, n\u00e3o pode ser encontrada. (EJB 2.0: 22.2, 22.5).
-CHKJ2803.named.ejb20=CHKJ2803E: A interface <home> {0} ou um de seus supertipos, n\u00e3o p\u00f4de ser refletida. Verifique o classpath.
-CHKJ2803.unnamed.ejb20=CHKJ2803E: Interface desconhecida especificada no elemento <home>. (EJB 2.0: 22.2, 22.5).
-CHKJ2804.named.ejb20=CHKJ2804E: A inteface <remote> {0} ou um de seus supertipos, n\u00e3o pode ser refletida . Verifique o classpath.
-CHKJ2804.unnamed.ejb20=CHKJ2804E: Interface desconhecida especificada no elemento <remote>. (EJB 2.0: 22.2, 22.5).
-CHKJ2805.named.ejb20=CHKJ2805E: A interface <local-home> {0} ou um de seus supertipos n\u00e3o pode ser refletido. Verifique o classpath.
-CHKJ2805.unnamed.ejb20=CHKJ2805E: Especificada interface desconhecida no elemento <local-home>. (EJB 2.0: 22.2, 22.5).
-CHKJ2800.named.ejb20=CHKJ2800E: A interface <local> {0} ou um de seus supertipos n\u00e3o podem ser refletidos. Verifique o classpath.
-CHKJ2800.unnamed.ejb20=CHKJ2800E: Especificada interface desconhecida no elemento <local>. (EJB 2.0: 22.2, 22.5).
-CHKJ2810.named.ejb20=CHKJ2810E: A classe <prim-key-class> {0} ou um de seus supertipos, n\u00e3o p\u00f4de ser refletida. Verifique o classpath.
-CHKJ2810.unnamed.ejb20=CHKJ2810E: Classe desconhecida especificada no elemento <prim-key-class>.  (EJB 2.0: 22.2, 22.5).
-CHKJ2811.ejb20=CHKJ2811E: <field-name> {0} n\u00e3o pode ser localizado na classe do bean {1}. (EJB 2.0: 22.5).
-
-CHKJ2103.ejb20=CHKJ2103E: Na heran\u00e7a de componente, a classe de bean {0} deve herdar {1} (EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E: Na heran\u00e7a de componente, a interface de in\u00edcio {0} n\u00e3o deve herdar o {1}. (EJB 2.0: D.2).
-CHKJ2105.ejb20=CHKJ2105E: Na heran\u00e7a de componente, a interface de componente {0} deve herdar {1}. (EJB 2.0: D.2).
-CHKJ2106.ejb20=CHKJ2106E:  O bean {0} deve utilizar {1} como sua <prim-key-class> (EJB 2.0: D.2).
-CHKJ2849.ejb20=CHKJ2849W: N\u00e3o \u00e9 poss\u00edvel validar heran\u00e7a de componente de {0} porque o tipo {1} ou uma de suas depend\u00eancias n\u00e3o puderam ser refletidos. Verifique o classpath.
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} deve ser exclusivo no arquivo ejb-jar.xml (EJB 2.0: 22.5).
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: Esta classe deve implementar {0} (EJB 2.0: 7.5.1, 7.10.2).
-CHKJ2017.mb.ejb20=CHKJ2017E: Esta classe deve implementar {0} (EJB 2.0: 15.4.1, 15.7.2).
-CHKJ2017.cb.ejb20=CHKJ2017E: Esta classe deve implementar {0} (EJB 2.0: 10.6.2).
-CHKJ2017.bb.ejb20=CHKJ2017E: Esta classe deve implementar {0} (EJB 2.0: 12.2.2).
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBHome (EJB 2.0: 6.3, 7.10.6).
-CHKJ2017.crh.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBHome (EJB 2.0: 9.5, 10.6.10).
-CHKJ2017.brh.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBHome (EJB 2.0: 9.5, 12.2.9).
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBLocalHome (EJB 2.0: 6.4, 7.10.8).
-CHKJ2017.clh.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 10.6.12).
-CHKJ2017.blh.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 12.2.11).
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBObject (EJB 2.0: 6.5, 7.10.5).
-CHKJ2017.crc.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBObject (EJB 2.0: 9.9, 10.6.9).
-CHKJ2017.brc.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBObject (EJB 2.0: 9.9, 12.2.8).
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBLocalObject (EJB 2.0: 7.10.7).
-CHKJ2017.clc.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 10.6.10).
-CHKJ2017.blc.ejb20=CHKJ2017E: Esta interface deve estender javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 12.2.10).
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: "this" n\u00e3o deve ser transmitido como um argumento de m\u00e9todo ou resultado (EJB 2.0: 10.6.2).
-CHKJ2040.bb.ejb20=CHKJ2040I: "this" n\u00e3o deve ser transmitido como um argumento de m\u00e9todo ou resultado (EJB 2.0: 12.2.2).
-CHKJ2040.sb.ejb20=CHKJ2040I: "this" n\u00e3o deve ser transmitido como um argumento de m\u00e9todo ou resultado (EJB 2.0: 7.10.2).
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: Esta classe deve ser abstrata (EJB 2.0: 10.3.1, 10.4.1, 10.6.2).
-CHKJ2014.mb.ejb20=CHKJ2014W: Esta classe n\u00e3o deve ser abstrata (EJB 2.0: 15.7.2).
-CHKJ2014.bb.ejb20=CHKJ2014W: Esta classe n\u00e3o deve ser abstrata (EJB 2.0: 12.2.2).
-CHKJ2014.sb.ejb20=CHKJ2014W: Esta classe n\u00e3o deve ser abstrata (EJB 2.0: 7.10.1).
-
-CHKJ2022.cb.ejb20=CHKJ2022W: Esta classe deve ser p\u00fablica (EJB 2.0: 10.6.2).
-CHKJ2022.mb.ejb20=CHKJ2022W: Esta classe deve ser p\u00fablica (EJB 2.0: 15.7.2).
-CHKJ2022.bb.ejb20=CHKJ2022W: Esta classe deve ser p\u00fablica (EJB 2.0: 12.2.2).
-CHKJ2022.sb.ejb20=CHKJ2022W: Esta classe deve ser p\u00fablica (EJB 2.0: 7.10.1).
-CHKJ2022.kc.ejb20=CHKJ2022W: Esta classe deve ser p\u00fablica (EJB 2.0: 10.8.2).
-
-CHKJ2015.cb.ejb20=CHKJ2015W: Esta classe n\u00e3o deve ser final (EJB 2.0: 10.6.2).
-CHKJ2015.mb.ejb20=CHKJ2015W: Esta classe n\u00e3o deve ser final (EJB 2.0: 15.7.2).
-CHKJ2015.bb.ejb20=CHKJ2015W: Esta classe n\u00e3o deve ser final (EJB 2.0: 12.2.2).
-CHKJ2015.sb.ejb20=CHKJ2015W: Esta classe n\u00e3o deve ser final (EJB 2.0: 7.10.1).
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: Esta classe deve ser serializ\u00e1vel (EJB 2.0: 10.3.3, 10.6.3).
-CHKJ2043.ejb20=CHKJ2043W: Esta classe deve ser p\u00fablica (EJB 2.0: 10.6.3).
-CHKJ2044.ejb20=CHKJ2044W: Esta classe n\u00e3o deve ser abstrata (EJB 2.0: 10.6.3).
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: Esta classe deve ter um Tipo de Valor v\u00e1lido em RMI-IIOP (EJB 2.0: 9.8, 10.6.13).
-CHKJ2019.kb.ejb20=CHKJ2019W: Esta classe deve ter um Tipo de Valor v\u00e1lido em 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} deve existir (EJB 2.0: 7.10.2).
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: public {0} deve existir (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: public {0} deve existir (EJB 2.0: 12.1.4.1, 12.2.2).
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: public {0} deve existir (EJB 2.0: 15.7.2).
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: public {0} deve existir (EJB 2.0: 10.8.2).
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: Esta classe deve definir {0} (EJB 2.0: 10.3.1).
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) deve existir (EJB 2.0: 15.4.2, 15.7.4).
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: Pelo menos um m\u00e9todo ejbCreate deve existir (EJB 2.0: 7.5.5).
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: O m\u00e9todo ejbCreate() deve existir (EJB 2.0: 7.8).
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: O m\u00e9todo ejbCreate() deve existir (EJB 2.0: 15.4.4, 15.7.2).
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: O m\u00e9todo ejbFindByPrimaryKey deve existir (EJB 2.0: 12.2.5).
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: O m\u00e9todo setEntityContext(EntityContext) deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: O m\u00e9todo setEntityContext(EntityContext) deve existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: O m\u00e9todo unsetEntityContext() deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: O m\u00e9todo unsetEntityContext() deve existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: O m\u00e9todo ejbActivate() deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: O m\u00e9todo ejbActivate() deve existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: O m\u00e9todo ejbPassivate() deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: O m\u00e9todo ejbPassivate() deve existir (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: O m\u00e9todo ejbPassivate() deve existir (EJB 2.0: 7.5.1).
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: O m\u00e9todo ejbRemove() deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: O m\u00e9todo ejbRemove() deve existir (EJB 2.0: 12.1.4.1).
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: O m\u00e9todo ejbRemove() deve existir (EJB 2.0: 15.7.5).
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: O m\u00e9todo ejbRemove() deve existir (EJB 2.0: 4.2.2, 7.5.1).
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: O m\u00e9todo ejbLoad() deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: O m\u00e9todo ejbLoad() deve existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: O m\u00e9todo ejbStore() deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: O m\u00e9todo ejbStore() deve existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: O m\u00e9todo create() deve existir (EJB 2.0: 7.8, 7.10.6).
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: O m\u00e9todo create() deve existir (EJB 2.0: 7.8, 7.10.8).
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: Esta interface deve definir pelo menos um m\u00e9todo create (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2050.create.slh.ejb20=CHKJ2050W: Esta interface deve definir pelo menos um m\u00e9todo create (EJB 2.0: 6.4.1, 7.10.8).
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: Pelo menos um m\u00e9todo finder deve existir (EJB 2.0: 9.5.2).
-CHKJ2050.find.brh.ejb20=CHKJ2050W: Pelo menos um m\u00e9todo finder deve existir (EJB 2.0: 9.5.2).
-CHKJ2050.find.clh.ejb20=CHKJ2050W: Pelo menos um m\u00e9todo finder deve existir (EJB 2.0: 9.6.2).
-CHKJ2050.find.blh.ejb20=CHKJ2050W: Pelo menos um m\u00e9todo finder deve existir (EJB 2.0: 9.6.2).
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: Esta interface deve definir pelo menos um m\u00e9todo home (EJB 2.0: 9.5.4).
-CHKJ2050.home.brh.ejb20=CHKJ2050W: Esta interface deve definir pelo menos um m\u00e9todo home (EJB 2.0: 9.5.4).
-CHKJ2050.home.clh.ejb20=CHKJ2050W: Esta interface deve definir pelo menos um m\u00e9todo home (EJB 2.0: 9.6.4).
-CHKJ2050.home.blh.ejb20=CHKJ2050W: Esta interface deve definir pelo menos um m\u00e9todo home (EJB 2.0: 9.6.4).
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: Esta classe deve definir pelo menos um m\u00e9todo ejbHome (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: Esta classe deve definir pelo menos um m\u00e9todo ejbHome (EJB 2.0: 9.5.4).
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: Esta classe deve definir pelo menos um m\u00e9todo ejbHome (EJB 2.0: 9.6.4).
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: Esta classe deve definir pelo menos um m\u00e9todo ejbHome (EJB 2.0: 9.6.4).
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() deve existir nesta classe (EJB 2.0: 12.2.12).
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() deve existir nesta classe (EJB 2.0: 10.6.13).
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) deve existir nesta classe (EJB 2.0: 12.2.12).
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) deve existir nesta classe (EJB 2.0: 10.6.13).
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: Um m\u00e9todo ejbSelect deve existir (EJB 2.0: 10.5.2, 10.6.7).
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey deve existir (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey deve existir (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey deve existir (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey deve existir (EJB 2.0: 9.5.2, 12.2.9).
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} deve existir (EJB 2.0: 12.1.4.1).
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} deve existir (EJB 2.0: 10.5.2).
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} deve existir (EJB 2.0: 12.1.4.1, 12.2.4).
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: Exce\u00e7\u00e3o de aplicativo {1} em {0} deve estender java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2404.m.ejb20=CHKJ2404W: Exce\u00e7\u00e3o de aplicativo {0} deve estender java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.i.ejb20=CHKJ2416W: Exce\u00e7\u00e3o de aplicativo {1} em {0} n\u00e3o deve estender java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-CHKJ2416.m.ejb20=CHKJ2416W: Exce\u00e7\u00e3o de aplicativo {0} n\u00e3o deve estender java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1).
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {0} em {1} deve ser p\u00fablico (EJB 2.0: 15.7.5).
-CHKJ2492.mb.m.ejb20=CHKJ2492W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 15.7.5).
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {0} em {1} deve ser p\u00fablico (EJB 2.0: 10.5.2).
-CHKJ2492.cb.m.ejb20=CHKJ2492W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 10.5.2).
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {0} em {1} deve ser p\u00fablico (EJB 2.0: 12.1.4.1).
-CHKJ2492.bb.m.ejb20=CHKJ2492W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 12.1.4.1).
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {0} em {1} deve ser p\u00fablico (EJB 2.0: 7.6).
-CHKJ2492.sb.m.ejb20=CHKJ2492W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 7.6).
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} n\u00e3o deve ser final (EJB 2.0: 15.7.5).
-CHKJ2493.mb.m.ejb20=CHKJ2493W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 15.7.5).
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} n\u00e3o deve ser final (EJB 2.0: 10.5.2).
-CHKJ2493.cb.m.ejb20=CHKJ2493W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 10.5.2).
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} n\u00e3o deve ser final (EJB 2.0: 12.1.4.1).
-CHKJ2493.bb.m.ejb20=CHKJ2493W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 12.1.4.1).
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} n\u00e3o deve ser final (EJB 2.0: 7.6).
-CHKJ2493.sb.m.ejb20=CHKJ2493W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 7.6).
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 15.7.5).
-CHKJ2494.mb.m.ejb20=CHKJ2494W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 15.7.5).
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.5.2).
-CHKJ2494.cb.m.ejb20=CHKJ2494W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.5.2).
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.1.4.1).
-CHKJ2494.bb.m.ejb20=CHKJ2494W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.1.4.1).
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 7.6).
-CHKJ2494.sb.m.ejb20=CHKJ2494W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 7.6).
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} deve retornar vazio (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 15.7.5).
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} deve retornar vazio (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 10.5.2).
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} deve retornar vazio (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 12.1.4.1).
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} deve retornar vazio (EJB 2.0: 7.6).
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 7.6).
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} deve ser p\u00fablico (EJB 2.0: 15.7.3).
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} deve ser p\u00fablico (EJB 2.0: 10.6.4).
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} deve ser p\u00fablico (EJB 2.0: 12.2.3).
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} deve ser p\u00fablico (EJB 2.0: 7.10.3).
-CHKJ2421.mb.m.ejb20=CHKJ2421W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 15.7.3).
-CHKJ2421.cb.m.ejb20=CHKJ2421W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 10.6.4).
-CHKJ2421.bb.m.ejb20=CHKJ2421W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 12.2.3).
-CHKJ2421.sb.m.ejb20=CHKJ2421W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 7.10.3).
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} n\u00e3o deve ser final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} n\u00e3o deve ser final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} n\u00e3o deve ser final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} n\u00e3o deve ser final (EJB 2.0: 15.7.3).
-CHKJ2422.sb.m.ejb20=CHKJ2422W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 7.10.3).
-CHKJ2422.cb.m.ejb20=CHKJ2422W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 10.6.4).
-CHKJ2422.bb.m.ejb20=CHKJ2422W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 12.2.3).
-CHKJ2422.mb.m.ejb20=CHKJ2422W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 15.7.3).
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 7.10.3).
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.4).
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.3).
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 15.7.3).
-CHKJ2423.sb.m.ejb20=CHKJ2423W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 7.10.3).
-CHKJ2423.cb.m.ejb20=CHKJ2423W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.4).
-CHKJ2423.bb.m.ejb20=CHKJ2423W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.3).
-CHKJ2423.mb.m.ejb20=CHKJ2423W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 15.7.3).
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} deve retornar {1} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} deve retornar {1} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} deve retornar vazio (EJB 2.0: 7.10.3).
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} deve retornar vazio (EJB 2.0: 15.7.3).
-CHKJ2424.cb.m.ejb20=CHKJ2424W: Este m\u00e9todo deve retornar {0} (EJB 2.0: 10.6.4).
-CHKJ2424.bb.m.ejb20=CHKJ2424W: Este m\u00e9todo deve retornar {0} (EJB 2.0: 12.2.3).
-CHKJ2424.sb.m.ejb20=CHKJ2424W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 7.10.3).
-CHKJ2424.mb.m.ejb20=CHKJ2424W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 15.7.3).
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.3).
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.3).
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.4).
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.3).
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} deve emitir javax.ejb.CreateException (EJB 2.0: 10.6.4).
-CHKJ2497.cb.m.ejb20=CHKJ2497W: Este m\u00e9todo deve emitir javax.ejb.CreateException (EJB 2.0: 10.6.4).
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} n\u00e3o deve emitir exce\u00e7\u00f5es de aplicativo (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: Este m\u00e9todo n\u00e3o deve emitir exce\u00e7\u00f5es de aplicativo (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} n\u00e3o deve emitir exce\u00e7\u00f5es de aplicativo (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: Este m\u00e9todo n\u00e3o deve emitir exce\u00e7\u00f5es de aplicativo (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} n\u00e3o deve emitir exce\u00e7\u00f5es de aplicativo (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2).
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: Este m\u00e9todo n\u00e3o deve emitir exce\u00e7\u00f5es de aplicativo (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} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6).
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6).
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} deve ser p\u00fablico (EJB 2.0: 10.6.5).
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} deve ser p\u00fablico (EJB 2.0: 12.2.4).
-CHKJ2426.cb.m.ejb20=CHKJ2426W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 10.6.5).
-CHKJ2426.bb.m.ejb20=CHKJ2426W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 12.2.4).
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} n\u00e3o deve ser final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} n\u00e3o deve ser final (EJB 2.0: 12.2.4).
-CHKJ2427.cb.m.ejb20=CHKJ2427W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 10.6.5).
-CHKJ2427.bb.m.ejb20=CHKJ2427W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 12.2.4).
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.5).
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.4).
-CHKJ2428.cb.m.ejb20=CHKJ2428W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.5).
-CHKJ2428.bb.m.ejb20=CHKJ2428W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.4).
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} deve retornar vazio (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} deve retornar vazio (EJB 2.0: 12.2.4).
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 10.6.5).
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 12.2.4).
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6).
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6).
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} deve existir para que {0} seja chamado (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} deve existir para que {0} seja chamado (EJB 2.0: 12.1.4.1).
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} deve existir para que este m\u00e9todo seja chamado (EJB 2.0: 10.5.2, 10.6.6).
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} deve existir para que este m\u00e9todo seja chamado (EJB 2.0: 12.1.4.1).
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} deve ser p\u00fablico (EJB 2.0: 10.6.6).
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} deve ser p\u00fablico. (EJB 2.0: 12.2.6).
-CHKJ2431.cb.m.ejb20=CHKJ2431W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 10.6.6).
-CHKJ2431.bb.m.ejb20=CHKJ2431W: Este m\u00e9todo deve ser p\u00fablico. (EJB 2.0: 12.2.6).
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.6).
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.6).
-CHKJ2439.cb.m.ejb20=CHKJ2439W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.6).
-CHKJ2439.bb.m.ejb20=CHKJ2439W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.6).
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.6).
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.6).
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.6).
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6).
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6).
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} deve ser p\u00fablico (EJB 2.0: 12.2.5).
-CHKJ2457.bb.m.ejb20=CHKJ2457W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 12.2.5).
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} n\u00e3o deve ser final (EJB 2.0: 12.2.5).
-CHKJ2458.bb.m.ejb20=CHKJ2458W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 12.2.5).
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.5).
-CHKJ2459.bb.m.ejb20=CHKJ2459W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.5).
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: {0} no m\u00e9todo {1} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.5).
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.5).
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} deve retornar {1} ou uma coleta deles (EJB 2.0: 12.2.5).
-CHKJ2407.bb.m.ejb20=CHKJ2407W: Este m\u00e9todo deve retornar {0} ou uma coleta deles (EJB 2.0: 12.2.5).
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6).
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2498.bb.m.ejb20=CHKJ2498W: Este m\u00e9todo n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir. O cont\u00eainer fornece a implementa\u00e7\u00e3o deste m\u00e9todo (EJB 2.0: 10.5.2, 10.6.2).
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir. O cont\u00eainer fornece a implementa\u00e7\u00e3o deste m\u00e9todo (EJB 2.0: 10.5.2, 10.6.2).
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir. Somente beans CMP podem ter m\u00e9todos ejbSelect (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir. Somente beans CMP podem ter m\u00e9todos ejbSelect (EJB 2.0: 12.1.5).
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir. Somente beans CMP podem ter m\u00e9todos ejbSelect (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir. Somente beans CMP podem ter m\u00e9todos ejbSelect (EJB 2.0: 7.6.1).
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir. Somente beans CMP podem ter m\u00e9todos ejbSelect (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir. Somente beans CMP podem ter m\u00e9todos ejbSelect (EJB 2.0: 7.8.2).
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 10.5.2, 10.5.7).
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() n\u00e3o deve existir (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 10.6.2).
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() n\u00e3o deve existir (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 15.7.2).
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() n\u00e3o deve existir (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 12.2.2).
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() n\u00e3o deve existir (EJB 2.0: 7.10.2).
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 7.10.2).
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir (EJB 2.0: 7.10.8).
-CHKJ2502.slh.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 7.10.8).
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} n\u00e3o deve existir (EJB 2.0: 7.10.6).
-CHKJ2502.srh.m.ejb20=CHKJ2502I: Este m\u00e9todo n\u00e3o deve existir (EJB 2.0: 7.10.6).
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.i.ejb20=CHKJ2411W: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.i.ejb20=CHKJ2411W: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "ejb" (EJB 2.0: 12.2.7).
-CHKJ2411.sb.m.ejb20=CHKJ2411W: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "ejb" (EJB 2.0: 7.10.4).
-CHKJ2411.cb.m.ejb20=CHKJ2411W: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "ejb" (EJB 2.0: 10.6.8).
-CHKJ2411.bb.m.ejb20=CHKJ2411W: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "ejb" (EJB 2.0: 12.2.7).
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} deve ser p\u00fablico (EJB 2.0: 7.10.4).
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} deve ser p\u00fablico (EJB 2.0: 10.6.8).
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} deve ser p\u00fablico (EJB 2.0: 12.2.7).
-CHKJ2441.sb.m.ejb20=CHKJ2441W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 7.10.4).
-CHKJ2441.cb.m.ejb20=CHKJ2441W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 10.6.8).
-CHKJ2441.bb.m.ejb20=CHKJ2441W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 12.2.7).
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} n\u00e3o deve ser final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} n\u00e3o deve ser final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} n\u00e3o deve ser final (EJB 2.0: 12.2.7).
-CHKJ2442.sb.m.ejb20=CHKJ2442W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 7.10.4).
-CHKJ2442.cb.m.ejb20=CHKJ2442W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 10.6.8).
-CHKJ2442.bb.m.ejb20=CHKJ2442W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 12.2.7).
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 7.10.4).
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.8).
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.7).
-CHKJ2443.sb.m.ejb20=CHKJ2443W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 7.10.4).
-CHKJ2443.cb.m.ejb20=CHKJ2443W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 10.6.8).
-CHKJ2443.bb.m.ejb20=CHKJ2443W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 12.2.7).
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.7).
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.4).
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.8).
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.7).
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6).
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6).
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6).
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6).
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} deve ser p\u00fablico (EJB 2.0: 15.7.4).
-CHKJ2445.mb.m.ejb20=CHKJ2445W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 15.7.4).
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} n\u00e3o deve ser final (EJB 2.0: 15.7.4).
-CHKJ2446.mb.m.ejb20=CHKJ2446W: Este m\u00e9todo n\u00e3o deve ser final (EJB 2.0: 15.7.4).
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} n\u00e3o deve ser est\u00e1tico (EJB 2.0: 15.7.4).
-CHKJ2447.mb.m.ejb20=CHKJ2447W: Este m\u00e9todo n\u00e3o deve ser est\u00e1tico (EJB 2.0: 15.7.4).
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} deve retornar vazio (EJB 2.0: 15.7.4).
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: Este m\u00e9todo deve retornar vazio (EJB 2.0: 15.7.4).
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} deve ser p\u00fablico (EJB 2.0: 10.3.1).
-CHKJ2449.cb.m.ejb20=CHKJ2449W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 10.3.1).
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} deve ser abstrato (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2450.cb.m.ejb20=CHKJ2450W: Este m\u00e9todo deve ser abstrato (EJB 2.0: 10.3.1, 10.6.2).
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: {0} n\u00e3o deve ser exposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crc.m.ejb20=CHKJ2473W: Este m\u00e9todo n\u00e3o deve ser exposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.i.ejb20=CHKJ2473W: {0} n\u00e3o deve ser exposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2473.crh.m.ejb20=CHKJ2473W: Este m\u00e9todo n\u00e3o deve ser exposto (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: Esta interface deve seguir regras RMI-IIOP para interfaces remotas (EJB 2.0: 12.2.9).
-CHKJ2461.home.crh.ejb20=CHKJ2461W: Esta interface deve seguir regras RMI-IIOP para interfaces remotas (EJB 2.0: 10.6.10).
-CHKJ2461.home.srh.ejb20=CHKJ2461W: Esta interface deve seguir regras RMI-IIOP para interfaces remotas (EJB 2.0: 7.10.6).
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.i.ejb20=CHKJ2462I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.i.ejb20=CHKJ2462I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.i.ejb20=CHKJ2462I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2462.clh.m.ejb20=CHKJ2462I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2462.brh.m.ejb20=CHKJ2462I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2462.crh.m.ejb20=CHKJ2462I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2462.blh.m.ejb20=CHKJ2462I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "create" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.i.ejb20=CHKJ2463I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.i.ejb20=CHKJ2463I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.i.ejb20=CHKJ2463I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2463.clh.m.ejb20=CHKJ2463I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2463.brh.m.ejb20=CHKJ2463I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2463.crh.m.ejb20=CHKJ2463I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2463.blh.m.ejb20=CHKJ2463I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "find" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.i.ejb20=CHKJ2464I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.i.ejb20=CHKJ2464I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.i.ejb20=CHKJ2464I: O nome do m\u00e9todo {0} n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.5.4, 12.2.11).
-CHKJ2464.clh.m.ejb20=CHKJ2464I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2464.brh.m.ejb20=CHKJ2464I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2464.crh.m.ejb20=CHKJ2464I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.6.4, 10.6.12).
-CHKJ2464.blh.m.ejb20=CHKJ2464I: O nome deste m\u00e9todo n\u00e3o deve come\u00e7ar com "remove" (EJB 2.0: 9.5.4, 12.2.11).
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} deve emitir javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} deve emitir javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} deve emitir javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} deve emitir javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} deve emitir javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} deve emitir javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2467.srh.m.ejb20=CHKJ2467W: Este m\u00e9todo deve emitir javax.ejb.CreateException (EJB 2.0: 7.10.6).
-CHKJ2467.slh.m.ejb20=CHKJ2467W: Este m\u00e9todo deve emitir javax.ejb.CreateException (EJB 2.0: 7.10.8).
-CHKJ2467.crh.m.ejb20=CHKJ2467W: Este m\u00e9todo deve emitir javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2467.clh.m.ejb20=CHKJ2467W: Este m\u00e9todo deve emitir javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2467.brh.m.ejb20=CHKJ2467W: Este m\u00e9todo deve emitir javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2467.blh.m.ejb20=CHKJ2467W: Este m\u00e9todo deve emitir javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} deve retornar {1} (EJB 2.0: 9.6.1, 12.2.11).
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 6.3.1, 7.10.6).
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 6.4.1, 7.10.8).
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 6.3.1, 7.8, 7.10.6).
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 6.4.1, 7.8, 7.10.8).
-CHKJ2402.crh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.5.1, 10.6.10).
-CHKJ2402.clh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.6.1, 10.6.12).
-CHKJ2402.brh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.5.1, 12.2.9).
-CHKJ2402.blh.m.ejb20=CHKJ2402E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.6.1, 12.2.11).
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} deve ser o m\u00e9todo create() (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} deve ser o m\u00e9todo create() (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.srh.m.ejb20=CHKJ2476E: Este m\u00e9todo deve ser create() (EJB 2.0: 7.8, 7.10.6).
-CHKJ2476.slh.m.ejb20=CHKJ2476E: Este m\u00e9todo deve ser create() (EJB 2.0: 7.8, 7.10.8).
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} deve ser o m\u00e9todo ejbCreate() (EJB 2.0: 7.8).
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: Este m\u00e9todo deve ser ejbCreate() (EJB 2.0: 7.8).
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 12.2.11).
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: O m\u00e9todo correspondente {0} deve existir em {1} (EJB 2.0: 7.10.6).
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: O m\u00e9todo correspondente {0} deve existir em {1} (EJB 2.0: 7.10.8).
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: O m\u00e9todo correspondente {0} deve existir em {1} (EJB 2.0: 10.6.10).
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: O m\u00e9todo correspondente {0} deve existir em {1} (EJB 2.0: 10.6.12).
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: O m\u00e9todo correspondente {0} deve existir em {1} (EJB 2.0: 12.2.9).
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: O m\u00e9todo correspondente {0} deve existir em {1} (EJB 2.0: 12.2.11).
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.6).
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: O m\u00e9todo correspondente {1} para {0} deve existir em {2} (EJB 2.0: 12.2.11).
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 10.5.2, 10.6.10).
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 10.5.2, 10.6.12).
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 12.2.9).
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 12.2.11).
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.6).
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6).
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6).
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6).
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} deve emitir javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} deve emitir javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} deve emitir javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} deve emitir javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2477.crh.m.ejb20=CHKJ2477W: Este m\u00e9todo deve emitir javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2477.brh.m.ejb20=CHKJ2477W: Este m\u00e9todo deve emitir javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2477.clh.m.ejb20=CHKJ2477W: Este m\u00e9todo deve emitir javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2477.blh.m.ejb20=CHKJ2477W: Este m\u00e9todo deve emitir javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12).
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.crh.m.ejb20=CHKJ2478I: Este m\u00e9todo n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.clh.m.ejb20=CHKJ2478I: Este m\u00e9todo n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.brh.m.ejb20=CHKJ2478I: Este m\u00e9todo n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.blh.m.ejb20=CHKJ2478I: Este m\u00e9todo n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.cb.m.ejb20=CHKJ2478I: Este m\u00e9todo n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 10.5.8.4).
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-CHKJ2478.bb.m.ejb20=CHKJ2478I: Este m\u00e9todo n\u00e3o deve emitir ObjectNotFoundException (EJB 2.0: 12.1.8.4).
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} deve retornar {1} ou uma coleta deles (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} deve retornar {1} ou uma coleta deles (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} deve retornar {1} ou uma coleta deles (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} deve retornar {1} ou uma coleta deles (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-CHKJ2403.brh.m.ejb20=CHKJ2403W: Este m\u00e9todo deve retornar {0} ou uma coleta deles (EJB 2.0: 9.5.2, 12.1.7, 12.2.9).
-CHKJ2403.blh.m.ejb20=CHKJ2403W: Este m\u00e9todo deve retornar {0} ou uma coleta deles (EJB 2.0: 9.6.2, 12.1.7, 12.2.11).
-CHKJ2403.crh.m.ejb20=CHKJ2403W: Este m\u00e9todo deve retornar {0} ou uma coleta deles (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2).
-CHKJ2403.clh.m.ejb20=CHKJ2403W: Este m\u00e9todo deve retornar {0} ou uma coleta deles (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2).
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} deve existir em {2} para {0} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} deve existir em {2} para {0} (EJB 2.0: 10.6.10).
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} deve existir em {1} (EJB 2.0: 12.2.9).
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} deve existir em {1} (EJB 2.0: 10.6.10).
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} deve existir em {2} para {0} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} deve existir em {2} para {0} (EJB 2.0: 10.6.2).
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} deve existir em {1} (EJB 2.0: 12.2.11).
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} deve existir em {1} (EJB 2.0: 10.6.2).
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.6).
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} deve estar associado a um elemento de consulta em ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.clh.m.ejb20=CHKJ2495I: Este m\u00e9todo deve estar associado a um elemento de consulta em ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} deve estar associado a um elemento de consulta em ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-CHKJ2495.crh.m.ejb20=CHKJ2495I: Este m\u00e9todo deve estar associado a um elemento de consulta em ejb-jar.xml (EJB 2.0: 10.5.6, 10.6.14).
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.5).
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6).
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 12.2.8).
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6).
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: Este m\u00e9todo deve emitir java.rmi.RemoteException (EJB 2.0: 10.6.9).
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: Este m\u00e9todo n\u00e3o deve emitir java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6).
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} deve emitir {1} para {2} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} deve emitir {1} para {2} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} deve emitir {1} para {2} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} deve emitir {1} para {2} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} deve emitir {1} para {2} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} deve emitir {1} para {2} (EJB 2.0: 7.10.8).
-CHKJ2465.brh.m.ejb20=CHKJ2465W: Este m\u00e9todo deve emitir {0} para {1} (EJB 2.0: 12.2.9).
-CHKJ2465.blh.m.ejb20=CHKJ2465W: Este m\u00e9todo deve emitir {0} para {1} (EJB 2.0: 12.2.11).
-CHKJ2465.crh.m.ejb20=CHKJ2465W: Este m\u00e9todo deve emitir {0} para {1} (EJB 2.0: 10.6.10).
-CHKJ2465.clh.m.ejb20=CHKJ2465W: Este m\u00e9todo deve emitir {0} para {1} (EJB 2.0: 10.6.12).
-CHKJ2465.srh.m.ejb20=CHKJ2465W: Este m\u00e9todo deve emitir {0} para {1} (EJB 2.0: 7.10.6).
-CHKJ2465.slh.m.ejb20=CHKJ2465W: Este m\u00e9todo deve emitir {0} para {1} (EJB 2.0: 7.10.8).
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: {1} no m\u00e9todo {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 12.2.9).
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.6).
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 10.6.10).
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 9.5.4, 12.2.9).
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} n\u00e3o deve expor o tipo {1} (EJB 2.0: 7.10.5).
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} n\u00e3o deve expor o tipo {1} (EJB 2.0: 10.6.10).
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} n\u00e3o deve expor o tipo {1} (EJB 2.0: 12.2.9).
-CHKJ2466.crh.m.ejb20=CHKJ2466I: Este m\u00e9todo n\u00e3o deve expor o tipo {0} (EJB 2.0: 10.6.10).
-CHKJ2466.brh.m.ejb20=CHKJ2466I: Este m\u00e9todo n\u00e3o deve expor o tipo {0} (EJB 2.0: 12.2.9).
-CHKJ2466.src.m.ejb20=CHKJ2466I: Este m\u00e9todo n\u00e3o deve expor o tipo {0} (EJB 2.0: 7.10.5).
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: Esta interface deve seguir regras RMI-IIOP para interfaces remotas (EJB 2.0: 7.10.5).
-CHKJ2468.crc.ejb20=CHKJ2468W: Esta interface deve seguir regras RMI-IIOP para interfaces remotas (EJB 2.0: 10.6.9).
-CHKJ2468.brc.ejb20=CHKJ2468W: Esta interface deve seguir regras RMI-IIOP para interfaces remotas (EJB 2.0: 12.2.8).
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: {0} no m\u00e9todo {1} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: {0} no m\u00e9todo {1} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: {0} no m\u00e9todo {1} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.8).
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 7.10.5).
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 10.6.9).
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} deve ser serializ\u00e1vel no runtime (EJB 2.0: 12.2.8).
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: {1} no m\u00e9todo {0} n\u00e3o pode ser um argumento ou tipo de resultado (EJB 2.0: 6.7.2).
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} n\u00e3o deve transmitir {1} como um argumento ou resultado (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} n\u00e3o deve transmitir {1} como um argumento ou resultado (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.brc.m.ejb20=CHKJ2472W: Este m\u00e9todo n\u00e3o deve transmitir {0} como um argumento ou resultado (EJB 2.0: 9.7.2, 12.2.8).
-CHKJ2472.crc.m.ejb20=CHKJ2472W: Este m\u00e9todo n\u00e3o deve transmitir {0} como um argumento ou resultado (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1).
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} n\u00e3o pode ser um argumento ou tipo de resultado (EJB 2.0: 6.7.2).
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} n\u00e3o deve expor {1} (EJB 2.0: 10.3.1, 10.3.10.1).
-CHKJ2474.crc.m.ejb20=CHKJ2474W: Este m\u00e9todo n\u00e3o deve expor {0} (EJB 2.0: 10.3.1, 10.3.10.1).
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: {0} n\u00e3o deve ser exposto (EJB 2.0: 10.3.1, 10.3.10.1).
-CJKJ2490.crc.m.ejb20=CHKJ2490W: Este m\u00e9todo n\u00e3o deve ser exposto (EJB 2.0: 10.3.1, 10.3.10.1).
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} deve ser abstrato (EJB 2.0: 10.5.7, 10.6.7).
-CHKJ2485.cb.m.ejb20=CHKJ2485W: Este m\u00e9todo deve ser abstrato (EJB 2.0: 10.5.7, 10.6.7).
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} deve ser p\u00fablico (EJB 2.0: 10.6.7).
-CHKJ2487.cb.m.ejb20=CHKJ2487W: Este m\u00e9todo deve ser p\u00fablico (EJB 2.0: 10.6.7).
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} deve emitir javax.ejb.FinderException (EJB 2.0: 10.6.7).
-CHKJ2488.cb.m.ejb20=CHKJ2488W: Este m\u00e9todo deve emitir javax.ejb.FinderException (EJB 2.0: 10.6.7).
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} deve retornar {1} ou uma coleta deles (EJB 2.0: 10.5.7, 11.2.2).
-CHKJ2486.cb.m.ejb20=CHKJ2486W: Este m\u00e9todo deve retornar {0} ou uma coleta deles (EJB 2.0: 10.5.7, 11.2.2).
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} deve estar associado a um elemento de consulta em ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-CHKJ2496.cb.m.ejb20=CHKJ2496W: Este m\u00e9todo deve estar associado a um elemento de consulta em ejb-jar.xml (EJB 2.0: 10.5.7, 10.6.14).
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: O m\u00e9todo {0} precisa de {1} para existir em {2} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.i.ejb20=CHKJ2023W: O m\u00e9todo {0} precisa de {1} para existir em {2} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.i.ejb20=CHKJ2023W: O m\u00e9todo {0} precisa de {1} para existir em {2} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.i.ejb20=CHKJ2023W: O m\u00e9todo {0} precisa de {1} para existir em {2} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.i.ejb20=CHKJ2023W: O m\u00e9todo {0} precisa de {1} para existir em {2} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.i.ejb20=CHKJ2023W: O m\u00e9todo {0} precisa de {1} para existir em {2} (EJB 2.0: 10.6.11).
-CHKJ2023.src.m.ejb20=CHKJ2023W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 7.10.5).
-CHKJ2023.slc.m.ejb20=CHKJ2023W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 7.10.7).
-CHKJ2023.brc.m.ejb20=CHKJ2023W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 12.2.8).
-CHKJ2023.blc.m.ejb20=CHKJ2023W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 12.2.10).
-CHKJ2023.crc.m.ejb20=CHKJ2023W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 10.6.9).
-CHKJ2023.clc.m.ejb20=CHKJ2023W: O m\u00e9todo {0} deve existir em {1} (EJB 2.0: 10.6.11).
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} deve retornar {1} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} deve retornar {1} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} deve retornar {1} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} deve retornar {1} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} deve retornar {1} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} deve retornar {1} (EJB 2.0: 12.2.10).
-CHKJ2470.src.m.ejb20=CHKJ2470E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 7.10.5).
-CHKJ2470.slc.m.ejb20=CHKJ2470E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 7.10.7).
-CHKJ2470.crc.m.ejb20=CHKJ2470E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 10.6.9).
-CHKJ2470.clc.m.ejb20=CHKJ2470E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 10.6.11).
-CHKJ2470.brc.m.ejb20=CHKJ2470E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 12.2.8).
-CHKJ2470.blc.m.ejb20=CHKJ2470E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 12.2.10).
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} deve emitir {1} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} deve emitir {1} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} deve emitir {1} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} deve emitir {1} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} deve emitir {1} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} deve emitir {1} (EJB 2.0: 12.2.10).
-CHKJ2471.src.m.ejb20=CHKJ2471W: Este m\u00e9todo deve emitir {0} (EJB 2.0: 7.10.5).
-CHKJ2471.slc.m.ejb20=CHKJ2471W: Este m\u00e9todo deve emitir {0} (EJB 2.0: 7.10.7).
-CHKJ2471.crc.m.ejb20=CHKJ2471W: Este m\u00e9todo deve emitir {0} (EJB 2.0: 10.6.9).
-CHKJ2471.clc.m.ejb20=CHKJ2471W: Este m\u00e9todo deve emitir {0} (EJB 2.0: 10.6.11).
-CHKJ2471.brc.m.ejb20=CHKJ2471W: Este m\u00e9todo deve emitir {0} (EJB 2.0: 12.2.8).
-CHKJ2471.blc.m.ejb20=CHKJ2471W: Este m\u00e9todo deve emitir {0} (EJB 2.0: 12.2.10).
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0} \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 6.5).
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0} \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 6.5).
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0} \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.9).
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0} \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.10).
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0} \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.9).
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0} \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.10).
-CHKJ2469.src.m.ejb20=CHKJ2469W: Este m\u00e9todo \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 6.5).
-CHKJ2469.slc.m.ejb20=CHKJ2469W: Este m\u00e9todo \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 6.5).
-CHKJ2469.crc.m.ejb20=CHKJ2469W: Este m\u00e9todo \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.9).
-CHKJ2469.clc.m.ejb20=CHKJ2469W: Este m\u00e9todo \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.10).
-CHKJ2469.brc.m.ejb20=CHKJ2469W: Este m\u00e9todo \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.9).
-CHKJ2469.blc.m.ejb20=CHKJ2469W: Este m\u00e9todo \u00e9 fornecido pelo cont\u00eainer (EJB 2.0: 9.10).
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} deve ser findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} deve ser findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} deve ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} deve ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} deve ser findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} deve ser findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2475.crh.m.ejb20=CHKJ2475W: Este m\u00e9todo deve ser findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2475.clh.m.ejb20=CHKJ2475W: Este m\u00e9todo deve ser findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: Este m\u00e9todo deve ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: Este m\u00e9todo deve ser findByPrimaryKey(Object) (EJB 2.0: 10.8.3).
-CHKJ2475.brh.m.ejb20=CHKJ2475W: Este m\u00e9todo deve ser findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2475.blh.m.ejb20=CHKJ2475W: Este m\u00e9todo deve ser findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 12.2.11).
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} deve retornar {1} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} deve retornar {1} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} deve retornar {1} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} deve retornar {1} (EJB 2.0: 9.6.2, 12.2.11).
-CHKJ2479.crh.m.ejb20=CHKJ2479E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.5.2, 10.6.10).
-CHKJ2479.clh.m.ejb20=CHKJ2479E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.6.2, 10.6.12).
-CHKJ2479.brh.m.ejb20=CHKJ2479E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.5.2, 12.2.9).
-CHKJ2479.blh.m.ejb20=CHKJ2479E: Este m\u00e9todo deve retornar {0} (EJB 2.0: 9.6.2, 12.2.11).
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: O campo tempor\u00e1rio {0} n\u00e3o deve ser do tipo {1} (EJB 2.0: 7.4.1).
-CHKJ2452.sb.m.ejb20=CHKJ2452W: Um campo tempor\u00e1rio n\u00e3o deve ser do tipo {0} (EJB 2.0: 7.4.1).
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: Os campos tempor\u00e1rios ({0}) n\u00e3o s\u00e3o recomend\u00e1veis (EJB 2.0: 7.4.1).
-CHKJ2453.sb.m.ejb20=CHKJ2453W: Os campos tempor\u00e1rios n\u00e3o s\u00e3o recomend\u00e1veis (EJB 2.0: 7.4.1).
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: {0} n\u00e3o deve ser definido (EJB 2.0: 10.3.1).
-CHKJ2454.cb.m.ejb20=CHKJ2454W: {0} n\u00e3o deve ser definido (EJB 2.0: 10.3.1).
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} deve come\u00e7ar com uma letra min\u00fascula (EJB 2.0: 10.3.1).
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} deve come\u00e7ar com uma letra min\u00fascula (EJB 2.0: 10.3.1).
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} deve ser declarado como um <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} deve ser declarado como um <cmp-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} deve ser declarado como um <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} deve ser declarado como um <cmr-field> (EJB 2.0: 10.3.1, 10.3.13).
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: {0} n\u00e3o deve ser exposto (EJB 2.0: 10.3.1).
-CHKJ2483.cb.m.ejb20=CHKJ2483W: {0} n\u00e3o deve ser exposto (EJB 2.0: 10.3.1).
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} deve ser um tipo primitivo ou serializ\u00e1vel (EJB 2.0: 10.3.1).
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} deve ser um tipo primitivo ou serializ\u00e1vel (EJB 2.0: 10.3.1).
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: O campo {0} deve ser do tipo {1} (EJB 2.0: 10.8.1).
-CHKJ2489.cb.m.ejb20=CHKJ2489W: Este campo deve ser do tipo {0} (EJB 2.0: 10.8.1).
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: O campo {0} deve ser p\u00fablico (EJB 2.0: 10.8.2).
-CHKJ2205.kc.m.ejb20=CHKJ2205W: Este campo deve ser p\u00fablico (EJB 2.0: 10.8.2).
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: O campo {0} deve ser um <cmp-field> (EJB 2.0: 10.8.2).
-CHKJ2206.kc.m.ejb20=CHKJ2206W: Este campo deve ser um <cmp-field> (EJB 2.0: 10.8.2).
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: Este bean deve fornecer um <local-home> (EJB 2.0: 7.10.1).
-CHKJ2881.s.ejb20=CHKJ2881W: Este bean deve fornecer um <home> (EJB 2.0: 7.10.1).
-CHKJ2882.s.ejb20=CHKJ2882W: Este bean deve fornecer um <local> (EJB 2.0: 7.10.1).
-CHKJ2883.s.ejb20=CHKJ2883W: Este bean deve fornecer um <remote> (EJB 2.0: 7.10.1).
-CHKJ2884.s.ejb20=CHKJ2884W: Este bean deve fornecer um <local-home> ou um <home> (EJB 2.0: 7.10.1).
-CHKJ2885.s.ejb20=CHKJ2885W: Este bean deve fornecer um <local> ou um <remote> (EJB 2.0: 7.10.1).
-CHKJ2880.c.ejb20=CHKJ2880W: Este bean deve fornecer um <local-home> (EJB 2.0: 10.6.1).
-CHKJ2881.c.ejb20=CHKJ2881W: Este bean deve fornecer um <home> (EJB 2.0: 10.6.1).
-CHKJ2882.c.ejb20=CHKJ2882W: Este bean deve fornecer um <local> (EJB 2.0: 10.6.1).
-CHKJ2883.c.ejb20=CHKJ2883W: Este bean deve fornecer um <remote> (EJB 2.0: 10.6.1).
-CHKJ2884.c.ejb20=CHKJ2884W: Este bean deve fornecer um <local-home> ou um <home> (EJB 2.0: 10.6.1).
-CHKJ2885.c.ejb20=CHKJ2885W: Este bean deve fornecer um <local> ou um <remote> (EJB 2.0: 10.6.1).
-CHKJ2880.b.ejb20=CHKJ2880W: Este bean deve fornecer um <local-home> (EJB 2.0: 12.2.1).
-CHKJ2881.b.ejb20=CHKJ2881W: Este bean deve fornecer um <home> (EJB 2.0: 12.2.1).
-CHKJ2882.b.ejb20=CHKJ2882W: Este bean deve fornecer um <local> (EJB 2.0: 12.2.1).
-CHKJ2883.b.ejb20=CHKJ2883W: Este bean deve fornecer um <remote> (EJB 2.0: 12.2.1).
-CHKJ2884.b.ejb20=CHKJ2884W: Este bean deve fornecer um <local-home> ou um <home> (EJB 2.0: 12.2.1).
-CHKJ2885.b.ejb20=CHKJ2885W: Este bean deve fornecer um <local> ou um <remote> (EJB 2.0: 12.2.1).
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} deve ser um identificador Java v\u00e1lido (EJB 2.0: 10.3.13, 11.2.6.1).
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} deve ser um identificador Java v\u00e1lido (EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1).
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} deve ser exclusivo no arquivo ejb-jar.xml (EJB 2.0: 10.3.13, 10.6.14, 11.2.2).
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> deve existir (EJB 2.0: 22.2, 22.5).
-CHKJ2859.ejb20=CHKJ2859W: O identificador reservado {0} n\u00e3o pode ser utilizado como um <ejb-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-CHKJ2860.ejb20=CHKJ2860W: O identificador reservado {0} n\u00e3o pode ser utilizado como um <abstract-schema-name> (EJB 2.0: 10.6.14, 11.2.6.1).
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} deve ser um identificador Java v\u00e1lido e deve come\u00e7ar com uma letra min\u00fascula (EJB 2.0: 10.3.1, 11.2.6.1).
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} deve ser um identificador Java v\u00e1lido e deve come\u00e7ar com uma letra min\u00fascula (EJB 2.0: 10.3.1, 11.2.6.1).
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} deve ter um m\u00e9todo set (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} deve ter um m\u00e9todo get (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} deve ter um m\u00e9todo set (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} deve ter um m\u00e9todo get (EJB 2.0: 10.3.1, 10.6.2).
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} deve ser um tipo primitivo Java ou um tipo serializ\u00e1vel Java (EJB 2.0: 10.3.1).
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} deve ser do tipo {1} ou uma coleta deles (EJB 2.0: 10.3.1).
-
-CHKJ2815.ejb20=CHKJ2815W: A classe de valor dependente {0} n\u00e3o pode ser um <cmr-field> (EJB 2.0: 10.3.3).
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> deve ser exclusivo no arquivo ejb-jar.xml (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> deve ser exclusivo dentro de uma<ejb-relation> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2818.ejb20=CHKJ2818I: O valor do elemento <multiplicity> deve ser "One" ou "Many" (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2821.ejb20=CHKJ2821I: <relationship-role-source> na fun\u00e7\u00e3o {0} deve fazer refer\u00eancia a um bean CMP existente (EJB 2.0: 10.3.2, 22.5).
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> deve ser utilizado com um <multiplicity> de "One" (EJB 2.0: 10.3.4.2, 22.5).
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} deve ser definido em {1} (EJB 2.0: 10.3.2, 22.5).
-CHKJ2867.ejb20=CHKJ2867I: Este bean pode ter apenas relacionamentos unidirecionais com outros beans (EJB 2.0: 10.3.2).
-CHKJ2868.ejb20=CHKJ2868I: O valor do elemento <cmr-field-type> deve ser "java.util.Collection" ou "java.util.Set" (EJB 2.0: 10.3.13, 22.5).
-CHKJ2869.ejb20=CHKJ2869I: Ao menos uma <ejb-relationship-role> deve definir um <cmr-field> (EJB 2.0: 10.3.2, 10.3.13, 22.5).
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} deve existir (EJB 2.0: 10.3.13).
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} deve referir-se a um bean CMP (EJB 2.0: 10.3.2, 10.3.13).
-
-CHKJ2872.ejb20=CHKJ2872E: O valor do elemento <cmp-version> deve ser "1.x" ou "2.x" (EJB 2.0: 22.5).
-CHKJ2873.ejb20=CHKJ2873W: Migrar a liga\u00e7\u00e3o de DataSource deste bean para uma liga\u00e7\u00e3o CMP Connection Factory.
-CHKJ2874.ejb20=CHKJ2874W: Migrar a liga\u00e7\u00e3o de DataSource padr\u00e3o deste m\u00f3dulo EJB para uma liga\u00e7\u00e3o CMP Connection Factory padr\u00e3o.
-
-###########################################################################
-#
-# 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/ejbvalidator_zh.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_zh.properties
deleted file mode 100644
index b702f86..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_zh.properties
+++ /dev/null
@@ -1,1528 +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=\u6b63\u5728\u9a8c\u8bc1 {0}\u3002
-
-LOC_CLASS=\u7c7b\uff1a{0}
-LOC_FIELD=\u5b57\u6bb5\uff1a{0}\uff0c\u7c7b\uff1a{1}
-LOC_METHOD=\u65b9\u6cd5\uff1a{0}\uff0c\u7c7b\uff1a{1}
-LOC_BEAN=\u4f01\u4e1a bean\uff1a{0}
-LOC_ROLE=<localRelationshipRoles>\uff1a{0}\uff0c\u4f01\u4e1a bean\uff1a{1}
-LOC_ROLEREF=<security-role-ref>\uff1a{0}
-LOC_METHODELEMENT=<method> \u5143\u7d20\uff1a{0}
-LOC_METHODPERMISSION=<method-permission> \u5143\u7d20\uff1a{0}
-LOC_METHODTRANSACTION=<container-transaction> \u5143\u7d20\uff1a{0}
-LOC_EJBRELATION=<ejb-relation>\uff1a{0}
-LOC_EJBRELATIONSHIPROLE=<ejb-relationship-role>\uff1a{0}\uff0c<ejb-relation>\uff1a{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\uff1a\u8fd0\u884c EJB \u9a8c\u8bc1\u5668\u65f6\u53d1\u751f\u5185\u90e8\u9519\u8bef\u3002\u6709\u5173\u8be6\u7ec6\u4fe1\u606f\uff0c\u8bf7\u9605\u8bfb\u65e5\u5fd7\u3002
-CHKJ2852=CHKJ2852W\uff1a\u9a8c\u8bc1 {0} \u65f6\u53d1\u751f\u5185\u90e8\u9519\u8bef\u3002\u6b63\u5728\u9a8c\u8bc1\u7684 bean \u662f {1}\u3002
-CHKJ2433=CHKJ2433W\uff1a\u4e0d\u80fd\u9a8c\u8bc1 {0}\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u53cd\u6620 {1}\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2907=CHKJ2907E\uff1a\u4e0d\u80fd\u53cd\u6620\u7c7b\u578b {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2905=CHKJ2905W\uff1a\u56e0\u4e3a\u672a\u80fd\u88c5\u5165 ejb-jar.xml\uff0c\u6240\u4ee5\u201cEJB \u9a8c\u8bc1\u5668\u201d\u672a\u8fd0\u884c\u3002\u6709\u5173\u66f4\u591a\u4fe1\u606f\uff0c\u8fd0\u884c XML \u9a8c\u8bc1\u5668\u3002
-CHKJ2041=CHKJ2041I\uff1a\u6301\u4e45\u7c7b\u548c\u63a5\u53e3\u5e94\u5728\u67d0\u6307\u5b9a\u5305\u5185\u3002(JLS 2.0: 7.4.2)\u3002
-
-CHKJ2456.i=CHKJ2456W\uff1a{0} \u5e94\u5bf9 {2} \u629b\u51fa {1}\uff0c\u5426\u5219\u90e8\u7f72\u4ee3\u7801\u4e2d\u53ef\u80fd\u5b58\u5728\u7f16\u8bd1\u9519\u8bef\u3002
-CHKJ2456.m=CHKJ2456W\uff1a\u6b64\u65b9\u6cd5\u5e94\u5bf9 {1} \u629b\u51fa {0}\uff0c\u5426\u5219\u90e8\u7f72\u4ee3\u7801\u4e2d\u53ef\u80fd\u5b58\u5728\u7f16\u8bd1\u9519\u8bef\u3002
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W\uff1a{0} \u952e\u7c7b\u5fc5\u987b\u5b9e\u73b0 {1} \u65b9\u6cd5\u3002(EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W\uff1a\u6b64\u7c7b\u5e94\u5bf9 {0} \u5b9e\u73b0\u76f8\u5339\u914d\u7684 ejbPostCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W\uff1a\u6b64\u7c7b\u5e94\u5bf9\u6b64\u65b9\u6cd5\u5b9e\u73b0\u76f8\u5339\u914d\u7684 ejbPostCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u5b9e\u73b0 javax.ejb.SessionSynchronization\u3002(EJB 1.1: 6.5.3)\u3002
-CHKJ2003I.ejb11=CHKJ2003I\uff1aBean \u7ba1\u7406\u7684\u4e8b\u52a1\u6709\u72b6\u6001\u4f1a\u8bdd bean \u4e0d\u9700\u8981\u5b9e\u73b0 javax.ejb.SessionSynchronization\u3002(EJB 1.1: 6.5.3)\u3002
-CHKJ2004.eb.i.ejb11=CHKJ2004W\uff1a{1} bean \u7c7b\u4e0d\u5e94\u5b9e\u73b0 {0} ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W\uff1a{0} bean \u7c7b\u4e0d\u5e94\u5b9e\u73b0 ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E\uff1a{0} \u5fc5\u987b\u662f create \u65b9\u6cd5\u6216 find \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E\uff1a\u65b9\u6cd5\u5fc5\u987b\u662f create \u65b9\u6cd5\u6216 find \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E\uff1a{0} bean \u7c7b\u5fc5\u987b\u5177\u6709\u4e0d\u542b\u4efb\u4f55\u81ea\u53d8\u91cf\u7684\u516c\u7528\u6784\u9020\u51fd\u6570\u3002(EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E\uff1a{0} bean \u7c7b\u5fc5\u987b\u5177\u6709\u4e0d\u542b\u4efb\u4f55\u81ea\u53d8\u91cf\u7684\u516c\u7528\u6784\u9020\u51fd\u6570\u3002(EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W\uff1a{0} \u4e0d\u5e94\u58f0\u660e finalize() \u65b9\u6cd5\u3002(EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W\uff1a{0} \u4e0d\u5e94\u58f0\u660e finalize() \u65b9\u6cd5\u3002(EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E\uff1a{0} bean \u7c7b\u5fc5\u987b\u81f3\u5c11\u5305\u542b\u4e00\u4e2a ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E\uff1a{0} bean \u7c7b\u5fc5\u987b\u81f3\u5c11\u5305\u542b\u4e00\u4e2a ejbFindByPrimaryKey \u65b9\u6cd5\u3002(EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E\uff1a{0} home \u63a5\u53e3\u5fc5\u987b\u81f3\u5c11\u5305\u542b\u4e00\u4e2a create \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E\uff1a{0} home \u63a5\u53e3\u5fc5\u987b\u5305\u542b\u4e00\u4e2a findByPrimaryKey \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E\uff1a\u6b64\u7c7b\u578b\u5fc5\u987b\u662f\u63a5\u53e3\u3002(EJB 1.1: 6.10.5)\u3002
-CHKJ2012.sh.ejb11=CHKJ2012E\uff1a\u6b64\u7c7b\u578b\u5fc5\u987b\u662f\u63a5\u53e3\u3002(EJB 1.1: 6.10.6)\u3002
-CHKJ2012.er.ejb11=CHKJ2012E\uff1a\u6b64\u7c7b\u578b\u5fc5\u987b\u662f\u63a5\u53e3\u3002(EJB 1.1: 9.2.7)\u3002
-CHKJ2012.eh.ejb11=CHKJ2012E\uff1a\u6b64\u7c7b\u578b\u5fc5\u987b\u662f\u63a5\u53e3\u3002(EJB 1.1: 9.2.8)\u3002
-CHKJ2013.sb.ejb11=CHKJ2013E\uff1a{0} bean \u7c7b\u5fc5\u987b\u5b9e\u73b0 {1}\u3002(EJB 1.1: 6.10.2)\u3002
-CHKJ2013.eb.ejb11=CHKJ2013E\uff1a{0} bean \u7c7b\u5fc5\u987b\u5b9e\u73b0 {1}\u3002(EJB 1.1: 9.2.2)\u3002
-CHKJ2014.sb.ejb11=CHKJ2014E\uff1a{0} bean \u7c7b\u4e0d\u80fd\u662f\u62bd\u8c61\u7684\u3002(EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E\uff1a{0} bean \u7c7b\u4e0d\u80fd\u662f\u62bd\u8c61\u7684\u3002(EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E\uff1a{0} bean \u7c7b\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E\uff1a{0} bean \u7c7b\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E\uff1a\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 {0}\u3002(EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E\uff1a\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 {0}\u3002(EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E\uff1a\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 {0}\u3002(EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E\uff1a\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 {0}\u3002(EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I\uff1a{0} \u952e\u7c7b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.9) (RMI 1.3: 2.6)\u3002
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E\uff1a{0} \u952e\u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E\uff1a{0} \u952e\u7c7b\u5fc5\u987b\u5b9a\u4e49\u516c\u7528\u7f3a\u7701\u6784\u9020\u51fd\u6570\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E\uff1a{0} bean \u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E\uff1a{0} bean \u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E\uff1a{0} \u5728 {1} bean \u7c7b\u4e2d\u5fc5\u987b\u5177\u6709\u76f8\u5339\u914d\u7684\u65b9\u6cd5\u3002(EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E\uff1a\u6b64\u65b9\u6cd5\u5728 {0} bean \u7c7b\u4e2d\u5fc5\u987b\u5177\u6709\u76f8\u5339\u914d\u7684\u65b9\u6cd5\u3002(EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E\uff1a{0} \u5728 {1} bean \u7c7b\u4e2d\u5fc5\u987b\u5177\u6709\u76f8\u5339\u914d\u7684\u65b9\u6cd5\u3002(EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E\uff1a\u6b64\u65b9\u6cd5\u5728 {0} bean \u7c7b\u4e2d\u5fc5\u987b\u5177\u6709\u76f8\u5339\u914d\u7684\u65b9\u6cd5\u3002(EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 create() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2024.sh.m.ejb11=CHKJ2024E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 create() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2025.sb.i.ejb11=CHKJ2025E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 ejbCreate() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2025.sb.m.ejb11=CHKJ2025E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 ejbCreate() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2026.sh.i.ejb11=CHKJ2026E\uff1aBean \u7c7b {1} \u5fc5\u987b\u4e3a {0} \u5b9e\u73b0\u76f8\u5339\u914d\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E\uff1aBean \u7c7b {0} \u5fc5\u987b\u4e3a\u6b64\u65b9\u6cd5\u5b9e\u73b0\u76f8\u5339\u914d\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E\uff1aBean \u7c7b {1} \u5fc5\u987b\u4e3a {0} \u5b9e\u73b0\u76f8\u5339\u914d\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E\uff1aBean \u7c7b {0} \u5fc5\u987b\u4e3a\u6b64\u65b9\u6cd5\u5b9e\u73b0\u76f8\u5339\u914d\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W\uff1a\u4e0d\u4f1a\u8c03\u7528 {0}\uff0c\u9664\u975e\u5b9a\u4e49\u4e86\u76f8\u5339\u914d\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W\uff1a\u4e0d\u4f1a\u8c03\u7528\u6b64\u65b9\u6cd5\uff0c\u9664\u975e\u5b9a\u4e49\u4e86\u76f8\u5339\u914d\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W\uff1a\u5982\u679c\u5728 home \u63a5\u53e3 {1} \u4e0a\u6ca1\u6709\u76f8\u5339\u914d\u7684 create \u65b9\u6cd5\uff0c\u5219\u4e0d\u80fd\u8c03\u7528 {0}\u3002(EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W\uff1a\u5982\u679c\u5728 home \u63a5\u53e3 {0} \u4e0a\u6ca1\u6709\u76f8\u5339\u914d\u7684 create \u65b9\u6cd5\uff0c\u5219\u4e0d\u80fd\u8c03\u7528\u6b64\u65b9\u6cd5\u3002(EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E\uff1a{0} \u5728 {1} bean \u7c7b\u4e2d\u5fc5\u987b\u5177\u6709\u76f8\u5339\u914d\u7684 ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E\uff1a\u6b64\u65b9\u6cd5\u5728 {0} bean \u7c7b\u4e2d\u5fc5\u987b\u5177\u6709\u76f8\u5339\u914d\u7684 ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W\uff1aBean \u7c7b {0} \u5fc5\u987b\u81f3\u5c11\u58f0\u660e\u4e00\u4e2a\u5bb9\u5668\u7ba1\u7406\u7684\u5b57\u6bb5\u3002(EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W\uff1asetEntityContext(EntityContext ic) \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W\uff1aunsetEntityContext() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W\uff1aejbActivate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W\uff1aejbPassivate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W\uff1aejbRemove() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W\uff1aejbLoad() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W\uff1aejbStore() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-
-CHKJ2040.sb.ejb11=CHKJ2040I\uff1a\u4e00\u5b9a\u4e0d\u80fd\u5c06\u201cthis\u201d\u4f5c\u4e3a\u65b9\u6cd5\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012\u3002(EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E\uff1a\u89d2\u8272\u7684\u53cc\u65b9\u90fd\u5fc5\u987b\u4f7f\u7528\u76f8\u540c\u6570\u76ee\u7684\u5c5e\u6027\u3002
-CHKJ2101.ejb11=CHKJ2101E\uff1a\u89d2\u8272\u7684\u53cc\u65b9\u90fd\u5fc5\u987b\u4f7f\u7528\u540c\u4e00\u7c7b\u578b\u3002
-CHKJ2102.eh.ejb11=CHKJ2102E\uff1a\u5fc5\u987b\u5728 {0} \u7c7b\u4e0a\u5b9a\u4e49\u4e00\u4e2a finder \u63cf\u8ff0\u7b26\u6216\u5339\u914d\u7684 custom finder \u65b9\u6cd5\u3002
-CHKJ2103.ejb11=CHKJ2103E\uff1a\u5728\u7ec4\u4ef6\u7ee7\u627f\u4e2d\uff0c{0} bean \u7c7b\u5fc5\u987b\u7ee7\u627f {1}\u3002(EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E\uff1a\u5728\u7ec4\u4ef6\u7ee7\u627f\u4e2d\uff0c{0} home \u63a5\u53e3\u4e00\u5b9a\u4e0d\u80fd\u7ee7\u627f {1}\u3002(EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E\uff1a\u5728\u7ec4\u4ef6\u7ee7\u627f\u4e2d\uff0c{0} \u8fdc\u7a0b\u63a5\u53e3\u5fc5\u987b\u7ee7\u627f {1}\u3002(EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E\uff1aBean {0} \u5fc5\u987b\u5c06 {1} \u7528\u4f5c\u5176 <prim-key-class> (EJB 1.1: B.2)\u3002
-
-CHKJ2200.i.ejb11=CHKJ2200W\uff1a{0} \u9759\u6001\u7684\u5b57\u6bb5\u5e94\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W\uff1a\u6b64\u9759\u6001\u7684\u5b57\u6bb5\u5e94\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u77ac\u6001\u7684\u3002(EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E\uff1a\u8be5\u5b57\u6bb5\u4e00\u5b9a\u4e0d\u80fd\u662f\u77ac\u6001\u7684\u3002(EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W\uff1a\u5b57\u6bb5 {0} \u7684\u5b57\u6bb5\u7c7b\u578b\u5bf9 CMP bean \u65e0\u6548\u3002(EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W\uff1a\u5b57\u6bb5\u7c7b\u578b\u5bf9 CMP bean \u65e0\u6548\u3002(EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E\uff1a\u8be5\u5b57\u6bb5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W\uff1a\u540d\u4e3a {0} \u7684\u4e3b\u952e\u5b57\u6bb5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W\uff1a\u4e3b\u952e\u5b57\u6bb5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W\uff1a{0} \u5fc5\u987b\u4e3a {1} \u7684 <cmp-field> \u548c bean \u7c7b {2} \u7684\u5b57\u6bb5\u3002(EJB 1.1: 9.4.7.2)\u3002
-CHKJ2206.eb.m.ejb11=CHKJ2206W\uff1a\u6b64\u5b57\u6bb5\u5fc5\u987b\u4e3a {0} \u7684 <cmp-field> \u548c bean \u7c7b {1} \u7684\u5b57\u6bb5\u3002(EJB 1.1: 9.4.7.2)\u3002
-CHKJ2207.eb.ejb11=CHKJ2207E\uff1a\u952e\u5b57\u6bb5 {0} \u7684\u7c7b\u578b\u5fc5\u987b\u4e0e\u4e3b\u952e {1} \u7684\u7c7b\u578b\u76f8\u540c\u3002(EJB 1.1: 9.4.7.1)\u3002
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u5728\u65b9\u6cd5 {0} \u4e0a\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u5728\u65b9\u6cd5 {0} \u4e0a\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u5728 {0} \u4e0a\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u5728 {0} \u4e0a\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u5728 {0} \u4e0a\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u5728 {0} \u4e0a\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528 java.rmi.RemoteException\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a\u3002(EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a\u3002(EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u8fdc\u7a0b\u63a5\u53e3\u7c7b\u578b\u3002(EJB 1.1: 6.10.6)\u3002
-CHKJ2402.sh.m.ejb11=CHKJ2402W\uff1a\u6b64 create \u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u8fdc\u7a0b\u63a5\u53e3\u7c7b\u578b\u3002(EJB 1.1: 6.10.6)\u3002
-CHKJ2402.eh.i.ejb11=CHKJ2402W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u8fdc\u7a0b\u63a5\u53e3\u7c7b\u578b\u3002(EJB 1.1: 9.2.8)\u3002
-CHKJ2402.eh.m.ejb11=CHKJ2402W\uff1a\u6b64 create \u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u8fdc\u7a0b\u63a5\u53e3\u7c7b\u578b\u3002(EJB 1.1: 9.2.8)\u3002
-CHKJ2403.eh.i.ejb11=CHKJ2403W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W\uff1a{0} \u4e2d\u81ea\u53d8\u91cf\u7684\u987a\u5e8f\u548c\u7c7b\u578b\u5fc5\u987b\u4e0e {1} \u952e\u7c7b\u4e2d\u5b57\u6bb5\u7684\u987a\u5e8f\u548c\u7c7b\u578b\u76f8\u5339\u914d\u3002(EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W\uff1a\u81ea\u53d8\u91cf\u7684\u987a\u5e8f\u548c\u7c7b\u578b\u5fc5\u987b\u4e0e {0} \u952e\u7c7b\u4e2d\u5b57\u6bb5\u7684\u987a\u5e8f\u548c\u7c7b\u578b\u76f8\u5339\u914d\u3002(EJB 1.1: 9.2.8, 9.4.7.3, 16.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W\uff1a{0} \u5e94\u8fd4\u56de\u4e3b\u952e\u7c7b\u578b {1}\u3002(EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3)\u3002
-CHKJ2406.eb.m.ejb11=CHKJ2406W\uff1a\u6b64\u65b9\u6cd5\u5e94\u8fd4\u56de\u4e3b\u952e\u7c7b\u578b {0}\u3002(EJB 1.1: 9.2.3, 9.4.2, 9.4.7.3)\u3002
-CHKJ2407.eb.i.ejb11=CHKJ2407W\uff1a{0} \u5e94\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W\uff1a\u6b64\u65b9\u6cd5\u5e94\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E\uff1a{0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb\u3002(EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E\uff1a\u6b64\u65b9\u6cd5\u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb\u3002(EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E\uff1a{0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb\u3002(EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E\uff1a\u6b64\u65b9\u6cd5\u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb\u3002(EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sb.m.ejb11=CHKJ2412I\uff1a\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eb.i.ejb11=CHKJ2412I\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eb.m.ejb11=CHKJ2412I\uff1a\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sr.i.ejb11=CHKJ2412I\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sr.m.ejb11=CHKJ2412I\uff1a\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2412.er.i.ejb11=CHKJ2412I\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2412.er.m.ejb11=CHKJ2412I\uff1a\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sh.i.ejb11=CHKJ2412I\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sh.m.ejb11=CHKJ2412I\uff1a\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eh.i.ejb11=CHKJ2412I\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eh.m.ejb11=CHKJ2412I\uff1a\u8fd4\u56de\u7c7b\u578b\u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I\uff1a{0} \u7684\u81ea\u53d8\u91cf {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sb.m.ejb11=CHKJ2413I\uff1a\u81ea\u53d8\u91cf {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eb.i.ejb11=CHKJ2413I\uff1a{0} \u7684\u81ea\u53d8\u91cf {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eb.m.ejb11=CHKJ2413I\uff1a\u81ea\u53d8\u91cf {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sr.i.ejb11=CHKJ2413I\uff1a{0} \u7684\u81ea\u53d8\u91cf {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sr.m.ejb11=CHKJ2413I\uff1a\u81ea\u53d8\u91cf {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2413.er.i.ejb11=CHKJ2413I\uff1a{0} \u7684\u81ea\u53d8\u91cf {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2413.er.m.ejb11=CHKJ2413I\uff1a\u81ea\u53d8\u91cf {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sh.i.ejb11=CHKJ2413I\uff1a{0} \u7684\u81ea\u53d8\u91cf {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sh.m.ejb11=CHKJ2413I\uff1a\u81ea\u53d8\u91cf {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eh.i.ejb11=CHKJ2413I\uff1a{0} \u7684\u81ea\u53d8\u91cf {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eh.m.ejb11=CHKJ2413I\uff1a\u81ea\u53d8\u91cf {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E\uff1a{0} \u5fc5\u987b\u629b\u51fa {1}\u3002(EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0}\u3002(EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E\uff1a{0} \u5fc5\u987b\u629b\u51fa {1}\u3002(EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0}\u3002(EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E\uff1a{0} \u5fc5\u987b\u629b\u51fa {1}\u3002(EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0}\u3002(EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E\uff1a{0} \u5fc5\u987b\u629b\u51fa {1}\u3002(EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0}\u3002(EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {2} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {1} \u76f8\u5339\u914d\u3002(EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E\uff1a\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {1} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {0} \u76f8\u5339\u914d\u3002(EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {2} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {1} \u76f8\u5339\u914d\u3002(EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E\uff1a\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {1} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {0} \u76f8\u5339\u914d\u3002(EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {2} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {1} \u76f8\u5339\u914d\u3002(EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E\uff1a\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {1} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {0} \u76f8\u5339\u914d\u3002(EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E\uff1a{0} \u7684\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {2} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {1} \u76f8\u5339\u914d\u3002(EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E\uff1a\u8fd4\u56de\u7c7b\u578b\u5fc5\u987b\u4e0e {1} bean \u7c7b\u4e2d\u5339\u914d\u65b9\u6cd5\u7684\u8fd4\u56de\u7c7b\u578b {0} \u76f8\u5339\u914d\u3002(EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a\u3002(EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a\u3002(EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E\uff1a{0} \u5fc5\u987b\u662f create \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f create \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E\uff1a\u5fc5\u987b\u7531 {2} home \u63a5\u53e3\u4e0a {0} \u7684\u76f8\u5e94\u65b9\u6cd5\u629b\u51fa {1}\u3002(EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E\uff1a\u5fc5\u987b\u7531 {1} home \u63a5\u53e3\u4e0a\u7684\u76f8\u5e94\u65b9\u6cd5\u629b\u51fa {0}\u3002(EJB 1.1: 6.10.6, 12.2.1, 12.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E\uff1a\u5fc5\u987b\u7531 {2} home \u63a5\u53e3\u4e0a {0} \u7684\u76f8\u5e94\u65b9\u6cd5\u629b\u51fa {1}\u3002(EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E\uff1a\u5fc5\u987b\u7531 {1} home \u63a5\u53e3\u4e0a\u7684\u76f8\u5e94\u65b9\u6cd5\u629b\u51fa {0}\u3002(EJB 1.1: 9.2.8, 12.2.1, 12.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E\uff1a{1} \u8fdc\u7a0b\u63a5\u53e3\u4e0a {0} \u7684\u76f8\u5e94\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {2}\u3002(EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E\uff1a{0} \u8fdc\u7a0b\u63a5\u53e3\u4e0a\u7684\u76f8\u5e94\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {1}\u3002(EJB 1.1: 6.10.5, 12.2.1, 12.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E\uff1a{1} \u8fdc\u7a0b\u63a5\u53e3\u4e0a {0} \u7684\u76f8\u5e94\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {2}\u3002(EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E\uff1a{0} \u8fdc\u7a0b\u63a5\u53e3\u4e0a\u7684\u76f8\u5e94\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {1}\u3002(EJB 1.1: 9.2.7, 12.2.1, 12.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E\uff1a\u5fc5\u987b\u6307\u5b9a <ejb-name> \u5143\u7d20\u7684\u503c\u3002(EJB 1.1: 16.2, 16.5)
-CHKJ2802.named.ejb11=CHKJ2802E\uff1a\u4e0d\u80fd\u53cd\u6620 <ejb-class> \u7c7b {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2802.unnamed.ejb11=CHKJ2802E\uff1a\u5728 <ejb-class> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u7c7b\u3002(EJB 1.1: 16.2, 16.5)\u3002
-CHKJ2803.named.ejb11=CHKJ2803E\uff1a\u4e0d\u80fd\u53cd\u6620 <home> \u63a5\u53e3 {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2803.unnamed.ejb11=CHKJ2803E\uff1a<home> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u63a5\u53e3\u3002(EJB 1.1: 16.2, 16.5)\u3002
-CHKJ2804.named.ejb11=CHKJ2804E\uff1a\u4e0d\u80fd\u53cd\u6620 <remote> \u63a5\u53e3 {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2804.unnamed.ejb11=CHKJ2804E\uff1a<remote> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u63a5\u53e3\u3002(EJB 1.1: 16.2, 16.5)\u3002
-CHKJ2806.ejb11=CHKJ2806E\uff1a<reentrant> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cTrue\u201d\u6216\u201cFalse\u201d\u3002(EJB 1.1: 16.2, 16.5)
-CHKJ2807.ejb11=CHKJ2807E\uff1a<session-type> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cStateful\u201d\u6216\u201cStateless\u201d\u3002(EJB 1.1: 16.2, 16.5)
-CHKJ2808.ejb11=CHKJ2808E\uff1a<transaction-type> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cContainer\u201d\u6216\u201cBean\u201d\u3002(EJB 1.1: 11.3.5, 16.2,, 16.5)
-CHKJ2809.ejb11=CHKJ2809E\uff1a<persistence-type> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cContainer\u201d\u6216\u201cBean\u201d\u3002(EJB 1.1: 16.2, 16.5)
-CHKJ2810.named.ejb11=CHKJ2810E\uff1a\u4e0d\u80fd\u53cd\u6620 <prim-key-class> \u7c7b {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2810.unnamed.ejb11=CHKJ2810E\uff1a<prim-key-class> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u7c7b\u3002(EJB 1.1: 16.2, 16.5)\u3002
-CHKJ2811.named.ejb11=CHKJ2811E\uff1a<field-name> {0} \u4e0d\u80fd\u4f4d\u4e8e bean \u7c7b {1} \u4e0a\u3002(EJB 1.1: 16.5)\u3002
-CHKJ2811.unnamed.ejb11=CHKJ2811E\uff1a<cmp-field> \u5fc5\u987b\u6307\u5b9a <field-name>\u3002(EJB 1.1: 16.5)\u3002
-CHKJ2812.ejb11=CHKJ2812E\uff1aBean \u7c7b {0} \u5fc5\u987b\u81f3\u5c11\u5c06\u5b83\u7684\u4e00\u4e2a\u5b57\u6bb5\u6307\u5b9a\u4e3a <cmp-field>\u3002(EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W\uff1a<method> \u4e2d\u7684 <ejb-name> \u5e94\u6307\u5b9a\u5df2\u77e5\u4f01\u4e1a Bean\u3002(EJB 1.1: 11.4.1, 15.3.2, 16.5)
-
-CHKJ2820.ejb11=CHKJ2820W\uff1a\u5b89\u5168\u89d2\u8272\u5f15\u7528\u53ea\u80fd\u5b9a\u4e49\u4e00\u6b21\u3002
-CHKJ2822.ejb11=CHKJ2822W\uff1abean {0} \u7684 <security-role-ref> \u5143\u7d20\u5e94\u5b9a\u4e49 <role-name> \u5143\u7d20\u3002(EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W\uff1a<security-role-ref> \u5143\u7d20\u5e94\u5b9a\u4e49 <role-link> \u5143\u7d20\u3002(EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W\uff1a<security-role-ref> \u5143\u7d20\u5f15\u7528\u4e86\u672a\u77e5\u89d2\u8272 {0}\u3002(EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W\uff1aejb-jar.xml \u4e2d\u7684 <security-role> \u5143\u7d20\u5e94\u5b9a\u4e49 <role-name> \u5143\u7d20\u3002(EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W\uff1a\u5b89\u5168\u89d2\u8272\u540d\u5fc5\u987b\u552f\u4e00\u3002(EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W\uff1a\u6ca1\u6709 <security-role> \u5143\u7d20\uff0c\u5c31\u4e0d\u80fd\u4f7f\u7528 <role-link> \u5143\u7d20\u3002(EJB 1.1: 15.2.5.3, 15.3.1, 15.3.3)
-CHKJ2828.ejb11=CHKJ2828E\uff1a\u6ca1\u6709\u539f\u59cb\u4e3b\u952e\uff0c\u5c31\u4e0d\u80fd\u4f7f\u7528 <primkey-field> \u5143\u7d20\u3002(EJB 1.1: 9.4.7, 16.5)
-CHKJ2829.ejb11=CHKJ2829E\uff1a\u952e\u7c7b {0} \u672a\u6620\u5c04\u81f3\u4f01\u4e1a bean {1} \u4e2d\u7684\u4efb\u4f55\u5b57\u6bb5\u3002(EJB 1.1: 9.4.7, 16.5)
-
-CHKJ2830.ejb11=CHKJ2830W\uff1a\u4e0d\u80fd\u53cd\u6620 {0} \u5b57\u6bb5\u7684\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2831.ejb11=CHKJ2831W\uff1a\u5fc5\u987b\u5728 <cmp-field> \u5143\u7d20\u4e2d\u58f0\u660e {0}\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I\uff1a\u5728 EJB \u6a21\u5757\u4e2d\u627e\u4e0d\u5230\u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 home {0}\u3002(EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I\uff1a\u5728 EJB \u6a21\u5757\u4e2d\u627e\u4e0d\u5230\u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684\u8fdc\u7a0b {0}\u3002(EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I\uff1a\u5728 EJB \u6a21\u5757\u4e2d\u627e\u4e0d\u5230\u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 Bean {0}\u3002(EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I\uff1aBean {0} \u662f {1} \u7c7b\u578b\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref-type> \u5143\u7d20\u3002(EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I\uff1aBean {0} \u4f7f\u7528 home {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I\uff1aBean {0} \u4f7f\u7528\u8fdc\u7a0b {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 1.1: 14.3.2)\u3002
-CHKJ2838.ejb11=CHKJ2838I\uff1a\u5efa\u8bae\u5728\u201cejb\u201d\u5b50\u4e0a\u4e0b\u6587\u4e2d\u7ec4\u7ec7\u5bf9\u4f01\u4e1a bean \u7684\u6240\u6709\u5f15\u7528\u3002(EJB 1.1: 14.3.1.1)\u3002
-CHKJ2839.ejb11=CHKJ2839W\uff1a<env-entry> \u5143\u7d20\u7684 <env-entry-name> \u5143\u7d20\u65e0\u6548\u3002(EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W\uff1a<env-entry> \u5143\u7d20\u7684 <env-entry-type> \u5143\u7d20\u65e0\u6548\u3002(EJB 1.1: 14.2.1.2)\u3002
-CHKJ2841.ejb11=CHKJ2841W\uff1a<env-entry-name> \u5143\u7d20\u4e2d\u7684 {0} \u540d\u79f0\u5728 bean \u4e2d\u53ea\u80fd\u4f7f\u7528\u4e00\u6b21\u3002(EJB 1.1: 14.2.1.2)\u3002
-CHKJ2842.ejb11=CHKJ2842W\uff1a\u5f53 <method-name> \u4e3a\u201c*\u201d\u65f6\u5ffd\u7565 <method-params>\u3002(EJB 1.1: 11.4.1, 15.3.2)\u3002
-CHKJ2843.ejb11=CHKJ2843W\uff1a{0} \u4e0a\u6ca1\u6709\u4efb\u4f55\u65b9\u6cd5\u4e0e\u6b64 <method> \u76f8\u5339\u914d\u3002(EJB 1.1: 11.4.1, 15.3.2)\u3002
-CHKJ2844.ejb11=CHKJ2844W\uff1a\u5e94\u5728 <method-permission> \u4e2d\u81f3\u5c11\u8bbe\u7f6e\u4e00\u4e2a <method>\u3002(EJB 1.1: 11.4.1, 15.3.2)\u3002
-CHKJ2845.ejb11=CHKJ2845W\uff1a\u5e94\u5728 <method-permission> \u4e2d\u81f3\u5c11\u8bbe\u7f6e\u4e00\u4e2a <role-name>\u3002(EJB 1.1: 11.4.1, 15.3.2)\u3002
-CHKJ2846.ejb11=CHKJ2846W\uff1a\u5bf9\u4e8e\u6b64 <method-permission>\uff0c\u627e\u4e0d\u5230\u4efb\u4f55\u65b9\u6cd5\u3002(EJB 1.1: 15.3.2)\u3002
-CHKJ2847.ejb11=CHKJ2847W\uff1a\u5bf9\u4e8e\u6b64 <container-transaction>\uff0c\u627e\u4e0d\u5230\u4efb\u4f55\u65b9\u6cd5\u3002(EJB 1.1: 11.4.1)\u3002
-CHKJ2849.ejb11=CHKJ2849W\uff1a\u4e0d\u80fd\u9a8c\u8bc1 {0} \u7684\u7ec4\u4ef6\u7ee7\u627f\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u53cd\u6620 {1} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2850.ejb11=CHKJ2850W\uff1a\u4e0d\u80fd\u9a8c\u8bc1 <method>\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u53cd\u6620 {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2851.ejb11=CHKJ2851W\uff1a\u4e0d\u80fd\u9a8c\u8bc1 {0}\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u53cd\u6620 {1} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2852.ejb11=CHKJ2852W\uff1a\u9a8c\u8bc1 ejb-jar.xml \u65f6\u6355\u83b7\u5230\u201c\u53ef\u629b\u51fa\u201d\u5f02\u5e38\u3002\u6b63\u5728\u9a8c\u8bc1\u7684 bean \u662f {0}\u3002
-CHKJ2853.ejb11=CHKJ2853W\uff1a\u9a8c\u8bc1 ibm-ejb-jar-ext.xmi \u65f6\u6355\u83b7\u5230\u201c\u53ef\u629b\u51fa\u201d\u5f02\u5e38\u3002\u6b63\u5728\u9a8c\u8bc1\u7684 bean \u662f {0}\u3002
-
-CHKJ2908.ejb11=CHKJ2908W\uff1a\u4e0d\u80fd\u6b63\u786e\u53cd\u6620\u4f01\u4e1a bean\u3002\u6709\u5173\u66f4\u591a\u4fe1\u606f\uff0c\u8fd0\u884c XML \u9a8c\u8bc1\u5668\u3002
-
-CHKJ2895.ejb11=CHKJ2895W\uff1a<ejb-name> {0} \u5728 ejb-jar.xml \u6587\u4ef6\u4e2d\u5fc5\u987b\u662f\u552f\u4e00\u7684 (EJB 1.1: 16.5)\u3002
-CHKJ2875.ejb11=CHKJ2875E\uff1a<ejb-client-jar> {0} \u5fc5\u987b\u5728\u5305\u542b\u6b64 EJB \u6a21\u5757\u7684\u6bcf\u4e2a EAR \u6587\u4ef6\u4e2d\u5b58\u5728 (EJB 1.1: 16.5, 17.4)\u3002
-
-
-# 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\uff1a\u6ca1\u6709\u539f\u59cb\u4e3b\u952e\uff0c\u5c31\u4e0d\u80fd\u4f7f\u7528 <primkey-field> (EJB 2.0: 10.8.1, 22.5)\u3002
-CHKJ2829.ejb20=CHKJ2829E\uff1a\u952e\u7c7b {0} \u672a\u6620\u5c04\u81f3\u4f01\u4e1a bean {1} \u4e2d\u7684\u4efb\u4f55\u5b57\u6bb5\u3002(EJB 2.0: 10.8, 22.5)\u3002
-CHKJ2839.ejb20=CHKJ2839W\uff1a<env-entry> \u5143\u7d20\u7684 <env-entry-name> \u5143\u7d20\u65e0\u6548\u3002(EJB 2.0: 20.2.1.2)\u3002
-CHKJ2840.ejb20=CHKJ2840W\uff1a<env-entry> \u5143\u7d20\u7684 <env-entry-type> \u5143\u7d20\u65e0\u6548\u3002(EJB 2.0: 20.2.1.2)\u3002
-CHKJ2841.ejb20=CHKJ2841W\uff1a<env-entry-name> \u5143\u7d20\u4e2d\u7684 {0} \u540d\u79f0\u5728 bean \u4e2d\u53ea\u80fd\u4f7f\u7528\u4e00\u6b21\u3002(EJB 2.0: 20.2.1.2)\u3002
-CHKJ2830.ejb20=CHKJ2830W\uff1a\u4e0d\u80fd\u53cd\u6620 {0} \u5b57\u6bb5\u7684\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2831.ejb20=CHKJ2831W\uff1a\u5fc5\u987b\u5728 <cmp-field> \u5143\u7d20\u4e2d\u58f0\u660e {0}\u3002(EJB 2.0: 10.8.2)\u3002
-CHKJ2801.ejb20=CHKJ2801E\uff1a\u5fc5\u987b\u6307\u5b9a <ejb-name> \u5143\u7d20\u7684\u503c\u3002(EJB 2.0 22.2, 22.5)\u3002
-CHKJ2809.ejb20=CHKJ2809E\uff1a<persistence-type> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cContainer\u201d\u6216\u201cBean\u201d\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2806.ejb20=CHKJ2806E\uff1a<reentrant> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cTrue\u201d\u6216\u201cFalse\u201d\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2807.ejb20=CHKJ2807E\uff1a<session-type> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cStateful\u201d\u6216\u201cStateless\u201d\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2808.ejb20=CHKJ2808E\uff1a<transaction-type> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cContainer\u201d\u6216\u201cBean\u201d\u3002(EJB 2.0: 17.3.6, 22.2, 22.5)\u3002
-CHKJ2814.ejb20=CHKJ2814W\uff1a<method> \u4e2d\u7684 <ejb-name> \u5e94\u6307\u5b9a\u5df2\u77e5\u4f01\u4e1a Bean\u3002(EJB 2.0: 17.4.1, 21.3.2, 22.5)\u3002
-CHKJ2842.ejb20=CHKJ2842W\uff1a\u5f53 <method-name> \u4e3a\u201c*\u201d\u65f6\u5ffd\u7565 <method-params>\u3002(EJB 2.0: 17.4.1, 21.3.2)\u3002
-CHKJ2843.ejb20=CHKJ2843W\uff1a{0} \u4e0a\u6ca1\u6709\u4efb\u4f55\u65b9\u6cd5\u4e0e\u6b64 <method> \u76f8\u5339\u914d\u3002(EJB 2.0: 17.4.1, 21.3.2)\u3002
-CHKJ2844.ejb20=CHKJ2844W\uff1a\u5e94\u5728 <method-permission> \u4e2d\u81f3\u5c11\u8bbe\u7f6e\u4e00\u4e2a <method>\u3002(EJB 2.0: 17.4.1, 21.3.2)\u3002
-CHKJ2845.ejb20=CHKJ2845W\uff1a\u5e94\u8be5\u5728 <method-permission> \u4e2d\u8bbe\u7f6e <role-name> \u6216 <unchecked> \u5143\u7d20\u3002(EJB 2.0: 17.4.1, 21.3.2)\u3002
-CHKJ2846.ejb20=CHKJ2846W\uff1a\u5bf9\u4e8e\u6b64 <method-permission>\uff0c\u627e\u4e0d\u5230\u4efb\u4f55\u65b9\u6cd5\u3002(EJB 2.0: 21.3.2)\u3002
-CHKJ2847.ejb20=CHKJ2847W\uff1a\u5bf9\u4e8e\u6b64 <container-transaction>\uff0c\u627e\u4e0d\u5230\u4efb\u4f55\u65b9\u6cd5\u3002(EJB 2.0: 17.4.1)\u3002
-CHKJ2812.ejb20=CHKJ2812E\uff1aBean \u7c7b {0} \u5fc5\u987b\u81f3\u5c11\u5c06\u5b83\u7684\u4e00\u4e2a\u5b57\u6bb5\u6307\u5b9a\u4e3a <cmp-field>\u3002(EJB 2.0: 22.5)\u3002
-CHKJ2832.ejb20=CHKJ2832I\uff1a\u5728 EJB \u6a21\u5757\u4e2d\u627e\u4e0d\u5230\u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 home {0}\u3002(EJB 2.0: 20.3.1.2)\u3002
-CHKJ2833.ejb20=CHKJ2833I\uff1a\u5728 EJB \u6a21\u5757\u4e2d\u627e\u4e0d\u5230\u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684\u8fdc\u7a0b {0}\u3002(EJB 2.0: 20.3.1.2)\u3002
-CHKJ2834.ejb20=CHKJ2834I\uff1a\u5728 EJB \u6a21\u5757\u4e2d\u627e\u4e0d\u5230\u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 Bean {0}\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2835.ejb20=CHKJ2835I\uff1aBean {0} \u662f {1} \u7c7b\u578b\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref-type> \u5143\u7d20\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2836.ejb20=CHKJ2836I\uff1aBean {0} \u4f7f\u7528 home {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2837.ejb20=CHKJ2837I\uff1aBean {0} \u4f7f\u7528\u8fdc\u7a0b {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2838.ejb20=CHKJ2838I\uff1a\u5efa\u8bae\u5728\u201cejb\u201d\u5b50\u4e0a\u4e0b\u6587\u4e2d\u7ec4\u7ec7\u5bf9\u4f01\u4e1a bean \u7684\u6240\u6709\u5f15\u7528\u3002(EJB 2.0: 20.3.1.1)\u3002
-CHKJ2820.ejb20=CHKJ2820W\uff1a\u5b89\u5168\u89d2\u8272\u5f15\u7528\u88ab\u5b9a\u4e49\u4e86\u591a\u6b21\u3002
-CHKJ2822.ejb20=CHKJ2822W\uff1abean {0} \u7684 <security-role-ref> \u5143\u7d20\u5e94\u5b9a\u4e49 <role-name> \u5143\u7d20\u3002(EJB 2.0: 21.2.5.3)\u3002
-CHKJ2823.ejb20=CHKJ2823W\uff1a<security-role-ref> \u5143\u7d20\u5e94\u5b9a\u4e49 <role-link> \u5143\u7d20\u3002(EJB 2.0: 21.3.3)\u3002
-CHKJ2824.ejb20=CHKJ2824W\uff1a<security-role-ref> \u5143\u7d20\u5f15\u7528\u4e86\u672a\u77e5\u89d2\u8272 {0}\u3002(EJB 2.0: 21.3.3)\u3002
-CHKJ2825.ejb20=CHKJ2825W\uff1aejb-jar.xml \u4e2d\u7684 <security-role> \u5143\u7d20\u5e94\u5b9a\u4e49 <role-name> \u5143\u7d20\u3002(EJB 2.0: 21.3.1)\u3002
-CHKJ2826.ejb20=CHKJ2826W\uff1a\u5b89\u5168\u89d2\u8272\u540d\u5fc5\u987b\u552f\u4e00\u3002(EJB 2.0: 21.3.1)\u3002
-CHKJ2827.ejb20=CHKJ2827W\uff1a\u6ca1\u6709 <security-role> \u5143\u7d20\uff0c\u5c31\u4e0d\u80fd\u4f7f\u7528 <role-link> \u5143\u7d20\u3002(EJB 2.0: 21.2.5.3, 21.3.1, 21.3.3)\u3002
-CHKJ2850.ejb20=CHKJ2850W\uff1a\u4e0d\u80fd\u9a8c\u8bc1 <method>\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u53cd\u6620\u7c7b\u578b {0}\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2851.ejb20=CHKJ2851W\uff1a\u4e0d\u80fd\u9a8c\u8bc1 {0}\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u53cd\u6620\u7c7b\u578b {1}\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2875.ejb20=CHKJ2875E\uff1a<ejb-client-jar> {0} \u5fc5\u987b\u5728\u5305\u542b\u6b64 EJB \u6a21\u5757\u7684\u6bcf\u4e2a EAR \u6587\u4ef6\u4e2d\u5b58\u5728\uff08EJB 2.0: 22.5, 23.4, 23.6\uff09\u3002
-
-CHKJ2003E.ejb20=CHKJ2003E\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u5b9e\u73b0 javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1)\u3002
-CHKJ2003I.ejb20=CHKJ2003I\uff1aBean \u7ba1\u7406\u7684\u4e8b\u52a1\u6709\u72b6\u6001\u4f1a\u8bdd bean \u4e0d\u9700\u8981\u5b9e\u73b0 javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3, 7.10.2, 17.3.4.1)\u3002
-CHKJ2802.named.ejb20=CHKJ2802E\uff1a\u4e0d\u80fd\u53cd\u6620 <ejb-class> \u7c7b {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2802.unnamed.ejb20=CHKJ2802E\uff1a\u627e\u4e0d\u5230\u7531 <ejb-class> \u5143\u7d20\u6807\u8bc6\u7684 bean \u7c7b\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2803.named.ejb20=CHKJ2803E\uff1a\u4e0d\u80fd\u53cd\u6620 <home> \u63a5\u53e3 {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2803.unnamed.ejb20=CHKJ2803E\uff1a<home> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u63a5\u53e3\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2804.named.ejb20=CHKJ2804E\uff1a\u4e0d\u80fd\u53cd\u6620 <remote> \u63a5\u53e3 {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2804.unnamed.ejb20=CHKJ2804E\uff1a<remote> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u63a5\u53e3\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2805.named.ejb20=CHKJ2805E\uff1a\u4e0d\u80fd\u53cd\u6620 <local-home> \u63a5\u53e3 {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2805.unnamed.ejb20=CHKJ2805E\uff1a\u5728 <local-home> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u63a5\u53e3\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2800.named.ejb20=CHKJ2800E\uff1a\u4e0d\u80fd\u53cd\u6620 <local> \u63a5\u53e3 {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2800.unnamed.ejb20=CHKJ2800E\uff1a\u5728 <local> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u63a5\u53e3\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2810.named.ejb20=CHKJ2810E\uff1a\u4e0d\u80fd\u53cd\u6620 <prim-key-class> \u7c7b {0} \u6216\u5b83\u7684\u67d0\u4e2a\u8d85\u7c7b\u578b\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-CHKJ2810.unnamed.ejb20=CHKJ2810E\uff1a<prim-key-class> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u672a\u77e5\u7c7b\u3002(EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2811.ejb20=CHKJ2811E\uff1a<field-name> {0} \u4e0d\u80fd\u4f4d\u4e8e bean \u7c7b {1} \u4e0a\u3002(EJB 2.0: 22.5)\u3002
-
-CHKJ2103.ejb20=CHKJ2103E\uff1a\u5728\u7ec4\u4ef6\u7ee7\u627f\u4e2d\uff0c{0} bean \u7c7b\u5fc5\u987b\u7ee7\u627f {1} (EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E\uff1a\u5728\u7ec4\u4ef6\u7ee7\u627f\u4e2d\uff0c{0} home \u63a5\u53e3\u4e00\u5b9a\u4e0d\u80fd\u7ee7\u627f {1}\u3002(EJB 2.0: D.2)\u3002
-CHKJ2105.ejb20=CHKJ2105E\uff1a\u5728\u7ec4\u4ef6\u7ee7\u627f\u4e2d\uff0c{0} \u7ec4\u4ef6\u63a5\u53e3\u5fc5\u987b\u7ee7\u627f {1}\u3002(EJB 2.0: D.2)\u3002
-CHKJ2106.ejb20=CHKJ2106E\uff1aBean {0} \u5fc5\u987b\u5c06 {1} \u7528\u4f5c\u5176 <prim-key-class> (EJB 2.0: D.2)\u3002
-CHKJ2849.ejb20=CHKJ2849W\uff1a\u4e0d\u80fd\u9a8c\u8bc1 {0} \u7684\u7ec4\u4ef6\u7ee7\u627f\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u53cd\u6620\u7c7b\u578b {1} \u6216\u67d0\u4e2a\u4f9d\u8d56\u9879\u3002\u68c0\u67e5\u7c7b\u8def\u5f84\u3002
-
-CHKJ2895.ejb20=CHKJ2895W\uff1a<ejb-name> {0} \u5728 ejb-jar.xml \u6587\u4ef6\u4e2d\u5fc5\u987b\u662f\u552f\u4e00\u7684 (EJB 2.0: 22.5)\u3002
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9e\u73b0 {0} (EJB 2.0: 7.5.1, 7.10.2)\u3002
-CHKJ2017.mb.ejb20=CHKJ2017E\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9e\u73b0 {0} (EJB 2.0: 15.4.1, 15.7.2)\u3002
-CHKJ2017.cb.ejb20=CHKJ2017E\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9e\u73b0 {0} (EJB 2.0: 10.6.2)\u3002
-CHKJ2017.bb.ejb20=CHKJ2017E\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9e\u73b0 {0} (EJB 2.0: 12.2.2)\u3002
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBHome (EJB 2.0: 6.3, 7.10.6)\u3002
-CHKJ2017.crh.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBHome (EJB 2.0: 9.5, 10.6.10)\u3002
-CHKJ2017.brh.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBHome (EJB 2.0: 9.5, 12.2.9)\u3002
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBLocalHome (EJB 2.0: 6.4, 7.10.8)\u3002
-CHKJ2017.clh.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 10.6.12)\u3002
-CHKJ2017.blh.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBLocalHome (EJB 2.0: 9.6, 12.2.11)\u3002
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBObject (EJB 2.0: 6.5, 7.10.5)\u3002
-CHKJ2017.crc.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBObject (EJB 2.0: 9.9, 10.6.9)\u3002
-CHKJ2017.brc.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBObject (EJB 2.0: 9.9, 12.2.8)\u3002
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBLocalObject (EJB 2.0: 7.10.7)\u3002
-CHKJ2017.clc.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 10.6.10)\u3002
-CHKJ2017.blc.ejb20=CHKJ2017E\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u6269\u5c55 javax.ejb.EJBLocalObject (EJB 2.0: 9.10, 12.2.10)\u3002
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I\uff1a\u4e00\u5b9a\u4e0d\u80fd\u5c06\u201cthis\u201d\u4f5c\u4e3a\u65b9\u6cd5\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012 (EJB 2.0: 10.6.2)\u3002
-CHKJ2040.bb.ejb20=CHKJ2040I\uff1a\u4e00\u5b9a\u4e0d\u80fd\u5c06\u201cthis\u201d\u4f5c\u4e3a\u65b9\u6cd5\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012 (EJB 2.0: 12.2.2)\u3002
-CHKJ2040.sb.ejb20=CHKJ2040I\uff1a\u4e00\u5b9a\u4e0d\u80fd\u5c06\u201cthis\u201d\u4f5c\u4e3a\u65b9\u6cd5\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012 (EJB 2.0: 7.10.2)\u3002
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W\uff1a\u6b64\u7c7b\u5fc5\u987b\u662f\u62bd\u8c61\u7684 (EJB 2.0: 10.3.1, 10.4.1, 10.6.2)\u3002
-CHKJ2014.mb.ejb20=CHKJ2014W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u62bd\u8c61\u7684 (EJB 2.0: 15.7.2)\u3002
-CHKJ2014.bb.ejb20=CHKJ2014W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u62bd\u8c61\u7684 (EJB 2.0: 12.2.2)\u3002
-CHKJ2014.sb.ejb20=CHKJ2014W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u62bd\u8c61\u7684 (EJB 2.0: 7.10.1)\u3002
-
-CHKJ2022.cb.ejb20=CHKJ2022W\uff1a\u6b64\u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.2)\u3002
-CHKJ2022.mb.ejb20=CHKJ2022W\uff1a\u6b64\u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 15.7.2)\u3002
-CHKJ2022.bb.ejb20=CHKJ2022W\uff1a\u6b64\u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.2)\u3002
-CHKJ2022.sb.ejb20=CHKJ2022W\uff1a\u6b64\u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 7.10.1)\u3002
-CHKJ2022.kc.ejb20=CHKJ2022W\uff1a\u6b64\u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.8.2)\u3002
-
-CHKJ2015.cb.ejb20=CHKJ2015W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.6.2)\u3002
-CHKJ2015.mb.ejb20=CHKJ2015W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 15.7.2)\u3002
-CHKJ2015.bb.ejb20=CHKJ2015W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.2)\u3002
-CHKJ2015.sb.ejb20=CHKJ2015W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 7.10.1)\u3002
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W\uff1a\u6b64\u7c7b\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.3.3, 10.6.3)\u3002
-CHKJ2043.ejb20=CHKJ2043W\uff1a\u6b64\u7c7b\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.3)\u3002
-CHKJ2044.ejb20=CHKJ2044W\uff1a\u6b64\u7c7b\u4e00\u5b9a\u4e0d\u80fd\u662f\u62bd\u8c61\u7684 (EJB 2.0: 10.6.3)\u3002
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W\uff1a\u6b64\u7c7b\u5728 RMI-IIOP \u4e2d\u5fc5\u987b\u662f\u5408\u6cd5\u201c\u503c\u7c7b\u578b\u201d(EJB 2.0: 9.8, 10.6.13)\u3002
-CHKJ2019.kb.ejb20=CHKJ2019W\uff1a\u6b64\u7c7b\u5728 RMI-IIOP \u4e2d\u5fc5\u987b\u662f\u5408\u6cd5\u201c\u503c\u7c7b\u578b\u201d(EJB 2.0: 9.8, 12.2.12)\u3002
-
-
-###
-# methods which must exist
-###
-# public default constructor with no parameters
-CHKJ2050.constr.sb.ejb20=CHKJ2050W\uff1a\u516c\u7528 {0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 7.10.2)\u3002
-CHKJ2050.constr.cb.ejb20=CHKJ2050W\uff1a\u516c\u7528 {0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2, 10.6.2)\u3002
-CHKJ2050.constr.bb.ejb20=CHKJ2050W\uff1a\u516c\u7528 {0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1, 12.2.2)\u3002
-CHKJ2050.constr.mb.ejb20=CHKJ2050W\uff1a\u516c\u7528 {0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 15.7.2)\u3002
-CHKJ2050.constr.kc.ejb20=CHKJ2050W\uff1a\u516c\u7528 {0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.8.2)\u3002
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9a\u4e49 {0} (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W\uff1aonMessage(javax.jms.Message) \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 15.4.2, 15.7.4)\u3002
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W\uff1a\u5fc5\u987b\u81f3\u5c11\u5b58\u5728\u4e00\u4e2a ejbCreate \u65b9\u6cd5 (EJB 2.0: 7.5.5)\u3002
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W\uff1aejbCreate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 7.8)\u3002
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W\uff1aejbCreate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 15.4.4, 15.7.2)\u3002
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W\uff1aejbFindByPrimaryKey \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W\uff1asetEntityContext(EntityContext) \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W\uff1asetEntityContext(EntityContext) \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W\uff1aunsetEntityContext() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W\uff1aunsetEntityContext() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W\uff1aejbActivate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W\uff1aejbActivate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W\uff1aejbPassivate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W\uff1aejbPassivate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W\uff1aejbPassivate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 7.5.1)\u3002
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W\uff1aejbRemove() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W\uff1aejbRemove() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W\uff1aejbRemove() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 15.7.5)\u3002
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W\uff1aejbRemove() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 4.2.2, 7.5.1)\u3002
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W\uff1aejbLoad() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W\uff1aejbLoad() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W\uff1aejbStore() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W\uff1aejbStore() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W\uff1acreate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 7.8, 7.10.6)\u3002
-CHKJ2050.create.sslh.ejb20=CHKJ2050W\uff1acreate() \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 7.8, 7.10.8)\u3002
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a create \u65b9\u6cd5 (EJB 2.0: 6.3.1, 7.10.6)\u3002
-CHKJ2050.create.slh.ejb20=CHKJ2050W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a create \u65b9\u6cd5 (EJB 2.0: 6.4.1, 7.10.8)\u3002
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W\uff1a\u5fc5\u987b\u81f3\u5c11\u5b58\u5728\u4e00\u4e2a finder \u65b9\u6cd5 (EJB 2.0: 9.5.2)\u3002
-CHKJ2050.find.brh.ejb20=CHKJ2050W\uff1a\u5fc5\u987b\u81f3\u5c11\u5b58\u5728\u4e00\u4e2a finder \u65b9\u6cd5 (EJB 2.0: 9.5.2)\u3002
-CHKJ2050.find.clh.ejb20=CHKJ2050W\uff1a\u5fc5\u987b\u81f3\u5c11\u5b58\u5728\u4e00\u4e2a finder \u65b9\u6cd5 (EJB 2.0: 9.6.2)\u3002
-CHKJ2050.find.blh.ejb20=CHKJ2050W\uff1a\u5fc5\u987b\u81f3\u5c11\u5b58\u5728\u4e00\u4e2a finder \u65b9\u6cd5 (EJB 2.0: 9.6.2)\u3002
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a home \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.home.brh.ejb20=CHKJ2050W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a home \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.home.clh.ejb20=CHKJ2050W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a home \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-CHKJ2050.home.blh.ejb20=CHKJ2050W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a home \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a ejbHome \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a ejbHome \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a ejbHome \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W\uff1a\u6b64\u7c7b\u5fc5\u987b\u5b9a\u4e49\u81f3\u5c11\u4e00\u4e2a ejbHome \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W\uff1ahashCode() \u5fc5\u987b\u5b58\u5728\u4e8e\u6b64\u7c7b\u4e0a (EJB 2.0: 12.2.12)\u3002
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W\uff1ahashCode() \u5fc5\u987b\u5b58\u5728\u4e8e\u6b64\u7c7b\u4e0a (EJB 2.0: 10.6.13)\u3002
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W\uff1aequals(Object) \u5fc5\u987b\u5b58\u5728\u4e8e\u6b64\u7c7b\u4e0a (EJB 2.0: 12.2.12)\u3002
-CHKJ2050.equals.kc.ejb20=CHKJ2050W\uff1aequals(Object) \u5fc5\u987b\u5b58\u5728\u4e8e\u6b64\u7c7b\u4e0a (EJB 2.0: 10.6.13)\u3002
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W\uff1aejbSelect \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2, 10.6.7)\u3002
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W\uff1afindByPrimaryKey \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W\uff1afindByPrimaryKey \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 9.6.2, 10.6.12)\u3002
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W\uff1afindByPrimaryKey \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 9.6.2, 12.2.11)\u3002
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W\uff1afindByPrimaryKey \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 9.5.2, 12.2.9)\u3002
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W\uff1a{0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E\uff1a{0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E\uff1a{0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 12.1.4.1, 12.2.4)\u3002
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W\uff1a{0} \u4e0a\u7684\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 {1} \u5fc5\u987b\u6269\u5c55 java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1)\u3002
-CHKJ2404.m.ejb20=CHKJ2404W\uff1a\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 {0} \u5fc5\u987b\u6269\u5c55 java.lang.Exception (EJB 2.0: 18.1.1, 18.2.1)\u3002
-CHKJ2416.i.ejb20=CHKJ2416W\uff1a{0} \u4e0a\u7684\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 {1} \u4e00\u5b9a\u4e0d\u80fd\u6269\u5c55 java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1)\u3002
-CHKJ2416.m.ejb20=CHKJ2416W\uff1a\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 {0} \u4e00\u5b9a\u4e0d\u80fd\u6269\u5c55 java.lang.RuntimeException (EJB 2.0: 18.1.1, 18.2.1)\u3002
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W\uff1a{1} \u4e0a\u7684 {0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 15.7.5)\u3002
-CHKJ2492.mb.m.ejb20=CHKJ2492W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 15.7.5)\u3002
-CHKJ2492.cb.i.ejb20=CHKJ2492W\uff1a{1} \u4e0a\u7684 {0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.5.2)\u3002
-CHKJ2492.cb.m.ejb20=CHKJ2492W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.5.2)\u3002
-CHKJ2492.bb.i.ejb20=CHKJ2492W\uff1a{1} \u4e0a\u7684 {0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2492.bb.m.ejb20=CHKJ2492W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2492.sb.i.ejb20=CHKJ2492W\uff1a{1} \u4e0a\u7684 {0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 7.6)\u3002
-CHKJ2492.sb.m.ejb20=CHKJ2492W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 7.6)\u3002
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 15.7.5)\u3002
-CHKJ2493.mb.m.ejb20=CHKJ2493W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 15.7.5)\u3002
-CHKJ2493.cb.i.ejb20=CHKJ2493W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.5.2)\u3002
-CHKJ2493.cb.m.ejb20=CHKJ2493W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.5.2)\u3002
-CHKJ2493.bb.i.ejb20=CHKJ2493W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2493.bb.m.ejb20=CHKJ2493W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2493.sb.i.ejb20=CHKJ2493W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 7.6)\u3002
-CHKJ2493.sb.m.ejb20=CHKJ2493W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 7.6)\u3002
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 15.7.5)\u3002
-CHKJ2494.mb.m.ejb20=CHKJ2494W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 15.7.5)\u3002
-CHKJ2494.cb.i.ejb20=CHKJ2494W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.5.2)\u3002
-CHKJ2494.cb.m.ejb20=CHKJ2494W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.5.2)\u3002
-CHKJ2494.bb.i.ejb20=CHKJ2494W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2494.bb.m.ejb20=CHKJ2494W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2494.sb.i.ejb20=CHKJ2494W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 7.6)\u3002
-CHKJ2494.sb.m.ejb20=CHKJ2494W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 7.6)\u3002
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 15.7.5)\u3002
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 15.7.5)\u3002
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 10.5.2)\u3002
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 10.5.2)\u3002
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 7.6)\u3002
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 7.6)\u3002
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 15.7.3)\u3002
-CHKJ2421.cb.i.ejb20=CHKJ2421W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.4)\u3002
-CHKJ2421.bb.i.ejb20=CHKJ2421W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.3)\u3002
-CHKJ2421.sb.i.ejb20=CHKJ2421W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 7.10.3)\u3002
-CHKJ2421.mb.m.ejb20=CHKJ2421W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 15.7.3)\u3002
-CHKJ2421.cb.m.ejb20=CHKJ2421W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.4)\u3002
-CHKJ2421.bb.m.ejb20=CHKJ2421W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.3)\u3002
-CHKJ2421.sb.m.ejb20=CHKJ2421W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 7.10.3)\u3002
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 7.10.3)\u3002
-CHKJ2422.cb.i.ejb20=CHKJ2422W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.6.4)\u3002
-CHKJ2422.bb.i.ejb20=CHKJ2422W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.3)\u3002
-CHKJ2422.mb.i.ejb20=CHKJ2422W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 15.7.3)\u3002
-CHKJ2422.sb.m.ejb20=CHKJ2422W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 7.10.3)\u3002
-CHKJ2422.cb.m.ejb20=CHKJ2422W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.6.4)\u3002
-CHKJ2422.bb.m.ejb20=CHKJ2422W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.3)\u3002
-CHKJ2422.mb.m.ejb20=CHKJ2422W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 15.7.3)\u3002
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 7.10.3)\u3002
-CHKJ2423.cb.i.ejb20=CHKJ2423W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.4)\u3002
-CHKJ2423.bb.i.ejb20=CHKJ2423W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.3)\u3002
-CHKJ2423.mb.i.ejb20=CHKJ2423W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 15.7.3)\u3002
-CHKJ2423.sb.m.ejb20=CHKJ2423W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 7.10.3)\u3002
-CHKJ2423.cb.m.ejb20=CHKJ2423W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.4)\u3002
-CHKJ2423.bb.m.ejb20=CHKJ2423W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.3)\u3002
-CHKJ2423.mb.m.ejb20=CHKJ2423W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 15.7.3)\u3002
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 10.6.4)\u3002
-CHKJ2424.bb.i.ejb20=CHKJ2424W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 12.2.3)\u3002
-CHKJ2424.sb.i.ejb20=CHKJ2424W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 7.10.3)\u3002
-CHKJ2424.mb.i.ejb20=CHKJ2424W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 15.7.3)\u3002
-CHKJ2424.cb.m.ejb20=CHKJ2424W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 10.6.4)\u3002
-CHKJ2424.bb.m.ejb20=CHKJ2424W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 12.2.3)\u3002
-CHKJ2424.sb.m.ejb20=CHKJ2424W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 7.10.3)\u3002
-CHKJ2424.mb.m.ejb20=CHKJ2424W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 15.7.3)\u3002
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.3)\u3002
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.4)\u3002
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.3)\u3002
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.3)\u3002
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.4)\u3002
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.3)\u3002
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 10.6.4)\u3002
-CHKJ2497.cb.m.ejb20=CHKJ2497W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 10.6.4)\u3002
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2)\u3002
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 (EJB 2.0: 15.7.3, 18.1.1, 18.2.1, 18.3.2)\u3002
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2)\u3002
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 (EJB 2.0: 15.7.5, 18.1.1, 18.2.1, 18.3.2)\u3002
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2)\u3002
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa\u5e94\u7528\u7a0b\u5e8f\u5f02\u5e38 (EJB 2.0: 15.4.10, 15.7.4, 18.1.1, 18.2.1, 18.3.2)\u3002
-
-
-CHKJ2503.ejbCreate.sb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.3, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.4, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.3, 18.3.8, 18.6)\u3002
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.5)\u3002
-CHKJ2426.bb.i.ejb20=CHKJ2426W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.4)\u3002
-CHKJ2426.cb.m.ejb20=CHKJ2426W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.5)\u3002
-CHKJ2426.bb.m.ejb20=CHKJ2426W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.6.5)\u3002
-CHKJ2427.bb.i.ejb20=CHKJ2427W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.4)\u3002
-CHKJ2427.cb.m.ejb20=CHKJ2427W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.6.5)\u3002
-CHKJ2427.bb.m.ejb20=CHKJ2427W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.5)\u3002
-CHKJ2428.bb.i.ejb20=CHKJ2428W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.4)\u3002
-CHKJ2428.cb.m.ejb20=CHKJ2428W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.5)\u3002
-CHKJ2428.bb.m.ejb20=CHKJ2428W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 10.6.5)\u3002
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 12.2.4)\u3002
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 10.6.5)\u3002
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.5, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.4, 18.3.8, 18.6)\u3002
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I\uff1a\u5fc5\u987b\u5b58\u5728 {1} \u624d\u80fd\u8c03\u7528 {0} (EJB 2.0: 10.5.2, 10.6.6)\u3002
-CHKJ2430.bb.i.ejb20=CHKJ2430I\uff1a\u5fc5\u987b\u5b58\u5728 {1} \u624d\u80fd\u8c03\u7528 {0} (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2430.cb.m.ejb20=CHKJ2430I\uff1a\u5fc5\u987b\u5b58\u5728 {0} \u624d\u80fd\u8c03\u7528\u6b64\u65b9\u6cd5 (EJB 2.0: 10.5.2, 10.6.6)\u3002
-CHKJ2430.bb.m.ejb20=CHKJ2430I\uff1a\u5fc5\u987b\u5b58\u5728 {0} \u624d\u80fd\u8c03\u7528\u6b64\u65b9\u6cd5 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.6)\u3002
-CHKJ2431.bb.i.ejb20=CHKJ2431W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 2.0: 12.2.6)\u3002
-CHKJ2431.cb.m.ejb20=CHKJ2431W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.6)\u3002
-CHKJ2431.bb.m.ejb20=CHKJ2431W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684\u3002(EJB 2.0: 12.2.6)\u3002
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.6)\u3002
-CHKJ2439.bb.i.ejb20=CHKJ2439W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.6)\u3002
-CHKJ2439.cb.m.ejb20=CHKJ2439W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.6)\u3002
-CHKJ2439.bb.m.ejb20=CHKJ2439W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.6)\u3002
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.6)\u3002
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.6)\u3002
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.6)\u3002
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.6)\u3002
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.6, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.6, 18.3.8, 18.6)\u3002
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.5)\u3002
-CHKJ2457.bb.m.ejb20=CHKJ2457W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.5)\u3002
-CHKJ2458.bb.m.ejb20=CHKJ2458W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.5)\u3002
-CHKJ2459.bb.m.ejb20=CHKJ2459W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {1} \u4e0a\u7684 {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.5)\u3002
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 12.2.5)\u3002
-CHKJ2407.bb.m.ejb20=CHKJ2407W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6)\u3002
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.5, 18.3.8, 18.6)\u3002
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2498.bb.m.ejb20=CHKJ2498W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u5bb9\u5668\u63d0\u4f9b\u4e86\u6b64\u65b9\u6cd5\u5b9e\u73b0 (EJB 2.0: 10.5.2, 10.6.2)\u3002
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u5bb9\u5668\u63d0\u4f9b\u4e86\u6b64\u65b9\u6cd5\u5b9e\u73b0 (EJB 2.0: 10.5.2, 10.6.2)\u3002
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 CMP bean \u53ef\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 12.1.5)\u3002
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 CMP bean \u53ef\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 12.1.5)\u3002
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 CMP bean \u53ef\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.6.1)\u3002
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 CMP bean \u53ef\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.6.1)\u3002
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 CMP bean \u53ef\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.8.2)\u3002
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728\u3002\u53ea\u6709 CMP bean \u53ef\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.8.2)\u3002
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.5.2, 10.5.7)\u3002
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I\uff1afinalize() \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.6.2)\u3002
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 10.6.2)\u3002
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I\uff1afinalize() \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 15.7.2)\u3002
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 15.7.2)\u3002
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I\uff1afinalize() \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 12.2.2)\u3002
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 12.2.2)\u3002
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I\uff1afinalize() \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 7.10.2)\u3002
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 7.10.2)\u3002
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 7.10.8)\u3002
-CHKJ2502.slh.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 7.10.8)\u3002
-CHKJ2502.srh.i.ejb20=CHKJ2502I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 7.10.6)\u3002
-CHKJ2502.srh.m.ejb20=CHKJ2502I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5b58\u5728 (EJB 2.0: 7.10.6)\u3002
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb (EJB 2.0: 7.10.4)\u3002
-CHKJ2411.cb.i.ejb20=CHKJ2411W\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb (EJB 2.0: 10.6.8)\u3002
-CHKJ2411.bb.i.ejb20=CHKJ2411W\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb (EJB 2.0: 12.2.7)\u3002
-CHKJ2411.sb.m.ejb20=CHKJ2411W\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb (EJB 2.0: 7.10.4)\u3002
-CHKJ2411.cb.m.ejb20=CHKJ2411W\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb (EJB 2.0: 10.6.8)\u3002
-CHKJ2411.bb.m.ejb20=CHKJ2411W\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cejb\u201d\u5f00\u59cb (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 7.10.4)\u3002
-CHKJ2441.cb.i.ejb20=CHKJ2441W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.8)\u3002
-CHKJ2441.bb.i.ejb20=CHKJ2441W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.7)\u3002
-CHKJ2441.sb.m.ejb20=CHKJ2441W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 7.10.4)\u3002
-CHKJ2441.cb.m.ejb20=CHKJ2441W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.8)\u3002
-CHKJ2441.bb.m.ejb20=CHKJ2441W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 7.10.4)\u3002
-CHKJ2442.cb.i.ejb20=CHKJ2442W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.6.8)\u3002
-CHKJ2442.bb.i.ejb20=CHKJ2442W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.7)\u3002
-CHKJ2442.sb.m.ejb20=CHKJ2442W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 7.10.4)\u3002
-CHKJ2442.cb.m.ejb20=CHKJ2442W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 10.6.8)\u3002
-CHKJ2442.bb.m.ejb20=CHKJ2442W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 7.10.4)\u3002
-CHKJ2443.cb.i.ejb20=CHKJ2443W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.8)\u3002
-CHKJ2443.bb.i.ejb20=CHKJ2443W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.7)\u3002
-CHKJ2443.sb.m.ejb20=CHKJ2443W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 7.10.4)\u3002
-CHKJ2443.cb.m.ejb20=CHKJ2443W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 10.6.8)\u3002
-CHKJ2443.bb.m.ejb20=CHKJ2443W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.4)\u3002
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.8)\u3002
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.7)\u3002
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.4)\u3002
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.8)\u3002
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.4, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.8, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.7, 18.3.8, 18.6)\u3002
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6)\u3002
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 15.4.10, 18.3.8, 18.6)\u3002
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 15.7.4)\u3002
-CHKJ2445.mb.m.ejb20=CHKJ2445W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 15.7.4)\u3002
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 15.7.4)\u3002
-CHKJ2446.mb.m.ejb20=CHKJ2446W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u7ec8\u6001\u7684 (EJB 2.0: 15.7.4)\u3002
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 15.7.4)\u3002
-CHKJ2447.mb.m.ejb20=CHKJ2447W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u662f\u9759\u6001\u7684 (EJB 2.0: 15.7.4)\u3002
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W\uff1a{0} \u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 15.7.4)\u3002
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de\u7a7a (EJB 2.0: 15.7.4)\u3002
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.3.1)\u3002
-CHKJ2449.cb.m.ejb20=CHKJ2449W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W\uff1a{0} \u5fc5\u987b\u662f\u62bd\u8c61\u7684 (EJB 2.0: 10.3.1, 10.6.2)\u3002
-CHKJ2450.cb.m.ejb20=CHKJ2450W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u62bd\u8c61\u7684 (EJB 2.0: 10.3.1, 10.6.2)\u3002
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00 {0} (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-CHKJ2473.crc.m.ejb20=CHKJ2473W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u6b64\u65b9\u6cd5 (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-CHKJ2473.crh.i.ejb20=CHKJ2473W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00 {0} (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-CHKJ2473.crh.m.ejb20=CHKJ2473W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u6b64\u65b9\u6cd5 (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u9075\u5faa\u7528\u4e8e\u8fdc\u7a0b\u63a5\u53e3\u7684 RMI-IIOP \u89c4\u5219 (EJB 2.0: 12.2.9)\u3002
-CHKJ2461.home.crh.ejb20=CHKJ2461W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u9075\u5faa\u7528\u4e8e\u8fdc\u7a0b\u63a5\u53e3\u7684 RMI-IIOP \u89c4\u5219 (EJB 2.0: 10.6.10)\u3002
-CHKJ2461.home.srh.ejb20=CHKJ2461W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u9075\u5faa\u7528\u4e8e\u8fdc\u7a0b\u63a5\u53e3\u7684 RMI-IIOP \u89c4\u5219 (EJB 2.0: 7.10.6)\u3002
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2462.brh.i.ejb20=CHKJ2462I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2462.crh.i.ejb20=CHKJ2462I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.6.4, 10.6.12)\u3002
-CHKJ2462.blh.i.ejb20=CHKJ2462I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.11)\u3002
-CHKJ2462.clh.m.ejb20=CHKJ2462I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2462.brh.m.ejb20=CHKJ2462I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2462.crh.m.ejb20=CHKJ2462I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.6.4, 10.6.12)\u3002
-CHKJ2462.blh.m.ejb20=CHKJ2462I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201ccreate\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.11)\u3002
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2463.brh.i.ejb20=CHKJ2463I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2463.crh.i.ejb20=CHKJ2463I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.6.4, 10.6.12)\u3002
-CHKJ2463.blh.i.ejb20=CHKJ2463I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.11)\u3002
-CHKJ2463.clh.m.ejb20=CHKJ2463I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2463.brh.m.ejb20=CHKJ2463I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2463.crh.m.ejb20=CHKJ2463I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.6.4, 10.6.12)\u3002
-CHKJ2463.blh.m.ejb20=CHKJ2463I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cfind\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.11)\u3002
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2464.brh.i.ejb20=CHKJ2464I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2464.crh.i.ejb20=CHKJ2464I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.6.4, 10.6.12)\u3002
-CHKJ2464.blh.i.ejb20=CHKJ2464I\uff1a\u65b9\u6cd5 {0} \u7684\u540d\u79f0\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.11)\u3002
-CHKJ2464.clh.m.ejb20=CHKJ2464I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2464.brh.m.ejb20=CHKJ2464I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2464.crh.m.ejb20=CHKJ2464I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.6.4, 10.6.12)\u3002
-CHKJ2464.blh.m.ejb20=CHKJ2464I\uff1a\u6b64\u65b9\u6cd5\u540d\u4e00\u5b9a\u4e0d\u80fd\u4ee5\u201cremove\u201d\u5f00\u59cb (EJB 2.0: 9.5.4, 12.2.11)\u3002
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6)\u3002
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6)\u3002
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6)\u3002
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4, 12.2.11, 18.3.8, 18.6)\u3002
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4, 10.6.12, 18.3.8, 18.6)\u3002
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6)\u3002
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9)\u3002
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10)\u3002
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6)\u3002
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6)\u3002
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6)\u3002
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1, 12.2.9)\u3002
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1, 10.6.10)\u3002
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1, 12.2.11, 18.3.8, 18.6)\u3002
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1, 10.6.12, 18.3.8, 18.6)\u3002
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6)\u3002
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.6)\u3002
-CHKJ2467.slh.i.ejb20=CHKJ2467W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.8)\u3002
-CHKJ2467.crh.i.ejb20=CHKJ2467W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10)\u3002
-CHKJ2467.clh.i.ejb20=CHKJ2467W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12)\u3002
-CHKJ2467.brh.i.ejb20=CHKJ2467W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9)\u3002
-CHKJ2467.blh.i.ejb20=CHKJ2467W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11)\u3002
-CHKJ2467.srh.m.ejb20=CHKJ2467W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.6)\u3002
-CHKJ2467.slh.m.ejb20=CHKJ2467W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.8)\u3002
-CHKJ2467.crh.m.ejb20=CHKJ2467W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1, 10.6.10)\u3002
-CHKJ2467.clh.m.ejb20=CHKJ2467W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1, 10.6.12)\u3002
-CHKJ2467.brh.m.ejb20=CHKJ2467W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1, 12.2.9)\u3002
-CHKJ2467.blh.m.ejb20=CHKJ2467W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1, 12.2.11)\u3002
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 6.3.1, 7.10.6)\u3002
-CHKJ2402.sflh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 6.4.1, 7.10.8)\u3002
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 6.3.1, 7.8, 7.10.6)\u3002
-CHKJ2402.sslh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 6.4.1, 7.8, 7.10.8)\u3002
-CHKJ2402.crh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.5.1, 10.6.10)\u3002
-CHKJ2402.clh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.6.1, 10.6.12)\u3002
-CHKJ2402.brh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.5.1, 12.2.9)\u3002
-CHKJ2402.blh.i.ejb20=CHKJ2402E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.6.1, 12.2.11)\u3002
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 6.3.1, 7.10.6)\u3002
-CHKJ2402.sflh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 6.4.1, 7.10.8)\u3002
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 6.3.1, 7.8, 7.10.6)\u3002
-CHKJ2402.sslh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 6.4.1, 7.8, 7.10.8)\u3002
-CHKJ2402.crh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.5.1, 10.6.10)\u3002
-CHKJ2402.clh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.6.1, 10.6.12)\u3002
-CHKJ2402.brh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.5.1, 12.2.9)\u3002
-CHKJ2402.blh.m.ejb20=CHKJ2402E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.6.1, 12.2.11)\u3002
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E\uff1a{0} \u5fc5\u987b\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8, 7.10.6)\u3002
-CHKJ2476.slh.i.ejb20=CHKJ2476E\uff1a{0} \u5fc5\u987b\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8, 7.10.8)\u3002
-CHKJ2476.srh.m.ejb20=CHKJ2476E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8, 7.10.6)\u3002
-CHKJ2476.slh.m.ejb20=CHKJ2476E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8, 7.10.8)\u3002
-CHKJ2476.ssb.i.ejb20=CHKJ2476E\uff1a{0} \u5fc5\u987b\u662f ejbCreate() \u65b9\u6cd5 (EJB 2.0: 7.8)\u3002
-CHKJ2476.ssb.m.ejb20=CHKJ2476E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f ejbCreate() \u65b9\u6cd5 (EJB 2.0: 7.8)\u3002
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 7.10.6)\u3002
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 7.10.8)\u3002
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 10.6.10)\u3002
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 10.6.12)\u3002
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W\uff1a{0} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 7.10.6)\u3002
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W\uff1a{0} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 7.10.8)\u3002
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W\uff1a{0} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.6.10)\u3002
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W\uff1a{0} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.6.12)\u3002
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W\uff1a{0} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W\uff1a{0} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.11)\u3002
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 12.2.9)\u3002
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 10.5.2, 10.6.10)\u3002
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 10.5.2, 10.6.12)\u3002
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W\uff1a{0} \u7684 {1} \u5339\u914d\u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.5.2, 10.6.10)\u3002
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.5.2, 10.6.12)\u3002
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.11)\u3002
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6)\u3002
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6)\u3002
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6)\u3002
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2, 12.2.11, 18.3.8, 18.6)\u3002
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2, 10.6.12, 18.3.8, 18.6)\u3002
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8, 18.3.8, 18.6)\u3002
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2477.brh.i.ejb20=CHKJ2477W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11)\u3002
-CHKJ2477.clh.i.ejb20=CHKJ2477W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2477.blh.i.ejb20=CHKJ2477W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12)\u3002
-CHKJ2477.crh.m.ejb20=CHKJ2477W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2477.brh.m.ejb20=CHKJ2477W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2, 12.2.11)\u3002
-CHKJ2477.clh.m.ejb20=CHKJ2477W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2477.blh.m.ejb20=CHKJ2477W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2, 10.6.12)\u3002
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.crh.m.ejb20=CHKJ2478I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.clh.i.ejb20=CHKJ2478I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.clh.m.ejb20=CHKJ2478I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.brh.i.ejb20=CHKJ2478I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.brh.m.ejb20=CHKJ2478I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.blh.i.ejb20=CHKJ2478I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.blh.m.ejb20=CHKJ2478I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.cb.i.ejb20=CHKJ2478I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.cb.m.ejb20=CHKJ2478I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.bb.i.ejb20=CHKJ2478I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.bb.m.ejb20=CHKJ2478I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2, 12.1.7, 12.2.9)\u3002
-CHKJ2403.blh.i.ejb20=CHKJ2403W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2, 12.1.7, 12.2.11)\u3002
-CHKJ2403.crh.i.ejb20=CHKJ2403W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2)\u3002
-CHKJ2403.clh.i.ejb20=CHKJ2403W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2)\u3002
-CHKJ2403.brh.m.ejb20=CHKJ2403W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2, 12.1.7, 12.2.9)\u3002
-CHKJ2403.blh.m.ejb20=CHKJ2403W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2, 12.1.7, 12.2.11)\u3002
-CHKJ2403.crh.m.ejb20=CHKJ2403W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2, 10.5.6, 10.6.10, 11.2.2)\u3002
-CHKJ2403.clh.m.ejb20=CHKJ2403W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2, 10.5.6, 10.6.12, 11.2.2)\u3002
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W\uff1a{1} \u5fc5\u987b\u5b58\u5728\u4e8e {0} \u7684 {2} \u4e0a (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W\uff1a{1} \u5fc5\u987b\u5b58\u5728\u4e8e {0} \u7684 {2} \u4e0a (EJB 2.0: 10.6.10)\u3002
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W\uff1a{0} \u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W\uff1a{0} \u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.6.10)\u3002
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W\uff1a{1} \u5fc5\u987b\u5b58\u5728\u4e8e {0} \u7684 {2} \u4e0a (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W\uff1a{1} \u5fc5\u987b\u5b58\u5728\u4e8e {0} \u7684 {2} \u4e0a (EJB 2.0: 10.6.2)\u3002
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W\uff1a{0} \u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W\uff1a{0} \u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.6.2)\u3002
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 12.2.9)\u3002
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I\uff1a{0} \u5fc5\u987b\u4e0e ejb-jar.xml \u4e2d\u7684\u67e5\u8be2\u5143\u7d20\u76f8\u5173\u8054 (EJB 2.0: 10.5.6, 10.6.14)\u3002
-CHKJ2495.clh.m.ejb20=CHKJ2495I\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u4e0e ejb-jar.xml \u4e2d\u7684\u67e5\u8be2\u5143\u7d20\u76f8\u5173\u8054 (EJB 2.0: 10.5.6, 10.6.14)\u3002
-CHKJ2495.crh.i.ejb20=CHKJ2495I\uff1a{0} \u5fc5\u987b\u4e0e ejb-jar.xml \u4e2d\u7684\u67e5\u8be2\u5143\u7d20\u76f8\u5173\u8054 (EJB 2.0: 10.5.6, 10.6.14)\u3002
-CHKJ2495.crh.m.ejb20=CHKJ2495I\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u4e0e ejb-jar.xml \u4e2d\u7684\u67e5\u8be2\u5143\u7d20\u76f8\u5173\u8054 (EJB 2.0: 10.5.6, 10.6.14)\u3002
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.5)\u3002
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.8)\u3002
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E\uff1a{0} \u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.9)\u3002
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.5)\u3002
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.7, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.8)\u3002
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.10, 12.2.10, 18.3.8, 18.6)\u3002
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.9)\u3002
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u629b\u51fa java.rmi.RemoteException (EJB 2.0: 9.10, 18.3.8, 18.6)\u3002
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W\uff1a{0} \u5fc5\u987b\u5bf9 {2} \u629b\u51fa {1} (EJB 2.0: 12.2.9)\u3002
-CHKJ2465.blh.i.ejb20=CHKJ2465W\uff1a{0} \u5fc5\u987b\u5bf9 {2} \u629b\u51fa {1} (EJB 2.0: 12.2.11)\u3002
-CHKJ2465.crh.i.ejb20=CHKJ2465W\uff1a{0} \u5fc5\u987b\u5bf9 {2} \u629b\u51fa {1} (EJB 2.0: 10.6.10)\u3002
-CHKJ2465.clh.i.ejb20=CHKJ2465W\uff1a{0} \u5fc5\u987b\u5bf9 {2} \u629b\u51fa {1} (EJB 2.0: 10.6.12)\u3002
-CHKJ2465.srh.i.ejb20=CHKJ2465W\uff1a{0} \u5fc5\u987b\u5bf9 {2} \u629b\u51fa {1} (EJB 2.0: 7.10.6)\u3002
-CHKJ2465.slh.i.ejb20=CHKJ2465W\uff1a{0} \u5fc5\u987b\u5bf9 {2} \u629b\u51fa {1} (EJB 2.0: 7.10.8)\u3002
-CHKJ2465.brh.m.ejb20=CHKJ2465W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u5bf9 {1} \u629b\u51fa {0} (EJB 2.0: 12.2.9)\u3002
-CHKJ2465.blh.m.ejb20=CHKJ2465W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u5bf9 {1} \u629b\u51fa {0} (EJB 2.0: 12.2.11)\u3002
-CHKJ2465.crh.m.ejb20=CHKJ2465W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u5bf9 {1} \u629b\u51fa {0} (EJB 2.0: 10.6.10)\u3002
-CHKJ2465.clh.m.ejb20=CHKJ2465W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u5bf9 {1} \u629b\u51fa {0} (EJB 2.0: 10.6.12)\u3002
-CHKJ2465.srh.m.ejb20=CHKJ2465W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u5bf9 {1} \u629b\u51fa {0} (EJB 2.0: 7.10.6)\u3002
-CHKJ2465.slh.m.ejb20=CHKJ2465W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u5bf9 {1} \u629b\u51fa {0} (EJB 2.0: 7.10.8)\u3002
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 12.2.9)\u3002
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 10.6.10)\u3002
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4, 12.2.9)\u3002
-
-CHKJ2466.src.i.ejb20=CHKJ2466I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u7c7b\u578b {1} (EJB 2.0: 7.10.5)\u3002
-CHKJ2466.crh.i.ejb20=CHKJ2466I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u7c7b\u578b {1} (EJB 2.0: 10.6.10)\u3002
-CHKJ2466.brh.i.ejb20=CHKJ2466I\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u7c7b\u578b {1} (EJB 2.0: 12.2.9)\u3002
-CHKJ2466.crh.m.ejb20=CHKJ2466I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u7c7b\u578b {0} (EJB 2.0: 10.6.10)\u3002
-CHKJ2466.brh.m.ejb20=CHKJ2466I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u7c7b\u578b {0} (EJB 2.0: 12.2.9)\u3002
-CHKJ2466.src.m.ejb20=CHKJ2466I\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u7c7b\u578b {0} (EJB 2.0: 7.10.5)\u3002
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u9075\u5faa\u7528\u4e8e\u8fdc\u7a0b\u63a5\u53e3\u7684 RMI-IIOP \u89c4\u5219 (EJB 2.0: 7.10.5)\u3002
-CHKJ2468.crc.ejb20=CHKJ2468W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u9075\u5faa\u7528\u4e8e\u8fdc\u7a0b\u63a5\u53e3\u7684 RMI-IIOP \u89c4\u5219 (EJB 2.0: 10.6.9)\u3002
-CHKJ2468.brc.ejb20=CHKJ2468W\uff1a\u6b64\u63a5\u53e3\u5fc5\u987b\u9075\u5faa\u7528\u4e8e\u8fdc\u7a0b\u63a5\u53e3\u7684 RMI-IIOP \u89c4\u5219 (EJB 2.0: 12.2.8)\u3002
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {1} \u4e2d\u7684 {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.5)\u3002
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {1} \u4e2d\u7684 {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.9)\u3002
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I\uff1a\u65b9\u6cd5 {1} \u4e2d\u7684 {0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.8)\u3002
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 7.10.5)\u3002
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 10.6.9)\u3002
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I\uff1a{0} \u5728\u8fd0\u884c\u65f6\u5fc5\u987b\u53ef\u5e8f\u5217\u5316 (EJB 2.0: 12.2.8)\u3002
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W\uff1a\u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u4e0d\u80fd\u4e3a\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u7c7b\u578b (EJB 2.0: 6.7.2)\u3002
-CHKJ2472.brc.i.ejb20=CHKJ2472W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5c06 {1} \u4f5c\u4e3a\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012 (EJB 2.0: 9.7.2, 12.2.8)\u3002
-CHKJ2472.crc.i.ejb20=CHKJ2472W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u5c06 {1} \u4f5c\u4e3a\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012 (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1)\u3002
-CHKJ2472.brc.m.ejb20=CHKJ2472W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5c06 {0} \u4f5c\u4e3a\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012 (EJB 2.0: 9.7.2, 12.2.8)\u3002
-CHKJ2472.crc.m.ejb20=CHKJ2472W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u5c06 {0} \u4f5c\u4e3a\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u4f20\u9012 (EJB 2.0: 9.7.2, 10.3.1, 10.3.10.1)\u3002
-CHKJ2472.srh.m.ejb20=CHKJ2472W\uff1a{0} \u4e0d\u80fd\u4e3a\u81ea\u53d8\u91cf\u6216\u7ed3\u679c\u7c7b\u578b (EJB 2.0: 6.7.2)\u3002
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W\uff1a{0} \u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00 {1} (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-CHKJ2474.crc.m.ejb20=CHKJ2474W\uff1a\u6b64\u65b9\u6cd5\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00 {0} (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00 {0} (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-CJKJ2490.crc.m.ejb20=CHKJ2490W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u516c\u5f00\u6b64\u65b9\u6cd5 (EJB 2.0: 10.3.1, 10.3.10.1)\u3002
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W\uff1a{0} \u5fc5\u987b\u662f\u62bd\u8c61\u7684 (EJB 2.0: 10.5.7, 10.6.7)\u3002
-CHKJ2485.cb.m.ejb20=CHKJ2485W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u62bd\u8c61\u7684 (EJB 2.0: 10.5.7, 10.6.7)\u3002
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W\uff1a{0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.7)\u3002
-CHKJ2487.cb.m.ejb20=CHKJ2487W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.6.7)\u3002
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W\uff1a{0} \u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 10.6.7)\u3002
-CHKJ2488.cb.m.ejb20=CHKJ2488W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa javax.ejb.FinderException (EJB 2.0: 10.6.7)\u3002
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 10.5.7, 11.2.2)\u3002
-CHKJ2486.cb.m.ejb20=CHKJ2486W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 10.5.7, 11.2.2)\u3002
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W\uff1a{0} \u5fc5\u987b\u4e0e ejb-jar.xml \u4e2d\u7684\u67e5\u8be2\u5143\u7d20\u76f8\u5173\u8054 (EJB 2.0: 10.5.7, 10.6.14)\u3002
-CHKJ2496.cb.m.ejb20=CHKJ2496W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u4e0e ejb-jar.xml \u4e2d\u7684\u67e5\u8be2\u5143\u7d20\u76f8\u5173\u8054 (EJB 2.0: 10.5.7, 10.6.14)\u3002
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u9700\u8981 {1} \u624d\u80fd\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 7.10.5)\u3002
-CHKJ2023.slc.i.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u9700\u8981 {1} \u624d\u80fd\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 7.10.7)\u3002
-CHKJ2023.brc.i.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u9700\u8981 {1} \u624d\u80fd\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 12.2.8)\u3002
-CHKJ2023.blc.i.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u9700\u8981 {1} \u624d\u80fd\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 12.2.10)\u3002
-CHKJ2023.crc.i.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u9700\u8981 {1} \u624d\u80fd\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 10.6.9)\u3002
-CHKJ2023.clc.i.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u9700\u8981 {1} \u624d\u80fd\u5b58\u5728\u4e8e {2} \u4e0a (EJB 2.0: 10.6.11)\u3002
-CHKJ2023.src.m.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 7.10.5)\u3002
-CHKJ2023.slc.m.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 7.10.7)\u3002
-CHKJ2023.brc.m.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.8)\u3002
-CHKJ2023.blc.m.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 12.2.10)\u3002
-CHKJ2023.crc.m.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.6.9)\u3002
-CHKJ2023.clc.m.ejb20=CHKJ2023W\uff1a{0} \u65b9\u6cd5\u5fc5\u987b\u5b58\u5728\u4e8e {1} \u4e0a (EJB 2.0: 10.6.11)\u3002
-
-CHKJ2470.src.i.ejb20=CHKJ2470E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 7.10.5)\u3002
-CHKJ2470.slc.i.ejb20=CHKJ2470E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 7.10.7)\u3002
-CHKJ2470.crc.i.ejb20=CHKJ2470E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 10.6.9)\u3002
-CHKJ2470.clc.i.ejb20=CHKJ2470E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 10.6.11)\u3002
-CHKJ2470.brc.i.ejb20=CHKJ2470E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 12.2.8)\u3002
-CHKJ2470.blc.i.ejb20=CHKJ2470E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 12.2.10)\u3002
-CHKJ2470.src.m.ejb20=CHKJ2470E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 7.10.5)\u3002
-CHKJ2470.slc.m.ejb20=CHKJ2470E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 7.10.7)\u3002
-CHKJ2470.crc.m.ejb20=CHKJ2470E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 10.6.9)\u3002
-CHKJ2470.clc.m.ejb20=CHKJ2470E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 10.6.11)\u3002
-CHKJ2470.brc.m.ejb20=CHKJ2470E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 12.2.8)\u3002
-CHKJ2470.blc.m.ejb20=CHKJ2470E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 12.2.10)\u3002
-
-CHKJ2471.src.i.ejb20=CHKJ2471W\uff1a{0} \u5fc5\u987b\u629b\u51fa {1} (EJB 2.0: 7.10.5)\u3002
-CHKJ2471.slc.i.ejb20=CHKJ2471W\uff1a{0} \u5fc5\u987b\u629b\u51fa {1} (EJB 2.0: 7.10.7)\u3002
-CHKJ2471.crc.i.ejb20=CHKJ2471W\uff1a{0} \u5fc5\u987b\u629b\u51fa {1} (EJB 2.0: 10.6.9)\u3002
-CHKJ2471.clc.i.ejb20=CHKJ2471W\uff1a{0} \u5fc5\u987b\u629b\u51fa {1} (EJB 2.0: 10.6.11)\u3002
-CHKJ2471.brc.i.ejb20=CHKJ2471W\uff1a{0} \u5fc5\u987b\u629b\u51fa {1} (EJB 2.0: 12.2.8)\u3002
-CHKJ2471.blc.i.ejb20=CHKJ2471W\uff1a{0} \u5fc5\u987b\u629b\u51fa {1} (EJB 2.0: 12.2.10)\u3002
-CHKJ2471.src.m.ejb20=CHKJ2471W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0} (EJB 2.0: 7.10.5)\u3002
-CHKJ2471.slc.m.ejb20=CHKJ2471W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0} (EJB 2.0: 7.10.7)\u3002
-CHKJ2471.crc.m.ejb20=CHKJ2471W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0} (EJB 2.0: 10.6.9)\u3002
-CHKJ2471.clc.m.ejb20=CHKJ2471W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0} (EJB 2.0: 10.6.11)\u3002
-CHKJ2471.brc.m.ejb20=CHKJ2471W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0} (EJB 2.0: 12.2.8)\u3002
-CHKJ2471.blc.m.ejb20=CHKJ2471W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u629b\u51fa {0} (EJB 2.0: 12.2.10)\u3002
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W\uff1a{0} \u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 6.5)\u3002
-CHKJ2469.slc.i.ejb20=CHKJ2469W\uff1a{0} \u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 6.5)\u3002
-CHKJ2469.crc.i.ejb20=CHKJ2469W\uff1a{0} \u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.9)\u3002
-CHKJ2469.clc.i.ejb20=CHKJ2469W\uff1a{0} \u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.10)\u3002
-CHKJ2469.brc.i.ejb20=CHKJ2469W\uff1a{0} \u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.9)\u3002
-CHKJ2469.blc.i.ejb20=CHKJ2469W\uff1a{0} \u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.10)\u3002
-CHKJ2469.src.m.ejb20=CHKJ2469W\uff1a\u6b64\u65b9\u6cd5\u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 6.5)\u3002
-CHKJ2469.slc.m.ejb20=CHKJ2469W\uff1a\u6b64\u65b9\u6cd5\u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 6.5)\u3002
-CHKJ2469.crc.m.ejb20=CHKJ2469W\uff1a\u6b64\u65b9\u6cd5\u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.9)\u3002
-CHKJ2469.clc.m.ejb20=CHKJ2469W\uff1a\u6b64\u65b9\u6cd5\u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.10)\u3002
-CHKJ2469.brc.m.ejb20=CHKJ2469W\uff1a\u6b64\u65b9\u6cd5\u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.9)\u3002
-CHKJ2469.blc.m.ejb20=CHKJ2469W\uff1a\u6b64\u65b9\u6cd5\u662f\u7531\u5bb9\u5668\u63d0\u4f9b\u7684 (EJB 2.0: 9.10)\u3002
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W\uff1a{0} \u5fc5\u987b\u662f findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2475.clh.i.ejb20=CHKJ2475W\uff1a{0} \u5fc5\u987b\u662f findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 10.6.12)\u3002
-CHKJ2475.crhd.i.ejb20=CHKJ2475W\uff1a{0} \u5fc5\u987b\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.clhd.i.ejb20=CHKJ2475W\uff1a{0} \u5fc5\u987b\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.brh.i.ejb20=CHKJ2475W\uff1a{0} \u5fc5\u987b\u662f findByPrimaryKey({1}) (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2475.blh.i.ejb20=CHKJ2475W\uff1a{0} \u5fc5\u987b\u662f findByPrimaryKey({1}) (EJB 2.0: 9.6.2, 12.2.11)\u3002
-CHKJ2475.crh.m.ejb20=CHKJ2475W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2475.clh.m.ejb20=CHKJ2475W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 10.6.12)\u3002
-CHKJ2475.crhd.m.ejb20=CHKJ2475W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.clhd.m.ejb20=CHKJ2475W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.brh.m.ejb20=CHKJ2475W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f findByPrimaryKey({0}) (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2475.blh.m.ejb20=CHKJ2475W\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u662f findByPrimaryKey({0}) (EJB 2.0: 9.6.2, 12.2.11)\u3002
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2479.clh.i.ejb20=CHKJ2479E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.6.2, 10.6.12)\u3002
-CHKJ2479.brh.i.ejb20=CHKJ2479E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2479.blh.i.ejb20=CHKJ2479E\uff1a{0} \u5fc5\u987b\u8fd4\u56de {1} (EJB 2.0: 9.6.2, 12.2.11)\u3002
-CHKJ2479.crh.m.ejb20=CHKJ2479E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.5.2, 10.6.10)\u3002
-CHKJ2479.clh.m.ejb20=CHKJ2479E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.6.2, 10.6.12)\u3002
-CHKJ2479.brh.m.ejb20=CHKJ2479E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.5.2, 12.2.9)\u3002
-CHKJ2479.blh.m.ejb20=CHKJ2479E\uff1a\u6b64\u65b9\u6cd5\u5fc5\u987b\u8fd4\u56de {0} (EJB 2.0: 9.6.2, 12.2.11)\u3002
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W\uff1a\u77ac\u6001\u5b57\u6bb5 {0} \u4e0d\u5e94\u662f\u7c7b\u578b {1} (EJB 2.0: 7.4.1)\u3002
-CHKJ2452.sb.m.ejb20=CHKJ2452W\uff1a\u77ac\u6001\u5b57\u6bb5\u4e0d\u5e94\u662f\u7c7b\u578b {0} (EJB 2.0: 7.4.1)\u3002
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528\u77ac\u6001\u5b57\u6bb5\uff08{0}\uff09(EJB 2.0: 7.4.1)\u3002
-CHKJ2453.sb.m.ejb20=CHKJ2453W\uff1a\u5efa\u8bae\u4e0d\u8981\u4f7f\u7528\u77ac\u6001\u5b57\u6bb5 (EJB 2.0: 7.4.1)\u3002
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u5b9a\u4e49 {0} (EJB 2.0: 10.3.1)\u3002
-CHKJ2454.cb.m.ejb20=CHKJ2454W\uff1a\u4e00\u5b9a\u4e0d\u80fd\u5b9a\u4e49 {0} (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I\uff1a{0} \u5fc5\u987b\u4ee5\u5c0f\u5199\u5b57\u6bcd\u5f00\u5934 (EJB 2.0: 10.3.1)\u3002
-CHKJ2480.cb.m.ejb20=CHKJ2480I\uff1a{0} \u5fc5\u987b\u4ee5\u5c0f\u5199\u5b57\u6bcd\u5f00\u5934 (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W\uff1a{0} \u5fc5\u987b\u58f0\u660e\u4e3a <cmp-field> (EJB 2.0: 10.3.1, 10.3.13)\u3002
-CHKJ2481.cb.m.ejb20=CHKJ2481W\uff1a{0} \u5fc5\u987b\u58f0\u660e\u4e3a <cmp-field> (EJB 2.0: 10.3.1, 10.3.13)\u3002
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W\uff1a{0} \u5fc5\u987b\u58f0\u660e\u4e3a <cmr-field> (EJB 2.0: 10.3.1, 10.3.13)\u3002
-CHKJ2482.cb.m.ejb20=CHKJ2482W\uff1a{0} \u5fc5\u987b\u58f0\u660e\u4e3a <cmr-field> (EJB 2.0: 10.3.1, 10.3.13)\u3002
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W\uff1a\u4e0d\u5e94\u516c\u5f00 {0} (EJB 2.0: 10.3.1)\u3002
-CHKJ2483.cb.m.ejb20=CHKJ2483W\uff1a\u4e0d\u5e94\u516c\u5f00 {0} (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W\uff1a{0} \u5fc5\u987b\u662f\u57fa\u672c\u7c7b\u578b\u6216\u53ef\u5e8f\u5217\u5316\u7c7b\u578b (EJB 2.0: 10.3.1)\u3002
-CHKJ2484.cb.m.ejb20=CHKJ2484W\uff1a{0} \u5fc5\u987b\u662f\u57fa\u672c\u7c7b\u578b\u6216\u53ef\u5e8f\u5217\u5316\u7c7b\u578b (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W\uff1a\u5b57\u6bb5 {0} \u5fc5\u987b\u662f\u7c7b\u578b {1} (EJB 2.0: 10.8.1)\u3002
-CHKJ2489.cb.m.ejb20=CHKJ2489W\uff1a\u6b64\u5b57\u6bb5\u5fc5\u987b\u662f\u7c7b\u578b {0} (EJB 2.0: 10.8.1)\u3002
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W\uff1a\u5b57\u6bb5 {0} \u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.8.2)\u3002
-CHKJ2205.kc.m.ejb20=CHKJ2205W\uff1a\u6b64\u5b57\u6bb5\u5fc5\u987b\u662f\u516c\u7528\u7684 (EJB 2.0: 10.8.2)\u3002
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W\uff1a\u5b57\u6bb5 {0} \u5fc5\u987b\u662f <cmp-field> (EJB 2.0: 10.8.2)\u3002
-CHKJ2206.kc.m.ejb20=CHKJ2206W\uff1a\u6b64\u5b57\u6bb5\u5fc5\u987b\u662f <cmp-field> (EJB 2.0: 10.8.2)\u3002
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local-home> (EJB 2.0: 7.10.1)\u3002
-CHKJ2881.s.ejb20=CHKJ2881W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <home> (EJB 2.0: 7.10.1)\u3002
-CHKJ2882.s.ejb20=CHKJ2882W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local> (EJB 2.0: 7.10.1)\u3002
-CHKJ2883.s.ejb20=CHKJ2883W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <remote> (EJB 2.0: 7.10.1)\u3002
-CHKJ2884.s.ejb20=CHKJ2884W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local-home> \u6216 <home> (EJB 2.0: 7.10.1)\u3002
-CHKJ2885.s.ejb20=CHKJ2885W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local> \u6216 <remote> (EJB 2.0: 7.10.1)\u3002
-CHKJ2880.c.ejb20=CHKJ2880W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local-home> (EJB 2.0: 10.6.1)\u3002
-CHKJ2881.c.ejb20=CHKJ2881W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <home> (EJB 2.0: 10.6.1)\u3002
-CHKJ2882.c.ejb20=CHKJ2882W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local> (EJB 2.0: 10.6.1)\u3002
-CHKJ2883.c.ejb20=CHKJ2883W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <remote> (EJB 2.0: 10.6.1)\u3002
-CHKJ2884.c.ejb20=CHKJ2884W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local-home> \u6216 <home> (EJB 2.0: 10.6.1)\u3002
-CHKJ2885.c.ejb20=CHKJ2885W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local> \u6216 <remote> (EJB 2.0: 10.6.1)\u3002
-CHKJ2880.b.ejb20=CHKJ2880W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local-home> (EJB 2.0: 12.2.1)\u3002
-CHKJ2881.b.ejb20=CHKJ2881W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <home> (EJB 2.0: 12.2.1)\u3002
-CHKJ2882.b.ejb20=CHKJ2882W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local> (EJB 2.0: 12.2.1)\u3002
-CHKJ2883.b.ejb20=CHKJ2883W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <remote> (EJB 2.0: 12.2.1)\u3002
-CHKJ2884.b.ejb20=CHKJ2884W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local-home> \u6216 <home> (EJB 2.0: 12.2.1)\u3002
-CHKJ2885.b.ejb20=CHKJ2885W\uff1a\u6b64 bean \u5fc5\u987b\u63d0\u4f9b <local> \u6216 <remote> (EJB 2.0: 12.2.1)\u3002
-
-CHKJ2813.ejb20=CHKJ2813I\uff1a<ejb-name> {0} \u5fc5\u987b\u662f\u6709\u6548\u7684 Java \u6807\u8bc6 (EJB 2.0: 10.3.13, 11.2.6.1)\u3002
-CHKJ2819.ejb20=CHKJ2819IL\uff1a<abstract-schema-name> {0} \u5fc5\u987b\u662f\u6709\u6548\u7684 Java \u6807\u8bc6 (EJB 2.0: 10.3.13, 10.6.14, 11.2.6.1)\u3002
-CHKJ2854.ejb20=CHKJ2854E\uff1a<abstract-schema-name> {0} \u5728 ejb-jar.xml \u6587\u4ef6\u4e2d\u5fc5\u987b\u662f\u552f\u4e00\u7684 (EJB 2.0: 10.3.13, 10.6.14, 11.2.2)\u3002
-CHKJ2858.ejb20=CHKJ2858W\uff1a<abstract-schema-name> \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 22.2, 22.5)\u3002
-CHKJ2859.ejb20=CHKJ2859W\uff1a\u4fdd\u7559\u7684\u6807\u8bc6 {0} \u4e0d\u80fd\u7528\u4f5c <ejb-name> (EJB 2.0: 10.6.14, 11.2.6.1)\u3002
-CHKJ2860.ejb20=CHKJ2860W\uff1a\u4fdd\u7559\u7684\u6807\u8bc6 {0} \u4e0d\u80fd\u7528\u4f5c <abstract-schema-name> (EJB 2.0: 10.6.14, 11.2.6.1)\u3002
-
-CHKJ2861.ejb20=CHKJ2861I\uff1a<cmp-field> {0} \u5fc5\u987b\u662f\u6709\u6548\u7684 Java \u6807\u8bc6\u4e14\u4ee5\u5c0f\u5199\u5b57\u6bcd\u5f00\u5934 (EJB 2.0: 10.3.1, 11.2.6.1)\u3002
-CHKJ2857.ejb20=CHKJ2857I\uff1a<cmr-field> {0} \u5fc5\u987b\u662f\u6709\u6548\u7684 Java \u6807\u8bc6\u4e14\u4ee5\u5c0f\u5199\u5b57\u6bcd\u5f00\u5934 (JB 2.0: 10.3.1, 11.2.6.1)\u3002
-
-CHKJ2862.ejb20=CHKJ2862I\uff1a<cmp-field> {0} \u5fc5\u987b\u5177\u6709 set \u65b9\u6cd5 (EJB 2.0: 10.3.1, 10.6.2)\u3002
-CHKJ2863.ejb20=CHKJ2863I\uff1a<cmp-field> {0} \u5fc5\u987b\u5177\u6709 get \u65b9\u6cd5 (EJB 2.0: 10.3.1, 10.6.2)\u3002
-CHKJ2864.ejb20=CHKJ2864I\uff1a<cmr-field> {0} \u5fc5\u987b\u5177\u6709 set \u65b9\u6cd5 (EJB 2.0: 10.3.1, 10.6.2)\u3002
-CHKJ2865.ejb20=CHKJ2865I\uff1a<cmr-field> {0} \u5fc5\u987b\u5177\u6709 get \u65b9\u6cd5 (EJB 2.0: 10.3.1, 10.6.2)\u3002
-CHKJ2855.ejb20=CHKJ2855I\uff1a<cmp-field> {0} \u5fc5\u987b\u662f Java \u57fa\u672c\u7c7b\u578b\u6216 Java \u53ef\u5e8f\u5217\u5316\u7c7b\u578b (EJB 2.0: 10.3.1)\u3002
-CHKJ2856.ejb20=CHKJ2856I\uff1a<cmr-field> {0} \u5fc5\u987b\u662f\u7c7b\u578b {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2815.ejb20=CHKJ2815W\uff1a\u4ece\u5c5e\u503c\u7c7b {0} \u4e0d\u80fd\u4e3a <cmr-field> (EJB 2.0: 10.3.3)\u3002
-
-CHKJ2816.ejb20=CHKJ2816I\uff1a<ejb-relation-name> \u5728 ejb-jar.xml \u4e2d\u5fc5\u987b\u662f\u552f\u4e00\u7684 (EJB 2.0: 10.3.2, 10.3.13, 22.5)\u3002
-CHKJ2817.ejb20=CHKJ2817I\uff1a<ejb-relationship-role-name> \u5728 <ejb-relation> \u4e2d\u5fc5\u987b\u662f\u552f\u4e00\u7684 (EJB 2.0: 10.3.2, 10.3.13, 22.5)\u3002
-CHKJ2818.ejb20=CHKJ2818I\uff1a<multiplicity> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cOne\u201d\u6216\u201cMany\u201d(EJB 2.0: 10.3.2, 10.3.13, 22.5)\u3002
-CHKJ2821.ejb20=CHKJ2821I\uff1a\u89d2\u8272 {0} \u4e2d\u7684 <relationship-role-source> \u5fc5\u987b\u5f15\u7528\u73b0\u6709\u7684 CMP bean (EJB 2.0: 10.3.2, 22.5)\u3002
-CHKJ2848.ejb20=CHKJ2848I\uff1a\u5fc5\u987b\u5c06 <cascade-delete> \u4e0e\u201cOne\u201d\u7684 <multiplicity> \u914d\u5408\u4f7f\u7528 (EJB 2.0: 10.3.4.2, 22.5)\u3002
-CHKJ2866.ejb20=CHKJ2866I\uff1a\u5fc5\u987b\u5728 {1} \u4e0a\u5b9a\u4e49 <cmr-field> {0} (EJB 2.0: 10.3.2, 22.5)\u3002
-CHKJ2867.ejb20=CHKJ2867I\uff1a\u6b64 bean \u4e0e\u5176\u5b83 bean \u53ea\u80fd\u5177\u6709\u5355\u5411\u5173\u7cfb (EJB 2.0: 10.3.2)\u3002
-CHKJ2868.ejb20=CHKJ2868I\uff1a<cmr-field-type> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201cjava.util.Collection\u201d\u6216\u201cjava.util.Set\u201d(EJB 2.0: 10.3.13, 22.5)\u3002
-CHKJ2869.ejb20=CHKJ2869I\uff1a\u81f3\u5c11\u6709\u4e00\u4e2a <ejb-relationship-role> \u5fc5\u987b\u5b9a\u4e49 <cmr-field> (EJB 2.0: 10.3.2, 10.3.13, 22.5)\u3002
-CHKJ2870.ejb20=CHKJ2870I\uff1a<ejb-name> {0} \u5fc5\u987b\u5b58\u5728 (EJB 2.0: 10.3.13)\u3002
-CHKJ2871.ejb20=CHKJ2871I\uff1a<ejb-name> {0} \u5fc5\u987b\u5f15\u7528 CMP bean (EJB 2.0: 10.3.2, 10.3.13)\u3002
-
-CHKJ2872.ejb20=CHKJ2872E\uff1a<cmp-version> \u5143\u7d20\u7684\u503c\u5fc5\u987b\u662f\u201c1.x\u201d\u6216\u201c2.x\u201d(EJB 2.0: 22.5)\u3002
-CHKJ2873.ejb20=CHKJ2873W\uff1a\u5c06\u6b64 bean \u7684\u6570\u636e\u6e90\u7ed1\u5b9a\u8fc1\u79fb\u81f3\u201cCMP \u8fde\u63a5\u5de5\u5382\u201d\u7ed1\u5b9a\u3002
-CHKJ2874.ejb20=CHKJ2874W\uff1a\u5c06\u6b64 EJB \u6a21\u5757\u7684\u7f3a\u7701\u6570\u636e\u6e90\u7ed1\u5b9a\u8fc1\u79fb\u81f3\u7f3a\u7701\u201cCMP \u8fde\u63a5\u5de5\u5382\u201d\u7ed1\u5b9a\u3002
-
-###########################################################################
-#
-# 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/ejbvalidator_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_zh_TW.properties
deleted file mode 100644
index 90135e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/ejbvalidator_zh_TW.properties
+++ /dev/null
@@ -1,1527 +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=\u6b63\u5728\u9a57\u8b49 {0}\u3002
-
-LOC_CLASS=\u985e\u5225\uff1a{0}
-LOC_FIELD=\u6b04\u4f4d\uff1a{0}, \u985e\u5225\uff1a{1}
-LOC_METHOD=\u65b9\u6cd5\uff1a{0}, \u985e\u5225\uff1a{1}
-LOC_BEAN=Enterprise Bean: {0}
-LOC_ROLE=<localRelationshipRoles>: {0}, Enterprise Bean: {1}
-LOC_ROLEREF=<security-role-ref>: {0}
-LOC_METHODELEMENT=<method> \u5143\u7d20\uff1a{0}
-LOC_METHODPERMISSION=<method-permission> \u5143\u7d20\uff1a{0}
-LOC_METHODTRANSACTION=<container-transaction> \u5143\u7d20\uff1a{0}
-LOC_EJBRELATION=<ejb-relation>\uff1a{0}
-LOC_EJBRELATIONSHIPROLE=<ejb-relationship-role>\uff1a{0}\uff0c<ejb-relation>\uff1a{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: \u57f7\u884c EJB \u9a57\u8b49\u5668\u6642\uff0c\u767c\u751f\u5167\u90e8\u932f\u8aa4\u3002\u8acb\u95b1\u8b80\u65e5\u8a8c\u4ee5\u53d6\u5f97\u8a73\u7d30\u8cc7\u6599\u3002
-CHKJ2852=CHKJ2852W: \u9a57\u8b49 {0} \u6642\uff0c\u767c\u751f\u5167\u90e8\u932f\u8aa4\u3002\u6240\u9a57\u8b49\u7684 Bean \u70ba {1}\u3002
-CHKJ2433=CHKJ2433W: \u7121\u6cd5\u9a57\u8b49 {0}\uff0c\u56e0\u70ba\u7121\u6cd5\u53cd\u6620 {1}\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2907=CHKJ2907E: \u7121\u6cd5\u53cd\u6620 {0} \u985e\u578b\u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2905=CHKJ2905W: EJB \u9a57\u8b49\u5668\u56e0 ejb-jar.xml \u7121\u6cd5\u8f09\u5165\u800c\u6c92\u6709\u57f7\u884c\u3002\u8acb\u57f7\u884c XML \u9a57\u8b49\u5668\u4ee5\u53d6\u5f97\u8a73\u7d30\u8cc7\u8a0a\u3002
-CHKJ2041=CHKJ2041I: \u6c38\u4e45\u985e\u5225\u548c\u4ecb\u9762\u61c9\u8a72\u5728\u4e00\u500b\u5177\u540d\u7684\u5957\u4ef6\u5167\u3002(JLS 2.0: 7.4.2)\u3002
-
-CHKJ2456.i=CHKJ2456W: {0} \u61c9\u8a72\u70ba {2} \u64f2\u51fa {1}\uff0c\u5426\u5247\u90e8\u7f72\u7a0b\u5f0f\u78bc\u4e2d\u53ef\u80fd\u6703\u6709\u7de8\u8b6f\u932f\u8aa4\u3002
-CHKJ2456.m=CHKJ2456W: \u9019\u500b\u65b9\u6cd5\u61c9\u8a72\u70ba {1} \u64f2\u51fa {0}\uff0c\u5426\u5247\u90e8\u7f72\u7a0b\u5f0f\u78bc\u4e2d\u53ef\u80fd\u6703\u6709\u7de8\u8b6f\u932f\u8aa4\u3002
-
-#
-# end of common messages
-#
-
-#
-# Messages for the EJB 1.1 specification
-#
-CHKJ2001.eb.ejb11=CHKJ2001W: {0} \u7d22\u5f15\u9375\u985e\u5225\u5fc5\u9808\u5be6\u4f5c {1} \u65b9\u6cd5\u3002(EJB 1.1: 9.2.9)
-CHKJ2002.eb.i.ejb11=CHKJ2002W: \u9019\u500b\u985e\u5225\u61c9\u5be6\u4f5c {0} \u7684\u76f8\u7b26 ejbPostCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.4)
-CHKJ2002.eb.m.ejb11=CHKJ2002W: \u9019\u500b\u985e\u5225\u61c9\u57f7\u884c\u9019\u500b\u65b9\u6cd5\u7684\u76f8\u7b26 ejbPostCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.4)
-CHKJ2003E.ejb11=CHKJ2003E: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u57f7\u884c javax.ejb.SessionSynchronization\u3002(EJB 1.1: 6.5.3)\u3002
-CHKJ2003I.ejb11=CHKJ2003I: Bean \u7ba1\u7406\u7684\u4ea4\u6613 Stateful Session Beans \u4e0d\u9700\u8981\u5be6\u4f5c javax.ejb.SessionSynchronization\u3002(EJB 1.1: 6.5.3)\u3002
-CHKJ2004.eb.i.ejb11=CHKJ2004W: {1} Bean \u985e\u5225\u4e0d\u61c9\u5be6\u4f5c {0} ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.4.6)
-CHKJ2004.eb.m.ejb11=CHKJ2004W: {0} Bean \u985e\u5225\u4e0d\u61c9\u5be6\u4f5c ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.4.6)
-CHKJ2005.eh.i.ejb11=CHKJ2005E: {0} \u5fc5\u9808\u662f create \u65b9\u6cd5\u6216 find \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2005.eh.m.ejb11=CHKJ2005E: \u65b9\u6cd5\u5fc5\u9808\u662f create \u65b9\u6cd5\u6216 find \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2006.sb.ejb11=CHKJ2006E: {0} Bean \u985e\u5225\u5fc5\u9808\u6709\u4e00\u500b\u4e0d\u4f7f\u7528\u5f15\u6578\u7684 public \u5efa\u69cb\u5b50\u3002(EJB 1.1: 6.10.2)
-CHKJ2006.eb.ejb11=CHKJ2006E: {0} Bean \u985e\u5225\u5fc5\u9808\u6709\u4e00\u500b\u4e0d\u4f7f\u7528\u5f15\u6578\u7684 public \u5efa\u69cb\u5b50\u3002(EJB 1.1: 9.2.2)
-CHKJ2007.sb.ejb11=CHKJ2007W: {0} \u4e0d\u61c9\u5ba3\u544a finalize() \u65b9\u6cd5\u3002(EJB 1.1: 6.10.2)
-CHKJ2007.eb.ejb11=CHKJ2007W: {0} \u4e0d\u61c9\u5ba3\u544a finalize() \u65b9\u6cd5\u3002(EJB 1.1: 9.2.2)
-CHKJ2008.sb.ejb11=CHKJ2008E: {0} Bean \u985e\u5225\u5fc5\u9808\u542b\u6709\u81f3\u5c11\u4e00\u500b ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 6.5.5, 6.10.3)
-CHKJ2009.eb.ejb11=CHKJ2009E: {0} Bean \u985e\u5225\u5fc5\u9808\u542b\u6709\u81f3\u5c11\u4e00\u500b ejbFindByPrimaryKey \u65b9\u6cd5\u3002(EJB 1.1: 9.2.5)
-CHKJ2010.sh.ejb11=CHKJ2010E: {0} Home \u4ecb\u9762\u5fc5\u9808\u81f3\u5c11\u542b\u6709\u4e00\u500b create \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2011.eh.ejb11=CHKJ2011E: {0} Home \u4ecb\u9762\u5fc5\u9808\u542b\u6709\u4e00\u500b findByPrimaryKey \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2012.sr.ejb11=CHKJ2012E: \u9019\u500b\u985e\u578b\u5fc5\u9808\u662f\u4ecb\u9762\u3002(EJB 1.1: 6.10.5)\u3002
-CHKJ2012.sh.ejb11=CHKJ2012E: \u9019\u500b\u985e\u578b\u5fc5\u9808\u662f\u4ecb\u9762\u3002(EJB 1.1: 6.10.6)\u3002
-CHKJ2012.er.ejb11=CHKJ2012E: \u9019\u500b\u985e\u578b\u5fc5\u9808\u662f\u4ecb\u9762\u3002(EJB 1.1: 9.2.7)\u3002
-CHKJ2012.eh.ejb11=CHKJ2012E: \u9019\u500b\u985e\u578b\u5fc5\u9808\u662f\u4ecb\u9762\u3002(EJB 1.1: 9.2.8)\u3002
-CHKJ2013.sb.ejb11=CHKJ2013E: {0} Bean \u985e\u5225\u5fc5\u9808\u5be6\u4f5c {1}\u3002(EJB 1.1: 6.10.2)\u3002
-CHKJ2013.eb.ejb11=CHKJ2013E: {0} Bean \u985e\u5225\u5fc5\u9808\u5be6\u4f5c {1}\u3002(EJB 1.1: 9.2.2)\u3002
-CHKJ2014.sb.ejb11=CHKJ2014E: {0} Bean \u985e\u5225\u4e0d\u53ef\u70ba abstract\u3002(EJB 1.1: 6.10.2)
-CHKJ2014.eb.ejb11=CHKJ2014E: {0} Bean \u985e\u5225\u4e0d\u53ef\u70ba abstract\u3002(EJB 1.1: 9.2.2)
-CHKJ2015.sb.ejb11=CHKJ2015E: {0} Bean \u985e\u5225\u4e0d\u53ef\u70ba final\u3002(EJB 1.1: 6.10.2)
-CHKJ2015.eb.ejb11=CHKJ2015E: {0} Bean \u985e\u5225\u4e0d\u53ef\u70ba final\u3002(EJB 1.1: 9.2.2)
-CHKJ2017.sr.ejb11=CHKJ2017E: \u4ecb\u9762\u5fc5\u9808\u7e7c\u627f {0}\u3002(EJB 1.1: 6.10.5)
-CHKJ2017.sh.ejb11=CHKJ2017E: \u4ecb\u9762\u5fc5\u9808\u7e7c\u627f {0}\u3002(EJB 1.1: 6.10.6)
-CHKJ2017.er.ejb11=CHKJ2017E: \u4ecb\u9762\u5fc5\u9808\u7e7c\u627f {0}\u3002(EJB 1.1: 9.2.7)
-CHKJ2017.eh.ejb11=CHKJ2017E: \u4ecb\u9762\u5fc5\u9808\u7e7c\u627f {0}\u3002(EJB 1.1: 9.2.8)
-CHKJ2019.eb.ejb11=CHKJ2019I: {0} \u7d22\u5f15\u9375\u985e\u5225\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.9) (RMI 1.3: 2.6)\u3002
-
-
-CHKJ2020.eb.ejb11=CHKJ2020E: {0} \u7d22\u5f15\u9375\u985e\u5225\u5fc5\u9808\u70ba public\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2021.eb.ejb11=CHKJ2021E: {0} \u7d22\u5f15\u9375\u985e\u5225\u5fc5\u9808\u5b9a\u7fa9\u4e00\u500b public \u9810\u8a2d\u5efa\u69cb\u5b50\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2022.sb.ejb11=CHKJ2022E: {0} Bean \u985e\u5225\u5fc5\u9808\u70ba public\u3002(EJB 1.1: 6.10.2)
-CHKJ2022.eb.ejb11=CHKJ2022E: {0} Bean \u985e\u5225\u5fc5\u9808\u70ba public\u3002(EJB 1.1: 9.2.2)
-CHKJ2023.sr.i.ejb11=CHKJ2023E: \u5728 {1} Bean \u985e\u5225\u4e2d\uff0c{0} \u5fc5\u9808\u6709\u76f8\u7b26\u7684\u65b9\u6cd5\u3002(EJB 1.1: 6.10.5)
-CHKJ2023.sr.m.ejb11=CHKJ2023E: \u5728 {0} Bean \u985e\u5225\u4e2d\uff0c\u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u6709\u76f8\u7b26\u7684\u65b9\u6cd5\u3002(EJB 1.1: 6.10.5)
-CHKJ2023.er.i.ejb11=CHKJ2023E: \u5728 {1} Bean \u985e\u5225\u4e2d\uff0c{0} \u5fc5\u9808\u6709\u76f8\u7b26\u7684\u65b9\u6cd5\u3002(EJB 1.1: 9.2.7)
-CHKJ2023.er.m.ejb11=CHKJ2023E: \u5728 {0} Bean \u985e\u5225\u4e2d\uff0c\u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u6709\u76f8\u7b26\u7684\u65b9\u6cd5\u3002(EJB 1.1: 9.2.7)
-CHKJ2024.sh.i.ejb11=CHKJ2024E: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u53ea\u6709 create() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2024.sh.m.ejb11=CHKJ2024E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u53ea\u6709 create() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2025.sb.i.ejb11=CHKJ2025E: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u53ea\u6709 ejbCreate() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2025.sb.m.ejb11=CHKJ2025E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u53ea\u6709 ejbCreate() \u53ef\u4ee5\u5b58\u5728 (EJB 1.1: 6.8)\u3002
-CHKJ2026.sh.i.ejb11=CHKJ2026E:  Bean \u985e\u5225 {1} \u5fc5\u9808\u5be6\u4f5c\u7b26\u5408 {0} \u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2026.sh.m.ejb11=CHKJ2026E:  Bean \u985e\u5225 {0} \u5fc5\u9808\u5be6\u4f5c\u7b26\u5408\u9019\u500b\u65b9\u6cd5\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2026.eh.i.ejb11=CHKJ2026E:  Bean \u985e\u5225 {1} \u5fc5\u9808\u5be6\u4f5c\u7b26\u5408 {0} \u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2026.eh.m.ejb11=CHKJ2026E:  Bean \u985e\u5225 {0} \u5fc5\u9808\u5be6\u4f5c\u7b26\u5408\u9019\u500b\u65b9\u6cd5\u7684 ejbCreate \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2028.eb.i.ejb11=CHKJ2028W: \u9664\u975e\u6709\u5b9a\u7fa9\u76f8\u7b26 ejbCreate \u65b9\u6cd5\uff0c\u5426\u5247\u4e0d\u6703\u547c\u53eb {0}\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2028.eb.m.ejb11=CHKJ2028W: \u9664\u975e\u6709\u5b9a\u7fa9\u76f8\u7b26 ejbCreate \u65b9\u6cd5\uff0c\u5426\u5247\u4e0d\u6703\u547c\u53eb\u9019\u500b\u65b9\u6cd5\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2029.eb.i.ejb11=CHKJ2029W: \u5982\u679c\u7f3a\u5c11\u76f8\u7b26\u7684 create \u65b9\u6cd5\uff0c\u5247\u7121\u6cd5\u5728 Home \u4ecb\u9762 {1} \u547c\u53eb {0}\u3002(EJB 1.1: 9.2.3)
-CHKJ2029.eb.m.ejb11=CHKJ2029W: \u5982\u679c\u7f3a\u5c11\u76f8\u7b26\u7684 create \u65b9\u6cd5\uff0c\u5247\u7121\u6cd5\u5728 Home \u4ecb\u9762 {0} \u547c\u53eb\u9019\u500b\u65b9\u6cd5\u3002 (EJB 1.1: 9.2.3)
-CHKJ2030.eh.i.ejb11=CHKJ2030E: \u5728 {1} Bean \u985e\u5225\u4e2d\u7684 {0} \u5fc5\u9808\u6709\u76f8\u7b26\u7684 ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2030.eh.m.ejb11=CHKJ2030E: \u5728 {0} bean \u985e\u5225\u4e2d\u7684\u65b9\u6cd5\u5fc5\u9808\u6709\u76f8\u7b26\u7684 ejbFind \u65b9\u6cd5\u3002(EJB 1.1: 9.2.8)
-CHKJ2032.eb.ejb11=CHKJ2032W:  Bean \u985e\u5225 {0} \u5fc5\u9808\u5ba3\u544a\u81f3\u5c11\u4e00\u500b\u5132\u5b58\u5668\u7ba1\u7406\u6b04\u4f4d\u3002(EJB 1.1: 9.4.7)
-CHKJ2033.eb.ejb11=CHKJ2033W: setEntityContext(EntityContext ic) \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2034.eb.ejb11=CHKJ2034W: unsetEntityContext() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2035.eb.ejb11=CHKJ2035W: ejbActivate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2036.eb.ejb11=CHKJ2036W: ejbPassivate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2037.eb.ejb11=CHKJ2037W: ejbRemove() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2038.eb.ejb11=CHKJ2038W: ejbLoad() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1)
-CHKJ2039.eb.ejb11=CHKJ2039W: ejbStore() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u3002(EJB 1.1: 9.1.5.1) 
-CHKJ2040.sb.ejb11=CHKJ2040I: \u4e0d\u53ef\u50b3\u905e "this" \u4f5c\u70ba\u65b9\u6cd5\u5f15\u6578\u6216\u7d50\u679c\u3002(EJB 1.1: 6.10.2)
-
-CHKJ2100.ejb11=CHKJ2100E: \u89d2\u8272\u5169\u7aef\u5fc5\u9808\u4f7f\u7528\u76f8\u540c\u5c6c\u6027\u6578\u76ee\u3002
-CHKJ2101.ejb11=CHKJ2101E: \u89d2\u8272\u5169\u7aef\u5fc5\u9808\u4f7f\u7528\u76f8\u540c\u985e\u578b\u3002
-CHKJ2102.eh.ejb11=CHKJ2102E: \u5fc5\u9808\u5728 {0} \u985e\u5225\u5b9a\u7fa9 finder \u63cf\u8ff0\u5b50\u6216\u76f8\u7b26\u7684\u81ea\u8a02 finder \u65b9\u6cd5\u3002
-CHKJ2103.ejb11=CHKJ2103E: \u5728\u5143\u4ef6\u7e7c\u627f\u4e2d\uff0c{0} Bean \u985e\u5225\u5fc5\u9808\u7e7c\u627f {1}\u3002(EJB 1.1: B.2)
-CHKJ2104.ejb11=CHKJ2104E: \u5728\u5143\u4ef6\u7e7c\u627f\u4e2d\uff0c{0} Home \u4ecb\u9762\u4e0d\u53ef\u7e7c\u627f {1}\u3002(EJB 1.1: B.2)
-CHKJ2105.ejb11=CHKJ2105E: \u5728\u5143\u4ef6\u7e7c\u627f\u4e2d\uff0c{0} \u9060\u7aef\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f {1}\u3002(EJB 1.1: B.2)
-CHKJ2106.ejb11=CHKJ2106E: Bean {0} \u5fc5\u9808\u4f7f\u7528 {1} \u4f5c\u70ba\u5176 <prim-key-class> (EJB 1.1: B.2)\u3002
-
-CHKJ2200.i.ejb11=CHKJ2200W: {0} static \u6b04\u4f4d\u61c9\u8a72\u662f final\u3002(EJB 1.1: 18.1.2)
-CHKJ2200.m.ejb11=CHKJ2200W: \u9019\u500b static \u6b04\u4f4d\u61c9\u8a72\u662f final\u3002(EJB 1.1: 18.1.2)
-CHKJ2201.eb.i.ejb11=CHKJ2201E: {0} \u4e0d\u53ef\u4ee5\u662f\u66ab\u6642\u6027\u7684\u3002(EJB 1.1: 9.4.1)
-CHKJ2201.eb.m.ejb11=CHKJ2201E: \u6b04\u4f4d\u4e0d\u53ef\u4ee5\u662f\u66ab\u6642\u6027\u7684\u3002(EJB 1.1: 9.4.1)
-CHKJ2202.eb.i.ejb11=CHKJ2202W: \u5c0d\u65bc CMP Bean \u4f86\u8aaa\uff0c\u6b04\u4f4d {0} \u7684\u6b04\u4f4d\u985e\u578b\u7121\u6548\u3002(EJB 1.1: 9.4.1)
-CHKJ2202.eb.m.ejb11=CHKJ2202W: \u5c0d\u65bc CMP Bean \u4f86\u8aaa\uff0c\u6b04\u4f4d\u985e\u578b\u7121\u6548\u3002(EJB 1.1: 9.4.1)
-CHKJ2203.eb.i.ejb11=CHKJ2203E: {0} \u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.4.1)
-CHKJ2203.eb.m.ejb11=CHKJ2203E: \u6b04\u4f4d\u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.4.1)
-CHKJ2205.eb.i.ejb11=CHKJ2205W: \u540d\u70ba {0} \u7684\u4e3b\u9375\u6b04\u4f4d\u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2205.eb.m.ejb11=CHKJ2205W: \u4e3b\u9375\u6b04\u4f4d\u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2206.eb.i.ejb11=CHKJ2206W: {0} \u5fc5\u9808\u662f {1} \u7684 <cmp-field> \u4ee5\u53ca Bean \u985e\u5225 {2} \u7684\u6b04\u4f4d\u3002(EJB 1.1: 9.4.7.2)\u3002
-CHKJ2206.eb.m.ejb11=CHKJ2206W: \u9019\u500b\u6b04\u4f4d\u5fc5\u9808\u662f {0} \u7684 <cmp-field> \u4ee5\u53ca Bean \u985e\u5225 {1} \u7684\u6b04\u4f4d\u3002(EJB 1.1: 9.4.7.2)\u3002
-CHKJ2207.eb.ejb11=CHKJ2207E: \u7d22\u5f15\u9375\u6b04\u4f4d {0} \u8207\u4e3b\u9375 {1} \u5fc5\u9808\u70ba\u76f8\u540c\u985e\u578b\u3002(EJB 1.1: 9.4.7.1)\u3002
-
-CHKJ2400.ejbCreate.sb.i.ejb11=CHKJ2400W: \u65b9\u6cd5 {0} \u4e0a\u7684 java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2400.ejbCreate.sb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2400.bus.sb.i.ejb11=CHKJ2400W: \u65b9\u6cd5 {0} \u4e0a\u7684 java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2400.bus.sb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2400.ejbCreate.eb.i.ejb11=CHKJ2400W: {0} \u4e0a\u7684 java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2400.ejbCreate.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2400.ejbPostCreate.eb.i.ejb11=CHKJ2400W: {0} \u4e0a\u7684 java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2400.ejbPostCreate.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2400.ejbFind.eb.i.ejb11=CHKJ2400W: {0} \u4e0a\u7684 java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2400.ejbFind.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2400.bus.eb.i.ejb11=CHKJ2400W: {0} \u4e0a\u7684 java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2400.bus.eb.m.ejb11=CHKJ2400W: java.rmi.RemoteException \u7684\u4f7f\u7528\u5373\u5c07\u68c4\u7528\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2401.sb.i.ejb11=CHKJ2401E: {0} \u5fc5\u9808\u50b3\u56de void\u3002(EJB 1.1: 6.10.3)
-CHKJ2401.sb.m.ejb11=CHKJ2401E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void\u3002(EJB 1.1: 6.10.3)
-CHKJ2402.sh.i.ejb11=CHKJ2402W: {0} \u5fc5\u9808\u50b3\u56de {1} \u9060\u7aef\u4ecb\u9762\u985e\u578b\u3002(EJB 1.1: 6.10.6)\u3002
-CHKJ2402.sh.m.ejb11=CHKJ2402W: \u9019\u500b create \u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u9060\u7aef\u4ecb\u9762\u985e\u578b\u3002(EJB 1.1: 6.10.6)\u3002
-CHKJ2402.eh.i.ejb11=CHKJ2402W: {0} \u5fc5\u9808\u50b3\u56de {1} \u9060\u7aef\u4ecb\u9762\u985e\u578b\u3002(EJB 1.1: 9.2.8)\u3002
-CHKJ2402.eh.m.ejb11=CHKJ2402W: \u9019\u500b create \u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u9060\u7aef\u4ecb\u9762\u985e\u578b\u3002(EJB 1.1: 9.2.8)\u3002
-CHKJ2403.eh.i.ejb11=CHKJ2403W: {0} \u5fc5\u9808\u50b3\u56de {1} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.8)
-CHKJ2403.eh.m.ejb11=CHKJ2403W: \u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.8)
-CHKJ2405.eh.i.ejb11=CHKJ2405W: {0} \u4e2d\u7684\u5f15\u6578\u6b21\u5e8f\u548c\u985e\u578b\u5fc5\u9808\u7b26\u5408 {1} \u7d22\u5f15\u9375\u985e\u5225\u4e2d\u7684\u6b04\u4f4d\u6b21\u5e8f\u548c\u985e\u578b\u3002(EJB 1.1: 9.2.8\u30019.4.7.3\u300116.5)
-CHKJ2405.eh.m.ejb11=CHKJ2405W: \u5f15\u6578\u7684\u6b21\u5e8f\u548c\u985e\u578b\u5fc5\u9808\u7b26\u5408 {0} \u7d22\u5f15\u9375\u985e\u5225\u4e2d\u7684\u6b04\u4f4d\u6b21\u5e8f\u548c\u985e\u578b\u3002(EJB 1.1: 9.2.8\u30019.4.7.3\u300116.5)
-CHKJ2406.eb.i.ejb11=CHKJ2406W: {0} \u61c9\u50b3\u56de\u4e3b\u9375\u985e\u578b {1}\u3002(EJB 1.1: 9.2.3\u30019.4.2\u30019.4.7.3)\u3002
-CHKJ2406.eb.m.ejb11=CHKJ2406W: \u65b9\u6cd5\u61c9\u50b3\u56de\u4e3b\u9375\u985e\u578b {0}\u3002(EJB 1.1: 9.2.3\u30019.4.2\u30019.4.7.3)\u3002
-CHKJ2407.eb.i.ejb11=CHKJ2407W: {0} \u61c9\u50b3\u56de {1} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.5)
-CHKJ2407.eb.m.ejb11=CHKJ2407W: \u9019\u500b\u65b9\u6cd5\u61c9\u8a72\u50b3\u56de {0} \u6216\u5176\u96c6\u5408\u3002(EJB 1.1: 9.2.5)
-
-CHKJ2408.ejbCreate.sb.i.ejb11=CHKJ2408E: {0} \u5fc5\u9808\u662f public\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2408.ejbCreate.sb.m.ejb11=CHKJ2408E: \u65b9\u6cd5\u5fc5\u9808\u662f public\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2408.bus.sb.i.ejb11=CHKJ2408E: {0} \u5fc5\u9808\u662f public\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2408.bus.sb.m.ejb11=CHKJ2408E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2408.ejbCreate.eb.i.ejb11=CHKJ2408E: {0} \u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2408.ejbCreate.eb.m.ejb11=CHKJ2408E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2408.ejbPostCreate.eb.i.ejb11=CHKJ2408E: {0} \u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2408.ejbPostCreate.eb.m.ejb11=CHKJ2408E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2408.ejbFind.eb.i.ejb11=CHKJ2408E: {0} \u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2408.ejbFind.eb.m.ejb11=CHKJ2408E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2408.bus.eb.i.ejb11=CHKJ2408E: {0} \u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2408.bus.eb.m.ejb11=CHKJ2408E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2409.ejbCreate.sb.i.ejb11=CHKJ2409E: {0} \u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2409.ejbCreate.sb.m.ejb11=CHKJ2409E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2409.bus.sb.i.ejb11=CHKJ2409E: {0} \u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2409.bus.sb.m.ejb11=CHKJ2409E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2409.ejbCreate.eb.i.ejb11=CHKJ2409E: {0} \u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2409.ejbCreate.eb.m.ejb11=CHKJ2409E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2409.ejbPostCreate.eb.i.ejb11=CHKJ2409E: {0} \u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2409.ejbPostCreate.eb.m.ejb11=CHKJ2409E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2409.ejbFind.eb.i.ejb11=CHKJ2409E: {0} \u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2409.ejbFind.eb.m.ejb11=CHKJ2409E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2409.bus.eb.i.ejb11=CHKJ2409E: {0} \u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2409.bus.eb.m.ejb11=CHKJ2409E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2410.ejbCreate.sb.i.ejb11=CHKJ2410E: {0} \u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2410.ejbCreate.sb.m.ejb11=CHKJ2410E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 6.10.3)\u3002
-CHKJ2410.bus.sb.i.ejb11=CHKJ2410E: {0} \u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2410.bus.sb.m.ejb11=CHKJ2410E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 6.10.4)\u3002
-CHKJ2410.ejbCreate.eb.i.ejb11=CHKJ2410E: {0} \u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2410.ejbCreate.eb.m.ejb11=CHKJ2410E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.3)\u3002
-CHKJ2410.ejbPostCreate.eb.i.ejb11=CHKJ2410E: {0} \u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2410.ejbPostCreate.eb.m.ejb11=CHKJ2410E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.4)\u3002
-CHKJ2410.ejbFind.eb.i.ejb11=CHKJ2410E: {0} \u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2410.ejbFind.eb.m.ejb11=CHKJ2410E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.5)\u3002
-CHKJ2410.bus.eb.i.ejb11=CHKJ2410E: {0} \u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.6)\u3002
-CHKJ2410.bus.eb.m.ejb11=CHKJ2410E: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static\u3002(EJB 1.1: 9.2.6)\u3002
-
-CHKJ2411.sb.i.ejb11=CHKJ2411E: {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "ejb"\u3002(EJB 1.1: 6.10.4)
-CHKJ2411.sb.m.ejb11=CHKJ2411E: \u65b9\u6cd5\u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "ejb"\u3002(EJB 1.1: 6.10.4)
-CHKJ2411.eb.i.ejb11=CHKJ2411E: {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "ejb"\u3002(EJB 1.1: 9.2.6)
-CHKJ2411.eb.m.ejb11=CHKJ2411E: \u65b9\u6cd5\u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "ejb"\u3002(EJB 1.1: 9.2.6)
-
-CHKJ2412.sb.i.ejb11=CHKJ2412I: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sb.m.ejb11=CHKJ2412I: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eb.i.ejb11=CHKJ2412I: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eb.m.ejb11=CHKJ2412I: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sr.i.ejb11=CHKJ2412I: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sr.m.ejb11=CHKJ2412I: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2412.er.i.ejb11=CHKJ2412I: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2412.er.m.ejb11=CHKJ2412I: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sh.i.ejb11=CHKJ2412I: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2412.sh.m.ejb11=CHKJ2412I: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eh.i.ejb11=CHKJ2412I: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-CHKJ2412.eh.m.ejb11=CHKJ2412I: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-
-CHKJ2413.sb.i.ejb11=CHKJ2413I: {0} \u7684\u5f15\u6578 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sb.m.ejb11=CHKJ2413I: \u5f15\u6578 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eb.i.ejb11=CHKJ2413I: {0} \u7684\u5f15\u6578 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eb.m.ejb11=CHKJ2413I: \u5f15\u6578 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sr.i.ejb11=CHKJ2413I: {0} \u7684\u5f15\u6578 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sr.m.ejb11=CHKJ2413I: \u5f15\u6578 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.5) (RMI 1.3: 2.6)\u3002
-CHKJ2413.er.i.ejb11=CHKJ2413I: {0} \u7684\u5f15\u6578 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2413.er.m.ejb11=CHKJ2413I: \u5f15\u6578 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.7) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sh.i.ejb11=CHKJ2413I: {0} \u7684\u5f15\u6578 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2413.sh.m.ejb11=CHKJ2413I: \u5f15\u6578 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 6.10.6) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eh.i.ejb11=CHKJ2413I: {0} \u7684\u5f15\u6578 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-CHKJ2413.eh.m.ejb11=CHKJ2413I: \u5f15\u6578 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316\u3002(EJB 1.1: 9.2.8) (RMI 1.3: 2.6)\u3002
-
-CHKJ2414.sh.i.ejb11=CHKJ2414E: {0} \u5fc5\u9808\u64f2\u51fa {1}\u3002(EJB 1.1: 6.10.6)
-CHKJ2414.sh.m.ejb11=CHKJ2414E: \u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0}\u3002(EJB 1.1: 6.10.6)
-CHKJ2414.eh.i.ejb11=CHKJ2414E: {0} \u5fc5\u9808\u64f2\u51fa {1}\u3002(EJB 1.1: 9.2.8)
-CHKJ2414.eh.m.ejb11=CHKJ2414E: \u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0}\u3002(EJB 1.1: 9.2.8)
-CHKJ2414.sr.i.ejb11=CHKJ2414E: {0} \u5fc5\u9808\u64f2\u51fa {1}\u3002(EJB 1.1: 6.10.5)
-CHKJ2414.sr.m.ejb11=CHKJ2414E: \u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0}\u3002(EJB 1.1: 6.10.5)
-CHKJ2414.er.i.ejb11=CHKJ2414E: {0} \u5fc5\u9808\u64f2\u51fa {1}\u3002(EJB 1.1: 9.2.7)
-CHKJ2414.er.m.ejb11=CHKJ2414E: \u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0}\u3002(EJB 1.1: 9.2.7)
-
-CHKJ2415.sr.i.ejb11=CHKJ2415E: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {2} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {1}\u3002(EJB 1.1: 6.10.5)
-CHKJ2415.sr.m.ejb11=CHKJ2415E: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {1} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {0}\u3002(EJB 1.1: 6.10.5)
-CHKJ2415.er.i.ejb11=CHKJ2415E: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {2} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {1}\u3002(EJB 1.1: 9.2.7)
-CHKJ2415.er.m.ejb11=CHKJ2415E: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {1} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {0}\u3002(EJB 1.1: 9.2.7)
-CHKJ2415.sh.i.ejb11=CHKJ2415E: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {2} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {1}\u3002(EJB 1.1: 6.10.6)
-CHKJ2415.sh.m.ejb11=CHKJ2415E: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {1} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {0}\u3002(EJB 1.1: 6.10.6)
-CHKJ2415.eh.i.ejb11=CHKJ2415E: {0} \u7684\u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {2} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {1}\u3002(EJB 1.1: 9.2.8)
-CHKJ2415.eh.m.ejb11=CHKJ2415E: \u50b3\u56de\u985e\u578b\u5fc5\u9808\u7b26\u5408 {1} Bean \u985e\u5225\u4e2d\u76f8\u7b26\u65b9\u6cd5\u7684\u50b3\u56de\u985e\u578b {0}\u3002(EJB 1.1: 9.2.8)
-
-CHKJ2418.eb.i.ejb11=CHKJ2418E: {0} \u5fc5\u9808\u50b3\u56de void\u3002(EJB 1.1: 9.2.4)
-CHKJ2418.eb.m.ejb11=CHKJ2418E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void\u3002(EJB 1.1: 9.2.4)
-CHKJ2419.sh.i.ejb11=CHKJ2419E: {0} \u5fc5\u9808\u662f create \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-CHKJ2419.sh.m.ejb11=CHKJ2419E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f create \u65b9\u6cd5\u3002(EJB 1.1: 6.10.6)
-
-CHKJ2420.sb.i.ejb11=CHKJ2420E: {1} \u5fc5\u9808\u7531 {2} Home \u4ecb\u9762\u4e0a {0} \u7684\u5c0d\u61c9\u65b9\u6cd5\u64f2\u51fa\u3002(EJB 1.1: 6.10.6\u300112.2.1\u300112.2.2)
-CHKJ2420.sb.m.ejb11=CHKJ2420E: {0} \u5fc5\u9808\u7531 {1} Home \u4ecb\u9762\u4e0a\u7684\u5c0d\u61c9\u65b9\u6cd5\u64f2\u51fa\u3002(EJB 1.1: 6.10.6\u300112.2.1\u300112.2.2)
-CHKJ2420.eb.i.ejb11=CHKJ2420E: {1} \u5fc5\u9808\u7531 {2} Home \u4ecb\u9762\u4e0a {0} \u7684\u5c0d\u61c9\u65b9\u6cd5\u64f2\u51fa\u3002(EJB 1.1: 9.2.8\u300112.2.1\u300112.2.2)
-CHKJ2420.eb.m.ejb11=CHKJ2420E: {0} \u5fc5\u9808\u7531 {1} Home \u4ecb\u9762\u4e0a\u7684\u5c0d\u61c9\u65b9\u6cd5\u64f2\u51fa\u3002(EJB 1.1: 9.2.8\u300112.2.1\u300112.2.2)
-CHKJ2432.sb.i.ejb11=CHKJ2432E: {1} \u9060\u7aef\u4ecb\u9762\u4e0a {0} \u7684\u5c0d\u61c9\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {2}\u3002(EJB 1.1: 6.10.5\u300112.2.1\u300112.2.2)
-CHKJ2432.sb.m.ejb11=CHKJ2432E: {0} \u9060\u7aef\u4ecb\u9762\u4e0a\u7684\u5c0d\u61c9\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {1}\u3002(EJB 1.1: 6.10.5\u300112.2.1\u300112.2.2)
-CHKJ2432.eb.i.ejb11=CHKJ2432E: {1} \u9060\u7aef\u4ecb\u9762\u4e0a {0} \u7684\u5c0d\u61c9\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {2}\u3002(EJB 1.1: 9.2.7\u300112.2.1\u300112.2.2)
-CHKJ2432.eb.m.ejb11=CHKJ2432E: {0} \u9060\u7aef\u4ecb\u9762\u4e0a\u7684\u5c0d\u61c9\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {1}\u3002(EJB 1.1: 9.2.7\u300112.2.1\u300112.2.2)
-
-CHKJ2801.ejb11=CHKJ2801E: \u5fc5\u9808\u6307\u5b9a <ejb-name> \u5143\u7d20\u7684\u503c\u3002(EJB 1.1: 16.2\u300116.5)
-CHKJ2802.named.ejb11=CHKJ2802E: <ejb-class> \u985e\u5225 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2802.unnamed.ejb11=CHKJ2802E: <ejb-class> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e86\u4e0d\u660e\u985e\u5225\u3002(EJB 1.1: 16.2\u300116.5)\u3002
-CHKJ2803.named.ejb11=CHKJ2803E: <home> \u4ecb\u9762 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2803.unnamed.ejb11=CHKJ2803E: \u5728 <home> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u4ecb\u9762\u3002(EJB 1.1: 16.2\u300116.5)\u3002
-CHKJ2804.named.ejb11=CHKJ2804E: <remote> \u4ecb\u9762 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2804.unnamed.ejb11=CHKJ2804E: \u5728 <remote> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u4ecb\u9762\u3002(EJB 1.1: 16.2\u300116.5)\u3002
-CHKJ2806.ejb11=CHKJ2806E: <reentrant> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "True" \u6216 "False"\u3002(EJB 1.1: 16.2\u300116.5)
-CHKJ2807.ejb11=CHKJ2807E: <session-type> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "Stateful" \u6216 "Stateless"\u3002(EJB 1.1: 16.2\u300116.5)
-CHKJ2808.ejb11=CHKJ2808E: <transaction-type> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "Container" \u6216 "Bean"\u3002(EJB 1.1: 11.3.5\u300116.2\u300116.5)
-CHKJ2809.ejb11=CHKJ2809E: <persistence-type> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "Container" \u6216 "Bean"\u3002(EJB 1.1: 16.2\u300116.5)
-CHKJ2810.named.ejb11=CHKJ2810E: <prim-key-class> \u985e\u5225 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2810.unnamed.ejb11=CHKJ2810E: \u5728 <prim-key-class> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u985e\u5225\u3002(EJB 1.1: 16.2\u300116.5)\u3002
-CHKJ2811.named.ejb11=CHKJ2811E: <field-name> {0} \u4e0d\u53ef\u4f4d\u65bc Bean \u985e\u5225{1}\u3002(EJB 1.1: 16.5)\u3002
-CHKJ2811.unnamed.ejb11=CHKJ2811E: <cmp-field> \u5fc5\u9808\u6307\u5b9a <field-name>\u3002(EJB 1.1: 16.5)\u3002
-CHKJ2812.ejb11=CHKJ2812E:  Bean \u985e\u5225 {0} \u5fc5\u9808\u6307\u5b9a\u81f3\u5c11\u4e00\u500b\u5b83\u7684\u6b04\u4f4d\u4f5c\u70ba <cmp-field>\u3002(EJB 1.1: 16.5)
-CHKJ2814.ejb11=CHKJ2814W: <method> \u4e2d\u7684 <ejb-name> \u61c9\u6307\u5b9a\u4e00\u500b\u5df2\u77e5\u7684 Enterprise Bean\u3002(EJB 1.1: 11.4.1\u300115.3.2\u300116.5)
-
-CHKJ2820.ejb11=CHKJ2820W: \u5b89\u5168\u89d2\u8272\u53c3\u7167\u5fc5\u9808\u50c5\u5b9a\u7fa9\u4e00\u6b21\u3002
-CHKJ2822.ejb11=CHKJ2822W: Bean {0} \u7684 <security-role-ref> \u5143\u7d20\u61c9\u5b9a\u7fa9 <role-name> \u5143\u7d20\u3002(EJB 1.1: 15.2.5.3)
-CHKJ2823.ejb11=CHKJ2823W: <security-role-ref> \u5143\u7d20\u61c9\u5b9a\u7fa9 <role-link> \u5143\u7d20\u3002(EJB 1.1: 15.3.3)
-CHKJ2824.ejb11=CHKJ2824W: <security-role-ref> \u5143\u7d20\u53c3\u7167\u4e0d\u660e\u89d2\u8272 {0}\u3002(EJB 1.1: 15.3.3)
-CHKJ2825.ejb11=CHKJ2825W: ejb-jar.xml \u4e2d\u7684 <security-role> \u5143\u7d20\u61c9\u5b9a\u7fa9 <role-name> \u5143\u7d20\u3002(EJB 1.1: 15.3.1)
-CHKJ2826.ejb11=CHKJ2826W: \u5b89\u5168\u89d2\u8272\u540d\u7a31\u5fc5\u9808\u662f\u552f\u4e00\u7684\u540d\u7a31\u3002(EJB 1.1: 15.3.1)
-CHKJ2827.ejb11=CHKJ2827W: \u6c92\u6709 <security-role> \u5143\u7d20\u60c5\u6cc1\u4e0b\u7121\u6cd5\u4f7f\u7528 <role-link> \u5143\u7d20\u3002(EJB 1.1: 15.2.5.3\u300115.3.1\u300115.3.3)
-CHKJ2828.ejb11=CHKJ2828E: \u5982\u679c\u6c92\u6709\u521d\u59cb\u7684\u4e3b\u9375\uff0c\u5c31\u7121\u6cd5\u4f7f\u7528 <primkey-field> \u5143\u7d20\u3002(EJB 1.1: 9.4.7\u300116.5)
-CHKJ2829.ejb11=CHKJ2829E: Key \u985e\u5225 {0} \u6c92\u6709\u5c0d\u6620\u81f3\u4efb\u4f55\u5728 Enterprise Bean {1}\u4e2d\u7684\u6b04\u4f4d\u3002(EJB 1.1: 9.4.7\u300116.5)
-
-CHKJ2830.ejb11=CHKJ2830W: \u7121\u6cd5\u53cd\u6620 {0} \u6b04\u4f4d\u985e\u578b\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2831.ejb11=CHKJ2831W: \u5fc5\u9808\u5728 <cmp-field> \u5143\u7d20\u4e2d\u5ba3\u544a {0}\u3002(EJB 1.1: 9.4.7.2)
-CHKJ2832.ejb11=CHKJ2832I: \u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 Home {0} \u7121\u6cd5\u5728 EJB \u6a21\u7d44\u4e2d\u627e\u5230\u3002(EJB 1.1: 14.3.1.2)
-CHKJ2833.ejb11=CHKJ2833I: \u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684\u9060\u7aef {0} \u7121\u6cd5\u5728 EJB \u6a21\u7d44\u4e2d\u627e\u5230\u3002(EJB 1.1: 14.3.1.2)
-CHKJ2834.ejb11=CHKJ2834I: \u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 Bean {0} \u7121\u6cd5\u5728 EJB \u6a21\u7d44\u4e2d\u627e\u5230\u3002(EJB 1.1: 14.3.2)
-CHKJ2835.ejb11=CHKJ2835I: Bean {0} \u662f {1} \u985e\u578b\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684<ejb-ref-type> \u5143\u7d20\u3002(EJB 1.1: 14.3.2)
-CHKJ2836.ejb11=CHKJ2836I: Bean {0} \u4f7f\u7528 Home {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 1.1: 14.3.2)
-CHKJ2837.ejb11=CHKJ2837I: Bean {0} \u4f7f\u7528\u9060\u7aef {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 1.1: 14.3.2)\u3002
-CHKJ2838.ejb11=CHKJ2838I: \u5efa\u8b70\u5728 "ejb" \u5b50\u74b0\u5883\u5b9a\u7fa9\u4e2d\u7d44\u7e54 Enterprise Bean \u7684\u6240\u6709\u53c3\u7167\u3002(EJB 1.1: 14.3.1.1)\u3002
-CHKJ2839.ejb11=CHKJ2839W: <env-entry> \u5143\u7d20\u7684 <env-entry-name> \u5143\u7d20\u7121\u6548\u3002(EJB 1.1: 14.2.1.2)
-
-CHKJ2840.ejb11=CHKJ2840W: <env-entry> \u5143\u7d20\u7684 <env-entry-type> \u5143\u7d20\u7121\u6548\u3002(EJB 1.1: 14.2.1.2)\u3002
-CHKJ2841.ejb11=CHKJ2841W: \u5728 <env-entry-name> \u5143\u7d20\u4e2d\u7684 {0} \u540d\u7a31\u53ea\u80fd\u5728 Bean \u4e2d\u4f7f\u7528\u4e00\u6b21\u3002(EJB 1.1: 14.2.1.2)\u3002
-CHKJ2842.ejb11=CHKJ2842W: \u7576 <method-name> \u662f "*" \u6642\u6703\u5ffd\u7565 <method-params>\u3002(EJB 1.1: 11.4.1\u300115.3.2)\u3002
-CHKJ2843.ejb11=CHKJ2843W: \u5728 {0} \u6c92\u6709\u65b9\u6cd5\u7b26\u5408\u9019\u500b <method>\u3002(EJB 1.1: 11.4.1\u300115.3.2)\u3002
-CHKJ2844.ejb11=CHKJ2844W: \u5728 <method-permission> \u4e2d\u5fc5\u9808\u8a2d\u5b9a\u81f3\u5c11\u4e00\u500b <method>\u3002(EJB 1.1: 11.4.1\u300115.3.2)\u3002
-CHKJ2845.ejb11=CHKJ2845W: \u5728 <method-permission> \u4e2d\u5fc5\u9808\u8a2d\u5b9a\u81f3\u5c11\u4e00\u500b <role-name> \u3002(EJB 1.1: 11.4.1\u300115.3.2)\u3002
-CHKJ2846.ejb11=CHKJ2846W: \u627e\u4e0d\u5230\u9019\u500b <method-permission> \u7684\u65b9\u6cd5\u3002(EJB 1.1: 15.3.2)\u3002
-CHKJ2847.ejb11=CHKJ2847W: \u627e\u4e0d\u5230\u9019\u500b <container-transaction> \u7684\u65b9\u6cd5\u3002(EJB 1.1: 11.4.1)\u3002
-CHKJ2849.ejb11=CHKJ2849W: \u7121\u6cd5\u9a57\u8b49 {0} \u7684\u5143\u4ef6\u7e7c\u627f\uff0c\u56e0\u70ba\u7121\u6cd5\u53cd\u6620 {1} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2850.ejb11=CHKJ2850W: \u7121\u6cd5\u9a57\u8b49 <method>\uff0c\u56e0\u70ba\u7121\u6cd5\u53cd\u6620 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2851.ejb11=CHKJ2851W: \u7121\u6cd5\u9a57\u8b49 {0}\uff0c\u56e0\u70ba\u7121\u6cd5\u53cd\u6620 {1} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2852.ejb11=CHKJ2852W: \u5728\u9a57\u8b49 ejb-jar.xml \u6642\u6355\u6349\u5230 Throwable\u3002\u6240\u9a57\u8b49\u7684 Bean \u70ba {0}\u3002
-CHKJ2853.ejb11=CHKJ2853W: \u5728\u9a57\u8b49 ibm-ejb-jar-ext.xmi \u6642\u6355\u6349\u5230 Throwable\u3002\u6240\u9a57\u8b49\u7684 Bean \u70ba {0}\u3002
-
-CHKJ2908.ejb11=CHKJ2908W: \u7121\u6cd5\u6b63\u78ba\u53cd\u6620 Enterprise Bean\u3002\u8acb\u57f7\u884c XML \u9a57\u8b49\u5668\u4ee5\u53d6\u5f97\u8a73\u7d30\u8cc7\u8a0a\u3002
-
-CHKJ2895.ejb11=CHKJ2895W: <ejb-name> {0} \u5fc5\u9808\u662f ejb-jar.xml \u6a94\u5167\u7684\u552f\u4e00 (EJB 1.1: 16.5)\u3002
-CHKJ2875.ejb11=CHKJ2875E: \u6bcf\u500b\u542b\u6709\u9019\u500b EJB \u6a21\u7d44\u7684 EAR \u6a94\u90fd\u5fc5\u9808\u6709 <ejb-client-jar> {0} (EJB 1.1: 16.5\u300117.4)\u3002
-
-
-# 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: \u5982\u679c\u6c92\u6709\u521d\u59cb\u7684\u4e3b\u9375\uff0c\u5c31\u7121\u6cd5\u4f7f\u7528 <primkey-field> (EJB 2.0: 10.8.1\u300122.5)\u3002
-CHKJ2829.ejb20=CHKJ2829E: Key \u985e\u5225 {0} \u6c92\u6709\u5c0d\u6620\u81f3\u4efb\u4f55\u5728 Enterprise Bean {1}\u4e2d\u7684\u6b04\u4f4d\u3002(EJB 2.0: 10.8\u300122.5)\u3002
-CHKJ2839.ejb20=CHKJ2839W: <env-entry> \u5143\u7d20\u7684 <env-entry-name> \u5143\u7d20\u7121\u6548\u3002(EJB 2.0: 20.2.1.2)\u3002
-CHKJ2840.ejb20=CHKJ2840W: <env-entry> \u5143\u7d20\u7684 <env-entry-type> \u5143\u7d20\u7121\u6548\u3002(EJB 2.0: 20.2.1.2)\u3002
-CHKJ2841.ejb20=CHKJ2841W: \u5728 <env-entry-name> \u5143\u7d20\u4e2d\u7684 {0} \u540d\u7a31\u53ea\u80fd\u5728 Bean \u4e2d\u4f7f\u7528\u4e00\u6b21\u3002(EJB 2.0: 20.2.1.2)\u3002
-CHKJ2830.ejb20=CHKJ2830W: \u7121\u6cd5\u53cd\u6620 {0} \u6b04\u4f4d\u985e\u578b\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2831.ejb20=CHKJ2831W: \u5fc5\u9808\u5728 <cmp-field> \u5143\u7d20\u4e2d\u5ba3\u544a {0}\u3002(EJB 2.0: 10.8.2)\u3002
-CHKJ2801.ejb20=CHKJ2801E: \u5fc5\u9808\u6307\u5b9a <ejb-name> \u5143\u7d20\u7684\u503c\u3002(EJB 2.0 22.2\u300122.5)\u3002
-CHKJ2809.ejb20=CHKJ2809E: <persistence-type> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "Container" \u6216 "Bean"\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2806.ejb20=CHKJ2806E: <reentrant> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "True" \u6216 "False"\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2807.ejb20=CHKJ2807E: <session-type> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "Stateful" \u6216 "Stateless"\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2808.ejb20=CHKJ2808E: <transaction-type> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "Container" \u6216 "Bean"\u3002(EJB 2.0: 17.3.6\u300122.2\u300122.5)\u3002
-CHKJ2814.ejb20=CHKJ2814W: <method> \u4e2d\u7684 <ejb-name> \u61c9\u6307\u5b9a\u4e00\u500b\u5df2\u77e5\u7684 Enterprise Bean\u3002(EJB 2.0: 17.4.1\u300121.3.2\u300122.5)\u3002
-CHKJ2842.ejb20=CHKJ2842W: \u7576 <method-name> \u662f "*" \u6642\u6703\u5ffd\u7565 <method-params>\u3002(EJB 2.0: 17.4.1\u300121.3.2)\u3002
-CHKJ2843.ejb20=CHKJ2843W: \u5728 {0} \u6c92\u6709\u65b9\u6cd5\u7b26\u5408\u9019\u500b <method>\u3002(EJB 2.0: 17.4.1\u300121.3.2)\u3002
-CHKJ2844.ejb20=CHKJ2844W: \u5728 <method-permission> \u4e2d\u5fc5\u9808\u8a2d\u5b9a\u81f3\u5c11\u4e00\u500b <method>\u3002(EJB 2.0: 17.4.1\u300121.3.2)\u3002
-CHKJ2845.ejb20=CHKJ2845W: <role-name> \u6216 <unchecked> \u5143\u7d20\u61c9\u8a2d\u5b9a\u5728 <method-permission> \u4e2d\u3002(EJB 2.0: 17.4.1\u300121.3.2)\u3002
-CHKJ2846.ejb20=CHKJ2846W: \u627e\u4e0d\u5230\u9019\u500b <method-permission> \u7684\u65b9\u6cd5\u3002(EJB 2.0: 21.3.2)\u3002
-CHKJ2847.ejb20=CHKJ2847W: \u627e\u4e0d\u5230\u9019\u500b <container-transaction> \u7684\u65b9\u6cd5\u3002(EJB 2.0: 17.4.1)\u3002
-CHKJ2812.ejb20=CHKJ2812E:  Bean \u985e\u5225 {0} \u5fc5\u9808\u6307\u5b9a\u81f3\u5c11\u4e00\u500b\u5b83\u7684\u6b04\u4f4d\u4f5c\u70ba <cmp-field>\u3002(EJB 2.0: 22.5)\u3002
-CHKJ2832.ejb20=CHKJ2832I: \u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 Home {0} \u7121\u6cd5\u5728 EJB \u6a21\u7d44\u4e2d\u627e\u5230\u3002(EJB 2.0: 20.3.1.2)\u3002
-CHKJ2833.ejb20=CHKJ2833I: \u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684\u9060\u7aef {0} \u7121\u6cd5\u5728 EJB \u6a21\u7d44\u4e2d\u627e\u5230\u3002(EJB 2.0: 20.3.1.2)\u3002
-CHKJ2834.ejb20=CHKJ2834I: \u5728 <ejb-ref> \u5143\u7d20\u4e2d\u6307\u5b9a\u7684 Bean {0} \u7121\u6cd5\u5728 EJB \u6a21\u7d44\u4e2d\u627e\u5230\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2835.ejb20=CHKJ2835I: Bean {0} \u662f {1} \u985e\u578b\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684<ejb-ref-type> \u5143\u7d20\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2836.ejb20=CHKJ2836I: Bean {0} \u4f7f\u7528 Home {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2837.ejb20=CHKJ2837I: Bean {0} \u4f7f\u7528\u9060\u7aef {1}\u3002\u66f4\u65b0 <ejb-ref> \u5143\u7d20\u7684 <ejb-ref> \u5143\u7d20\u3002(EJB 2.0: 20.3.2)\u3002
-CHKJ2838.ejb20=CHKJ2838I: \u5efa\u8b70\u5728 "ejb" \u5b50\u74b0\u5883\u5b9a\u7fa9\u4e2d\u7d44\u7e54 Enterprise Bean \u7684\u6240\u6709\u53c3\u7167\u3002(EJB 2.0: 20.3.1.1)\u3002
-CHKJ2820.ejb20=CHKJ2820W: \u4e0d\u53ea\u4e00\u6b21\u5b9a\u7fa9\u5b89\u5168\u89d2\u8272 ref\u3002
-CHKJ2822.ejb20=CHKJ2822W: Bean {0} \u7684 <security-role-ref> \u5143\u7d20\u61c9\u5b9a\u7fa9 <role-name> \u5143\u7d20\u3002(EJB 2.0: 21.2.5.3)\u3002
-CHKJ2823.ejb20=CHKJ2823W: <security-role-ref> \u5143\u7d20\u61c9\u5b9a\u7fa9 <role-link> \u5143\u7d20\u3002(EJB 2.0: 21.3.3)\u3002
-CHKJ2824.ejb20=CHKJ2824W: <security-role-ref> \u5143\u7d20\u53c3\u7167\u4e0d\u660e\u89d2\u8272 {0}\u3002(EJB 2.0: 21.3.3)\u3002
-CHKJ2825.ejb20=CHKJ2825W: ejb-jar.xml \u4e2d\u7684 <security-role> \u5143\u7d20\u61c9\u5b9a\u7fa9 <role-name> \u5143\u7d20\u3002(EJB 2.0: 21.3.1)\u3002
-CHKJ2826.ejb20=CHKJ2826W: \u5b89\u5168\u89d2\u8272\u540d\u7a31\u5fc5\u9808\u662f\u552f\u4e00\u7684\u540d\u7a31\u3002(EJB 2.0: 21.3.1)\u3002
-CHKJ2827.ejb20=CHKJ2827W: \u6c92\u6709 <security-role> \u5143\u7d20\u60c5\u6cc1\u4e0b\u7121\u6cd5\u4f7f\u7528 <role-link> \u5143\u7d20\u3002(EJB 2.0: 21.2.5.3\u300121.3.1\u300121.3.3)\u3002
-CHKJ2850.ejb20=CHKJ2850W: \u7121\u6cd5\u9a57\u8b49 <method>\uff0c\u56e0\u70ba {0} \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2851.ejb20=CHKJ2851W: \u7121\u6cd5\u9a57\u8b49 {0}\uff0c\u56e0\u70ba\u7121\u6cd5\u53cd\u6620\u985e\u578b {1}\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2875.ejb20=CHKJ2875E: \u6bcf\u500b\u542b\u6709\u9019\u500b EJB \u6a21\u7d44\u7684 EAR \u6a94\u90fd\u5fc5\u9808\u6709 <ejb-client-jar> {0} (EJB 2.0: 22.5\u300123.4\u300123.6)\u3002
-
-CHKJ2003E.ejb20=CHKJ2003E: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u5be6\u4f5c javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3\u30017.10.2\u300117.3.4.1)\u3002
-CHKJ2003I.ejb20=CHKJ2003I: Bean \u7ba1\u7406\u7684\u4ea4\u6613 Stateful Session Bean \u4e0d\u9700\u8981\u5be6\u4f5c javax.ejb.SessionSynchronization (EJB 2.0: 7.5.3\u30017.10.2\u300117.3.4.1)\u3002
-CHKJ2802.named.ejb20=CHKJ2802E: <ejb-class> \u985e\u5225 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2802.unnamed.ejb20=CHKJ2802E: \u627e\u4e0d\u5230 <ejb-class> \u5143\u7d20\u6240\u8b58\u5225\u7684 Bean \u985e\u5225\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2803.named.ejb20=CHKJ2803E: <home> \u4ecb\u9762 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2803.unnamed.ejb20=CHKJ2803E: \u5728 <home> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u4ecb\u9762\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2804.named.ejb20=CHKJ2804E: <remote> \u4ecb\u9762 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2804.unnamed.ejb20=CHKJ2804E: \u5728 <remote> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u4ecb\u9762\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2805.named.ejb20=CHKJ2805E: <local-home> \u4ecb\u9762 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2805.unnamed.ejb20=CHKJ2805E: \u5728 <local-home> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u4ecb\u9762\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2800.named.ejb20=CHKJ2800E: <local> \u4ecb\u9762 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2800.unnamed.ejb20=CHKJ2800E: \u5728 <local> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u4ecb\u9762\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2810.named.ejb20=CHKJ2810E: <prim-key-class> \u985e\u5225 {0} \u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b Super \u985e\u578b\u7121\u6cd5\u53cd\u6620\u51fa\u4f86\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-CHKJ2810.unnamed.ejb20=CHKJ2810E: \u5728 <prim-key-class> \u5143\u7d20\u4e2d\u6307\u5b9a\u4e0d\u660e\u985e\u5225\u3002(EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2811.ejb20=CHKJ2811E: <field-name> {0} \u4e0d\u53ef\u4f4d\u65bc Bean \u985e\u5225{1}\u3002(EJB 2.0: 22.5)\u3002
-
-CHKJ2103.ejb20=CHKJ2103E: \u5728\u5143\u4ef6\u7e7c\u627f\u4e2d\uff0c{0} Bean \u985e\u5225\u5fc5\u9808\u7e7c\u627f {1} (EJB 2.0: D.2)
-CHKJ2104.ejb20=CHKJ2104E: \u5728\u5143\u4ef6\u7e7c\u627f\u4e2d\uff0c{0} Home \u4ecb\u9762\u4e0d\u53ef\u7e7c\u627f {1}\u3002(EJB 2.0: D.2)\u3002
-CHKJ2105.ejb20=CHKJ2105E: \u5728\u5143\u4ef6\u7e7c\u627f\u4e2d\uff0c{0} \u5143\u4ef6\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f {1}\u3002(EJB 2.0: D.2)\u3002
-CHKJ2106.ejb20=CHKJ2106E: Bean {0} \u5fc5\u9808\u4f7f\u7528 {1} \u4f5c\u70ba\u5176 <prim-key-class> (EJB 2.0: D.2)\u3002
-CHKJ2849.ejb20=CHKJ2849W: \u7121\u6cd5\u9a57\u8b49 {0} \u7684\u5143\u4ef6\u7e7c\u627f\uff0c\u56e0\u70ba\u7121\u6cd5\u53cd\u6620 {1} \u985e\u578b\u6216\u5b83\u7684\u5176\u4e2d\u4e00\u500b\u76f8\u4f9d\u95dc\u4fc2\u3002\u8acb\u6aa2\u67e5\u985e\u5225\u8def\u5f91\u3002
-
-CHKJ2895.ejb20=CHKJ2895W: <ejb-name> {0} \u5fc5\u9808\u662f ejb-jar.xml \u6a94\u5167\u7684\u552f\u4e00 (EJB 2.0: 22.5)\u3002
-
-##################################################
-# class/interface checks
-##################################################
-# implement SessionBean/EntityBean/MessageDrivenBean/MessageListener
-CHKJ2017.sb.ejb20=CHKJ2017E: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5be6\u4f5c {0} (EJB 2.0: 7.5.1\u30017.10.2)\u3002
-CHKJ2017.mb.ejb20=CHKJ2017E: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5be6\u4f5c {0} (EJB 2.0: 15.4.1\u300115.7.2)\u3002
-CHKJ2017.cb.ejb20=CHKJ2017E: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5be6\u4f5c {0} (EJB 2.0: 10.6.2)\u3002
-CHKJ2017.bb.ejb20=CHKJ2017E: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5be6\u4f5c {0} (EJB 2.0: 12.2.2)\u3002
-
-# implement EJBHome
-CHKJ2017.srh.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBHome (EJB 2.0: 6.3\u30017.10.6)\u3002
-CHKJ2017.crh.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBHome (EJB 2.0: 9.5\u300110.6.10)\u3002
-CHKJ2017.brh.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBHome (EJB 2.0: 9.5\u300112.2.9)\u3002
-
-# implement EJBLocalHome
-CHKJ2017.slh.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBLocalHome (EJB 2.0: 6.4\u30017.10.8)\u3002
-CHKJ2017.clh.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBLocalHome (EJB 2.0: 9.6\u300110.6.12)\u3002
-CHKJ2017.blh.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBLocalHome (EJB 2.0: 9.6\u300112.2.11)\u3002
-
-# implement EJBObject
-CHKJ2017.src.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBObject (EJB 2.0: 6.5\u30017.10.5)\u3002
-CHKJ2017.crc.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBObject (EJB 2.0: 9.9\u300110.6.9)\u3002
-CHKJ2017.brc.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBObject (EJB 2.0: 9.9\u300112.2.8)\u3002
-
-# implement EJBLocalObject
-CHKJ2017.slc.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBLocalObject (EJB 2.0: 7.10.7)\u3002
-CHKJ2017.clc.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBLocalObject (EJB 2.0: 9.10\u300110.6.10)\u3002
-CHKJ2017.blc.ejb20=CHKJ2017E: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u7e7c\u627f javax.ejb.EJBLocalObject (EJB 2.0: 9.10\u300112.2.10)\u3002
-
-# impl component interface
-CHKJ2040.cb.ejb20=CHKJ2040I: \u4e0d\u5f97\u50b3\u905e "this" \u4f5c\u70ba\u65b9\u6cd5\u5f15\u6578\u6216\u7d50\u679c (EJB 2.0: 10.6.2)\u3002
-CHKJ2040.bb.ejb20=CHKJ2040I: \u4e0d\u5f97\u50b3\u905e "this" \u4f5c\u70ba\u65b9\u6cd5\u5f15\u6578\u6216\u7d50\u679c (EJB 2.0: 12.2.2)\u3002
-CHKJ2040.sb.ejb20=CHKJ2040I: \u4e0d\u5f97\u50b3\u905e "this" \u4f5c\u70ba\u65b9\u6cd5\u5f15\u6578\u6216\u7d50\u679c (EJB 2.0: 7.10.2)\u3002
-
-# bean class
-CHKJ2014.cb.ejb20=CHKJ2014W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f abstract (EJB 2.0: 10.3.1\u300110.4.1\u300110.6.2)\u3002
-CHKJ2014.mb.ejb20=CHKJ2014W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f abstract (EJB 2.0: 15.7.2)\u3002
-CHKJ2014.bb.ejb20=CHKJ2014W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f abstract (EJB 2.0: 12.2.2)\u3002
-CHKJ2014.sb.ejb20=CHKJ2014W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f abstract (EJB 2.0: 7.10.1)\u3002
-
-CHKJ2022.cb.ejb20=CHKJ2022W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f public (EJB 2.0: 10.6.2)\u3002
-CHKJ2022.mb.ejb20=CHKJ2022W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f public (EJB 2.0: 15.7.2)\u3002
-CHKJ2022.bb.ejb20=CHKJ2022W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f public (EJB 2.0: 12.2.2)\u3002
-CHKJ2022.sb.ejb20=CHKJ2022W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f public (EJB 2.0: 7.10.1)\u3002
-CHKJ2022.kc.ejb20=CHKJ2022W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f public (EJB 2.0: 10.8.2)\u3002
-
-CHKJ2015.cb.ejb20=CHKJ2015W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.6.2)\u3002
-CHKJ2015.mb.ejb20=CHKJ2015W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 15.7.2)\u3002
-CHKJ2015.bb.ejb20=CHKJ2015W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.2)\u3002
-CHKJ2015.sb.ejb20=CHKJ2015W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 7.10.1)\u3002
-
-# dependent value class
-CHKJ2018.ejb20=CHKJ2018W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f\u53ef\u5e8f\u5217\u5316\u7684 (EJB 2.0: 10.3.3\u300110.6.3)\u3002
-CHKJ2043.ejb20=CHKJ2043W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f public (EJB 2.0: 10.6.3)\u3002
-CHKJ2044.ejb20=CHKJ2044W: \u9019\u500b\u985e\u5225\u4e0d\u53ef\u4ee5\u662f abstract (EJB 2.0: 10.6.3)\u3002
-
-# key class
-CHKJ2019.kc.ejb20=CHKJ2019W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f RMI-IIOP \u4e2d\u7684\u5408\u6cd5\u503c\u985e\u578b (EJB 2.0: 9.8\u300110.6.13)\u3002
-CHKJ2019.kb.ejb20=CHKJ2019W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u662f RMI-IIOP \u4e2d\u7684\u5408\u6cd5\u503c\u985e\u578b (EJB 2.0: 9.8\u300112.2.12)\u3002
-
-
-###
-# methods which must exist
-###
-# public default constructor with no parameters
-CHKJ2050.constr.sb.ejb20=CHKJ2050W: Public {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 7.10.2)\u3002
-CHKJ2050.constr.cb.ejb20=CHKJ2050W: Public {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.6.2)\u3002
-CHKJ2050.constr.bb.ejb20=CHKJ2050W: Public {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1\u300112.2.2)\u3002
-CHKJ2050.constr.mb.ejb20=CHKJ2050W: Public {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 15.7.2)\u3002
-CHKJ2050.constr.kc.ejb20=CHKJ2050W: Public {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.8.2)\u3002
-
-
-# accessor method
-CHKJ2050.acc.cb.ejb20=CHKJ2050E: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5b9a\u7fa9 {0} (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2050.onMessage.mb.ejb20=CHKJ2050W: onMessage(javax.jms.Message) \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 15.4.2\u300115.7.4)\u3002
-
-CHKJ2050.ejbCreate.sfb.ejb20=CHKJ2050W: \u81f3\u5c11\u6709\u4e00\u500b ejbCreate \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 7.5.5)\u3002
-CHKJ2050.ejbCreate.ssb.ejb20=CHKJ2050W: ejbCreate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 7.8)\u3002
-CHKJ2050.ejbCreate.mb.ejb20=CHKJ2050W: ejbCreate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 15.4.4\u300115.7.2)\u3002
-
-CHKJ2050.ejbFindByPrimaryKey.bb.ejb20=CHKJ2050W: ejbFindByPrimaryKey \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2050.setEntityContext.cb.ejb20=CHKJ2050W: setEntityContext(EntityContext) \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.setEntityContext.bb.ejb20=CHKJ2050W: setEntityContext(EntityContext) \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.unsetEntityContext.cb.ejb20=CHKJ2050W: unsetEntityContext() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.unsetEntityContext.bb.ejb20=CHKJ2050W: unsetEntityContext() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbActivate.cb.ejb20=CHKJ2050W: ejbActivate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbActivate.bb.ejb20=CHKJ2050W: ejbActivate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbPassivate.cb.ejb20=CHKJ2050W: ejbPassivate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbPassivate.bb.ejb20=CHKJ2050W: ejbPassivate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2050.ejbPassivate.sb.ejb20=CHKJ2050W: ejbPassivate() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 7.5.1)\u3002
-
-CHKJ2050.ejbRemove.cb.ejb20=CHKJ2050W: ejbRemove() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbRemove.bb.ejb20=CHKJ2050W: ejbRemove() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2050.ejbRemove.mb.ejb20=CHKJ2050W: ejbRemove() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 15.7.5)\u3002
-CHKJ2050.ejbRemove.sb.ejb20=CHKJ2050W: ejbRemove() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 4.2.2\u30017.5.1)\u3002
-
-CHKJ2050.ejbLoad.cb.ejb20=CHKJ2050W: ejbLoad() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbLoad.bb.ejb20=CHKJ2050W: ejbLoad() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbStore.cb.ejb20=CHKJ2050W: ejbStore() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbStore.bb.ejb20=CHKJ2050W: ejbStore() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.create.ssrh.ejb20=CHKJ2050W: create() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 7.8\u30017.10.6)\u3002
-CHKJ2050.create.sslh.ejb20=CHKJ2050W: create() \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 7.8\u30017.10.8)\u3002
-
-CHKJ2050.create.srh.ejb20=CHKJ2050W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b create \u65b9\u6cd5 (EJB 2.0: 6.3.1\u30017.10.6)\u3002
-CHKJ2050.create.slh.ejb20=CHKJ2050W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b create \u65b9\u6cd5 (EJB 2.0: 6.4.1\u30017.10.8)\u3002
-
-CHKJ2050.find.crh.ejb20=CHKJ2050W: \u81f3\u5c11\u6709\u4e00\u500b finder \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.5.2)\u3002
-CHKJ2050.find.brh.ejb20=CHKJ2050W: \u81f3\u5c11\u6709\u4e00\u500b finder \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.5.2)\u3002
-CHKJ2050.find.clh.ejb20=CHKJ2050W: \u81f3\u5c11\u6709\u4e00\u500b finder \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.6.2)\u3002
-CHKJ2050.find.blh.ejb20=CHKJ2050W: \u81f3\u5c11\u6709\u4e00\u500b finder \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.6.2)\u3002
-
-CHKJ2050.home.crh.ejb20=CHKJ2050W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b home \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.home.brh.ejb20=CHKJ2050W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b home \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.home.clh.ejb20=CHKJ2050W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b home \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-CHKJ2050.home.blh.ejb20=CHKJ2050W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b home \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-
-CHKJ2050.ejbHome.crh.ejb20=CHKJ2050W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b ejbHome \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.ejbHome.brh.ejb20=CHKJ2050W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b ejbHome \u65b9\u6cd5 (EJB 2.0: 9.5.4)\u3002
-CHKJ2050.ejbHome.clh.ejb20=CHKJ2050W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b ejbHome \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-CHKJ2050.ejbHome.blh.ejb20=CHKJ2050W: \u9019\u500b\u985e\u5225\u5fc5\u9808\u5b9a\u7fa9\u81f3\u5c11\u4e00\u500b ejbHome \u65b9\u6cd5 (EJB 2.0: 9.6.4)\u3002
-
-CHKJ2050.hashCode.kb.ejb20=CHKJ2050W: hashCode() \u5fc5\u9808\u5b58\u5728\u65bc\u9019\u500b\u985e\u5225 (EJB 2.0: 12.2.12)\u3002
-CHKJ2050.hashCode.kc.ejb20=CHKJ2050W: hashCode() \u5fc5\u9808\u5b58\u5728\u65bc\u9019\u500b\u985e\u5225 (EJB 2.0: 10.6.13)\u3002
-
-CHKJ2050.equals.kb.ejb20=CHKJ2050W: equals(Object) \u5fc5\u9808\u5b58\u5728\u65bc\u9019\u500b\u985e\u5225 (EJB 2.0: 12.2.12)\u3002
-CHKJ2050.equals.kc.ejb20=CHKJ2050W: equals(Object) \u5fc5\u9808\u5b58\u5728\u65bc\u9019\u500b\u985e\u5225 (EJB 2.0: 10.6.13)\u3002
-
-# ejbSelect - needed? pl174 says zero or more, p.193 says one or more
-CHKJ2050.ejbSelect.cb.ejb20=CHKJ2050W: ejbSelect \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.6.7)\u3002
-
-CHKJ2050.findByPrimaryKey.crh.ejb20=CHKJ2050W: findByPrimaryKey \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2050.findByPrimaryKey.clh.ejb20=CHKJ2050W: findByPrimaryKey \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.6.2\u300110.6.12)\u3002
-CHKJ2050.findByPrimaryKey.blh.ejb20=CHKJ2050W: findByPrimaryKey \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.6.2\u300112.2.11)\u3002
-CHKJ2050.findByPrimaryKey.brh.ejb20=CHKJ2050W: findByPrimaryKey \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-
-# ejbFind
-CHKJ2050.ejbFind.bb.ejb20=CHKJ2050W: {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2050.ejbPostCreate.cb.ejb20=CHKJ2050E: {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.5.2)\u3002
-CHKJ2050.ejbPostCreate.bb.ejb20=CHKJ2050E: {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 12.1.4.1\u300112.2.4)\u3002
-
-
-##################################################
-# method checks
-##################################################
-# application exception
-CHKJ2404.i.ejb20=CHKJ2404W: {0} \u4e0a\u7684\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 {1} \u5fc5\u9808\u7e7c\u627f java.lang.Exception (EJB 2.0: 18.1.1\u300118.2.1)\u3002
-CHKJ2404.m.ejb20=CHKJ2404W: \u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 {0} \u5fc5\u9808\u7e7c\u627f java.lang.Exception (EJB 2.0: 18.1.1\u300118.2.1)\u3002
-CHKJ2416.i.ejb20=CHKJ2416W: {0} \u4e0a\u7684\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 {1} \u4e0d\u53ef\u4ee5\u7e7c\u627f java.lang.RuntimeException (EJB 2.0: 18.1.1\u300118.2.1)\u3002
-CHKJ2416.m.ejb20=CHKJ2416W: \u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 {0} \u4e0d\u53ef\u4ee5\u7e7c\u627f java.lang.RuntimeException (EJB 2.0: 18.1.1\u300118.2.1)\u3002
-
-# ejbRemove
-CHKJ2492.mb.i.ejb20=CHKJ2492W: {1} \u4e0a\u7684 {0} \u5fc5\u9808\u662f public (EJB 2.0: 15.7.5)\u3002
-CHKJ2492.mb.m.ejb20=CHKJ2492W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 15.7.5)\u3002
-CHKJ2492.cb.i.ejb20=CHKJ2492W: {1} \u4e0a\u7684 {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.5.2)\u3002
-CHKJ2492.cb.m.ejb20=CHKJ2492W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 10.5.20)\u3002
-CHKJ2492.bb.i.ejb20=CHKJ2492W: {1} \u4e0a\u7684 {0} \u5fc5\u9808\u662f public (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2492.bb.m.ejb20=CHKJ2492W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2492.sb.i.ejb20=CHKJ2492W: {1} \u4e0a\u7684 {0} \u5fc5\u9808\u662f public (EJB 2.0: 7.6)\u3002
-CHKJ2492.sb.m.ejb20=CHKJ2492W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 7.6)\u3002
-
-CHKJ2493.mb.i.ejb20=CHKJ2493W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 15.7.5)\u3002
-CHKJ2493.mb.m.ejb20=CHKJ2493W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 15.7.5)\u3002
-CHKJ2493.cb.i.ejb20=CHKJ2493W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.5.2)\u3002
-CHKJ2493.cb.m.ejb20=CHKJ2493W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.5.2)\u3002
-CHKJ2493.bb.i.ejb20=CHKJ2493W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2493.bb.m.ejb20=CHKJ2493W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2493.sb.i.ejb20=CHKJ2493W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 7.6)\u3002
-CHKJ2493.sb.m.ejb20=CHKJ2493W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 7.6)\u3002
-
-CHKJ2494.mb.i.ejb20=CHKJ2494W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 15.7.5)\u3002
-CHKJ2494.mb.m.ejb20=CHKJ2494W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 15.7.5)\u3002
-CHKJ2494.cb.i.ejb20=CHKJ2494W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.5.2)\u3002
-CHKJ2494.cb.m.ejb20=CHKJ2494W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.5.2)\u3002
-CHKJ2494.bb.i.ejb20=CHKJ2494W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2494.bb.m.ejb20=CHKJ2494W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2494.sb.i.ejb20=CHKJ2494W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 7.6)\u3002
-CHKJ2494.sb.m.ejb20=CHKJ2494W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 7.6)\u3002
-
-CHKJ2505.ejbRemove.mb.i.ejb20=CHKJ2505W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 15.7.5)\u3002
-CHKJ2505.ejbRemove.mb.m.ejb20=CHKJ2505W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 15.7.5)\u3002
-CHKJ2505.ejbRemove.cb.i.ejb20=CHKJ2505W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 10.5.2)\u3002
-CHKJ2505.ejbRemove.cb.m.ejb20=CHKJ2505W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 10.5.2)\u3002
-CHKJ2505.ejbRemove.bb.i.ejb20=CHKJ2505W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2505.ejbRemove.bb.m.ejb20=CHKJ2505W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2505.ejbRemove.sb.i.ejb20=CHKJ2505W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 7.6)\u3002
-CHKJ2505.ejbRemove.sb.m.ejb20=CHKJ2505W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 7.6)\u3002
-
-# ejbCreate
-CHKJ2421.mb.i.ejb20=CHKJ2421W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 15.7.3)\u3002
-CHKJ2421.cb.i.ejb20=CHKJ2421W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.6.4)\u3002
-CHKJ2421.bb.i.ejb20=CHKJ2421W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 12.2.3)\u3002
-CHKJ2421.sb.i.ejb20=CHKJ2421W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 7.10.3)\u3002
-CHKJ2421.mb.m.ejb20=CHKJ2421W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 15.7.3)\u3002
-CHKJ2421.cb.m.ejb20=CHKJ2421W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 10.6.4)\u3002
-CHKJ2421.bb.m.ejb20=CHKJ2421W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 12.2.3)\u3002
-CHKJ2421.sb.m.ejb20=CHKJ2421W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 7.10.3)\u3002
-
-CHKJ2422.sb.i.ejb20=CHKJ2422W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 7.10.3)\u3002
-CHKJ2422.cb.i.ejb20=CHKJ2422W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.6.4)\u3002
-CHKJ2422.bb.i.ejb20=CHKJ2422W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.3)\u3002
-CHKJ2422.mb.i.ejb20=CHKJ2422W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 15.7.3)\u3002
-CHKJ2422.sb.m.ejb20=CHKJ2422W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 7.10.3)\u3002
-CHKJ2422.cb.m.ejb20=CHKJ2422W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.6.4)\u3002
-CHKJ2422.bb.m.ejb20=CHKJ2422W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.3)\u3002
-CHKJ2422.mb.m.ejb20=CHKJ2422W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 15.7.3)\u3002
-
-CHKJ2423.sb.i.ejb20=CHKJ2423W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 7.10.3)\u3002
-CHKJ2423.cb.i.ejb20=CHKJ2423W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.4)\u3002
-CHKJ2423.bb.i.ejb20=CHKJ2423W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.3)\u3002
-CHKJ2423.mb.i.ejb20=CHKJ2423W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 15.7.3)\u3002
-CHKJ2423.sb.m.ejb20=CHKJ2423W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 7.10.3)\u3002
-CHKJ2423.cb.m.ejb20=CHKJ2423W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.4)\u3002
-CHKJ2423.bb.m.ejb20=CHKJ2423W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.3)\u3002
-CHKJ2423.mb.m.ejb20=CHKJ2423W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 15.7.3)\u3002
-
-CHKJ2424.cb.i.ejb20=CHKJ2424W: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 10.6.4)\u3002
-CHKJ2424.bb.i.ejb20=CHKJ2424W: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 12.2.3)\u3002
-CHKJ2424.sb.i.ejb20=CHKJ2424W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 7.10.3)\u3002
-CHKJ2424.mb.i.ejb20=CHKJ2424W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 15.7.3)\u3002
-CHKJ2424.cb.m.ejb20=CHKJ2424W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 10.6.4)\u3002
-CHKJ2424.bb.m.ejb20=CHKJ2424W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 12.2.3)\u3002
-CHKJ2424.sb.m.ejb20=CHKJ2424W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 7.10.3)\u3002
-CHKJ2424.mb.m.ejb20=CHKJ2424W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 15.7.3)\u3002
-
-
-
-# ejbCreate's method parameters and return type
-CHKJ2500.ejbCreate.sb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.3)\u3002
-CHKJ2500.ejbCreate.cb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.4)\u3002
-CHKJ2500.ejbCreate.bb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.3)\u3002
-CHKJ2500.ejbCreate.sb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.3)\u3002
-CHKJ2500.ejbCreate.cb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.4)\u3002
-CHKJ2500.ejbCreate.bb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.3)\u3002
-
-CHKJ2497.cb.i.ejb20=CHKJ2497W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 10.6.4)\u3002
-CHKJ2497.cb.m.ejb20=CHKJ2497W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 10.6.4)\u3002
-
-CHKJ2501.ejbCreate.mb.i.ejb20=CHKJ2501I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 (EJB 2.0: 15.7.3\u300118.1.1\u300118.2.1\u300118.3.2)\u3002
-CHKJ2501.ejbCreate.mb.m.ejb20=CHKJ2501I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 (EJB 2.0: 15.7.3\u300118.1.1\u300118.2.1\u300118.3.2)\u3002
-CHKJ2501.ejbRemove.mb.i.ejb20=CHKJ2501I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 (EJB 2.0: 15.7.5\u300118.1.1\u300118.2.1\u300118.3.2)\u3002
-CHKJ2501.ejbRemove.mb.m.ejb20=CHKJ2501I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 (EJB 2.0: 15.7.5\u300118.1.1\u300118.2.1\u300118.3.2)\u3002
-CHKJ2501.onMessage.mb.i.ejb20=CHKJ2501I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 (EJB 2.0: 15.4.10\u300115.7.4\u300118.1.1\u300118.2.1\u300118.3.2)\u3002
-CHKJ2501.onMessage.mb.m.ejb20=CHKJ2501I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa\u61c9\u7528\u7a0b\u5f0f\u7570\u5e38\u72c0\u6cc1 (EJB 2.0: 15.4.10\u300115.7.4\u300118.1.1\u300118.2.1\u300118.3.2)\u3002
-
-
-CHKJ2503.ejbCreate.sb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.3\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbCreate.cb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.4\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbCreate.bb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.3\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbCreate.sb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.3\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbCreate.cb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.4\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbCreate.bb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.3\u300118.3.8\u300118.6)\u3002
-
-# ejbPostCreate
-CHKJ2426.cb.i.ejb20=CHKJ2426W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.6.5)\u3002
-CHKJ2426.bb.i.ejb20=CHKJ2426W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 12.2.4)\u3002
-CHKJ2426.cb.m.ejb20=CHKJ2426W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 10.6.5)\u3002
-CHKJ2426.bb.m.ejb20=CHKJ2426W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2427.cb.i.ejb20=CHKJ2427W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.6.5)\u3002
-CHKJ2427.bb.i.ejb20=CHKJ2427W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.4)\u3002
-CHKJ2427.cb.m.ejb20=CHKJ2427W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.6.5)\u3002
-CHKJ2427.bb.m.ejb20=CHKJ2427W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2428.cb.i.ejb20=CHKJ2428W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.5)\u3002
-CHKJ2428.bb.i.ejb20=CHKJ2428W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.4)\u3002
-CHKJ2428.cb.m.ejb20=CHKJ2428W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.5)\u3002
-CHKJ2428.bb.m.ejb20=CHKJ2428W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2505.ejbPostCreate.cb.i.ejb20=CHKJ2505W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 10.6.5)\u3002
-CHKJ2505.ejbPostCreate.bb.i.ejb20=CHKJ2505W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 12.2.4)\u3002
-CHKJ2505.ejbPostCreate.cb.m.ejb20=CHKJ2505W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 10.6.5)\u3002
-CHKJ2505.ejbPostCreate.bb.m.ejb20=CHKJ2505W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 12.2.4)\u3002
-
-CHKJ2503.ejbPostCreate.cb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.5\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbPostCreate.bb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.4\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbPostCreate.cb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.5\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbPostCreate.bb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.4\u300118.3.8\u300118.6)\u3002
-
-
-# ejbHome
-CHKJ2430.cb.i.ejb20=CHKJ2430I: {1} \u5fc5\u9808\u5b58\u5728\uff0c\u624d\u80fd\u547c\u53eb {0} (EJB 2.0: 10.5.2\u300110.6.6)\u3002
-CHKJ2430.bb.i.ejb20=CHKJ2430I: {1} \u5fc5\u9808\u5b58\u5728\uff0c\u624d\u80fd\u547c\u53eb {0} (EJB 2.0: 12.1.4.1)\u3002
-CHKJ2430.cb.m.ejb20=CHKJ2430I: {0} \u5fc5\u9808\u5b58\u5728\uff0c\u624d\u80fd\u547c\u53eb\u9019\u500b\u65b9\u6cd5 (EJB 2.0: 10.5.2\u300110.6.6)\u3002
-CHKJ2430.bb.m.ejb20=CHKJ2430I: {0} \u5fc5\u9808\u5b58\u5728\uff0c\u624d\u80fd\u547c\u53eb\u9019\u500b\u65b9\u6cd5 (EJB 2.0: 12.1.4.1)\u3002
-
-CHKJ2431.cb.i.ejb20=CHKJ2431W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.6.6)\u3002
-CHKJ2431.bb.i.ejb20=CHKJ2431W: {0} \u5fc5\u9808\u662f public\u3002(EJB 2.0: 12.2.6)\u3002
-CHKJ2431.cb.m.ejb20=CHKJ2431W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 10.6.6)\u3002
-CHKJ2431.bb.m.ejb20=CHKJ2431W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public\u3002(EJB 2.0: 12.2.6)\u3002
-
-CHKJ2439.cb.i.ejb20=CHKJ2439W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.6)\u3002
-CHKJ2439.bb.i.ejb20=CHKJ2439W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.6)\u3002
-CHKJ2439.cb.m.ejb20=CHKJ2439W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.6)\u3002
-CHKJ2439.bb.m.ejb20=CHKJ2439W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.6)\u3002
-
-CHKJ2500.ejbHome.cb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.6)\u3002
-CHKJ2500.ejbHome.bb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.6)\u3002
-CHKJ2500.ejbHome.cb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.6)\u3002
-CHKJ2500.ejbHome.bb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.6)\u3002
-
-CHKJ2503.ejbHome.cb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.6\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbHome.bb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.6\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbHome.cb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.6\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbHome.bb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.6\u300118.3.8\u300118.6)\u3002
-
-# ejbFind
-CHKJ2457.bb.i.ejb20=CHKJ2457W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 12.2.5)\u3002
-CHKJ2457.bb.m.ejb20=CHKJ2457W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2458.bb.i.ejb20=CHKJ2458W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.5)\u3002
-CHKJ2458.bb.m.ejb20=CHKJ2458W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2459.bb.i.ejb20=CHKJ2459W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.5)\u3002
-CHKJ2459.bb.m.ejb20=CHKJ2459W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2500.ejbFind.bb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {1} \u4e0a\u7684 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.5)\u3002
-CHKJ2500.ejbFind.bb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2407.bb.i.ejb20=CHKJ2407W: {0} \u5fc5\u9808\u50b3\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 12.2.5)\u3002
-CHKJ2407.bb.m.ejb20=CHKJ2407W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 12.2.5)\u3002
-
-CHKJ2503.ejbFind.bb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.5\u300118.3.8\u300118.6)\u3002
-CHKJ2503.ejbFind.bb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.5\u300118.3.8\u300118.6)\u3002
-
-CHKJ2498.bb.i.ejb20=CHKJ2498W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2498.bb.m.ejb20=CHKJ2498W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-
-
-#
-# methods which must not exist
-#
-CHKJ2502.ejbFind.cb.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u5132\u5b58\u5668\u63d0\u4f9b\u9019\u500b\u65b9\u6cd5\u5be6\u4f5c (EJB 2.0: 10.5.2\u300110.6.2)\u3002
-CHKJ2502.ejbFind.cb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u5132\u5b58\u5668\u63d0\u4f9b\u9019\u500b\u65b9\u6cd5\u5be6\u4f5c (EJB 2.0: 10.5.2\u300110.6.2)\u3002
-
-CHKJ2502.ejbSelect.bb.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u50c5 CMP Bean \u53ef\u4ee5\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 12.1.5)\u3002
-CHKJ2502.ejbSelect.bb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u50c5 CMP Bean \u53ef\u4ee5\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 12.1.5)\u3002
-CHKJ2502.ejbSelect.sfb.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u50c5 CMP Bean \u53ef\u4ee5\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.6.1)\u3002
-CHKJ2502.ejbSelect.sfb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u50c5 CMP Bean \u53ef\u4ee5\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.6.1)\u3002
-CHKJ2502.ejbSelect.ssb.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u50c5 CMP Bean \u53ef\u4ee5\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.8.2)\u3002
-CHKJ2502.ejbSelect.ssb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728\u3002\u50c5 CMP Bean \u53ef\u4ee5\u5177\u6709 ejbSelect \u65b9\u6cd5 (EJB 2.0: 7.8.2)\u3002
-CHKJ2502.ejbSelect.crh.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-CHKJ2502.ejbSelect.crh.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-CHKJ2502.ejbSelect.clh.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-CHKJ2502.ejbSelect.clh.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-CHKJ2502.ejbSelect.crc.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-CHKJ2502.ejbSelect.crc.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-CHKJ2502.ejbSelect.clc.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-CHKJ2502.ejbSelect.clc.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.5.2\u300110.5.7)\u3002
-
-# finalize
-CHKJ2502.finalize.cb.i.ejb20=CHKJ2502I: finalize() \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.6.2)\u3002
-CHKJ2502.finalize.cb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 10.6.2)\u3002
-CHKJ2502.finalize.mb.i.ejb20=CHKJ2502I: finalize() \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 15.7.2)\u3002
-CHKJ2502.finalize.mb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 15.7.2)\u3002
-CHKJ2502.finalize.bb.i.ejb20=CHKJ2502I: finalize() \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 12.2.2)\u3002
-CHKJ2502.finalize.bb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 12.2.2)\u3002
-CHKJ2502.finalize.sb.i.ejb20=CHKJ2502I: finalize() \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 7.10.2)\u3002
-CHKJ2502.finalize.sb.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 7.10.2)\u3002
-
-CHKJ2502.slh.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 7.10.8)\u3002
-CHKJ2502.slh.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 7.10.8)\u3002
-CHKJ2502.srh.i.ejb20=CHKJ2502I: {0} \u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 7.10.6)\u3002
-CHKJ2502.srh.m.ejb20=CHKJ2502I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5b58\u5728 (EJB 2.0: 7.10.6)\u3002
-
-
-# business
-CHKJ2411.sb.i.ejb20=CHKJ2411W: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "ejb" (EJB 2.0: 7.10.4)\u3002
-CHKJ2411.cb.i.ejb20=CHKJ2411W: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "ejb" (EJB 2.0: 10.6.8)\u3002
-CHKJ2411.bb.i.ejb20=CHKJ2411W: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "ejb" (EJB 2.0: 12.2.7)\u3002
-CHKJ2411.sb.m.ejb20=CHKJ2411W: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "ejb" (EJB 2.0: 7.10.4)\u3002
-CHKJ2411.cb.m.ejb20=CHKJ2411W: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "ejb" (EJB 2.0: 10.6.8)\u3002
-CHKJ2411.bb.m.ejb20=CHKJ2411W: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "ejb" (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2441.sb.i.ejb20=CHKJ2441W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 7.10.4)\u3002
-CHKJ2441.cb.i.ejb20=CHKJ2441W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.6.8)\u3002
-CHKJ2441.bb.i.ejb20=CHKJ2441W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 12.2.7)\u3002
-CHKJ2441.sb.m.ejb20=CHKJ2441W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 7.10.4)\u3002
-CHKJ2441.cb.m.ejb20=CHKJ2441W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 10.6.8)\u3002
-CHKJ2441.bb.m.ejb20=CHKJ2441W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2442.sb.i.ejb20=CHKJ2442W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 7.10.4)\u3002
-CHKJ2442.cb.i.ejb20=CHKJ2442W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.6.8)\u3002
-CHKJ2442.bb.i.ejb20=CHKJ2442W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.7)\u3002
-CHKJ2442.sb.m.ejb20=CHKJ2442W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 7.10.4)\u3002
-CHKJ2442.cb.m.ejb20=CHKJ2442W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 10.6.8)\u3002
-CHKJ2442.bb.m.ejb20=CHKJ2442W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2443.sb.i.ejb20=CHKJ2443W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 7.10.4)\u3002
-CHKJ2443.cb.i.ejb20=CHKJ2443W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.8)\u3002
-CHKJ2443.bb.i.ejb20=CHKJ2443W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.7)\u3002
-CHKJ2443.sb.m.ejb20=CHKJ2443W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 7.10.4)\u3002
-CHKJ2443.cb.m.ejb20=CHKJ2443W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 10.6.8)\u3002
-CHKJ2443.bb.m.ejb20=CHKJ2443W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2500.bus.sb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.4)\u3002
-CHKJ2500.bus.cb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.8)\u3002
-CHKJ2500.bus.bb.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.7)\u3002
-CHKJ2500.bus.sb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.4)\u3002
-CHKJ2500.bus.cb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.8)\u3002
-CHKJ2500.bus.bb.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.7)\u3002
-
-CHKJ2503.bus.sb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.4\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.cb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.8\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.bb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.7\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.sb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.4\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.cb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.8\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.bb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.7\u300118.3.8\u300118.6)\u3002
-
-# onMessage
-CHKJ2503.onMessage.mb.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 15.4.10\u300118.3.8\u300118.6)\u3002
-CHKJ2503.onMessage.mb.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 15.4.10\u300118.3.8\u300118.6)\u3002
-
-CHKJ2445.mb.i.ejb20=CHKJ2445W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 15.7.4)\u3002
-CHKJ2445.mb.m.ejb20=CHKJ2445W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 15.7.4)\u3002
-
-CHKJ2446.mb.i.ejb20=CHKJ2446W: {0} \u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 15.7.4)\u3002
-CHKJ2446.mb.m.ejb20=CHKJ2446W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f final (EJB 2.0: 15.7.4)\u3002
-
-CHKJ2447.mb.i.ejb20=CHKJ2447W: {0} \u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 15.7.4)\u3002
-CHKJ2447.mb.m.ejb20=CHKJ2447W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u662f static (EJB 2.0: 15.7.4)\u3002
-
-CHKJ2505.onMessage.mb.i.ejb20=CHKJ2505W: {0} \u5fc5\u9808\u50b3\u56de void (EJB 2.0: 15.7.4)\u3002
-CHKJ2505.onMessage.mb.m.ejb20=CHKJ2505W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de void (EJB 2.0: 15.7.4)\u3002
-
-# accessor method
-CHKJ2449.cb.i.ejb20=CHKJ2449W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.3.1)\u3002
-CHKJ2449.cb.m.ejb20=CHKJ2449W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2450.cb.i.ejb20=CHKJ2450W: {0} \u5fc5\u9808\u662f abstract (EJB 2.0: 10.3.1\u300110.6.2)\u3002
-CHKJ2450.cb.m.ejb20=CHKJ2450W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f abstract (EJB 2.0: 10.3.1\u300110.6.2)\u3002
-
-# get & set methods of cmr fields
-CHKJ2473.crc.i.ejb20=CHKJ2473W: \u4e0d\u53ef\u4ee5\u5916\u66dd {0} (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-CHKJ2473.crc.m.ejb20=CHKJ2473W: \u4e0d\u53ef\u4ee5\u5916\u66dd\u9019\u500b\u65b9\u6cd5 (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-CHKJ2473.crh.i.ejb20=CHKJ2473W: \u4e0d\u53ef\u4ee5\u5916\u66dd {0} (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-CHKJ2473.crh.m.ejb20=CHKJ2473W: \u4e0d\u53ef\u4ee5\u5916\u66dd\u9019\u500b\u65b9\u6cd5 (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-
-# home
-CHKJ2461.home.brh.ejb20=CHKJ2461W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u9075\u5faa\u9060\u7aef\u4ecb\u9762\u7684 RMI-IIOP \u898f\u5247 (EJB 2.0: 12.2.9)\u3002
-CHKJ2461.home.crh.ejb20=CHKJ2461W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u9075\u5faa\u9060\u7aef\u4ecb\u9762\u7684 RMI-IIOP \u898f\u5247 (EJB 2.0: 10.6.10)\u3002
-CHKJ2461.home.srh.ejb20=CHKJ2461W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u9075\u5faa\u9060\u7aef\u4ecb\u9762\u7684 RMI-IIOP \u898f\u5247 (EJB 2.0: 7.10.6)\u3002
-
-CHKJ2462.clh.i.ejb20=CHKJ2462I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2462.brh.i.ejb20=CHKJ2462I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2462.crh.i.ejb20=CHKJ2462I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.6.4\u300110.6.12)\u3002
-CHKJ2462.blh.i.ejb20=CHKJ2462I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.5.4\u300112.2.11)\u3002
-CHKJ2462.clh.m.ejb20=CHKJ2462I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2462.brh.m.ejb20=CHKJ2462I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2462.crh.m.ejb20=CHKJ2462I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.6.4\u300110.6.12)\u3002
-CHKJ2462.blh.m.ejb20=CHKJ2462I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "create" (EJB 2.0: 9.5.4\u300112.2.11)\u3002
-
-CHKJ2463.clh.i.ejb20=CHKJ2463I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2463.brh.i.ejb20=CHKJ2463I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2463.crh.i.ejb20=CHKJ2463I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.6.4\u300110.6.12)\u3002
-CHKJ2463.blh.i.ejb20=CHKJ2463I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.5.4\u300112.2.11)\u3002
-CHKJ2463.clh.m.ejb20=CHKJ2463I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2463.brh.m.ejb20=CHKJ2463I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2463.crh.m.ejb20=CHKJ2463I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.6.4\u300110.6.12)\u3002
-CHKJ2463.blh.m.ejb20=CHKJ2463I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "find" (EJB 2.0: 9.5.4\u300112.2.11)\u3002
-
-CHKJ2464.clh.i.ejb20=CHKJ2464I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2464.brh.i.ejb20=CHKJ2464I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2464.crh.i.ejb20=CHKJ2464I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.6.4\u300110.6.12)\u3002
-CHKJ2464.blh.i.ejb20=CHKJ2464I: \u65b9\u6cd5 {0} \u7684\u540d\u7a31\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.5.4\u300112.2.11)\u3002
-CHKJ2464.clh.m.ejb20=CHKJ2464I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2464.brh.m.ejb20=CHKJ2464I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2464.crh.m.ejb20=CHKJ2464I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.6.4\u300110.6.12)\u3002
-CHKJ2464.blh.m.ejb20=CHKJ2464I: \u9019\u500b\u65b9\u6cd5\u540d\u7a31\u7684\u958b\u982d\u4e0d\u80fd\u662f "remove" (EJB 2.0: 9.5.4\u300112.2.11)\u3002
-
-CHKJ2503.home.brh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2503.home.crh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2503.home.srh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.home.blh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4\u300112.2.11\u300118.3.8\u300118.6)\u3002
-CHKJ2503.home.clh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4\u300110.6.12\u300118.3.8\u300118.6)\u3002
-CHKJ2503.home.slh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8\u300118.3.8\u300118.6)\u3002
-CHKJ2503.home.brh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2503.home.crh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2503.home.srh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.home.blh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4\u300112.2.11\u300118.3.8\u300118.6)\u3002
-CHKJ2503.home.clh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.4\u300110.6.12\u300118.3.8\u300118.6)\u3002
-CHKJ2503.home.slh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8\u300118.3.8\u300118.6)\u3002
-
-
-# create
-CHKJ2503.create.brh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1\u300112.2.9)\u3002
-CHKJ2503.create.crh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1\u300110.6.10)\u3002
-CHKJ2503.create.srh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.create.blh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1\u300112.2.11\u300118.3.8\u300118.6)\u3002
-CHKJ2503.create.clh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1\u300110.6.12\u300118.3.8\u300118.6)\u3002
-CHKJ2503.create.slh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8\u300118.3.8\u300118.6)\u3002
-CHKJ2503.create.brh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1\u300112.2.9)\u3002
-CHKJ2503.create.crh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.1\u300110.6.10)\u3002
-CHKJ2503.create.srh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.create.blh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1\u300112.2.11\u300118.3.8\u300118.6)\u3002
-CHKJ2503.create.clh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.1\u300110.6.12\u300118.3.8\u300118.6)\u3002
-CHKJ2503.create.slh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8\u300118.3.8\u300118.6)\u3002
-
-CHKJ2467.srh.i.ejb20=CHKJ2467W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.6)\u3002
-CHKJ2467.slh.i.ejb20=CHKJ2467W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.8)\u3002
-CHKJ2467.crh.i.ejb20=CHKJ2467W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1\u300110.6.10)\u3002
-CHKJ2467.clh.i.ejb20=CHKJ2467W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1\u300110.6.12)\u3002
-CHKJ2467.brh.i.ejb20=CHKJ2467W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1\u300112.2.9)\u3002
-CHKJ2467.blh.i.ejb20=CHKJ2467W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1\u300112.2.11)\u3002
-CHKJ2467.srh.m.ejb20=CHKJ2467W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.6)\u3002
-CHKJ2467.slh.m.ejb20=CHKJ2467W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 7.10.8)\u3002
-CHKJ2467.crh.m.ejb20=CHKJ2467W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1\u300110.6.10)\u3002
-CHKJ2467.clh.m.ejb20=CHKJ2467W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1\u300110.6.12)\u3002
-CHKJ2467.brh.m.ejb20=CHKJ2467W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.5.1\u300112.2.9)\u3002
-CHKJ2467.blh.m.ejb20=CHKJ2467W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.CreateException (EJB 2.0: 9.6.1\u300112.2.11)\u3002
-
-CHKJ2402.sfrh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 6.3.1\u30017.10.6)\u3002
-CHKJ2402.sflh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 6.4.1\u30017.10.8)\u3002
-CHKJ2402.ssrh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 6.3.1\u30017.8\u30017.10.6)\u3002
-CHKJ2402.sslh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 6.4.1\u30017.8\u30017.10.8)\u3002
-CHKJ2402.crh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.5.1\u300110.6.10)\u3002
-CHKJ2402.clh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.6.1\u300110.6.12)\u3002
-CHKJ2402.brh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.5.1\u300112.2.9)\u3002
-CHKJ2402.blh.i.ejb20=CHKJ2402E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.6.1\u300112.2.11)\u3002
-CHKJ2402.sfrh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 6.3.1\u30017.10.6)\u3002
-CHKJ2402.sflh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 6.4.1\u30017.10.8)\u3002
-CHKJ2402.ssrh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 6.3.1\u30017.8\u30017.10.6)\u3002
-CHKJ2402.sslh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 6.4.1\u30017.8\u30017.10.8)\u3002
-CHKJ2402.crh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.5.1\u300110.6.10)\u3002
-CHKJ2402.clh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.6.1\u300110.6.12)\u3002
-CHKJ2402.brh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.5.1\u300112.2.9)\u3002
-CHKJ2402.blh.m.ejb20=CHKJ2402E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.6.1\u300112.2.11)\u3002
-
-CHKJ2476.srh.i.ejb20=CHKJ2476E: {0} \u5fc5\u9808\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8\u30017.10.6)\u3002
-CHKJ2476.slh.i.ejb20=CHKJ2476E: {0} \u5fc5\u9808\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8\u30017.10.8)\u3002
-CHKJ2476.srh.m.ejb20=CHKJ2476E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8\u30017.10.6)\u3002
-CHKJ2476.slh.m.ejb20=CHKJ2476E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f create() \u65b9\u6cd5 (EJB 2.0: 7.8\u30017.10.8)\u3002
-CHKJ2476.ssb.i.ejb20=CHKJ2476E: {0} \u5fc5\u9808\u662f ejbCreate() \u65b9\u6cd5 (EJB 2.0: 7.8)\u3002
-CHKJ2476.ssb.m.ejb20=CHKJ2476E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f ejbCreate() \u65b9\u6cd5 (EJB 2.0: 7.8)\u3002
-
-
-# remote create
-CHKJ2504.create.srh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 7.10.6)\u3002
-CHKJ2504.create.slh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 7.10.8)\u3002
-CHKJ2504.create.crh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 10.6.10)\u3002
-CHKJ2504.create.clh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 10.6.12)\u3002
-CHKJ2504.create.brh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.create.blh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.create.srh.m.ejb20=CHKJ2504W: {0} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 7.10.6)\u3002
-CHKJ2504.create.slh.m.ejb20=CHKJ2504W: {0} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 7.10.8)\u3002
-CHKJ2504.create.crh.m.ejb20=CHKJ2504W: {0} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.6.10)\u3002
-CHKJ2504.create.clh.m.ejb20=CHKJ2504W: {0} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.6.12)\u3002
-CHKJ2504.create.brh.m.ejb20=CHKJ2504W: {0} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.create.blh.m.ejb20=CHKJ2504W: {0} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.11)\u3002
-
-CHKJ2500.create.srh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.create.crh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2500.create.brh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2500.create.srh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.create.crh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2500.create.brh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-
-# home method
-CHKJ2504.home.crh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 10.5.2\u300110.6.10)\u3002
-CHKJ2504.home.clh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 10.5.2\u300110.6.12)\u3002
-CHKJ2504.home.brh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.home.blh.i.ejb20=CHKJ2504W: {0} \u7684 {1} \u76f8\u7b26\u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {2} (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.home.crh.m.ejb20=CHKJ2504W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.5.2\u300110.6.10)\u3002
-CHKJ2504.home.clh.m.ejb20=CHKJ2504W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.5.2\u300110.6.12)\u3002
-CHKJ2504.home.brh.m.ejb20=CHKJ2504W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.home.blh.m.ejb20=CHKJ2504W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.11)\u3002
-
-
-# find method
-CHKJ2503.find.brh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2503.find.crh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2503.find.srh.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.find.blh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2\u300112.2.11\u300118.3.8\u300118.6)\u3002
-CHKJ2503.find.clh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2\u300110.6.12\u300118.3.8\u300118.6)\u3002
-CHKJ2503.find.slh.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8\u300118.3.8\u300118.6)\u3002
-CHKJ2503.find.brh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2503.find.crh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2503.find.srh.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.6)\u3002
-CHKJ2503.find.blh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2\u300112.2.11\u300118.3.8\u300118.6)\u3002
-CHKJ2503.find.clh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.6.2\u300110.6.12\u300118.3.8\u300118.6)\u3002
-CHKJ2503.find.slh.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.8\u300118.3.8\u300118.6)\u3002
-
-CHKJ2477.crh.i.ejb20=CHKJ2477W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2477.brh.i.ejb20=CHKJ2477W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2\u300112.2.11)\u3002
-CHKJ2477.clh.i.ejb20=CHKJ2477W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2477.blh.i.ejb20=CHKJ2477W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2\u300110.6.12)\u3002
-CHKJ2477.crh.m.ejb20=CHKJ2477W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2477.brh.m.ejb20=CHKJ2477W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2\u300112.2.11)\u3002
-CHKJ2477.clh.m.ejb20=CHKJ2477W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2477.blh.m.ejb20=CHKJ2477W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 9.6.2\u300110.6.12)\u3002
-
-CHKJ2478.crh.i.ejb20=CHKJ2478I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.crh.m.ejb20=CHKJ2478I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.clh.i.ejb20=CHKJ2478I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.clh.m.ejb20=CHKJ2478I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.brh.i.ejb20=CHKJ2478I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.brh.m.ejb20=CHKJ2478I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.blh.i.ejb20=CHKJ2478I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.blh.m.ejb20=CHKJ2478I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.cb.i.ejb20=CHKJ2478I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.cb.m.ejb20=CHKJ2478I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 10.5.8.4)\u3002
-CHKJ2478.bb.i.ejb20=CHKJ2478I: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-CHKJ2478.bb.m.ejb20=CHKJ2478I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa ObjectNotFoundException (EJB 2.0: 12.1.8.4)\u3002
-
-CHKJ2403.brh.i.ejb20=CHKJ2403W: {0} \u5fc5\u9808\u50b3\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2\u300112.1.7\u300112.2.9)\u3002
-CHKJ2403.blh.i.ejb20=CHKJ2403W: {0} \u5fc5\u9808\u50b3\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2\u300112.1.7\u300112.2.11)\u3002
-CHKJ2403.crh.i.ejb20=CHKJ2403W: {0} \u5fc5\u9808\u50b3\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2\u300110.5.6\u300110.6.10\u300111.2.2)\u3002
-CHKJ2403.clh.i.ejb20=CHKJ2403W: {0} \u5fc5\u9808\u50b3\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2\u300110.5.6\u300110.6.12\u300111.2.2)\u3002
-CHKJ2403.brh.m.ejb20=CHKJ2403W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2\u300112.1.7\u300112.2.9)\u3002
-CHKJ2403.blh.m.ejb20=CHKJ2403W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2\u300112.1.7\u300112.2.11)\u3002
-CHKJ2403.crh.m.ejb20=CHKJ2403W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.5.2\u300110.5.6\u300110.6.10\u300111.2.2)\u3002
-CHKJ2403.clh.m.ejb20=CHKJ2403W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 9.6.2\u300110.5.6\u300110.6.12\u300111.2.2)\u3002
-
-# remote find
-CHKJ2504.find.brh.i.ejb20=CHKJ2504W: {1} \u5fc5\u9808\u5b58\u5728\u65bc {0} \u7684 {2} (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.find.crh.i.ejb20=CHKJ2504W: {1} \u5fc5\u9808\u5b58\u5728\u65bc {0} \u7684 {2} (EJB 2.0: 10.6.10)\u3002
-CHKJ2504.find.brh.m.ejb20=CHKJ2504W: {0} \u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.9)\u3002
-CHKJ2504.find.crh.m.ejb20=CHKJ2504W: {0} \u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.6.10)\u3002
-
-# local find
-CHKJ2504.find.blh.i.ejb20=CHKJ2504W: {1} \u5fc5\u9808\u5b58\u5728\u65bc {0} \u7684 {2} (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.find.clh.i.ejb20=CHKJ2504W: {1} \u5fc5\u9808\u5b58\u5728\u65bc {0} \u7684 {2} (EJB 2.0: 10.6.2)\u3002
-CHKJ2504.find.blh.m.ejb20=CHKJ2504W: {0} \u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.11)\u3002
-CHKJ2504.find.clh.m.ejb20=CHKJ2504W: {0} \u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.6.2)\u3002
-
-
-CHKJ2500.find.srh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.find.crh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2500.find.brh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2500.find.srh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.find.crh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2500.find.brh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-
-CHKJ2495.clh.i.ejb20=CHKJ2495I: {0} \u5fc5\u9808\u8207 ejb-jar.xml \u4e2d\u7684\u67e5\u8a62\u5143\u7d20\u5efa\u7acb\u95dc\u806f\u6027 (EJB 2.0: 10.5.6\u300110.6.14)\u3002
-CHKJ2495.clh.m.ejb20=CHKJ2495I: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u8207 ejb-jar.xml \u4e2d\u7684\u67e5\u8a62\u5143\u7d20\u5efa\u7acb\u95dc\u806f\u6027 (EJB 2.0: 10.5.6\u300110.6.14)\u3002
-CHKJ2495.crh.i.ejb20=CHKJ2495I: {0} \u5fc5\u9808\u8207 ejb-jar.xml \u4e2d\u7684\u67e5\u8a62\u5143\u7d20\u5efa\u7acb\u95dc\u806f\u6027 (EJB 2.0: 10.5.6\u300110.6.14)\u3002
-CHKJ2495.crh.m.ejb20=CHKJ2495I: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u8207 ejb-jar.xml \u4e2d\u7684\u67e5\u8a62\u5143\u7d20\u5efa\u7acb\u95dc\u806f\u6027 (EJB 2.0: 10.5.6\u300110.6.14)\u3002
-
-
-# method on a component interface
-CHKJ2503.bus.src.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.5)\u3002
-CHKJ2503.bus.slc.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.7\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.brc.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.8)\u3002
-CHKJ2503.bus.blc.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.10\u300112.2.10\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.crc.i.ejb20=CHKJ2503E: {0} \u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.9)\u3002
-CHKJ2503.bus.clc.i.ejb20=CHKJ2503W: {0} \u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.10\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.src.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.5)\u3002
-CHKJ2503.bus.slc.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 7.10.7\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.brc.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 12.2.8)\u3002
-CHKJ2503.bus.blc.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.10\u300112.2.10\u300118.3.8\u300118.6)\u3002
-CHKJ2503.bus.crc.m.ejb20=CHKJ2503E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 10.6.9)\u3002
-CHKJ2503.bus.clc.m.ejb20=CHKJ2503W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u64f2\u51fa java.rmi.RemoteException (EJB 2.0: 9.10\u300118.3.8\u300118.6)\u3002
-
-# method on a home interface
-CHKJ2465.brh.i.ejb20=CHKJ2465W: {0} \u5fc5\u9808\u70ba {2} \u64f2\u51fa {1} (EJB 2.0: 12.2.9)\u3002
-CHKJ2465.blh.i.ejb20=CHKJ2465W: {0} \u5fc5\u9808\u70ba {2} \u64f2\u51fa {1} (EJB 2.0: 12.2.11)\u3002
-CHKJ2465.crh.i.ejb20=CHKJ2465W: {0} \u5fc5\u9808\u70ba {2} \u64f2\u51fa {1} (EJB 2.0: 10.6.10)\u3002
-CHKJ2465.clh.i.ejb20=CHKJ2465W: {0} \u5fc5\u9808\u70ba {2} \u64f2\u51fa {1} (EJB 2.0: 10.6.12)\u3002
-CHKJ2465.srh.i.ejb20=CHKJ2465W: {0} \u5fc5\u9808\u70ba {2} \u64f2\u51fa {1} (EJB 2.0: 7.10.6)\u3002
-CHKJ2465.slh.i.ejb20=CHKJ2465W: {0} \u5fc5\u9808\u70ba {2} \u64f2\u51fa {1} (EJB 2.0: 7.10.8)\u3002
-CHKJ2465.brh.m.ejb20=CHKJ2465W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u70ba {1} \u64f2\u51fa {0} (EJB 2.0: 12.2.9)\u3002
-CHKJ2465.blh.m.ejb20=CHKJ2465W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u70ba {1} \u64f2\u51fa {0} (EJB 2.0: 12.2.11)\u3002
-CHKJ2465.crh.m.ejb20=CHKJ2465W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u70ba {1} \u64f2\u51fa {0} (EJB 2.0: 10.6.10)\u3002
-CHKJ2465.clh.m.ejb20=CHKJ2465W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u70ba {1} \u64f2\u51fa {0} (EJB 2.0: 10.6.12)\u3002
-CHKJ2465.srh.m.ejb20=CHKJ2465W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u70ba {1} \u64f2\u51fa {0} (EJB 2.0: 7.10.6)\u3002
-CHKJ2465.slh.m.ejb20=CHKJ2465W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u70ba {1} \u64f2\u51fa {0} (EJB 2.0: 7.10.8)\u3002
-
-# method on a remote home
-CHKJ2500.home.srh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.home.crh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2500.home.brh.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-CHKJ2500.home.srh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.6)\u3002
-CHKJ2500.home.crh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300110.6.10)\u3002
-CHKJ2500.home.brh.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 9.5.4\u300112.2.9)\u3002
-
-CHKJ2466.src.i.ejb20=CHKJ2466I: {0} \u4e0d\u53ef\u4ee5\u5916\u66dd {1} \u985e\u578b (EJB 2.0: 7.10.5)\u3002
-CHKJ2466.crh.i.ejb20=CHKJ2466I: {0} \u4e0d\u53ef\u4ee5\u5916\u66dd {1} \u985e\u578b (EJB 2.0: 10.6.10)\u3002
-CHKJ2466.brh.i.ejb20=CHKJ2466I: {0} \u4e0d\u53ef\u4ee5\u5916\u66dd {1} \u985e\u578b (EJB 2.0: 12.2.9)\u3002
-CHKJ2466.crh.m.ejb20=CHKJ2466I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5916\u66dd {0} \u985e\u578b (EJB 2.0: 10.6.10)\u3002
-CHKJ2466.brh.m.ejb20=CHKJ2466I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5916\u66dd {0} \u985e\u578b (EJB 2.0: 12.2.9)\u3002
-CHKJ2466.src.m.ejb20=CHKJ2466I: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5916\u66dd {0} \u985e\u578b (EJB 2.0: 7.10.5)\u3002
-
-# method on a remote component
-CHKJ2468.src.ejb20=CHKJ2468W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u9075\u5faa\u9060\u7aef\u4ecb\u9762\u7684 RMI-IIOP \u898f\u5247 (EJB 2.0: 7.10.5)\u3002
-CHKJ2468.crc.ejb20=CHKJ2468W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u9075\u5faa\u9060\u7aef\u4ecb\u9762\u7684 RMI-IIOP \u898f\u5247 (EJB 2.0: 10.6.9)\u3002
-CHKJ2468.brc.ejb20=CHKJ2468W: \u9019\u500b\u4ecb\u9762\u5fc5\u9808\u9075\u5faa\u9060\u7aef\u4ecb\u9762\u7684 RMI-IIOP \u898f\u5247 (EJB 2.0: 12.2.8)\u3002
-
-CHKJ2500.bus.src.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {1} \u4e2d\u7684 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.5)\u3002
-CHKJ2500.bus.crc.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {1} \u4e2d\u7684 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.9)\u3002
-CHKJ2500.bus.brc.i.ejb20=CHKJ2500I: \u65b9\u6cd5 {1} \u4e2d\u7684 {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.8)\u3002
-CHKJ2500.bus.src.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 7.10.5)\u3002
-CHKJ2500.bus.crc.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 10.6.9)\u3002
-CHKJ2500.bus.brc.m.ejb20=CHKJ2500I: {0} \u5fc5\u9808\u53ef\u5728\u57f7\u884c\u6642\u671f\u5e8f\u5217\u5316 (EJB 2.0: 12.2.8)\u3002
-
-CHKJ2472.srh.i.ejb20=CHKJ2472W: \u65b9\u6cd5 {0} \u4e2d\u7684 {1} \u4e0d\u80fd\u662f\u5f15\u6578\u6216\u7d50\u679c\u985e\u578b (EJB 2.0: 6.7.2)\u3002
-CHKJ2472.brc.i.ejb20=CHKJ2472W: {0} \u4e0d\u53ef\u4ee5\u50b3\u905e {1} \u7576\u4f5c\u5f15\u6578\u6216\u7d50\u679c (EJB 2.0: 9.7.2\u300112.2.8)\u3002
-CHKJ2472.crc.i.ejb20=CHKJ2472W: {0} \u4e0d\u53ef\u4ee5\u50b3\u905e {1} \u7576\u4f5c\u5f15\u6578\u6216\u7d50\u679c (EJB 2.0: 9.7.2\u300110.3.1\u300110.3.10.1)\u3002
-CHKJ2472.brc.m.ejb20=CHKJ2472W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u50b3\u905e {0} \u7576\u4f5c\u5f15\u6578\u6216\u7d50\u679c (EJB 2.0: 9.7.2\u300112.2.8)\u3002
-CHKJ2472.crc.m.ejb20=CHKJ2472W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u50b3\u905e {0} \u7576\u4f5c\u5f15\u6578\u6216\u7d50\u679c (EJB 2.0: 9.7.2\u300110.3.1\u300110.3.10.1)\u3002
-CHKJ2472.srh.m.ejb20=CHKJ2472W: {0} \u4e0d\u80fd\u662f\u5f15\u6578\u6216\u7d50\u679c\u985e\u578b (EJB 2.0: 6.7.2)\u3002
-
-# method on a remote component CMP
-CHKJ2474.crc.i.ejb20=CHKJ2474W: {0} \u4e0d\u53ef\u4ee5\u5916\u66dd {1} (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-CHKJ2474.crc.m.ejb20=CHKJ2474W: \u9019\u500b\u65b9\u6cd5\u4e0d\u53ef\u4ee5\u5916\u66dd {0} (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-
-CHKJ2490.crc.i.ejb20=CHKJ2490W: \u4e0d\u53ef\u4ee5\u5916\u66dd {0} (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-CJKJ2490.crc.m.ejb20=CHKJ2490W: \u4e0d\u53ef\u4ee5\u5916\u66dd\u9019\u500b\u65b9\u6cd5 (EJB 2.0: 10.3.1\u300110.3.10.1)\u3002
-
-# ejbSelect method
-CHKJ2485.cb.i.ejb20=CHKJ2485W: {0} \u5fc5\u9808\u662f abstract (EJB 2.0: 10.5.7\u300110.6.7)\u3002
-CHKJ2485.cb.m.ejb20=CHKJ2485W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f abstract (EJB 2.0: 10.5.7\u300110.6.7)\u3002
-
-CHKJ2487.cb.i.ejb20=CHKJ2487W: {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.6.7)\u3002
-CHKJ2487.cb.m.ejb20=CHKJ2487W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f public (EJB 2.0: 10.6.7)\u3002
-
-CHKJ2488.cb.i.ejb20=CHKJ2488W: {0} \u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 10.6.7)\u3002
-CHKJ2488.cb.m.ejb20=CHKJ2488W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa javax.ejb.FinderException (EJB 2.0: 10.6.7)\u3002
-
-CHKJ2486.cb.i.ejb20=CHKJ2486W: {0} \u5fc5\u9808\u50b3\u56de {1} \u6216\u5176\u96c6\u5408 (EJB 2.0: 10.5.7\u300111.2.2)\u3002
-CHKJ2486.cb.m.ejb20=CHKJ2486W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} \u6216\u5176\u96c6\u5408 (EJB 2.0: 10.5.7\u300111.2.2)\u3002
-
-CHKJ2496.cb.i.ejb20=CHKJ2496W: {0} \u5fc5\u9808\u8207 ejb-jar.xml \u4e2d\u7684\u67e5\u8a62\u5143\u7d20\u5efa\u7acb\u95dc\u806f\u6027 (EJB 2.0: 10.5.7\u300110.6.14)\u3002
-CHKJ2496.cb.m.ejb20=CHKJ2496W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u8207 ejb-jar.xml \u4e2d\u7684\u67e5\u8a62\u5143\u7d20\u5efa\u7acb\u95dc\u806f\u6027 (EJB 2.0: 10.5.7\u300110.6.14)\u3002
-
-# component matching method
-CHKJ2023.src.i.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u9700\u8981 {1} \u5b58\u5728\u65bc {2} (EJB 2.0: 7.10.5)\u3002
-CHKJ2023.slc.i.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u9700\u8981 {1} \u5b58\u5728\u65bc {2} (EJB 2.0: 7.10.7)\u3002
-CHKJ2023.brc.i.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u9700\u8981 {1} \u5b58\u5728\u65bc {2} (EJB 2.0: 12.2.8)\u3002
-CHKJ2023.blc.i.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u9700\u8981 {1} \u5b58\u5728\u65bc {2} (EJB 2.0: 12.2.10)\u3002
-CHKJ2023.crc.i.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u9700\u8981 {1} \u5b58\u5728\u65bc {2} (EJB 2.0: 10.6.9)\u3002
-CHKJ2023.clc.i.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u9700\u8981 {1} \u5b58\u5728\u65bc {2} (EJB 2.0: 10.6.11)\u3002
-CHKJ2023.src.m.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 7.10.5)\u3002
-CHKJ2023.slc.m.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 7.10.7)\u3002
-CHKJ2023.brc.m.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.8)\u3002
-CHKJ2023.blc.m.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 12.2.10)\u3002
-CHKJ2023.crc.m.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.6.9)\u3002
-CHKJ2023.clc.m.ejb20=CHKJ2023W: {0} \u65b9\u6cd5\u5fc5\u9808\u5b58\u5728\u65bc {1} (EJB 2.0: 10.6.11)\u3002
-
-CHKJ2470.src.i.ejb20=CHKJ2470E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 7.10.5)\u3002
-CHKJ2470.slc.i.ejb20=CHKJ2470E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 7.10.7)\u3002
-CHKJ2470.crc.i.ejb20=CHKJ2470E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 10.6.9)\u3002
-CHKJ2470.clc.i.ejb20=CHKJ2470E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 10.6.11)\u3002
-CHKJ2470.brc.i.ejb20=CHKJ2470E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 12.2.8)\u3002
-CHKJ2470.blc.i.ejb20=CHKJ2470E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 12.2.10)\u3002
-CHKJ2470.src.m.ejb20=CHKJ2470E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 7.10.5)\u3002
-CHKJ2470.slc.m.ejb20=CHKJ2470E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 7.10.7)\u3002
-CHKJ2470.crc.m.ejb20=CHKJ2470E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 10.6.9)\u3002
-CHKJ2470.clc.m.ejb20=CHKJ2470E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 10.6.11)\u3002
-CHKJ2470.brc.m.ejb20=CHKJ2470E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 12.2.8)\u3002
-CHKJ2470.blc.m.ejb20=CHKJ2470E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 12.2.10)\u3002
-
-CHKJ2471.src.i.ejb20=CHKJ2471W: {0} \u5fc5\u9808\u64f2\u51fa {1} (EJB 2.0: 7.10.5)\u3002
-CHKJ2471.slc.i.ejb20=CHKJ2471W: {0} \u5fc5\u9808\u64f2\u51fa {1} (EJB 2.0: 7.10.7)\u3002
-CHKJ2471.crc.i.ejb20=CHKJ2471W: {0} \u5fc5\u9808\u64f2\u51fa {1} (EJB 2.0: 10.6.9)\u3002
-CHKJ2471.clc.i.ejb20=CHKJ2471W: {0} \u5fc5\u9808\u64f2\u51fa {1} (EJB 2.0: 10.6.11)\u3002
-CHKJ2471.brc.i.ejb20=CHKJ2471W: {0} \u5fc5\u9808\u64f2\u51fa {1} (EJB 2.0: 12.2.8)\u3002
-CHKJ2471.blc.i.ejb20=CHKJ2471W: {0} \u5fc5\u9808\u64f2\u51fa {1} (EJB 2.0: 12.2.10)\u3002
-CHKJ2471.src.m.ejb20=CHKJ2471W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0} (EJB 2.0: 7.10.5)\u3002
-CHKJ2471.slc.m.ejb20=CHKJ2471W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0} (EJB 2.0: 7.10.7)\u3002
-CHKJ2471.crc.m.ejb20=CHKJ2471W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0} (EJB 2.0: 10.6.9)\u3002
-CHKJ2471.clc.m.ejb20=CHKJ2471W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0} (EJB 2.0: 10.6.11)\u3002
-CHKJ2471.brc.m.ejb20=CHKJ2471W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0} (EJB 2.0: 12.2.8)\u3002
-CHKJ2471.blc.m.ejb20=CHKJ2471W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u64f2\u51fa {0} (EJB 2.0: 12.2.10)\u3002
-
-# EJBObject, EJBLocalObject methods
-CHKJ2469.src.i.ejb20=CHKJ2469W: {0} \u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 6.5)\u3002
-CHKJ2469.slc.i.ejb20=CHKJ2469W: {0} \u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 6.5)\u3002
-CHKJ2469.crc.i.ejb20=CHKJ2469W: {0} \u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.9)\u3002
-CHKJ2469.clc.i.ejb20=CHKJ2469W: {0} \u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.10)\u3002
-CHKJ2469.brc.i.ejb20=CHKJ2469W: {0} \u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.9)\u3002
-CHKJ2469.blc.i.ejb20=CHKJ2469W: {0} \u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.10)\u3002
-CHKJ2469.src.m.ejb20=CHKJ2469W: \u9019\u500b\u65b9\u6cd5\u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 6.5)\u3002
-CHKJ2469.slc.m.ejb20=CHKJ2469W: \u9019\u500b\u65b9\u6cd5\u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 6.5)\u3002
-CHKJ2469.crc.m.ejb20=CHKJ2469W: \u9019\u500b\u65b9\u6cd5\u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.9)\u3002
-CHKJ2469.clc.m.ejb20=CHKJ2469W: \u9019\u500b\u65b9\u6cd5\u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.10)\u3002
-CHKJ2469.brc.m.ejb20=CHKJ2469W: \u9019\u500b\u65b9\u6cd5\u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.9)\u3002
-CHKJ2469.blc.m.ejb20=CHKJ2469W: \u9019\u500b\u65b9\u6cd5\u662f\u7531\u5132\u5b58\u5668\u63d0\u4f9b (EJB 2.0: 9.10)\u3002
-
-# findByPrimaryKey
-CHKJ2475.crh.i.ejb20=CHKJ2475W: {0} \u5fc5\u9808\u662f findByPrimaryKey({1}) (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2475.clh.i.ejb20=CHKJ2475W: {0} \u5fc5\u9808\u662f findByPrimaryKey({1}) (EJB 2.0: 9.6.2\u300110.6.12)\u3002
-CHKJ2475.crhd.i.ejb20=CHKJ2475W: {0} \u5fc5\u9808\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.clhd.i.ejb20=CHKJ2475W: {0} \u5fc5\u9808\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.brh.i.ejb20=CHKJ2475W: {0} \u5fc5\u9808\u662f findByPrimaryKey({1}) (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2475.blh.i.ejb20=CHKJ2475W: {0} \u5fc5\u9808\u662f findByPrimaryKey({1}) (EJB 2.0: 9.6.2\u300112.2.11)\u3002
-CHKJ2475.crh.m.ejb20=CHKJ2475W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f findByPrimaryKey({0}) (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2475.clh.m.ejb20=CHKJ2475W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f findByPrimaryKey({0}) (EJB 2.0: 9.6.2\u300110.6.12)\u3002
-CHKJ2475.crhd.m.ejb20=CHKJ2475W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.clhd.m.ejb20=CHKJ2475W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f findByPrimaryKey(Object) (EJB 2.0: 10.8.3)\u3002
-CHKJ2475.brh.m.ejb20=CHKJ2475W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f findByPrimaryKey({0}) (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2475.blh.m.ejb20=CHKJ2475W: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u662f findByPrimaryKey({0}) (EJB 2.0: 9.6.2\u300112.2.11)\u3002
-
-CHKJ2479.crh.i.ejb20=CHKJ2479E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2479.clh.i.ejb20=CHKJ2479E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.6.2\u300110.6.12)\u3002
-CHKJ2479.brh.i.ejb20=CHKJ2479E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2479.blh.i.ejb20=CHKJ2479E: {0} \u5fc5\u9808\u50b3\u56de {1} (EJB 2.0: 9.6.2\u300112.2.11)\u3002
-CHKJ2479.crh.m.ejb20=CHKJ2479E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.5.2\u300110.6.10)\u3002
-CHKJ2479.clh.m.ejb20=CHKJ2479E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.6.2\u300110.6.12)\u3002
-CHKJ2479.brh.m.ejb20=CHKJ2479E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.5.2\u300112.2.9)\u3002
-CHKJ2479.blh.m.ejb20=CHKJ2479E: \u9019\u500b\u65b9\u6cd5\u5fc5\u9808\u50b3\u56de {0} (EJB 2.0: 9.6.2\u300112.2.11)\u3002
-
-
-
-##################################################
-# field checks
-##################################################
-CHKJ2452.sb.i.ejb20=CHKJ2452W: \u66ab\u6642\u6027\u6b04\u4f4d {0} \u4e0d\u61c9\u662f {1} \u985e\u578b (EJB 2.0: 7.4.1)\u3002
-CHKJ2452.sb.m.ejb20=CHKJ2452W: \u66ab\u6642\u6027\u6b04\u4f4d\u4e0d\u61c9\u662f {0} \u985e\u578b (EJB 2.0: 7.4.1)\u3002
-
-CHKJ2453.sb.i.ejb20=CHKJ2453W: \u4e0d\u5141\u8a31\u66ab\u6642\u6027\u6b04\u4f4d ({0}) (EJB 2.0: 7.4.1)\u3002
-CHKJ2453.sb.m.ejb20=CHKJ2453W: \u4e0d\u5141\u8a31\u66ab\u6642\u6027\u6b04\u4f4d (EJB 2.0: 7.4.1)\u3002
-
-# CMR and CMP fields must NOT be defined on the bean class.
-CHKJ2454.cb.i.ejb20=CHKJ2454W: \u4e0d\u53ef\u4ee5\u5b9a\u7fa9 {0} (EJB 2.0: 10.3.1)\u3002
-CHKJ2454.cb.m.ejb20=CHKJ2454W: \u4e0d\u53ef\u4ee5\u5b9a\u7fa9 {0} (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2480.cb.i.ejb20=CHKJ2480I: {0} \u5fc5\u9808\u4ee5\u5c0f\u5beb\u5b57\u6bcd\u958b\u982d (EJB 2.0: 10.3.1)\u3002
-CHKJ2480.cb.m.ejb20=CHKJ2480I: {0} \u5fc5\u9808\u4ee5\u5c0f\u5beb\u5b57\u6bcd\u958b\u982d (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2481.cb.i.ejb20=CHKJ2481W: {0} \u5fc5\u9808\u5ba3\u544a\u70ba <cmp-field> (EJB 2.0: 10.3.1\u300110.3.13)\u3002
-CHKJ2481.cb.m.ejb20=CHKJ2481W: {0} \u5fc5\u9808\u5ba3\u544a\u70ba <cmp-field> (EJB 2.0: 10.3.1\u300110.3.13)\u3002
-
-CHKJ2482.cb.i.ejb20=CHKJ2482W: {0} \u5fc5\u9808\u5ba3\u544a\u70ba <cmr-field> (EJB 2.0: 10.3.1\u300110.3.13)\u3002
-CHKJ2482.cb.m.ejb20=CHKJ2482W: {0} \u5fc5\u9808\u5ba3\u544a\u70ba <cmr-field> (EJB 2.0: 10.3.1\u300110.3.13)\u3002
-
-CHKJ2483.cb.i.ejb20=CHKJ2483W: \u4e0d\u61c9\u5916\u66dd {0} (EJB 2.0: 10.3.1)\u3002
-CHKJ2483.cb.m.ejb20=CHKJ2483W: \u4e0d\u61c9\u5916\u66dd {0} (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2484.cb.i.ejb20=CHKJ2484W: {0} \u5fc5\u9808\u662f\u521d\u59cb\u7684\u6216\u53ef\u5e8f\u5217\u5316\u7684\u985e\u578b (EJB 2.0: 10.3.1)\u3002
-CHKJ2484.cb.m.ejb20=CHKJ2484W: {0} \u5fc5\u9808\u662f\u521d\u59cb\u7684\u6216\u53ef\u5e8f\u5217\u5316\u7684\u985e\u578b (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2489.cb.i.ejb20=CHKJ2489W: \u6b04\u4f4d {0} \u5fc5\u9808\u662f {1} \u985e\u578b (EJB 2.0: 10.8.1)\u3002
-CHKJ2489.cb.m.ejb20=CHKJ2489W: \u9019\u500b\u6b04\u4f4d\u5fc5\u9808\u662f {0} \u985e\u578b (EJB 2.0: 10.8.1)\u3002
-
-CHKJ2205.kc.i.ejb20=CHKJ2205W: \u6b04\u4f4d {0} \u5fc5\u9808\u662f public (EJB 2.0: 10.8.2)\u3002
-CHKJ2205.kc.m.ejb20=CHKJ2205W: \u9019\u500b\u6b04\u4f4d\u5fc5\u9808\u662f public (EJB 2.0: 10.8.2)\u3002
-
-CHKJ2206.kc.i.ejb20=CHKJ2206W: \u6b04\u4f4d {0} \u5fc5\u9808\u662f <cmp-field> (EJB 2.0: 10.8.2)\u3002
-CHKJ2206.kc.m.ejb20=CHKJ2206W: \u9019\u500b\u6b04\u4f4d\u5fc5\u9808\u662f <cmp-field> (EJB 2.0: 10.8.2)\u3002
-
-
-############################################################
-## DD
-############################################################
-CHKJ2880.s.ejb20=CHKJ2880W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local-home> (EJB 2.0: 7.10.1)\u3002
-CHKJ2881.s.ejb20=CHKJ2881W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <home> (EJB 2.0: 7.10.1)\u3002
-CHKJ2882.s.ejb20=CHKJ2882W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local> (EJB 2.0: 7.10.1)\u3002
-CHKJ2883.s.ejb20=CHKJ2883W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <remote> (EJB 2.0: 7.10.1)\u3002
-CHKJ2884.s.ejb20=CHKJ2884W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local-home> \u6216 <home> (EJB 2.0: 7.10.1)\u3002
-CHKJ2885.s.ejb20=CHKJ2885W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local> \u6216 <remote> (EJB 2.0: 7.10.1)\u3002
-CHKJ2880.c.ejb20=CHKJ2880W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local-home> (EJB 2.0: 10.6.1)\u3002
-CHKJ2881.c.ejb20=CHKJ2881W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <home> (EJB 2.0: 10.6.1)\u3002
-CHKJ2882.c.ejb20=CHKJ2882W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local> (EJB 2.0: 10.6.1)\u3002
-CHKJ2883.c.ejb20=CHKJ2883W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <remote> (EJB 2.0: 10.6.1)\u3002
-CHKJ2884.c.ejb20=CHKJ2884W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local-home> \u6216 <home> (EJB 2.0: 10.6.1)\u3002
-CHKJ2885.c.ejb20=CHKJ2885W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local> \u6216 <remote> (EJB 2.0: 10.6.1)\u3002
-CHKJ2880.b.ejb20=CHKJ2880W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local-home> (EJB 2.0: 12.2.1)\u3002
-CHKJ2881.b.ejb20=CHKJ2881W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <home> (EJB 2.0: 12.2.1)\u3002
-CHKJ2882.b.ejb20=CHKJ2882W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local> (EJB 2.0: 12.2.1)\u3002
-CHKJ2883.b.ejb20=CHKJ2883W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <remote> (EJB 2.0: 12.2.1)\u3002
-CHKJ2884.b.ejb20=CHKJ2884W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local-home> \u6216 <home> (EJB 2.0: 12.2.1)\u3002
-CHKJ2885.b.ejb20=CHKJ2885W: \u9019\u500b Bean \u5fc5\u9808\u63d0\u4f9b <local> \u6216 <remote> (EJB 2.0: 12.2.1)\u3002
-
-CHKJ2813.ejb20=CHKJ2813I: <ejb-name> {0} \u5fc5\u9808\u662f\u6709\u6548\u7684 Java \u8b58\u5225\u5b57 (EJB 2.0: 10.3.13\u300111.2.6.1)\u3002
-CHKJ2819.ejb20=CHKJ2819I: <abstract-schema-name> {0} \u5fc5\u9808\u662f\u6709\u6548\u7684 Java \u8b58\u5225\u5b57 (EJB 2.0: 10.3.13\u300110.6.14\u300111.2.6.1)\u3002
-CHKJ2854.ejb20=CHKJ2854E: <abstract-schema-name> {0} \u5fc5\u9808\u662f ejb-jar.xml \u6a94\u5167\u7684\u552f\u4e00 (EJB 2.0: 10.3.13\u300110.6.14\u300111.2.2)\u3002
-CHKJ2858.ejb20=CHKJ2858W: <abstract-schema-name> \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 22.2\u300122.5)\u3002
-CHKJ2859.ejb20=CHKJ2859W: \u4fdd\u7559 ID {0} \u4e0d\u80fd\u4f5c\u70ba <ejb-name> (EJB 2.0: 10.6.14\u300111.2.6.1)\u3002
-CHKJ2860.ejb20=CHKJ2860W: \u4fdd\u7559 ID {0} \u4e0d\u80fd\u4f5c\u70ba <abstract-schema-name> (EJB 2.0: 10.6.14\u300111.2.6.1)\u3002
-
-CHKJ2861.ejb20=CHKJ2861I: <cmp-field> {0} \u5fc5\u9808\u662f\u6709\u6548\u7684 Java \u8b58\u5225\u5b57\uff0c\u800c\u4e14\u4ee5\u5c0f\u5beb\u5b57\u6bcd\u958b\u982d (EJB 2.0: 10.3.1\u300111.2.6.1)\u3002
-CHKJ2857.ejb20=CHKJ2857I: <cmr-field> {0} \u5fc5\u9808\u662f\u6709\u6548\u7684 Java \u8b58\u5225\u5b57\uff0c\u800c\u4e14\u4ee5\u5c0f\u5beb\u5b57\u6bcd\u958b\u982d (EJB 2.0: 10.3.1\u300111.2.6.1)\u3002
-
-CHKJ2862.ejb20=CHKJ2862I: <cmp-field> {0} \u5fc5\u9808\u5177\u6709\u4e00\u500b set \u65b9\u6cd5 (EJB 2.0: 10.3.1\u300110.6.2)\u3002
-CHKJ2863.ejb20=CHKJ2863I: <cmp-field> {0} \u5fc5\u9808\u5177\u6709\u4e00\u500b get \u65b9\u6cd5 (EJB 2.0: 10.3.1\u300110.6.2)\u3002
-CHKJ2864.ejb20=CHKJ2864I: <cmr-field> {0} \u5fc5\u9808\u5177\u6709\u4e00\u500b set \u65b9\u6cd5 (EJB 2.0: 10.3.1\u300110.6.2)\u3002
-CHKJ2865.ejb20=CHKJ2865I: <cmr-field> {0} \u5fc5\u9808\u5177\u6709\u4e00\u500b get \u65b9\u6cd5 (EJB 2.0: 10.3.1\u300110.6.2)\u3002
-CHKJ2855.ejb20=CHKJ2855I: <cmp-field> {0} \u5fc5\u9808\u5177\u6709 Java \u521d\u59cb\u7684\u6216 Java \u53ef\u5e8f\u5217\u5316\u7684\u985e\u578b (EJB 2.0: 10.3.1)\u3002
-CHKJ2856.ejb20=CHKJ2856I: <cmr-field> {0} \u5fc5\u9808\u662f {1} \u985e\u578b\u6216\u5176\u96c6\u5408 (EJB 2.0: 10.3.1)\u3002
-
-CHKJ2815.ejb20=CHKJ2815W: \u76f8\u4f9d\u503c\u985e\u5225 {0} \u4e0d\u80fd\u662f <cmr-field> (EJB 2.0: 10.3.3)\u3002
-
-CHKJ2816.ejb20=CHKJ2816I: <ejb-relation-name> \u5728 ejb-jar.xml \u4e2d\u5fc5\u9808\u662f\u552f\u4e00\u7684 (EJB 2.0: 10.3.2\u300110.3.13\u300122.5)\u3002
-CHKJ2817.ejb20=CHKJ2817I: <ejb-relationship-role-name> \u5728 <ejb-relation> \u5167\u5fc5\u9808\u662f\u552f\u4e00\u7684 (EJB 2.0: 10.3.2\u300110.3.13\u300122.5)\u3002
-CHKJ2818.ejb20=CHKJ2818I: <multiplicity> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "One" \u6216 "Many" (EJB 2.0: 10.3.2\u300110.3.13\u300122.5)\u3002
-CHKJ2821.ejb20=CHKJ2821I: <relationship-role-source> \u5728\u89d2\u8272 {0} \u5fc5\u9808\u53c3\u7167\u73fe\u6709\u7684 CMP bean (EJB 2.0: 10.3.2\u300122.5)\u3002
-CHKJ2848.ejb20=CHKJ2848I: <cascade-delete> \u5fc5\u9808\u8207 "One" \u7684 <multiplicity> \u642d\u914d\u4f7f\u7528 (EJB 2.0: 10.3.4.2\u300122.5)\u3002
-CHKJ2866.ejb20=CHKJ2866I: <cmr-field> {0} \u5fc5\u9808\u5b9a\u7fa9\u65bc {1} (EJB 2.0: 10.3.2\u300122.5)\u3002
-CHKJ2867.ejb20=CHKJ2867I: \u9019\u500b Bean \u8207\u5176\u4ed6\u7684 Bean \u53ea\u80fd\u6709\u55ae\u5411\u7684\u95dc\u4fc2 (EJB 2.0: 10.3.2)\u3002
-CHKJ2868.ejb20=CHKJ2868I: <cmr-field-type> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "java.util.Collection" \u6216 "java.util.Set" (EJB 2.0: 10.3.13\u300122.5)\u3002
-CHKJ2869.ejb20=CHKJ2869I: \u81f3\u5c11\u4e00\u500b <ejb-relationship-role> \u5fc5\u9808\u5b9a\u7fa9 <cmr-field> (EJB 2.0: 10.3.2\u300110.3.13\u300122.5)\u3002
-CHKJ2870.ejb20=CHKJ2870I: <ejb-name> {0} \u5fc5\u9808\u5b58\u5728 (EJB 2.0: 10.3.13)\u3002
-CHKJ2871.ejb20=CHKJ2871I: <ejb-name> {0} \u5fc5\u9808\u53c3\u7167 CMP Bean (EJB 2.0: 10.3.2\u300110.3.13)\u3002
-
-CHKJ2872.ejb20=CHKJ2872E: <cmp-version> \u5143\u7d20\u7684\u503c\u5fc5\u9808\u662f "1.x" \u6216 "2.x" (EJB 2.0: 22.5)\u3002
-CHKJ2873.ejb20=CHKJ2873W: \u5c07\u9019\u500b Bean \u7684\u8cc7\u6599\u4f86\u6e90\u9023\u7d50\u79fb\u8f49\u81f3 CMP Connection Factory \u9023\u7d50\u3002
-CHKJ2874.ejb20=CHKJ2874W: \u5c07\u9019\u500b EJB \u6a21\u7d44\u7684\u9810\u8a2d\u8cc7\u6599\u4f86\u6e90\u9023\u7d50\u79fb\u8f49\u81f3\u9810\u8a2d\u7684 CMP Connection Factory \u9023\u7d50\u3002
-
-###########################################################################
-#
-# 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 e10f4fe..0000000
--- 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}.
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_de.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_de.properties
deleted file mode 100644
index 17fa5e1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_de.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:  Im Modul {1} ist das Element ''ejb-ref-name'' in  ejb-ref: {0} ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E:  Im Modul {1} ist das Element ''ejb-ref-type'' in  ejb-ref: {0} ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3010E:  Im Modul {1} fehlt das Element ''ejb-ref-type'' in  ejb-ref: {0}.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: Im Modul {1} fehlt die Home-Schnittstelle im ejb-ref-Element {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: Im Modul {1} fehlt die Remote-Schnittstelle im ejb-ref-Element {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: Das Element ''security-role-ref'' {0} definiert das Element ''role-link'', aber keine ''security-role''-Elemente in der Anwendungsbeschreibung.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: Das Element ''resource-ref'' mit dem Namen {0} ist doppelt vorhanden.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W Das EJB-Linkelement {0} kann in Modul {1} und EAR {2} nicht aufgel\u00f6st werden.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: Das Element ''service-ref'' mit dem Namen {0} ist doppelt vorhanden.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: Das Element ''security role-ref'' mit dem Namen {0} ist doppelt vorhanden.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: Das Element ''ejb-ref'' mit dem Namen {0} ist doppelt vorhanden.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: Das Element ''resource environment-ref'' mit dem Namen {0} ist doppelt vorhanden.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: Das Element ''message destination-ref'' mit dem Namen {0} ist doppelt vorhanden.
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_es.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_es.properties
deleted file mode 100644
index 3f57424..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_es.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: En el m\u00f3dulo {1}, el elemento ''ejb-ref-name'' de ''ejb-ref'' {0} no es v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: En el m\u00f3dulo {1}, el elemento ''ejb-ref-type'' de ''ejb-ref'' {0} no es v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: En el m\u00f3dulo {1}, falta el elemento ''ejb-ref-type'' de ejb-ref: {0}.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: En el m\u00f3dulo {1}, falta la interfaz inicial del elemento ''ejb-ref''{0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: En el m\u00f3dulo {1}, falta la interfaz remota del elemento ''ejb-ref''{0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: El elemento ''security-role-ref'' {0} define el elemento ''role-link'' pero no hay elementos ''security-role'' en la descripci\u00f3n de la aplicaci\u00f3n.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: Hay un elemento ''resource-ref'' duplicado denominado {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W El elemento de enlace EJB {0} no puede resolverse en el m\u00f3dulo {1} y en el EAR {2}.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: Hay un elemento ''service-ref'' duplicado denominado {0}.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: Hay un elemento ''security role-ref'' duplicado llamado {0}.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: Hay un elemento ''ejb-ref'' duplicado denominado {0}.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: Hay un elemento ''resource environment-ref'' duplicado llamado {0}.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: Hay un elemento ''message destination-ref'' duplicado llamado {0}.
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_fr.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_fr.properties
deleted file mode 100644
index a4c44ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_fr.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: Dans le module {1}, l''\u00e9l\u00e9ment "ejb-ref-name" de l''\u00e9l\u00e9ment ejb-ref {0} n''est pas valide.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: Dans le module {1}, l''\u00e9l\u00e9ment "ejb-ref-type" de l''\u00e9l\u00e9ment ejb-ref {0} n''est pas valide.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: Dans le module {1}, l''\u00e9l\u00e9ment "ejb-ref-type" de l''\u00e9l\u00e9ment ejb-ref {0} est manquant.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: Dans le module {1}, l''interface home ne se trouve pas dans l''\u00e9l\u00e9ment ejb-ref {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: Dans le module {1}, l''interface \u00e9loign\u00e9e ne se trouve pas dans l''\u00e9l\u00e9ment ejb-ref {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: L''\u00e9l\u00e9ment security-role-ref {0} d\u00e9finit l''\u00e9l\u00e9ment role-link, mais il n''y a pas d''\u00e9l\u00e9ment security-role dans le descripteur de l''application.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: El\u00e9ment resource-ref appel\u00e9 {0} en double.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W L''\u00e9l\u00e9ment de lien d''EJB {0} ne peut pas \u00eatre r\u00e9solu dans le module {1} et l''EAR {2}.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: El\u00e9ment service-ref appel\u00e9 {0} en double.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: El\u00e9ment "security role-ref" appel\u00e9 {0} en double.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: El\u00e9ment ejb-ref appel\u00e9 {0} en double.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: El\u00e9ment "resource environment-ref" appel\u00e9 {0} en double.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: El\u00e9ment "message destination-ref" appel\u00e9 {0} en double.
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_it.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_it.properties
deleted file mode 100644
index 5001977..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_it.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: nel modulo {1}, l''elemento "ejb-ref-name" in ejb-ref: {0} non \u00e8 valido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: nel modulo {1}, l''elemento "ejb-ref-type" in ejb-ref: {0} non \u00e8 valido.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: nel modulo {1}, l''elemento "ejb-ref-type" in ejb-ref: {0} risulta mancante.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: nel modulo {1}, l''interfaccia locale risulta mancante dall''elemento ejb-ref: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: nel modulo {1}, l''interfaccia remota risulta mancante dall''elemento ejb-ref: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: l'elemento ''security-role-ref'' {0} definisce l'elemento ''role-link'' ma non gli elementi ''security-role'' nel descrittore dell'applicazione.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: Elemento ''resource-ref'' denominato {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W L''elemento di collegamento EJB {0} risulta non risolvibile nel modulo {1} e nell''EAR {2}.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: Elemento ''service-ref'' denominato {0}.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: Elemento ''security role-ref'' denominato {0}.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: Elemento ''ejb-ref'' denominato {0}.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: Elemento ''resource environment-ref'' denominato {0}.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: Elemento ''message destination-ref'' denominato {0}.
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_ja.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_ja.properties
deleted file mode 100644
index 59c906f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_ja.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: \u30e2\u30b8\u30e5\u30fc\u30eb {1} \u3067\u3001ejb-ref {0} \u5185\u306e ''ejb-ref-name'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: \u30e2\u30b8\u30e5\u30fc\u30eb {1} \u3067\u3001ejb-ref {0} \u5185\u306e ''ejb-ref-type'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: \u30e2\u30b8\u30e5\u30fc\u30eb {1} \u3067\u3001ejb-ref {0} \u5185\u306e ''ejb-ref-type'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059\u3002
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: \u30e2\u30b8\u30e5\u30fc\u30eb {1} \u3067\u3001\u30db\u30fc\u30e0\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c ejb-ref {0} \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u3042\u308a\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: \u30e2\u30b8\u30e5\u30fc\u30eb {1} \u3067\u3001\u30ea\u30e2\u30fc\u30c8\u30fb\u30a4\u30f3\u30bf\u30fc\u30d5\u30a7\u30fc\u30b9\u304c ejb-ref {0} \u30a8\u30ec\u30e1\u30f3\u30c8\u306b\u3042\u308a\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8 {0} \u306f\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u8a18\u8ff0\u5b50\u3067 ''role-link'' \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u304c\u3001''security-role'' \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: {0} \u3068\u3044\u3046\u540d\u524d\u306e ''resource-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W EJB \u30ea\u30f3\u30af\u30fb\u30a8\u30ec\u30e1\u30f3\u30c8 {0} \u304c\u30e2\u30b8\u30e5\u30fc\u30eb {1} \u304a\u3088\u3073 EAR {2} \u3067\u89e3\u6c7a\u4e0d\u53ef\u80fd\u3067\u3059\u3002
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: {0} \u3068\u3044\u3046\u540d\u524d\u306e ''service-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: {0} \u3068\u3044\u3046\u540d\u524d\u306e ''security role-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: {0} \u3068\u3044\u3046\u540d\u524d\u306e ''ejb-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: {0} \u3068\u3044\u3046\u540d\u524d\u306e ''resource environment-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: {0} \u3068\u3044\u3046\u540d\u524d\u306e ''message destination-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_ko.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_ko.properties
deleted file mode 100644
index 0ec126e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_ko.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: {1} \ubaa8\ub4c8\uc5d0\uc11c ejb-ref: {0}\uc5d0 \uc788\ub294 ''ejb-ref-name'' \uc694\uc18c\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: {1} \ubaa8\ub4c8\uc5d0\uc11c ejb-ref: {0}\uc5d0 \uc788\ub294 ''ejb-ref-type'' \uc694\uc18c\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: {1} \ubaa8\ub4c8\uc5d0\uc11c ''ejb-ref-type'' \uc694\uc18c\uac00 ejb-ref: {0}\uc5d0\uc11c \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: {1} \ubaa8\ub4c8\uc5d0\uc11c \ud648 \uc778\ud130\ud398\uc774\uc2a4\uac00 ejb-ref: {0} \uc694\uc18c\uc5d0\uc11c \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: {1} \ubaa8\ub4c8\uc5d0\uc11c \uc6d0\uaca9 \uc778\ud130\ud398\uc774\uc2a4\uac00 ejb-ref: {0} \uc694\uc18c\uc5d0\uc11c \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' \uc694\uc18c({0})\uac00 ''role-link'' \uc694\uc18c\ub97c \uc815\uc758\ud558\uc9c0\ub9cc \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc124\uba85\uc790\uc5d0 ''security-role'' \uc694\uc18c\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: ''resource-ref'' \uc694\uc18c \uc774\ub984({0})\uc774 \uc911\ubcf5\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W EJB \ub9c1\ud06c \uc694\uc18c {0}\uc774(\uac00) {1} \ubaa8\ub4c8\uacfc EAR {2}\uc5d0\uc11c \ubd84\ub9ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: ''service-ref'' \uc694\uc18c \uc774\ub984({0})\uc774 \uc911\ubcf5\ub429\ub2c8\ub2e4.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: ''security role-ref'' \uc694\uc18c \uc774\ub984({0})\uc774 \uc911\ubcf5\ub429\ub2c8\ub2e4.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: ''ejb-ref'' \uc694\uc18c \uc774\ub984({0})\uc774 \uc911\ubcf5\ub429\ub2c8\ub2e4.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: ''resource environment-ref'' \uc694\uc18c \uc774\ub984({0})\uc774 \uc911\ubcf5\ub429\ub2c8\ub2e4.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: ''message destination-ref'' \uc694\uc18c \uc774\ub984({0})\uc774 \uc911\ubcf5\ub429\ub2c8\ub2e4.
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_pt_BR.properties
deleted file mode 100644
index 6e1a649..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_pt_BR.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: No m\u00f3dulo {1}, o elemento ''ejb-ref-name'' de ejb-ref: {0} \u00e9 inv\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: No m\u00f3dulo {1}, o elemento ''ejb-ref-type'' de ejb-ref: {0} \u00e9 inv\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: No m\u00f3dulo {1}, o elemento ''ejb-ref-type'' de ejb-ref: {0} est\u00e1 faltando.
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: No m\u00f3dulo {1}, a interface Posi\u00e7\u00e3o Inicial est\u00e1 faltando no elemento {0} de ejb-ref.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: No m\u00f3dulo {1}, a interface Remota est\u00e1 faltando no elemento {0} de ejb-ref.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: O elemento {0} do ''security-role-ref'' define elemento ''role-link'', por\u00e9m, n\u00e3o h\u00e1 elementos do ''security-role'' no descritor do aplicativo.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: O elemento do ''resource-ref'' , nomeado {0}, est\u00e1 duplicado.
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W O elemento link do EJB {0} n\u00e3o pode ser resolvido no m\u00f3dulo {1} e EAR {2}.
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: Elemento ''service-ref'' denominado {0} duplicado.
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: Elemento ''security role-ref'' denominado {0} duplicado.
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: Elemento ''ejb-ref'' denominado {0} duplicado.
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: Elemento ''resource environment-ref'' denominado {0} duplicado.
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: Elemento ''message destination-ref'' denominado {0} duplicado.
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_zh.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_zh.properties
deleted file mode 100644
index 91c8867..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_zh.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\uff1a\u5728\u6a21\u5757 {1} \u4e2d\uff0cejb-ref {0} \u4e2d\u7684\u201cejb-ref-name\u201d\u5143\u7d20\u65e0\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E\uff1a\u5728\u6a21\u5757 {1} \u4e2d\uff0cejb-ref {0} \u4e2d\u7684\u201cejb-ref-type\u201d\u5143\u7d20\u65e0\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E\uff1a\u5728\u6a21\u5757 {1} \u4e2d\uff0cejb-ref {0} \u4e2d\u7684\u201cejb-ref-type\u201d\u5143\u7d20\u4e22\u5931\u3002
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E\uff1a\u5728\u6a21\u5757 {1} \u4e2d\uff0cejb-ref {0} \u5143\u7d20\u4e2d\u4e22\u5931\u4e86 home \u63a5\u53e3\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E\uff1a\u5728\u6a21\u5757 {1} \u4e2d\uff0cejb-ref {0} \u5143\u7d20\u4e2d\u4e22\u5931\u4e86\u8fdc\u7a0b\u63a5\u53e3\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W\uff1a\u201csecurity-role-ref\u201d\u5143\u7d20 {0} \u5b9a\u4e49\u4e86\u201crole-link\u201d\u5143\u7d20\uff0c\u4f46\u5728\u5e94\u7528\u7a0b\u5e8f\u63cf\u8ff0\u7b26\u4e2d\u6ca1\u6709\u201csecurity-role\u201d\u5143\u7d20\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E\uff1a\u540d\u4e3a {0} \u7684\u201cresource-ref\u201d\u5143\u7d20\u91cd\u590d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W \u5728\u6a21\u5757 {1} \u548c EAR {2} \u4e2d\u4e0d\u80fd\u89e3\u6790 EJB \u94fe\u63a5\u5143\u7d20 {0}\u3002
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E\uff1a\u540d\u4e3a {0} \u7684\u201cservice-ref\u201d\u5143\u7d20\u91cd\u590d\u3002
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E\uff1a\u540d\u4e3a {0} \u7684\u201csecurity role-ref\u201d\u5143\u7d20\u91cd\u590d\u3002
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E\uff1a\u540d\u4e3a {0} \u7684\u201cejb-ref\u201d\u5143\u7d20\u91cd\u590d\u3002
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E\uff1a\u540d\u4e3a {0} \u7684\u201cresource environment-ref\u201d\u5143\u7d20\u91cd\u590d\u3002
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E\uff1a\u540d\u4e3a {0} \u7684\u201cmessage destination-ref\u201d\u5143\u7d20\u91cd\u590d\u3002
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_zh_TW.properties
deleted file mode 100644
index 79cecb7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/erefvalidation_zh_TW.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: \u5728\u6a21\u7d44 {1} \u4e2d\uff0cejb-ref {0} \u7684 ''ejb-ref-name'' \u5143\u7d20\u7121\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_INVALID_EREFTYPE=CHKJ3010E: \u5728\u6a21\u7d44 {1} \u4e2d\uff0cejb-ref {0} \u7684 ''ejb-ref-type'' \u5143\u7d20\u7121\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-ERROR_EAR_MISSING_EREFTYPE=CHKJ3014E: \u5728\u6a21\u7d44 {1} \u4e2d\uff0c\u907a\u6f0f ejb-ref {0} \u7684 ''ejb-ref-type'' \u5143\u7d20\u3002
-
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFHOME=CHKJ3011E: \u5728\u6a21\u7d44 {1} \u4e2d\uff0cejb-ref {0} \u5143\u7d20\u907a\u6f0f Home \u4ecb\u9762\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EREFREMOTE=CHKJ3012E: \u5728\u6a21\u7d44 {1} \u4e2d\uff0cejb-ref {0} \u5143\u7d20\u907a\u6f0f\u9060\u7aef\u4ecb\u9762\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' \u5143\u7d20 {0} \u662f\u7528\u4f86\u5b9a\u7fa9 ''role-link'' \u5143\u7d20\uff0c\u4f46\u662f\u61c9\u7528\u7a0b\u5f0f\u63cf\u8ff0\u5b50\u4e2d\u6c92\u6709 ''security-role'' \u5143\u7d20\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_RESREF=CHKJ3013E: \u91cd\u8907\u7684 ''resource-ref'' \u5143\u7d20\u540d\u7a31 {0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# new string added for version 5 WSAD
-UNRESOLVED_EJB_REF_WARN_=IWAE0034W EJB \u93c8\u7d50\u5143\u7d20 {0} \u7121\u6cd5\u5728\u6a21\u7d44 {1} \u548c EAR {2} \u4e2d\u89e3\u6790 \u3002
-
-ERROR_EAR_DUPLICATE_SERVICEREF=CHKJ3015E: \u540d\u7a31\u70ba {0} \u7684 ''service-ref'' \u5143\u7d20\u91cd\u8907\u3002
-ERROR_EAR_DUPLICATE_SECURITYROLEREF=CHKJ3016E: \u540d\u7a31\u70ba {0} \u7684 ''service role-ref'' \u5143\u7d20\u91cd\u8907\u3002
-ERROR_EAR_DUPLICATE_EJBREF=CHKJ3017E: \u540d\u7a31\u70ba {0} \u7684 ''ejb-ref'' \u5143\u7d20\u91cd\u8907\u3002
-ERROR_EAR_DUPLICATE_RESENVREF=CHKJ3018E: \u540d\u7a31\u70ba {0} \u7684 ''resource environment-ref'' \u5143\u7d20\u91cd\u8907\u3002
-ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF=CHKJ3019E: \u540d\u7a31\u70ba {0} \u7684 ''message destination-ref'' \u5143\u7d20\u91cd\u8907\u3002
-
-
-
-
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 bbb2f65..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 a86b79d..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 04053bd..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 870ed42..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 4948507..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 b742fc3..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 fdcab91..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 0fd0c14..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AInterfaceTypeVRule.java
+++ /dev/null
@@ -1,151 +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.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;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-
-
-/*
- * 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, MessageLimitException  {
-		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 ec134bc..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 43e682b..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 4959ef3..0000000
--- 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 0a7e3eb..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 58886a9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ATypeVRule.java
+++ /dev/null
@@ -1,645 +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 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.jst.j2ee.ejb.EnterpriseBean;
-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.MessageLimitException;
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * @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) throws MessageLimitException {
-		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) throws MessageLimitException {
-		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) throws MessageLimitException {
-		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, MessageLimitException {
-		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 10991ba..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 e588662..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java
+++ /dev/null
@@ -1,375 +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.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;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-
-/**
- * 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) throws MessageLimitException {
-		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(MessageLimitException e) {
-			throw e;
-		}
-		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 e2d518a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityBean.java
+++ /dev/null
@@ -1,1001 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- *
- * 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.
- *
- * 9.1.5.1 Entity bean instance's view: ... The entity Bean Provider is responsible
- *    for implementing the following methods in the entity bean class:...
- *
- * 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 must define a public constructor that takes no arguments.
- *      - The class must not define the finalize() method.
- *   - 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.
- *
- * 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.4 ejbPostCreate methods
- *   - For each ejbCreate(...) method, the entity bean class must define a matching 
- *     ejbPostCreate(...) method, using the following rules:
- *        - The method name must be ejbPostCreate.
- *        - The method must be declared as public.
- *        - The method must not be declared as final or static.
- *        - The return type must be void.
- *        - The method arguments must be the same as the arguments of the matching ejbCreate(...) 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.RemoteExceptionto 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).
- *
- * 9.2.5 ejbFind methods
- *   - The entity bean class may also define additional ejbFind<METHOD>(...) finder methods.
- *   - The signatures of the finder methods must follow the following rules:
- *   - A finder method name must start with the prefix "ejbFind" 
- *     (e.g. ejbFindByPrimaryKey, ejbFindLargeAccounts, ejbFindLateShipments).
- *   - A finder method must be declared as public.
- *   - The method must not be declared as final or static.
- *   - The method argument types must be legal types for RMI-IIOP.
- *   - 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).
- *   - The throws clause may define arbitrary application specific exceptions, including 
- *     the javax.ejb.FinderException.
- *   - 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).
- *   - 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).
- *
- * 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.
- *        - The business method must be declared as public.
- *        - The method must not be declared as final or static.
- *        - The method argument and return value types must be legal types for RMI-IIOP.
- *        - 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).
- *...
- * 9.2.9 Entity bean's primary key class
- *...
- *  - The primary key type must be a legal Value Type in RMI-IIOP.
- *...
- *
- * 9.4.1 Container-managed fields
- *...
- *   - The following requirements ensure that an entity bean can be deployed in any 
- *     compliant container.
- *        - The Bean Provider must ensure that the Java programming language types 
- *          assigned to the container-managed fields are restricted to the following: 
- *          Java programming language primitive types, Java programming language 
- *          serializable types, and references of enterprise beans' remote or home 
- *          interfaces.
- *        - The Container Provider may, but is not required to, use Java programming 
- *          language Serialization to store the container-managed fields in the database. 
- *          If the container chooses a different approach, the effect should be equivalent 
- *          to that of Java programming language Serialization. The Container must also be 
- *          capable of persisting references to enterprise beans' remote and home interfaces 
- *          (for example, by storing their handle or primary key).
- *...
- *
- * 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.
- *...
- *
- * 9.4.6 finder methods
- *   - The entity Bean Provider does not write the finder (ejbFind<METHOD>(...)) methods.
- *...
- * 9.4.7 primary key type
- *   - The container must be able to manipulate the primary key type. Therefore, 
- *     the primary key type for an entity bean with container-managed persistence 
- *     must follow the rules in this subsection, in addition to those specified in 
- *     Subsection 9.2.9.
- *
- *     There are two ways to specify a primary key class for an entity bean with container-managed persistence:
- *        - Primary key that maps to a single field in the entity bean class.
- *        - Primary key that maps to multiple fields in the entity bean class.
- *     The second method is necessary for implementing compound keys, and the first method is convenient for
- *     single-field keys. Without the first method, simple types such as String would have to be wrapped in a
- *     user-defined class.
- * 
- *     9.4.7.1 Primary key that maps to a single field in the entity bean class
- *     The Bean Provider uses the primkey-field element of the deployment descriptor to specify the
- *     container-managed field of the entity bean class that contains the primary key. The field's type must be
- *     the primary key type.
- *
- *     9.4.7.2 Primary key that maps to multiple fields in the entity bean class
- *     The primary key class must be public, and must have a public constructor with no parameters.
- *     All fields in the primary key class must be declared as public.
- *     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.)
- *
- *     9.4.7.3 Special case: Unknown primary key class
- *     In special situations, the entity Bean Provider may choose not to specify the primary key class for an
- *     entity bean with container-managed persistence. This case usually happens when the entity bean does
- *     not have a natural primary key, and the Bean Provider wants to allow the Deployer to select the primary
- *     key fields at deployment time. The entity bean's primary key type will usually be derived from the primary
- *     key type used by the underlying database system that stores the entity objects. The primary key
- *     used by the database system may not be known to the Bean Provider.
- *     When defining the primary key for the enterprise bean, the Deployer may sometimes need to subclass
- *     the entity bean class to add additional container-managed fields (this typically happens for entity beans
- *     that do not have a natural primary key, and the primary keys are system-generated by the underlying
- *     database system that stores the entity objects).
- *     In this special case, the type of the argument of the findByPrimaryKey method must be declared as
- *     java.lang.Object, and the return value of ejbCreate() must be declared as
- *     java.lang.Object. The Bean Provider must specify the primary key class in the deployment
- *     descriptor as of the type java.lang.Object.
- *     The primary key class is specified at deployment time in the situations when the Bean Provider develops
- *     an entity bean that is intended to be used with multiple back-ends that provide persistence, and when
- *     these multiple back-ends require different primary key structures.
- *     Use of entity beans with a deferred primary key type specification limits the client application programming
- *     model, because the clients written prior to deployment of the entity bean may not use, in general,
- *     the methods that rely on the knowledge of the primary key type.
- *     The implementation of the enterprise bean class methods must be done carefully. For example, the meth-ods
- *     should not depend on the type of the object returned from EntityContext.getPrimaryKey(), because
- *     the return type is determined by the Deployer after the EJB class has been written.
- *
- */
-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.
-	 *
-	 * 9.2.2 Enterprise bean class
-	 *...
-	 *   - The following are the requirements for an entity bean class:
-	 *...
-	 *      - The class must define a public constructor that takes no arguments.
-	 *      - The class must not define the finalize() method.
-	 *...
-	 *   - 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 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();
-
-	}
-	
-	/**
-	 * 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.
-	 *        - The business method must be declared as public.
-	 *        - The method must not be declared as final or static.
-	 *        - The method argument and return value types must be legal types for RMI-IIOP.
-	 *        - 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).
-	 */
-	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);
-	}
-	
-	/**
-	 * 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 {
-		// 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);
-	}
-	
-	/**
-	 * 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(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);
-	}
-	
-	/**
-	 * 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_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);
-		}
-	}
-	
-	/**
-	 * 9.2.5 ejbFind methods
-	 *   - The entity bean class may also define additional ejbFind<METHOD>(...) finder methods.
-	 *   - The signatures of the finder methods must follow the following rules:
-	 *   - A finder method name must start with the prefix "ejbFind" 
-	 *     (e.g. ejbFindByPrimaryKey, ejbFindLargeAccounts, ejbFindLateShipments).
-	 *   - A finder method must be declared as public.
-	 *   - The method must not be declared as final or static.
-	 *   - The method argument types must be legal types for RMI-IIOP.
-	 *   - 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).
-	 *   - The throws clause may define arbitrary application specific exceptions, including 
-	 *     the javax.ejb.FinderException.
-	 *   - 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).
-	 *   - 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).
-	 *
-	 * 9.4.6 finder methods
-	 *   - The entity Bean Provider does not write the finder (ejbFind<METHOD>(...)) methods.
-	 *
-	 * 9.4.7.3 (CMP) Special case: Unknown primary key class.
-	 *   - In this special case, the type of the argument of the findByPrimaryKey method 
-	 *     must be declared as java.lang.Object, and the return value of ejbCreate() must 
-	 *     be declared as java.lang.Object. The Bean Provider must specify the primary key 
-	 *     class in the deployment descriptor as of the type java.lang.Object.
-	 *  (This does not need to be validated directly, since CMPs don't implement finder methods.
-	 */
-	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.)
-	}
-	
-	/**
-	 * 9.2.5 ejbFind methods
-	 *   - The entity bean class may also define additional ejbFind<METHOD>(...) finder methods.
-	 *   - The signatures of the finder methods must follow the following rules:
-	 *   - A finder method name must start with the prefix "ejbFind" 
-	 *     (e.g. ejbFindByPrimaryKey, ejbFindLargeAccounts, ejbFindLateShipments).
-	 *   - A finder method must be declared as public.
-	 *   - The method must not be declared as final or static.
-	 *   - The method argument types must be legal types for RMI-IIOP.
-	 *   - 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).
-	 *   - The throws clause may define arbitrary application specific exceptions, including 
-	 *     the javax.ejb.FinderException.
-	 *   - 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).
-	 *   - 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).
-	 *
-	 * 9.4.6 finder methods
-	 *   - The entity Bean Provider does not write the finder (ejbFind<METHOD>(...)) methods.
-	 *
-	 * 9.4.7.3 (CMP) Special case: Unknown primary key class.
-	 *   - In this special case, the type of the argument of the findByPrimaryKey method 
-	 *     must be declared as java.lang.Object, and the return value of ejbCreate() must 
-	 *     be declared as java.lang.Object. The Bean Provider must specify the primary key 
-	 *     class in the deployment descriptor as of the type java.lang.Object.
-	 *  (This does not need to be validated directly, since CMPs don't implement finder methods.
-	 */
-	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.
-	 *
-	 * 9.2.4 ejbPostCreate methods
-	 * - For each ejbCreate(...) method, the entity bean class must define a matching 
-	 *   ejbPostCreate(...) method, using the following rules:
-	 *    - The method name must be ejbPostCreate.
-	 *    - The method must be declared as public.
-	 *    - The method must not be declared as final or static.
-	 *    - The return type must be void.
-	 *    - The method arguments must be the same as the arguments of the matching 
-	 *      ejbCreate(...) 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).
-	 *...
-	*/
-	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.
-	 *
-	 * 9.2.4 ejbPostCreate methods
-	 * - For each ejbCreate(...) method, the entity bean class must define a matching 
-	 *   ejbPostCreate(...) method, using the following rules:
-	 *    - The method name must be ejbPostCreate.
-	 *    - The method must be declared as public.
-	 *    - The method must not be declared as final or static.
-	 *    - The return type must be void.
-	 *    - The method arguments must be the same as the arguments of the matching 
-	 *      ejbCreate(...) 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).
-	 *...
-	*/
-	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);
-			}
-		}
-	}
-	
-	/**
-	 * 9.2.2 Enterprise bean class
-	 *...
-	 *   - The following are the requirements for an entity bean class:
-	 *...
-	 *      - The class must not define the finalize() method.
-	 *...
-	 */
-	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);
-		}
-	}
-	
-	/**
-	 * 9.2.2 Enterprise bean class
-	 *...
-	 *   - The following are the requirements for an entity bean class:
-	 *...
-	 *      - The class must define a public constructor that takes no arguments.
-	 *...
-	 *
-	 * EJB spec 1.1, p. 105 explains why this method does not check for at least one ejbCreate method.
-	 *    [6] An entity enterprise Bean has no ejbCreate(...) and ejbPostCreate(...) 
-	 *    methods if it does not define any create methods in its home interface. 
-	 *    Such an entity enterprise Bean does not allow the clients to create new 
-	 *    EJB objects. The enterprise Bean restricts the clients to accessing entities 
-	 *    that were created through direct database inserts.
-	 */
-	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 12466b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEntityHome.java
+++ /dev/null
@@ -1,681 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- * 9.2.8 Entity bean's home interface
- * The following are the requirements for the entity bean's home interface:
- *   - The interface must extend the javax.ejb.EJBHome interface.
- *   - 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.
- *   - The home interface is allowed to have superinterfaces. Use of interface 
- *     inheritance is subject to the RMI-IIOP rules for the definition of remote interfaces.
- *   - Each method defined in the home interface must be one of the following:
- *      - A create method.
- *      - A finder method.
- *   - 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.)
- *   - The return type for a create method must be the entity bean's remote interface type.
- *   - 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)
- *   - The throws clause of a create method must include the javax.ejb.CreateException.
- *   - 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.)
- *   - 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).
- *   - 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.
- *   - 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.
- *   - The throws clause of a finder method must include the javax.ejb.FinderException. 
- */
-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.
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *...
-	 *   - 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.
-	 *...
-	 *   - Each method defined in the home interface must be one of the following:
-	 *      - A create method.
-	 *      - A finder method.
-	 *   - 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.)
-	 *   - The return type for a create method must be the entity bean's remote interface type.
-	 *   - 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)
-	 *   - The throws clause of a create method must include the javax.ejb.CreateException.
-	 *   - 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.)
-	 *   - 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).
-	 *   - 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.
-	 *   - 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.
-	 *   - The throws clause of a finder method must include the javax.ejb.FinderException. 
-	 */
-	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);
-	}
-	
-	/**
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - The interface must extend the javax.ejb.EJBHome interface.
-	 *...
-	 *   - The home interface is allowed to have superinterfaces. Use of interface 
-	 *     inheritance is subject to the RMI-IIOP rules for the definition of remote interfaces.
-	 *...
-	 */
-	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.
-	 *
-	 * 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.)
-	 *   - The return type for a create method must be the entity bean's remote interface type.
-	 *   - 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 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.
-	 *
-	 * 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.)
-	 *   - The return type for a create method must be the entity bean's remote interface type.
-	 *   - 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 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.
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *...
-	 *   - 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.
-	 */
-	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.
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *...
-	 *   - 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.
-	 */
-	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.
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *...
-	 *   - 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.)
-	 *   - 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).
-	 *...
-	 *   - 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.
-	 *   - The throws clause of a finder method must include the javax.ejb.FinderException. 
-	 */
-	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.
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *...
-	 *   - 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.)
-	 *   - 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).
-	 *...
-	 *   - 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.
-	 *   - The throws clause of a finder method must include the javax.ejb.FinderException. 
-	 */
-	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.
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - 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.
-	 *...
-	 */
-	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.
-	 *
-	 * 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 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);
-			}
-		}
-		*/
-	}
-	
-	/**
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - 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.
-	 */
-	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 4a59c11..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateHome.java
+++ /dev/null
@@ -1,420 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- * 6.8 Stateless session beans
- *...
- * 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. 
- * The session bean class must define a single ejbCreate method that takes 
- * no arguments.
- *...
- *
- * 6.10.6 Session bean's home interface
- * The following are the requirements for the session bean's home interface:
- *   - The interface must extend the javax.ejb.EJBHome interface.
- *   - 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.
- *   - The home interface is allowed to have superinterfaces. Use of interface 
- *     inheritance is subject to the RMI/IIOP rules for the definition of 
- *     remote interfaces.
- *   - A session bean's home interface must define one or more create(...) methods.
- *   - 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.)
- *   - The return type for a create method must be the session bean's remote 
- *     interface type.
- *   - 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.
- *...
- *
- * 9.2.8 Entity bean's home interface
- * The following are the requirements for the entity bean's home interface:
- *   - The interface must extend the javax.ejb.EJBHome interface.
- *   - 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.
- *   - The home interface is allowed to have superinterfaces. Use of interface 
- *     inheritance is subject to the RMI-IIOP rules for the definition of remote interfaces.
- *   - Each method defined in the home interface must be one of the following:
- *      - A create method.
- *      - A finder method.
- *   - 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.)
- *   - The return type for a create method must be the entity bean's remote interface type.
- *   - 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)
- *   - The throws clause of a create method must include the javax.ejb.CreateException.
- *   - 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.)
- *   - 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).
- *   - 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.
- *   - 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.
- *   - The throws clause of a finder method must include the javax.ejb.FinderException. 
- */
-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.
-	 *
-	 * 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 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;
-	}
-	
-	/**
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - The interface must extend the javax.ejb.EJBHome interface.
-	 *...
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - The interface must extend the javax.ejb.EJBHome interface.
-	 *...
-	 */
-	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);
-	}
-	
-	/**
-	 * 6.8 Stateless session beans
-	 *...
-	 * 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. 
-	 * The session bean class must define a single ejbCreate method that takes 
-	 * no arguments.
-	 *...
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - 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.
-	 *   - A session bean's home interface must define one or more create(...) methods.
-	 *   - 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.)
-	 *   - The return type for a create method must be the session bean's remote 
-	 *     interface type.
-	 *   - 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. 
-	 */
-	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);
-	}
-	
-	/**
-	 * 6.8 Stateless session beans
-	 *...
-	 * 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. 
-	 * The session bean class must define a single ejbCreate method that takes 
-	 * no arguments.
-	 *...
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - 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.
-	 *   - A session bean's home interface must define one or more create(...) methods.
-	 *   - 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.)
-	 *   - The return type for a create method must be the session bean's remote 
-	 *     interface type.
-	 *   - 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.
-	 *
-	 *
-	 * 9.2.8 Entity bean's home interface
-	 *    The following are the requirements for the entity bean's home interface:
-	 * ...
-	 *    The return type for a create method must be the entity bean's remote interface type.
-	 * ...
-	 * 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).
-	 *...
-	 */
-	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);
-		}
-	}
-	
-	/**
-	 * 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 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 ddb9750..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateKeyClass.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- * 9.2.9 Entity bean's primary key class
- *  - The Bean Provider must specify a primary key class in the deployment descriptor.
- *  - The primary key type must be a legal Value Type in RMI-IIOP.
- *  - 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.
-*/
-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;
-	}
-	
-	/**
-	 * 9.2.9 Entity bean's primary key class
-	 *  - The Bean Provider must specify a primary key class in the deployment descriptor. (checked by the MOF model)
-	 *  - The primary key type must be a legal Value Type in RMI-IIOP. (for key fields, checked in the ValidateEntityBean class)
-	 *  - 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.
-	 */
-	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
-	 *
-	 * 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. For more
-	 *   details on how to make classes serializable, see the Java Object Serialization
-	 *   Specification. 
-	 */
-	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);
-		}
-	}
-	
-	/**
-	 * 9.2.9 Entity bean's primary key class
-	 *  - 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.
-	 */
-	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 de90c77..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateRemote.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- * 6.10.5 Session bean's remote interface
- * The following are the requirements for the session bean's remote interface:
- *		- The interface must extend the javax.ejb.EJBObject interface.
- *		- 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 their throws clause must include the java.rmi.RemoteException.
- *		- The remote interface is allowed to have superinterfaces. Use of interface
- *        inheritance is subject to the RMI/IIOP rules for the definition of remote interfaces.
- *		- For each method defined in the remote interface, there must be a matching
- *        method in the session bean's class. 
- *			- The matching method must have:
- *				- The same name.
- *				- The same number and types of arguments, and the same return type.
- *				- All the exceptions defined in the throws clause of the matching 
- *                method of the session bean class must be defined in the throws 
- *                clause of the method of the remote interface.
- *
- * 9.2.7 Entity bean's remote interface
- * The following are the requirements for the entity bean's remote interface:
- * 		- The interface must extend the javax.ejb.EJBObject interface.
- * 		- The methods defined in the remote interface must follow the rules for RMI-IIOP. 
- * 		  This means that their argument and return value types must be valid types for RMI-IIOP, 
- * 		  and their throws clauses must include the java.rmi.RemoteException.
- * 		- The remote interface is allowed to have superinterfaces. Use of interface inheritance 
- *		  is subject to the RMI-IIOP rules for the definition of remote interfaces. 
- * 		- For each method defined in the remote interface, there must be a matching method 
- *		  in the entity bean's class. The matching method must have:
- * 			- The same name.
- *			- The same number and types of its arguments, and the same return type.
- *			- All the exceptions defined in the throws clause of the matching method 
- *			  of the enterprise Bean class must be defined in the throws clause of 
- *			  the method of the remote interface.
- */
-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.
-	 * 
-	 * 6.10.5 Session bean's remote interface
-	 * ...
-	 *		- 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 their throws clause must include the java.rmi.RemoteException.
-	 * ...
-	 *		- For each method defined in the remote interface, there must be a matching
-	 *        method in the session bean's class. 
-	 *			- The matching method must have:
-	 *				- The same name.
-	 *				- The same number and types of arguments, and the same return type.
-	 *				- All the exceptions defined in the throws clause of the matching 
-	 *                method of the session bean class must be defined in the throws 
-	 *                clause of the method of the remote interface.
-	 * ...
-	 * 9.2.7 Entity bean's remote interface
-	 * ...
-	 * 		- The methods defined in the remote interface must follow the rules for RMI-IIOP. 
-	 * 		  This means that their argument and return value types must be valid types for RMI-IIOP, 
-	 * 		  and their throws clauses must include the java.rmi.RemoteException.
-	 * ...
-	 * 		- For each method defined in the remote interface, there must be a matching method 
-	 *		  in the entity bean's class. The matching method must have:
-	 * 			- The same name.
-	 *			- The same number and types of its arguments, and the same return type.
-	 *			- All the exceptions defined in the throws clause of the matching method 
-	 *			  of the enterprise Bean class must be defined in the throws clause of 
-	 *			  the method of the remote interface.
-	 * ...
-	 */
-	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.
-	 *
-	 * The following paragraph is taken from
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * Copyright 1999 Sun Microsystems, Inc.
-	 * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
-	 * All rights reserved.
-	 *
-	 * 6.10.5 Session bean's remote interface
-	 * The following are the requirements for the session bean's remote interface:
-	 *		- The interface must extend the javax.ejb.EJBObject interface.
-	 * ...
-	 *		- The remote interface is allowed to have superinterfaces. Use of interface
-	 *        inheritance is subject to the RMI/IIOP rules for the definition of remote interfaces.
-	 * ...
-	 * 9.2.7 Entity bean's remote interface
-	 * The following are the requirements for the entity bean's remote interface:
-	 * 		- The interface must extend the javax.ejb.EJBObject interface.
-	 * ...
-	 * 		- The remote interface is allowed to have superinterfaces. Use of interface inheritance 
-	 *		  is subject to the RMI-IIOP rules for the definition of remote interfaces.
-	 * ...
-	 */
-	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);
-	}
-	
-	/**
-	 * 6.10.5
-	 * For each method defined in the remote interface, there must be a matching 
-	 * method in the session bean's class. The matching method must have:
-	 *   - The same name.
-	 *   - The same number and types of arguments, and the same return type.
-	 *   - All the exceptions defined in the throws clause of the matching method 
-	 *     of the session bean class must be defined in the throws clause of the 
-	 *     method of the remote interface.
-	 *
-	 * 9.2.7
-	 * For each method defined in the remote interface, there must be a matching 
-	 * method in the entity bean's class. The matching method must have:
-	 *   - The same name.
-	 *   - The same number and types of its arguments, and the same return type.
-	 *   - All the exceptions defined in the throws clause of the matching method 
-	 *     of the enterprise Bean class must be defined in the throws clause of 
-	 *     the method of the remote interface. 
-	 */
-	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.
-	 * 
-	 * 6.10.5 Session bean's remote interface
-	 * ...
-	 *		- 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 their throws clause must include the java.rmi.RemoteException.
-	 * ...
-	 *		- For each method defined in the remote interface, there must be a matching
-	 *        method in the session bean's class. 
-	 *			- The matching method must have:
-	 *				- The same name.
-	 *				- The same number and types of arguments, and the same return type.
-	 *				- All the exceptions defined in the throws clause of the matching 
-	 *                method of the session bean class must be defined in the throws 
-	 *                clause of the method of the remote interface.
-	 * ...
-	 * 9.2.7 Entity bean's remote interface
-	 * ...
-	 * 		- The methods defined in the remote interface must follow the rules for RMI-IIOP. 
-	 * 		  This means that their argument and return value types must be valid types for RMI-IIOP, 
-	 * 		  and their throws clauses must include the java.rmi.RemoteException.
-	 * ...
-	 * 		- For each method defined in the remote interface, there must be a matching method 
-	 *		  in the entity bean's class. The matching method must have:
-	 * 			- The same name.
-	 *			- The same number and types of its arguments, and the same return type.
-	 *			- All the exceptions defined in the throws clause of the matching method 
-	 *			  of the enterprise Bean class must be defined in the throws clause of 
-	 *			  the method of the remote interface.
-	 * ...
-	 */
-	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 d590586..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 3704d09..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 dcf0e3b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidator.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 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;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-/**
- * @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();
-	}
-	
-	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
-	}
-	
-    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(MessageLimitException 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(_validated.containsKey(key)) {
-    		done = (Set)_validated.get(key);
-    	}
-    	else {
-    		done = new HashSet();
-    	}
-    	
-    	done.add(getTargetObjectPool().getTargetObject(targetParent, target));
-    	_validated.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(!_validated.containsKey(key)) {
-    		return false;
-    	}
-    
-    
-    	Set done = (Set)_validated.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) {
-    	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();
-    	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 7e73b75..0000000
--- 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 fe1cf8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ApplicationClientValidator.java
+++ /dev/null
@@ -1,142 +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.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 org.eclipse.jst.j2ee.model.internal.validation.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 {
-	  super.validate(inHelper, inReporter);
-	  try {
-		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 
-	}// 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
-
-}// 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 118eb9d..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 3e75d0e..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 65af05e..0000000
--- 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 c524194..0000000
--- 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 6967167..0000000
--- 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 1e33987..0000000
--- 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 70bc986..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.internal.ejb.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 1ee5bd7..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 7dcace1..0000000
--- 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 79aee23..0000000
--- 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 2edf00a..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 f40ec25..0000000
--- 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 62b3fc4..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-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 890d482..0000000
--- 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 0670f82..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ConnectorValidator.java
+++ /dev/null
@@ -1,104 +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;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-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 {
-			super.validate(inHelper, inReporter);
-			try {
-				setRarFile( (RARFile) inHelper.loadModel(CONNECTOR_MODEL_NAME));
-				if ( rarFile != null ) {
-					setConnectorDD( rarFile.getDeploymentDescriptor() );
-				} else {
-					IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_INVALID_CONNECTOR_FILE);
-					throw new ValidationException(errorMsg);
-				}// if
-			} 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);
-			}// try 
-		}// validate
-		
-
-}
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 3bd98fe..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/DuplicatesTable.java
+++ /dev/null
@@ -1,152 +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.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 {
-	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/EARMessageConstants.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EARMessageConstants.java
deleted file mode 100644
index 6abe0bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EARMessageConstants.java
+++ /dev/null
@@ -1,49 +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 EARMessageConstants extends J2EEMessageConstants {
-	public static final String EAR_VALIDATOR_ID = "EAR_VALIDATOR"; //$NON-NLS-1$
-	public static final String EAR_MODEL_NAME = "EAR_VALIDATION"; //$NON-NLS-1$
-	public static final String ERROR_EAR_VALIDATION_FAILED = "ERROR_EAR_VALIDATION_FAILED"; //$NON-NLS-1$
-	public static final String ERROR_EAR_INVALID_EAR_FILE = "ERROR_EAR_INVALID_EAR_FILE"; //$NON-NLS-1$
-	public static final String ERROR_EAR_DUPLICATE_ROLES = "ERROR_EAR_DUPLICATE_ROLES"; //$NON-NLS-1$
-	public static final String MESSAGE_EAR_NO_MODULE_URI = "MESSAGE_EAR_NO_MODULE_URI"; //$NON-NLS-1$
-	public static final String MESSAGE_EAR_MISSING_URI = "MESSAGE_EAR_MISSING_URI"; //$NON-NLS-1$
-	public static final String EAR_DD_PARSE_LINECOL = "EAR_DD_PARSE_LINECOL"; //$NON-NLS-1$
-	
-	public static final String MODULE_DD_PARSE_LINECOL = "MODULE_DD_PARSE_LINECOL_ERROR_"; //$NON-NLS-1$
-	public static final String MODULE_DD_PARSE_NOINFO = "MODULE_DD_PARSE_NOINFO_ERROR_"; //$NON-NLS-1$
-	public static final String MODULE_DD_PARSE_LINE = "MODULE_DD_PARSE_LINE_ERROR_"; //$NON-NLS-1$
-	public static final String EAR_DD_PARSE_LINE = "EAR_DD_PARSE_LINE"; //$NON-NLS-1$
-	public static final String EAR_DD_CANNOT_OPEN_DD = "EAR_DD_CANNOT_OPEN_DD"; //$NON-NLS-1$
-	public static final String EAR_DD_PARSE_NOINFO = "EAR_DD_PARSE_NOINFO"; //$NON-NLS-1$
-	
-	public static final String MESSAGE_EAR_DUPLICATE_URI_ERROR_ = "MESSAGE_EAR_DUPLICATE_URI_ERROR_"; //$NON-NLS-1$
-	public static final String MESSAGE_INVALID_ALT_DD_WARN_ = "MESSAGE_INVALID_ALT_DD_WARN_"; //$NON-NLS-1$
-	public static final String MESSAGE_EMPTY_ALT_DD_ERROR_ = "MESSAGE_EMPTY_ALT_DD_ERROR_"; //$NON-NLS-1$
-	public static final String UNRESOLVED_EJB_REF_WARN_= "UNRESOLVED_EJB_REF_WARN_"; //$NON-NLS-1$
-	public static final String ERROR_READING_MANIFEST_ERROR_ = "ERROR_READING_MANIFEST_ERROR_"; //$NON-NLS-1$
-	public static final String MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_ = "MANIFEST_LINE_EXCEEDS_LENGTH_ERROR_"; //$NON-NLS-1$
-	public static final String MANIFEST_LINE_END_ERROR_ = "MANIFEST_LINE_END_ERROR_"; //$NON-NLS-1$
-	public static final String MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_ = "MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_"; //$NON-NLS-1$
-	public static final String URI_CONTAINS_SPACES_ERROR_ = "URI_CONTAINS_SPACES_ERROR_"; //$NON-NLS-1$
-	public static final String MESSAGE_INCOMPATIBLE_SPEC_WARNING_ = "MESSAGE_INCOMPATIBLE_SPEC_WARNING_"; //$NON-NLS-1$
-	public static final String EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_ = "EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_"; //$NON-NLS-1$
-	public static final String EAR_VALIDATION_INTERNAL_ERROR_UI_ ="EAR_VALIDATION_INTERNAL_ERROR_UI_"; //$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 a7b7a05..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java
+++ /dev/null
@@ -1,252 +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.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.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-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.MessageLimitException;
-
-/**
- * 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(MessageLimitException e) {
-			throw e;
-		}
-		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 b41bfbd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar11VRule.java
+++ /dev/null
@@ -1,595 +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.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.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.jst.j2ee.internal.common.CommonPackage;
-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.MessageLimitException;
-
-/**
- * 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(MessageLimitException exc) {
-					throw exc;
-				}
-				catch(ValidationException e) {
-					throw e;
-				}
-				catch (Throwable exc) {
-					addInternalErrorMessage(vc, exc);
-				}
-				finally {
-					EJBValidationRuleFactory.getFactory().release(vRule);
-				}
-			}
-			catch (MessageLimitException e) {
-				throw e;
-			}
-			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 ed7112e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBJar20VRule.java
+++ /dev/null
@@ -1,884 +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.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.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.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.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-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.MessageLimitException;
-
-/**
- * @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(MessageLimitException e) {
-					throw e;
-				}
-				catch(ValidationException e) {
-					throw e;
-				}
-				catch(Throwable exc) {
-					addInternalErrorMessage(vc, exc);
-				}
-				finally {
-					EJBValidationRuleFactory.getFactory().release(vRule);
-				}
-				
-			}
-			catch (MessageLimitException e) {
-				throw e;
-			}
-			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);
-				}
-				
-				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 9c07d40..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationContext.java
+++ /dev/null
@@ -1,197 +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.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;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-
-import org.eclipse.jem.util.logger.LogEntry;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * @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) throws MessageLimitException {
-		if(message == null) {
-			return;
-		}
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId) throws MessageLimitException {
-		IMessage message = new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId);
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId, String[] parms) throws MessageLimitException {
-		IMessage message = new Message(IEJBValidatorConstants.BUNDLE_NAME,severity,messageId,parms);
-		getReporter().addMessage(getValidator(), message);
-	}
-	
-	public void addMessage(int severity, String messageId, Object target) throws MessageLimitException {
-		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) throws MessageLimitException {
-		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) throws MessageLimitException {
-		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) throws MessageLimitException {
-		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 522bf68..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidationRuleFactory.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-import java.util.HashMap;
-import java.util.logging.Level;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-/**
- * Core EJB Validation rules
- */
-public class EJBValidationRuleFactory extends AbstractEJBValidationRuleFactory {
-	private static EJBValidationRuleFactory _inst = null;
-	private Logger logger = null;
-	
-	public EJBValidationRuleFactory() {
-		createRuleList();
-	}
-	
-	public static EJBValidationRuleFactory getFactory() {
-		if(_inst == null) {
-			_inst = new EJBValidationRuleFactory();
-		}
-		return _inst;
-	}
-	protected Logger getMsgLogger(){
-	    if(logger == null)
-	        logger = Logger.getLogger(IEJBValidatorConstants.J2EE_CORE_PLUGIN);
-	    return logger;
-	}
-	private void createRuleList() {
-		_ruleList = new HashMap();
-
-		_ruleList.put(IValidationRuleList.EJB11_EJBJAR, new org.eclipse.jst.j2ee.model.internal.validation.EJBJar11VRule());
-		_ruleList.put(IValidationRuleList.EJB20_EJBJAR, new org.eclipse.jst.j2ee.model.internal.validation.EJBJar20VRule());
-	
-		_ruleList.put(IValidationRuleList.EJB11_ENTERPRISEBEAN, new org.eclipse.jst.j2ee.model.internal.validation.EnterpriseBean11VRule());
-		_ruleList.put(IValidationRuleList.EJB20_ENTERPRISEBEAN, new org.eclipse.jst.j2ee.model.internal.validation.EnterpriseBean20VRule());
-		
-		_ruleList.put(IValidationRuleList.EJB11_SESSION_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateSessionBean());
-		_ruleList.put(IValidationRuleList.EJB11_SESSION_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.ValidateSessionRemote());
-		_ruleList.put(IValidationRuleList.EJB11_SESSION_HOME, new org.eclipse.jst.j2ee.model.internal.validation.ValidateSessionHome());
-		
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_HOME, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.StatelessSessionLocalHomeVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_HOME, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.StatefulSessionLocalHomeVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB11_CMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateCMPBean());
-		_ruleList.put(IValidationRuleList.EJB11_CMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.ValidateCMPRemote());
-		_ruleList.put(IValidationRuleList.EJB11_CMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateCMPKey());
-		
-		_ruleList.put(IValidationRuleList.EJB20_CMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.CMPBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.CMPRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_HOME, new org.eclipse.jst.j2ee.model.internal.validation.CMPRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.CMPLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.CMPLocalHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_CMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.CMPKeyClassVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB11_BMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPBean());
-		_ruleList.put(IValidationRuleList.EJB11_BMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPRemote());
-		_ruleList.put(IValidationRuleList.EJB11_BMP_HOME, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPHome());
-		_ruleList.put(IValidationRuleList.EJB11_BMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.ValidateBMPKey());
-
-		_ruleList.put(IValidationRuleList.EJB20_BMP_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.BMPBeanClassVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_REMOTE, new org.eclipse.jst.j2ee.model.internal.validation.BMPRemoteComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_HOME, new org.eclipse.jst.j2ee.model.internal.validation.BMPRemoteHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_LOCAL, new org.eclipse.jst.j2ee.model.internal.validation.BMPLocalComponentVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_LOCALHOME, new org.eclipse.jst.j2ee.model.internal.validation.BMPLocalHomeVRule());
-		_ruleList.put(IValidationRuleList.EJB20_BMP_KEYCLASS, new org.eclipse.jst.j2ee.model.internal.validation.BMPKeyClassVRule());
-		
-		_ruleList.put(IValidationRuleList.EJB20_MESSAGE_BEANCLASS, new org.eclipse.jst.j2ee.model.internal.validation.MessageDrivenBeanClassVRule());
-		
-		addDependentRuleToRuleList();
-		logAllDependentRules();
-	}
-	
-	/**
-	 * If the IFileDelta represents a static load model (i.e., the file name is always the same),
-	 * then return the Integer which loads that model. Otherwise return null.
-	 */
-	public  Object getRuleId(IEJBValidationContext vc, String fileName) {
-		if(fileName == null) {
-			Logger aLogger = vc.getMsgLogger();
-			if (aLogger != null && aLogger.isLoggingLevel(Level.FINE)) {
-				aLogger.write(Level.FINE, "Cannot load rule from fileName: " + fileName); //$NON-NLS-1$
-			}
-			return null;
-		}
-
-		EJBJar ejbJar = getEJBJar(vc);
-
-		if(fileName.endsWith(J2EEConstants.EJBJAR_DD_SHORT_NAME)) {
-			if(ejbJar.getVersionID() == J2EEVersionConstants.EJB_1_1_ID) {
-				return IValidationRuleList.EJB11_EJBJAR;
-			}
-			return IValidationRuleList.EJB20_EJBJAR;
-		}
-		return null; // must be a JavaClass
-	}
-	
-	/**
-	 * If the IFileDelta represents a dynamic load model (i.e., the file name can be changed by the
-	 * user), then return the Integer which loads that model. Return null if no such model exists.
-	 */
-	public final Object getRuleId(IEJBValidationContext vc, JavaClass clazz, EnterpriseBean bean) {
-		// Return the rule id which will validate the JavaClass as the 
-		// type which it is used as by the EnterpriseBean.
-		if((clazz == null) || (bean == null)) {
-			Logger aLogger = vc.getMsgLogger();
-			if (aLogger != null && aLogger.isLoggingLevel(Level.FINE)) {
-				aLogger.write(Level.FINE, "Cannot load rule because either bean (" + bean + ") or class (" + clazz + ") is null"); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-			}
-			return null;
-		}
-		
-		boolean isStatelessSession = (bean.isSession() && ValidationRuleUtility.isStateless(bean));
-		boolean isStatefulSession = (bean.isSession() && ValidationRuleUtility.isStateful(bean));
-		
-		if(bean.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID) {
-			if(clazz.equals(bean.getEjbClass())) {
-				if(isStatelessSession) {
-						return IValidationRuleList.EJB20_STATELESS_SESSION_BEANCLASS;
-				}
-				else if(isStatefulSession) {
-						return IValidationRuleList.EJB20_STATEFUL_SESSION_BEANCLASS;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_BEANCLASS;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_BEANCLASS;
-				}
-				else if(bean.isMessageDriven()) {
-					return IValidationRuleList.EJB20_MESSAGE_BEANCLASS;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger != null && aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getEjbClass()"); //$NON-NLS-1$
-					}
-					
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getRemoteInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_REMOTE;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_REMOTE;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_REMOTE;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_REMOTE;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getRemoteInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getHomeInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_HOME;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_HOME;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_HOME;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_HOME;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getHomeInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getLocalHomeInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_LOCALHOME;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_LOCALHOME;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_LOCALHOME;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_LOCALHOME;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getLocalHomeInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getLocalInterface())) {
-				if(isStatelessSession) {
-					return IValidationRuleList.EJB20_STATELESS_SESSION_LOCAL;
-				}
-				else if(isStatefulSession) {
-					return IValidationRuleList.EJB20_STATEFUL_SESSION_LOCAL;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB20_CMP_LOCAL;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB20_BMP_LOCAL;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(bean.getLocalInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(bean instanceof Entity) {
-				if(clazz.equals(((Entity)bean).getPrimaryKey())) {
-					if(bean.isContainerManagedEntity()) {
-						ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-						// If it's a primitive primary key, it's exempt from these checks.
-						if(ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-							return null;
-						}
-						else if(ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-							return null;
-						}
-						return IValidationRuleList.EJB20_CMP_KEYCLASS;
-					}
-					else if(bean.isBeanManagedEntity()) {
-						return IValidationRuleList.EJB20_BMP_KEYCLASS;
-					}
-					else {
-						Logger aLogger = vc.getMsgLogger();
-						if (aLogger.isLoggingLevel(Level.FINE)) {
-							aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X() && clazz.equals(((Entity)bean).getPrimaryKey()"); //$NON-NLS-1$
-						}
-						return null;
-					}
-				}
-			}
-			
-			Logger aLogger = vc.getMsgLogger();
-			if (aLogger.isLoggingLevel(Level.FINE)) {
-				aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion2_X()"); //$NON-NLS-1$
-			}
-			return null;
-		}
-		else if(bean.getVersionID() <= J2EEVersionConstants.EJB_1_1_ID) {
-			if(clazz.equals(bean.getEjbClass())) {
-				if(bean.isSession()) {
-						return IValidationRuleList.EJB11_SESSION_BEANCLASS;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB11_CMP_BEANCLASS;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB11_BMP_BEANCLASS;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(bean.getEjbClass()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getRemoteInterface())) {
-				if(bean.isSession()) {
-					return IValidationRuleList.EJB11_SESSION_REMOTE;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB11_CMP_REMOTE;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB11_BMP_REMOTE;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(bean.getRemoteInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(clazz.equals(bean.getHomeInterface())) {
-				if(bean.isSession()) {
-					return IValidationRuleList.EJB11_SESSION_HOME;
-				}
-				else if(bean.isContainerManagedEntity()) {
-					return IValidationRuleList.EJB11_CMP_HOME;
-				}
-				else if(bean.isBeanManagedEntity()) {
-					return IValidationRuleList.EJB11_BMP_HOME;
-				}
-				else {
-					Logger aLogger = vc.getMsgLogger();
-					if (aLogger.isLoggingLevel(Level.FINE)) {
-						aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(bean.getHomeInterface()"); //$NON-NLS-1$
-					}
-					return null;
-				}
-			}
-			else if(bean instanceof Entity) {
-				if(clazz.equals(((Entity)bean).getPrimaryKey())) {
-					if(bean.isContainerManagedEntity()) {
-						ContainerManagedEntity cmp = (ContainerManagedEntity)bean;
-						// If it's a primitive primary key, it's exempt from these checks.
-						if(ValidationRuleUtility.isPrimitivePrimaryKey(cmp)) {
-							return null;
-						}
-						else if(ValidationRuleUtility.usesUnknownPrimaryKey(cmp)) {
-							return null;
-						}
-						return IValidationRuleList.EJB11_CMP_KEYCLASS;
-					}
-					else if(bean.isBeanManagedEntity()) {
-						return IValidationRuleList.EJB11_BMP_KEYCLASS;
-					}
-					else {
-						Logger aLogger = vc.getMsgLogger();
-						if (aLogger.isLoggingLevel(Level.FINE)) {
-							aLogger.write(Level.FINE, "Cannot load rule: bean.isVersion1_X() && clazz.equals(((Entity)bean).getPrimaryKey()"); //$NON-NLS-1$
-						}
-						return null;
-					}
-				}
-			}
-		}
-		
-		Logger aLogger = vc.getMsgLogger();
-		if (aLogger.isLoggingLevel(Level.FINE)) {
-			aLogger.write(Level.FINE, "Cannot load rule: !bean.isVersion1_X() && !bean.isVersion2_X()"); //$NON-NLS-1$
-		}
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidator.java
deleted file mode 100644
index afc6128..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBValidator.java
+++ /dev/null
@@ -1,500 +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.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.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.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.MessageLimitException;
-
-/**
- * @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$
-	}
-
-	/*
-	 * @see IValidator#validate(IValidationContext, IReporter, IFileDelta[])
-	 */
-	public void validate(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);
-		}
-		
-		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);
-		}
-	}
-	
-	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 = (String)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(MessageLimitException 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 {
-		Set validatedClasses = new HashSet();
-		
-		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
-				JavaClass[] children = (JavaClass[])vc.loadModel(EJBValidatorModelEnum.CHILDREN, new Object[]{vc.getReporter(), validatedClasses});
-				validatedClasses.clear(); // Don't need this cache any more; free the memory.
-				if((children != null) && (children.length > 0)) {
-					Iterator bciterator = null;
-					Object id = null;
-					for(int c=0; c<children.length; c++) {
-						JavaClass child = children[c];
-						List beans = (List)vc.loadModel(EJBValidatorModelEnum.EJB, new Object[]{child});
-						if((beans == null) || (beans.size() == 0)) {
-							// The child is not a member of an enterprise bean.
-							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);
-							if(clazzRule == null) {
-								// This has already been logged by the AbstractEJBValidationRuleFactory, so just
-								// need to add "Cannot validate" to the task list.
-								continue;
-							}
-		
-							setValidated(clazzRule.getId(), bean, child);
-						}
-					}
-				}
-			}
-			
-			// 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(MessageLimitException 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);
-        
-    }
-	
-}
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 5848240..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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/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 90310e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java
+++ /dev/null
@@ -1,725 +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.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.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.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-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.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientImpl;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.common.impl.EjbRefImpl;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-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;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (12/6/2000 11:08:55 AM)
- * @author: Administrator
- */
-public class EarValidator extends org.eclipse.jst.j2ee.model.internal.validation.J2EEValidator implements EARMessageConstants {
-	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$
-	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();
-	}// validate
-	
-	/**
-	 * Does the validation
-	 */
-	public void validate(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-		inReporter.removeAllMessages(this);
-		super.validate(inHelper, inReporter);
-		try {
-			earFile = (EARFile) _helper.loadModel(EAR_MODEL_NAME);
-			if (earFile != null) {
-				appDD = earFile.getDeploymentDescriptor();
-				if (appDD != null && appDD.eResource() != null && appDD.eResource().isLoaded())
-					validate();
-				else {
-					IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, EAR_DD_CANNOT_OPEN_DD, new String[] { getResourceName()});
-					throw new ValidationException(errorMsg);
-				}
-			} else {
-				IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_EAR_INVALID_EAR_FILE, new String[] { getResourceName()});
-				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);
-			IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, EAR_VALIDATION_INTERNAL_ERROR_UI_, param);
-			throw new ValidationException(errorMsg, e);
-		} // try 
-	} // validate
-	
-	public void validate(IValidationContext inHelper, IReporter inReporter,Application app) throws ValidationException {
-
-		super.validate(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
-
-		try {
-			appDD = app;
-			validate();
-			
-		} 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_EAR_VALIDATION_FAILED, parms );
-			throw new ValidationException(errorMsg, e);
-		}
-	}
-	
-	/**
-	 * 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;
-				addWarning(getBaseName(), ERROR_EAR_DUPLICATE_ROLES, params, appDD );
-			}// if
-		}// for
-	}// validateEarRoles
-	
-	/**
-	 * validateRefs(WebApp) - validate EJB  references
-	 * 
-	 * @param EjbRef eref - An ejb ref.
-	 * @param Sting uri - The uri of the module.
-	 */
-	public void validateEJBRefMandatoryElements(List ejbRefs, String uri) {
-	 for(int i = 0; i < ejbRefs.size(); i++) {
-	  EjbRef eref = (EjbRef) ejbRefs.get(i);
-	  String refName = eref.getName();
-	  String[] params = new String[2];
-	  params[0] = refName;
-	  params[1] = uri;
-	  
-	  if ((eref.getName().trim() == null) || (eref.getName().trim().length() == 0)) {
-		addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFNAME, params);
-	  }// if
-	  if (eref.isSetType())
-	    {if(eref.getType() == null ) 
-		  addWarning(EREF_CATEGORY, ERROR_EAR_INVALID_EREFTYPE, params);}
-	  else 
-	  	 addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFTYPE, params);
-	  // if
-	  if ((eref.getHome() == null) || (eref.getHome().trim().length() == 0)) {
-		addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFHOME, params);
-	  }// if
-	  if ((eref.getRemote() == null) || (eref.getRemote().trim().length() == 0)) {
-		addWarning(EREF_CATEGORY, ERROR_EAR_MISSING_EREFREMOTE, params);
-	  }
-	 }
-	}
-	
-	/**
-	 * Compare the ejb interfaces to check if they are similar.
-	 * 
-	 * @param EjbRef eref - The ejb reference.
-	 * @param EnterpriseBean ejb - The enterprise bean
-	 */
-	public boolean isSimilarEJBInterface(EjbRef eref, EnterpriseBean ejb) {
-		
-		if( eref.isLocal() ) {
-			if( ejb.getLocalHomeInterfaceName() == null ||
-				ejb.getLocalInterfaceName() == null || 
-				((EJBLocalRef)eref).getLocalHome() == null  || 
-				((EJBLocalRef)eref).getLocal() == null ) {
-				return false;
-			}// if
-			
-			boolean isHomeLocalOk = ejb.getLocalHomeInterfaceName().equals(((EJBLocalRef)eref).getLocalHome());
-			boolean isRemoteLocalOk =  ejb.getLocalInterfaceName().equals(((EJBLocalRef)eref).getLocal());
-		 	return isHomeLocalOk && isRemoteLocalOk;
-		}// if
-		
-		if( ejb.getHomeInterfaceName() == null ||
-			ejb.getRemoteInterfaceName() == null || 
-			eref.getHome() == null  || 
-			eref.getRemote() == null ) {
-			return false;
-		}// if
-		
-		boolean isHomeOk = ejb.getHomeInterfaceName().equals( eref.getHome() );
-		boolean isRemoteOk = ejb.getRemoteInterfaceName().equals( eref.getRemote() );
-		
-		return isHomeOk && isRemoteOk;
-	}// isSimilarEJBInterface
-		
-	/**
-	 * validate for duplicates in EAR Roles
-	 * 
-	 * @param List ejbRefs - List of ejb refs.
-	 * @param String uri - The uri of the module.
-	 */
-	public void validateEJBRefs(List ejbRefs, String uri) {
-	  for (int i = 0; i < ejbRefs.size(); i++) {
-	  	  EjbRef eref = (EjbRef) ejbRefs.get(i);
-		  if( eref != null && eref.getLink() != null && eref.getLink().length() > 0) {
-		  	EnterpriseBean ejb = earFile.getEnterpiseBeanFromRef( eref, uri );
-		  	if( ejb == null ) {
-		  		String[] params = new String[3];
-				params[0] = eref.getName();
-				params[1] = uri;
-				params[2] = earFile.getName();
-		  		addWarning(EREF_CATEGORY,UNRESOLVED_EJB_REF_WARN_,params);
-		  	} else {
-		  		if( !isSimilarEJBInterface( eref, ejb ) ) {
-		  			String[] params = new String[3];
-					params[0] = ejb.getName();
-					params[1] = eref.getName();
-					params[2] = uri;
-		  			addError( getBaseName(), EJB_BEAN_EJB_LINK_INTEFACE_MISMATCH_ERROR_, params, 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$
-		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)) {
-				addError(getBaseName(), 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;
-					addError(getBaseName(), URI_CONTAINS_SPACES_ERROR_, params, 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();
-				addError(getBaseName(), MESSAGE_EAR_DUPLICATE_URI_ERROR_, params, 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();
-			addError(getBaseName(), MESSAGE_EMPTY_ALT_DD_ERROR_, params, appDD);
-		} else if (altDD != null && !earFile.isDuplicate(altDD)) {
-			String[] params = new String[3];
-			params[0] = m.getUri();
-			params[1] = altDD;
-			params[2] = earFile.getName();
-			addWarning(getBaseName(), MESSAGE_INVALID_ALT_DD_WARN_, params, appDD);
-		}// if
-	}// validateAltDD
-	
-	/**
-	 * validate EJB and resource references
-	 */
-	public void validateRefs() {
-		List moduleList = earFile.getModuleRefs();
-		for (int i = 0; i < moduleList.size(); i++) {
-			
-			ModuleRef ref = (ModuleRef) moduleList.get(i);
-			try {
-				if(ref.isWeb()) {
-					validateWebAppRefs(ref);				}  
-				else if( ref.isEJB() ) {
-				    validateEJBModuleRefs(ref);
-				} else if(ref.isClient())
-					validateAppClientRefs(ref);
-			} catch (ArchiveWrappedException ex) {
-				Exception nested = ex.getNestedException();
-				if (!(nested instanceof NoModuleFileException)) 
-					Logger.getLogger().logError(ex);
-				//otherwise ignore it; there are other validations for this
-			} 
-			
-		}
-	}	
-	
-	/**
-	 * @param ref
-	 */
-	private void validateAppClientRefs(ModuleRef ref) throws ArchiveWrappedException {
-		ApplicationClient appClient = (ApplicationClientImpl)ref.getDeploymentDescriptor();
-		List ejbRefs = new ArrayList();
-	    ejbRefs.addAll(appClient.getEjbReferences());
-		validateEJBRefMandatoryElements(ejbRefs, ref.getUri());
-		validateEJBRefs(ejbRefs, ref.getUri());
-		if (appClient != null && appClient.getVersionID() <= J2EEVersionConstants.J2EE_1_3_ID) {
-			Set allRefs = new HashSet();
-			List resourceRefs = appClient.getResourceRefs();
-			List resourceEnvRefs = appClient.getResourceEnvRefs();
-			List serviceRefs = appClient.getServiceRefs();
-			    
-			validateDuplicateEJBRefs(allRefs,ejbRefs);
-			validateDuplicateResourceRefs(allRefs,resourceRefs);
-			validateDuplicateResourceEnvRefs(allRefs,resourceEnvRefs);
-			validateDuplicateServiceRefs(allRefs,serviceRefs);
-		}
-		
-	}
-
-	/**
-	 * @param ref
-	 * @throws ArchiveWrappedException
-	 */
-	private void validateWebAppRefs(ModuleRef ref) throws ArchiveWrappedException {
-		WebApp webApp = (WebApp)ref.getDeploymentDescriptor();
-		List ejbRefs = new ArrayList();
-	    ejbRefs.addAll(webApp.getEjbRefs());
-	    ejbRefs.addAll(webApp.getEjbLocalRefs());
-		validateEJBRefMandatoryElements(ejbRefs, ref.getUri());
-		validateEJBRefs(ejbRefs, ref.getUri());
-		if (webApp != null && webApp.getVersionID() <= J2EEVersionConstants.WEB_2_3_ID) {
-			Set allRefs = new HashSet();
-			List resourceRefs = webApp.getResourceRefs();
-			List resourceEnvRefs = webApp.getResourceEnvRefs();
-			List serviceRefs = webApp.getServiceRefs();
-			
-			validateDuplicateEJBRefs(allRefs,ejbRefs);
-			validateDuplicateResourceRefs(allRefs,resourceRefs);
-			validateDuplicateResourceEnvRefs(allRefs,resourceEnvRefs);
-			validateDuplicateServiceRefs(allRefs,serviceRefs);
-		}
-	}
-	/**
-	 * @param ref
-	 * @throws ArchiveWrappedException
-	 */
-	private void validateEJBModuleRefs(ModuleRef ref) throws ArchiveWrappedException {
-		EJBJar ejbJar = (EJBJar)ref.getDeploymentDescriptor();
-		if( ejbJar != null ) {
-			List ejbCollection = ejbJar.getEnterpriseBeans();			
-			if( ejbCollection != null || !ejbCollection.isEmpty() ) {
-				Resource res = ejbJar.eResource();
-				cleanUpAllRefSubTaskMessages(res);
-				Iterator iterator = ejbCollection.iterator();	
-				while( iterator.hasNext() ) {
-					EnterpriseBean ejbBean = (EnterpriseBean)iterator.next();
-					if( ejbBean != null ) {
-					    List ejbRefs = new ArrayList();
-					    ejbRefs.addAll(ejbBean.getEjbRefs());
-					    ejbRefs.addAll(ejbBean.getEjbLocalRefs());
-						validateEJBRefMandatoryElements(ejbRefs, ref.getUri());
-						validateEJBRefs(ejbRefs, ref.getUri());
-						if(ejbJar.getVersionID() <= J2EEVersionConstants.EJB_2_0_ID) {
-							Set allRefs = new HashSet();
-							List resourceRefs = ejbBean.getResourceRefs();
-							List resourceEnvRefs = ejbBean.getResourceEnvRefs();
-							List secRoleRefs = ejbBean.getSecurityRoleRefs();
-							List serviceRefs = ejbBean.getServiceRefs();
-							List messageDestRefs = ejbBean.getMessageDestinationRefs();
-							    
-							validateDuplicateEJBRefs(allRefs,ejbRefs);
-							validateDuplicateResourceRefs(allRefs,resourceRefs);
-							validateDuplicateResourceEnvRefs(allRefs,resourceEnvRefs);
-							validateDuplicateSecurityRoleRefs(allRefs,secRoleRefs);
-							validateDuplicateServiceRefs(allRefs,serviceRefs);
-							validateDuplicateMessageDestRefs(allRefs,messageDestRefs);
-					   }
-					}
-				}
-			}
-		}
-	 
-	}
-
-	/**
-	 * @param allRefs
-	 * @param serviceRefs
-	 */
-	private void validateDuplicateServiceRefs(Set allRefs, List serviceRefs) {
-		if (!serviceRefs.isEmpty()) {
-			ServiceRef firstRef = (ServiceRef)(serviceRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < serviceRefs.size(); refNo++) {
-			ServiceRef ref = (ServiceRef) (serviceRefs.get(refNo));
-			String refName = ref.getServiceRefName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_SERVICEREF, parms,ref,SERVICE_REF_GROUP_NAME);
-		}
-	  }
-	}
-
-	/**
-	 * @param allRefs
-	 * @param secRoleRefs
-	 */
-	private void validateDuplicateSecurityRoleRefs(Set allRefs, List secRoleRefs) {
-		if (!secRoleRefs.isEmpty()) {
-			SecurityRoleRef firstRef = (SecurityRoleRef)(secRoleRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < secRoleRefs.size(); refNo++) {
-			SecurityRoleRef ref = (SecurityRoleRef) (secRoleRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_SECURITYROLEREF, parms,ref,SEC_ROLE_REF_GROUP_NAME);
-		}
-	  }
-	}
-
-	/**
-	 * @param allRefs
-	 * @param resourceEnvRefs
-	 */
-	private void validateDuplicateResourceEnvRefs(Set allRefs, List resourceEnvRefs) {
-		if (!resourceEnvRefs.isEmpty()) {
-			ResourceEnvRef firstRef = (ResourceEnvRef)(resourceEnvRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < resourceEnvRefs.size(); refNo++) {
-			ResourceEnvRef ref = (ResourceEnvRef) (resourceEnvRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_RESENVREF, parms,ref,RES_ENV_REF_GROUP_NAME);
-		}
-	  }
-	}
-
-	/**
-	 * @param allRefs
-	 * @param resourceRefs
-	 */
-	private void validateDuplicateResourceRefs(Set allRefs, List resourceRefs) {
-		if (!resourceRefs.isEmpty()) {
-			ResourceRef firstRef = (ResourceRef)(resourceRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < resourceRefs.size(); refNo++) {
-			ResourceRef ref = (ResourceRef) (resourceRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_RESREF, parms,ref,RES_REF_GROUP_NAME);
-		}
-	  }
-	}
-	/**
-	 * @param allRefs
-	 * @param ejbRefs
-	 */
-	protected void validateDuplicateEJBRefs(Set allRefs, List ejbRefs) {
-		if (!ejbRefs.isEmpty()) {
-			EjbRef firstRef = (EjbRef)(ejbRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < ejbRefs.size(); refNo++) {
-			EjbRef ref = (EjbRefImpl) (ejbRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_EJBREF, parms, ref, EJB_REF_GROUP_NAME);
-		 }
-		}
-	}
-	
-	/**
-	 * @param allRefs
-	 * @param ejbRefs
-	 */
-	protected void validateDuplicateMessageDestRefs(Set allRefs, List messageDestRefs) {
-		if (!messageDestRefs.isEmpty()) {
-			MessageDestinationRef firstRef = (MessageDestinationRef)(messageDestRefs.get(0));
-		if(!(firstRef.eContainer() instanceof EnterpriseBean))
-			cleanUpSubTaskMessages(firstRef);
-		for (int refNo = 0; refNo < messageDestRefs.size(); refNo++) {
-			MessageDestinationRef ref = (MessageDestinationRef) (messageDestRefs.get(refNo));
-			String refName = ref.getName();
-			String[] parms = new String[1];
-			parms[0] = refName;
-			if (!(allRefs.add(refName)))
-			  addError(EREF_CATEGORY, ERROR_EAR_DUPLICATE_MESSSAGEDESTINATIONREF, parms,ref, MESSAGE_REF_GROUP_NAME);
-		 }
-		}
-	}
-
-	/**
-	 * @param firstRef
-	 */
-	protected void cleanUpSubTaskMessages(EObject ref) {
-		//No Op - subclass overrides 
-	}
-	
-	protected void cleanUpAllRefSubTaskMessages(Resource res) {
-		//No Op - subclass overrides 
-	}
-
-	/**
-	 * Ejb refs to the running list of ejb refs.
-	 * 
-	 * @param List currentRefs - List of current ejb refs to be added.
-	 * @param List ejbRefs - collection of running ejbrefs
-	 */
-	public void addEJBRefs( List currentRefs, List ejbRefs ) {		
-		if( currentRefs == null || ejbRefs == null )
-			return;
-		
-		ejbRefs.addAll( currentRefs );									
-	}// addEJBRefs
-
-	/**
-	 * validate security constraints, roles, and security role refs.
-	 */
-	public void validateSecurity() {
-		EList earRoleList = appDD.getSecurityRoles();
-		if (!earRoleList.isEmpty())
-			validateEarRoles(earRoleList);
-		EList moduleList = appDD.getModules();
-		if (!moduleList.isEmpty()) {
-	
-			for (int i = 0; i < moduleList.size(); i++) {
-				Module m = (Module) moduleList.get(i);
-				if (m.isEjbModule()) {
-					EList ejbRoles = m.getApplication().getSecurityRoles();
-					if (!ejbRoles.isEmpty())
-						validateEJBRolesWithEARRoles(earRoleList, ejbRoles);
-				}// if
-				if (m.isWebModule()) {
-					EList webRoles = m.getApplication().getSecurityRoles();
-					if (!webRoles.isEmpty())
-						validateWEBRolesWithEARRoles(earRoleList, webRoles);
-				}// if
-			}// for
-		}// if
-	}// validateSecurity
-	
-	/**
-	 * Validates an ear for duplicate web contexts.
-	 */
-	public void validateWebContexts() {
-		
-		EList moduleList = appDD.getModules();
-	  	Map visitedWebContext = new HashMap();
-	  	
-	  	if( !moduleList.isEmpty() ) {		
-			Iterator iterator = moduleList.iterator();		
-			while( iterator.hasNext() ) {
-		  		Module module = (Module)iterator.next();
-		  		if( module.isWebModule() ) {
-		  			
-		  			WebModule webModule = (WebModule)module;
-			  			
-			  		if( webModule != null ) {
-			  			if( visitedWebContext.containsKey( webModule.getContextRoot() ) ) {
-			  				WebModule tempWebModule = (WebModule)visitedWebContext.get( webModule.getContextRoot() );
-							String[] params = new String[3];
-							params[0] = webModule.getContextRoot();
-							params[1] = webModule.getUri();
-							params[2] = tempWebModule.getUri();
-			  				addError(getBaseName(), MESSAGE_EAR_DUPICATE_ROOTCONTEXT_ERROR_, params, 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()};
-					addWarning(getBaseName(), MESSAGE_INCOMPATIBLE_SPEC_WARNING_, params, 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;
-	}
-}// 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 52eb629..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean11VRule.java
+++ /dev/null
@@ -1,1071 +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.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.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.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.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-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.MessageLimitException;
-
-/**
- * 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 (MessageLimitException e) {
-			throw e;
-		}
-		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 0c3ba3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EnterpriseBean20VRule.java
+++ /dev/null
@@ -1,1193 +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.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.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.CMRField;
-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.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-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.MessageLimitException;
-
-/**
- * @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};
-	
-	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);
-			}
-
-			validatePrimKeyClassElement(vc, ejbJar, bean);
-			validateEJBRef(vc, ejbJar, bean);
-		}
-		catch (MessageLimitException e) {
-			throw e;
-		}
-		catch(ValidationCancelledException e) {
-			throw e;
-		}
-		/* unreachable catch block
-		catch(ValidationException exc) {
-			throw 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 != 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;
-		}
-	}
-}
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 b7e13e5..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 aed0fb8..0000000
--- 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 043842b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBInterfaceType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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.MessageLimitException;
-
-
-/**
- * @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, MessageLimitException;
-	public void validateRMI_IIOPTypeRules(IEJBValidationContext vc, EnterpriseBean bean, JavaClass clazz, Method method, List[] methodsExtendedLists, boolean checkReturnType) throws InvalidInputException, ValidationCancelledException, MessageLimitException;
-	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 e7dd493..0000000
--- 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 9c1fd5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IEJBValidationContext.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.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;
-import org.eclipse.wst.validation.internal.provisional.core.MessageLimitException;
-
-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) throws MessageLimitException;
-	public void addMessage(int severity, String messageId) throws MessageLimitException;
-	public void addMessage(int severity, String messageId, String[] parms) throws MessageLimitException;
-	public void addMessage(int severity, String messageId, Object target) throws MessageLimitException;
-	public void addMessage(int severity, String messageId, String[] parms, Object target) throws MessageLimitException;
-	public void addMessage(int severity, String messageId, Object target, String groupName) throws MessageLimitException;
-	public void addMessage(int severity, String messageId, String[] parms, Object target, String groupName) throws MessageLimitException;
-	
-	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 90f88fd..0000000
--- 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 2cdedba..0000000
--- 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 c96f701..0000000
--- 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 4c65942..0000000
--- 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 c6cdcfa..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 0d823f8..0000000
--- 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 32c3b64..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IMessagePrefixEjb20Constants.java
+++ /dev/null
@@ -1,200 +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$
-}
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 4476f1f..0000000
--- 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 fd031af..0000000
--- 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 38511c4..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 608ef1f..0000000
--- 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 01a6509..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 29c390b..0000000
--- 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 0745d33..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/InvalidInputException.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.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 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 7272177..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEMessageConstants.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;
-
-/**
- * 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$
-}
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 c35b846..0000000
--- 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 a88054e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/J2EEValidator.java
+++ /dev/null
@@ -1,511 +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.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.internal.common.impl.ResourceRefImpl;
-import org.eclipse.jst.j2ee.internal.common.impl.SecurityRoleImpl;
-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.wst.validation.internal.provisional.core.IValidator;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (3/9/2001 3:34:39 PM)
- * @author: Administrator
- */
-public abstract class J2EEValidator implements IValidator, J2EEMessageConstants {
-  protected IReporter _reporter;
-  protected IValidationContext _helper;
-
-	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);
-	  
-}
-/**
- * <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));
-}
-/**
- * <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);		   
-}
-/**
- * Perform any resource cleanup once validation is complete. 
- */
-public void cleanup() {
-	//Default
-}
-/**
- * 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.
- * @deprecated Use cleanup()
- */
-public void cleanup(IReporter reporter) {
-	//Default
-}
-/**
- * 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>
- *     "{0} is validating {1}.",
- * </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;
-  }
-}
-/**
-   * Validate EJB references.
-   */
-public 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.
-   */
-public 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.
-   */
-public 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++) {
-	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 7c154c0..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 70cbf91..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 85408bd..0000000
--- 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 aa446a8..0000000
--- 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 ced1f65..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 c08a32f..0000000
--- 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 476d0ba..0000000
--- 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 e97d380..0000000
--- 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 df03406..0000000
--- 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 d8c6323..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 c8cc3d9..0000000
--- 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 ebb83b4..0000000
--- 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 ebfd6fd..0000000
--- 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 f25b17f..0000000
--- 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 6dc852e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPBean.java
+++ /dev/null
@@ -1,544 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- *
- * 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.
- *
- *
- * 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 must define a public constructor that takes no arguments.
- *      - The class must not define the finalize() method.
- *   - 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.
- *
- * 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.4 ejbPostCreate methods
- *   - For each ejbCreate(...) method, the entity bean class must define a matching 
- *     ejbPostCreate(...) method, using the following rules:
- *        - The method name must be ejbPostCreate.
- *        - The method must be declared as public.
- *        - The method must not be declared as final or static.
- *        - The return type must be void.
- *        - The method arguments must be the same as the arguments of the matching ejbCreate(...) 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.RemoteExceptionto 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).
- *
- * 9.2.5 ejbFind methods
- *   - The entity bean class may also define additional ejbFind<METHOD>(...) finder methods.
- *   - The signatures of the finder methods must follow the following rules:
- *   - A finder method name must start with the prefix "ejbFind" 
- *     (e.g. ejbFindByPrimaryKey, ejbFindLargeAccounts, ejbFindLateShipments).
- *   - A finder method must be declared as public.
- *   - The method must not be declared as final or static.
- *   - The method argument types must be legal types for RMI-IIOP.
- *   - 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).
- *   - The throws clause may define arbitrary application specific exceptions, including 
- *     the javax.ejb.FinderException.
- *   - 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).
- *   - 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).
- *
- * 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.
- *        - The business method must be declared as public.
- *        - The method must not be declared as final or static.
- *        - The method argument and return value types must be legal types for RMI-IIOP.
- *        - 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).
- *...
- * 9.2.9 Entity bean's primary key class
- *...
- *  - The primary key type must be a legal Value Type in RMI-IIOP.
- *...
- * 18.1.2 Programming restrictions
- *  This section describes the programming restrictions that a Bean Provider must follow to ensure that the
- *  enterprise bean is portable and can be deployed in any compliant EJB Container. The restrictions apply
- *  to the implementation of the business methods. Section 18.2, which describes the Container's view of
- *  these restrictions, defines the programming environment that all EJB Containers must provide.
- *
- *  - 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.
- *...
- *  - An enterprise Bean must not use thread synchronization primitives to synchronize execution of
- *    multiple instances.
- *...
- *  - An enterprise Bean must not use the AWT functionality to attempt to output information to a
- *    display, or to input information from a keyboard.
- *...
- *  - An enterprise bean must not use the java.io package to attempt to access files and directo-ries
- *    in the file system.
- *...
- *  - An enterprise bean must not attempt to listen on a socket, accept connections on a socket, or
- *    use a socket for multicast.
- *...
- *  - The enterprise bean must not attempt to query a class to obtain information about the declared
- *    members that are not otherwise accessible to the enterprise bean because of the security rules
- *    of the Java language. The enterprise bean must not attempt to use the Reflection API to access
- *    information that the security rules of the Java programming language make unavailable.
- *...
- *  - The enterprise bean must not attempt to create a class loader; obtain the current class loader;
- *    set the context class loader; set security manager; create a new security manager; stop the
- *    JVM; or change the input, output, and error streams.
- *...
- *  - The enterprise bean must not attempt to set the socket factory used by ServerSocket, Socket, or
- *    the stream handler factory used by URL.
- *...
- *  - The enterprise bean must not attempt to manage threads. The enterprise bean must not attempt
- *    to start, stop, suspend, or resume a thread; or to change a thread's priority or name. The enter-prise
- *    bean must not attempt to manage thread groups.
- *...
- *  - The enterprise bean must not attempt to directly read or write a file descriptor.
- *...
- *  - The enterprise bean must not attempt to obtain the security policy information for a particular
- *    code source.
- *...
- *  - The enterprise bean must not attempt to load a native library.
- *...
- *  - The enterprise bean must not attempt to gain access to packages and classes that the usual rules
- *    of the Java programming language make unavailable to the enterprise bean.
- *...
- *  - The enterprise bean must not attempt to define a class in a package.
- *...
- *  - The enterprise bean must not attempt to access or modify the security configuration objects
- *    (Policy, Security, Provider, Signer, and Identity).
- *...
- *  - The enterprise bean must not attempt to use the subclass and object substitution features of the
- *    Java Serialization Protocol.
- *...
- *  - The enterprise bean must not attempt to pass this as an argument or method result. The
- *    enterprise bean must pass the result of SessionContext.getEJBObject() or EntityContext.
- *    getEJBObject() instead.
- *
- */
-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();
-	}
-	
-	/**
-	 * 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.
-	 *        - The business method must be declared as public.
-	 *        - The method must not be declared as final or static.
-	 *        - The method argument and return value types must be legal types for RMI-IIOP.
-	 *        - 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).
-	 */
-	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.
-	}
-	
-	/**
-	 * 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 must define a public constructor that takes no arguments.
-	 *      - The class must not define the finalize() method.
-	 *   - 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 {
-		// All of the above checks are performed by the parent.
-		super.validateClass(vc, bean, clazz);
-	}
-	
-	/**
-	 * 9.2.5 ejbFind methods
-	 *   - The entity bean class may also define additional ejbFind<METHOD>(...) finder methods.
-	 *   - The signatures of the finder methods must follow the following rules:
-	 *   - A finder method name must start with the prefix "ejbFind" 
-	 *     (e.g. ejbFindByPrimaryKey, ejbFindLargeAccounts, ejbFindLateShipments).
-	 *   - A finder method must be declared as public.
-	 *   - The method must not be declared as final or static.
-	 *   - The method argument types must be legal types for RMI-IIOP.
-	 *   - 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).
-	 *   - The throws clause may define arbitrary application specific exceptions, including 
-	 *     the javax.ejb.FinderException.
-	 *   - 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).
-	 *   - 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).
-	 */
-	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);
-	}
-	
-	/**
-	 * 9.2.5 ejbFind methods
-	 *   - The entity bean class may also define additional ejbFind<METHOD>(...) finder methods.
-	 *   - The signatures of the finder methods must follow the following rules:
-	 *   - A finder method name must start with the prefix "ejbFind" 
-	 *     (e.g. ejbFindByPrimaryKey, ejbFindLargeAccounts, ejbFindLateShipments).
-	 *   - A finder method must be declared as public.
-	 *   - The method must not be declared as final or static.
-	 *   - The method argument types must be legal types for RMI-IIOP.
-	 *   - 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).
-	 *   - The throws clause may define arbitrary application specific exceptions, including 
-	 *     the javax.ejb.FinderException.
-	 *   - 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).
-	 *   - 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).
-	 */
-	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.
-	 *
-	 * 9.2.4 ejbPostCreate methods
-	 * - For each ejbCreate(...) method, the entity bean class must define a matching 
-	 *   ejbPostCreate(...) method, using the following rules:
-	 *    - The method name must be ejbPostCreate.
-	 *    - The method must be declared as public.
-	 *    - The method must not be declared as final or static.
-	 *    - The return type must be void.
-	 *    - The method arguments must be the same as the arguments of the matching 
-	 *      ejbCreate(...) 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).
-	 *...
-	*/
-	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.
-	}
-	
-	/**
-	 * 9.2.5 ejbFind methods
-	 *...
-	 *   - 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).
-	 *...
-	 */
-	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 2576c40..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateBMPHome.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- * 9.2.8 Entity bean's home interface
- * The following are the requirements for the entity bean's home interface:
- *   - The interface must extend the javax.ejb.EJBHome interface.
- *   - 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.
- *   - The home interface is allowed to have superinterfaces. Use of interface 
- *     inheritance is subject to the RMI-IIOP rules for the definition of remote interfaces.
- *   - Each method defined in the home interface must be one of the following:
- *      - A create method.
- *      - A finder method.
- *   - 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.)
- *   - The return type for a create method must be the entity bean's remote interface type.
- *   - 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)
- *   - The throws clause of a create method must include the javax.ejb.CreateException.
- *   - 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.)
- *   - 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).
- *   - 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.
- *   - 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.
- *   - The throws clause of a finder method must include the javax.ejb.FinderException. 
- */
-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;
-	}
-
-	/**
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - 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.
-	 *...
-	 */
-	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);
-
-	}
-	
-	/**
-	 * 9.2.8 Entity bean's home interface
-	 * The following are the requirements for the entity bean's home interface:
-	 *   - 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.
-	 *...
-	 */
-	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 7e795f0..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 8ad649d..0000000
--- 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 bb8cbf2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java
+++ /dev/null
@@ -1,564 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- *
- * 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.
- *
- *
- * 9.4.1 Container-managed fields
- *...
- * The fields must be defined in the entity bean class as public, and must not be 
- * defined as transient.
- *...
- *   - The following requirements ensure that an entity bean can be deployed in any 
- *     compliant container.
- *        - The Bean Provider must ensure that the Java programming language types 
- *          assigned to the container-managed fields are restricted to the following: 
- *          Java programming language primitive types, Java programming language 
- *          serializable types, and references of enterprise beans' remote or home 
- *          interfaces.
- *        - The Container Provider may, but is not required to, use Java programming 
- *          language Serialization to store the container-managed fields in the database. 
- *          If the container chooses a different approach, the effect should be equivalent 
- *          to that of Java programming language Serialization. The Container must also be 
- *          capable of persisting references to enterprise beans' remote and home interfaces 
- *          (for example, by storing their handle or primary key).
- *...
- *
- * 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.
- *...
- *
- * 9.4.6 finder methods
- *   - The entity Bean Provider does not write the finder (ejbFind<METHOD>(...)) methods.
- *...
- * 9.4.7 primary key type
- *   - The container must be able to manipulate the primary key type. Therefore, 
- *     the primary key type for an entity bean with container-managed persistence 
- *     must follow the rules in this subsection, in addition to those specified in 
- *     Subsection 9.2.9.
- *
- *     There are two ways to specify a primary key class for an entity bean with container-managed persistence:
- *        - Primary key that maps to a single field in the entity bean class.
- *        - Primary key that maps to multiple fields in the entity bean class.
- *     The second method is necessary for implementing compound keys, and the first method is convenient for
- *     single-field keys. Without the first method, simple types such as String would have to be wrapped in a
- *     user-defined class.
- * 
- *     9.4.7.1 Primary key that maps to a single field in the entity bean class
- *     The Bean Provider uses the primkey-field element of the deployment descriptor to specify the
- *     container-managed field of the entity bean class that contains the primary key. The field's type must be
- *     the primary key type.
- *
- *     9.4.7.2 Primary key that maps to multiple fields in the entity bean class
- *     The primary key class must be public, and must have a public constructor with no parameters.
- *     All fields in the primary key class must be declared as public.
- *     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.)
- *
- *     9.4.7.3 Special case: Unknown primary key class
- *     In special situations, the entity Bean Provider may choose not to specify the primary key class for an
- *     entity bean with container-managed persistence. This case usually happens when the entity bean does
- *     not have a natural primary key, and the Bean Provider wants to allow the Deployer to select the primary
- *     key fields at deployment time. The entity bean's primary key type will usually be derived from the primary
- *     key type used by the underlying database system that stores the entity objects. The primary key
- *     used by the database system may not be known to the Bean Provider.
- *     When defining the primary key for the enterprise bean, the Deployer may sometimes need to subclass
- *     the entity bean class to add additional container-managed fields (this typically happens for entity beans
- *     that do not have a natural primary key, and the primary keys are system-generated by the underlying
- *     database system that stores the entity objects).
- *     In this special case, the type of the argument of the findByPrimaryKey method must be declared as
- *     java.lang.Object, and the return value of ejbCreate() must be declared as
- *     java.lang.Object. The Bean Provider must specify the primary key class in the deployment
- *     descriptor as of the type java.lang.Object.
- *     The primary key class is specified at deployment time in the situations when the Bean Provider develops
- *     an entity bean that is intended to be used with multiple back-ends that provide persistence, and when
- *     these multiple back-ends require different primary key structures.
- *     Use of entity beans with a deferred primary key type specification limits the client application programming
- *     model, because the clients written prior to deployment of the entity bean may not use, in general,
- *     the methods that rely on the knowledge of the primary key type.
- *     The implementation of the enterprise bean class methods must be done carefully. For example, the meth-ods
- *     should not depend on the type of the object returned from EntityContext.getPrimaryKey(), because
- *     the return type is determined by the Deployer after the EJB class has been written.
- *
- */
-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());
-	}
-	
-	/**
-	 * 9.4.1 Container-managed fields
-	 *...
-	 * The fields must be defined in the entity bean class as public, and must not be 
-	 * defined as transient.
-	 *...
-	 *   - The following requirements ensure that an entity bean can be deployed in any 
-	 *     compliant container.
-	 *        - The Bean Provider must ensure that the Java programming language types 
-	 *          assigned to the container-managed fields are restricted to the following: 
-	 *          Java programming language primitive types, Java programming language 
-	 *          serializable types, and references of enterprise beans' remote or home 
-	 *          interfaces.
-	 *...
-	 *
-	 * 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);
-	}
-	
-	/**
-	 * 9.4.1 Container-managed fields
-	 *...
-	 * The fields must be defined in the entity bean class as public, and must not be 
-	 * defined as transient.
-	 *...
-	 *   - The following requirements ensure that an entity bean can be deployed in any 
-	 *     compliant container.
-	 *        - The Bean Provider must ensure that the Java programming language types 
-	 *          assigned to the container-managed fields are restricted to the following: 
-	 *          Java programming language primitive types, Java programming language 
-	 *          serializable types, and references of enterprise beans' remote or home 
-	 *          interfaces.
-	 *...
-	 *
-	 * 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;
-	}
-
-	/**
-	 * 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(vc, bean, clazz, field);
-
-		vc.terminateIfCancelled();
-
-		validateContainerManagedField(vc, bean, clazz, field);
-	}
-	
-	/**
-	 * 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.
-	 *        - The business method must be declared as public.
-	 *        - The method must not be declared as final or static.
-	 *        - The method argument and return value types must be legal types for RMI-IIOP.
-	 *        - 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).
-	 */
-	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"
-	}
-	
-	/**
-	 * 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 must define a public constructor that takes no arguments.
-	 *      - The class must not define the finalize() method.
-	 *   - 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 {
-		// 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
-	}
-	
-	/**
-	 * 9.4.1 Container-managed fields
-	 *...
-	 * The fields must be defined in the entity bean class as public, and must not be 
-	 * defined as transient.
-	 *...
-	 *   - The following requirements ensure that an entity bean can be deployed in any 
-	 *     compliant container.
-	 *        - The Bean Provider must ensure that the Java programming language types 
-	 *          assigned to the container-managed fields are restricted to the following: 
-	 *          Java programming language primitive types, Java programming language 
-	 *          serializable types, and references of enterprise beans' remote or home 
-	 *          interfaces.
-	 *...
-	 */
-	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);
-		}
-	}
-	
-	/**
-	 * 9.4.1 Container-managed fields
-	 *...
-	 * The fields must be defined in the entity bean class as public, and must not be 
-	 * defined as transient.
-	 *...
-	 *   - The following requirements ensure that an entity bean can be deployed in any 
-	 *     compliant container.
-	 *        - The Bean Provider must ensure that the Java programming language types 
-	 *          assigned to the container-managed fields are restricted to the following: 
-	 *          Java programming language primitive types, Java programming language 
-	 *          serializable types, and references of enterprise beans' remote or home 
-	 *          interfaces.
-	 *...
-	 *
-	 * 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);
-			}
-		}
-	}
-	
-	/**
-	 * 9.4.6 finder methods
-	 *   - The entity Bean Provider does not write the finder (ejbFind<METHOD>(...)) methods.
-	 */
-	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.
-	 *
-	 * 9.2.4 ejbPostCreate methods
-	 * - For each ejbCreate(...) method, the entity bean class must define a matching 
-	 *   ejbPostCreate(...) method, using the following rules:
-	 *    - The method name must be ejbPostCreate.
-	 *    - The method must be declared as public.
-	 *    - The method must not be declared as final or static.
-	 *    - The return type must be void.
-	 *    - The method arguments must be the same as the arguments of the matching 
-	 *      ejbCreate(...) 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).
-	 *...
-	 * 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 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 b08b6b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPKey.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- *
- * 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.
- *
- * 9.4.7 primary key type
- *   - The container must be able to manipulate the primary key type. Therefore, 
- *     the primary key type for an entity bean with container-managed persistence 
- *     must follow the rules in this subsection, in addition to those specified in 
- *     Subsection 9.2.9.
- *
- *     There are two ways to specify a primary key class for an entity bean with container-managed persistence:
- *        - Primary key that maps to a single field in the entity bean class.
- *        - Primary key that maps to multiple fields in the entity bean class.
- *     The second method is necessary for implementing compound keys, and the first method is convenient for
- *     single-field keys. Without the first method, simple types such as String would have to be wrapped in a
- *     user-defined class.
- * 
- *     9.4.7.1 Primary key that maps to a single field in the entity bean class
- *     The Bean Provider uses the primkey-field element of the deployment descriptor to specify the
- *     container-managed field of the entity bean class that contains the primary key. The field's type must be
- *     the primary key type.
- *
- *     9.4.7.2 Primary key that maps to multiple fields in the entity bean class
- *     The primary key class must be public, and must have a public constructor with no parameters.
- *     All fields in the primary key class must be declared as public.
- *     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.)
- *...
- */
-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;
-	}
-
-	/*
-	 * 9.4.7.1 Primary key that maps to a single field in the entity bean class
-	 *     The Bean Provider uses the primkey-field element of the deployment descriptor to specify the
-	 *     container-managed field of the entity bean class that contains the primary key. The field's type must be
-	 *     the primary key type.
-	 *
-	 * 9.4.7.2 Primary key that maps to multiple fields in the entity bean class
-	 *     The primary key class must be public, and must have a public constructor with no parameters.
-	 *     All fields in the primary key class must be declared as public.
-	 *     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.)
-	 */
-	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.
-	 *
-	 * 9.4.7.2 Primary key that maps to multiple fields in the entity bean class
-	 *     The primary key class must be public, and must have a public constructor with no parameters.
-	 *     All fields in the primary key class must be declared as public.
-	 *     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.)
-	 */
-	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;
-			}
-		}
-	}
-	
-	/**
-	 * 9.4.7.2 Primary key that maps to multiple fields in the entity bean class
-	 *     The primary key class must be public, and must have a public constructor with no parameters.
-	 *     All fields in the primary key class must be declared as public.
-	 *     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.)
-	 */
-	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);
-			}
-		}
-	}
-	
-	/**
-	 *  9.4.7.2 Primary key that maps to multiple fields in the entity bean class
-	 *     The primary key class must be public, and must have a public constructor with no parameters.
-	 */
-	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 2a5ed9c..0000000
--- 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 a4c293d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionBean.java
+++ /dev/null
@@ -1,719 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- * 6.8 Stateless session beans
- *...
- * 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. 
- * The session bean class must define a single ejbCreate method that takes 
- * no arguments.
- *...
- *
- * 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 must have a public constructor that takes no parameters. The 
- *        Container uses this constructor to create instances of the session bean class.
- * 		- The class must not define the finalize() method.
- * 		- The class may, but is not required to, implement the session bean's 
- *        remote interface [4] .
- * 		- The class must implement the business methods and the ejbCreate methods.
- * 		- 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.
- * 		- The session 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.
- *
- *		[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.
- *
- * 6.10.3 ejbCreate methods
- * The session bean class must define one 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 void.
- * 		- The method arguments must be legal types for RMI/IIOP.
- * 		- The throws clause may define arbitrary application exceptions, possibly 
- *        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 RuntimeException 
- * to indicate non-application exceptions to the Container (see Section 12.2.2).
- *
- * 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.
- * 		- The business method must be declared as public.
- * 		- The method must not be declared as final or static.
- * 		- The argument and return value types for a method must be legal types for RMI/IIOP.
- * 		- The throws clause may define arbitrary application 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 RuntimeException to
- * indicate non-application exceptions to the Container (see Section 12.2.2).
- */
-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.
-	 *
-	 *
-	 * 6.8 Stateless session beans
-	 *...
-	 * 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. 
-	 * The session bean class must define a single ejbCreate method that takes 
-	 * no arguments.
-	 *...
-	 *
-	 * 6.10.2 Session bean class
-	 * The following are the requirements for session bean class:
-	 * ...
-	 * 		- The class must have a public constructor that takes no parameters. The 
-	 *        Container uses this constructor to create instances of the session bean class.
-	 * 		- The class must not define the finalize() method.
-	 * ...
-	 * 		- The class must implement the business methods and the ejbCreate methods.
-	 * ...
-	 * 		- The session 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.
-	 * ...
-	 *
-	 * 6.10.3 ejbCreate methods
-	 * The session bean class must define one 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 void.
-	 * 		- The method arguments must be legal types for RMI/IIOP.
-	 * 		- The throws clause may define arbitrary application exceptions, possibly 
-	 *        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 RuntimeException 
-	 * to indicate non-application exceptions to the Container (see Section 12.2.2).
-	 *
-	 * 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.
-	 * 		- The business method must be declared as public.
-	 * 		- The method must not be declared as final or static.
-	 * 		- The argument and return value types for a method must be legal types for RMI/IIOP.
-	 * 		- The throws clause may define arbitrary application 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 RuntimeException to
-	 * indicate non-application exceptions to the Container (see Section 12.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_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.
-	 *
-	 * 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.
-	 * 		- The business method must be declared as public.
-	 * 		- The method must not be declared as final or static.
-	 * 		- The argument and return value types for a method must be legal types for RMI/IIOP.
-	 * 		- The throws clause may define arbitrary application 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 RuntimeException to
-	 * indicate non-application exceptions to the Container (see Section 12.2.2).
-	 */
-	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.
-	 *
-	 * The following paragraph is taken from
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * Copyright 1999 Sun Microsystems, Inc.
-	 * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
-	 * All rights reserved.
-	 *
-	 * 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.
-	 *
-	 *		[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.
-	 */
-	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) {
-			/*
-			 * 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 {
-				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) {
-			/*
-			 * 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 {
-				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.
-	 *
-	 * The following paragraph is taken from
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * Copyright 1999 Sun Microsystems, Inc.
-	 * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
-	 * All rights reserved.
-	 *
-	 * 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.
-	 *
-	 *		[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.
-	 */
-	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.
-	 *
-	 * 6.10.3 ejbCreate methods
-	 * The session bean class must define one 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 void.
-	 * 		- The method arguments must be legal types for RMI/IIOP.
-	 * 		- The throws clause may define arbitrary application exceptions, possibly 
-	 *        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 RuntimeException 
-	 * to indicate non-application exceptions to the Container (see Section 12.2.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 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);
-	}
-	
-	/**
-	 *...
-	 * 6.10.2 Session bean class
-	 * The following are the requirements for session bean class:
-	 * ...
-	 * 		- The class must not define the finalize() method.
-	 * ...
-	 */
-	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);
-		}
-	}
-	
-	/**
-	 * 6.8 Stateless session beans
-	 *...
-	 * The session bean class must define a single ejbCreate method that takes 
-	 * no arguments.
-	 *...
-	 * 6.10.2 Session bean class
-	 * The following are the requirements for session bean class:
-	 * ...
-	 * 		- The class must have a public constructor that takes no parameters. The 
-	 *        Container uses this constructor to create instances of the session bean class.
-	 * ...
-	 * 6.10.3 ejbCreate methods
-	 * The session bean class must define one or more ejbCreate(...) methods whose signatures must
-	 * follow these rules:
-	 *...
-	 */
-	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)
-	 *
-	 * 		- The business method must be declared as public.
-	 * 		- The method must not be declared as final or static.
-	 * 		- The argument and return value types for a method must be legal types for RMI/IIOP.
-	 * 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).
-	 */
-	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 45b289f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateSessionHome.java
+++ /dev/null
@@ -1,354 +0,0 @@
-package org.eclipse.jst.j2ee.model.internal.validation;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-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.
- *
- * The following paragraph is taken from
- * Enterprise JavaBeans Specification ("Specification")
- * Version: 1.1
- * Status: Final Release
- * Release: 12/17/99
- * Copyright 1999 Sun Microsystems, Inc.
- * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
- * All rights reserved.
- *
- * 6.8 Stateless session beans
- *...
- * 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. 
- * The session bean class must define a single ejbCreate method that takes 
- * no arguments.
- *...
- *
- * 6.10.6 Session beans home interface
- * The following are the requirements for the session bean's home interface:
- *   - The interface must extend the javax.ejb.EJBHome interface.
- *   - 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.
- *   - The home interface is allowed to have superinterfaces. Use of interface 
- *     inheritance is subject to the RMI/IIOP rules for the definition of 
- *     remote interfaces.
- *   - A session bean's home interface must define one or more create(...) methods.
- *   - 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.)
- *   - The return type for a create method must be the session bean's remote 
- *     interface type.
- *   - 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. 
- */
-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.
-	 * 
-	 * The following paragraph is taken from
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * Copyright 1999 Sun Microsystems, Inc.
-	 * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
-	 * All rights reserved.
-	 * 
-	 * 6.8 Stateless session beans
-	 *...
-	 * 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. 
-	 * The session bean class must define a single ejbCreate method that takes 
-	 * no arguments.
-	 *...
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 * ...
-	 *   - 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.
-	 * ...
-	 *   - A session bean's home interface must define one or more create(...) methods.
-	 *   - 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.)
-	 *   - The return type for a create method must be the session bean's remote 
-	 *     interface type.
-	 *   - 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.
-	 * ...
-	 */
-	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.
-	 *
-	 * The following paragraph is taken from
-	 * Enterprise JavaBeans Specification ("Specification")
-	 * Version: 1.1
-	 * Status: Final Release
-	 * Release: 12/17/99
-	 * Copyright 1999 Sun Microsystems, Inc.
-	 * 901 San Antonio Road, Palo Alto, CA 94303, U.S.A.
-	 * All rights reserved.
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - The interface must extend the javax.ejb.EJBHome interface.
-	 * ...
-	 *   - The home interface is allowed to have superinterfaces. Use of interface 
-	 *     inheritance is subject to the RMI/IIOP rules for the definition of 
-	 *     remote interfaces.
-	 * ...
-	 */
-	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);
-	}
-
-	/**
-	 * 6.8 Stateless session beans
-	 *...
-	 * 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. 
-	 * The session bean class must define a single ejbCreate method that takes 
-	 * no arguments.
-	 *...
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - 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.
-	 *   - A session bean's home interface must define one or more create(...) methods.
-	 *   - 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.)
-	 *   - The return type for a create method must be the session bean's remote 
-	 *     interface type.
-	 *   - 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. 
-	 */
-	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);
-	}
-
-	/**
-	 * 6.8 Stateless session beans
-	 *...
-	 * 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. 
-	 * The session bean class must define a single ejbCreate method that takes 
-	 * no arguments.
-	 *...
-	 *
-	 * 6.10.6 Session bean's home interface
-	 * The following are the requirements for the session bean's home interface:
-	 *   - A session bean's home interface must define one or more create(...) methods.
-	 */
-	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 6822064..0000000
--- 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 54b9214..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationCancelledException.java
+++ /dev/null
@@ -1,21 +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 exception should be thrown if the user cancels validation.
- */
-public class ValidationCancelledException extends RuntimeException {
-	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 f8d08ad..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java
+++ /dev/null
@@ -1,1548 +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.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Level;
-
-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.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.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.ejb.impl.LocalModelledPersistentAttributeFilter;
-
-/**
- * @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 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();
-		}
-	
-		return getType(javaClassName, resource.getResourceSet());
-	}
-	
-	/**
-	 * 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$
-				entry.setText("invalid parameter; javaClassName = {0} and resourceSet = {1}"); //$NON-NLS-1$
-				entry.setTokens(new String[]{javaClassName, String.valueOf(resourceSet)});
-				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 d42c005..0000000
--- 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 567e1d7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WARValidationResourceHandler.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.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class WARValidationResourceHandler {
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("warvalidation");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle = getResourceBundle();
-		}
-
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		}
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	public static String getString(String key, Object[] args) {
-
-		try {
-			return MessageFormat.format(getString(key), args);
-		} catch (IllegalArgumentException e) {
-			return getString(key);
-		}
-
-	}
-
-	public static String getString(String key, Object[] args, int x) {
-
-		return getString(key);
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.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 dae6e98..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/WarValidator.java
+++ /dev/null
@@ -1,1353 +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.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-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.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.internal.common.impl.EJBLocalRefImpl;
-import org.eclipse.jst.j2ee.internal.common.impl.EjbRefImpl;
-import org.eclipse.jst.j2ee.internal.common.impl.ResourceRefImpl;
-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.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 org.eclipse.jst.j2ee.model.internal.validation.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()) {
-	  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.getString("of_Type_Security_Role_Name_6") ; //$NON-NLS-1$
-		  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.getString("Web_Archive_Validator_8"); //$NON-NLS-1$
-	}
-	// Messaging helpers ...
-
-	/**
-	 * Returns the name of the Validator, as it should be displayed in
-	 * the UI.
-	 *
-	 * @see J2EEValidator#getName
-	 */
-
-	public String getName(Locale locale)
-	{
-		return getMessage(null,"webArchiveValidator.name", locale); //$NON-NLS-1$
-	}
-/**
- * This is a utility function used by the validateSecurityConstraints.
- * 
- * @return boolean
- */
-protected boolean isHttpMethod(String method) {
-
-
-	if (httpMethods == null) {  // Need to construct the Hashtable, once
-		String [] mList = {"GET", "PUT", "HEAD", "TRACE", "POST", "DELETE", "OPTIONS"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-		
-		httpMethods = new Hashtable() ;
-		for (int i = 0; i<mList.length; i++)
-		   httpMethods.put (mList[i],"bla") ; //$NON-NLS-1$
-	}
-	String compare = method.trim() ;
-	return (httpMethods.get(compare) != null) ;         
-}
-/**
- *  WAR validation is driven by 3 prong approach:
- *  o XML/DTD validation (this is now handled by the XML Validator)
- *  o Consistent web.xml data entry validation beyond DTD
- *      e.g., duplicate entries, null entries etc. This is also
- *      driven by this validator.
- *  o web.xml reference to resources in the "file system".  This
- *      will not be provided by this validator.  In the workbench
- *      this function is already provided by the link builder.
- *     
- */
-public void validate() throws ValidationException{
-		validateMimeMapping() ;
-		validateContextParameters() ;
-		validateTagLibs();
-		validateServletMappings(webDD.getServletMappings());
-		validateWelcomeFileList(webDD.getFileList());
-		validateErrorPages(webDD.getErrorPages());
-		validateSecurityAndServlets();
-		validateFilters(webDD.getFilters());
-		validateFilterMappings(webDD.getFilterMappings());
-		validateRefs();
-		validateLoginConfig( webDD.getLoginConfig() );
-		validateEnvironmentEntries( webDD.getEnvironmentProperties() );
-		validateOther() ;
-		validate14();
-	}
-/**
- * 
- */
-private void validate14() {
-	int versionId = webDD.getVersionID();
-	if(versionId == J2EEVersionConstants.WEB_2_4_ID) {
-		validateUrlPattern();
-	}
-}
-/**
- * 
- */
-private void validateUrlPattern() {
-	List servletMappings = webDD.getServletMappings();
-	for(int i = 0; i < servletMappings.size(); i++) {
-		ServletMapping mapping = (ServletMapping)servletMappings.get(i);
-		String urlPattern = mapping.getUrlPattern();
-		int newLineChar = urlPattern.indexOf(Character.LINE_SEPARATOR);
-		if(newLineChar != -1) {
-			String[] parms = new String[2];
-			parms[0] = urlPattern ;
-			parms[1] = mapping.getServlet().getDisplayName();
-			addError(WAR_CATEGORY, MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN,parms,mapping);
-		}
-	}
-	
-}
-
-/**
- * This is the method which performs the validation on the MOF model.
- * <br><br>
- * <code>helper</code> and <code>reporter</code> may not be null. <code>changedFiles</code> may be null, if a full
- * build is desired.
- * <br><br>
- * <code>helper</code> loads a EObject. The EObject is the root of the 
- * MOF model about to be validated. When this object is traversed,
- * you can reach every element in the MOF model which needs to be validated.
- * <br><br>
- * <code>reporter</code> is an instance of an IReporter interface, which is used for interaction with the user.
- * <br><br>
- * <code>changedFiles</code> is an array of file names which have changed since the last validation. 
- * If <code>changedFiles</code> is null, or if it is an empty array, then a full build
- * is performed. Otherwise, validation on just the files listed in the Vector is performed.
- */
-public void validate(IValidationContext inHelper, IReporter inReporter) throws ValidationException {
-
-	super.validate(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
-
-	try {
-		warFile = (WARFile) _helper.loadModel(WAR_MODEL_NAME);
-		if (warFile != null) {
-			webDD = warFile.getDeploymentDescriptor();
-			validate();
-		} else {
-			IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_INVALID_WAR_FILE);
-			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 );
-		throw new ValidationException(errorMsg, e);
-	}
-}
-
-
-public void validate(IValidationContext inHelper, IReporter inReporter, WebApp webApp) throws ValidationException {
-
-	super.validate(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
-
-	try {
-		webDD = webApp;
-		validate();
-		
-	} 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 );
-		throw new ValidationException(errorMsg, e);
-	}
-}
-
-
-/**
- * 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.getString("of_Type_Role_Name_19") ; //$NON-NLS-1$
-				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()) {
-		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.getString("of_Type_Parameter_Name_25"); //$NON-NLS-1$
-
-			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.getString("of_Type_Parameter_Name_25") + ": " + name; //$NON-NLS-1$  //$NON-NLS-2$
-			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.getString("of_Type_Parameter_Name_32"); //$NON-NLS-1$
-				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.getString("of_Type_Parameter_Name_25") + ": " +  name; //$NON-NLS-1$ //$NON-NLS-2$
-				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.getString("of_Type_Parameter_Name_39"); //$NON-NLS-1$
-				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.getString("of_Type_Parameter_Name_25") + ": " +  name; //$NON-NLS-1$ //$NON-NLS-2$
-				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.getString("of_Type_ejb-ref-name_44"); //$NON-NLS-1$
-					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.getString("of_Type_ejb-ref-name_44"); //$NON-NLS-1$
-				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.getString("of_Type_ejb-ref-name_44"); //$NON-NLS-1$
-					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.getString("of_Type_ejb-ref-name_44"); //$NON-NLS-1$
-				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()) {
-	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.getString("of_Type_Error_Location_47") ; //$NON-NLS-1$
-		addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_EMPTY_ENTRY, parms,nextPage);
-	}
-	if (!location.startsWith("/")){ //$NON-NLS-1$
-		String[] parms = new String[1];
-		parms[0] = WARValidationResourceHandler.getString("of_Type_Error_Location_49") ; //$NON-NLS-1$
-		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.Exception
-	else if (nextPage.isExceptionType()) {
-		ExceptionTypeErrorPage etep = (ExceptionTypeErrorPage)nextPage;
-		JavaClass javaType = etep.getExceptionType();
-		String exceptionType = "java.lang.Exception";//$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.getString("of_Type_Env_Entry_Name___88") +  ": " + name; //$NON-NLS-1$  //$NON-NLS-2$
-		  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()) {   
-	  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.getString("of_Type_Mime_Extension_54") ;    //$NON-NLS-1$
-		  else
-			 parms[0] = WARValidationResourceHandler.getString("of_Type_Mime_Type_55") ; //$NON-NLS-1$
-		  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.getString("of_Type_Mime_Extension___56") + ": " + ext ; //$NON-NLS-1$  //$NON-NLS-2$
-		  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++) {
-			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()) {
-	  SecurityConstraint constraint = (SecurityConstraint) constList.next() ;
-
-	  EList webResourceList = constraint.getWebResourceCollections() ;
-	  if (webResourceList == null || webResourceList.isEmpty()) {
-		  String[] parms = new String[1];
-		  parms[0] = WARValidationResourceHandler.getString("of_Type_Web_Resource_Collection_64") ; //$NON-NLS-1$
-		  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()) {
-			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.getString("of_Type_Filter_Name_66") ; //$NON-NLS-1$
-				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.getString("Invalid_URL_70")) ; //$NON-NLS-1$ //$NON-NLS-2$
-		// 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()) {
-	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.getString("Invalid_URL_75")) ; //$NON-NLS-1$ //$NON-NLS-2$
-
-//
-// 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()) {
-			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.getString("of_Type_Servlet_Name_77"); //$NON-NLS-1$
-				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().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()) {
-		
-		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.getString("of_Type_Taglib_80"); //$NON-NLS-1$
-			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.getString("of_Type_TagLib___81") + ": " + uri; //$NON-NLS-1$  //$NON-NLS-2$
-			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.getString("of_Type_Web_Resource_Name_84") ; //$NON-NLS-1$
-			  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()) {
-	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.getString("of_Type_Welcome_File_Name__87") + ": " + fileName ; //$NON-NLS-1$  //$NON-NLS-2$
-		addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY, parms,nextFile);
-		continue ;      
-	}
-	remember.put(fileName,"Yea") ; //$NON-NLS-1$
-  }
-}
-}
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 999e8ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E Document type version "{0}" for rar.xml in project "{1}" needs to be version "{2}".
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_de.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_de.properties
deleted file mode 100644
index bf2ef5b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_de.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E Die Dokumenttypversion "{0}" f\u00fcr die Datei rar.xml in Projekt "{1}" muss Version "{2}" sein.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_es.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_es.properties
deleted file mode 100644
index 10836d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_es.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E La versi\u00f3n de tipo de documento "{0}" del archivo rar.xml del proyecto "{1}" tiene que ser de la versi\u00f3n "{2}".
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_fr.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_fr.properties
deleted file mode 100644
index b91e205..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_fr.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E La version de type de document "{0}" du fichier rar.xml dans le projet "{1}" n''est pas correcte ; la version "{2}" est requise.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_it.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_it.properties
deleted file mode 100644
index dec96a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_it.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E La versione del tipo di documento "{0}" per rar.xml nel progetto "{1}" deve essere in versione "{2}".
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_ja.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_ja.properties
deleted file mode 100644
index b0d5bd6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_ja.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 "{1}" \u5185\u306e rar.xml \u306e\u6587\u66f8\u30bf\u30a4\u30d7\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3 "{0}" \u306f\u30d0\u30fc\u30b8\u30e7\u30f3 "{2}" \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_ko.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_ko.properties
deleted file mode 100644
index 06aefe1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_ko.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E "{1}" \ud504\ub85c\uc81d\ud2b8\uc758 rar.xml\uc5d0 \ub300\ud55c \ubb38\uc11c \uc720\ud615 \ubc84\uc804 "{0}"\uc740(\ub294) "{2}" \ubc84\uc804\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_pt_BR.properties
deleted file mode 100644
index 1b28691..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_pt_BR.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E A vers\u00e3o do tipo do documento "{0}" para rar.xml no projeto "{1}" precisa ter a vers\u00e3o "{2}".
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_zh.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_zh.properties
deleted file mode 100644
index 17ca640..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_zh.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E \u9879\u76ee\u201c{1}\u201d\u4e2d rar.xml \u7684\u6587\u6863\u7c7b\u578b\u7248\u672c\u201c{0}\u201d\u5fc5\u987b\u662f\u7248\u672c\u201c{2}\u201d\u3002
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_zh_TW.properties
deleted file mode 100644
index 9bcfcad..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/rarvalidation_zh_TW.properties
+++ /dev/null
@@ -1,11 +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
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E "{1}" \u5c08\u6848\u4e2d\u7684 rar.xml \u4e4b\u6587\u4ef6\u985e\u578b\u7248\u672c "{0}" \u5fc5\u9808\u662f "{2}" \u7248\u3002
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 b290e9b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation.properties
+++ /dev/null
@@ -1,258 +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 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/j2ee-validation/warvalidation_de.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_de.properties
deleted file mode 100644
index d804015..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_de.properties
+++ /dev/null
@@ -1,258 +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 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-Auswertung ist fehlgeschlagen: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Die Sicherheitsberechtigungsklasse mit dem Namen {0} ist doppelt vorhanden.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: Die JSP-Datei {0} f\u00fcr das Servlet \"{1}\" fehlt.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: Die <small-icon>-Datei {0} fehlt.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: Die <large-icon>-Datei {0} fehlt.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: Die Servletzuordnung \"{0}\" bezieht sich auf ein Servlet, das nicht definiert ist.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Ein Eintrag in der Startdateiliste ist leer.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: Die Startdatei {0} fehlt.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: Die Befehlsbibliothekdeskriptordatei {0} fehlt.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: Die WAR-Datei fehlt oder ist ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: Die Filterzuordnung \"{0}\" bezieht sich auf einen Filter, der nicht definiert ist.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: Startdateien d\u00fcrfen nicht mit  "/" beginnen oder enden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Parsingfehler: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Fehler beim Parsing des Implementierungsdeskriptors.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Fehler beim Parsing des Implementierungsdeskriptors.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: Der Implementierungsdeskriptor kann nicht ge\u00f6ffnet werden. Die Pr\u00fcfung kann nicht abgeschlossen werden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: Die URL-Zuordnung \"{0}\" ist ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Die Sicherheitsberechtigungsklassenverkn\u00fcpfung {0} ist ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: Die HTTP-Methode {0} ist ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Ung\u00fcltige Transportgarantie.  G\u00fcltige Werte sind \"NONE\", \"INTEGRAL\" oder \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: Die JSP-Datei \"{0}\", auf die das Servlet {1} verweist, muss den vollst\u00e4ndigen absoluten Pfad aufweisen.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Das Webprojekt {0} ist dem ung\u00fcltigen Kontextstammverzeichnis {1} im EAR-Projekt {2} zugeordnet.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: Die Position der Fehlerseite muss mit "/" beginnen.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Der Name der Sicherheitsberechtigungsklasse {0} ist ung\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: Die Authentifizierungsmethode ist ung\u00fcltig.  G\u00fcltige Werte sind: \"BASIC\", \"DIGEST\", \"FORM\" oder \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E: Die Authentifizierungsmethode ist {0}.  Die Werte f\u00fcr die Formularanmeldungskonfiguration (form-login-config) werden ignoriert, falls nicht die Authentifizierungsmethode FORM verwendet wird.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E: Der Ressourcenverweis {0} muss die Ressourcenauthentifizierung "SERVLET" oder "CONTAINER" enthalten.
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E: Der Ressourcenverweis {0} muss die Ressourcenauthentifizierung "Application" oder "Container" enthalten.
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E: \"Application\" ist kein g\u00fcltiger Wert f\u00fcr die Ressourcenauthentifizierung in einem Implementierungsdeskriptor der Stufe 2.2.  Verwenden Sie anstatt dessen \"SERVLET\".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E: \"SERVLET\" ist kein g\u00fcltiger Wert f\u00fcr die Ressourcenauthentifizierung in einem Implementierungsdeskriptor der Stufe 2.2.  Verwenden Sie anstatt dessen \"Application\".
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: Ung\u00fcltiger Ausnahmebedingungstyp {0}.  Der Ausnahmebedingungstyp muss den vollst\u00e4ndig qualifizierten Klassennamen eines Java-Ausnahmebedingungstyps enthalten.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: Die URL-Zuordnung {0} ist doppelt vorhanden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Der Servleteintrag {0} ist doppelt vorhanden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: Das Sitzungszeitlimit ist nicht g\u00fcltig.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Der Eintrag {0} ist doppelt vorhanden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: Der Eintrag {0} ist leer.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: Der Filtereintrag {0} ist doppelt vorhanden.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: Das Element ''ejb-ref'' mit dem Namen {0} ist doppelt vorhanden.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: FEHLER: AUSNAHMEBEDINGUNG WEGEN FEHLENDER MODULDATEI IN EAR
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: Unbekannter Fehlercode: {0}.  Der Fehlercode muss einen g\u00fcltigen HTTP-Statuscode enthalten.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: Der Bereich der gemeinsamen Ressourcenbenutzung ist ung\u00fcltig. G\u00fcltige Werte sind \"SHAREABLE\" oder \"UNSHAREABLE\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: Der Umgebungseintragstyp ist ung\u00fcltig. G\u00fcltige Werte sind \"java.lang.TYP\", wobei TYP einer der folgenden Typen angibt: Boolean, Byte, Character, String, Short, Integer, Long, Float oder Double."
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Das Webbibliotheksprojekt ({0}) fehlt.  \u00dcberpr\u00fcfen Sie die Eigenschaften dieses Projekts, um diesen Fehler zu beheben.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: Die Webbbibliotheksprojekt-JAR ({0}) ist unvertr\u00e4glich mit einer tats\u00e4chlichen JAR im Verzeichnis WEB-INF/lib.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: Der Zielserver des Webbibliotheksprojekts ({1}) stimmt nicht mit dem dieses Webprojekts ({0}) \u00fcberein.  F\u00fchren Sie gegebenenfalls eine \u00dcberpr\u00fcfung des Webprojekts durch.
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=Die URL-Musterzeichenfolge "{0}" endet mit einem ung\u00fcltigen R\u00fccklauf f\u00fcr Servlet {1}
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: 'ejb-ref-type' muss 'Entity' oder 'Session' sein.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: Das Element ''security-role-ref'' {0} definiert das Element ''role-link'', aber keine ''security-role''-Elemente in der Anwendungsbeschreibung.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=des Typs 'Sicherheitsberechtigungsklassenname'
-Web_Archive_Validator_8=Webarchiv-Pr\u00fcfprogramm
-of_Type_Role_Name_19=des Typs 'Berechtigungsklassenname'
-of_Type_Parameter_Name_25=des Typs 'Parametername'
-of_Type_Parameter_Value_26=des Typs 'Parameterwert'
-of_Type_Parameter_Name_32=des Typs 'Parametername'
-of_Type_Parameter_Value_33=des Typs 'Parameterwert'
-of_Type_Parameter_Name_39=des Typs 'Parametername'
-of_Type_Parameter_Value_40=des Typs 'Parameterwert'
-of_Type_ejb-ref-name_44=des Typs 'ejb-ref-name'
-of_Type_Error_Location_47=des Typs 'Fehlerposition'
-of_Type_Error_Location_49=des Typs 'Fehlerposition'
-of_Type_Mime_Extension_54=des Typs 'Mimeerweiterung'
-of_Type_Mime_Type_55=des Typs 'Mimetyp'
-of_Type_Mime_Extension___56=des Typs 'Mimeerweiterung':
-of_Type_Web_Resource_Collection_64=des Typs 'Collection mit Webressourcen'
-of_Type_Filter_Name_66=des Typs 'Filtername'
-Invalid_URL_70=Ung\u00fcltige URL
-Invalid_URL_75=Ung\u00fcltige URL
-of_Type_Servlet_Name_77=des Typs 'Servletname'
-of_Type_Taglib_80=des Typs 'Taglib'
-of_Type_TagLib___81=des Typs 'TagLib':
-of_Type_Web_Resource_Name_84=des Typs 'Webressourcenname'
-of_Type_Welcome_File_Name__87=des Typs 'Startdateiname'
-of_Type_Env_Entry_Name___88=des Typs 'Umgebungseintragsname'
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_es.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_es.properties
deleted file mode 100644
index 4a1142d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_es.properties
+++ /dev/null
@@ -1,258 +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 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: La validaci\u00f3n de WAR ha fallado: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Cometido de seguridad denominado {0} duplicado.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: Falta el archivo JSP {0} del servlet \"{1}\".
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: Falta el archivo <small-icon>, {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: Falta el archivo <large-icon>, {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: La correlaci\u00f3n de servlet \"{0}\" hace referencia a un servlet que no est\u00e1 definido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Hay una entrada vac\u00eda en la lista de archivos de bienvenida.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: Falta el archivo de bienvenida {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: Falta el archivo de descriptor de biblioteca de c\u00f3digos {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: Falta el archivo WAR o no es v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: La correlaci\u00f3n de filtro \"{0}\" hace referencia a un filtro que no est\u00e1 definido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: Los archivos de bienvenida no pueden empezar ni acabar en /.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Error de an\u00e1lisis: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Error de an\u00e1lisis del descriptor de despliegue.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Error de an\u00e1lisis del descriptor de despliegue.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: No se puede abrir el descriptor de despliegue. La validaci\u00f3n no puede completarse.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: La correlaci\u00f3n de URL \"{0}\" no es v\u00e1lida.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Enlace de cometido de seguridad no v\u00e1lido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: El m\u00e9todo HTTP no es v\u00e1lido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Garant\u00eda de transporte no v\u00e1lida.  Los valores v\u00e1lidos son \"NONE\", \"INTEGRAL\" o \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: El archivo jsp \"{0}\" al que hace referencia el servlet {1} debe tener una v\u00eda de acceso absoluta completa.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: El proyecto Web {0} est\u00e1 correlacionado con una ra\u00edz de contexto {1} que no es v\u00e1lida en el proyecto EAR {2}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: La ubicaci\u00f3n de la p\u00e1gina de errores debe empezar por /.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Nombre de cometido de seguridad no v\u00e1lido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: El m\u00e9todo auth no es v\u00e1lido.  Los valores v\u00e1lidos son: \"BASIC\", \"DIGEST\", \"FORM\", \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E: El m\u00e9todo de autenticaci\u00f3n es {0}.  Los valores de form-login-config se pasar\u00e1n por alto a menos que se utilice el m\u00e9todo de autenticaci\u00f3n FORM.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E:  La ref de recurso {0} debe contener res-auth de "SERVLET" o "CONTAINER".
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E:  La ref de recurso {0} debe contener res-auth de "Application" o "Container".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" no es un valor v\u00e1lido para res-auth en un descriptor de despliegue de nivel 2.2.  En su lugar, utilice \"SERVLET\".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" no es un valor v\u00e1lido para res-auth en un descriptor de despliegue de nivel 2.2.  En su lugar, utilice \"Application\".
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E:  Tipo de excepci\u00f3n no v\u00e1lido {0}.  El tipo de excepci\u00f3n debe contener un nombre de clase totalmente calificado de un tipo de excepci\u00f3n Java.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: La correlaci\u00f3n de URL {0} est\u00e1 duplicada.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: La entrada de servlet {0} est\u00e1 duplicada.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: El tiempo de espera de sesi\u00f3n no es v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Entrada duplicada {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: La entrada {0} est\u00e1 vac\u00eda.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: La entrada de filtro {0} est\u00e1 duplicada.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: El elemento ejb-ref denominado {0} est\u00e1 duplicado.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: EXCEPCI\u00d3N DE ARCHIVO DE M\u00d3DULO NO CONTENIDA EN EAR DE ERRORES
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: C\u00f3digo de error desconocido: {0}.  El c\u00f3digo de error debe contener un c\u00f3digo de estado HTTP v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: El valor de res-sharing-scope no es v\u00e1lido; los valores v\u00e1lidos son \"Shareable\" o \"Unshareable\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: El tipo de entrada de entorno no es v\u00e1lido. Los valores v\u00e1lidos son \"java.lang.TYPE\", siendo TYPE uno de los siguientes tipos: Boolean, Byte, Character, String, Short, Integer, Long, Float, Double."
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Falta proyecto de biblioteca Web ({0}).  Compruebe las propiedades de este proyecto para arreglar este problema.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: El JAR de proyecto de biblioteca Web ({0}) est\u00e1 en conflicto con un JAR real del directorio WEB-INF/lib.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: El servidor destino de proyecto de biblioteca Web ({1}) no coincide con el de este proyecto Web ({0}).  Ejecute la validaci\u00f3n en el proyecto Web si cree que no es as\u00ed.
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=La serie de patr\u00f3n URL "{0}" termina con un retorno de carro no v\u00e1lido para el servlet {1}
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type debe ser 'Entity' o 'Session'.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: El elemento ''security-role-ref'' {0} define el elemento ''role-link'' pero no hay elementos ''security-role'' en la descripci\u00f3n de la aplicaci\u00f3n.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=de tipo Nombre de cometido de seguridad
-Web_Archive_Validator_8=Validador de archivador Web
-of_Type_Role_Name_19=de tipo Nombre de cometido
-of_Type_Parameter_Name_25=de tipo Nombre de par\u00e1metro
-of_Type_Parameter_Value_26=de tipo Valor de par\u00e1metro
-of_Type_Parameter_Name_32=de tipo Nombre de par\u00e1metro
-of_Type_Parameter_Value_33=de tipo Valor de par\u00e1metro
-of_Type_Parameter_Name_39=de tipo Nombre de par\u00e1metro
-of_Type_Parameter_Value_40=de tipo Valor de par\u00e1metro
-of_Type_ejb-ref-name_44=de tipo ejb-ref-name
-of_Type_Error_Location_47=de tipo Ubicaci\u00f3n de error
-of_Type_Error_Location_49=de tipo Ubicaci\u00f3n de error
-of_Type_Mime_Extension_54=de tipo Extensi\u00f3n Mime
-of_Type_Mime_Type_55=de tipo Tipo Mime
-of_Type_Mime_Extension___56=de tipo Extensi\u00f3n Mime:
-of_Type_Web_Resource_Collection_64=de tipo Colecci\u00f3n de recursos Web
-of_Type_Filter_Name_66=de tipo Nombre de filtro
-Invalid_URL_70=URL no v\u00e1lido
-Invalid_URL_75=URL no v\u00e1lido
-of_Type_Servlet_Name_77=de tipo Nombre de servlet
-of_Type_Taglib_80=de tipo Biblioteca de c\u00f3digos
-of_Type_TagLib___81=de tipo Biblioteca de c\u00f3digos:
-of_Type_Web_Resource_Name_84=de tipo Nombre de recurso Web
-of_Type_Welcome_File_Name__87=de tipo Nombre de archivo de bienvenida
-of_Type_Env_Entry_Name___88=de tipo Nombre de entrada de entorno
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_fr.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_fr.properties
deleted file mode 100644
index 27e9909..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_fr.properties
+++ /dev/null
@@ -1,258 +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 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: Echec de validation WAR : {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: R\u00f4le de s\u00e9curit\u00e9 nomm\u00e9 {0} en double.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: Le fichier JSP {0} du servlet \"{1}\" est manquant.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: Le fichier <small-icon> {0} est manquant.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: Le fichier <large-icon> {0} est manquant.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: Le mappage de servlet \"{0}\" fait r\u00e9f\u00e9rence \u00e0 un servlet non d\u00e9fini.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Entr\u00e9e de la liste de fichiers de bienvenue vide.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: Le fichier de bienvenue {0} est manquant.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: Le fichier du descripteur de la biblioth\u00e8que de balises {0} est manquant.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: Fichier WAR manquant ou non valide.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: Le mappage de filtres \"{0}\" fait r\u00e9f\u00e9rence \u00e0 un filtre non d\u00e9fini.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: Les noms de fichiers de pages d''accueil ne peuvent ni commencer ni finir par /.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Erreur d''analyse : {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Erreur d'analyse du descripteur de d\u00e9ploiement.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Erreur d'analyse du descripteur de d\u00e9ploiement.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: Impossible d'ouvrir le descripteur de d\u00e9ploiement. Validation non termin\u00e9e.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: L''URL mappant \"{0}\" n''est pas valide.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Lien de r\u00f4le de s\u00e9curit\u00e9 non valide : {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: M\u00e9thode HTTP non valide : {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Garantie de transport non valide.  Les valeurs valides sont \"NONE\", \"INTEGRAL\" ou \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: Le fichier jsp \"{0}\" r\u00e9f\u00e9renc\u00e9 par le servlet {1} doit correspondre \u00e0 un chemin d''acc\u00e8s absolu.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Le projet Web {0} est mapp\u00e9 \u00e0 une racine de contexte non valide {1} dans le projet EAR {2}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: L'emplacement de la page d'erreurs doit commencer par /.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Nom du r\u00f4le de s\u00e9curit\u00e9 non valide : {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: M\u00e9thode d'authentification non valide.  Les valeurs valides sont : \"BASIC\", \"DIGEST\", \"FORM\" ou \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E: La m\u00e9thode d''authentification est {0}.  Les valeurs de formulaire, de connexion et de configuration seront ignor\u00e9es si vous n''utilisez pas la m\u00e9thode d''authentification FORM.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E: La r\u00e9f\u00e9rence de ressource {0} doit contenir l''authentification de la ressource de type "SERVLET" ou "CONTAINER".
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E: La r\u00e9f\u00e9rence de ressource {0} doit contenir l''authentification de la ressource de type "Application" ou "Container".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" n'est pas une valeur valide pour l'authentification de ressource dans un descripteur de d\u00e9ploiement de niveau 2.2.  Utilisez plut\u00f4t \"SERVLET\".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" n'est pas une valeur valide pour l'authentification de ressource dans un descripteur de d\u00e9ploiement de niveau 2.2.  Utilisez plut\u00f4t \"Application\".
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: Type d''exception {0} non valide.  Le type d''exception doit contenir un nom de classe complet d''un type d''exception Java.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: URL en double mappant {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Entr\u00e9e de servlet en double {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: Le d\u00e9passement de d\u00e9lai de la session n'est pas valide.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Entr\u00e9e {0} en double.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: Entr\u00e9e {0} vide.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: Entr\u00e9e de filtre {0} en double.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: El\u00e9ment de r\u00e9f\u00e9rence ejb {0} en double.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: ERREUR EAR : EXCEPTION DU FICHIER DE MODULE NON CONTENU
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: Code d''erreur inconnu : {0}.  Le code d''erreur doit contenir un code de statut HTTP valide.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: Port\u00e9e du nouveau partage non valide. Les valeurs valides sont \"Shareable\" ou \"Unshareable\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: Type d'entr\u00e9e d'environnement non valide. Les valeurs valides sont \"java.lang.TYPE\", o\u00f9 TYPE correspond \u00e0 l'un des \u00e9l\u00e9ments suivants : Boolean, Byte, Character, String, Short, Integer, Long, Float ou Double."
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Projet de biblioth\u00e8que Web manquant ({0}).  V\u00e9rifiez les propri\u00e9t\u00e9s de ce projet pour r\u00e9soudre l''erreur.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: Le fichier JAR du projet de biblioth\u00e8que Web ({0}) entre en conflit avec un fichier JAR du r\u00e9pertoire WEB-INF/lib.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: Le serveur cible du projet de biblioth\u00e8que Web ({1}) ne correspond pas \u00e0 celui de ce projet Web ({0}).  Lancez la validation sur le projet Web si vous pensez que cela n''est pas le cas.
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=La cha\u00eene de masque URL "{0}" se termine par un retour chariot non valide pour le servlet {1}
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: Le type ejb-ref-doit \u00eatre "Entity" ou "Session".
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: L''\u00e9l\u00e9ment security-role-ref {0} d\u00e9finit l''\u00e9l\u00e9ment role-link, mais il n''y a pas d''\u00e9l\u00e9ment security-role dans le descripteur de l''application.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=de type Nom du r\u00f4le de s\u00e9curit\u00e9
-Web_Archive_Validator_8=Valideur d'archive Web
-of_Type_Role_Name_19=de type Nom de r\u00f4le
-of_Type_Parameter_Name_25=de type Nom de param\u00e8tre
-of_Type_Parameter_Value_26=de type Valeur de param\u00e8tre
-of_Type_Parameter_Name_32=de type Nom de param\u00e8tre
-of_Type_Parameter_Value_33=de type Valeur de param\u00e8tre
-of_Type_Parameter_Name_39=de type Nom de param\u00e8tre
-of_Type_Parameter_Value_40=de type Valeur de param\u00e8tre
-of_Type_ejb-ref-name_44=de type nom de r\u00e9f\u00e9rence d'ejb
-of_Type_Error_Location_47=de type Emplacement d'erreur
-of_Type_Error_Location_49=de type Emplacement d'erreur
-of_Type_Mime_Extension_54=de type Extension Mime
-of_Type_Mime_Type_55=de type Type Mime
-of_Type_Mime_Extension___56=de type Extension Mime :
-of_Type_Web_Resource_Collection_64=de type Collection de ressources Web
-of_Type_Filter_Name_66=de type Nom de filtre
-Invalid_URL_70=URL non valide
-Invalid_URL_75=URL non valide
-of_Type_Servlet_Name_77=de type Nom de servlet
-of_Type_Taglib_80=de type Biblioth\u00e8que de balises
-of_Type_TagLib___81=de type Biblioth\u00e8que de balises :
-of_Type_Web_Resource_Name_84=de type Nom de ressource Web
-of_Type_Welcome_File_Name__87=de type Nom de fichier de bienvenue
-of_Type_Env_Entry_Name___88=de type Nom d'entr\u00e9e d'environnement
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_it.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_it.properties
deleted file mode 100644
index 703b26b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_it.properties
+++ /dev/null
@@ -1,258 +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 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: convalida WAR non riuscita: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: ruolo di protezione duplicato con il nome {0}.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: Impossibile trovare il file JSP, {0}, per servlet \"{1}\".
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: Impossibile trovare il file <small-icon>, {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: Impossibile trovare il file <large-icon>, {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: L''associazione servlet \"{0}\" fa riferimento a un servlet non definito.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Voce di riepilogo del file di benvenuto vuota.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: Impossibile trovare il file di benvenuto {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: Impossibile trovare il file del descrittore della libreria dei tag, {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: File WAR mancante o non valido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: L''associazione del filtro \"{0}\" fa riferimento a un filtro non definito.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: I file di benvenuto non possono iniziare o terminare con il carattere /.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Errore di analisi: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Errore durante l'analisi del descrittore di distribuzione.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Errore durante l'analisi del descrittore di distribuzione.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: Impossibile aprire il descrittore di distribuzione. La convalida non pu\u00f2 essere completata.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: L''associazione URL \"{0}\" non \u00e8 valida.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Collegamento al ruolo di protezione non valido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: Metodo HTTP non valido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Garanzia di trasporto non valida.  I valori validi sono \"NONE\", \"INTEGRAL\" o \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: Il file jsp \"{0}\" richiamato dal servlet {1} deve essere un percorso assoluto completo.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Il progetto Web: {0} \u00e8 associato a una cartella principale di contesto non valida: {1} nel progetto EAR: {2}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: Il percorso della pagina degli errori deve iniziare con il carattere /.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Nome del ruolo di protezione non valido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: Metodo di autenticazione non valido.  I valori validi sono: \"BASIC\", \"DIGEST\", \"FORM\" o \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E:  Il metodo di autenticazione \u00e8 {0}.  I valori form-login-config saranno ignorati a meno che non si utilizza il metodo di autenticazione FORM.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E:  Il riferimento risorsa {0} deve contenere res-auth di tipo "SERVLET" o "CONTAINER".
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E:  Il riferimento risorsa {0} deve contenere res-auth di tipo "Application" o "Container".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" non \u00e8 un valore valido per res-auth in un descrittore di distribuzione di livello 2.2.  Utilizzare \"SERVLET\".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" non \u00e8 un valore valido per res-auth in un descrittore di distribuzione di livello 2.2.  Utilizzare \"Application\".
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: tipo di eccezione non valido {0}.  Il tipo di eccezione deve contenere un nome di classe completo di un tipo di eccezione Java.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: Associazione URL duplicata {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Voce servlet duplicata {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: Timeout di sessione non valido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Voce duplicata {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: Voce vuota {0}.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: Voce filtro duplicata {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: Elemento ejb-ref duplicato denominato {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: ERRORE EAR. ECCEZIONE DI FILE DEL MODULO NON CONTENUTO
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: Codice di errore sconosciuto: {0}.  Il codice di errore deve contenere un codice di stato HTTP valido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: Ambito di condivisione risorse non valido. I valori validi sono \"Condivisibile\" o \"Non condivisibile\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: Tipo di ambiente non valido. I valori validi sono \"java.lang.TYPE\", in cui il TIPO \u00e8 uno dei seguenti: Booleano, Byte, Carattere, Stringa, Abbreviato, Intero, Lungo, Float o Doppio".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Progetto libreria Web ({0}) mancante.  Controllare le propriet\u00e0 del progetto per correggere questo problema.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: Il JAR ({0}) del progetto libreria Web \u00e8 in conflitto con un JAR effettivo che si trova nella directory WEB-INF/lib.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: il server di destinazione del progetto libreria Web ({1}) non corrisponde al server di questo progetto Web ({0}).  Se non si \u00e8 certi di questa condizione, eseguire la convalida del progetto Web.
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=La stringa del modello URL "{0}" termina con un ritorno a capo non valido per il servlet {1}
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type deve essere  'Entit\u00e0' o 'Sessione'.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: l'elemento ''security-role-ref'' {0} definisce l'elemento ''role-link'' ma non gli elementi ''security-role'' nel descrittore dell'applicazione.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=di tipo nome ruolo di protezione
-Web_Archive_Validator_8=Validator archivio Web
-of_Type_Role_Name_19=di tipo nome ruolo
-of_Type_Parameter_Name_25=di tipo nome parametro
-of_Type_Parameter_Value_26=di tipo valore parametro
-of_Type_Parameter_Name_32=di tipo nome parametro
-of_Type_Parameter_Value_33=di tipo valore parametro
-of_Type_Parameter_Name_39=di tipo nome parametro
-of_Type_Parameter_Value_40=di tipo valore parametro
-of_Type_ejb-ref-name_44=di tipo nome riferimento ejb
-of_Type_Error_Location_47=di tipo posizione errori
-of_Type_Error_Location_49=di tipo posizione errori
-of_Type_Mime_Extension_54=di tipo estensione mime
-of_Type_Mime_Type_55=di tipo tipo mime
-of_Type_Mime_Extension___56=di tipo estensione mime:
-of_Type_Web_Resource_Collection_64=di tipo insieme di risorse Web
-of_Type_Filter_Name_66=di tipo nome filtro
-Invalid_URL_70=URL non valido
-Invalid_URL_75=URL non valido
-of_Type_Servlet_Name_77=di tipo nome servlet
-of_Type_Taglib_80=di tipo taglib
-of_Type_TagLib___81=di tipo taglib:
-of_Type_Web_Resource_Name_84=di tipo nome risorsa Web
-of_Type_Welcome_File_Name__87=di tipo nome file di benvenuto
-of_Type_Env_Entry_Name___88=di tipo nome ambiente
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_ja.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_ja.properties
deleted file mode 100644
index a2c70e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_ja.properties
+++ /dev/null
@@ -1,258 +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 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 \u306e\u59a5\u5f53\u6027\u691c\u67fb\u304c\u5931\u6557\u3057\u307e\u3057\u305f: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u540d {0} \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 \"{1}\" \u306e JSP \u30d5\u30a1\u30a4\u30eb {0} \u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: <small-icon> \u30d5\u30a1\u30a4\u30eb {0} \u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: <large-icon> \u30d5\u30a1\u30a4\u30eb {0} \u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30fb\u30de\u30c3\u30d4\u30f3\u30b0 \"{0}\" \u306f\u3001\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u53c2\u7167\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: \u30a6\u30a7\u30eb\u30ab\u30e0\u30fb\u30d5\u30a1\u30a4\u30eb\u30fb\u30ea\u30b9\u30c8\u30fb\u30a8\u30f3\u30c8\u30ea\u30fc\u304c\u7a7a\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: \u30a6\u30a7\u30eb\u30ab\u30e0\u30fb\u30d5\u30a1\u30a4\u30eb {0} \u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: \u30bf\u30b0\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u30fc\u8a18\u8ff0\u5b50\u30d5\u30a1\u30a4\u30eb {0} \u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: WAR \u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u306a\u3044\u304b\u3001\u307e\u305f\u306f\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: \u30d5\u30a3\u30eb\u30bf\u30fc\u30fb\u30de\u30c3\u30d4\u30f3\u30b0 \"{0}\" \u306f\u3001\u5b9a\u7fa9\u3055\u308c\u3066\u3044\u306a\u3044\u30d5\u30a3\u30eb\u30bf\u30fc\u3092\u53c2\u7167\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: \u30a6\u30a7\u30eb\u30ab\u30e0\u30fb\u30d5\u30a1\u30a4\u30eb\u306f / \u3067\u59cb\u307e\u308b\u3053\u3068\u3082\u3001\u7d42\u308f\u308b\u3053\u3068\u3082\u3067\u304d\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: \u69cb\u6587\u89e3\u6790\u30a8\u30e9\u30fc: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u306e\u69cb\u6587\u89e3\u6790\u30a8\u30e9\u30fc\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u306e\u69cb\u6587\u89e3\u6790\u30a8\u30e9\u30fc\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3092\u958b\u3051\u307e\u305b\u3093\u3002 \u691c\u8a3c\u306f\u5b8c\u4e86\u3057\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: URL \u30de\u30c3\u30d4\u30f3\u30b0 \"{0}\" \u304c\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u30ea\u30f3\u30af {0} \u304c\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: HTTP \u30e1\u30bd\u30c3\u30c9 {0} \u304c\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: \u30c8\u30e9\u30f3\u30b9\u30dd\u30fc\u30c8\u4fdd\u8a3c\u304c\u7121\u52b9\u3067\u3059\u3002  \u6709\u52b9\u306a\u5024\u306f \"NONE\"\u3001\"INTEGRAL\"\u3001\u307e\u305f\u306f \"CONFIDENTIAL\" \u3067\u3059\u3002
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {1} \u304c\u53c2\u7167\u3057\u3066\u3044\u308b JSP \u30d5\u30a1\u30a4\u30eb \"{0}\" \u306f\u3001\u5b8c\u5168\u7d76\u5bfe\u30d1\u30b9\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Web \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {0} \u304c EAR \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 {2} \u5185\u306e\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30fb\u30eb\u30fc\u30c8 {1} \u306b\u30de\u30c3\u30d7\u3055\u308c\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: \u30a8\u30e9\u30fc\u30fb\u30da\u30fc\u30b8\u306e\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u306f / \u3067\u59cb\u307e\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: \u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u540d {0} \u304c\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: auth \u30e1\u30bd\u30c3\u30c9\u304c\u7121\u52b9\u3067\u3059\u3002  \u6709\u52b9\u306a\u5024\u306f \"BASIC\"\u3001\"DIGEST\"\u3001\"FORM\"\u3001\u307e\u305f\u306f \"CLIENT-CERT\" \u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E:  \u8a8d\u8a3c\u65b9\u5f0f\u304c {0} \u3067\u3059\u3002  FORM \u8a8d\u8a3c\u65b9\u5f0f\u304c\u4f7f\u7528\u3055\u308c\u306a\u3044\u9650\u308a\u3001form-login-config \u5024\u306f\u7121\u8996\u3055\u308c\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E:  \u30ea\u30bd\u30fc\u30b9\u53c2\u7167 {0} \u306b\u306f\u3001"SERVLET" \u307e\u305f\u306f "CONTAINER" \u306e res-auth \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E:  \u30ea\u30bd\u30fc\u30b9\u53c2\u7167 {0} \u306b\u306f\u3001"Application" \u307e\u305f\u306f "Container" \u306e res-auth \u304c\u542b\u307e\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" \u306f 2.2 \u30ec\u30d9\u30eb\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3067\u306f res-auth \u306e\u6709\u52b9\u306a\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002  \u4ee3\u308f\u308a\u306b \"SERVLET\" \u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" \u306f 2.2 \u30ec\u30d9\u30eb\u306e\u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u3067\u306f res-auth \u306e\u6709\u52b9\u306a\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002  \u4ee3\u308f\u308a\u306b \"Application\" \u3092\u4f7f\u7528\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: \u4f8b\u5916\u578b {0} \u304c\u7121\u52b9\u3067\u3059\u3002  \u4f8b\u5916\u578b\u306b\u306f\u3001Java \u4f8b\u5916\u30bf\u30a4\u30d7\u306e\u5b8c\u5168\u4fee\u98fe\u30af\u30e9\u30b9\u540d\u304c\u542b\u307e\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: URL \u30de\u30c3\u30d4\u30f3\u30b0 {0} \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30fb\u30a8\u30f3\u30c8\u30ea\u30fc {0} \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: \u30bb\u30c3\u30b7\u30e7\u30f3\u30fb\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u304c\u7121\u52b9\u3067\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: \u30a8\u30f3\u30c8\u30ea\u30fc {0} \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: \u30a8\u30f3\u30c8\u30ea\u30fc {0} \u304c\u7a7a\u3067\u3059\u3002
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: \u30d5\u30a3\u30eb\u30bf\u30fc\u30fb\u30a8\u30f3\u30c8\u30ea\u30fc {0} \u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: {0} \u3068\u3044\u3046\u540d\u524d\u306e ejb-ref \u30a8\u30ec\u30e1\u30f3\u30c8\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: EAR \u304c\u542b\u307e\u308c\u3066\u3044\u306a\u3044\u30e2\u30b8\u30e5\u30fc\u30eb\u30fb\u30d5\u30a1\u30a4\u30eb\u4f8b\u5916\u306e\u30a8\u30e9\u30fc
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: \u4e0d\u660e\u306a\u30a8\u30e9\u30fc\u30fb\u30b3\u30fc\u30c9: {0}\u3002  error-code \u306b\u306f\u6709\u52b9\u306a HTTP \u72b6\u6cc1\u30b3\u30fc\u30c9\u304c\u542b\u307e\u308c\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: res-sharing-scope \u304c\u7121\u52b9\u3067\u3059\u3002\u6709\u52b9\u306a\u5024\u306f \"Shareable\" \u307e\u305f\u306f \"Unshareable\" \u3067\u3059\u3002
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: \u7121\u52b9\u306a\u74b0\u5883\u30a8\u30f3\u30c8\u30ea\u30fc\u306e\u578b\u3002 \u6709\u52b9\u306a\u5024\u306f \"java.lang.TYPE\" \u3067\u3059\u3002\u3053\u306e TYPE \u306f\u3001Boolean\u3001Byte\u3001Character\u3001String\u3001Short\u3001Integer\u3001Long\u3001Float\u3001\u307e\u305f\u306f Double \u3067\u3059\u3002
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Web \u30e9\u30a4\u30d6\u30e9\u30ea\u30fc\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 ({0}) \u304c\u6b20\u843d\u3057\u3066\u3044\u307e\u3059\u3002  \u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u3092\u30c1\u30a7\u30c3\u30af\u3057\u3066\u3001\u3053\u306e\u554f\u984c\u3092\u4fee\u6b63\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: Web \u30e9\u30a4\u30d6\u30e9\u30ea\u30fc\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 JAR ({0}) \u306f\u3001WEB-INF/lib \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u5185\u306e\u5b9f\u969b\u306e JAR \u3068\u5bfe\u7acb\u3057\u3066\u3044\u307e\u3059\u3002
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: Web \u30e9\u30a4\u30d6\u30e9\u30ea\u30fc\u30fb\u30d7\u30ed\u30b8\u30a7\u30af\u30c8 ({1}) \u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u304c\u3001\u3053\u306e Web \u30d7\u30ed\u30b8\u30a7\u30af\u30c8 ({0}) \u306e\u30bf\u30fc\u30b2\u30c3\u30c8\u30fb\u30b5\u30fc\u30d0\u30fc\u3068\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002  \u3053\u308c\u304c\u8a72\u5f53\u3057\u306a\u3044\u3068\u8003\u3048\u3089\u308c\u308b\u5834\u5408\u306f\u3001Web \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u59a5\u5f53\u6027\u691c\u67fb\u3092\u5b9f\u884c\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=URL \u30d1\u30bf\u30fc\u30f3\u30fb\u30b9\u30c8\u30ea\u30f3\u30b0 "{0}" \u304c\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {1} \u306e\u7121\u52b9\u306a\u6539\u884c\u3067\u7d42\u308f\u3063\u3066\u3044\u307e\u3059\u3002
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type \u306f 'Entity' \u307e\u305f\u306f 'Session' \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' \u30a8\u30ec\u30e1\u30f3\u30c8 {0} \u306f\u3001\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u8a18\u8ff0\u5b50\u3067 ''role-link'' \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u3059\u304c\u3001''security-role'' \u30a8\u30ec\u30e1\u30f3\u30c8\u3092\u5b9a\u7fa9\u3057\u3066\u3044\u307e\u305b\u3093\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=\u578b\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30fc\u5f79\u5272\u540d
-Web_Archive_Validator_8=Web \u30a2\u30fc\u30ab\u30a4\u30d6\u30fb\u30d0\u30ea\u30c7\u30fc\u30bf\u30fc
-of_Type_Role_Name_19=\u578b\u5f79\u5272\u540d
-of_Type_Parameter_Name_25=\u578b\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u540d
-of_Type_Parameter_Value_26=\u578b\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u5024
-of_Type_Parameter_Name_32=\u578b\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u540d
-of_Type_Parameter_Value_33=\u578b\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u5024
-of_Type_Parameter_Name_39=\u578b\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u540d
-of_Type_Parameter_Value_40=\u578b\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u5024
-of_Type_ejb-ref-name_44=\u578b ejb-ref \u540d
-of_Type_Error_Location_47=\u578b\u30a8\u30e9\u30fc\u30fb\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
-of_Type_Error_Location_49=\u578b\u30a8\u30e9\u30fc\u30fb\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3
-of_Type_Mime_Extension_54=\u578b MIME \u62e1\u5f35
-of_Type_Mime_Type_55=\u578b MIME \u578b
-of_Type_Mime_Extension___56=\u578b MIME \u62e1\u5f35:
-of_Type_Web_Resource_Collection_64=\u578b Web \u30ea\u30bd\u30fc\u30b9\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3
-of_Type_Filter_Name_66=\u578b\u30d5\u30a3\u30eb\u30bf\u30fc\u540d
-Invalid_URL_70=\u7121\u52b9\u306a URL
-Invalid_URL_75=\u7121\u52b9\u306a URL
-of_Type_Servlet_Name_77=\u578b\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d
-of_Type_Taglib_80=\u578b Taglib
-of_Type_TagLib___81=\u578b Taglib
-of_Type_Web_Resource_Name_84=\u578b Web \u30ea\u30bd\u30fc\u30b9\u540d
-of_Type_Welcome_File_Name__87=\u578b\u30a6\u30a7\u30eb\u30ab\u30e0\u30fb\u30d5\u30a1\u30a4\u30eb\u540d
-of_Type_Env_Entry_Name___88=\u578b\u74b0\u5883\u30a8\u30f3\u30c8\u30ea\u30fc\u540d
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_ko.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_ko.properties
deleted file mode 100644
index bfc2e95..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_ko.properties
+++ /dev/null
@@ -1,258 +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 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 \uc720\ud6a8\uc131 \uac80\uc99d \uc2e4\ud328: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: \ubcf4\uc548 \uc5ed\ud560 \uc774\ub984 {0}\uc774(\uac00) \uc911\ubcf5\ub429\ub2c8\ub2e4.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: Servlet \"{1}\"\uc5d0 \ub300\ud55c {0} JSP \ud30c\uc77c\uc774 \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: <small-icon> \ud30c\uc77c {0}\uc774(\uac00) \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: <large-icon> \ud30c\uc77c {0}\uc774(\uac00) \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: Servlet \ub9f5\ud551 \"{0}\"\uc774(\uac00) \uc815\uc758\ub418\uc9c0 \uc54a\uc740 Servlet\uc744 \ucc38\uc870\ud569\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: \ud658\uc601 \ud30c\uc77c \ubaa9\ub85d \ud56d\ubaa9\uc774 \ube44\uc5b4 \uc788\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: {0} \ud658\uc601 \ud30c\uc77c\uc774 \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: \ud0dc\uadf8 \ub77c\uc774\ube0c\ub7ec\ub9ac \uc124\uba85\uc790 \ud30c\uc77c {0}(\uac00) \ub204\ub77d\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: WAR \ud30c\uc77c\uc774 \ub204\ub77d\ub418\uc5c8\uac70\ub098 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: \ud544\ud130 \ub9f5\ud551 \"{0}\"\uc774(\uac00) \uc815\uc758\ub418\uc9c0 \uc54a\uc740 \ud544\ud130\ub97c \ucc38\uc870\ud569\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: \ud658\uc601 \ud30c\uc77c\uc740 /\ub85c \uc2dc\uc791\ud558\uac70\ub098 \ub05d\ub0a0 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: \uad6c\ubb38 \ubd84\uc11d \uc624\ub958: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: \uc804\uac1c \uc124\uba85\uc790 \uad6c\ubb38 \ubd84\uc11d \uc624\ub958.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: \uc804\uac1c \uc124\uba85\uc790 \uad6c\ubb38 \ubd84\uc11d \uc624\ub958.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: \uc804\uac1c \uc124\uba85\uc790\ub97c \uc5f4 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc720\ud6a8\uc131 \uac80\uc99d\uc744 \uc644\ub8cc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: URL \ub9f5\ud551 \"{0}\"\uc774(\uac00) \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ubcf4\uc548 \uc5ed\ud560 \ub9c1\ud06c: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 HTTP \uba54\uc18c\ub4dc: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc804\uc1a1 \ubcf4\uc99d.  \uc62c\ubc14\ub978 \uac12\uc740 \"NONE\", \"INTEGRAL\" \ub610\ub294 \"CONFIDENTIAL\"\uc785\ub2c8\ub2e4.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: Servlet {1}\uc5d0\uc11c \ucc38\uc870\ub41c \"{0}\" jsp \ud30c\uc77c\uc740 \uc644\uc804\ud55c \uc808\ub300 \uacbd\ub85c\uc5ec\uc57c \ud569\ub2c8\ub2e4.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: \uc6f9 \ud504\ub85c\uc81d\ud2b8: {0}\uc774(\uac00) EAR \ud504\ub85c\uc81d\ud2b8: {2}\uc5d0\uc11c \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ucee8\ud14d\uc2a4\ud2b8 \ub8e8\ud2b8: {1}\uc5d0 \ub9f5\ud551\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: \uc624\ub958 \ud398\uc774\uc9c0\uc758 \uc704\uce58\ub294 /\ub85c \uc2dc\uc791\ud574\uc57c \ud569\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ubcf4\uc548 \uc5ed\ud560 \uc774\ub984: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: auth \uba54\uc18c\ub4dc\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.  \uc62c\ubc14\ub978 \uac12\uc740 \"BASIC\", \"DIGEST\", \"FORM\" \ub610\ub294 \"CLIENT-CERT\"\uc785\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E:  \uc778\uc99d \uba54\uc18c\ub4dc\ub294 {0}\uc785\ub2c8\ub2e4.  form-login-config \uac12\uc740 FORM \uc778\uc99d \uba54\uc18c\ub4dc\ub97c \uc0ac\uc6a9\ud558\uc9c0 \uc54a\ub294 \uacbd\uc6b0 \ubb34\uc2dc\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E:  {0} \uc790\uc6d0 \ucc38\uc870\uc5d0\ub294 "SERVLET" \ub610\ub294 "CONTAINER" \uc720\ud615\uc758 res-auth\uac00 \ud3ec\ud568\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E:  {0} \uc790\uc6d0 \ucc38\uc870\uc5d0\ub294 "Application" \ub610\ub294 "Container" \uc720\ud615\uc758 res-auth\uac00 \ud3ec\ud568\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\"\uc740(\ub294) 2.2 \ub808\ubca8 \uc804\uac1c \uc124\uba85\uc790\uc5d0\uc11c .res-auth\uc5d0 \ub300\ud574 \uc62c\ubc14\ub978 \uac12\uc774 \uc544\ub2d9\ub2c8\ub2e4.  \ub300\uc2e0 \"SERVLET\"\uc744 \uc0ac\uc6a9\ud558\uc2ed\uc2dc\uc624.
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"Application\"\uc740(\ub294) 2.2 \ub808\ubca8 \uc804\uac1c \uc124\uba85\uc790\uc5d0\uc11c .res-auth\uc5d0 \ub300\ud55c \uc62c\ubc14\ub978 \uac12\uc774 \uc544\ub2d9\ub2c8\ub2e4.  \ub300\uc2e0 \"Application\"\uc744 \uc0ac\uc6a9\ud558\uc2ed\uc2dc\uc624.
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc608\uc678 \uc720\ud615 {0}.  \uc608\uc678 \uc720\ud615\uc5d0\ub294 Java \uc608\uc678 \uc720\ud615\uc758 \uc644\uc804\ud558\uac8c \uaddc\uc815\ub41c \ud074\ub798\uc2a4 \uc774\ub984\uc774 \ud3ec\ud568\ub418\uc5b4 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: \uc911\ubcf5\ub418\ub294 URL \ub9f5\ud551 {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: \uc911\ubcf5\ub418\ub294 Servlet \ud56d\ubaa9 {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: \uc138\uc158 \uc81c\ud55c\uc2dc\uac04\uc774 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: \uc911\ubcf5\ub418\ub294 \ud56d\ubaa9 {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: \ube48 \ud56d\ubaa9 {0}.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: \uc911\ubcf5\ub418\ub294 \ud544\ud130 \ud56d\ubaa9 {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: {0}\uc73c\ub85c \uc774\ub984\uc774 \uc9c0\uc815\ub41c ejb-ref \uc694\uc18c\uac00 \uc911\ubcf5\ub429\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: EAR \ube44\ud3ec\ud568 \ubaa8\ub4c8 \ud30c\uc77c \uc608\uc678 \uc624\ub958
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: \uc54c \uc218 \uc5c6\ub294 \uc624\ub958 \ucf54\ub4dc: {0}.  \uc624\ub958 \ucf54\ub4dc\uc5d0\ub294 \uc62c\ubc14\ub978 HTTP \uc0c1\ud0dc \ucf54\ub4dc\uac00 \ud3ec\ud568\ub418\uc5b4 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: res-sharing-scope\uac00 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc62c\ubc14\ub978 \uac12\uc740 \"Shareable\" \ub610\ub294 \"Unshareable\"\uc785\ub2c8\ub2e4.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: \ud658\uacbd \ud56d\ubaa9 \uc720\ud615\uc774 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc62c\ubc14\ub978 \uac12\uc740 \"java.lang.TYPE\" \uc785\ub2c8\ub2e4. \uc5ec\uae30\uc11c TYPE\uc740 Boolean, Byte, Character, String, Short, Integer, Long, Float, Double \uc911 \ud558\ub098\uc785\ub2c8\ub2e4.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: \uc6f9 \ub77c\uc774\ube0c\ub7ec\ub9ac \ud504\ub85c\uc81d\ud2b8({0})\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.  \uc774 \ud504\ub85c\uc81d\ud2b8\uc758 \ud2b9\uc131\uc744 \ud655\uc778\ud558\uc5ec \uc774 \ubb38\uc81c\uc810\uc744 \uc218\uc815\ud558\uc2ed\uc2dc\uc624.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: \uc6f9 \ub77c\uc774\ube0c\ub7ec\ub9ac \ud504\ub85c\uc81d\ud2b8 JAR({0})\uc774 WEB-INF/lib \ub514\ub809\ud1a0\ub9ac\uc758 \uc2e4\uc81c Jar\uacfc \ucda9\ub3cc\ud569\ub2c8\ub2e4.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: \uc6f9 \ub77c\uc774\ube0c\ub7ec\ub9ac \ud504\ub85c\uc81d\ud2b8({1})\uc758 \ub300\uc0c1 \uc11c\ubc84\uac00 \uc774 \uc6f9 \ud504\ub85c\uc81d\ud2b8({0})\uc758 \ub300\uc0c1 \uc11c\ubc84\uc640 \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.  \uc774 \uacbd\uc6b0\uc5d0 \ud574\ub2f9\ub418\uc9c0 \uc54a\ub294 \uac83\uc73c\ub85c \uc0dd\uac01\ub418\uba74 \uc6f9 \ud504\ub85c\uc81d\ud2b8\uc5d0\uc11c \uc720\ud6a8\uc131 \uac80\uc99d\uc744 \uc2e4\ud589\ud558\uc2ed\uc2dc\uc624.
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=URL \ud328\ud134 \ubb38\uc790\uc5f4 "{0}"\uc740(\ub294) servlet {1}\uc758 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uce90\ub9ac\uc9c0 \ub9ac\ud134\uc73c\ub85c \ub05d\ub0a9\ub2c8\ub2e4.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type\uc740 'Entity' \ub610\ub294 'Session'\uc774\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' \uc694\uc18c({0})\uac00 ''role-link'' \uc694\uc18c\ub97c \uc815\uc758\ud558\uc9c0\ub9cc \uc751\uc6a9\ud504\ub85c\uadf8\ub7a8 \uc124\uba85\uc790\uc5d0 ''security-role'' \uc694\uc18c\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=\uc720\ud615 \ubcf4\uc548 \uc5ed\ud560 \uc774\ub984
-Web_Archive_Validator_8=\uc6f9 \uc544\uce74\uc774\ube0c \uc720\ud6a8\uc131 \uac80\uc99d\uae30
-of_Type_Role_Name_19=\uc720\ud615 \uc5ed\ud560 \uc774\ub984
-of_Type_Parameter_Name_25=\uc720\ud615 \ub9e4\uac1c\ubcc0\uc218 \uc774\ub984
-of_Type_Parameter_Value_26=\uc720\ud615 \ub9e4\uac1c\ubcc0\uc218 \uac12
-of_Type_Parameter_Name_32=\uc720\ud615 \ub9e4\uac1c\ubcc0\uc218 \uc774\ub984
-of_Type_Parameter_Value_33=\uc720\ud615 \ub9e4\uac1c\ubcc0\uc218 \uac12
-of_Type_Parameter_Name_39=\uc720\ud615 \ub9e4\uac1c\ubcc0\uc218 \uc774\ub984
-of_Type_Parameter_Value_40=\uc720\ud615 \ub9e4\uac1c\ubcc0\uc218 \uac12
-of_Type_ejb-ref-name_44=\uc720\ud615 ejb-ref-name
-of_Type_Error_Location_47=\uc720\ud615 \uc624\ub958 \uc704\uce58
-of_Type_Error_Location_49=\uc720\ud615 \uc624\ub958 \uc704\uce58
-of_Type_Mime_Extension_54=\uc720\ud615 Mime \ud655\uc7a5
-of_Type_Mime_Type_55=\uc720\ud615 Mime \uc720\ud615
-of_Type_Mime_Extension___56=\uc720\ud615 Mime \ud655\uc7a5:
-of_Type_Web_Resource_Collection_64=\uc720\ud615 \uc6f9 \uc790\uc6d0 \ucf5c\ub809\uc158
-of_Type_Filter_Name_66=\uc720\ud615 \ud544\ud130 \uc774\ub984
-Invalid_URL_70=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 URL
-Invalid_URL_75=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 URL
-of_Type_Servlet_Name_77=\uc720\ud615 Servlet \uc774\ub984
-of_Type_Taglib_80=\uc720\ud615 Taglib
-of_Type_TagLib___81=\uc720\ud615 TagLib:
-of_Type_Web_Resource_Name_84=\uc720\ud615 \uc6f9 \uc790\uc6d0 \uc774\ub984
-of_Type_Welcome_File_Name__87=\uc720\ud615 \ud658\uc601 \ud30c\uc77c \uc774\ub984
-of_Type_Env_Entry_Name___88=\uc720\ud615 \ud658\uacbd \ud56d\ubaa9 \uc774\ub984
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_pt_BR.properties
deleted file mode 100644
index 29af736..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_pt_BR.properties
+++ /dev/null
@@ -1,258 +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 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: Falha na Valida\u00e7\u00e3o de WAR: {0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: Fun\u00e7\u00e3o de seguran\u00e7a duplicada nomeada {0}.
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: O arquivo JSP, {0}, para o servlet \"{1}\" est\u00e1 ausente.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: O arquivo <small-icon>, {0}, est\u00e1 ausente.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: O arquivo <large-icon>, {0}, est\u00e1 ausente.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: O mapeamento de servlet \"{0}\" se refere a um servlet que n\u00e3o est\u00e1 definido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: Entrada da lista de arquivos de bem-vindo vazia.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: O arquivo de bem-vindo {0} est\u00e1 ausente.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: O Arquivo Descritor da Biblioteca de Tags, {0}, est\u00e1 ausente.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: Arquivo WAR ausente ou inv\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: O mapeamento de filtro, \"{0}\" se refere a um filtro que n\u00e3o est\u00e1 definido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: Os Arquivos de Bem-Vindo n\u00e3o podem come\u00e7ar ou terminar com um /.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: Erro de An\u00e1lise: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: Erro de An\u00e1lise do Descritor de Implementa\u00e7\u00e3o.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: Erro de An\u00e1lise do Descritor de Implementa\u00e7\u00e3o.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: N\u00e3o \u00e9 poss\u00edvel abrir o descritor de implementa\u00e7\u00e3o. A valida\u00e7\u00e3o n\u00e3o pode ser conclu\u00edda.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: O Mapeamento de URL \"{0}\" \u00e9 inv\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: Link de Fun\u00e7\u00e3o de Seguran\u00e7a inv\u00e1lido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: M\u00e9todo HTTP inv\u00e1lido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: Garantia de Transporte Inv\u00e1lida. Os valores v\u00e1lidos s\u00e3o \"NONE\", \"INTEGRAL\" ou \"CONFIDENTIAL\".
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: O arquivo jsp \"{0}\" referido pelo servlet {1} deve ser um caminho absoluto completo.
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Projeto da Web: {0} est\u00e1 mapeado para uma raiz de Contexto inv\u00e1lida: {1} no Projeto EAR: {2}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: A Localiza\u00e7\u00e3o da P\u00e1gina de Erro Deve Come\u00e7ar com um /.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: Nome da fun\u00e7\u00e3o de Seguran\u00e7a inv\u00e1lido: {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: M\u00e9todo de autentica\u00e7\u00e3o inv\u00e1lido.  Os valores v\u00e1lidos s\u00e3o: \"BASIC\", \"DIGEST\", \"FORM\" ou \"CLIENT-CERT\".
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E:  O m\u00e9todo de autentica\u00e7\u00e3o \u00e9 {0}.  Os valores de configura\u00e7\u00e3o de login do formul\u00e1rio ser\u00e1 ignorado, a n\u00e3o ser que seja utilizado o m\u00e9todo de autentica\u00e7\u00e3o FORM.
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E: A refer\u00eancia de recurso {0} deve conter res-auth "SERVLET" ou "CONTAINER".
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E: A refer\u00eancia de recurso {0} deve conter res-auth "Application" ou "Container".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" n\u00e3o \u00e9 um valor v\u00e1lido para res-auth em um descritor de implementa\u00e7\u00e3o de n\u00edvel 2.2. Utilize \"SERVLET\".
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" n\u00e3o \u00e9 um valor v\u00e1lido para res-auth em um descritor de implementa\u00e7\u00e3o de n\u00edvel 2.2. Utilize \"Application\".
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: Tipo de Exce\u00e7\u00e3o Inv\u00e1lido {0}. O tipo de exce\u00e7\u00e3o deve conter um nome de classe completo do tipo de exce\u00e7\u00e3o Java.
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: Mapeamento de URL duplicado {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Entrada de Servlet Duplicada {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: O Tempo Limite de Session n\u00e3o \u00e9 v\u00e1lido.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: Entrada Duplicada {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: Entrada Vazia {0}.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: Entrada de Filtro Duplicada {0}.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: Elemento ejb-ref duplicado denominado {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: C\u00f3digo de Erro Desconhecido: {0}.  O c\u00f3digo de erro deve conter um c\u00f3digo de status HTTP.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: res-sharing-scope inv\u00e1lido; valores v\u00e1lidos s\u00e3o \"Shareable\" ou \"Unshareable\".
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: Tipo de Entrada de Ambiente Inv\u00e1lido. Os valores v\u00e1lidos s\u00e3o \"java.lang.TYPE\", em que TYPE \u00e9 um dos seguintes: Boolean, Byte, Character, String, Short, Integer, Long, Float ou Double."
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: Projeto da Biblioteca da Web Ausente ({0}).  Verifique as propriedades deste projeto para corrigir este problema.
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: O JAR do projeto da Biblioteca da Web ({0}) conflita com um JAR real no diret\u00f3rio WEB-INF/lib.
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: O servidor de destino do Projeto de Biblioteca da Web ({1}) n\u00e3o corresponde a este Projeto da Web ({0}).  Execute a valida\u00e7\u00e3o no Projeto da Web se acreditar que esse n\u00e3o \u00e9 o caso.
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=A cadeia de padr\u00e3o de URL "{0}" termina com um retorno de carro inv\u00e1lido para o servlet {1}
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type deve ser 'Entity' ou 'Session'.
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: O elemento {0} do ''security-role-ref'' define elemento ''role-link'', por\u00e9m, n\u00e3o h\u00e1 elementos do ''security-role'' no descritor do aplicativo.
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=do Tipo Nome da Fun\u00e7\u00e3o de Seguran\u00e7a
-Web_Archive_Validator_8=Validador de Archive da Web
-of_Type_Role_Name_19=do Tipo Nome da Fun\u00e7\u00e3o
-of_Type_Parameter_Name_25=do Tipo Nome do Par\u00e2metro
-of_Type_Parameter_Value_26=do Tipo Valor do Par\u00e2metro
-of_Type_Parameter_Name_32=do Tipo Nome do Par\u00e2metro
-of_Type_Parameter_Value_33=do Tipo Valor do Par\u00e2metro
-of_Type_Parameter_Name_39=do Tipo Nome do Par\u00e2metro
-of_Type_Parameter_Value_40=do Tipo Valor do Par\u00e2metro
-of_Type_ejb-ref-name_44=do Tipo ejb-ref-name
-of_Type_Error_Location_47=do Tipo Localiza\u00e7\u00e3o do Erro
-of_Type_Error_Location_49=do Tipo Localiza\u00e7\u00e3o do Erro
-of_Type_Mime_Extension_54=Do Tipo Extens\u00e3o Mime
-of_Type_Mime_Type_55=do Tipo Tipo de Mime
-of_Type_Mime_Extension___56=do Tipo Extens\u00e3o Mime:
-of_Type_Web_Resource_Collection_64=do Tipo Coleta de Recursos da Web
-of_Type_Filter_Name_66=do Tipo Nome do Filtro
-Invalid_URL_70=URL Inv\u00e1lido
-Invalid_URL_75=URL Inv\u00e1lido
-of_Type_Servlet_Name_77=do Tipo Nome do Servlet
-of_Type_Taglib_80=do Tipo Taglib
-of_Type_TagLib___81=do Tipo TagLib:
-of_Type_Web_Resource_Name_84=do Tipo Nome do Recurso da Web
-of_Type_Welcome_File_Name__87=do Tipo Nome do Arquivo Bem-vindo
-of_Type_Env_Entry_Name___88=do Tipo Nome da Entrada do Ambiente
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_zh.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_zh.properties
deleted file mode 100644
index 9a0c5dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_zh.properties
+++ /dev/null
@@ -1,258 +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 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\uff1aWAR \u9a8c\u8bc1\u5931\u8d25\uff1a{0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E\uff1a\u540d\u4e3a {0} \u7684\u5b89\u5168\u89d2\u8272\u91cd\u590d\u3002
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E\uff1aservlet\u201c{1}\u201d\u7684 JSP \u6587\u4ef6 {0} \u4e22\u5931\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E\uff1a<small-icon> \u6587\u4ef6 {0} \u4e22\u5931\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E\uff1a<large-icon> \u6587\u4ef6 {0} \u4e22\u5931\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W\uff1aservlet \u6620\u5c04\u201c{0}\u201d\u5f15\u7528\u4e86\u672a\u5b9a\u4e49\u7684 servlet\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E\uff1a\u6b22\u8fce\u6587\u4ef6\u5217\u8868\u6761\u76ee\u4e3a\u7a7a\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E\uff1a\u6b22\u8fce\u6587\u4ef6 {0} \u4e22\u5931\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E\uff1a\u201c\u6807\u8bb0\u5e93\u63cf\u8ff0\u7b26\u6587\u4ef6\u201d{0} \u4e22\u5931\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E\uff1aWAR \u6587\u4ef6\u5df2\u4e22\u5931\u6216\u65e0\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E\uff1a\u8fc7\u6ee4\u5668\u6620\u5c04\u201c{0}\u201d\u5f15\u7528\u4e86\u672a\u5b9a\u4e49\u7684\u8fc7\u6ee4\u5668\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W\uff1a\u6b22\u8fce\u6587\u4ef6\u4e0d\u80fd\u4ee5 / \u5f00\u5934\u6216\u7ed3\u5c3e\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E\uff1a\u89e3\u6790\u9519\u8bef\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E\uff1a\u201c\u90e8\u7f72\u63cf\u8ff0\u7b26\u89e3\u6790\u201d\u9519\u8bef\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E\uff1a\u201c\u90e8\u7f72\u63cf\u8ff0\u7b26\u89e3\u6790\u201d\u9519\u8bef\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E\uff1a\u65e0\u6cd5\u6253\u5f00\u90e8\u7f72\u63cf\u8ff0\u7b26\u3002\u4e0d\u80fd\u5b8c\u6210\u9a8c\u8bc1\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E\uff1aURL \u6620\u5c04\u201c{0}\u201d\u65e0\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E\uff1a\u65e0\u6548\u7684\u5b89\u5168\u89d2\u8272\u94fe\u63a5\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E\uff1a\u65e0\u6548\u7684 HTTP \u65b9\u6cd5\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E\uff1a\u65e0\u6548\u7684\u4f20\u8f93\u4fdd\u8bc1\u3002\u6709\u6548\u503c\u4e3a\uff1a\u201cNONE\u201d\u3001\u201cINTEGRAL\u201d\u6216\u201cCONFIDENTIAL\u201d\u3002
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E\uff1aservlet {1} \u5f15\u7528\u7684 JSP \u6587\u4ef6\u201c{0}\u201d\u5fc5\u987b\u662f\u5b8c\u6574\u7684\u7edd\u5bf9\u8def\u5f84\u3002
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E\uff1aWeb \u9879\u76ee {0} \u6620\u5c04\u81f3 EAR \u9879\u76ee {2} \u4e2d\u7684\u65e0\u6548\u4e0a\u4e0b\u6587\u6839 {1}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E\uff1a\u9519\u8bef\u9875\u9762\u7684\u4f4d\u7f6e\u5fc5\u987b\u4ee5 / \u5f00\u5934\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E\uff1a\u65e0\u6548\u7684\u5b89\u5168\u89d2\u8272\u540d\u79f0\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E\uff1a\u65e0\u6548\u7684\u8ba4\u8bc1\u65b9\u6cd5\u3002\u6709\u6548\u503c\u4e3a\uff1a\u201cBASIC\u201d\u3001\u201cDIGEST\u201d\u3001\u201cFORM\u201d\u6216\u201cCLIENT-CERT\u201d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E\uff1a\u8ba4\u8bc1\u65b9\u6cd5\u662f {0}\u3002\u5c06\u5ffd\u7565 form-login-config \u503c\uff0c\u9664\u975e\u4f7f\u7528 FORM \u8ba4\u8bc1\u65b9\u6cd5\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E\uff1a\u8d44\u6e90\u5f15\u7528 {0} \u5fc5\u987b\u5305\u542b\u7c7b\u578b\u4e3a\u201cSERVLET\u201d\u6216\u201cCONTAINER\u201d\u7684\u8d44\u6e90\u8ba4\u8bc1\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E\uff1a\u8d44\u6e90\u5f15\u7528 {0} \u5fc5\u987b\u5305\u542b\u7c7b\u578b\u4e3a\u201cApplication\u201d\u6216\u201cContainer\u201d\u7684\u8d44\u6e90\u8ba4\u8bc1\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E\uff1a\u5bf9\u4e8e 2.2 \u7ea7\u522b\u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u4e2d\u7684 .res-auth \u6765\u8bf4\uff0c\u201cApplication\u201d\u662f\u65e0\u6548\u503c\u3002\u4f7f\u7528\u201cSERVLET\u201d\u6765\u4ee3\u66ff\u5b83\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E\uff1a\u5bf9\u4e8e 2.2 \u7ea7\u522b\u7684\u90e8\u7f72\u63cf\u8ff0\u7b26\u4e2d\u7684 .res-auth \u6765\u8bf4\uff0c\u201cSERVLET\u201d\u662f\u65e0\u6548\u503c\u3002\u4f7f\u7528\u201cApplication\u201d\u6765\u4ee3\u66ff\u5b83\u3002
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E\uff1a\u65e0\u6548\u7684\u5f02\u5e38\u7c7b\u578b {0}\u3002\u5f02\u5e38\u7c7b\u578b\u5fc5\u987b\u5305\u542b Java \u5f02\u5e38\u7c7b\u578b\u7684\u6807\u51c6\u7c7b\u540d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W\uff1aURL \u6620\u5c04 {0} \u91cd\u590d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W\uff1aservlet \u6761\u76ee {0} \u91cd\u590d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W\uff1a\u4f1a\u8bdd\u8d85\u65f6\u65e0\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W\uff1a\u6761\u76ee {0} \u91cd\u590d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W\uff1a\u6761\u76ee {0} \u4e3a\u7a7a\u3002
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W\uff1a\u8fc7\u6ee4\u5668\u6761\u76ee {0} \u91cd\u590d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W\uff1a\u540d\u4e3a {0} \u7684 ejb-ref \u5143\u7d20\u91cd\u590d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W\uff1a\u9519\u8bef\uff1a\u201cEAR \u672a\u5305\u542b\u6a21\u5757\u6587\u4ef6\u201d\u5f02\u5e38
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W\uff1a\u672a\u77e5\u9519\u8bef\u4ee3\u7801 {0}\u3002\u9519\u8bef\u4ee3\u7801\u4e2d\u5fc5\u987b\u5305\u542b\u6709\u6548\u7684 HTTP \u72b6\u6001\u7801\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W\uff1ares-sharing-scope \u65e0\u6548\uff1b\u6709\u6548\u503c\u4e3a\u201cShareable\u201d\u6216\u201cUnshareable\u201d\u3002
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W\uff1a\u73af\u5883\u6761\u76ee\u7c7b\u578b\u65e0\u6548\u3002\u6709\u6548\u503c\u4e3a\u201cjava.lang.TYPE\u201d\uff0c\u5176\u4e2d TYPE \u662f\u4e0b\u5217\u5176\u4e2d\u4e00\u9879\uff1aBoolean\u3001Byte\u3001Character\u3001String\u3001Short\u3001Integer\u3001Long\u3001Float \u6216 Double\u3002
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W\uff1a\u4e22\u5931 Web \u5e93\u9879\u76ee\uff08{0}\uff09\u3002\u68c0\u67e5\u6b64\u9879\u76ee\u7684\u5c5e\u6027\u4ee5\u89e3\u51b3\u6b64\u95ee\u9898\u3002
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W\uff1a\u201cWeb \u5e93\u9879\u76ee\u201dJAR\uff08{0}\uff09\u4e0e WEB-INF/lib \u76ee\u5f55\u4e2d\u7684\u5b9e\u9645 JAR \u76f8\u51b2\u7a81\u3002
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W\uff1a\u201cWeb \u5e93\u9879\u76ee\u201d\uff08{1}\uff09\u7684\u76ee\u6807\u670d\u52a1\u5668\u4e0e\u6b64 Web \u9879\u76ee\uff08{0}\uff09\u7684\u76ee\u6807\u670d\u52a1\u5668\u4e0d\u5339\u914d\u3002\u5982\u679c\u8ba4\u4e3a\u4e0d\u662f\u8fd9\u79cd\u60c5\u51b5\uff0c\u8bf7\u5bf9\u8be5 Web \u9879\u76ee\u8fd0\u884c\u9a8c\u8bc1\u3002
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=URL \u6a21\u5f0f\u5b57\u7b26\u4e32\u201c{0}\u201d\u662f\u4ee5 servlet {1} \u7684\u65e0\u6548\u56de\u8f66\u7b26\u7ed3\u5c3e\u7684
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W\uff1aejb-ref-type \u5fc5\u987b\u662f\u201cEntity\u201d\u6216\u201cSession\u201d\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W\uff1a\u201csecurity-role-ref\u201d\u5143\u7d20 {0} \u5b9a\u4e49\u4e86\u201crole-link\u201d\u5143\u7d20\uff0c\u4f46\u5728\u5e94\u7528\u7a0b\u5e8f\u63cf\u8ff0\u7b26\u4e2d\u6ca1\u6709\u201csecurity-role\u201d\u5143\u7d20\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=\u7c7b\u578b\u4e3a\u5b89\u5168\u89d2\u8272\u540d
-Web_Archive_Validator_8=WAR \u9a8c\u8bc1\u5668
-of_Type_Role_Name_19=\u7c7b\u578b\u4e3a\u89d2\u8272\u540d
-of_Type_Parameter_Name_25=\u7c7b\u578b\u4e3a\u53c2\u6570\u540d
-of_Type_Parameter_Value_26=\u7c7b\u578b\u4e3a\u53c2\u6570\u503c
-of_Type_Parameter_Name_32=\u7c7b\u578b\u4e3a\u53c2\u6570\u540d
-of_Type_Parameter_Value_33=\u7c7b\u578b\u4e3a\u53c2\u6570\u503c
-of_Type_Parameter_Name_39=\u7c7b\u578b\u4e3a\u53c2\u6570\u540d
-of_Type_Parameter_Value_40=\u7c7b\u578b\u4e3a\u53c2\u6570\u503c
-of_Type_ejb-ref-name_44=\u7c7b\u578b\u4e3a ejb-ref-name
-of_Type_Error_Location_47=\u7c7b\u578b\u4e3a\u9519\u8bef\u4f4d\u7f6e
-of_Type_Error_Location_49=\u7c7b\u578b\u4e3a\u9519\u8bef\u4f4d\u7f6e
-of_Type_Mime_Extension_54=\u7c7b\u578b\u4e3a Mime \u6269\u5c55
-of_Type_Mime_Type_55=\u7c7b\u578b\u4e3a Mime \u7c7b\u578b
-of_Type_Mime_Extension___56=\u7c7b\u578b\u4e3a Mime \u6269\u5c55\uff1a
-of_Type_Web_Resource_Collection_64=\u7c7b\u578b\u4e3a Web \u8d44\u6e90\u96c6\u5408
-of_Type_Filter_Name_66=\u7c7b\u578b\u4e3a\u8fc7\u6ee4\u5668\u540d
-Invalid_URL_70=\u65e0\u6548 URL
-Invalid_URL_75=\u65e0\u6548 URL
-of_Type_Servlet_Name_77=\u7c7b\u578b\u4e3a servlet \u540d
-of_Type_Taglib_80=\u7c7b\u578b\u4e3a\u6807\u8bb0\u5e93
-of_Type_TagLib___81=\u7c7b\u578b\u4e3a\u6807\u8bb0\u5e93\uff1a
-of_Type_Web_Resource_Name_84=\u7c7b\u578b\u4e3a Web \u8d44\u6e90\u540d\u79f0
-of_Type_Welcome_File_Name__87=\u7c7b\u578b\u4e3a\u6b22\u8fce\u6587\u4ef6\u540d
-of_Type_Env_Entry_Name___88=\u7c7b\u578b\u4e3a\u73af\u5883\u6761\u76ee\u540d
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_zh_TW.properties
deleted file mode 100644
index 92fd28c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/warvalidation_zh_TW.properties
+++ /dev/null
@@ -1,258 +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 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 \u9a57\u8b49\u5931\u6557\uff1a{0}
-#EXPLANATION None.
-#USERACTION None.
-
-
-# --------------------------------
-ERROR_EAR_DUPLICATE_ROLES=CHKJ1002E: \u540d\u7a31 {0} \u7684\u5b89\u5168\u89d2\u8272\u91cd\u8907\u3002
-MESSAGE_WAR_VALIDATION_MISSING_JSP=CHKJ3001E: \u907a\u6f0f Servlet \"{1}\" \u7684 JSP \u6a94 {0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SMALL_ICON=CHKJ3002E: \u907a\u6f0f <small-icon> \u6a94\uff0c{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_LARGE_ICON=CHKJ3003E: \u907a\u6f0f <large-icon> \u6a94\uff0c{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_SERVLET_MAPPING=CHKJ3004W: Servlet \u5c0d\u6620 \"{0}\" \u6240\u53c3\u7167\u7684 Servlet \u5c1a\u672a\u5b9a\u7fa9\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_NO_WELCOME_FILE=CHKJ3005E: \u7a7a\u7684\u6b61\u8fce\u4f7f\u7528\u6a94\u6e05\u55ae\u9805\u76ee\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_WELCOME_FILE=CHKJ3006E: \u907a\u6f0f\u6b61\u8fce\u4f7f\u7528\u6a94 {0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_MISSING_TLD=CHKJ3007E: \u907a\u6f0f\u6a19\u793a\u5eab\u63cf\u8ff0\u5b50 {0} \u6a94\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_INVALID_WAR_FILE=CHKJ3008E: WAR \u6a94\u907a\u6f0f\u6216\u7121\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_BROKEN_FILTER_MAPPING=CHKJ3009E: \u904e\u6ffe\u5668\u5c0d\u6620 \"{0}\" \u6240\u53c3\u7167\u7684\u904e\u6ffe\u5668\u5c1a\u672a\u5b9a\u7fa9\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_WELCOME_FILE=CHKJ3010W: \u6b61\u8fce\u4f7f\u7528\u6a94\u7684\u958b\u982d\u6216\u7d50\u5c3e\u4e0d\u80fd\u662f /\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINECOL=CHKJ1009E: \u5256\u6790\u932f\u8aa4\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_LINE=CHKJ1010E: \u90e8\u7f72\u63cf\u8ff0\u5b50\u5256\u6790\u932f\u8aa4\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_PARSE_NOINFO=CHKJ1011E: \u90e8\u7f72\u63cf\u8ff0\u5b50\u5256\u6790\u932f\u8aa4\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-WAR_DD_CANNOT_OPEN_DD=CHKJ1012E: \u7121\u6cd5\u958b\u555f\u90e8\u7f72\u63cf\u8ff0\u5b50\u3002\u9a57\u8b49\u7121\u6cd5\u5b8c\u6210\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_URL=CHKJ3013E: URL \u5c0d\u6620 \"{0}\" \u7121\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE=CHKJ3014E: \u7121\u6548\u7684\u5b89\u5168\u89d2\u8272\u93c8\u7d50\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_HTTP_CMD=CHKJ3015E: \u7121\u6548\u7684 HTTP \u65b9\u6cd5\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_TRANSPORT=CHKJ3016E: \u7121\u6548\u7684\u50b3\u8f38\u4fdd\u8b49\u3002\u6709\u6548\u503c\u662f\uff1a\"NONE\"\u3001\"INTEGRAL\" \u6216 \"CONFIDENTIAL\"\u3002
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_JSPFILE_REF=CHKJ3018E: Servlet {1} \u6240\u53c3\u7167\u7684 jsp \u6a94 \"{0}\" \u5fc5\u9808\u662f\u4e00\u500b\u5b8c\u6574\u7684\u7d55\u5c0d\u8def\u5f91\u3002
-
-
-# --------------------------------
-ERROR_EAR_INVALID_CONTEXT_ROOT=CHKJ3017E: Web \u5c08\u6848 {0} \u6240\u5c0d\u6620\u7684\u662f EAR \u5c08\u6848 {2} \u4e2d\u7684\u7121\u6548\u74b0\u5883\u5b9a\u7fa9\u6839 {1}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_PAGE=IWAE0001E CHKJ3019E: \u932f\u8aa4\u9801\u9762\u4f4d\u7f6e\u7684\u958b\u982d\u5fc5\u9808\u662f /\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_SEC_ROLE_NAME=CHKJ3020E: \u7121\u6548\u7684\u5b89\u5168\u89d2\u8272\u540d\u7a31\uff1a{0}\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_AUTH_METHOD=CHKJ3021E: auth \u65b9\u6cd5\u7121\u6548\u3002\u6709\u6548\u503c\u5982\u4e0b\uff1a\"BASIC\"\u3001\"DIGEST\"\u3001\"FORM\" \u6216 \"CLIENT-CERT\"\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_IGNORE_FORM_LOGIN=CHKJ3022E:  \u9451\u5225\u65b9\u6cd5\u662f {0}\u3002\u9664\u975e\u4f7f\u7528 FORM \u9451\u5225\u65b9\u6cd5\uff0c\u5426\u5247\uff0c\u6703\u5ffd\u7565 form-login-config \u503c\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_22=CHKJ3023E:  \u8cc7\u6e90\u53c3\u7167 {0} \u5fc5\u9808\u542b\u6709 "SERVLET" \u6216 "CONTAINER" \u7684 res-auth\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_REQUIRED_23=CHKJ3024E:  \u8cc7\u6e90\u53c3\u7167 {0} \u5fc5\u9808\u5305\u542b "Application" \u6216 "Container" \u7684 res-auth\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_22=CHKJ3025E:  \"Application\" \u4e0d\u662f 2.2 \u5c64\u6b21\u90e8\u7f72\u63cf\u8ff0\u5b50\u4e2d res-auth \u7684\u6709\u6548\u503c\u3002\u8acb\u6539\u7528 \"SERVLET\"\u3002
-MESSAGE_WAR_VALIDATION_RES_AUTH_INVALID_23=CHKJ3026E:  \"SERVLET\" \u4e0d\u662f 2.2 \u5c64\u6b21\u90e8\u7f72\u63cf\u8ff0\u5b50\u4e2d res-auth \u7684\u6709\u6548\u503c\u3002\u8acb\u6539\u7528 \"Application\"\u3002
-
-MESSAGE_WAR_VALIDATION_INVALID_EXCEPTION_TYPE=CHKJ3027E: \u7570\u5e38\u72c0\u6cc1\u985e\u578b\u7121\u6548 {0}\u3002\u7570\u5e38\u72c0\u6cc1\u985e\u578b\u5fc5\u9808\u5305\u542b Java \u7570\u5e38\u72c0\u6cc1\u985e\u578b\u7684\u5b8c\u6574\u985e\u5225\u540d\u7a31\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_MAPPING=CHKJ4010W: URL \u5c0d\u6620 {0} \u91cd\u8907\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_SERVLET=CHKJ4011W: Servlet \u9805\u76ee {0} \u91cd\u8907\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_SESSION_TIMEOUT=CHKJ4012W: Session \u903e\u6642\u503c\u7121\u6548\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_ENTRY=CHKJ4013W: \u9805\u76ee {0} \u91cd\u8907\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_EMPTY_ENTRY=CHKJ4014W: \u9805\u76ee {0} \u70ba\u7a7a\u7684\u3002
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_FILTER=CHKJ4015W: \u904e\u6ffe\u5668\u9805\u76ee {0} \u91cd\u8907\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_DUPLICATE_EJB_REF=CHKJ4016W: \u540d\u70ba {0} \u7684 ejb-ref \u5143\u7d20\u91cd\u8907\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# This was missing.  It's defined in constants...
-ERROR_EAR_UNCONTAINED_MODULE_FILE_EXCEPTION=CHKJ4017W: \u767c\u751f\u932f\u8aa4\uff1bEAR \u672a\u5305\u542b\u6a21\u7d44\u6a94\u7570\u5e38\u72c0\u6cc1
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_ERROR_CODE=IWAE0036E CHKJ4018W: \u932f\u8aa4\u78bc\u4e0d\u660e\uff1a{0}\u3002\u932f\u8aa4\u78bc\u5fc5\u9808\u5305\u542b\u6709\u6548\u7684 HTTP \u72c0\u614b\u78bc\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_RES_SHARING_SCOPE=CHKJ4019W: res-sharing-scope \u7121\u6548\uff1b\u6709\u6548\u503c\u70ba \"Shareable\" \u6216 \"Unshareable\"\u3002
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_INVALID_ENV_ENTRY=CHKJ4020W: \u74b0\u5883\u9805\u76ee\u985e\u578b\u7121\u6548\u3002\u6709\u6548\u503c\u70ba\"java.lang.TYPE\"\uff0c\u5176\u4e2d TYPE \u662f\u4e0b\u5217\u5176\u4e2d\u4e00\u9805\uff1aBoolean\u3001Byte\u3001Character\u3001String\u3001Short\u3001Integer\u3001Long\u3001Float \u6216 Double\u3002
-#USERACTION None.
-
-MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT=CHKJ4021W: \u907a\u6f0f Web \u7a0b\u5f0f\u5eab\u5c08\u6848 ({0})\u3002\u8acb\u6aa2\u67e5\u9019\u500b\u5c08\u6848\u7684\u5167\u5bb9\uff0c\u4ee5\u4fee\u6b63\u9019\u500b\u554f\u984c\u3002
-MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT=CHKJ4022W: Web \u7a0b\u5f0f\u5eab\u5c08\u6848 JAR ({0}) \u548c WEB-INF/lib \u76ee\u9304\u4e2d\u7684\u5be6\u969b JAR \u885d\u7a81\u3002
-MSG_SERVER_TARGET_MISMATCH=CHKJ4023W: Web \u7a0b\u5f0f\u5eab\u5c08\u6848 ({1}) \u7684\u76ee\u6a19\u4f3a\u670d\u5668\u4e0d\u7b26\u5408\u9019\u500b Web \u5c08\u6848 ({0}) \u7684\u76ee\u6a19\u4f3a\u670d\u5668\u3002\u5982\u679c\u60a8\u8a8d\u70ba\u4e0d\u662f\u5982\u6b64\uff0c\u8acb\u5728 Web \u5c08\u6848\u4e0a\u57f7\u884c\u9a57\u8b49\u3002
-MESSAGE_URL_PATTERN_END_WITH_CARRAIGE_RETURN=Servlet {1} \u7684 URL \u578b\u6a23\u5b57\u4e32 "{0}" \u7d50\u5c3e\u662f\u7121\u6548\u7684\u56de\u8eca
-
-# --------------------------------
-MESSAGE_WAR_VALIDATION_INVALID_EJB_REF_TYPE=CHKJ4023W: ejb-ref-type \u5fc5\u9808\u662f 'Entity' \u6216 'Session'\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-# --------------------------------
-ERROR_EAR_MISSING_EJB_ROLE=CHKJ2827W: ''security-role-ref'' \u5143\u7d20 {0} \u662f\u7528\u4f86\u5b9a\u7fa9 ''role-link'' \u5143\u7d20\uff0c\u4f46\u662f\u61c9\u7528\u7a0b\u5f0f\u63cf\u8ff0\u5b50\u4e2d\u6c92\u6709 ''security-role'' \u5143\u7d20\u3002
-#EXPLANATION None.
-#USERACTION None.
-
-of_Type_Security_Role_Name_6=\u985e\u578b\u5b89\u5168\u89d2\u8272\u540d\u7a31\u7684
-Web_Archive_Validator_8=Web \u4fdd\u5b58\u9a57\u8b49\u5668
-of_Type_Role_Name_19=\u985e\u578b\u89d2\u8272\u540d\u7a31\u7684
-of_Type_Parameter_Name_25=\u985e\u578b\u53c3\u6578\u540d\u7a31\u7684
-of_Type_Parameter_Value_26=\u985e\u578b\u53c3\u6578\u503c\u7684
-of_Type_Parameter_Name_32=\u985e\u578b\u53c3\u6578\u540d\u7a31\u7684
-of_Type_Parameter_Value_33=\u985e\u578b\u53c3\u6578\u503c\u7684
-of_Type_Parameter_Name_39=\u985e\u578b\u53c3\u6578\u540d\u7a31\u7684
-of_Type_Parameter_Value_40=\u985e\u578b\u53c3\u6578\u503c\u7684
-of_Type_ejb-ref-name_44=\u985e\u578b ejb-ref-name \u7684
-of_Type_Error_Location_47=\u985e\u578b\u932f\u8aa4\u4f4d\u7f6e\u7684
-of_Type_Error_Location_49=\u985e\u578b\u932f\u8aa4\u4f4d\u7f6e\u7684
-of_Type_Mime_Extension_54=\u985e\u578b Mime \u5ef6\u4f38\u7684
-of_Type_Mime_Type_55=\u985e\u578b Mime \u985e\u578b\u7684
-of_Type_Mime_Extension___56=\u985e\u578b Mime \u5ef6\u4f38\u7684\uff1a
-of_Type_Web_Resource_Collection_64=\u985e\u578b Web \u8cc7\u6e90\u96c6\u5408\u7684
-of_Type_Filter_Name_66=\u985e\u578b\u904e\u6ffe\u5668\u540d\u7a31\u7684
-Invalid_URL_70=\u7121\u6548\u7684 URL
-Invalid_URL_75=\u7121\u6548\u7684 URL
-of_Type_Servlet_Name_77=\u985e\u578b Servlet \u540d\u7a31\u7684
-of_Type_Taglib_80=\u985e\u578b Taglib \u7684
-of_Type_TagLib___81=\u985e\u578b TagLib \u7684\uff1a
-of_Type_Web_Resource_Name_84=\u985e\u578b Web \u8cc7\u6e90\u540d\u7a31\u7684
-of_Type_Welcome_File_Name__87=\u985e\u578b\u6b61\u8fce\u4f7f\u7528\u6a94\u540d\u7684
-of_Type_Env_Entry_Name___88=\u985e\u578b\u74b0\u5883\u9805\u76ee\u540d\u7a31\u7684
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 e1f07b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/plugin/EclipseEJBModelExtenderProvider.java
+++ /dev/null
@@ -1,161 +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 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.internal.runtime.Assert;
-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 57e368c..0000000
--- 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, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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/mofj2ee/ejb.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb.properties
deleted file mode 100644
index cc61953..0000000
--- 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_=-- Java Generation :: Initializing...
-CMDS_Generating_UI_=-- Java Generation :: Generating...
-CMDS_Finishing_UI_=-- Java Generation :: Finishing...
-CMDS_Analyzing_UI_=-- Java Generation :: 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/ejb_de.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_de.properties
deleted file mode 100644
index b5a5be4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_de.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=Start des EJB-Provider-Plug-ins - Fehler bei Plug-in-Initialisierung
-Ejbext_provider_plugin_prob=Start des EJBEXT-Provider-Plug-ins - Fehler bei Plug-in-Initialisierung
-EJB_UI_STARTUP=EJB-UI-START
-EJB_Path__=EJB-Pfad:
-Size__=Gr\u00f6\u00dfe:
-Edit_the_bean_class=Bean-Klasse bearbeiten
-EJB_Tree=EJB-Baumstruktur
-EJB_Jar_Components=EJB-JAR-Komponenten
-EJB_Models=EJB-Modelle
-EJB_Features=EJB-Funktionen
-Exception_loading_plugin=Ausnahmebedingung beim Laden des Plug-ins
-Create=Erstellen
-Create_Attribute...=Attribut erstellen...
-createAttribute=createAttribute
-Edit=Bearbeiten
-Add_To_Key=Zu Schl\u00fcssel hinzuf\u00fcgen
-delete=L\u00f6schen
-Unknown=Unbekannt
-Remove_From_Key=Aus Schl\u00fcssel entfernen
-Delete=L\u00f6schen
-Delete_Attribute...=Attribut l\u00f6schen...
-additions=Erg\u00e4nzungen
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E Java-Klasse (JavaClass) kann nicht wiedergegeben werden, weil ihr Name nicht definiert ist.
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E Der Java-Typ mit dem Namen {0} konnte nicht f\u00fcr {1} definiert werden, weil die EJB Null ist.
-CMDS_Cannot_perform_INFO_=IWAE0070I Die Befehlsanforderung kann nicht ausgef\u00fchrt werden, weil die EJB f\u00fcr den Befehl Null ist:
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I Die Funktion kann nicht zum Schl\u00fcssel hinzugef\u00fcgt werden, weil die Funktion f\u00fcr den Befehl Null ist:
-CMDS_Cannot_remove_the_INFO_=IWAE0072I Die Funktion kann nicht aus dem Schl\u00fcssel entfernt werden, weil die Funktion f\u00fcr den Befehl Null ist:
-CMDS_Initializing_UI_=-- Java-Generierung :: Initialisierung l\u00e4uft...
-CMDS_Generating_UI_=-- Java-Generierung :: Generierung l\u00e4uft...
-CMDS_Finishing_UI_=-- Java-Generierung :: Fertigstellung l\u00e4uft...
-CMDS_Analyzing_UI_=-- Java-Generierung :: Analyse l\u00e4uft...
-CMDS_Cancelled_WARNING_=Abgebrochen
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I Aktualisierungen von mehreren Enterprise-Beans
-CMDS_CREATING_TASK_UI_=Bean mit dem Namen "{0}" wird erstellt
-CMDS_UPDATING_TASK_UI_=Bean mit dem Namen "{0}" wird aktualisiert
-CMDS_DELETING_TASK_UI_=Bean mit dem Namen "{0}" wird gel\u00f6scht
-CMDS_Updating_Metadata..._UI_=-- Metadaten werden aktualisiert...
-Updating=Aktualisierung l\u00e4uft
-New_key_attribute_added_wi=Neues Schl\u00fcsselattribut wurde ohne Attribut-Helper hinzugef\u00fcgt
-Error_has_occurred=Ein Fehler ist aufgetreten.
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_es.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_es.properties
deleted file mode 100644
index df7ea9a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_es.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=Inicio del conector del proveedor Ejb - Se ha producido un problema al inicializar el conector
-Ejbext_provider_plugin_prob=Inicio del conector del proveedor Ejbext - Se ha producido un problema al inicializar el conector
-EJB_UI_STARTUP=INICIO DE LA UI DE EJB
-EJB_Path__=V\u00eda de acceso de EJB:
-Size__=Tama\u00f1o:
-Edit_the_bean_class=Editar la clase de bean
-EJB_Tree=\u00c1rbol de EJB
-EJB_Jar_Components=Componentes de JAR EJB
-EJB_Models=Modelos de EJB
-EJB_Features=Caracter\u00edsticas de EJB
-Exception_loading_plugin=Se ha producido una excepci\u00f3n al cargar el conector
-Create=Crear
-Create_Attribute...=Crear atributo...
-createAttribute=createAttribute
-Edit=Editar
-Add_To_Key=A\u00f1adir a clave
-delete=suprimir
-Unknown=Desconocido
-Remove_From_Key=Eliminar de clave
-Delete=Suprimir
-Delete_Attribute...=Suprimir atributo...
-additions=adiciones
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E No puede reflejarse la clase Java porque su nombre no se ha establecido para
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E El tipo Java denominado {0} no se ha podido establecer para {1} porque su EJB es nulo.
-CMDS_Cannot_perform_INFO_=IWAE0070I No puede efectuarse la petici\u00f3n del mandato porque el EJB es nulo para el mandato:
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I No puede a\u00f1adirse la caracter\u00edstica a la clave porque la caracter\u00edstica es nula para el mandato:
-CMDS_Cannot_remove_the_INFO_=IWAE0072I No puede eliminarse la caracter\u00edstica de la clave porque la caracter\u00edstica es nula para el mandato:
-CMDS_Initializing_UI_=-- Generaci\u00f3n Java :: Inicializando...
-CMDS_Generating_UI_=-- Generaci\u00f3n Java :: Generando...
-CMDS_Finishing_UI_=-- Generaci\u00f3n Java :: Finalizando...
-CMDS_Analyzing_UI_=-- Generaci\u00f3n Java :: Analizando...
-CMDS_Cancelled_WARNING_=Cancelado
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I Varias actualizaciones de EnterpriseBean
-CMDS_CREATING_TASK_UI_=Creando bean denominado "{0}"
-CMDS_UPDATING_TASK_UI_=Actualizando bean denominado "{0}"
-CMDS_DELETING_TASK_UI_=Suprimiendo bean denominado "{0}"
-CMDS_Updating_Metadata..._UI_=-- Actualizando metadatos...
-Updating=Actualizando
-New_key_attribute_added_wi=Se ha a\u00f1adido un atributo de clave nuevo sin ayudante de atributos.
-Error_has_occurred=Se ha producido un error
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_fr.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_fr.properties
deleted file mode 100644
index 8486ffe..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_fr.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=D\u00e9marrage du plug-in fournisseur d'EJB - Probl\u00e8me d'initialisation du plug-in
-Ejbext_provider_plugin_prob=D\u00e9marrage du plug-in fournisseur Ejbext - Probl\u00e8me d'initialisation du plug-in
-EJB_UI_STARTUP=DEMARRAGE DE L'INTERFACE UTILISATEUR EJB
-EJB_Path__=Chemin des EJB :
-Size__=Taille :
-Edit_the_bean_class=Editer la classe du bean
-EJB_Tree=Arborescence d'EJB
-EJB_Jar_Components=Composants du fichier JAR d'EJB
-EJB_Models=Mod\u00e8les d'EJB
-EJB_Features=Fonctions d'EJB
-Exception_loading_plugin=Exception au chargement du plug-in
-Create=Cr\u00e9er
-Create_Attribute...=Cr\u00e9er attribut...
-createAttribute=createAttribute
-Edit=Editer
-Add_To_Key=Ajouter \u00e0 la cl\u00e9
-delete=delete
-Unknown=Inconnu
-Remove_From_Key=Supprimer de la cl\u00e9
-Delete=Supprimer
-Delete_Attribute...=Supprimer attribut...
-additions=additions
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E Impossible de refl\u00e9ter la classe Java car son nom n'est pas d\u00e9fini pour
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E Le type Java nomm\u00e9 {0} n''a pas pu \u00eatre d\u00e9fini pour la {1} car sa sp\u00e9cification d''EJB est null.
-CMDS_Cannot_perform_INFO_=IWAE0070I Impossible de satisfaire la demande de commande car la sp\u00e9cification d'EJB est null pour la commande :
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I Impossible d'ajouter la fonction \u00e0 la cl\u00e9 car elle est null pour la commande :
-CMDS_Cannot_remove_the_INFO_=IWAE0072I Impossible de supprimer la fonction de la cl\u00e9 car elle est null pour la commande :
-CMDS_Initializing_UI_=-- G\u00e9n\u00e9ration Java :: Initialisation...
-CMDS_Generating_UI_=-- G\u00e9n\u00e9ration Java :: G\u00e9n\u00e9ration...
-CMDS_Finishing_UI_=-- G\u00e9n\u00e9ration Java :: Finition...
-CMDS_Analyzing_UI_=-- G\u00e9n\u00e9ration Java :: Analyse...
-CMDS_Cancelled_WARNING_=Annul\u00e9
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I Mises \u00e0 jour de beans enterprise multiple
-CMDS_CREATING_TASK_UI_=Cr\u00e9ation du bean nomm\u00e9 "{0}"
-CMDS_UPDATING_TASK_UI_=Mise \u00e0 jour du bean nomm\u00e9 "{0}"
-CMDS_DELETING_TASK_UI_=Suppression du bean nomm\u00e9 "{0}"
-CMDS_Updating_Metadata..._UI_=-- Mise \u00e0 jour des m\u00e9tadonn\u00e9es...
-Updating=Mise \u00e0 jour
-New_key_attribute_added_wi=Nouvel attribut de cl\u00e9 ajout\u00e9 sans auxiliaire.
-Error_has_occurred=Une erreur s'est produite.
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_it.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_it.properties
deleted file mode 100644
index 7d18c55..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_it.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=Avvio del plug-in del provider Ejb: problemi di inizializzazione del plug-in
-Ejbext_provider_plugin_prob=Avvio del plug-in del provider Ejbext: problemi di inizializzazione del plug-in
-EJB_UI_STARTUP=AVVIO INTERFACCIA UTENTE EJB
-EJB_Path__=Percorso EJB:
-Size__=Dimensione:
-Edit_the_bean_class=Modifica la classe bean
-EJB_Tree=Struttura EJB
-EJB_Jar_Components=Componenti JAR EJB
-EJB_Models=Modelli EJB
-EJB_Features=Funzioni EJB
-Exception_loading_plugin=Eccezione durante il caricamento del plug-in
-Create=Crea
-Create_Attribute...=Crea attributo...
-createAttribute=createAttribute
-Edit=Modifica
-Add_To_Key=Aggiungi alla chiave
-delete=elimina
-Unknown=Sconosciuto
-Remove_From_Key=Rimuovi dalla chiave
-Delete=Elimina
-Delete_Attribute...=Elimina attributo...
-additions=aggiunte
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E Impossibile riflettere JavaClass poich\u00e9 il nome non \u00e8 impostato
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E Impossibile impostare il tipo Java denominato {0} per {1} poich\u00e9 il rispettivo EJB \u00e8 null.
-CMDS_Cannot_perform_INFO_=IWAE0070I Impossibile eseguire la richiesta di comando poich\u00e9 l'EJB del comando \u00e8 null:
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I Impossibile aggiungere la funzione alla chiave poich\u00e9 tale funzione \u00e8 Null per il comando:
-CMDS_Cannot_remove_the_INFO_=IWAE0072I Impossibile rimuovere la funzione dalla chiave poich\u00e9 tale funzione \u00e8 Null per il comando:
-CMDS_Initializing_UI_=-- Generazione Java :: inizializzazione in corso...
-CMDS_Generating_UI_=-- Generazione Java :: generazione in corso...
-CMDS_Finishing_UI_=-- Generazione Java :: completamento in corso...
-CMDS_Analyzing_UI_=-- Generazione Java :: analisi in corso...
-CMDS_Cancelled_WARNING_=Operazione annullata
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I Aggiornamenti EnterpriseBean multipli
-CMDS_CREATING_TASK_UI_=Creazione del bean "{0}" in corso
-CMDS_UPDATING_TASK_UI_=Aggiornamento del bean "{0}" in corso
-CMDS_DELETING_TASK_UI_=Eliminazione del bean "{0}" in corso
-CMDS_Updating_Metadata..._UI_=-- Aggiornamento dei metadati in corso...
-Updating=Aggiornamento in corso
-New_key_attribute_added_wi=Sono stati aggiunti nuovi attributi chiave senza l'aggiunta dell'helper di attributo.
-Error_has_occurred=Si \u00e8 verificato un errore
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_ja.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_ja.properties
deleted file mode 100644
index 3ee34a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_ja.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 \u30d7\u30ed\u30d0\u30a4\u30c0\u30fc\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u59cb\u52d5 - \u30d7\u30e9\u30b0\u30a4\u30f3\u521d\u671f\u5316\u4e2d\u306e\u554f\u984c
-Ejbext_provider_plugin_prob=Ejbext \u30d7\u30ed\u30d0\u30a4\u30c0\u30fc\u306e\u30d7\u30e9\u30b0\u30a4\u30f3\u59cb\u52d5 - \u30d7\u30e9\u30b0\u30a4\u30f3\u521d\u671f\u5316\u4e2d\u306e\u554f\u984c
-EJB_UI_STARTUP=EJB UI \u59cb\u52d5
-EJB_Path__=EJB \u30d1\u30b9:
-Size__=\u30b5\u30a4\u30ba:
-Edit_the_bean_class=Bean \u30af\u30e9\u30b9\u306e\u7de8\u96c6
-EJB_Tree=EJB \u30c4\u30ea\u30fc
-EJB_Jar_Components=EJB JAR \u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8
-EJB_Models=EJB \u30e2\u30c7\u30eb
-EJB_Features=EJB \u6a5f\u80fd
-Exception_loading_plugin=\u30d7\u30e9\u30b0\u30a4\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916
-Create=\u4f5c\u6210
-Create_Attribute...=\u5c5e\u6027\u306e\u4f5c\u6210...
-createAttribute=createAttribute
-Edit=\u7de8\u96c6
-Add_To_Key=\u30ad\u30fc\u306b\u8ffd\u52a0
-delete=\u524a\u9664
-Unknown=\u4e0d\u660e
-Remove_From_Key=\u30ad\u30fc\u304b\u3089\u9664\u53bb
-Delete=\u524a\u9664
-Delete_Attribute...=\u5c5e\u6027\u306e\u524a\u9664...
-additions=\u8ffd\u52a0
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E JavaClass \u306e\u540d\u524d\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u305f\u3081\u3001JavaClass \u3092\u53cd\u6620\u3067\u304d\u307e\u305b\u3093
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E EJB \u304c NULL \u3067\u3042\u308b\u305f\u3081\u3001{0} \u3068\u3044\u3046\u540d\u524d\u306e Java \u306e\u578b\u3092 {1} \u306b\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-CMDS_Cannot_perform_INFO_=IWAE0070I \u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3067 EJB \u304c NULL \u3067\u3042\u308b\u305f\u3081\u3001\u30b3\u30de\u30f3\u30c9\u8981\u6c42\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093:
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I \u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3067\u6a5f\u80fd\u304c NULL \u3067\u3042\u308b\u305f\u3081\u3001\u6a5f\u80fd\u3092\u30ad\u30fc\u306b\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093:
-CMDS_Cannot_remove_the_INFO_=IWAE0072I \u6b21\u306e\u30b3\u30de\u30f3\u30c9\u3067\u6a5f\u80fd\u304c NULL \u3067\u3042\u308b\u305f\u3081\u3001\u6a5f\u80fd\u3092\u30ad\u30fc\u304b\u3089\u9664\u53bb\u3067\u304d\u307e\u305b\u3093:
-CMDS_Initializing_UI_=-- Java \u751f\u6210 :: \u521d\u671f\u5316\u4e2d...
-CMDS_Generating_UI_=-- Java \u751f\u6210 :: \u751f\u6210\u4e2d...
-CMDS_Finishing_UI_=-- Java \u751f\u6210 :: \u7d42\u4e86\u4e2d...
-CMDS_Analyzing_UI_=-- Java \u751f\u6210 :: \u5206\u6790\u4e2d...
-CMDS_Cancelled_WARNING_=\u30ad\u30e3\u30f3\u30bb\u30eb\u3055\u308c\u307e\u3057\u305f
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I \u8907\u6570\u306e\u30a8\u30f3\u30bf\u30fc\u30d7\u30e9\u30a4\u30ba Bean \u306e\u66f4\u65b0
-CMDS_CREATING_TASK_UI_="{0}" \u3068\u3044\u3046\u540d\u524d\u306e Bean \u3092\u4f5c\u6210\u4e2d
-CMDS_UPDATING_TASK_UI_="{0}" \u3068\u3044\u3046\u540d\u524d\u306e Bean \u3092\u66f4\u65b0\u4e2d
-CMDS_DELETING_TASK_UI_="{0}" \u3068\u3044\u3046\u540d\u524d\u306e Bean \u3092\u524a\u9664\u4e2d
-CMDS_Updating_Metadata..._UI_=-- \u30e1\u30bf\u30c7\u30fc\u30bf\u306e\u66f4\u65b0\u4e2d...
-Updating=\u66f4\u65b0\u4e2d
-New_key_attribute_added_wi=\u65b0\u898f\u30ad\u30fc\u5c5e\u6027\u304c\u5c5e\u6027\u30d8\u30eb\u30d1\u30fc\u306a\u3057\u3067\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002
-Error_has_occurred=\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_ko.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_ko.properties
deleted file mode 100644
index ec3bfec..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_ko.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 \uc81c\uacf5\uc790 \ud50c\ub7ec\uadf8\uc778 \uc2dc\uc791 - \ud50c\ub7ec\uadf8\uc778 \ucd08\uae30\ud654 \uc911\uc5d0 \ubb38\uc81c\uc810 \ubc1c\uc0dd
-Ejbext_provider_plugin_prob=Ejbext \uc81c\uacf5\uc790 \ud50c\ub7ec\uadf8\uc778 \uc2dc\uc791 - \ud50c\ub7ec\uadf8\uc778 \ucd08\uae30\ud654 \uc911\uc5d0 \ubb38\uc81c\uc810 \ubc1c\uc0dd
-EJB_UI_STARTUP=EJB UI STARTUP
-EJB_Path__=EJB \uacbd\ub85c:
-Size__=\ud06c\uae30:
-Edit_the_bean_class=Bean \ud074\ub798\uc2a4 \ud3b8\uc9d1
-EJB_Tree=EJB \ud2b8\ub9ac
-EJB_Jar_Components=EJB JAR \uad6c\uc131\uc694\uc18c
-EJB_Models=EJB \ubaa8\ub378
-EJB_Features=EJB \uae30\ub2a5
-Exception_loading_plugin=\ud50c\ub7ec\uadf8\uc778 \ub85c\ub4dc \uc911\uc5d0 \uc608\uc678 \ubc1c\uc0dd
-Create=\uc791\uc131
-Create_Attribute...=\uc18d\uc131 \uc791\uc131...
-createAttribute=createAttribute
-Edit=\ud3b8\uc9d1
-Add_To_Key=\ud0a4\uc5d0 \ucd94\uac00
-delete=\uc0ad\uc81c
-Unknown=\uc54c \uc218 \uc5c6\uc74c
-Remove_From_Key=\ud0a4\uc5d0\uc11c \uc81c\uac70
-Delete=\uc0ad\uc81c
-Delete_Attribute...=\uc18d\uc131 \uc0ad\uc81c...
-additions=\ucd94\uac00
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E JavaClass\uc758 \uc774\ub984\uc774 \ub2e4\uc74c\uc5d0 \ub300\ud574 \uc124\uc815\ub418\uc5b4 \uc788\uc9c0 \uc54a\uae30 \ub54c\ubb38\uc5d0 JavaClass\ub97c \ubc18\uc601\ud560 \uc218 \uc5c6\uc74c -
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E EJB\uac00 \ub110\uc774\uc5b4\uc11c \uc774\ub984\uc774 {0}\uc778 Java \uc720\ud615\uc744 {1}\uc5d0 \ub300\ud574 \uc124\uc815\ud560 \uc218 \uc5c6\uc5c8\uc2b5\ub2c8\ub2e4.
-CMDS_Cannot_perform_INFO_=IWAE0070I EJB\uac00 \ub2e4\uc74c \uba85\ub839\uc5d0 \ub300\ud574 \ub110\uc774\uc5b4\uc11c \uba85\ub839 \uc694\uccad\uc744 \uc218\ud589\ud560 \uc218 \uc5c6\uc74c:
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I \uae30\ub2a5\uc774 \ub2e4\uc74c \uba85\ub839\uc5d0 \ub300\ud574 \ub110\uc774\uc5b4\uc11c \ud0a4\uc5d0 \uae30\ub2a5\uc744 \ucd94\uac00\ud560 \uc218 \uc5c6\uc74c:
-CMDS_Cannot_remove_the_INFO_=IWAE0072I \uae30\ub2a5\uc774 \ub2e4\uc74c \uba85\ub839\uc5d0 \ub300\ud574 \ub110\uc774\uc5b4\uc11c \ud0a4\uc5d0\uc11c \uae30\ub2a5\uc744 \uc81c\uac70\ud560 \uc218 \uc5c6\uc74c:
-CMDS_Initializing_UI_=-- Java \uc0dd\uc131 :: \ucd08\uae30\ud654 \uc911...
-CMDS_Generating_UI_=-- Java \uc0dd\uc131 :: \uc0dd\uc131 \uc911...
-CMDS_Finishing_UI_=-- Java \uc0dd\uc131 :: \uc644\ub8cc \uc911...
-CMDS_Analyzing_UI_=-- Java \uc0dd\uc131 :: \ubd84\uc11d \uc911...
-CMDS_Cancelled_WARNING_=\ucde8\uc18c\ub428
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I \uc5ec\ub7ec EnterpriseBean \uac31\uc2e0
-CMDS_CREATING_TASK_UI_=\uc774\ub984\uc774 "{0}"\uc778 Bean \uc791\uc131 \uc911
-CMDS_UPDATING_TASK_UI_=\uc774\ub984\uc774 "{0}"\uc778 Bean \uac31\uc2e0 \uc911
-CMDS_DELETING_TASK_UI_=\uc774\ub984\uc774 "{0}"\uc778 Bean \uc0ad\uc81c \uc911
-CMDS_Updating_Metadata..._UI_=-- \uba54\ud0c0\ub370\uc774\ud130 \uac31\uc2e0 \uc911...
-Updating=\uac31\uc2e0 \uc911
-New_key_attribute_added_wi=\uc18d\uc131 \ud5ec\ud37c \uc5c6\uc774 \uc0c8 \ud0a4 \uc18d\uc131\uc774 \ucd94\uac00\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-Error_has_occurred=\uc624\ub958 \ubc1c\uc0dd
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_pt_BR.properties
deleted file mode 100644
index 0370eb0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_pt_BR.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=Inicializa\u00e7\u00e3o do plug-in do provedor ejb - Problema ao inicializar plug-in
-Ejbext_provider_plugin_prob=Inicializa\u00e7\u00e3o do plug-in do provedor ejbext - Problema ao inicializar plug-in
-EJB_UI_STARTUP=EJB UI STARTUP
-EJB_Path__=Caminho EJB:
-Size__=Tamanho:
-Edit_the_bean_class=Editar a classe do bean
-EJB_Tree=\u00c1rvore EJB
-EJB_Jar_Components=Componentes de JAR EJB
-EJB_Models=Modelos EJB
-EJB_Features=Recursos EJB
-Exception_loading_plugin=Exce\u00e7\u00e3o no carregamento do plug-in
-Create=Criar
-Create_Attribute...=Criar Atributo...
-createAttribute=createAttribute
-Edit=Editar
-Add_To_Key=Incluir na Chave
-delete=excluir
-Unknown=Desconhecido
-Remove_From_Key=Remover da Chave
-Delete=Excluir
-Delete_Attribute...=Excluir Atributo...
-additions=adi\u00e7\u00f5es
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E N\u00e3o \u00e9 poss\u00edvel refletir JavaClass porque o nome n\u00e3o est\u00e1 definido para
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E O tipo Java denominado {0} n\u00e3o p\u00f4de ser definido para {1} porque seu EJB \u00e9 nulo.
-CMDS_Cannot_perform_INFO_=IWAE0070I N\u00e3o \u00e9 poss\u00edvel executar o pedido de comando porque o EJB \u00e9 nulo para o comando:
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I N\u00e3o \u00e9 poss\u00edvel incluir o recurso na chave porque o recurso \u00e9 nulo para o comando:
-CMDS_Cannot_remove_the_INFO_=IWAE0072I N\u00e3o \u00e9 poss\u00edvel remover o recurso da chave porque o recurso \u00e9 nulo para o comando:
-CMDS_Initializing_UI_=-- Java Generation :: Inicializando...
-CMDS_Generating_UI_=-- Java Generation :: Gerando...
-CMDS_Finishing_UI_=-- Java Generation :: Concluindo...
-CMDS_Analyzing_UI_=-- Java Generation :: Analisando...
-CMDS_Cancelled_WARNING_=Cancelado
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I Atualiza\u00e7\u00f5es de V\u00e1rios EnterpriseBean
-CMDS_CREATING_TASK_UI_=Criando bean nomeado "{0}"
-CMDS_UPDATING_TASK_UI_=Atualizando bean nomeado "{0}"
-CMDS_DELETING_TASK_UI_=Excluindo bean nomeado "{0}"
-CMDS_Updating_Metadata..._UI_=-- Atualizando Metadados...
-Updating=Atualizando
-New_key_attribute_added_wi=Novo atributo de chave inclu\u00eddo sem o auxiliar de atributos.
-Error_has_occurred=Ocorreu um erro
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_zh.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_zh.properties
deleted file mode 100644
index 7079cf1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_zh.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 \u63d0\u4f9b\u7a0b\u5e8f\u63d2\u4ef6\u542f\u52a8 \uff0d \u521d\u59cb\u5316\u63d2\u4ef6\u65f6\u51fa\u73b0\u95ee\u9898
-Ejbext_provider_plugin_prob=Ejbext \u63d0\u4f9b\u7a0b\u5e8f\u63d2\u4ef6\u542f\u52a8 \uff0d \u521d\u59cb\u5316\u63d2\u4ef6\u65f6\u51fa\u73b0\u95ee\u9898
-EJB_UI_STARTUP=EJB UI \u542f\u52a8
-EJB_Path__=EJB \u8def\u5f84\uff1a
-Size__=\u5927\u5c0f\uff1a
-Edit_the_bean_class=\u7f16\u8f91 bean \u7c7b
-EJB_Tree=EJB \u6811
-EJB_Jar_Components=EJB JAR \u7ec4\u4ef6
-EJB_Models=EJB \u6a21\u578b
-EJB_Features=EJB \u529f\u80fd\u90e8\u4ef6
-Exception_loading_plugin=\u88c5\u5165\u63d2\u4ef6\u65f6\u51fa\u73b0\u5f02\u5e38
-Create=\u521b\u5efa
-Create_Attribute...=\u521b\u5efa\u5c5e\u6027...
-createAttribute=createAttribute
-Edit=\u7f16\u8f91
-Add_To_Key=\u6dfb\u52a0\u81f3\u952e
-delete=\u5220\u9664
-Unknown=\u672a\u77e5
-Remove_From_Key=\u4ece\u952e\u4e2d\u9664\u53bb
-Delete=\u5220\u9664
-Delete_Attribute...=\u5220\u9664\u5c5e\u6027...
-additions=\u9644\u52a0\u9879
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E \u4e0d\u80fd\u53cd\u6620 Java \u7c7b\uff0c\u56e0\u4e3a\u672a\u8bbe\u7f6e\u5176\u540d\u79f0
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E \u672a\u80fd\u4e3a {1} \u8bbe\u7f6e\u540d\u4e3a {0} \u7684 Java \u7c7b\u578b\uff0c\u539f\u56e0\u662f\u5176 EJB \u4e3a\u7a7a\u3002
-CMDS_Cannot_perform_INFO_=IWAE0070I \u4e0d\u80fd\u6267\u884c\u547d\u4ee4\u8bf7\u6c42\uff0c\u539f\u56e0\u662f\u5bf9\u4e8e\u4ee5\u4e0b\u547d\u4ee4 EJB \u4e3a\u7a7a\uff1a
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I \u4e0d\u80fd\u5c06\u529f\u80fd\u90e8\u4ef6\u6dfb\u52a0\u81f3\u952e\uff0c\u539f\u56e0\u662f\u5bf9\u4e8e\u4ee5\u4e0b\u547d\u4ee4\u529f\u80fd\u90e8\u4ef6\u4e3a\u7a7a\uff1a
-CMDS_Cannot_remove_the_INFO_=IWAE0072I \u4e0d\u80fd\u4ece\u952e\u4e2d\u9664\u53bb\u529f\u80fd\u90e8\u4ef6\uff0c\u539f\u56e0\u662f\u5bf9\u4e8e\u4ee5\u4e0b\u547d\u4ee4\u529f\u80fd\u90e8\u4ef6\u4e3a\u7a7a\uff1a
-CMDS_Initializing_UI_=-- Java \u751f\u6210 :: \u6b63\u5728\u521d\u59cb\u5316...
-CMDS_Generating_UI_=-- Java \u751f\u6210 :: \u6b63\u5728\u751f\u6210...
-CMDS_Finishing_UI_=-- Java \u751f\u6210 :: \u6b63\u5728\u5b8c\u6210...
-CMDS_Analyzing_UI_=-- Java \u751f\u6210 :: \u6b63\u5728\u5206\u6790...
-CMDS_Cancelled_WARNING_=\u5df2\u53d6\u6d88
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I \u591a\u4e2a\u4f01\u4e1a Bean \u66f4\u65b0
-CMDS_CREATING_TASK_UI_=\u6b63\u5728\u521b\u5efa\u540d\u4e3a\u201c{0}\u201d\u7684 bean
-CMDS_UPDATING_TASK_UI_=\u6b63\u5728\u66f4\u65b0\u540d\u4e3a\u201c{0}\u201d\u7684 bean
-CMDS_DELETING_TASK_UI_=\u6b63\u5728\u5220\u9664\u540d\u4e3a\u201c{0}\u201d\u7684 bean
-CMDS_Updating_Metadata..._UI_=-- \u6b63\u5728\u66f4\u65b0\u5143\u6570\u636e...
-Updating=\u6b63\u5728\u66f4\u65b0
-New_key_attribute_added_wi=\u5728\u6ca1\u6709\u5c5e\u6027 helper \u7684\u60c5\u51b5\u4e0b\u6dfb\u52a0\u4e86\u65b0\u7684\u952e\u5c5e\u6027\u3002
-Error_has_occurred=\u53d1\u751f\u4e86\u9519\u8bef
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_zh_TW.properties
deleted file mode 100644
index 17b49a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/ejb_zh_TW.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 \u63d0\u4f9b\u8005\u5916\u639b\u7a0b\u5f0f\u555f\u52d5 - \u7121\u6cd5\u8d77\u59cb\u8a2d\u5b9a\u5916\u639b\u7a0b\u5f0f
-Ejbext_provider_plugin_prob=Ejbext \u63d0\u4f9b\u8005\u5916\u639b\u7a0b\u5f0f\u555f\u52d5 - \u7121\u6cd5\u8d77\u59cb\u8a2d\u5b9a\u5916\u639b\u7a0b\u5f0f
-EJB_UI_STARTUP=EJB UI STARTUP
-EJB_Path__=EJB \u8def\u5f91\uff1a
-Size__=\u5927\u5c0f\uff1a
-Edit_the_bean_class=\u7de8\u8f2f Bean \u985e\u5225
-EJB_Tree=EJB \u6a39\u72c0\u7d50\u69cb
-EJB_Jar_Components=EJB JAR \u5143\u4ef6
-EJB_Models=EJB \u6a21\u578b
-EJB_Features=EJB \u7279\u6027
-Exception_loading_plugin=\u8f09\u5165\u5916\u639b\u7a0b\u5f0f\u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1
-Create=\u5efa\u7acb
-Create_Attribute...=\u5efa\u7acb\u5c6c\u6027...
-createAttribute=createAttribute
-Edit=\u7de8\u8f2f
-Add_To_Key=\u65b0\u589e\u81f3\u7d22\u5f15\u9375
-delete=\u522a\u9664
-Unknown=\u4e0d\u660e
-Remove_From_Key=\u81ea\u7d22\u5f15\u9375\u79fb\u9664
-Delete=\u522a\u9664
-Delete_Attribute...=\u522a\u9664\u5c6c\u6027...
-additions=\u65b0\u589e\u5167\u5bb9
-CMDS_Cannot_reflect_JavaClass_ERROR_=IWAE0068E \u7121\u6cd5\u53cd\u6620 JavaClass\uff0c\u56e0\u70ba\u5b83\u7684\u540d\u7a31\u672a\u8a2d\u5b9a
-CMDS_CLASS_SET_FAILED_STRING_ERROR_=IWAE0069E \u7121\u6cd5\u70ba {1} \u8a2d\u5b9a\u540d\u7a31\u70ba {0} \u7684 Java \u985e\u578b\uff0c\u56e0\u70ba\u5b83\u7684 EJB \u662f\u7a7a\u503c\u3002
-CMDS_Cannot_perform_INFO_=IWAE0070I \u7121\u6cd5\u57f7\u884c\u6307\u4ee4\u8981\u6c42\uff0c\u56e0\u70ba\u5c0d\u65bc\u6307\u4ee4\u800c\u8a00 EJB \u662f\u7a7a\u503c\uff1a
-CMDS_Cannot_add_the_feat_INFO_=IWAE0071I \u7121\u6cd5\u5c07\u9019\u9805\u7279\u6027\u65b0\u589e\u81f3\u9019\u500b\u7d22\u5f15\u9375\uff0c\u56e0\u70ba\u5c0d\u65bc\u6307\u4ee4\u4f86\u8aaa\u9019\u9805\u7279\u6027\u662f\u7a7a\u503c\uff1a
-CMDS_Cannot_remove_the_INFO_=IWAE0072I \u7121\u6cd5\u5f9e\u9019\u500b\u7d22\u5f15\u9375\u79fb\u9664\u9019\u9805\u7279\u6027\uff0c\u56e0\u70ba\u5c0d\u65bc\u6307\u4ee4\u4f86\u8aaa\u9019\u9805\u7279\u6027\u662f\u7a7a\u503c\uff1a
-CMDS_Initializing_UI_=-- Java \u7522\u751f :: \u8d77\u59cb\u8a2d\u5b9a...
-CMDS_Generating_UI_=-- Java \u7522\u751f :: \u7522\u751f\u4e2d...
-CMDS_Finishing_UI_=-- Java \u7522\u751f :: \u5b8c\u6210\u4e2d...
-CMDS_Analyzing_UI_=-- Java \u7522\u751f :: \u5206\u6790\u4e2d...
-CMDS_Cancelled_WARNING_=\u5df2\u53d6\u6d88
-CMDS_Multiple_EnterpriseBean_Up_INFO_=IWAE0073I \u591a\u500b EnterpriseBean \u66f4\u65b0
-CMDS_CREATING_TASK_UI_=\u6b63\u5728\u5efa\u7acb Bean "{0}"
-CMDS_UPDATING_TASK_UI_=\u6b63\u5728\u66f4\u65b0 Bean "{0}"
-CMDS_DELETING_TASK_UI_=\u6b63\u5728\u522a\u9664 Bean "{0}"
-CMDS_Updating_Metadata..._UI_=-- \u6b63\u5728\u66f4\u65b0 Meta \u8cc7\u6599...
-Updating=\u6b63\u5728\u66f4\u65b0
-New_key_attribute_added_wi=\u5df2\u65b0\u589e\u7d22\u5f15\u9375\u5c6c\u6027\u4f46\u6c92\u6709\u5c6c\u6027\u8aaa\u660e\u7a0b\u5f0f\u3002
-Error_has_occurred=\u767c\u751f\u932f\u8aa4
-
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 9531944..0000000
--- 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/j2eeplugin_de.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_de.properties
deleted file mode 100644
index ed1eab0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_de.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 Das Stammobjekt wurde nicht gefunden in Ressource: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0075E Beim Sichern ist ein Fehler aufgetreten.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E Die Operation J2EEUIWorkingCopyManager kann nicht ausgef\u00fchrt werden, da der Arbeitsbereichsbaum gesperrt ist.
-Unable_to_save_read-only_f_ERROR_=IWAE0077E die schreibgesch\u00fctzte Datei kann nicht gesichert werden: {0}
-The_following_resources_ne_UI_=Die folgenden Ressourcen m\u00fcssen gesichert werden, werden aber momentan gemeinsam verwendet. Sollen Sie jetzt gesichert werden?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_es.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_es.properties
deleted file mode 100644
index a79910f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_es.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 No se ha podido encontrar el objeto ra\u00edz en el recurso: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0075E Se produjo un error mientras se guardaba.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E No se puede ejecutar la operaci\u00f3n J2EEUIWorkingCopyManager porque el \u00e1rbol del \u00e1rea de trabajo est\u00e1 bloqueado.
-Unable_to_save_read-only_f_ERROR_=IWAE0077E No se puede guardar en un archivo solo de lectura: {0}
-The_following_resources_ne_UI_=Los siguientes recursos deben guardarse pero actualmente est\u00e1n comparti\u00e9ndose, \u00bfdesea guardarlos ahora?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_fr.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_fr.properties
deleted file mode 100644
index 7df1a03..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_fr.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 L''objet racine est introuvable dans la ressource : {0}.
-An_error_occurred_while_sa_ERROR_=IWAE0075E Une erreur s'est produite lors de la sauvegarde.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E Impossible d'ex\u00e9cuter l'op\u00e9ration J2EEUIWorkingCopyManager car l'arborescence de l'espace de travail est verrouill\u00e9e.
-Unable_to_save_read-only_f_ERROR_=IWAE0077E Impossible de sauvegarder le fichier en lecture seule : {0}
-The_following_resources_ne_UI_=Les ressources suivantes doivent \u00eatre sauvegard\u00e9es, mais elles sont actuellement partag\u00e9es. Voulez-vous effectuer la sauvegarde maintenant ?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_it.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_it.properties
deleted file mode 100644
index ad2484c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_it.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 Impossibile trovare l''oggetto radice nella risorsa: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0075E Errore durante il salvataggio.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E Impossibile eseguire l'operazione J2EEUIWorkingCopyManager poich\u00e9 la struttura dello spazio di lavoro \u00e8 bloccata.
-Unable_to_save_read-only_f_ERROR_=IWAE0077E Impossibile salvare il file di sola lettura: {0}
-The_following_resources_ne_UI_=Le seguenti risorse devono essere salvate ma sono attualmente condivise. Si desidera salvarle ora?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_ja.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_ja.properties
deleted file mode 100644
index a3ac401..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_ja.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 \u30ea\u30bd\u30fc\u30b9 {0} \u5185\u3067\u30eb\u30fc\u30c8\u30fb\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
-An_error_occurred_while_sa_ERROR_=IWAE0075E \u4fdd\u7ba1\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E \u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9\u30fb\u30c4\u30ea\u30fc\u304c\u30ed\u30c3\u30af\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001J2EEUIWorkingCopyManager \u64cd\u4f5c\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3002
-Unable_to_save_read-only_f_ERROR_=IWAE0077E \u8aad\u307f\u53d6\u308a\u5c02\u7528\u30d5\u30a1\u30a4\u30eb {0} \u3092\u4fdd\u7ba1\u3067\u304d\u307e\u305b\u3093
-The_following_resources_ne_UI_=\u6b21\u306e\u30ea\u30bd\u30fc\u30b9\u3092\u4fdd\u7ba1\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u73fe\u5728\u306f\u5171\u7528\u3068\u306a\u3063\u3066\u3044\u307e\u3059\u3002\u3059\u3050\u306b\u4fdd\u7ba1\u3057\u307e\u3059\u304b?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_ko.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_ko.properties
deleted file mode 100644
index 757dba6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_ko.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 \uc790\uc6d0\uc5d0\uc11c \ub8e8\ud2b8 \uc624\ube0c\uc81d\ud2b8\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc5c8\uc74c: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0075E \uc800\uc7a5 \uc911\uc5d0 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E \uc791\uc5c5\uacf5\uac04 \ud2b8\ub9ac\uac00 \uc7a0\uaca8 \uc788\uc5b4\uc11c J2EEUIWorkingCopyManager \uc870\uc791\uc744 \uc2e4\ud589\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-Unable_to_save_read-only_f_ERROR_=IWAE0077E \uc77d\uae30 \uc804\uc6a9 \ud30c\uc77c\uc744 \uc800\uc7a5\ud560 \uc218 \uc5c6\uc74c: {0}
-The_following_resources_ne_UI_=\ub2e4\uc74c \uc790\uc6d0\uc740 \uc800\uc7a5\ud574\uc57c \ud558\uc9c0\ub9cc \ud604\uc7ac \uacf5\uc720\ub418\uc5b4 \uc788\uc2b5\ub2c8\ub2e4. \uc9c0\uae08 \uc800\uc7a5\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_pt_BR.properties
deleted file mode 100644
index 63ffdb9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_pt_BR.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 A raiz do objeto n\u00e3o p\u00f4de ser encontrada no recurso: {0}
-An_error_occurred_while_sa_ERROR_=IWAE0075E Ocorreu um erro durante o salvamento.
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E N\u00e3o \u00e9 poss\u00edvel executar a opera\u00e7\u00e3o J2EEUIWorkingCopyManager porque a \u00e1rvore Workspace est\u00e1 travada.
-Unable_to_save_read-only_f_ERROR_=IWAE0077E N\u00e3o \u00e9 poss\u00edvel salvar o arquivo somente leitura: {0}
-The_following_resources_ne_UI_=Os recursos a seguir necessitam ser salvos mas est\u00e3o atualmente compartilhado, voc\u00ea deseja salv\u00e1-los agora?
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_zh.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_zh.properties
deleted file mode 100644
index bb2e570..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_zh.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 \u672a\u80fd\u5728\u8d44\u6e90 {0} \u4e2d\u627e\u5230\u6839\u5bf9\u8c61
-An_error_occurred_while_sa_ERROR_=IWAE0075E \u4fdd\u5b58\u65f6\u53d1\u751f\u4e86\u9519\u8bef\u3002
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E \u4e0d\u80fd\u8fd0\u884c J2EEUIWorkingCopyManager \u64cd\u4f5c\uff0c\u539f\u56e0\u662f\u9501\u5b9a\u4e86\u201c\u5de5\u4f5c\u7a7a\u95f4\u201d\u6811\u3002
-Unable_to_save_read-only_f_ERROR_=IWAE0077E \u65e0\u6cd5\u4fdd\u5b58\u53ea\u8bfb\u6587\u4ef6\uff1a{0}
-The_following_resources_ne_UI_=\u9700\u8981\u4fdd\u5b58\u4e0b\u5217\u8d44\u6e90\uff0c\u4f46\u5f53\u524d\u5b83\u4eec\u6b63\u5904\u4e8e\u5171\u4eab\u72b6\u6001\uff0c\u60f3\u8981\u73b0\u5728\u4fdd\u5b58\u5417\uff1f
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_zh_TW.properties
deleted file mode 100644
index 55fa6f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eeplugin_zh_TW.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 \u8cc7\u6e90\u4e2d\u7121\u6cd5\u627e\u5230\u6839\u7269\u4ef6\uff1a{0}
-An_error_occurred_while_sa_ERROR_=IWAE0075E \u5132\u5b58\u6642\u767c\u751f\u932f\u8aa4\u3002
-Cannot_run_J2EEUIWorkingCo_ERROR_=IWAE0076E \u7121\u6cd5\u57f7\u884c J2EEUIWorkingCopyManager \u4f5c\u696d\uff0c\u56e0\u70ba\u5de5\u4f5c\u5340\u6a39\u72c0\u7d50\u69cb\u5df2\u9396\u5b9a\u3002
-Unable_to_save_read-only_f_ERROR_=IWAE0077E \u7121\u6cd5\u5132\u5b58\u552f\u8b80\u6a94\u6848\uff1a{0}
-The_following_resources_ne_UI_=\u4e0b\u5217\u8cc7\u6e90\u5fc5\u9808\u8981\u5132\u5b58\uff0c\u4f46\u76ee\u524d\u70ba\u5171\u7528\u7684\uff0c\u60a8\u73fe\u5728\u8981\u5132\u5b58\u55ce\uff1f
-
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 492f7aa..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-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:
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_de.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_de.properties
deleted file mode 100644
index fdd83d7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_de.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E Unterst\u00fctzung f\u00fcr RAR-Datei: DTD-Datei nicht gefunden: {0}
-io_ex_saving_EXC_=IWAE0079E E/A-Ausnahmebedingung beim Speichern von {0}.
-could_not_create_file_EXC_=IWAE0080E Die Datei mit dem Namen {0} konnte nicht erstellt werden.
-unsupported_encoding_EXC_=IWAE0081E {0} ist auf dieser Plattform keine unterst\u00fctzte Codierung.
-unsupported_type_EXC_=IWAE0082E Der Typ wird nicht erkannt oder noch nicht unterst\u00fctzt: PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E F\u00fcr die XML konnte kein Parsing ausgef\u00fchrt werden, weil die aufgel\u00f6ste Ressourcen "{0}" nicht im Klassenpfad gefunden wurde.
-must_be_boolean_EXC_=IWAE0084E Beim Lesen von {0} ist eine Ausnahmebedingung aufgetreten.  Der Wert muss ein Boolescher Wert sein: Zeichenfolgewert = {1}
-must_be_int_EXC_=IWAE0085E Beim Lesen von {0} ist eine Ausnahmebedingung aufgetreten.  Der Wert muss eine ganze Zahl sein: Zeichenfolgewert = {1}
-empty_collection_EXC_=IWAE0086E Leere Collection f\u00fcr {0} in {1}
-missing_req_field_EXC_=IWAE0087E Das erforderliche Feld {0} in {1} fehlt.
-An_Exception_occurred_whil_EXC_=IWAE0088E Beim Schreiben von XML ist eine Ausnahmebedingung aufgetreten.
-Not_supported_in_this_rele_EXC_=IWAE0089E Keine Unterst\u00fctzung in diesem Release
-RAR_file_support__IO_excep_EXC_=IWAE0090E Unterst\u00fctzung f\u00fcr RAR-Datei: E/A-Ausnahmebedingung im angepassten DTD-Aufl\u00f6ser.
-An_IO_Exception_occurred_w_EXC_=IWAE0091E Beim Schreiben von XML ist eine Ausnahmebedingung aufgetreten.
-Failure_occurred_reading_x_EXC_=IWAE0092E Fehler beim Lesen von XML:
-Invalid_value_for__EXC_=IWAE0093E Ung\u00fcltiger Wert f\u00fcr
-Valid_values_are___EXC_=IWAE0094E G\u00fcltige Werte sind:
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_es.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_es.properties
deleted file mode 100644
index 58721cf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_es.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E Soporte de archivo RAR: No se ha encontrado el archivo DTD: {0}
-io_ex_saving_EXC_=IWAE0079E Se ha producido una excepci\u00f3n de E/S al guardar {0}
-could_not_create_file_EXC_=IWAE0080E No se ha podido crear el archivo denominado {0}
-unsupported_encoding_EXC_=IWAE0081E {0} no es una codificaci\u00f3n soportada en esta plataforma
-unsupported_type_EXC_=IWAE0082E El tipo no est\u00e1 reconocido o todav\u00eda no est\u00e1 soportado: PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E No se ha podido analizar xml ya que el recurso resuelto "{0}" no se ha podido encontrar en la v\u00eda de acceso de clases
-must_be_boolean_EXC_=IWAE0084E Se ha producido una excepci\u00f3n al leer {0}.  El valor debe ser un booleano: Valor de la serie = {1}
-must_be_int_EXC_=IWAE0085E Se ha producido una excepci\u00f3n al leer {0}.  El valor debe ser un entero: Valor de la serie = {1}
-empty_collection_EXC_=IWAE0086E Colecci\u00f3n vac\u00eda para {0} en {1}
-missing_req_field_EXC_=IWAE0087E Falta el campo obligatorio {0} en {1}
-An_Exception_occurred_whil_EXC_=IWAE0088E Se ha producido una excepci\u00f3n durante la escritura de xml
-Not_supported_in_this_rele_EXC_=IWAE0089E No soportado en este release
-RAR_file_support__IO_excep_EXC_=IWAE0090E Soporte de archivo RAR: excepci\u00f3n de E/S en resolutor de DTD personalizado.
-An_IO_Exception_occurred_w_EXC_=IWAE0091E Se ha producido una excepci\u00f3n de E/S durante la escritura de xml
-Failure_occurred_reading_x_EXC_=IWAE0092E Se ha producido una anomal\u00eda al leer xml:
-Invalid_value_for__EXC_=IWAE0093E Valor no v\u00e1lido para
-Valid_values_are___EXC_=IWAE0094E Los valores v\u00e1lidos son:
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_fr.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_fr.properties
deleted file mode 100644
index f2bad0e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_fr.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E Support de fichier RAR : fichier DTD introuvable : {0}
-io_ex_saving_EXC_=IWAE0079E Une exception d''E-S s''est produite lors de la sauvegarde de {0}.
-could_not_create_file_EXC_=IWAE0080E Impossible de cr\u00e9er le fichier nomm\u00e9 {0}.
-unsupported_encoding_EXC_=IWAE0081E {0} n''est pas un encodage support\u00e9 sur cette plateforme.
-unsupported_type_EXC_=IWAE0082E Type non reconnu ou pas encore support\u00e9 : PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E Impossible d''analyser le fichier xml car la ressource r\u00e9solue "{0}" est introuvable dans le chemin d''acc\u00e8s aux classes.
-must_be_boolean_EXC_=IWAE0084E Une exception s''est produite lors de la lecture de {0}.  La valeur doit \u00eatre un bool\u00e9en : valeur de cha\u00eene = {1}
-must_be_int_EXC_=IWAE0085E Une exception s''est produite lors de la lecture de {0}.  La valeur doit \u00eatre un entier : valeur de cha\u00eene = {1}
-empty_collection_EXC_=IWAE0086E Collection vide pour {0} dans {1}.
-missing_req_field_EXC_=IWAE0087E Zone requise manquante {0} dans {1}.
-An_Exception_occurred_whil_EXC_=IWAE0088E Une exception s'est produite lors de l'\u00e9criture du fichier xml
-Not_supported_in_this_rele_EXC_=IWAE0089E Non support\u00e9 dans cette \u00e9dition.
-RAR_file_support__IO_excep_EXC_=IWAE0090E Support du fichier RAR : exception d'E-S dans le r\u00e9solveur DTD personnalis\u00e9.
-An_IO_Exception_occurred_w_EXC_=IWAE0091E Une exception d'E-S s'est produite lors de l'\u00e9criture du fichier xml.
-Failure_occurred_reading_x_EXC_=IWAE0092E Echec lors de la lecture du fichier xml :
-Invalid_value_for__EXC_=IWAE0093E Valeur non valide pour
-Valid_values_are___EXC_=IWAE0094E Les valeurs valides sont :
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_it.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_it.properties
deleted file mode 100644
index bd2bf17..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_it.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E Supporto file RAR: impossibile trovare il file DTD: {0}
-io_ex_saving_EXC_=IWAE0079E Eccezione IO durante il salvataggio di {0}
-could_not_create_file_EXC_=IWAE0080E Impossibile creare il file {0}
-unsupported_encoding_EXC_=IWAE0081E {0} non \u00e8 un tipo di codice supportato su questa piattaforma
-unsupported_type_EXC_=IWAE0082E Tipo non riconosciuto o non supportato: PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E Impossibile eseguire l''analisi xml. Risorsa risolta "{0}" non trovata nel percorso classi
-must_be_boolean_EXC_=IWAE0084E Eccezione durante la lettura di {0}.  Il valore fornito deve essere booleano: valore stringa = {1}
-must_be_int_EXC_=IWAE0085E Eccezione durante la lettura di {0}.  Il valore fornito deve essere un numero intero: valore stringa = {1}
-empty_collection_EXC_=IWAE0086E Insieme vuoto per {0} in {1}
-missing_req_field_EXC_=IWAE0087E Campo {0} richiesto mancante in {1}
-An_Exception_occurred_whil_EXC_=IWAE0088E Eccezione durante la scrittura xml
-Not_supported_in_this_rele_EXC_=IWAE0089E Non supportato in questa versione
-RAR_file_support__IO_excep_EXC_=IWAE0090E Supporto file RAR: eccezione IO nel resolver personalizzato DTD.
-An_IO_Exception_occurred_w_EXC_=IWAE0091E Eccezione IO durante la scrittura xml
-Failure_occurred_reading_x_EXC_=IWAE0092E Errore durante la lettura xml:
-Invalid_value_for__EXC_=IWAE0093E Valore non valido per
-Valid_values_are___EXC_=IWAE0094E I valori non validi sono:
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_ja.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_ja.properties
deleted file mode 100644
index d48776b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_ja.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E RAR \u30d5\u30a1\u30a4\u30eb\u30fb\u30b5\u30dd\u30fc\u30c8: DTD \u30d5\u30a1\u30a4\u30eb\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: {0}
-io_ex_saving_EXC_=IWAE0079E {0} \u3092\u4fdd\u7ba1\u4e2d\u306b I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-could_not_create_file_EXC_=IWAE0080E {0} \u3068\u3044\u3046\u540d\u524d\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
-unsupported_encoding_EXC_=IWAE0081E {0} \u306f\u3001\u3053\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u3067\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u30a8\u30f3\u30b3\u30fc\u30c9\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-unsupported_type_EXC_=IWAE0082E \u30bf\u30a4\u30d7\u304c\u8a8d\u8b58\u3055\u308c\u306a\u3044\u304b\u3001\u307e\u305f\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093: PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E \u30af\u30e9\u30b9\u30d1\u30b9\u3067\u89e3\u6c7a\u3055\u308c\u305f\u30ea\u30bd\u30fc\u30b9 "{0}" \u304c\u898b\u3064\u304b\u3089\u306a\u304b\u3063\u305f\u305f\u3081\u3001xml \u3092\u89e3\u6790\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
-must_be_boolean_EXC_=IWAE0084E {0} \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002  \u5024\u306f\u30d6\u30fc\u30eb\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059: \u30b9\u30c8\u30ea\u30f3\u30b0\u5024 = {1}
-must_be_int_EXC_=IWAE0085E {0} \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002  \u5024\u306f\u6574\u6570\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059: \u30b9\u30c8\u30ea\u30f3\u30b0\u5024 = {1}
-empty_collection_EXC_=IWAE0086E {1} \u5185\u306e {0} \u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u304c\u7a7a\u3067\u3059
-missing_req_field_EXC_=IWAE0087E {1} \u5185\u3067\u5fc5\u9808\u30d5\u30a3\u30fc\u30eb\u30c9 {0} \u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-An_Exception_occurred_whil_EXC_=IWAE0088E xml \u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-Not_supported_in_this_rele_EXC_=IWAE0089E \u3053\u306e\u30ea\u30ea\u30fc\u30b9\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-RAR_file_support__IO_excep_EXC_=IWAE0090E RAR \u30d5\u30a1\u30a4\u30eb\u30fb\u30b5\u30dd\u30fc\u30c8: \u30ab\u30b9\u30bf\u30e0 DTD \u30ea\u30be\u30eb\u30d0\u30fc\u3067 I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-An_IO_Exception_occurred_w_EXC_=IWAE0091E xml \u3092\u66f8\u304d\u8fbc\u307f\u4e2d\u306b I/O \u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-Failure_occurred_reading_x_EXC_=IWAE0092E xml \u3092\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u5931\u6557\u3057\u307e\u3057\u305f:
-Invalid_value_for__EXC_=IWAE0093E \u7121\u52b9\u306a\u5024
-Valid_values_are___EXC_=IWAE0094E \u6709\u52b9\u306a\u5024:
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_ko.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_ko.properties
deleted file mode 100644
index 66c880b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_ko.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E RAR \ud30c\uc77c \uc9c0\uc6d0: DTD \ud30c\uc77c \uc5c6\uc74c: {0}
-io_ex_saving_EXC_=IWAE0079E {0} \uc800\uc7a5 \uc911\uc5d0 IOException \ubc1c\uc0dd
-could_not_create_file_EXC_=IWAE0080E {0}(\uc774)\ub77c\ub294 \uc774\ub984\uc758 \ud30c\uc77c\uc744 \uc791\uc131\ud560 \uc218 \uc5c6\uc5c8\uc74c
-unsupported_encoding_EXC_=IWAE0081E {0}\uc740(\ub294) \uc774 \ud50c\ub7ab\ud3fc\uc5d0\uc11c \uc9c0\uc6d0\ub418\ub294 \uc778\ucf54\ub529\uc774 \uc544\ub2d8
-unsupported_type_EXC_=IWAE0082E \uc720\ud615\uc774 \uc778\uc2dd\ub418\uc9c0 \uc54a\uac70\ub098 \uc544\uc9c1 \uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc74c: PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E \ubd84\uc11d\ub41c "{0}" \uc790\uc6d0\uc744 \ud074\ub798\uc2a4 \uacbd\ub85c\uc5d0\uc11c \ucc3e\uc744 \uc218 \uc5c6\uc5c8\uae30 \ub54c\ubb38\uc5d0 xml\uc758 \uad6c\ubb38\uc744 \ubd84\uc11d\ud560 \uc218 \uc5c6\uc5c8\uc74c
-must_be_boolean_EXC_=IWAE0084E {0}\uc744(\ub97c) \uc77d\ub294 \uc911\uc5d0 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.  \uac12\uc774 \ubd80\uc6b8\uc774\uc5b4\uc57c \ud568: \ubb38\uc790\uc5f4 \uac12 = {1}
-must_be_int_EXC_=IWAE0085E {0}\uc744(\ub97c) \uc77d\ub294 \uc911\uc5d0 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.  \uac12\uc774 \uc815\uc218\uc5ec\uc57c \ud568: \ubb38\uc790\uc5f4 \uac12 = {1}
-empty_collection_EXC_=IWAE0086E {1}\uc5d0\uc11c {0}\uc5d0 \ub300\ud55c \ucf5c\ub809\uc158\uc774 \ube44\uc5b4 \uc788\uc74c
-missing_req_field_EXC_=IWAE0087E {1}\uc5d0\uc11c {0} \ud544\uc218 \ud544\ub4dc\uac00 \uc5c6\uc74c
-An_Exception_occurred_whil_EXC_=IWAE0088E xml\uc744 \uc4f0\ub294 \ub3d9\uc548 \uc608\uc678 \ubc1c\uc0dd
-Not_supported_in_this_rele_EXC_=IWAE0089E \uc774 \ub9b4\ub9ac\uc2a4\uc5d0\uc11c\ub294 \uc9c0\uc6d0\ub418\uc9c0 \uc54a\uc74c
-RAR_file_support__IO_excep_EXC_=IWAE0090E RAR \ud30c\uc77c \uc9c0\uc6d0: \uc0ac\uc6a9\uc790 \uc815\uc758 DTD \ubd84\uc11d\uae30\uc5d0\uc11c IO \uc608\uc678.
-An_IO_Exception_occurred_w_EXC_=IWAE0091E xml\uc744 \uc4f0\ub294 \ub3d9\uc548 IO \uc608\uc678 \ubc1c\uc0dd
-Failure_occurred_reading_x_EXC_=IWAE0092E xml\uc744 \uc77d\ub294 \uc911\uc5d0 \uc7a5\uc560 \ubc1c\uc0dd:
-Invalid_value_for__EXC_=IWAE0093E \ub2e4\uc74c\uc5d0 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uac12 -
-Valid_values_are___EXC_=IWAE0094E \uc62c\ubc14\ub978 \uac12:
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_pt_BR.properties
deleted file mode 100644
index e23899f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_pt_BR.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E Suporte ao arquivo RAR: arquivo DTD n\u00e3o encontrado: {0}
-io_ex_saving_EXC_=IWAE0079E Ocorreu uma Exce\u00e7\u00e3o E/S ao salvar {0}
-could_not_create_file_EXC_=IWAE0080E N\u00e3o foi poss\u00edvel criar o arquivo denominado {0}
-unsupported_encoding_EXC_=IWAE0081E {0} n\u00e3o \u00e9 uma codifica\u00e7\u00e3o suportada nesta plataforma
-unsupported_type_EXC_=IWAE0082E O tipo n\u00e3o \u00e9 reconhecido ou ainda n\u00e3o \u00e9 suportado: PUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E N\u00e3o foi poss\u00edvel analisar xml porque o recurso resolvido "{0}" n\u00e3o p\u00f4de ser encontrado no classpath
-must_be_boolean_EXC_=IWAE0084E Ocorreu uma exce\u00e7\u00e3o ao ler {0}. O valor deve ser um booleano: Valor de cadeia = {1}
-must_be_int_EXC_=IWAE0085E Ocorreu uma exce\u00e7\u00e3o ao ler {0}. O valor deve ser um inteiro: Valor de cadeia = {1}
-empty_collection_EXC_=IWAE0086E Coleta vazia para {0} em {1}
-missing_req_field_EXC_=IWAE0087E Campo requerido ausente {0} em {1}
-An_Exception_occurred_whil_EXC_=IWAE0088E Ocorreu uma Exce\u00e7\u00e3o durante a grava\u00e7\u00e3o de xml
-Not_supported_in_this_rele_EXC_=IWAE0089E N\u00e3o suportado neste release
-RAR_file_support__IO_excep_EXC_=IWAE0090E Suporte ao arquivo RAR: exce\u00e7\u00e3o ES no solucionador DTD personalizado.
-An_IO_Exception_occurred_w_EXC_=IWAE0091E Ocorreu uma Exce\u00e7\u00e3o E/S durante a grava\u00e7\u00e3o de xml
-Failure_occurred_reading_x_EXC_=IWAE0092E Ocorreu uma falha ao ler xml:
-Invalid_value_for__EXC_=IWAE0093E Valor inv\u00e1lido para
-Valid_values_are___EXC_=IWAE0094E Os valores v\u00e1lidos s\u00e3o:
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_zh.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_zh.properties
deleted file mode 100644
index 5a28ade..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_zh.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E RAR \u6587\u4ef6\u652f\u6301\uff1a\u627e\u4e0d\u5230 DTD \u6587\u4ef6\uff1a{0}
-io_ex_saving_EXC_=IWAE0079E \u4fdd\u5b58 {0} \u65f6\u53d1\u751f\u4e86 IO \u5f02\u5e38
-could_not_create_file_EXC_=IWAE0080E \u672a\u80fd\u521b\u5efa\u540d\u4e3a {0} \u7684\u6587\u4ef6
-unsupported_encoding_EXC_=IWAE0081E {0} \u5728\u6b64\u5e73\u53f0\u4e0a\u4e0d\u662f\u53d7\u652f\u6301\u7684\u7f16\u7801
-unsupported_type_EXC_=IWAE0082E \u7c7b\u578b\u4e0d\u80fd\u8bc6\u522b\u6216\u5c1a\u672a\u53d7\u652f\u6301\uff1aPUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E \u672a\u80fd\u89e3\u6790 xml\uff0c\u539f\u56e0\u662f\u5728\u7c7b\u8def\u5f84\u4e2d\u627e\u4e0d\u5230\u5df2\u89e3\u6790\u8d44\u6e90\u201c{0}\u201d
-must_be_boolean_EXC_=IWAE0084E \u8bfb\u53d6 {0} \u65f6\u53d1\u751f\u4e86\u5f02\u5e38\u3002\u503c\u5fc5\u987b\u4e3a\u5e03\u5c14\u503c\uff1a\u5b57\u7b26\u4e32\u503c = {1}
-must_be_int_EXC_=IWAE0085E \u8bfb\u53d6 {0} \u65f6\u53d1\u751f\u4e86\u5f02\u5e38\u3002\u503c\u5fc5\u987b\u4e3a\u6574\u6570\uff1a\u5b57\u7b26\u4e32\u503c = {1}
-empty_collection_EXC_=IWAE0086E {1} \u4e2d {0} \u7684\u96c6\u5408\u4e3a\u7a7a
-missing_req_field_EXC_=IWAE0087E {1} \u4e2d\u4e22\u5931\u5fc5\u9700\u7684\u5b57\u6bb5 {0}
-An_Exception_occurred_whil_EXC_=IWAE0088E \u7f16\u5199 xml \u65f6\u53d1\u751f\u4e86\u5f02\u5e38
-Not_supported_in_this_rele_EXC_=IWAE0089E \u5728\u6b64\u53d1\u884c\u7248\u4e2d\u4e0d\u53d7\u652f\u6301
-RAR_file_support__IO_excep_EXC_=IWAE0090E RAR \u6587\u4ef6\u652f\u6301\uff1a\u5b9a\u5236 DTD \u89e3\u6790\u5668\u4e2d\u5b58\u5728 IO \u5f02\u5e38\u3002
-An_IO_Exception_occurred_w_EXC_=IWAE0091E \u7f16\u5199 xml \u65f6\u53d1\u751f\u4e86 IO \u5f02\u5e38
-Failure_occurred_reading_x_EXC_=IWAE0092E \u8bfb\u53d6 xml \u65f6\u53d1\u751f\u4e86\u6545\u969c\uff1a
-Invalid_value_for__EXC_=IWAE0093E \u503c\u65e0\u6548
-Valid_values_are___EXC_=IWAE0094E \u6709\u6548\u503c\u4e3a\uff1a
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_zh_TW.properties
deleted file mode 100644
index 8f9149b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/j2eexml_zh_TW.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-rar_dtd_not_found_EXC_=IWAE0078E RAR \u6a94\u652f\u63f4\uff1a\u627e\u4e0d\u5230 DTD \u6a94\uff1a{0}
-io_ex_saving_EXC_=IWAE0079E \u5132\u5b58 {0} \u6642\u767c\u751f IOException
-could_not_create_file_EXC_=IWAE0080E \u7121\u6cd5\u5efa\u7acb {0} \u6a94
-unsupported_encoding_EXC_=IWAE0081E \u5728\u9019\u500b\u5e73\u53f0\u4e0a {0} \u4e0d\u662f\u652f\u63f4\u7684\u7de8\u78bc
-unsupported_type_EXC_=IWAE0082E \u7121\u6cd5\u8fa8\u8b58\u985e\u578b\u6216\u5c1a\u4e0d\u652f\u63f4\uff1aPUBLIC_ID={0} SYSTEM_ID={1}
-dtd_not_found_EXC_=IWAE0083E \u7121\u6cd5\u5256\u6790 xml\uff0c\u56e0\u70ba\u5728\u985e\u5225\u8def\u5f91\u627e\u4e0d\u5230\u89e3\u6790\u7684\u8cc7\u6e90 "{0}"
-must_be_boolean_EXC_=IWAE0084E \u8b80\u53d6 {0} \u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1\u3002\u503c\u5fc5\u9808\u662f Boolean\uff1aString \u503c = {1}
-must_be_int_EXC_=IWAE0085E \u8b80\u53d6 {0} \u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1\u3002\u503c\u5fc5\u9808\u662f\u6574\u6578\uff1aString \u503c = {1}
-empty_collection_EXC_=IWAE0086E {1} \u4e2d\u7684 {0} \u7684\u7a7a\u96c6\u5408
-missing_req_field_EXC_=IWAE0087E {1} \u4e2d\u907a\u6f0f\u5fc5\u8981\u7684\u6b04\u4f4d {0}
-An_Exception_occurred_whil_EXC_=IWAE0088E \u64b0\u5beb xml \u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1
-Not_supported_in_this_rele_EXC_=IWAE0089E \u672c\u7248\u6b21\u4e0d\u652f\u63f4
-RAR_file_support__IO_excep_EXC_=IWAE0090E RAR \u6a94\u652f\u63f4\uff1a\u81ea\u8a02\u7684 DTD \u5206\u8fa8\u5668\u767c\u751f IO \u7570\u5e38\u72c0\u6cc1\u3002
-An_IO_Exception_occurred_w_EXC_=IWAE0091E \u64b0\u5beb xml \u6642\u767c\u751f IO \u7570\u5e38\u72c0\u6cc1
-Failure_occurred_reading_x_EXC_=IWAE0092E \u8b80\u53d6 xml \u6642\u767c\u751f\u5931\u6557\uff1a
-Invalid_value_for__EXC_=IWAE0093E \u7121\u6548\u503c
-Valid_values_are___EXC_=IWAE0094E \u7121\u6548\u503c\uff1a
-
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 8745d94..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-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/mofj2ee_de.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_de.properties
deleted file mode 100644
index 47f37db..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_de.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=Stack-Trace der verschachtelten Ausnahmebedingung:
-ERROR=Fehler:
-WARNING=Warnung:
-INFO=Info:
-DEFAULT_COMPLETED_STATUS_MSG=Die Migration von {0} ist abgeschlossen.
-DEFAULT_NOT_NEEDED_STATUS_MSG=Die Migration von {0} war nicht erforderlich.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=Die Migration von {0} war nicht m\u00f6glich.
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E Fehler beim Migrieren von {0}.
-REMOVED_LOCAL_CLIENT_MSG=Die lokale Clientsicht f\u00fcr EJB {0} wurde entfernt.
-REMOVED_ACCESS_INTENTS_MSG=Die Werte f\u00fcr den geplanten Zugriff auf {0} 1.1-Methoden wurden aus der CMP-Bean {1} entfernt.
-REMOVED_ISOLATION_LEVELS_MSG=Die Isolationsstufen f\u00fcr {0} 1.1-Methoden wurden aus der CMP-Bean {1} entfernt.
-CONVERTED_FINDER_MSG=Der Finderdeskriptor f\u00fcr {0} in der CMP-Bean {1} wurde konvertiert.  Die EJB QL-Abfrage k\u00f6nnen Sie mit dem EJB-Editor aktualisieren.
-UNNAMED_EJB=<Nicht benannte CMP-Bean>
-CONVERTED_QUERY_DESCRIPTION=Konvertiert aus IBM Erweiterung der Version 1.1
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=Das Standarddatenquellenbinding wurde f\u00fcr die EJB-JAR \"{0}\" auf ein Standardbinding f\u00fcr eine CMP-Verbindungsfactory migriert.
-MIGRATED_DEFAULT_DATASOURCE_MSG=Das Standarddatenquellenbinding wurde f\u00fcr die EJB-JAR auf ein Standardbinding f\u00fcr eine CMP-Verbindungsfactory migriert.
-J2EE_VERSION_NULL_ERROR=Die J2EE-Version des Objekts kann nicht ermittelt werden, da es nicht in einem Dokument enthalten ist.
-J2EE_VERSION_PROXY_ERROR=Die J2EE-Version des Referenzobjekts kann nicht ermittelt werden, da der Proxy nicht aufgel\u00f6st werden kann.  Pr\u00fcfen Sie die IDs in den Deploymentdeskriptordateien.  HREF = {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_es.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_es.properties
deleted file mode 100644
index 5455612..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_es.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=Rastreo de pila de excepci\u00f3n anidada:
-ERROR=Error:
-WARNING=Aviso:
-INFO=Informaci\u00f3n:
-DEFAULT_COMPLETED_STATUS_MSG=Se ha completado la migraci\u00f3n para {0}.
-DEFAULT_NOT_NEEDED_STATUS_MSG=No era necesaria la migraci\u00f3n para {0}.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=No era posible la migraci\u00f3n para {0}.
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E Error al migrar {0}.
-REMOVED_LOCAL_CLIENT_MSG=Se ha eliminado vista de cliente local para EJB {0}.
-REMOVED_ACCESS_INTENTS_MSG=Se han eliminado {0} prop\u00f3sitos de acceso al m\u00e9todo 1.1 del bean CMP {1}.
-REMOVED_ISOLATION_LEVELS_MSG=Se han eliminado {0} niveles de aislamiento de m\u00e9todo 1.1 del bean CMP {1}.
-CONVERTED_FINDER_MSG=Se ha convertido el descriptor de buscador para {0} en el bean CMP {1}.  Utilice el editor EJB para actualizar el EJB QL de consulta.
-UNNAMED_EJB=<Bean CMP sin nombre>
-CONVERTED_QUERY_DESCRIPTION=Convertido a partir de extensiones IBM versi\u00f3n 1.1.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=El enlace de origen de datos predeterminado se ha migrado a un enlace de f\u00e1brica de conexiones CMP predeterminado para el JAR EJB \"{0}\".
-MIGRATED_DEFAULT_DATASOURCE_MSG=El enlace de origen de datos predeterminado se ha migrado a un enlace de f\u00e1brica de conexiones CMP predeterminado para el JAR EJB.
-J2EE_VERSION_NULL_ERROR=No se puede obtener la versi\u00f3n de J2EE del objeto ya que este no est\u00e1 en un documento.
-J2EE_VERSION_PROXY_ERROR=No se puede obtener la versi\u00f3n de J2EE del objeto al que se hace referencia ya que el proxy no puede resolverse.  Compruebe los ID en los archivos de descriptor de despliegue.  HREF = {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_fr.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_fr.properties
deleted file mode 100644
index 8c37edc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_fr.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=Trace de pile de l'exception imbriqu\u00e9e :
-ERROR=Erreur :
-WARNING=Avertissement :
-INFO=Information :
-DEFAULT_COMPLETED_STATUS_MSG=Migration termin\u00e9e pour {0}.
-DEFAULT_NOT_NEEDED_STATUS_MSG=Migration non requise pour {0}.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=Migration impossible pour {0}.
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E Erreur lors de la migration de {0}.
-REMOVED_LOCAL_CLIENT_MSG=Vue du client local supprim\u00e9e pour l''EJB {0}.
-REMOVED_ACCESS_INTENTS_MSG=Tentatives d''acc\u00e8s \u00e0 la m\u00e9thode 1.1 {0} supprim\u00e9es du bean CMP {1}.
-REMOVED_ISOLATION_LEVELS_MSG=Niveaux d''isolement \u00e0 la m\u00e9thode 1.1 {0} supprim\u00e9s du bean CMP {1}.
-CONVERTED_FINDER_MSG=Descripteur de m\u00e9thode finder de {0} converti dans le bean CMP {1}.  Utilisez l''\u00e9diteur d''EJB pour mettre \u00e0 jour la requ\u00eate EJB QL.
-UNNAMED_EJB=<bean CMP sans nom>
-CONVERTED_QUERY_DESCRIPTION=Convertie \u00e0 partir des extensions d'IBM version 1.1.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=Liaison de source de donn\u00e9es par d\u00e9faut migr\u00e9e vers une liaison de fabrique de connexions CMP par d\u00e9faut pour EJB JAR \"{0}\".
-MIGRATED_DEFAULT_DATASOURCE_MSG=Liaison de source de donn\u00e9es par d\u00e9faut migr\u00e9e vers une liaison de fabrique de connexions CMP par d\u00e9faut pour EJB JAR.
-J2EE_VERSION_NULL_ERROR=Impossible d'obtenir la version J2EE de l'objet car elle ne figure pas dans un document.
-J2EE_VERSION_PROXY_ERROR=Impossible d''obtenir la version J2EE de l''objet r\u00e9f\u00e9renc\u00e9 car le proxy ne peut pas \u00eatre converti.  V\u00e9rifiez les ID dans les fichiers de descripteur de d\u00e9ploiement.  HREF = {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_it.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_it.properties
deleted file mode 100644
index 8f8144d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_it.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=Traccia nello stack dell'eccezione nidificata:
-ERROR=Errore:
-WARNING=Avviso:
-INFO=Info:
-DEFAULT_COMPLETED_STATUS_MSG=La migrazione di {0} \u00e8 stata completata.
-DEFAULT_NOT_NEEDED_STATUS_MSG=La migrazione di {0} non \u00e8 stata richiesta.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=La migrazione di {0} non \u00e8 stata possibile.
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E Errore durante la migrazione di {0}.
-REMOVED_LOCAL_CLIENT_MSG=Vista client locale per EJB {0} rimossa.
-REMOVED_ACCESS_INTENTS_MSG=Intenti di accesso al metodo {0} 1.1 rimossi dal bean CMP {1}.
-REMOVED_ISOLATION_LEVELS_MSG=Livelli di isolamento del metodo {0} 1.1 rimossi dal bean CMP {1}.
-CONVERTED_FINDER_MSG=Descrittore finder per {0} convertito in bean CMP {1}.  Utilizzare l'editor EJB per l'aggiornamento della query EJB QL.
-UNNAMED_EJB=<Unnamed CMP bean>
-CONVERTED_QUERY_DESCRIPTION=Convertito dalle estensioni della versione 1.1 di IBM.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=Eseguita migrazione della binding di origine dati predefinita verso la binding di un factory di connessione predefinito CMP per JAR EJB \"{0}\".
-MIGRATED_DEFAULT_DATASOURCE_MSG=Eseguita migrazione della binding di origine dati predefinita verso la binding di un factory di connessione predefinito CMP per JAR EJB.
-J2EE_VERSION_NULL_ERROR=Impossibile ottenere la versione J2EE dell'oggetto perch\u00e9 non \u00e8 contenuta in un documento.
-J2EE_VERSION_PROXY_ERROR=Impossibile ottenere la versione J2EE dell'oggetto indicato come riferimento perch\u00e9 non \u00e8 possibile risolvere il proxy.  Verificare gli ID nei file del descrittore di distribuzione.  HREF = {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_ja.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_ja.properties
deleted file mode 100644
index ddd5ffb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_ja.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=\u30cd\u30b9\u30c8\u3055\u308c\u305f\u4f8b\u5916\u306e\u30b9\u30bf\u30c3\u30af\u30fb\u30c8\u30ec\u30fc\u30b9:
-ERROR=\u30a8\u30e9\u30fc:
-WARNING=\u8b66\u544a:
-INFO=\u60c5\u5831:
-DEFAULT_COMPLETED_STATUS_MSG={0} \u306e\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002
-DEFAULT_NOT_NEEDED_STATUS_MSG={0} \u306e\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u306f\u5fc5\u8981\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-DEFAULT_NOT_POSSIBLE_STATUS_MSG={0} \u306e\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u306f\u4e0d\u53ef\u80fd\u3067\u3057\u305f\u3002
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E {0} \u306e\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u4e2d\u306b\u30a8\u30e9\u30fc\u3002
-REMOVED_LOCAL_CLIENT_MSG=EJB {0} \u306e\u30ed\u30fc\u30ab\u30eb\u30fb\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30d3\u30e5\u30fc\u3092\u9664\u53bb\u3057\u307e\u3057\u305f\u3002
-REMOVED_ACCESS_INTENTS_MSG=CMP Bean {1} \u304b\u3089 {0} 1.1 \u30e1\u30bd\u30c3\u30c9\u30fb\u30a2\u30af\u30bb\u30b9\u30fb\u30a4\u30f3\u30c6\u30f3\u30c8\u3092\u9664\u53bb\u3057\u307e\u3057\u305f\u3002
-REMOVED_ISOLATION_LEVELS_MSG=CMP Bean {1} \u304b\u3089 {0} 1.1 \u30e1\u30bd\u30c3\u30c9\u5206\u96e2\u30ec\u30d9\u30eb\u3092\u9664\u53bb\u3057\u307e\u3057\u305f\u3002
-CONVERTED_FINDER_MSG=CMP Bean {1} \u5185 {0} \u306e\u30d5\u30a1\u30a4\u30f3\u30c0\u30fc\u8a18\u8ff0\u5b50\u3092\u5909\u63db\u3057\u307e\u3057\u305f\u3002  EJB \u30a8\u30c7\u30a3\u30bf\u30fc\u3092\u4f7f\u7528\u3057\u3066\u3001\u7167\u4f1a EJB QL \u3092\u66f4\u65b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-UNNAMED_EJB=<\u540d\u524d\u306a\u3057 CMP Bean>
-CONVERTED_QUERY_DESCRIPTION=IBM \u30d0\u30fc\u30b8\u30e7\u30f3 1.1 \u62e1\u5f35\u304b\u3089\u5909\u63db\u3057\u307e\u3057\u305f\u3002
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30c7\u30fc\u30bf\u30fb\u30bd\u30fc\u30b9\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u3001EJB JAR \"{0}\" \u306e\u30c7\u30d5\u30a9\u30eb\u30c8 CMP \u63a5\u7d9a\u30d5\u30a1\u30af\u30c8\u30ea\u30fc\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306b\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u307e\u3057\u305f\u3002
-MIGRATED_DEFAULT_DATASOURCE_MSG=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30c7\u30fc\u30bf\u30fb\u30bd\u30fc\u30b9\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u3092\u3001EJB JAR \u306e\u30c7\u30d5\u30a9\u30eb\u30c8 CMP \u63a5\u7d9a\u30d5\u30a1\u30af\u30c8\u30ea\u30fc\u30fb\u30d0\u30a4\u30f3\u30c7\u30a3\u30f3\u30b0\u306b\u30de\u30a4\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3057\u307e\u3057\u305f\u3002
-J2EE_VERSION_NULL_ERROR=\u6587\u66f8\u306b\u542b\u307e\u308c\u3066\u3044\u306a\u3044\u305f\u3081\u3001\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e J2EE \u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3002
-J2EE_VERSION_PROXY_ERROR=\u30d7\u30ed\u30ad\u30b7\u30fc\u3092\u89e3\u6c7a\u3067\u304d\u306a\u3044\u305f\u3081\u3001\u53c2\u7167\u3055\u308c\u3066\u3044\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e J2EE \u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3002  \u30c7\u30d7\u30ed\u30a4\u30e1\u30f3\u30c8\u8a18\u8ff0\u5b50\u30d5\u30a1\u30a4\u30eb\u5185\u306e ID \u3092\u30c1\u30a7\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044\u3002  HREF = {0}\u3002
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_ko.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_ko.properties
deleted file mode 100644
index 8c6fb4d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_ko.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=\uc911\ucca9\ub41c \uc608\uc678\uc758 \uc2a4\ud0dd \ucd94\uc801:
-ERROR=\uc624\ub958:
-WARNING=\uacbd\uace0:
-INFO=\uc815\ubcf4:
-DEFAULT_COMPLETED_STATUS_MSG={0}\uc5d0 \ub300\ud55c \uc774\uc8fc\uac00 \uc644\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-DEFAULT_NOT_NEEDED_STATUS_MSG={0}\uc5d0 \ub300\ud574 \uc774\uc8fc\uac00 \ud544\uc694\ud558\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG={0}\uc5d0 \ub300\ud574 \uc774\uc8fc\uac00 \ubd88\uac00\ub2a5\ud588\uc2b5\ub2c8\ub2e4.
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E {0} \uc774\uc8fc \uc911 \uc624\ub958 \ubc1c\uc0dd.
-REMOVED_LOCAL_CLIENT_MSG={0} EJB\uc758 \ub85c\uceec \ud074\ub77c\uc774\uc5b8\ud2b8 \ubcf4\uae30\ub97c \uc81c\uac70\ud588\uc2b5\ub2c8\ub2e4.
-REMOVED_ACCESS_INTENTS_MSG={1} CMP Bean\uc5d0\uc11c {0} 1.1 \uba54\uc18c\ub4dc \uc561\uc138\uc2a4 \ubaa9\uc801\uc744 \uc81c\uac70\ud588\uc2b5\ub2c8\ub2e4.
-REMOVED_ISOLATION_LEVELS_MSG={1} CMP Bean\uc5d0\uc11c {0} 1.1 \uba54\uc18c\ub4dc \ubd84\ub9ac \ub808\ubca8\uc744 \uc81c\uac70\ud588\uc2b5\ub2c8\ub2e4.
-CONVERTED_FINDER_MSG={1} CMP Bean\uc5d0\uc11c {0}\uc5d0 \ub300\ud55c \ud30c\uc778\ub354 \uc124\uba85\uc790\ub97c \ubcc0\ud658\ud588\uc2b5\ub2c8\ub2e4.  EJB \ud3b8\uc9d1\uae30\ub97c \uc0ac\uc6a9\ud558\uc5ec \uc870\ud68c EJB QL\uc744 \uac31\uc2e0\ud558\uc2ed\uc2dc\uc624.
-UNNAMED_EJB=<\uc774\ub984 \uc5c6\ub294 CMP Bean>
-CONVERTED_QUERY_DESCRIPTION=IBM \ubc84\uc804 1.1 \ud655\uc7a5\uc5d0\uc11c \ubcc0\ud658\ud588\uc2b5\ub2c8\ub2e4.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=EJB JAR \"{0}\"\uc5d0 \ub300\ud574 \uae30\ubcf8 \ub370\uc774\ud130 \uc18c\uc2a4 \ubc14\uc778\ub529\uc5d0\uc11c \uae30\ubcf8 CMP \uc5f0\uacb0 \ud329\ud1a0\ub9ac \ubc14\uc778\ub529\uc73c\ub85c \uc774\uc8fc\ud588\uc2b5\ub2c8\ub2e4.
-MIGRATED_DEFAULT_DATASOURCE_MSG=EJB JAR\uc5d0 \ub300\ud574 \uae30\ubcf8 \ub370\uc774\ud130 \uc18c\uc2a4 \ubc14\uc778\ub529\uc5d0\uc11c \uae30\ubcf8 CMP \uc5f0\uacb0 \ud329\ud1a0\ub9ac \ubc14\uc778\ub529\uc73c\ub85c \uc774\uc8fc\ud588\uc2b5\ub2c8\ub2e4.
-J2EE_VERSION_NULL_ERROR=\uc624\ube0c\uc81d\ud2b8\uc758 J2EE \ubc84\uc804\uc774 \ubb38\uc11c\uc5d0 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \uac00\uc838\uc62c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-J2EE_VERSION_PROXY_ERROR=\ud504\ub85d\uc2dc\uac00 \ubd84\uc11d\ub420 \uc218 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \ucc38\uc870\ub418\ub294 \uc624\ube0c\uc81d\ud2b8\uc758 J2EE \ubc84\uc804\uc744 \uac00\uc838\uc62c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.  \uc804\uac1c \uc124\uba85\uc790 \ud30c\uc77c\uc5d0 \uc788\ub294 ID\ub97c \ud655\uc778\ud558\uc2ed\uc2dc\uc624.  HREF = {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_pt_BR.properties
deleted file mode 100644
index 51b9324..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_pt_BR.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=Rastreio de pilha da exce\u00e7\u00e3o aninhada:
-ERROR=Erro:
-WARNING=Aviso:
-INFO=Informa\u00e7\u00f5es:
-DEFAULT_COMPLETED_STATUS_MSG=A migra\u00e7\u00e3o foi conclu\u00edda para {0}.
-DEFAULT_NOT_NEEDED_STATUS_MSG=A migra\u00e7\u00e3o n\u00e3o era necess\u00e1ria para {0}.
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=A migra\u00e7\u00e3o n\u00e3o foi poss\u00edvel para {0}.
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E Erro ao migrar {0}.
-REMOVED_LOCAL_CLIENT_MSG=A exibi\u00e7\u00e3o local de cliente foi removida para o EJB {0}.
-REMOVED_ACCESS_INTENTS_MSG=As inten\u00e7\u00f5es de acesso do m\u00e9todo {0} 1.1 foram removidas do bean CMP {1}.
-REMOVED_ISOLATION_LEVELS_MSG=Os n\u00edveis de isolamento do m\u00e9todo {0} 1.1 foram removidos do bean CMP {1}.
-CONVERTED_FINDER_MSG=O descritor do localizador {0} foi convertido no bean CMP {1}.  Utilize o editor EJB para atualizar a consulta EJB QL.
-UNNAMED_EJB=<Bean CMP n\u00e3o nomeado>
-CONVERTED_QUERY_DESCRIPTION=Convertido das extens\u00f5es IBM vers\u00e3o 1.1.
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=A liga\u00e7\u00e3o do Datasource padr\u00e3o foi migrada para uma liga\u00e7\u00e3o de F\u00e1brica de Conex\u00e3o CMP padr\u00e3o para o JAR EJB \"{0}\".
-MIGRATED_DEFAULT_DATASOURCE_MSG=A liga\u00e7\u00e3o do Datasource padr\u00e3o foi migrada para uma liga\u00e7\u00e3o de F\u00e1brica de Conex\u00e3o CMP padr\u00e3o para o JAR EJB.
-J2EE_VERSION_NULL_ERROR=N\u00e3o foi poss\u00edvel obter a vers\u00e3o J2EE do objeto, porque ela n\u00e3o est\u00e1 contida em um documento.
-J2EE_VERSION_PROXY_ERROR=N\u00e3o foi poss\u00edvel obter a vers\u00e3o J2EE do objeto em quest\u00e3o, porque o proxy n\u00e3o pode ser resolvido. Verifique os IDs nos arquivos descritores de implementa\u00e7\u00e3o. HREF = {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_zh.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_zh.properties
deleted file mode 100644
index ceaabd2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_zh.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=\u5d4c\u5957\u5f02\u5e38\u7684\u5806\u6808\u8ddf\u8e2a\uff1a
-ERROR=\u9519\u8bef\uff1a
-WARNING=\u8b66\u544a\uff1a
-INFO=\u4fe1\u606f\uff1a
-DEFAULT_COMPLETED_STATUS_MSG=\u5bf9\u4e8e {0}\uff0c\u8fc1\u79fb\u5df2\u5b8c\u6210\u3002
-DEFAULT_NOT_NEEDED_STATUS_MSG=\u5bf9\u4e8e {0}\uff0c\u4e0d\u9700\u8981\u8fc1\u79fb\u3002
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=\u5bf9\u4e8e {0}\uff0c\u4e0d\u53ef\u80fd\u8fdb\u884c\u8fc1\u79fb\u3002
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E \u8fc1\u79fb {0} \u65f6\u51fa\u9519\u3002
-REMOVED_LOCAL_CLIENT_MSG=\u9664\u53bb\u4e86 EJB {0} \u7684\u672c\u5730\u5ba2\u6237\u673a\u89c6\u56fe\u3002
-REMOVED_ACCESS_INTENTS_MSG=\u5df2\u4ece CMP bean {1} \u4e2d\u9664\u53bb\u4e86 {0} 1.1 \u65b9\u6cd5\u5b58\u53d6\u610f\u5411\u3002
-REMOVED_ISOLATION_LEVELS_MSG=\u5df2\u4ece CMP bean {1} \u4e2d\u9664\u53bb\u4e86 {0} 1.1 \u65b9\u6cd5\u9694\u79bb\u7ea7\u522b\u3002
-CONVERTED_FINDER_MSG=\u5df2\u8f6c\u6362\u4e86 CMP bean {1} \u4e2d {0} \u7684 finder \u63cf\u8ff0\u7b26\u3002\u4f7f\u7528 EJB \u7f16\u8f91\u5668\u6765\u66f4\u65b0\u67e5\u8be2 EJB QL\u3002
-UNNAMED_EJB=<\u672a\u547d\u540d\u7684 CMP bean>
-CONVERTED_QUERY_DESCRIPTION=\u5df2\u4ece IBM V1.1 \u6269\u5c55\u8f6c\u6362\u3002
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=\u5df2\u5c06\u7f3a\u7701\u201c\u6570\u636e\u6e90\u201d\u7ed1\u5b9a\u8fc1\u79fb\u81f3 EJB JAR\u201c{0}\u201d\u7684\u7f3a\u7701\u201cCMP \u8fde\u63a5\u5de5\u5382\u201d\u7ed1\u5b9a\u3002
-MIGRATED_DEFAULT_DATASOURCE_MSG=\u5df2\u5c06\u7f3a\u7701\u201c\u6570\u636e\u6e90\u201d\u7ed1\u5b9a\u8fc1\u79fb\u81f3 EJB JAR \u7684\u7f3a\u7701\u201cCMP \u8fde\u63a5\u5de5\u5382\u201d\u7ed1\u5b9a\u3002
-J2EE_VERSION_NULL_ERROR=\u65e0\u6cd5\u83b7\u53d6\u5bf9\u8c61\u7684 J2EE \u7248\u672c\uff0c\u539f\u56e0\u662f\u5b83\u672a\u5305\u542b\u5728\u6587\u6863\u4e2d\u3002
-J2EE_VERSION_PROXY_ERROR=\u672a\u80fd\u83b7\u53d6\u5f15\u7528\u5bf9\u8c61\u7684 J2EE \u7248\u672c\uff0c\u539f\u56e0\u662f\u4e0d\u80fd\u89e3\u6790\u4ee3\u7406\u3002\u68c0\u67e5\u90e8\u7f72\u63cf\u8ff0\u7b26\u6587\u4ef6\u4e2d\u7684\u6807\u8bc6\u3002HREF = {0}\u3002
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_zh_TW.properties
deleted file mode 100644
index 675b9b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/mofj2ee_zh_TW.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-Stack_trace_of_nested_exce=\u5de2\u72c0\u7570\u5e38\u72c0\u6cc1\u7684\u5806\u758a\u8ffd\u8e64\uff1a
-ERROR=\u932f\u8aa4\uff1a
-WARNING=\u8b66\u544a\uff1a
-INFO=\u8cc7\u8a0a\uff1a
-DEFAULT_COMPLETED_STATUS_MSG={0} \u7684\u79fb\u8f49\u5df2\u5b8c\u6210\u3002
-DEFAULT_NOT_NEEDED_STATUS_MSG={0} \u7684\u79fb\u8f49\u4e0d\u662f\u5fc5\u8981\u7684\u3002
-DEFAULT_NOT_POSSIBLE_STATUS_MSG=\u7121\u6cd5\u9032\u884c {0} \u7684\u79fb\u8f49\u3002
-DEFAULT_ERROR_STATUS_MSG=IWAE0100E \u79fb\u8f49 {0} \u6642\u767c\u751f\u932f\u8aa4\u3002
-REMOVED_LOCAL_CLIENT_MSG=\u5df2\u79fb\u9664 EJB {0} \u7684\u672c\u7aef\u7528\u6236\u7aef\u8996\u5716\u3002
-REMOVED_ACCESS_INTENTS_MSG=\u5df2\u79fb\u9664 CMP Bean {1} \u4e2d\u7684 {0} 1.1 \u65b9\u6cd5\u5b58\u53d6\u76ee\u7684\u3002
-REMOVED_ISOLATION_LEVELS_MSG=\u5df2\u79fb\u9664 CMP Bean {1} \u4e2d\u7684 {0} 1.1 \u65b9\u6cd5\u9694\u96e2\u5c64\u6b21\u3002
-CONVERTED_FINDER_MSG=\u5df2\u8f49\u63db CMP Bean {1} \u4e2d {0} \u7684 finder \u63cf\u8ff0\u5b50\u3002\u8acb\u4f7f\u7528 EJB \u7de8\u8f2f\u5668\u4f86\u66f4\u65b0\u67e5\u8a62 EJB QL\u3002
-UNNAMED_EJB=<\u672a\u547d\u540d\u7684 CMP Bean>
-CONVERTED_QUERY_DESCRIPTION=\u5df2\u81ea IBM \u7b2c 1.1 \u7248\u5ef6\u4f38\u9032\u884c\u8f49\u63db\u3002
-MIGRATED_DEFAULT_DATASOURCE_JAR_MSG=\u5df2\u5c07\u9810\u8a2d\u8cc7\u6599\u4f86\u6e90\u9023\u7d50\u79fb\u8f49\u81f3 EJB JAR \"{0}\" \u7684\u9810\u8a2d CMP Connection Factory \u9023\u7d50\u3002
-MIGRATED_DEFAULT_DATASOURCE_MSG=\u5df2\u5c07\u9810\u8a2d\u8cc7\u6599\u4f86\u6e90\u9023\u7d50\u79fb\u8f49\u81f3 EJB JAR \u7684\u9810\u8a2d CMP Connection Factory \u9023\u7d50\u3002
-J2EE_VERSION_NULL_ERROR=\u7121\u6cd5\u53d6\u5f97\u7269\u4ef6\u7684 J2EE \u7248\u672c\uff0c\u56e0\u70ba\u5b83\u4e26\u672a\u5167\u542b\u65bc\u6587\u4ef6\u4e2d\u3002
-J2EE_VERSION_PROXY_ERROR=\u7121\u6cd5\u53d6\u5f97\u6240\u53c3\u7167\u7269\u4ef6\u7684 J2EE \u7248\u672c\uff0c\u56e0\u70ba\u7121\u6cd5\u89e3\u6790 Proxy\u3002\u8acb\u6aa2\u67e5\u90e8\u7f72\u63cf\u8ff0\u5b50\u6a94\u4e2d\u7684 ID\u3002HREF = {0}\u3002
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 16c7026..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Application.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.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.
-
- */
-public interface Application extends CompatibilityDescriptionGroup{
-
-
-public boolean containsSecurityRole(String name);
-/**
- * Returns 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
- **/
-public Module getModule(String uri);
-/**
- *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
- */
-public int getJ2EEVersionID() throws IllegalStateException ;
-/**
- * This returns the module version id.  Compare with J2EEVersionConstants to determine module level
- */
-public int getVersionID() throws IllegalStateException ;
-
-/**
- * Returns the first module matching the specified uri
- */
-public Module getFirstModule(String uri);
-/**
- * Returns the first module where the alt dd matches the specified uri
- */
-public Module getModuleHavingAltDD(String uri);
-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 -->
-	 * @since 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.internal.application.ApplicationPackage#getApplication_Version()
-	 * @model 
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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 5079e3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationFactory.java
+++ /dev/null
@@ -1,74 +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.application;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-/**
- * @generated
- */
-public interface ApplicationFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.application.impl.ApplicationFactoryImpl();
-
-	/**
-	 * @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();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	ApplicationPackage getApplicationPackage();
-
-}
-
-
-
-
-
-
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 1a8f4da..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ApplicationResource.java
+++ /dev/null
@@ -1,18 +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.application;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-public interface ApplicationResource extends XMLResource {
-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 2ced538..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/ConnectorModule.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.application;
-
-
-/**
- * Specifies the URI of a resource adapter archive file, relative to the top level of the application package.
- */
-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 aedaeaf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/EjbModule.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.application;
-
-
-/**
- * Specifies the URI of a ejb-jar, relative to the top level of the application package.
-
- */
-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 c0a1a84..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/JavaClientModule.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.application;
-
-
-/**
- * specifies the URI of a java application client module, relative to the top level of the application package.
-
- */
-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 8735af6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/Module.java
+++ /dev/null
@@ -1,75 +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.application;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * 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.
-
- */
-public interface Module extends EObject{
-
-public boolean isConnectorModule();
-public boolean isEjbModule();
-public boolean isJavaModule();
-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 l 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 70ee2d7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/application/WebModule.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.application;
-
-
-/**
- * Contains the web-uri and context-root of a web application module.
-
- */
-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/client/ApplicationClient.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClient.java
deleted file mode 100644
index 111bb16..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClient.java
+++ /dev/null
@@ -1,212 +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.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.
-
- */
-public interface ApplicationClient extends CompatibilityDescriptionGroup{
-
-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();
-/**
- * @deprecated Use getVersionID() to determine module level
- * */
-public boolean isVersion1_4Descriptor();
-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 -->
-	 * @since 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.internal.client.ClientPackage#getApplicationClient_Version()
-	 * @model 
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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
-	 */
-	public int getVersionID() throws IllegalStateException ;
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	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 l 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.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.client.ClientPackage#getApplicationClient_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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 -->
-	 * @since 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.internal.client.ClientPackage#getApplicationClient_MessageDestinationRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.client.ClientPackage#getApplicationClient_MessageDestinations()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 85a2488..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ApplicationClientResource.java
+++ /dev/null
@@ -1,19 +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.client;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-public interface ApplicationClientResource extends XMLResource {
-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 a45e282..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ClientFactory.java
+++ /dev/null
@@ -1,43 +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.client;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-/**
- * @generated
- */
-public interface ClientFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ClientFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl();
-
-	/**
-	 * @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.
-	 */
-	ClientPackage getClientPackage();
-
-}
-
-
-
-
-
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 291ae6c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/client/ResAuthApplicationType.java
+++ /dev/null
@@ -1,133 +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.client;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-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"); //$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"); //$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 name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthApplicationType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthApplicationType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Application Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- 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) {
-		super(value, name);
-	}
-
-} //ResAuthApplicationType
-
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 bc4a12d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CommonFactory.java
+++ /dev/null
@@ -1,231 +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.common;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-/**
- * <!-- 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.internal.common.CommonPackage
- * @generated
- */
-public interface CommonFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.common.impl.CommonFactoryImpl();
-
-	/**
-	 * 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 the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- 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/CompatibilityDescriptionGroup.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CompatibilityDescriptionGroup.java
deleted file mode 100644
index 97a4b6d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/CompatibilityDescriptionGroup.java
+++ /dev/null
@@ -1,147 +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.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.internal.common.CompatibilityDescriptionGroup#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.CompatibilityDescriptionGroup#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.CompatibilityDescriptionGroup#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.CompatibilityDescriptionGroup#getDisplayName <em>Display Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getCompatibilityDescriptionGroup_SmallIcon()
-	 * @model 
-	 * @generated
-	 */
-	String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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);
-
-	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.internal.common.CommonPackage#getCompatibilityDescriptionGroup_LargeIcon()
-	 * @model 
-	 * @generated
-	 */
-	String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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);
-
-	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.internal.common.CommonPackage#getCompatibilityDescriptionGroup_Description()
-	 * @model 
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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);
-
-	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.internal.common.CommonPackage#getCompatibilityDescriptionGroup_DisplayName()
-	 * @model 
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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);
-
-	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 506a0da..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DeploymentExtension.java
+++ /dev/null
@@ -1,103 +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.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.internal.common.CommonPackage#getDeploymentExtension()
- * @model 
- * @generated
- */
-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.internal.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.internal.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.internal.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 a03959f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Description.java
+++ /dev/null
@@ -1,101 +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.common;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since 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.internal.common.Description#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.Description#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getDescription()
- * @model 
- * @generated
- */
-public interface Description extends EObject{
-	/**
-	 * 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.internal.common.CommonPackage#getDescription_Lang()
-	 * @model 
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getDescription_Value()
-	 * @model 
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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 e166201..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DescriptionGroup.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.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>Description Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since 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.internal.common.DescriptionGroup#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.DescriptionGroup#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.DescriptionGroup#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getDescriptionGroup()
- * @model 
- * @generated
- */
-public interface DescriptionGroup extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Icons</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getDescriptionGroup_Icons()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getDescriptionGroup_DisplayNames()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getDescriptionGroup_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 adb4b84..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/DisplayName.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.common;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since 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.internal.common.DisplayName#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.DisplayName#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getDisplayName()
- * @model 
- * @generated
- */
-public interface DisplayName extends EObject{
-	/**
-	 * 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.internal.common.CommonPackage#getDisplayName_Lang()
-	 * @model 
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getDisplayName_Value()
-	 * @model 
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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 94f84e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EJBLocalRef.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.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
- */
-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 f78093a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRef.java
+++ /dev/null
@@ -1,196 +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.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-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.
- */
-public interface EjbRef extends EObject{
-
-/**
- * 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.internal.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.internal.common.EjbRefType
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(EjbRefType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getEjbRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 f4ded8a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EjbRefType.java
+++ /dev/null
@@ -1,126 +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.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"); //$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"); //$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 name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EjbRefType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EjbRefType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Ejb Ref Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- 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) {
-		super(value, name);
-	}
-
-} //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 9c41e23..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntry.java
+++ /dev/null
@@ -1,142 +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.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 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.
- */
-public interface EnvEntry extends EObject{
-	/**
-	 * @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.internal.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.internal.common.EnvEntryType
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(EnvEntryType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getEnvEntry_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 989fa2b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/EnvEntryType.java
+++ /dev/null
@@ -1,266 +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.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"); //$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"); //$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"); //$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"); //$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"); //$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"); //$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"); //$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"); //$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"); //$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 name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EnvEntryType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EnvEntryType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Env Entry Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- 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) {
-		super(value, name);
-	}
-
-} //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 9bb7ac9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ExtensibleType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.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.internal.common.CommonPackage#getExtensibleType()
- * @model 
- * @generated
- */
-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.internal.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 d78dbf1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/IconType.java
+++ /dev/null
@@ -1,152 +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.common;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Icon Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since 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.internal.common.IconType#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.IconType#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.IconType#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getIconType()
- * @model 
- * @generated
- */
-public interface IconType extends EObject{
-	/**
-	 * 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.internal.common.CommonPackage#getIconType_SmallIcon()
-	 * @model 
-	 * @generated
-	 */
-	String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getIconType_LargeIcon()
-	 * @model 
-	 * @generated
-	 */
-	String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getIconType_Lang()
-	 * @model 
-	 * @generated
-	 */
-	String getLang();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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 e6ec320..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Identity.java
+++ /dev/null
@@ -1,75 +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.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.
-
- */
-public interface Identity extends EObject{
-	/**
-	 * @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.internal.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.internal.common.CommonPackage#getIdentity_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
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 e8c6873..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/JNDIEnvRefsGroup.java
+++ /dev/null
@@ -1,160 +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.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 -->
- * @since 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.internal.common.JNDIEnvRefsGroup#getEnvironmentProperties <em>Environment Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getJNDIEnvRefsGroup_EnvironmentProperties()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getJNDIEnvRefsGroup_ResourceRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getJNDIEnvRefsGroup_EjbRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getJNDIEnvRefsGroup_ResourceEnvRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getJNDIEnvRefsGroup_EjbLocalRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getJNDIEnvRefsGroup_MessageDestinationRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getJNDIEnvRefsGroup_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 bd5671b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/Listener.java
+++ /dev/null
@@ -1,71 +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.common;
-
-import org.eclipse.jem.java.JavaClass;
-/**
- * Declares a class in the application must be registered as a web application listener bean.
- */
-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 19b484a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestination.java
+++ /dev/null
@@ -1,87 +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.common;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Destination</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since 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.internal.common.MessageDestination#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getMessageDestination_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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 8a80a59..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationRef.java
+++ /dev/null
@@ -1,189 +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.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>Message Destination Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since 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.internal.common.MessageDestinationRef#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.MessageDestinationRef#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.MessageDestinationRef#getUsage <em>Usage</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.MessageDestinationRef#getLink <em>Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.MessageDestinationRef#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getMessageDestinationRef()
- * @model 
- * @generated
- */
-public interface MessageDestinationRef extends EObject{
-	/**
-	 * 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.internal.common.CommonPackage#getMessageDestinationRef_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getMessageDestinationRef_Type()
-	 * @model 
-	 * @generated
-	 */
-	String getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.MessageDestinationUsageType
-	 * @see #setUsage(MessageDestinationUsageType)
-	 * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getMessageDestinationRef_Usage()
-	 * @model 
-	 * @generated
-	 */
-	MessageDestinationUsageType getUsage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getMessageDestinationRef_Link()
-	 * @model 
-	 * @generated
-	 */
-	String getLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getMessageDestinationRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 827e16f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/MessageDestinationUsageType.java
+++ /dev/null
@@ -1,166 +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.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.internal.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"); //$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"); //$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"); //$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 name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MessageDestinationUsageType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MessageDestinationUsageType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Message Destination Usage Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- 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) {
-		super(value, name);
-	}
-
-} //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 a1f4270..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ParamValue.java
+++ /dev/null
@@ -1,145 +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.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>Param Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since 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.internal.common.ParamValue#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.ParamValue#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.ParamValue#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.ParamValue#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getParamValue()
- * @model 
- * @generated
- */
-public interface ParamValue extends EObject{
-	/**
-	 * 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.internal.common.CommonPackage#getParamValue_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getParamValue_Value()
-	 * @model 
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since 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.internal.common.CommonPackage#getParamValue_Description()
-	 * @model 
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.common.CommonPackage#getParamValue_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 d5d6c55..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java
+++ /dev/null
@@ -1,150 +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.common;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- 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.internal.common.QName#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.QName#getLocalPart <em>Local Part</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.QName#getCombinedQName <em>Combined QName</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.QName#getInternalPrefixOrNsURI <em>Internal Prefix Or Ns URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getQName()
- * @model 
- * @generated
- */
-public interface QName extends EObject{
-	/**
-	 * 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.internal.common.CommonPackage#getQName_NamespaceURI()
-	 * @model 
-	 * @generated
-	 */
-	String getNamespaceURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getQName_LocalPart()
-	 * @model 
-	 * @generated
-	 */
-	String getLocalPart();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getQName_CombinedQName()
-	 * @model 
-	 * @generated
-	 */
-	String getCombinedQName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getQName_InternalPrefixOrNsURI()
-	 * @model 
-	 * @generated
-	 */
-	String getInternalPrefixOrNsURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.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 3248a66..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResAuthTypeBase.java
+++ /dev/null
@@ -1,173 +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.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.internal.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"); //$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"); //$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"); //$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 name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthTypeBase get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthTypeBase result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Type Base</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- 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) {
-		super(value, name);
-	}
-
-} //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 8cbee4e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResSharingScopeType.java
+++ /dev/null
@@ -1,126 +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.common;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface ResSharingScopeType {}
- */
-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"); //$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"); //$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 name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResSharingScopeType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResSharingScopeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Sharing Scope Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- 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) {
-		super(value, name);
-	}
-
-} //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 ede34d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceEnvRef.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.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-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>
- */
-public interface ResourceEnvRef extends EObject{
-
-public String getTypeName();
-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 l The new value of the Type reference
-	 */
-	void setType(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getResourceEnvRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.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 cf0cdee..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/ResourceRef.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.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 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>
- */
-public interface ResourceRef extends EObject{
-	/**
-	 * @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.internal.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.internal.common.ResAuthTypeBase
-	 * @see #isSetAuth()
-	 * @see #unsetAuth()
-	 * @see #getAuth()
-	 * @generated
-	 */
-	void setAuth(ResAuthTypeBase value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.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.internal.common.ResSharingScopeType
-	 * @see #isSetResSharingScope()
-	 * @see #unsetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @generated
-	 */
-	void setResSharingScope(ResSharingScopeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.common.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @see #setResSharingScope(ResSharingScopeType)
-	 * @generated
-	 */
-	void unsetResSharingScope();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.common.ResourceRef#getResSharingScope <em>Res Sharing Scope</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Res Sharing Scope</em>' attribute is set.
-	 * @see #unsetResSharingScope()
-	 * @see #getResSharingScope()
-	 * @see #setResSharingScope(ResSharingScopeType)
-	 * @generated
-	 */
-	boolean isSetResSharingScope();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getResourceRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/RunAsSpecifiedIdentity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/RunAsSpecifiedIdentity.java
deleted file mode 100644
index d39ecc4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/RunAsSpecifiedIdentity.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-
-
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It    contains an optional description and a specification of the security identity to be used.
-
- */
-public interface RunAsSpecifiedIdentity extends SecurityIdentity{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Identity reference
-	 * Optional specifies the run-as identity to be used for the execution of the
-	 * methods of an enterprise bean. It contains an optional description, and the
-	 * name of a security role.
-	 */
-	Identity getIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Identity reference
-	 */
-	void setIdentity(Identity value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityIdentity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityIdentity.java
deleted file mode 100644
index 8986020..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityIdentity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It
- * contains an optional description and a specification of the security identity to be used.
-
- */
-public interface SecurityIdentity extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.common.CommonPackage#getSecurityIdentity_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	boolean isRunAsSpecifiedIdentity();
-	
-	boolean isUseCallerIdentity();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRole.java
deleted file mode 100644
index ba050bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRole.java
+++ /dev/null
@@ -1,68 +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.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * A semantic grouping of operations that may be performed by a subject.
- * The security-role element contains the declaration of a security role which is used in the security-constraints placed on the web application.
- */
-public interface SecurityRole extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RoleName attribute
-	 * The role-name element contains the name of a role. This element must contain a
-	 * non-empty string.
-
-	 */
-	String getRoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RoleName attribute
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getSecurityRole_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRoleRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRoleRef.java
deleted file mode 100644
index 10b7e1f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/SecurityRoleRef.java
+++ /dev/null
@@ -1,86 +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.common;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @generated
- */
-public interface SecurityRoleRef extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Link attribute
-	 * The role-link element is used to link a security role reference to a defined
-	 * security role. The role-link element must contain the name of one of the
-	 * security roles defined in the security-role elements.
-	 */
-	String getLink();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Link attribute
-	 */
-	void setLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.common.CommonPackage#getSecurityRoleRef_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/UseCallerIdentity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/UseCallerIdentity.java
deleted file mode 100644
index 7e02824..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/UseCallerIdentity.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.common;
-
-
-
-/**
- * The use-caller-identity element specifies that the caller's security identity be used as the security identity for the execution of the enterprise bean's methods.
-
- */
-public interface UseCallerIdentity extends SecurityIdentity{
-	//UseCallerIdentity
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AcknowledgeMode.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AcknowledgeMode.java
deleted file mode 100644
index a7bee7f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AcknowledgeMode.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.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface AcknowledgeMode {}
- */
-public final class AcknowledgeMode extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int AUTO_ACKNOWLEDGE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int DUPS_OK_ACKNOWLEDGE= 1;
-
-	/**
-	 * The '<em><b>Auto Acknowledge</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Auto Acknowledge</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AUTO_ACKNOWLEDGE
-	 * @ordered
-	 */
-	public static final AcknowledgeMode AUTO_ACKNOWLEDGE_LITERAL = new AcknowledgeMode(AUTO_ACKNOWLEDGE, "Auto-acknowledge"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Dups Ok Acknowledge</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Dups Ok Acknowledge</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DUPS_OK_ACKNOWLEDGE
-	 *TODO: generate correctly
-	 * @ordered
-	 */
-	public static final AcknowledgeMode DUPS_OK_ACKNOWLEDGE_LITERAL = new AcknowledgeMode(DUPS_OK_ACKNOWLEDGE, "Dups-ok-acknowledge"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Acknowledge Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AcknowledgeMode[] VALUES_ARRAY =
-		new AcknowledgeMode[] {
-			AUTO_ACKNOWLEDGE_LITERAL,
-			DUPS_OK_ACKNOWLEDGE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Acknowledge Mode</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Acknowledge Mode</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AcknowledgeMode get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AcknowledgeMode result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Acknowledge Mode</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AcknowledgeMode get(int value) {
-		switch (value) {
-			case AUTO_ACKNOWLEDGE: return AUTO_ACKNOWLEDGE_LITERAL;
-			case DUPS_OK_ACKNOWLEDGE: return DUPS_OK_ACKNOWLEDGE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AcknowledgeMode(int value, String name) {
-		super(value, name);
-	}
-
-} //AcknowledgeMode
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfig.java
deleted file mode 100644
index 769c44a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfig.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The activation-configType defines information about the
- * expected configuration properties of the message-driven bean
- * in its operational environment. This may include information
- * about message acknowledgement, message selector, expected
- * destination type, etc.
- * 
- * The configuration information is expressed in terms of
- * name/value configuration properties.
- * 
- * The properties that are recognized for a particular
- * message-driven bean are determined by the messaging type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfig#getConfigProperties <em>Config Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfig#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getActivationConfig()
- * @model 
- * @generated
- */
-public interface ActivationConfig extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getActivationConfig_ConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty" containment="true" required="true"
-	 * @generated
-	 */
-	EList getConfigProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.ejb.EjbPackage#getActivationConfig_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-} // ActivationConfig
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfigProperty.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfigProperty.java
deleted file mode 100644
index b88f7b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ActivationConfigProperty.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Config Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The activation-config-propertyType contains a name/value
- * configuration property pair for a message-driven bean.
- * 
- * The properties that are recognized for a particular
- * message-driven bean are determined by the messaging type.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getActivationConfigProperty()
- * @model 
- * @generated
- */
-public interface ActivationConfigProperty 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 -->
-	 * <!-- begin-model-doc -->
-	 * The activation-config-property-value element
-	 *         contains the value for an activation configuration
-	 *         property of a message-driven bean.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getActivationConfigProperty_Value()
-	 * @model 
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The activation-config-property-name element contains
-	 *         the name for an activation configuration property of
-	 *         a message-driven bean.
-	 * 
-	 *         For JMS message-driven beans, the following property
-	 *         names are recognized: acknowledgeMode,
-	 *         messageSelector, destinationType, subscriptionDurability
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getActivationConfigProperty_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // ActivationConfigProperty
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AssemblyDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AssemblyDescriptor.java
deleted file mode 100644
index 5b45cb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/AssemblyDescriptor.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.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-
-/**
- * The assembly-descriptor element contains application-assembly information.  The application-assembly information consists of the following parts: the definition of security roles, the definition of method permissions, and the definition of transaction attributes for enterprise beans with container-managed transaction demarcation. All the parts are optional in the sense that they are omitted if the lists represented by them are empty. Providing an assembly-descriptor in the deployment descriptor is optional for the ejb-jar file producer.
- */
-public interface AssemblyDescriptor extends EObject{
-
-/**
- * Return the first method permission that contains all the roles in securityRoles and
- * is the same size
- */
-MethodPermission getMethodPermission(List securityRoles);
-/**
- * Return a List of MethodElements for @anEJB going
- * through the MethodPermissions.
- */
-List getMethodPermissionMethodElements(EnterpriseBean anEJB) ;
-/**
- * Return a List of MethodElements for @anEJB going
- * through the MethodTransactions.
- */
-List getMethodTransactionMethodElements(EnterpriseBean anEJB) ;
-	public SecurityRole getSecurityRoleNamed(String roleName);
-
-/**
- * Rename the security role, if it exists
- */
-public void renameSecurityRole(String existingRoleName, String newRoleName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodPermissions references
-	 */
-	EList getMethodPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodTransactions references
-	 * Specifies how the container must manage transaction scopes for the enterprise
-	 * bean's method invocations.  The element consists of an optional description, a
-	 * list of method elements, and a transaction attribute.The transaction attribute
-	 * is to be applied to all the specified methods.
-	 */
-	EList getMethodTransactions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbJar reference
-	 */
-	EJBJar getEjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EjbJar reference
-	 */
-	void setEjbJar(EJBJar value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoles references
-	 */
-	EList getSecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ExcludeList reference
-	 */
-	ExcludeList getExcludeList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ExcludeList reference
-	 */
-	void setExcludeList(ExcludeList value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getAssemblyDescriptor_MessageDestinations()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.MessageDestination" containment="true"
-	 * @generated
-	 */
-	EList getMessageDestinations();
-
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 */
-	void removeData(EnterpriseBean anEJB) ;
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMPAttribute.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMPAttribute.java
deleted file mode 100644
index 6e35300..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMPAttribute.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-/**
- * Describes a container-managed field. The field element includes an optional description of the field, and the name of the field.
-
- */
-public interface CMPAttribute extends EAttribute{
-
-/**
- * @deprecated - With EJB 2.0, assuming a Java field is no longer safe.
- * 		Use getType() and getName() to get the most common field info.
- *		Or use getEjbClass() to get additional Java info.
- */
-
-Field getField() ;
-String getGetterName();
-/**
- * Return the type of this attribute in its original form (i.e., unwrapped if
- * the type has been wrapped).
- */
-public JavaHelpers getOriginatingType() ;
-String getSetterName();
-JavaHelpers getType() ;
-boolean isCMRField() ;
-boolean isKey() ;
-/**
- * Returns true if this field is a primkey-field in the deployment descriptor.
- * @return
- */
-public boolean isPrimKeyField();
-public void setOriginatingType(JavaHelpers newOriginatingType) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the cmr field.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getCMPAttribute_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	 * Return true if a targetAttribute exists.
-	 */
-	boolean isDerived();
-	
-	void setDerived(boolean aBoolean);
-	
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMRField.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMRField.java
deleted file mode 100644
index baf5ed1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CMRField.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jem.java.JavaClass;
-/**
- * Describes the bean provider's view of a relationship. It consists of an optional description, and the name and the class type of a field in the source of a role of a relationship. The CMRField::name element corresponds to the name used for the get and set accessor methods for the relationship. The CMRField::type element is used only for collection-valued CMRFields. It specifies the type of the collection that is used (a java class name).
- * 
-
- */
-public interface CMRField extends CMPAttribute{
-
-  public  String getCollectionTypeName();  
-public void setCollectionTypeName(String typeName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Role reference
-	 */
-	EJBRelationshipRole getRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Role reference
-	 */
-	void setRole(EJBRelationshipRole value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The CollectionType reference
-	 */
-	JavaClass getCollectionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the CollectionType reference
-	 */
-	void setCollectionType(JavaClass value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationship.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationship.java
deleted file mode 100644
index 3cee916..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationship.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Insert the type's description here.
- * Creation date: (10/26/2001 9:24:27 AM)
- * @author: Administrator
- */
-public interface CommonRelationship extends EObject {
-public EList getCommonRoles();
-public CommonRelationshipRole getFirstCommonRole();
-public CommonRelationshipRole getSecondCommonRole();
-public String getName();
-public void setName(String value);
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationshipRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationshipRole.java
deleted file mode 100644
index 498b0f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/CommonRelationshipRole.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.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Insert the type's description here.
- * Creation date: (10/26/2001 9:24:27 AM)
- * @author: Administrator
- */
-public interface CommonRelationshipRole extends EObject {
-/**
- * Return the persistentAttributes from my Entity that are used
- * by this role.
- */
-
-public EList getAttributes();
-/**
- * Return our parent relationship as a CommonRelationship
- */
-
-public CommonRelationship getCommonRelationship();
-
-
-/**
- * @return The value of the Name attribute
- * Defines a name for a role that is unique within an ejb-relation. Different relationships can use the same name for a role.
-
-	 */
-	public String getName();
-/**
- * Return the actual name of this role.  This is the name defined in the Deployment
- * Descriptor.  You should use <code>getName()</code> for the name to use in code
- * generation.
- */
-String getRoleName();
-/**
- * Return the other role.
- */
-
-CommonRelationshipRole getOppositeAsCommonRole() ;
-/**
- * @return The Source ejb
- * Compute the ContainerManagedEntity which is the source of a role that participates in a relationship. 
- */
-public ContainerManagedEntity getSourceEntity();
-
-/**
- * @return The type ejb
- * Compute the ContainerManagedEntity which is the type of a role that participates in a relationship. 
- */
-public ContainerManagedEntity getTypeEntity();
-/**
-* @return The computed value of the isForward attribute
-* Specifies whether this role should be mapped to a persistent reference, such as a foreign key.
-*/
-public boolean isForward();
-/**
-* @return The computed value isKey
-*/
-public boolean isKey();
-
-/**
- * This method should be used as a hint about the key status of the role.
- */
-public void setKey(boolean aBoolean) ;
-/**
-* @return The computed value isMany
-* Returns whether the upper limit of our multiplicity is > 1
-*/
-public boolean isMany();
-
-/**
-* 
-* sets the upper limit of our multiplicity
-*/
-public void setUpper(int upperBound);
-
-/**
-* 
-* sets the lower limit of our multiplicity
-*/
-public void setLower(int lowerBound);
-
-/**
-* @return The computed value of the isNavigable attribute
-* Specifies that accessors should be generated for this relationship role.
-*/
-public boolean isNavigable();
-public String getTargetAttributeName(CMPAttribute roleAttribute);
-
-void reconcileAttributes();
-	/**
-	 * Method isRequired.
-	 * @return boolean
-	 */
-	boolean isRequired();
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ContainerManagedEntity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ContainerManagedEntity.java
deleted file mode 100644
index f91faa2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ContainerManagedEntity.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-
-/**
- * @generated
- */
-public interface ContainerManagedEntity extends Entity{
-
-	String VERSION_1_X = "1.x"; //$NON-NLS-1$
-	String VERSION_2_X = "2.x"; //$NON-NLS-1$
-	String WAS_GENERATED_STRING_KEY = "com.ibm.ws.ejbpersistence.dataaccess.GeneratedStringPK"; //$NON-NLS-1$
-	String WAS_GENERATED_STRING_FIELD = "wasGenUnknownkeyValue"; //$NON-NLS-1$
-	String UNKNOWN_PRIMARY_KEY = "java.lang.Object"; //$NON-NLS-1$
-	String JAVA_LANG_STRING = "java.lang.String"; //$NON-NLS-1$
-	int DERIVED_FLAG_CHANGE = 301;
-public CMPAttribute addKeyAttributeName(String aName);
-
-public abstract CMPAttribute addPersistentAttribute(Field aField) ;
-public abstract CMPAttribute addPersistentAttributeName(String aName) ;
-/**
- * Return the keyAttribute with aName.
- * Creation date: (8/8/2000 9:25:27 PM)
- * @return EStructuralFeature
- * @param aName java.lang.String
- */
-CMPAttribute getKeyAttribute(String aName) ;
-/**
- * Return the persistentAttribute with aName.
- * Creation date: (8/8/2000 9:25:27 PM)
- * @return EStructuralFeature
- * @param aName java.lang.String
- */
-CMPAttribute getPersistentAttribute(String aName) ;
-/**
- * If a primary key exists, return the persistent attribute; the primary key is defined as one and only one
- * key attribute, whose type is the same as the key class
- * @deprecated - Use getPrimKeyField()
- */
-CMPAttribute getPrimaryKeyAttribute();
-
-public boolean isContainerManagedEntity();
-public boolean isVersion1_X();
-public boolean isVersion2_X();
-public boolean isKeyAttribute(CMPAttribute anAttribute);
-/*
- * Return whether this bean represents an instance of the "unknown primary key" case
- * described in the specification.  This is identified by the primary key class
- * being specified as "java.lang.Object".
- * In order to deploy an unknown primary key bean, we must substitute a real key,
- * and add a corresponding field.
- */
-public boolean isUnknownPrimaryKey();
-public String[] listPersistentFieldNames();
-
-CMPAttribute removePersistentAttribute(Field aField) ;
-/**
- * Remove the persistentAttribute named aName.
- * Creation date: (8/2/2000 8:59:32 PM)
- * @param aName java.lang.String
- */
-CMPAttribute removePersistentAttribute(String aName) ;
-/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Version attribute
-	 * Specifies the version of an entity bean with container-managed persistence.
-	 * 
-	 * @invariant The cmp-version element must be one of the two following: 1.x , 2.x
-	 * @default 2.x
-
-	 */
-	String getVersion();
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getCMPVersionID() throws IllegalStateException ;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Version attribute
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AbstractSchemaName attribute
-	 * The abstract-schema-name element specifies the name of the abstract schema type 
-	 * of an entity bean with cmp-version 2.x. It is used in EJB QL queries.
-	 * 
-	 * For example, the abstract-schema-name for an entity bean whose local interface
-	 * is com.acme.commerce.Order might be Order.
-	 * 
-
-	 */
-	String getAbstractSchemaName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the AbstractSchemaName attribute
-	 */
-	void setAbstractSchemaName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of PersistentAttributes references
-	 */
-	EList getPersistentAttributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of KeyAttributes references
-	 */
-	EList getKeyAttributes();
-
-	/**
-	 * Returns the value of the '<em><b>Queries</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.ejb.Query}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.jst.j2ee.internal.ejb.Query#getEntity <em>Entity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Queries</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4 moved from CME
-	 * The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.
-	 * 
-	 * @invariant see description
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Queries</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getContainerManagedEntity_Queries()
-	 * @see org.eclipse.jst.j2ee.internal.ejb.Query#getEntity
-	 * @model type="org.eclipse.jst.j2ee.internal.ejb.Query" opposite="entity" containment="true"
-	 * @generated
-	 */
-	EList getQueries();
-
-	/**
-	 * Returns the value of the '<em><b>CMP Attribute</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.ejb.CMPAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>CMP Attribute</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>CMP Attribute</em>' reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getContainerManagedEntity_CMPAttribute()
-	 * @model type="org.eclipse.jst.j2ee.internal.ejb.CMPAttribute"
-	 * @generated
-	 */
-	EList getCMPAttribute();
-
-	/**
-	 * Returns the value of the '<em><b>Prim Key Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Prim Key Field</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Prim Key Field</em>' reference.
-	 * @see #setPrimKeyField(CMPAttribute)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getContainerManagedEntity_PrimKeyField()
-	 * @model 
-	 * @generated
-	 */
-	CMPAttribute getPrimKeyField();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getPrimKeyField <em>Prim Key Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prim Key Field</em>' reference.
-	 * @see #getPrimKeyField()
-	 * @generated
-	 */
-	void setPrimKeyField(CMPAttribute value);
-
-	/**
-	 * Return a List of all the available Query methods for the Home and Local Home interfaces.
-	 */
-	List getAvailableFindQueryMethods() ;
-	/**
-	 * Return a List of all the available Query methods for the Bean class.
-	 */
-	List getAvailableSelectQueryMethods();
-	/**
-	 * Return a List, sorted by signature, of all the available Query methods 
-	 * on the remote Home, local Home, or ejbSelect methods on the bean class
-	 */
-	List getAllAvailableQueryMethods();
-	public List getFilteredFeatures(EJBExtensionFilter aFilter);
-	public void makePrimKeyFieldProxy();
-	/**
-	 * @return The list of all CMR fields for this bean.
-	 */
-	public List getCMRFields();
-	/**
-	 * @return The list of all roles where this bean is the source.
-	 * @link CommonRelationshipRole
-	 */
-	public List getRoles();
-
-	/**
-	 * Return a specific CommonRelationshipRole which has a named role
-	 * that is equal to <code>roleName</code>.
-	 * @see CommonRelationshipRole
-	 */
-	public CommonRelationshipRole getRole(String roleName);
-	
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/DestinationType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/DestinationType.java
deleted file mode 100644
index a017f85..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/DestinationType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface DestinationType {}
- */
-public final class DestinationType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int QUEUE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int TOPIC= 1;
-
-	/**
-	 * The '<em><b>Queue</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Queue</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #QUEUE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DestinationType QUEUE_LITERAL = new DestinationType(QUEUE, "Queue"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Topic</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Topic</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TOPIC
-	 * @generated
-	 * @ordered
-	 */
-	public static final DestinationType TOPIC_LITERAL = new DestinationType(TOPIC, "Topic"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Destination Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final DestinationType[] VALUES_ARRAY =
-		new DestinationType[] {
-			QUEUE_LITERAL,
-			TOPIC_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Destination Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Destination Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DestinationType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DestinationType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Destination Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DestinationType get(int value) {
-		switch (value) {
-			case QUEUE: return QUEUE_LITERAL;
-			case TOPIC: return TOPIC_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private DestinationType(int value, String name) {
-		super(value, name);
-	}
-
-} //DestinationType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBExtensionFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBExtensionFilter.java
deleted file mode 100644
index abec447..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBExtensionFilter.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.ejb;
-
-import java.util.List;
-
-/**
- * Insert the type's description here.
- * Creation date: (11/28/2000 5:31:53 PM)
- * @author: Administrator
- */
-public interface EJBExtensionFilter {
-List filter(EnterpriseBean ejb) ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBJar.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBJar.java
deleted file mode 100644
index 03784ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBJar.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.EjbRef;
-
-/**
- * The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file
- * name; mandatory structural information about all included enterprise beans; a descriptor for container managed relationships, if any; an optional application-assembly descriptor; and an optional name of an ejb-client-jar file for the ejb-jar.
- */
-public interface EJBJar extends CompatibilityDescriptionGroup{
-
-/**
- * Return true if there are any ContainerManagedEntity beans in this jar.
- */
-boolean containsContainerManagedBeans() ;
-public boolean containsSecurityRole(String name);
-/**
- * Return List of BeanManaged beans in this jar.
- * @return java.util.List
- */
-List getBeanManagedBeans() ;
-/**
- * Return List of ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-List getContainerManagedBeans() ;
-/**
- * Return List of EJB 1.1 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-List getEJB11ContainerManagedBeans() ;
-/**
- * Return List of EJB 2.0 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-List getEJB20ContainerManagedBeans() ;
-/**
- * Return List of MessageDriven beans in this jar.
- * @return java.util.List
- */
-List getMessageDrivenBeans() ;
-	/**
-	 * @return The list of EjbRelations references
-	 * A list of ejb-relation elements, which specify the container managed relationships.
-	 */
-	public List getEjbRelations();
-/**
- * Return an enterprise bean referenced by the EjbRef, if one exists.  The ejb-link value
- * of the ref must equate to a named enterprise bean contained in the jar; otherwise return
- * null
- */
-public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref);
-	public EnterpriseBean getEnterpriseBeanNamed(String ejbName);
-/**
- * Return ALL EnterpriseBean(s) that are referencing @aJavaClass as a
- * home, remote, bean class, or key class.
- */
-List getEnterpriseBeansWithReference(JavaClass aJavaClass) ;
-/**
- * Return the *FIRST* EnterpriseBean that is referencing @aJavaClass as its
- * home, remote, bean class, or key class.
- */
-EnterpriseBean getEnterpriseBeanWithReference(JavaClass aJavaClass) ;
-/**
- * Return List of Session beans in this jar.
- * @return java.util.List
- */
-List getSessionBeans() ;
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 1.1 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-boolean isVersion1_1Descriptor() ;
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 2.0 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-boolean isVersion2_0Descriptor() ;
-/**
- * Rename the security role contained in the assembly descriptor; for each enterprise bean, fix the role-link on any contained role
- * refs
- */
-public void renameSecurityRole(String existingRoleName, String newRoleName);
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the EjbClientJar attribute
-	 * The optional ejb-client-jar element specifies a JAR file that contains the
-	 * class files necessary for a client program to access the enterprise beans in
-	 * the ejb-jar file. The Deployer should make the ejb-client JAR file accessible
-	 * to the client's class-loader. 
-	 * Example:<ejb-client-jar>employee_service_client.jar<//ejb-client-jar>
-
-	 */
-	String getEjbClientJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the EjbClientJar attribute
-	 */
-	void setEjbClientJar(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * The version specifies the version of the
-	 *     EJB specification that the instance document must
-	 *     comply with. This information enables deployment tools
-	 *     to validate a particular EJB Deployment
-	 *     Descriptor with respect to a specific version of the EJB
-	 *     schema.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getEJBJar_Version()
-	 * @model 
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	 * This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	 */
-	public int getVersionID() throws IllegalStateException ;
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.EJBJar#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AssemblyDescriptor reference
-	 */
-	AssemblyDescriptor getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the AssemblyDescriptor reference
-	 */
-	void setAssemblyDescriptor(AssemblyDescriptor value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of EnterpriseBeans references
-	 * The enterprise-beans element contains the declarations of one or more
-	 * enterprise beans.
-	 */
-	EList getEnterpriseBeans();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RelationshipList reference
-	 * The relationships collection describes the relationships in which container
-	 * managed persistence entity beans and dependent objects participate. The
-	 * relationships element contains an optional description; a list of
-	 * ejb-entity-ref elements (references to entity beans that participate in
-	 * container managed relationships but whose abstract persistence schemas are not
-	 * included in the ejb-jar file);
-	 * and a list of ejb-relation elements, which specify the container managed
-	 * relationships.
-	 */
-	Relationships getRelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the RelationshipList reference
-	 */
-	void setRelationshipList(Relationships value);
-
-	/**
-	 * Return the EJBRelationshipRole with the same name as <code>aRoleName</code>
-	 * that has <code>sourceCMP</code> as its source bean.
-	 */
-	EJBRelationshipRole getRelationshipRole(String aRoleName, ContainerManagedEntity sourceCMP) ;
-	
-	/**
-	 * Return the first EJBRelation with the same name as <code>aRelationName</code>.
-	 */
-	EJBRelation getEJBRelation(String aRelationName) ;
-	
-	/**
-	 * Return all EJBRelation objects that have an EJBRelationshipRole with a
-	 * source EJB of <code>cmp</code>.
-	 */
-	List getEJBRelationsForSource(ContainerManagedEntity cmp);
-	
-	/**
-	 * Return all EJBRelationshipRole objects that have an EJBRelationshipRole with a
-	 * type EJB of <code>cmp</code>.
-	 */
-	List getEJBRelationshipRolesForType(ContainerManagedEntity cmp) ;
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBMethodCategory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBMethodCategory.java
deleted file mode 100644
index 11ce7d0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBMethodCategory.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.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD, EJBFINDERMETHOD, EJBREMOTEMETHOD.
- */
-public interface EJBMethodCategory extends EObject{
-	//EJBMethodCategory
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelation.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelation.java
deleted file mode 100644
index c4477eb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelation.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * The ejb-relation element describes a relationship between two entity beans with container managed persistence. An ejb-relation element contains a description; an optional ejb-relation-name element; and exactly two relationship role declarations, defined by the ejb-relationship-roles. The name of the relationship, if specified, is unique within the ejb-jar file.
- * 
- * @invariant The name of the relationship, if specified, is unique within the ejb-jar file.
- * @invariant self.relationshipRoles.size == 2
- * @invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name
- * 
- * @migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under ejbext::EJBJarExtension
- * @migration EJB1.1 added optional attribute, description:String
- * @migration EJB1.1 added optional attribute, name:String (May have been inherited from EObject previously)
- */
-public interface EJBRelation extends EObject,CommonRelationship{
-
-boolean containsRelationshipRole(EJBRelationshipRole aRole) ;
-EJBRelationshipRole getFirstRole() ;
-/**
- * Return the other role.
- */
-
-EJBRelationshipRole getOppositeRole(EJBRelationshipRole aRole) ;
-EJBRelationshipRole getSecondRole() ;
-/**
- * Set the forward role.
- */
-
-void setFoward(EJBRelationshipRole aRole) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the ejb relation.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The name of the relationship. If specified, must be unique within the ejb-jar
-	 * file.
-	 * @invariant self.name unique within Set<collect(ejbJar.ejbRelations.name)>
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RelationshipList reference
-	 */
-	Relationships getRelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the RelationshipList reference
-	 */
-	void setRelationshipList(Relationships value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of RelationshipRoles references
-	 * A collection containing exactly two relationship roles.
-	 * 
-	 * @migration EJB1.1 Containment used to be by reference on relation--now by value.
-
-	 */
-	EList getRelationshipRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getEJBRelation_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	 * Return the EJBRelationshipRole with the same name as <code>aRoleName</code>.
-	 */
-	EJBRelationshipRole getRelationshipRole(String aRoleName) ;
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelationshipRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelationshipRole.java
deleted file mode 100644
index edc59a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBRelationshipRole.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * The ejb-relationship-role element describes a role within a relationship.
- * There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is "not aware" of the relationship.
- * 
- * @invariant multiplicity != null
- * @invariant roleSource != null
- * @invariant Cascade delete can only be specified in an EJBRelationshipRole element in which the roleSource element specifies a dependent object class. 
- * @invariant Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.
- * 
- * Example:
- * <ejb-relation>
- *   <ejb-relation-name>Product-LineItem<//ejb-relation-name>
- *   <ejb-relationship-role>
- *     <ejb-relationship-role-name>product-has-lineitems<//ejb-relationship-role-name>
- *     <multiplicity>One<//multiplicity>
- *     <relationship-role-source>
- *       <ejb-name>ProductEJB<//ejb-name>
- *     <//relationship-role-source>
- *   <//ejb-relationship-role>
- * ...
- */
-public interface EJBRelationshipRole extends EObject,CommonRelationshipRole{
-
-/**
- * @return The logical name which can be used for naming this role.
- * Required to be unique within a JAR.
- * If a cmr-field is defined, then a name in the form %source-ejb-name%_%cmr-field-name% is computed.
- * Otherwise a default ID is generated.
- */
-public String getLogicalName();
-/**
- * Return the other role.
- */
-
-EJBRelationshipRole getOpposite() ;
-/**
- * @return java.lang.String the unique name for this role
- * */
-public java.lang.String getName();
-/**
- * @return The Source ejb
- * Compute the ContainerManagedEntity which is the source of a role that participates in a relationship. 
- */
-public ContainerManagedEntity getSourceEntity();
-/**
-* @return The computed value of the isForward attribute
-* Specifies whether this role should be mapped to a persistent reference, such as a foreign key.
-*/
-public boolean isForward();
-/**
-* @return The computed value isMany
-* Returns whether the upper limit of our multiplicity is > 1
-*/
-public boolean isMany();
-/**
-* @return The computed value of the isNavigable attribute
-* Specifies that accessors should be generated for this relationship role.
-*/
-public boolean isNavigable();
-/**
- * Set this role to be the forward role.
- */
-
-void setFoward() ;
-
-public void setName(java.lang.String uniqueName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the ejb relationship role.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RoleName attribute
-	 * Defines a name for a role that is unique within an ejb-relation. Different
-	 * relationships can use the same name for a role.
-
-	 */
-	String getRoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RoleName attribute
-	 */
-	void setRoleName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Multiplicity</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.internal.ejb.MultiplicityKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multiplicity</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the multiplicity of the role that participates in a relation.
-	 * 
-	 * The multiplicity element must be one of the two following:
-	 *      One
-	 *      Many
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Multiplicity</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MultiplicityKind
-	 * @see #isSetMultiplicity()
-	 * @see #unsetMultiplicity()
-	 * @see #setMultiplicity(MultiplicityKind)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getEJBRelationshipRole_Multiplicity()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	MultiplicityKind getMultiplicity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multiplicity</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MultiplicityKind
-	 * @see #isSetMultiplicity()
-	 * @see #unsetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @generated
-	 */
-	void setMultiplicity(MultiplicityKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @see #setMultiplicity(MultiplicityKind)
-	 * @generated
-	 */
-	void unsetMultiplicity();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.EJBRelationshipRole#getMultiplicity <em>Multiplicity</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Multiplicity</em>' attribute is set.
-	 * @see #unsetMultiplicity()
-	 * @see #getMultiplicity()
-	 * @see #setMultiplicity(MultiplicityKind)
-	 * @generated
-	 */
-	boolean isSetMultiplicity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the CascadeDelete attribute
-	 * Specifies that, within a particular relationship, the lifetime of one or more
-	 * entity beans is dependent upon the lifetime of another entity bean. The
-	 * cascade-delete element can Cascade delete can only be specified for an
-	 * EJBRelationshipRole contained in an EJBrelation in which the other
-	 * EJBRelationshipRole element specifies a multiplicity of One.
-	 * 
-	 * 
-
-	 */
-	boolean isCascadeDelete();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CascadeDelete attribute
-	 */
-	void setCascadeDelete(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.EJBRelationshipRole#isCascadeDelete <em>Cascade Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetCascadeDelete()
-	 * @see #isCascadeDelete()
-	 * @see #setCascadeDelete(boolean)
-	 * @generated
-	 */
-  void unsetCascadeDelete();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.EJBRelationshipRole#isCascadeDelete <em>Cascade Delete</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Cascade Delete</em>' attribute is set.
-	 * @see #unsetCascadeDelete()
-	 * @see #isCascadeDelete()
-	 * @see #setCascadeDelete(boolean)
-	 * @generated
-	 */
-  boolean isSetCascadeDelete();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Relationship reference
-	 */
-	EJBRelation getRelationship();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Relationship reference
-	 */
-	void setRelationship(EJBRelation value);
-
-	void setRequired(Boolean isRequired);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Source reference
-	 * Designates the source of a role that participates in a relationship. A
-	 * relationship-role-source element uniquely identifies an entity bean.
-	 * @migration EJB1.1: was ibmejbext::EjbRelationshipRole::sourceEJBName, but that
-	 * may not be sufficient, as this can now refer to dependent class names or ejb
-	 * refs
-	 */
-	RoleSource getSource();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Source reference
-	 */
-	void setSource(RoleSource value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The CmrField reference
-	 * A declaration of the CMRField, if any, by means of which the other side of the
-	 * relationship is accessed from the perspective of the role source
-	 * 
-	 * @migration EJB1.1: Used to be handled via ibmejbext::EjbRole::attributes list
-	 */
-	CMRField getCmrField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the CmrField reference
-	 */
-	void setCmrField(CMRField value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getEJBRelationshipRole_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	 * Return whether this role is part of the key of the source EJB.
-	 */
-	boolean isKey();
-	
-	/**
-	 * This allows you to set the Role as being key so it will
-	 * not traverse it attributes to determine if it is key.
-	 */
-	void setKey(boolean aBoolean) ;
-	
-	void reconcileAttributes() ;
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBResource.java
deleted file mode 100644
index a3fa790..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EJBResource.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
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- * @author schacher
- */
-public interface EJBResource extends XMLResource {
-	EJBJar getEJBJar();
-	/**
-	 * Return true if this Resource supports the EJB 1.1 spec.
-	 */
-	boolean isEJB1_1();
-	/**
-	 * Return true if this Resource supports the EJB 2.0 spec.
-	 */
-	boolean isEJB2_0();
-	/**
-	 * Sets the batchMode.
-	 * @param batchMode The batchMode to set
-	 */
-	public void setBatchMode(boolean isBatch);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java
deleted file mode 100644
index 3bd8ffa..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbFactory.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
- 
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-/**
- * @generated
- */
-public interface EjbFactory extends EFactory{
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EjbFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl();
-
-MethodElement createMethodElement(String aSignature) ;
-MethodElement createMethodElementFrom(Method method) ;
-MethodElement createMethodElementFrom(java.lang.reflect.Method method) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodPermission value
-	 */
-	MethodPermission createMethodPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AssemblyDescriptor value
-	 */
-	AssemblyDescriptor createAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodTransaction value
-	 */
-	MethodTransaction createMethodTransaction();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Entity value
-	 */
-	Entity createEntity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContainerManagedEntity value
-	 */
-	ContainerManagedEntity createContainerManagedEntity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMPAttribute value
-	 */
-	CMPAttribute createCMPAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMRField value
-	 */
-	CMRField createCMRField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelationshipRole value
-	 */
-	EJBRelationshipRole createEJBRelationshipRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelation value
-	 */
-	EJBRelation createEJBRelation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Relationships value
-	 */
-	Relationships createRelationships();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBJar value
-	 */
-	EJBJar createEJBJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleSource value
-	 */
-	RoleSource createRoleSource();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Query value
-	 */
-	Query createQuery();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return QueryMethod value
-	 */
-	QueryMethod createQueryMethod();
-
-	/**
-	 * Returns a new object of class '<em>Activation Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Config Property</em>'.
-	 * @generated
-	 */
-	ActivationConfigProperty createActivationConfigProperty();
-
-	/**
-	 * Returns a new object of class '<em>Activation Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Config</em>'.
-	 * @generated
-	 */
-	ActivationConfig createActivationConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodElement value
-	 */
-	MethodElement createMethodElement();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExcludeList value
-	 */
-	ExcludeList createExcludeList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Session value
-	 */
-	Session createSession();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDriven value
-	 */
-	MessageDriven createMessageDriven();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDrivenDestination value
-	 */
-	MessageDrivenDestination createMessageDrivenDestination();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBMethodCategory value
-	 */
-	EJBMethodCategory createEJBMethodCategory();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EjbPackage getEjbPackage();
-
-}
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementComparator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementComparator.java
deleted file mode 100644
index ea8ba2a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementComparator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.Comparator;
-
-public class EjbMethodElementComparator implements Comparator {
-	static final int HOME = MethodElementKind.HOME;
-	static final int REMOTE = MethodElementKind.REMOTE;
-	static final int LOCAL_HOME = MethodElementKind.LOCAL_HOME;
-	static final int LOCAL = MethodElementKind.LOCAL;
-	static final int UNSPECIFIED = MethodElementKind.UNSPECIFIED;
-
-	/**
-	 * Constructor for EjbMethodElementComparator.
-	 */
-	public EjbMethodElementComparator() {
-		super();
-	}
-
-	/*
-	 * @see Comparator#compare(Object, Object)
-	 */
-	public int compare(Object o1, Object o2) {
-		return compare((MethodElement) o1, (MethodElement) o2);
-	}
-	/**
-	 * Sort by type first in the following order:
-	 * Home, Remote, LocalHome, Local, Unspecified
-	 * Then alphabetically order.
-	 */
-	protected int compare(MethodElement me1, MethodElement me2) {
-		int type1, type2;
-		type1 = me1.getType().getValue();
-		type2 = me2.getType().getValue();
-		if (type1 == type2)
-			return compareSignatures(me1, me2);
-		return compareTypes(type1, type2);
-	}
-
-	protected int compareTypes(int type1, int type2) {
-		if (type1 == HOME)
-			return -1;
-		if (type1 == REMOTE) {
-			if (type2 == HOME)
-				return 1;
-			return -1;
-		}
-		if (type1 == LOCAL_HOME) {
-			if (type2 == HOME || type2 == REMOTE)
-				return 1;
-			return -1;
-		}
-		if (type1 == LOCAL) {
-			if (type2 == HOME || type2 == REMOTE || type2 == LOCAL_HOME)
-				return 1;
-			return -1;
-		}
-		if (type1 == UNSPECIFIED) {
-			if (type2 == HOME || type2 == REMOTE || type2 == LOCAL_HOME || type2 == LOCAL)
-				return 1;
-			return -1;
-		}
-		return -1;
-	}
-	protected int compareSignatures(MethodElement me1, MethodElement me2) {
-		String sig1, sig2;
-		sig1 = me1.getSignature();
-		sig2 = me2.getSignature();
-		return sig1.compareTo(sig2);
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java
deleted file mode 100644
index 651dd72..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EjbMethodElementHelper.java
+++ /dev/null
@@ -1,436 +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 Apr 21, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.ejb;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl;
-
-/**
- * @author blancett
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EjbMethodElementHelper {
-	public static final int ALL_METHODS = 0;
-	public static final int HOME_METHODS = 1;
-	public static final int CLIENT_METHODS = 2;
-	public static final int REMOTE_METHODS = 3;
-	public static final int LOCAL_METHODS = 4;
-	public static final int LOCAL_HOME_METHODS = 5;
-	public static final int LOCAL_REMOTE_METHODS = 6;
-	protected EjbMethodElementComparator defaultMEComparator;
-	protected EjbMethodElementComparator defaultMethodElementComparator;
-	private static EjbMethodElementHelper singleton;
-	public static final String DEFAULT_METHOD_NAME = "*"; //$NON-NLS-1$
-	protected static final String METHOD_ELEMENT_NAME = "MethodElement"; //$NON-NLS-1$
-	public EjbMethodElementHelper() {
-		super();
-	}
-	public static EjbMethodElementHelper singleton() {
-		if (singleton == null)
-			singleton = new EjbMethodElementHelper();
-		return singleton;
-	}
-	public boolean isMethodElementsEqual(MethodElement me1, MethodElement me2) {
-		return (me1.getSignature().equals(me2.getSignature()) 
-				&& me1.getEnterpriseBean() == me2.getEnterpriseBean() 
-				&& me1.getMethodParams().equals(me2.getMethodParams()) 
-				&& me1.getType() == me2.getType());
-	}
-	public boolean isMethodElementinList(List meList, Object me) {
-		if (! (me instanceof MethodElement))
-			return false;
-		for (int i = 0; i < meList.size(); i++) {
-			if (meList.get(i) instanceof MethodElement) {
-				MethodElement element = (MethodElement) meList.get(i);
-				if (isMethodElementsEqual(element, (MethodElement)me))
-					return true;
-			}
-		}
-		return false;
-	}
-	protected EjbMethodElementComparator getDefaultMEComparator() {
-		if (defaultMEComparator == null)
-			defaultMEComparator = new EjbMethodElementComparator();
-		return defaultMEComparator;
-	}
-	protected void excludeQueryMethods(List result, List someQueries) {
-		if (someQueries.isEmpty())
-			return;
-		int size = someQueries.size();
-		List methods = new ArrayList(size);
-		Query query = null;
-		for (int i = 0; i < size; i++) {
-			query = (Query) someQueries.get(i);
-			methods.add(query.getQueryMethod());
-		}
-		excludeMethodElements(result, methods);
-	}
-	public List getAvailableSelectQueryMethodsExcludingExisting(ContainerManagedEntity cmp) {
-		if (cmp == null)
-			return Collections.EMPTY_LIST;
-		List result = cmp.getAvailableSelectQueryMethods();
-		List existing = cmp.getQueries();
-		excludeQueryMethods(result, existing);
-		return result;
-	}
-	public List getAvailableFindQueryMethodsExcludingExisting(ContainerManagedEntity cmp) {
-		if (cmp == null)
-			return Collections.EMPTY_LIST;
-		List result = cmp.getAvailableFindQueryMethods();
-		List existing = cmp.getQueries();
-		excludeQueryMethods(result, existing);
-		return result;
-	}
-	public List getExistingOrAvailableTransactionMethodElements(EObject object, EnterpriseBean bean) {
-		List result = new ArrayList();
-		result.addAll(getAvailableMethodTransactionMethodElementsExcludingExisting(bean));
-		unionMethodElements(result, getExistingMethodElements(object, bean));
-		Collections.sort(result, getDefaultMethodElementComparator());
-		return result;
-	}
-	protected EjbMethodElementComparator getDefaultMethodElementComparator() {
-		if (defaultMethodElementComparator == null)
-			defaultMethodElementComparator = new EjbMethodElementComparator();
-		return defaultMethodElementComparator;
-	}
-	protected List getExistingMethodElements(EObject refObject, EnterpriseBean bean) {
-		if (refObject != null) {
-			EjbPackage pack = getEjbPackage();
-			if (refObject.eClass() == pack.getMethodTransaction())
-				return ((MethodTransaction) refObject).getMethodElements(bean);
-			if (refObject.eClass() == pack.getMethodPermission())
-				return ((MethodPermission) refObject).getMethodElements(bean);
-		}
-		return Collections.EMPTY_LIST;
-	}
-	protected void unionMethodElements(List sourceMethodElements, List additionalMethodElements) {
-		MethodElement sourceME, additionalME;
-		int sourceSize, addSize;
-		sourceSize = sourceMethodElements.size();
-		addSize = additionalMethodElements.size();
-		List foundElements = new ArrayList(addSize);
-		boolean found = false;
-		for (int i = 0; i < addSize; i++) {
-			found = false;
-			additionalME = (MethodElement) additionalMethodElements.get(i);
-			sourceME = null;
-			for (int ii = 0; ii < sourceSize; ii++) {
-				sourceME = (MethodElement) sourceMethodElements.get(ii);
-				if (sourceME.isEquivalent(additionalME)) {
-					found = true;
-					break;
-				}
-			}
-			if (found)
-				foundElements.add(sourceME);
-		}
-		sourceMethodElements.removeAll(foundElements);
-		sourceMethodElements.addAll(additionalMethodElements);
-	}
-	public List getAvailableMethodTransactionMethodElementsExcludingExisting(EnterpriseBean bean) {
-		List result = new ArrayList();
-		List filteredMethods = new ArrayList();
-		if (bean.isEntity()) {
-			if (bean.getRemoteInterface() != null) {
-				filteredMethods = bean.getRemoteInterface().getMethodsExtendedWithFilters(Collections.EMPTY_LIST, getEntityMethodTransactionExcludedMethods((Entity) bean, REMOTE_METHODS));
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.REMOTE_LITERAL, bean));
-			}
-			if (bean.getHomeInterface() != null) {
-				filteredMethods = bean.getHomeInterface().getMethodsExtendedWithFilters(Collections.EMPTY_LIST, getEntityMethodTransactionExcludedMethods((Entity) bean, HOME_METHODS));
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.HOME_LITERAL, bean));
-			}
-			if (bean.getLocalInterface() != null) {
-				filteredMethods = bean.getLocalInterface().getMethodsExtendedWithFilters(Collections.EMPTY_LIST, getEntityMethodTransactionExcludedMethods((Entity) bean, LOCAL_METHODS));
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.LOCAL_LITERAL, bean));
-			}
-			if (bean.getLocalHomeInterface() != null)
-				result.addAll(bean.getAvailableLocalHomeMethodElements());
-			result.addAll(bean.getAvailableUnspecifiedMethodElements());
-		} else if (bean.isSession()) {
-			if (bean.getRemoteInterface() != null) {
-				filteredMethods = bean.getRemoteInterface().getMethodsExtendedWithFilters(getSessionMethodTransactionExcludedClasses((Session) bean, REMOTE_METHODS), Collections.EMPTY_LIST);
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.REMOTE_LITERAL, bean));
-			}
-			if (bean.getLocalInterface() != null) {
-				filteredMethods = bean.getLocalInterface().getMethodsExtendedWithFilters(getSessionMethodTransactionExcludedClasses((Session) bean, LOCAL_METHODS), Collections.EMPTY_LIST);
-				result.addAll(createMethodElements(getMethodElementSignatures(filteredMethods), MethodElementKind.LOCAL_LITERAL, bean));
-			}
-			result.add(bean.getAvailableUnspecifiedMethodElements().get(0));
-		} else if (bean.isMessageDriven()) {
-			filteredMethods = Arrays.asList(new Object[]{getMethod(bean.getEjbClass(), getMDBMethod_Sig())});
-			result.addAll(bean.createMethodElements(filteredMethods, bean.getEjbClass()));
-		}
-		return result;
-	}
-	public List getMethodElementSignatures(List methods) {
-		List signatures, sameNames;
-		sameNames = new ArrayList();
-		signatures = new ArrayList(methods.size() + 1);
-		signatures.add(DEFAULT_METHOD_NAME);
-		Iterator it = methods.iterator();
-		Method aMethod;
-		String methodName;
-		while (it.hasNext()) {
-			aMethod = (Method) it.next();
-			methodName = aMethod.getName();
-			if (sameNames.contains(methodName)) {
-				if (!signatures.contains(methodName))
-					signatures.add(methodName);
-			} else
-				sameNames.add(methodName);
-			signatures.add(aMethod.getMethodElementSignature());
-		}
-		Collections.sort(signatures);
-		return signatures;
-	}
-	protected List createMethodElements(List signatures, Enumerator aType, EnterpriseBean bean) {
-		return createMethodElements(METHOD_ELEMENT_NAME, signatures, aType, bean);
-	}
-	protected EjbPackage getEjbPackage() {
-		return EjbFactoryImpl.getPackage();
-	}
-	protected EjbFactory getEjbFactory() {
-		return ((EjbPackage) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory();
-	}
-	protected List createMethodElements(String meTypeName, List signatures, Enumerator aType, EnterpriseBean bean) {
-		int size = signatures.size();
-		List methodElements = new ArrayList(size);
-		String signature;
-		MethodElement me;
-		for (int i = 0; i < size; i++) {
-			signature = (String) signatures.get(i);
-			me = (MethodElement) getEjbFactory().create((EClass) getEjbPackage().getEClassifier(meTypeName));
-			me.initializeFromSignature(signature);
-			me.setEnterpriseBean(bean);
-			me.setType((MethodElementKind) aType);
-			methodElements.add(me);
-		}
-		return methodElements;
-	}
-	protected List getEntityMethodTransactionExcludedMethods(Entity entity, int type) {
-		List result = new ArrayList();
-		switch (type) {
-			case (REMOTE_METHODS) :
-				{
-					JavaClass aClass = getEJBObjectClass(entity);
-					aClass.getClassImport();
-					result.addAll(excludeMethods(aClass, Arrays.asList(new Object[]{getMethod(aClass, getRemoteRemoveMethod_Sig())})));
-					break;
-				}
-			case (HOME_METHODS) :
-				{
-					JavaClass aClass = getEJBHomeClass(entity);
-					aClass.getClassImport();
-					result.addAll(Arrays.asList(new Object[]{getMethod(aClass, getEjbGetMetaDataMethod_Sig()), getMethod(aClass, getEjbGetHomeHandleMethod_Sig())}));
-					break;
-				}
-			case (LOCAL_METHODS) :
-				{
-					JavaClass aClass = getEJBLocalObjectClass(entity);
-					aClass.getClassImport();
-					result.addAll(excludeMethods(aClass, Arrays.asList(new Object[]{getMethod(aClass, getLocalRemoveMethod_Sig())})));
-					break;
-				}
-		}
-		return result;
-	}
-	protected List getSessionMethodTransactionExcludedClasses(Session session, int type) {
-		List result = new ArrayList();
-		Object[] allInterfaces;
-		String className;
-		switch (type) {
-			case (REMOTE_METHODS) :
-				{
-					className = getEJBObjectClassName();
-					allInterfaces = session.getRemoteInterface().getImplementsInterfaces().toArray();
-					result.addAll(getInterfaces(allInterfaces, className));
-					break;
-				}
-			case (LOCAL_METHODS) :
-				{
-					className = getEJBLocalObjectClassName();
-					allInterfaces = session.getLocalInterface().getImplementsInterfaces().toArray();
-					result.addAll(getInterfaces(allInterfaces, className));
-					break;
-				}
-		}
-		return result;
-	}
-	protected List excludeMethods(JavaClass aClass, List methods) {
-		List currentMethods = aClass.getMethods();
-		List resultMethods = new ArrayList();
-		for (int i = 0; i < currentMethods.size(); i++) {
-			if (!methods.contains(currentMethods.get(i)))
-				resultMethods.add(currentMethods.get(i));
-		}
-		return resultMethods;
-	}
-	protected Method getMethod(JavaClass aClass, String methodName) {
-		List currentMethods = aClass.getMethods();
-		for (int i = 0; i < currentMethods.size(); i++) {
-			Method method = (Method) currentMethods.get(i);
-			if (methodName.equals(method.getSignature()))
-				return method;
-		}
-		return null;
-	}
-	protected Method getMethodUsingMethodSig(JavaClass aClass, String methodName) {
-		List currentMethods = aClass.getMethods();
-		for (int i = 0; i < currentMethods.size(); i++) {
-			Method method = (Method) currentMethods.get(i);
-			if (methodName.equals(method.getSignature()))
-				return method;
-		}
-		return null;
-	}
-	public List getInterfaces(Object[] interfaces, String aEjbObjectClassName) {
-		List extractedInterfaces = new ArrayList();
-		for (int i = 0; i < interfaces.length; i++) {
-			if (((JavaClass) interfaces[i]).getQualifiedName().equals(aEjbObjectClassName))
-				extractedInterfaces.add(interfaces[i]);
-		}
-		return extractedInterfaces;
-	}
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference, int usageFlag) {
-		return getAvailableMethodElementsExcludingExisting(ejb, someMethodElementOwners, methodElementReference, getDefaultMEComparator(), usageFlag);
-	}
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference) {
-		return getAvailableMethodElementsExcludingExisting(ejb, someMethodElementOwners, methodElementReference, getDefaultMEComparator());
-	}
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference, Comparator comparator) {
-		return getAvailableMethodElementsExcludingExisting(ejb, someMethodElementOwners, methodElementReference, comparator, ALL_METHODS);
-	}
-	protected List getExistingMethodElements(List someMethodElementOwners, EReference methodElementReference) {
-		if (someMethodElementOwners == null || someMethodElementOwners.isEmpty() || methodElementReference == null || !methodElementReference.isMany())
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		int size = someMethodElementOwners.size();
-		EObject owner = null;
-		for (int i = 0; i < size; i++) {
-			owner = (EObject) someMethodElementOwners.get(i);
-			result.addAll((List) owner.eGet(methodElementReference));
-		}
-		return result;
-	}
-	public List getAvailableMethodElementsExcludingExisting(EnterpriseBean ejb, List someMethodElementOwners, EReference methodElementReference, Comparator comparator, int usageFlag) {
-		if (ejb == null)
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		boolean showHomes = usageFlag == ALL_METHODS || usageFlag == HOME_METHODS;
-		boolean showClients = usageFlag == ALL_METHODS || usageFlag == CLIENT_METHODS;
-		if (showHomes)
-			result.addAll(ejb.getAvailableHomeMethodElements());
-		if (showClients)
-			result.addAll(ejb.getAvailableRemoteMethodElements());
-		if (showHomes)
-			result.addAll(ejb.getAvailableLocalHomeMethodElements());
-		if (showClients)
-			result.addAll(ejb.getAvailableLocalMethodElements());
-		result.addAll(ejb.getAvailableUnspecifiedMethodElements());
-		excludeMethodElements(result, getExistingMethodElements(someMethodElementOwners, methodElementReference));
-		Collections.sort(result, comparator);
-		return result;
-	}
-	protected void excludeMethodElements(List sourceMethodElements, List existingMethodElements) {
-		MethodElement sourceME, existingME;
-		int sourceSize, existingSize;
-		sourceSize = sourceMethodElements.size();
-		existingSize = existingMethodElements.size();
-		List foundElements = new ArrayList(existingSize);
-		boolean found = false;
-		for (int i = 0; i < existingSize; i++) {
-			found = false;
-			existingME = (MethodElement) existingMethodElements.get(i);
-			sourceME = null;
-			for (int ii = 0; ii < sourceSize; ii++) {
-				sourceME = (MethodElement) sourceMethodElements.get(ii);
-				if (existingME != null && existingME.getName() != null && sourceME.getSignature().equals(existingME.getSignature()) && sourceME.getTypeJavaClass() == existingME.getTypeJavaClass()) {
-					if (sourceME.getTypeJavaClass() != null) { //it returns
-						// null if the
-						// method is *
-						// and it is not
-						// a message
-						// bean
-						found = true;
-						break;
-					}
-					else if (sourceME.getEnterpriseBean().getEjbClass() == existingME.getEnterpriseBean().getEjbClass()) {
-						found = true;
-						break;
-					}
-				}
-			}
-			if (found)
-				foundElements.add(sourceME);
-		}
-		sourceMethodElements.removeAll(foundElements);
-	}
-	private String getEjbGetHomeHandleMethod_Sig() {
-		return "Public abstract javax.ejb.HomeHandle javax.ejb.EJBHome.getHomeHandle() throws java.rmi.RemoteException"; //$NON-NLS-1$
-	}
-	private String getEjbGetMetaDataMethod_Sig() {
-		return "Public abstract javax.ejb.EJBMetaData javax.ejb.EJBHome.getEJBMetaData() throws java.rmi.RemoteException"; //$NON-NLS-1$
-	}
-	private String getRemoteRemoveMethod_Sig() {
-		return "Public abstract void javax.ejb.EJBObject.remove() throws java.rmi.RemoteException,javax.ejb.RemoveException"; //non-nls //$NON-NLS-1$
-	}
-	private String getLocalRemoveMethod_Sig() {
-		return "Public abstract void javax.ejb.EJBLocalObject.remove() throws java.rmi.RemoteException,javax.ejb.RemoveException"; //non-nls //$NON-NLS-1$
-	}
-	private String getMDBMethod_Sig() {
-		return "public void onMessage(javax.jms.Message msg)"; //$NON-NLS-1$
-	}
-	private String getEJBObjectClassName() {
-		return "javax.ejb.EJBObject"; //$NON-NLS-1$
-	}
-	private String getEJBLocalObjectClassName() {
-		return "javax.ejb.EJBLocalObject"; //$NON-NLS-1$
-	}
-	private JavaClass getEJBObjectClass(EnterpriseBean bean) {
-		Resource res = bean.eResource();
-		ResourceSet set = res != null ? res.getResourceSet() : null;
-		return (JavaClass) JavaRefFactory.eINSTANCE.reflectType("javax.ejb", "EJBObject", set); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	private JavaClass getEJBLocalObjectClass(EnterpriseBean bean) {
-		Resource res = bean.eResource();
-		ResourceSet set = res != null ? res.getResourceSet() : null;
-		return (JavaClass) JavaRefFactory.eINSTANCE.reflectType("javax.ejb", "EJBLocalObject", set); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	private JavaClass getEJBHomeClass(EnterpriseBean bean) {
-		Resource res = bean.eResource();
-		ResourceSet set = res != null ? res.getResourceSet() : null;
-		return (JavaClass) JavaRefFactory.eINSTANCE.reflectType("javax.ejb", "EJBHome", set); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EnterpriseBean.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EnterpriseBean.java
deleted file mode 100644
index e85d30e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/EnterpriseBean.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-
-
-/**
- * @generated
- * EnterpriseJavaBean is a class.  It can have instances, someone could write an instance document containing Departments and Employees.  It also has attributes, operations, and associations.  These are actually derived//filtered from its implementation classes and interfaces.  For mapping and browsing purposes, though, you would like the EJB to appear as a class.  
- * 
- * In this light, even Session Beans can have associations and properties implemented by their bean.  For example, it would be meaningful to describe associations from a Session to the Entities which it uses to perform its work.
- * @extends ENamedElement
- *
- **/
-public interface EnterpriseBean extends JNDIEnvRefsGroup, ENamedElement{
-
-/**
- * Creates a List of MethodElements that represent the
- * Methods from @someMethods pointing to this EJB.  It is
- * assumed that all of the methods belong to @anInterface.
- */
-List createMethodElements(List someMethods, JavaClass anInterface) ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- * @deprecated used getAvailableUnspecifiedMethodElements
- */
-List getAvailableCommonMethodElements() ;
-
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableUnspecifiedMethodElements() ;
-/**
- * This method will return a List of MethodElements signatures
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.
- * @deprecated used getAvailableUnspecifiedMethodElementSignatures
- */
-List getAvailableCommonMethodElementSignatures() ;
-/**
- * This method will return a List of MethodElements signatures
- * that represent all the possible MethodElements that can be created
- * and are common to both the Home and Remote interfaces.
- */
-List getAvailableUnspecifiedMethodElementSignatures() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Home interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableHomeMethodElements() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Local Home interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableLocalHomeMethodElements() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Local interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableLocalMethodElements() ;
-/**
- * This method will return a List of newly created MethodElements
- * that represent all the possible MethodElements that can be created
- * for the Remote interface.  These MethodElements are not contained and will
- * not be serialized and should not be added to the model.  Their intention is
- * solely for comparing with actual MethodElements contained in the model.
- */
-List getAvailableRemoteMethodElements() ;
-/**
- * Return a List of all available MethodElements for all types as well as the
- * existing MethodElements from the <code>refObject</code>.  The parameter
- * will be either a MethodTransaction or a MethodPermission.  The List will be
- * sorted based on the passed EjbMethodElementComparator
- */
-public List getExistingOrAvailableMethodElements(EObject refObject, Comparator comparator) ;
-/**
- * Return a List of all available MethodElements for all types as well as the
- * existing MethodElements from the <code>refObject</code>.  The parameter
- * will be either a MethodTransaction or a MethodPermission.  The List will be
- * sorted based on the EjbMethodElementComparator
- */
-public List getExistingOrAvailableMethodElements(EObject refObject) ;
-public String getEjbClassName();
-/**
- * Return an EjbRef contained by this bean which is
- * equivalent to @anEjbRef.
- */
-EjbRef getEquivalentEjbRef(EjbRef anEjbRef) ;
-/**
- * Method getEquivalentEJBLocalRef.
- * @param anEjbLocalRef
- * @return EJBLocalRef
- */
-EJBLocalRef getEquivalentEJBLocalRef(EJBLocalRef anEjbLocalRef);
-
-public String getHomeInterfaceName();
-public Method[] getHomeMethodsForDeployment();
-/**
- * Return an EjbRef that is physically linked to @anEJB.
- */
-EjbRef getLinkedEJBReference(EnterpriseBean anEJB) ;
-/**
- * Return an EJBLocalRef that is physically linked to @anEJB.
- */
-EJBLocalRef getLinkedEJBLocalReference(EnterpriseBean anEJB) ;
-public String getLocalHomeInterfaceName();
-public Method[] getLocalHomeMethodsForDeployment();
-public String getLocalInterfaceName();
-public String getRemoteInterfaceName();
-public Method[] getRemoteMethodsForDeployment();
-/**
- * Return true if @aJavaClass as equal to the
- * home, remote, bean class, or key class.
- */
-boolean hasJavaReference(JavaClass aJavaClass) ;
-/**
- * Return true if this ejb has BeanManagedPersistance.
- */
-boolean isBeanManagedEntity() ;
-public boolean isContainerManagedEntity();
-public boolean isEntity();
-public boolean isMessageDriven();
-public boolean isSession();
-
-/**
- * returns an integer representing the version of the bean in the EJBJar
- * @see org.eclipse.jst.j2ee.internal.J2EEVersionConstants
- */
-public int getVersionID();
-
-/**
- * @deprecated - Use {@link #getVersionID()}
- * @see org.eclipse.jst.j2ee.internal.J2EEVersionConstants
- */
-public boolean isVersion1_X() ;
-
-/**
- * @deprecated - Use {@link #getVersionID()}
- * @see org.eclipse.jst.j2ee.internal.J2EEVersionConstants
- */
-public boolean isVersion2_X() ;
-
-/**
- * Return true if this EJB has a local interface and a local home
- * interface.
- */
-public boolean hasLocalClient();
-
-/**
- * Return true if this EJB has a remote interface and a home
- * interface.
- */
-public boolean hasRemoteClient();
-
-/**
- * Fix the role-link on any contained role refs
- */
-public void reSyncSecurityRoleRef(String existingRoleName, String newRoleName);
-public void setEjbClassName(String ejbClassName);
-public void setHomeInterfaceName(String homeInterfaceName);
-public void setLocalHomeInterfaceName(String localHomeInterfaceName);
-public void setLocalInterfaceName(String localInterfaceName);
-public void setRemoteInterfaceName(String remoteInterfaceName);
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getEnterpriseBean_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoleRefs references
-	 */
-	EList getSecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbClass reference
-	 */
-	JavaClass getEjbClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EjbClass reference
-	 */
-	void setEjbClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The HomeInterface reference
-	 */
-	JavaClass getHomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the HomeInterface reference
-	 */
-	void setHomeInterface(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RemoteInterface reference
-	 */
-	JavaClass getRemoteInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the RemoteInterface reference
-	 */
-	void setRemoteInterface(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbJar reference
-	 */
-	EJBJar getEjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EjbJar reference
-	 */
-	void setEjbJar(EJBJar value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecurityIdentity reference
-	 * The security-identity element specifies whether the caller's security identity
-	 * is to be used for the execution of the methods of the enterprise bean or
-	 * whether a specific run-as identity is to be used. It
-	 * contains an optional description and a specification of the security identity
-	 * to be used.
-	 */
-	SecurityIdentity getSecurityIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the SecurityIdentity reference
-	 */
-	void setSecurityIdentity(SecurityIdentity value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LocalHomeInterface reference
-	 */
-	JavaClass getLocalHomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the LocalHomeInterface reference
-	 */
-	void setLocalHomeInterface(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LocalInterface reference
-	 */
-	JavaClass getLocalInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the LocalInterface reference
-	 */
-	void setLocalInterface(JavaClass value);
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Entity.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Entity.java
deleted file mode 100644
index 722b278..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Entity.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * The entity element declares an entity bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a unique name assigned to the enterprise bean in the deployment descriptor; the names of the entity bean's home and remote interfaces, if any; the names of the entity bean's local home and local interface, if any; the entity bean's implementation class; the entity bean's persistence management type; the entity bean's primary key class name; an indication of the entity bean's reentrancy; an optional specification of the entity bean's cmp-version; an optional specification of the entity bean's abstract schema name; an optional list of container-managed fields; an optional specification of the primary key field; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; an optional declaration of the bean's resource environment references; an optional set of query declarations for finder and select methods for an entity bean with cmp-version 2.x.
- * The optional abstract-schema-name element must be specified for an entity bean with container managed persistence and cmp-version 2.x. The optional primkey-field may be present in the descriptor if the entity's persistence-type is Container. The optional cmp-version element may be present in the descriptor if the entity's persistence-type is Container. If the persistence-type is Container and the cmp-version element is not specified, its value defaults to 2.x.
- * The optional home and remote elements must be specified if the entity bean cmp-version is 1.x.
- * The optional local-home and local elements must be specified if the entity bean has a local home and local interface.
- * The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.
- * The other elements that are optional are "optional" in the sense that they are omitted if the lists represented by them are empty. At least one cmp-field element must be present in the descriptor if
- * the entity's persistence-type is Container and the cmp-version is 1.x, and none must not be present if the entity's persistence-type is Bean.
- */
-public interface Entity extends EnterpriseBean{
-
-public String getPrimaryKeyName();
-public boolean isContainerManagedEntity();
-
-public void setPrimaryKeyName(String primaryKeyName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the IsReentrant attribute
-	 * The reentrant element specifies whether an entity bean is reentrant or not.
-
-	 */
-	boolean isReentrant();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Entity#isReentrant <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reentrant</em>' attribute.
-	 * @see #isSetReentrant()
-	 * @see #unsetReentrant()
-	 * @see #isReentrant()
-	 * @generated
-	 */
-	void setReentrant(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Entity#isReentrant <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetReentrant()
-	 * @see #isReentrant()
-	 * @see #setReentrant(boolean)
-	 * @generated
-	 */
-  void unsetReentrant();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Entity#isReentrant <em>Reentrant</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Reentrant</em>' attribute is set.
-	 * @see #unsetReentrant()
-	 * @see #isReentrant()
-	 * @see #setReentrant(boolean)
-	 * @generated
-	 */
-  boolean isSetReentrant();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The PrimaryKey reference
-	 * The primkey-field element is used to specify the name of the primary key field
-	 * for an entity with container-managed persistence.  The primkey-field must be
-	 * one of the fields declared in the cmp-field
-	 * element, and the type of the field must be the same as the primary key type. 
-	 * The primkey-field element is not used if the primary key maps to multiple
-	 * container-managed fields (i.e. the key is a compound key). In this case, the
-	 * fields of the primary key class must be public, and their names must correspond 
-	 * to the field names of the entity bean class that comprise the key.
-	 * Examples:<prim-key-class>java.lang.String<//prim-key-class>
-	 * 	<prim-key-class>com.wombat.empl.EmployeeID<//prim-key-class>
-	 * 	<prim-key-class>java.lang.Object<//prim-key-class>
-
-	 */
-	JavaClass getPrimaryKey();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the PrimaryKey reference
-	 */
-	void setPrimaryKey(JavaClass value);
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ExcludeList.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ExcludeList.java
deleted file mode 100644
index bbbbe0e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ExcludeList.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * The exclude list element defines a set of methods which the Assembler marks to be uncallable. It contains one or more methods.
- * 
- * If the method permission relation contains methods that are in the exclude list, the Deployer must consider those methods to be uncallable.
-
- */
-public interface ExcludeList extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodElements references
-	 */
-	EList getMethodElements();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getExcludeList_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-	/**
-	* Return a List of MethodElements that point to
-	* @anEJB.
-	*/
-	List getMethodElements(EnterpriseBean anEJB);
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/IRoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/IRoleShapeStrategy.java
deleted file mode 100644
index 5b42cfd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/IRoleShapeStrategy.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.ejb;
-
-import java.util.List;
-
-
-
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/6/2000 11:40:16 AM)
- * @author: Administrator
- */
-public interface IRoleShapeStrategy {
-	String ATTRIBUTE_NAME_JOINER = "_"; //$NON-NLS-1$
-	String ROLE_GET_PREFIX = "get"; //$NON-NLS-1$
-	String ROLE_SET_PREFIX = "set"; //$NON-NLS-1$
-boolean isFlat();
-boolean isRound();
-void reconcileAttributes(List roleAttributes) ;
-boolean usesAttributeNamed(String attributeName) ;
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDriven.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDriven.java
deleted file mode 100644
index a241fe0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDriven.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import org.eclipse.jem.java.JavaClass;
-
-
-
-
-/**
- * @generated
- */
-public interface MessageDriven extends EnterpriseBean{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionType attribute
-	 * The transaction-type element specifies an enterprise bean's transaction
-	 * management type.
-	 * 
-	 * The transaction-type element must be one of the two following: Bean, Container
-	 */
-	TransactionType getTransactionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @generated
-	 */
-	void setTransactionType(TransactionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	void unsetTransactionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getTransactionType <em>Transaction Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Type</em>' attribute is set.
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	boolean isSetTransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the MessageSelector attribute
-	 * The message-selector element is used to specify the JMS message
-	 * selector to be used in determining which messages a message-driven
-	 * bean is to receive.
-	 * 
-	 * Example value: 
-	 * JMSType = `car' AND color = `blue' AND weight > 2500
-
-	 */
-	String getMessageSelector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the MessageSelector attribute
-	 */
-	void setMessageSelector(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AcknowledgeMode attribute
-	 * an optional declaration of the acknowledgment mode for the message-driven bean
-	 * if bean-managed transaction demarcation is used (ie. self.transactionType =
-	 * Bean)
-	 * 
-	 * The acknowledge-mode specifies whether JMS AUTO_ACKNOWLEDGE or
-	 * DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used for the
-	 * onMessage message of a message-driven bean that uses bean managed transaction
-	 * demarcation.
-	 * 
-	 * The acknowledge-mode must be one of the two following:  Auto-acknowledge,
-	 * Dups-ok-acknowledge
-
-	 */
-	AcknowledgeMode getAcknowledgeMode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getAcknowledgeMode <em>Acknowledge Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Acknowledge Mode</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.AcknowledgeMode
-	 * @see #isSetAcknowledgeMode()
-	 * @see #unsetAcknowledgeMode()
-	 * @see #getAcknowledgeMode()
-	 * @generated
-	 */
-	void setAcknowledgeMode(AcknowledgeMode value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getAcknowledgeMode <em>Acknowledge Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAcknowledgeMode()
-	 * @see #getAcknowledgeMode()
-	 * @see #setAcknowledgeMode(AcknowledgeMode)
-	 * @generated
-	 */
-	void unsetAcknowledgeMode();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getAcknowledgeMode <em>Acknowledge Mode</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Acknowledge Mode</em>' attribute is set.
-	 * @see #unsetAcknowledgeMode()
-	 * @see #getAcknowledgeMode()
-	 * @see #setAcknowledgeMode(AcknowledgeMode)
-	 * @generated
-	 */
-	boolean isSetAcknowledgeMode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Destination reference
-	 * An optional declaration of the intended destination type of the message-driven
-	 * bean
-	 */
-	MessageDrivenDestination getDestination();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Destination reference
-	 */
-	void setDestination(MessageDrivenDestination value);
-
-	/**
-	 * Returns the value of the '<em><b>Activation Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Config</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activation Config</em>' containment reference.
-	 * @see #setActivationConfig(ActivationConfig)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getMessageDriven_ActivationConfig()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ActivationConfig getActivationConfig();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getActivationConfig <em>Activation Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Config</em>' containment reference.
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	void setActivationConfig(ActivationConfig value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destination</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destination</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Destination</em>' reference.
-	 * @see #setMessageDestination(JavaClass)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getMessageDriven_MessageDestination()
-	 * @model 
-	 * @generated
-	 */
-	JavaClass getMessageDestination();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getMessageDestination <em>Message Destination</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Destination</em>' reference.
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	void setMessageDestination(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  - an optional declaration of the bean's
-	 * 	      message-destination-link
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Link</em>' attribute.
-	 * @see #setLink(String)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getMessageDriven_Link()
-	 * @model 
-	 * @generated
-	 */
-	String getLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getLink <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link</em>' attribute.
-	 * @see #getLink()
-	 * @generated
-	 */
-	void setLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Messaging Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Messaging Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * The messaging-type element specifies the message
-	 *         listener interface of the message-driven bean. If
-	 *         the messaging-type element is not specified, it is
-	 *         assumed to be javax.jms.MessageListener.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Messaging Type</em>' reference.
-	 * @see #setMessagingType(JavaClass)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getMessageDriven_MessagingType()
-	 * @model 
-	 * @generated
-	 */
-	JavaClass getMessagingType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getMessagingType <em>Messaging Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Messaging Type</em>' reference.
-	 * @see #getMessagingType()
-	 * @generated
-	 */
-	void setMessagingType(JavaClass value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDrivenDestination.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDrivenDestination.java
deleted file mode 100644
index 7ef45e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MessageDrivenDestination.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * 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.
- */
-public interface MessageDrivenDestination extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * The destination-type element specifies the type of the JMS destination. The
-	 * type is specified by the Java interface expected to be implemented by the
-	 * destination.
-	 * 
-	 * The destination-type element must be one of the two following: javax.jms.Queue, 
-	 * javax.jms.Topic
-	 */
-	DestinationType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDrivenDestination#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.DestinationType
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(DestinationType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDrivenDestination#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetType()
-	 * @see #getType()
-	 * @see #setType(DestinationType)
-	 * @generated
-	 */
-	void unsetType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDrivenDestination#getType <em>Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Type</em>' attribute is set.
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @see #setType(DestinationType)
-	 * @generated
-	 */
-	boolean isSetType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SubscriptionDurability attribute
-	 * The subscription-durability element specifies whether a JMS topic subscription
-	 * is intended to be durable or nondurable.
-	 * 
-	 * The subscription-durability element must be one of the two following:  Durable, 
-	 * NonDurable
-
-	 */
-	SubscriptionDurabilityKind getSubscriptionDurability();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDrivenDestination#getSubscriptionDurability <em>Subscription Durability</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Subscription Durability</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.SubscriptionDurabilityKind
-	 * @see #isSetSubscriptionDurability()
-	 * @see #unsetSubscriptionDurability()
-	 * @see #getSubscriptionDurability()
-	 * @generated
-	 */
-	void setSubscriptionDurability(SubscriptionDurabilityKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDrivenDestination#getSubscriptionDurability <em>Subscription Durability</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSubscriptionDurability()
-	 * @see #getSubscriptionDurability()
-	 * @see #setSubscriptionDurability(SubscriptionDurabilityKind)
-	 * @generated
-	 */
-	void unsetSubscriptionDurability();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDrivenDestination#getSubscriptionDurability <em>Subscription Durability</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Subscription Durability</em>' attribute is set.
-	 * @see #unsetSubscriptionDurability()
-	 * @see #getSubscriptionDurability()
-	 * @see #setSubscriptionDurability(SubscriptionDurabilityKind)
-	 * @generated
-	 */
-	boolean isSetSubscriptionDurability();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Bean reference
-	 */
-	MessageDriven getBean();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Bean reference
-	 */
-	void setBean(MessageDriven value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElement.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElement.java
deleted file mode 100644
index 4ed6b62..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElement.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * The method element is used to denote a method of an enterprise bean's
- * home or remote interface, or a set of methods. The ejb-name element
- * must be the name of one of the enterprise beans in declared in the
- * deployment descriptor; the optional method-intf element allows to
- * distinguish between a method with the same signature that is defined in
- * both the home and remote interface; the method-name element specifies
- * the method name; and the optional method-params elements identify a
- * single method among multiple methods with an overloaded method name.
- * 
- * There are three possible styles of the method element syntax:
- * 
- * 1. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>*<//method-name>
- * 	<//method>
- * 
- *    This style is used to refer to all the methods of the specified
- *    enterprise bean's home and remote interfaces.
- * 
- * 2. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 	<//method>>
- * 
- *    This style is used to refer to the specified method of the
- *    specified enterprise bean. If there are multiple methods with
- *    the same overloaded name, the element of this style refers to
- *    all the methods with the overloaded name.
- * 
- * 
- * 
- * 
- * 
- * 3. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 		<method-params>
- *    			<method-param>PARAM-1<//method-param>
- *    			<method-param>PARAM-2<//method-param>
- *           			...
- *    			<method-param>PARAM-n<//method-param>
- * 		<//method-params>
- * 	<method>	
- * 
- *    This style is used to refer to a single method within a set of
- *    methods with an overloaded name. PARAM-1 through PARAM-n are the
- *    fully-qualified Java types of the method's input parameters (if
- *    the method has no input arguments, the method-params element
- *    contains no method-param elements). Arrays are specified by the
- *    array element's type, followed by one or more pair of square
- *    brackets (e.g. int[][]).
- * 
- * 
- * Used in: method-permission and container-transaction
- * 
- * Examples:
- * 
- *     Style 1: The following method element refers to all the methods of
- * 		the EmployeeService bean's home and remote interfaces:
- * 
- * 		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>*<//method-name>
- * 		<//method>
- * 
- * 	Style 2: The following method element refers to all the create
- * 		methods of the EmployeeService bean's home interface:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 		<//method>
- * 
- * 	Style 3: The following method element refers to the
- * 		create(String firstName, String LastName) method of the
- * 	 	EmployeeService bean's home interface.
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	
- * 	The following example illustrates a Style 3 element with
- * 	more complex parameter types. The method
- * 			foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
- * 				mypackage.MyClass[][] myclaar)
- *         would be specified as:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>foobar<//method-name>
- * 			<method-params>
- * 				<method-param>char<//method-param>
- * 				<method-param>int<//method-param>
- * 				<method-param>int[]<//method-param>
- * 				<method-param>mypackage.MyClass<//method-param>
- * 				<method-param>mypackage.MyClass[][]<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	The optional method-intf element can be used when it becomes
- *    necessary to differentiate between a method defined in the home
- *    interface and a method with the same name and signature that is
- *    defined in the remote interface.
- * 
- * 	For example, the method element
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Remote<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	can be used to differentiate the create(String, String) method
- *    defined in the remote interface from the create(String, String)
- *    method defined in the home interface, which would be defined as
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Home<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
-
- */
-public interface MethodElement extends EObject{
-
-	public static final String RIGHT_PAREN = "("; //$NON-NLS-1$
-	public static final String LEFT_PAREN = ")"; //$NON-NLS-1$
-	public static final String COMMA = ","; //$NON-NLS-1$
-	public void addMethodParams(String param);
-/**
- * Set the params for this method element to an empty array, as opposed
- * to null.
- */
-public void applyZeroParams();
-/**
- * Return true if this MethodElement and @anotherMethodElement
- * have the same name, parameters, and type.
- */
-boolean equalSignature(MethodElement anotherMethodElement) ;
-	java.util.List getMethodParams() ;/**
- * Answer whether method params apply to this method, e.g., it is specific to one
- * overloaded method, even if the method is a zero parameter method.  Answer false if no
- * parameters apply, that is, the method element applies to all overloaded methods with this name
- */ 
-/**
- * Answer a list of all the methods for which this method element applies.  The following rules are used:
- *
- * 1)  If the method element type is unspecified, the methods are obtained from the remote interface of the ejb;
- *		If it is specified, then the appropriate interface is used
- *
- * 2)  If the method name = "*", then all the PUBLIC methods for that interface are returned
- *
- * 3)  If the method name is specified, and no method params are specified, then all public methods for the interface
- *      having the same name are returned.
- *
- * 4)  If the method name and params are specified, then a zero or one element array is returned, containing the one and only method
- *      on the interface with the appropriate signature, if it exists
- */
-public Method[] getMethods();
-/**
- * Return the MethodElement that is most specific.
- */
-MethodElement getMostSpecific(MethodElement aMethodElement, JavaClass aJavaClass);
-/**
- * Return the signature.
- * For example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-String getSignature() ;
-/**
- * Return the type cast to a JavaClass.
- */
-JavaClass getTypeJavaClass() ;
-public boolean hasMethodParams();
-/**
- * Parse @aSignature setting the name and the params.
- * A signature example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-void initializeFromSignature(String aSignature) ;
-boolean isDefault();
-/**
- * Return true if this MethodElement and @anotherMethodElement
- * represent the same exact methods.
- */
-boolean isEquivalent(MethodElement anotherMethodElement) ;
-boolean isHome() ;
-boolean isRemote() ;
-boolean isUnspecified() ;
-boolean isLocalHome() ;
-boolean isLocal() ;
-/**
- * Return true if this MethodElement represents one or more
- * methods.
- */
-public boolean isValid() ;
-/**
- * Return true if this MethodElement has the same basic signature as
- * @aMethod, ignoring the return type, thrown exceptions, and declaring class of 
- * this instance or @aMethod.  Return false, if params is null
- */
-public boolean nameAndParamsEquals(Method aMethod);
-	public void removeMethodParams(String param);
-boolean represents(Method aMethod);
-public void setIdToReadableString();
-/**
- * Return true if this MethodElement uniquely identifies
- * @aMethod.  Return false, even if the MethodElement represents
- * @aMethod (i.e., @aMethod is contained in its list of methods).
- */
-boolean uniquelyIdentifies(Method aMethod);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The method-name element contains a name of an enterprise bean method,
-	 * or the asterisk (*) character. The asterisk is used when the element
-	 * denotes all the methods of an enterprise bean's remote and home
-	 * interfaces.
-
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Parms attribute
-	 * The method-params element contains a list of the fully-qualified Java type
-	 * names of the method parameters.  In the current implementation this is a space
-	 * delimitted String.  A null string indicates a generic method element that can
-	 * apply to multiple methods with the same name.  An empty string indicates a
-	 * method with zero parameters.  
-	 */
-	String getParms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Parms attribute
-	 */
-	void setParms(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 */
-	MethodElementKind getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodElement#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MethodElementKind
-	 * @see #isSetType()
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(MethodElementKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodElement#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetType()
-	 * @see #getType()
-	 * @see #setType(MethodElementKind)
-	 * @generated
-	 */
-	void unsetType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodElement#getType <em>Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Type</em>' attribute is set.
-	 * @see #unsetType()
-	 * @see #getType()
-	 * @see #setType(MethodElementKind)
-	 * @generated
-	 */
-	boolean isSetType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EnterpriseBean reference
-	 */
-	EnterpriseBean getEnterpriseBean();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EnterpriseBean reference
-	 */
-	void setEnterpriseBean(EnterpriseBean value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.ejb.EjbPackage#getMethodElement_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElementKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElementKind.java
deleted file mode 100644
index 6071f4f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodElementKind.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface MethodElementKind {}
- */
-public final class MethodElementKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int UNSPECIFIED = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REMOTE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int HOME = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL_HOME = 4;
-	/**
-	 * The '<em><b>Service Endpoint</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SERVICE_ENDPOINT_LITERAL
-	 * @model name="ServiceEndpoint"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SERVICE_ENDPOINT = 5;
-
-	/**
-	 * The '<em><b>Unspecified</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Unspecified</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNSPECIFIED
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind UNSPECIFIED_LITERAL = new MethodElementKind(UNSPECIFIED, "Unspecified"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Remote</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind REMOTE_LITERAL = new MethodElementKind(REMOTE, "Remote"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Home</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Home</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HOME
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind HOME_LITERAL = new MethodElementKind(HOME, "Home"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Local</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind LOCAL_LITERAL = new MethodElementKind(LOCAL, "Local"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Local Home</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Home</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_HOME
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind LOCAL_HOME_LITERAL = new MethodElementKind(LOCAL_HOME, "LocalHome"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Service Endpoint</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Service Endpoint</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SERVICE_ENDPOINT
-	 * @generated
-	 * @ordered
-	 */
-	public static final MethodElementKind SERVICE_ENDPOINT_LITERAL = new MethodElementKind(SERVICE_ENDPOINT, "ServiceEndpoint"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Method Element Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MethodElementKind[] VALUES_ARRAY =
-		new MethodElementKind[] {
-			UNSPECIFIED_LITERAL,
-			REMOTE_LITERAL,
-			HOME_LITERAL,
-			LOCAL_LITERAL,
-			LOCAL_HOME_LITERAL,
-			SERVICE_ENDPOINT_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Method Element Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Method Element Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodElementKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MethodElementKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Method Element Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MethodElementKind get(int value) {
-		switch (value) {
-			case UNSPECIFIED: return UNSPECIFIED_LITERAL;
-			case REMOTE: return REMOTE_LITERAL;
-			case HOME: return HOME_LITERAL;
-			case LOCAL: return LOCAL_LITERAL;
-			case LOCAL_HOME: return LOCAL_HOME_LITERAL;
-			case SERVICE_ENDPOINT: return SERVICE_ENDPOINT_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MethodElementKind(int value, String name) {
-		super(value, name);
-	}
-
-} //MethodElementKind
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodPermission.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodPermission.java
deleted file mode 100644
index 811d563..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodPermission.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-
-/**
- * The method-permission element specifies that one or more security roles are allowed to invoke one or more enterprise bean methods. The method-permission element consists of an optional description, a list of security role names, and a list of method elements.  The security roles used in the method-permission element must be defined in the security-role element of the deployment descriptor, and the methods must be methods defined in the enterprise bean's remote and//or home interfaces.
- */
-public interface MethodPermission extends EObject{
-
-/**
- * Return a List of MethodElements that point to
- * @anEJB.
- */
-List getMethodElements(EnterpriseBean anEJB) ;
-/**
- * Return the SecurityRole named @aRoleName.
- */
-SecurityRole getSecurityRole(String aRoleName) ;
-/**
- * Return true if this permission contains @aSecurityRole
- */
-boolean hasSecurityRole(SecurityRole aSecurityRole) ;
-/**
- * Return true if this permission contains a SecurityRole
- * named @aRoleName.
- */
-boolean hasSecurityRole(String aRoleName) ;
-/**
- * Return true if this MethodPermission and @anotherMethodPermission
- * have the same roles.
- */
-boolean isEquivalent(MethodPermission anotherMethodPermission) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Unchecked attribute
-	 */
-	boolean isUnchecked();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Unchecked attribute
-	 */
-	void setUnchecked(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodPermission#isUnchecked <em>Unchecked</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetUnchecked()
-	 * @see #isUnchecked()
-	 * @see #setUnchecked(boolean)
-	 * @generated
-	 */
-	void unsetUnchecked();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodPermission#isUnchecked <em>Unchecked</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Unchecked</em>' attribute is set.
-	 * @see #unsetUnchecked()
-	 * @see #isUnchecked()
-	 * @see #setUnchecked(boolean)
-	 * @generated
-	 */
-	boolean isSetUnchecked();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AssemblyDescriptor reference
-	 */
-	AssemblyDescriptor getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the AssemblyDescriptor reference
-	 */
-	void setAssemblyDescriptor(AssemblyDescriptor value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Roles references
-	 */
-	EList getRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodElements references
-	 */
-	EList getMethodElements();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getMethodPermission_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodTransaction.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodTransaction.java
deleted file mode 100644
index fd3752d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MethodTransaction.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.Method;
-/**
- * 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.
- */
-public interface MethodTransaction extends EObject{
-
-/**
- * Return a List of MethodElements that point to
- * @anEJB.
- */
-List getMethodElements(EnterpriseBean anEJB) ;
-MethodElement getMostSpecificMethodElement(Method aMethod) ;
-/**
- * Return true if the transaction attributes are the same.
- */
-boolean isEquivalent(MethodTransaction anotherMethodTransaction) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionAttribute attribute
-	 * The trans-attribute element specifies how the container must manage the
-	 * transaction boundaries when delegating a method invocation to an enterprise
-	 * bean's business method.
-
-	 */
-	TransactionAttributeType getTransactionAttribute();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodTransaction#getTransactionAttribute <em>Transaction Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Attribute</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.TransactionAttributeType
-	 * @see #isSetTransactionAttribute()
-	 * @see #unsetTransactionAttribute()
-	 * @see #getTransactionAttribute()
-	 * @generated
-	 */
-	void setTransactionAttribute(TransactionAttributeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodTransaction#getTransactionAttribute <em>Transaction Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionAttribute()
-	 * @see #getTransactionAttribute()
-	 * @see #setTransactionAttribute(TransactionAttributeType)
-	 * @generated
-	 */
-	void unsetTransactionAttribute();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.MethodTransaction#getTransactionAttribute <em>Transaction Attribute</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Attribute</em>' attribute is set.
-	 * @see #unsetTransactionAttribute()
-	 * @see #getTransactionAttribute()
-	 * @see #setTransactionAttribute(TransactionAttributeType)
-	 * @generated
-	 */
-	boolean isSetTransactionAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description element is used by the ejb-jar file producer to provide text
-	 * describing the parent element.  The description element should include any
-	 * information that the ejb-jar file producer wants to provide to the consumer of
-	 * the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the
-	 * ejb-jar file consumer will display the description when processing the parent
-	 * element.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AssemblyDescriptor reference
-	 */
-	AssemblyDescriptor getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the AssemblyDescriptor reference
-	 */
-	void setAssemblyDescriptor(AssemblyDescriptor value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MethodElements references
-	 */
-	EList getMethodElements();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getMethodTransaction_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MultiplicityKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MultiplicityKind.java
deleted file mode 100644
index 1a365e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/MultiplicityKind.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface MultiplicityKind {}
- */
-public final class MultiplicityKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int ONE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int MANY= 1;
-
-	/**
-	 * The '<em><b>One</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>One</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final MultiplicityKind ONE_LITERAL = new MultiplicityKind(ONE, "One"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Many</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Many</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANY
-	 * @generated
-	 * @ordered
-	 */
-	public static final MultiplicityKind MANY_LITERAL = new MultiplicityKind(MANY, "Many"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Multiplicity Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final MultiplicityKind[] VALUES_ARRAY =
-		new MultiplicityKind[] {
-			ONE_LITERAL,
-			MANY_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Multiplicity Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Multiplicity Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			MultiplicityKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Multiplicity Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MultiplicityKind get(int value) {
-		switch (value) {
-			case ONE: return ONE_LITERAL;
-			case MANY: return MANY_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private MultiplicityKind(int value, String name) {
-		super(value, name);
-	}
-
-} //MultiplicityKind
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Query.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Query.java
deleted file mode 100644
index e27d9b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Query.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * The query element is used to specify a finder or select query. It contains an optional description of the query; the specification of the finder or select method it is used by; a specification of the return type mapping, if any, if the query is for a select method; and the EJB QL query string that defines the query. Queries that are expressible in EJB QL must use the ejb-ql element to specify the query. If a query
- * is not expressible in EJB QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty.
- */
-public interface Query extends EObject{
-
-	public boolean isLocalResultMapping();
-	public boolean isRemoteResultMapping();
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the query.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the EjbQL attribute
-	 * Contains the EJB QL query string that defines a finder or select query. This
-	 * element is defined within the scope of a query element whose contents specify
-	 * the finder or the select method that uses the query. The content must be a
-	 * valid EJB QL query string for the entity bean for which the query is specified. 
-	 * The ejb-ql element must be specified for all queries that are expressible in
-	 * EJB QL.
-	 * 
-	 * @invariant The value must be a valid EJB QL query string for the entity bean or 
-	 * dependent object class for which the query is specified.
-	 * @invariant The ejb-ql element must be specified for all queries that are
-	 * expressible in EJB QL.
-	 * 
-	 * Example:
-	 * <query>
-	 * <query-method>
-	 * <method-name>ejbSelectPendingLineitems<//method-name>
-	 * <method-params//>
-	 * <//query-method>
-	 * <ejb-ql>SELECT ENTITY(l)
-	 * FROM LineItems l
-	 * WHERE l.shipped is FALSE
-	 * <//ejb-ql>
-	 * <//query>
-	 */
-	String getEjbQL();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the EjbQL attribute
-	 */
-	void setEjbQL(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ReturnTypeMapping attribute
-	 * The return-type-mapping element is used in the query element to specify whether 
-	 * an abstract schema type that is returned by a query for a select method is to
-	 * be mapped to an EJBLocalObject or EJBObject type.  The value of the
-	 * return-type-mapping element, if specified must be one of the following.
-	 */
-	ReturnTypeMapping getReturnTypeMapping();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Query#getReturnTypeMapping <em>Return Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Type Mapping</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ReturnTypeMapping
-	 * @see #isSetReturnTypeMapping()
-	 * @see #unsetReturnTypeMapping()
-	 * @see #getReturnTypeMapping()
-	 * @generated
-	 */
-	void setReturnTypeMapping(ReturnTypeMapping value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Query#getReturnTypeMapping <em>Return Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReturnTypeMapping()
-	 * @see #getReturnTypeMapping()
-	 * @see #setReturnTypeMapping(ReturnTypeMapping)
-	 * @generated
-	 */
-	void unsetReturnTypeMapping();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Query#getReturnTypeMapping <em>Return Type Mapping</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Return Type Mapping</em>' attribute is set.
-	 * @see #unsetReturnTypeMapping()
-	 * @see #getReturnTypeMapping()
-	 * @see #setReturnTypeMapping(ReturnTypeMapping)
-	 * @generated
-	 */
-	boolean isSetReturnTypeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The QueryMethod reference
-	 * The query-method element is used to specify the method (DB//SR//CM-"on the
-	 * home") for a finder or
-	 * select query.
-	 * 
-	 * The method-name element specifies the name of a finder or select
-	 * method in the entity bean's implementation class or a select method in
-	 * the dependent object class.
-	 * 
-	 * Each method-param must be defined for a query-method using the
-	 * method-params element.
-	 * 
-	 * Used in: query
-	 * 
-	 * Example:
-	 * 
-	 * Example:
-	 * <query>
-	 *   <description>Method finds large orders<//description>
-	 *   <query-method>
-	 *     <method-name>findLargeOrders<//method-name>
-	 *     <method-params><//method-params>
-	 *   <//query-method>
-	 *   <ejb-ql>SELECT ENTITY(o) FROM Order o WHERE o.amount &gt; 1000<//ejb-ql>
-	 * <//query>
-	 */
-	QueryMethod getQueryMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the QueryMethod reference
-	 */
-	void setQueryMethod(QueryMethod value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Entity reference
-	 */
-	ContainerManagedEntity getEntity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Query#getEntity <em>Entity</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity</em>' container reference.
-	 * @see #getEntity()
-	 * @generated
-	 */
-	void setEntity(ContainerManagedEntity value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.ejb.EjbPackage#getQuery_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/QueryMethod.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/QueryMethod.java
deleted file mode 100644
index 64980f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/QueryMethod.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.ejb;
-
-import org.eclipse.jem.java.JavaClass;
-/**
- * @generated
- */
-public interface QueryMethod extends MethodElement{
-	public static final String SELECT_PREFIX = "ejbSelect"; //$NON-NLS-1$
-	public static final String FIND_PREFIX = "find"; //$NON-NLS-1$
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Query reference
-	 */
-	Query getQuery();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Query reference
-	 */
-	void setQuery(Query value);
-
-	/**
-	 * Return an array of JavaClasses of all the interfaces or bean class that this method is presented
-	 * to a client.  If it is an ejbSelect... on the bean class will be returned and if
-	 * it if a find both home interfaces will be returned if they exist.
-	 * 
-	 * May return null.
-	 */
-	JavaClass[] getClientTypeJavaClasses() ;
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Relationships.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Relationships.java
deleted file mode 100644
index 6c3eff7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Relationships.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * 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.
- */
-public interface Relationships extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the collection of relationships.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EjbJar reference
-	 */
-	EJBJar getEjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the EjbJar reference
-	 */
-	void setEjbJar(EJBJar value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of EjbRelations references
-	 * A list of ejb-relation elements, which specify the container managed
-	 * relationships.
-	 */
-	EList getEjbRelations();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getRelationships_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ReturnTypeMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ReturnTypeMapping.java
deleted file mode 100644
index 57c575c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/ReturnTypeMapping.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface ReturnTypeMapping {}
- */
-public final class ReturnTypeMapping extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL= 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REMOTE= 1;
-	/**
-	 * The '<em><b>Local</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final ReturnTypeMapping LOCAL_LITERAL = new ReturnTypeMapping(LOCAL, "Local"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Remote</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Remote</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REMOTE
-	 * @generated
-	 * @ordered
-	 */
-	public static final ReturnTypeMapping REMOTE_LITERAL = new ReturnTypeMapping(REMOTE, "Remote"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Return Type Mapping</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ReturnTypeMapping[] VALUES_ARRAY =
-		new ReturnTypeMapping[] {
-			LOCAL_LITERAL,
-			REMOTE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Return Type Mapping</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Return Type Mapping</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ReturnTypeMapping get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ReturnTypeMapping result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Return Type Mapping</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ReturnTypeMapping get(int value) {
-		switch (value) {
-			case LOCAL: return LOCAL_LITERAL;
-			case REMOTE: return REMOTE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ReturnTypeMapping(int value, String name) {
-		super(value, name);
-	}
-
-} //ReturnTypeMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/RoleSource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/RoleSource.java
deleted file mode 100644
index 9b41ca0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/RoleSource.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.
- * @invariant The content of each role-source element shall refer to an existing entity bean, entity bean reference.
- */
-public interface RoleSource extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Role reference
-	 */
-	EJBRelationshipRole getRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Role reference
-	 */
-	void setRole(EJBRelationshipRole value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The EntityBean reference
-	 */
-	ContainerManagedEntity getEntityBean();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.RoleSource#getEntityBean <em>Entity Bean</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Entity Bean</em>' reference.
-	 * @see #getEntityBean()
-	 * @generated
-	 */
-	void setEntityBean(ContainerManagedEntity value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getRoleSource_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Session.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Session.java
deleted file mode 100644
index 17f952a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/Session.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import org.eclipse.jem.java.JavaClass;
-
-
-
-
-/**
- * The session element declares an session bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a name assigned
- * to the enterprise bean in the deployment description; the names of the session bean's home and remote interfaces, if any; the names of the session bean's local home and local interfaces, if any; the session bean's implementation class; the session bean's state management type; the session bean's transaction management type; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; and an optional declaration of the bean's resource environment references. The elements that are optional are "optional" in the sense that they are omitted when if lists represented by them are empty.
- */
-public interface Session extends EnterpriseBean{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionType attribute
-	 * The transaction-type element specifies an enterprise bean's transaction
-	 * management type.
-	 * 
-
-	 */
-	TransactionType getTransactionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.TransactionType
-	 * @see #isSetTransactionType()
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @generated
-	 */
-	void setTransactionType(TransactionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getTransactionType <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	void unsetTransactionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getTransactionType <em>Transaction Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Type</em>' attribute is set.
-	 * @see #unsetTransactionType()
-	 * @see #getTransactionType()
-	 * @see #setTransactionType(TransactionType)
-	 * @generated
-	 */
-	boolean isSetTransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SessionType attribute
-	 */
-	SessionType getSessionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getSessionType <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Session Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.SessionType
-	 * @see #isSetSessionType()
-	 * @see #unsetSessionType()
-	 * @see #getSessionType()
-	 * @generated
-	 */
-	void setSessionType(SessionType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getSessionType <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetSessionType()
-	 * @see #getSessionType()
-	 * @see #setSessionType(SessionType)
-	 * @generated
-	 */
-	void unsetSessionType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getSessionType <em>Session Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Session Type</em>' attribute is set.
-	 * @see #unsetSessionType()
-	 * @see #getSessionType()
-	 * @see #setSessionType(SessionType)
-	 * @generated
-	 */
-	boolean isSetSessionType();
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Endpoint</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * The service-endpoint element contains the
-	 *         fully-qualified name of the enterprise bean's web
-	 *         service endpoint interface. The service-endpoint
-	 *         element may only be specified for a stateless
-	 *         session bean. The specified interface must be a
-	 *         valid JAX-RPC service endpoint interface.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint</em>' reference.
-	 * @see #setServiceEndpoint(JavaClass)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EjbPackage#getSession_ServiceEndpoint()
-	 * @model 
-	 * @generated
-	 */
-	JavaClass getServiceEndpoint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getServiceEndpoint <em>Service Endpoint</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint</em>' reference.
-	 * @see #getServiceEndpoint()
-	 * @generated
-	 */
-	void setServiceEndpoint(JavaClass value);
-	/**
-	 * Helper method to set Java Class name via String
-	 */
-	public void setServiceEndpointName(String serviceEndpointName);
-	/**
-	 * Return true if this Session bean has a service endpoint interface
-	 * interface.
-	 */
-	public boolean hasServiceEndpoint() ;
-	/**
-	 * Helper method to get Java Class name 
-	 */
-	public String getServiceEndpointName();
-	
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SessionType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SessionType.java
deleted file mode 100644
index 539add5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SessionType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface SessionType {}
- */
-public final class SessionType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int STATEFUL= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int STATELESS= 1;
-
-	/**
-	 * The '<em><b>Stateful</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Stateful</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STATEFUL
-	 * @generated
-	 * @ordered
-	 */
-	public static final SessionType STATEFUL_LITERAL = new SessionType(STATEFUL, "Stateful"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Stateless</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Stateless</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STATELESS
-	 * @generated
-	 * @ordered
-	 */
-	public static final SessionType STATELESS_LITERAL = new SessionType(STATELESS, "Stateless"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Session Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final SessionType[] VALUES_ARRAY =
-		new SessionType[] {
-			STATEFUL_LITERAL,
-			STATELESS_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Session Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SessionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Session Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SessionType get(int value) {
-		switch (value) {
-			case STATEFUL: return STATEFUL_LITERAL;
-			case STATELESS: return STATELESS_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private SessionType(int value, String name) {
-		super(value, name);
-	}
-
-} //SessionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SubscriptionDurabilityKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SubscriptionDurabilityKind.java
deleted file mode 100644
index f866a5f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/SubscriptionDurabilityKind.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface SubscriptionDurabilityKind {}
- */
-public final class SubscriptionDurabilityKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int DURABLE= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NON_DURABLE= 1;
-
-	/**
-	 * The '<em><b>Durable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Durable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DURABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final SubscriptionDurabilityKind DURABLE_LITERAL = new SubscriptionDurabilityKind(DURABLE, "Durable"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Non Durable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Non Durable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NON_DURABLE
-	 * @generated
-	 * @ordered
-	 */
-	public static final SubscriptionDurabilityKind NON_DURABLE_LITERAL = new SubscriptionDurabilityKind(NON_DURABLE, "NonDurable"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Subscription Durability Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final SubscriptionDurabilityKind[] VALUES_ARRAY =
-		new SubscriptionDurabilityKind[] {
-			DURABLE_LITERAL,
-			NON_DURABLE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Subscription Durability Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Subscription Durability Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SubscriptionDurabilityKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SubscriptionDurabilityKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Subscription Durability Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SubscriptionDurabilityKind get(int value) {
-		switch (value) {
-			case DURABLE: return DURABLE_LITERAL;
-			case NON_DURABLE: return NON_DURABLE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private SubscriptionDurabilityKind(int value, String name) {
-		super(value, name);
-	}
-
-} //SubscriptionDurabilityKind
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionAttributeType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionAttributeType.java
deleted file mode 100644
index ddc5ded..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionAttributeType.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.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface TransactionAttributeType {}
- */
-public final class TransactionAttributeType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NOT_SUPPORTED= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int SUPPORTS= 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REQUIRED= 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int REQUIRES_NEW= 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int MANDATORY= 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NEVER= 5;
-
-	/**
-	 * The '<em><b>Not Supported</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Not Supported</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT_SUPPORTED
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType NOT_SUPPORTED_LITERAL = new TransactionAttributeType(NOT_SUPPORTED, "NotSupported"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Supports</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Supports</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUPPORTS
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType SUPPORTS_LITERAL = new TransactionAttributeType(SUPPORTS, "Supports"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Required</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Required</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRED
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType REQUIRED_LITERAL = new TransactionAttributeType(REQUIRED, "Required"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Requires New</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Requires New</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUIRES_NEW
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType REQUIRES_NEW_LITERAL = new TransactionAttributeType(REQUIRES_NEW, "RequiresNew"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Mandatory</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Mandatory</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANDATORY
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType MANDATORY_LITERAL = new TransactionAttributeType(MANDATORY, "Mandatory"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Never</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Never</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NEVER
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionAttributeType NEVER_LITERAL = new TransactionAttributeType(NEVER, "Never"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transaction Attribute Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionAttributeType[] VALUES_ARRAY =
-		new TransactionAttributeType[] {
-			NOT_SUPPORTED_LITERAL,
-			SUPPORTS_LITERAL,
-			REQUIRED_LITERAL,
-			REQUIRES_NEW_LITERAL,
-			MANDATORY_LITERAL,
-			NEVER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Attribute Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionAttributeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Attribute Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionAttributeType get(int value) {
-		switch (value) {
-			case NOT_SUPPORTED: return NOT_SUPPORTED_LITERAL;
-			case SUPPORTS: return SUPPORTS_LITERAL;
-			case REQUIRED: return REQUIRED_LITERAL;
-			case REQUIRES_NEW: return REQUIRES_NEW_LITERAL;
-			case MANDATORY: return MANDATORY_LITERAL;
-			case NEVER: return NEVER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionAttributeType(int value, String name) {
-		super(value, name);
-	}
-
-} //TransactionAttributeType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionType.java
deleted file mode 100644
index 43fe0a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/TransactionType.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface TransactionType {}
- */
-public final class TransactionType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BEAN= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CONTAINER= 1;
-
-	/**
-	 * The '<em><b>Bean</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Bean</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BEAN
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionType BEAN_LITERAL = new TransactionType(BEAN, "Bean"); //$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Container</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Container</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionType CONTAINER_LITERAL = new TransactionType(CONTAINER, "Container"); //$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionType[] VALUES_ARRAY =
-		new TransactionType[] {
-			BEAN_LITERAL,
-			CONTAINER_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionType get(int value) {
-		switch (value) {
-			case BEAN: return BEAN_LITERAL;
-			case CONTAINER: return CONTAINER_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionType(int value, String name) {
-		super(value, name);
-	}
-
-} //TransactionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/DefaultEJBModelExtenderProvider.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/DefaultEJBModelExtenderProvider.java
deleted file mode 100644
index f921460..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/DefaultEJBModelExtenderProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 25, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * @author mdelder
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DefaultEJBModelExtenderProvider implements IEJBModelExtenderProvider {
-    
-	/**
-	 * 
-	 */
-	public DefaultEJBModelExtenderProvider() {
-		super();
-		
-	}
-	
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider#getEJBModuleExtension(java.lang.Object)
-     */
-    public EjbModuleExtensionHelper getEJBModuleExtension(Object context) {
-        return null;
-    }
-    
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider#hasEJBModuleExtension(java.lang.Object)
-     */
-    public boolean hasEJBModuleExtension(Object context) {
-        return getEJBModuleExtension(context) != null;
-    }
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EJBModelExtenderManager.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EJBModelExtenderManager.java
deleted file mode 100644
index 616e889..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EJBModelExtenderManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-
-/**
- * @author cbridgha
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EJBModelExtenderManager implements IEJBModelExtenderManager { 
-
-    private IEJBModelExtenderProvider provider = new DefaultEJBModelExtenderProvider();
-    
-    /**
-     * @deprecated Should use IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
-     */
-    public static EjbModuleExtensionHelper getEJBModuleExtension() {
-        return IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
-    }
-
-    public EjbModuleExtensionHelper getEJBModuleExtension(Object context) {
-        return provider.getEJBModuleExtension(context);
-    }
-    
-    public boolean hasEJBModuleExtension(Object context) {
-        return getEJBModuleExtension(context) != null;
-    } 
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderManager#setProvider(org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderProvider)
-     */
-    public void setProvider(IEJBModelExtenderProvider provider) {
-        this.provider = provider;
-    }
-    
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.core.moduleextension.helper.IEJBModelExtenderManager#isProviderSet()
-     */
-    public boolean isProviderSet() {
-        return !(this.provider instanceof DefaultEJBModelExtenderProvider);
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EjbModuleExtensionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EjbModuleExtensionHelper.java
deleted file mode 100644
index 0002f56..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/EjbModuleExtensionHelper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-
-/**
- * This is a helper used for deriving the JNDI name of enterprise beans,
- * and for inheritance support.  The helper can be plugged in by application
- * server vendors.
- */
-
-public interface EjbModuleExtensionHelper extends J2EEModuleExtensionHelper {
-	List getSubtypes(EnterpriseBean anEJB);
-	EnterpriseBean getSuperType(EnterpriseBean anEJB);
-	List getRoleMethodNamesExtended(ContainerManagedEntity cmp);
-	String getEJBInheritanceFileName();
-	String getJNDIName(EJBJar jar, EnterpriseBean bean); 
-	List getRelationships_cmp11(EJBJar jar);
-	List getLocalRelationshipRoles_cmp11(ContainerManagedEntity cmp);
-	boolean isEJBInheritanceSupported();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ExceptionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ExceptionHelper.java
deleted file mode 100644
index cdd7d06..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ExceptionHelper.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-/**
- * Utility class to factor common code for implementers of IWrappedException
- */
-public class ExceptionHelper {
-/**
- * Utility class; cannot be instantiated
- */
-private ExceptionHelper() {
-	super();
-}
-/**
- * Return the messages from @exception and all nested exceptions, in order from outermost to innermost
- */
-public static java.lang.String[] getAllMessages(IWrappedException exception) {
-	List messages = new ArrayList(4);
-	messages.add(exception.getMessage());
-	Exception nested = exception.getNestedException();
-	while (nested != null) {
-		messages.add(nested.getMessage());
-		if (nested instanceof IWrappedException) 
-			nested = ((IWrappedException)nested).getNestedException();
-		else
-			nested = null;
-	}
-	return (String[])messages.toArray(new String[messages.size()]);
-}
-/**
- * Return the messages from @exception and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public static String getConcatenatedMessages(IWrappedException exception) {
-	String[] messages = getAllMessages(exception);
-	StringBuffer sb = new StringBuffer(256);
-	for (int i = 0; i < messages.length; i++){
-		sb.append(messages[i]);
-		if (i < messages.length-1)
-			sb.append('\n');
-	}
-	return sb.toString();
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderManager.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderManager.java
deleted file mode 100644
index f72b2f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * The IEJBModelExtenderManager replaces the former J2EEModuleExtensionManager and acts
- * as a facade for a single IEJBModelExtenderProvider. The IEJBModelExtenderProvider will
- * provide the correct extension helper based on a given context (@see IEJBModelExtenderProvider).
- * 
- * @author mdelder
- *  
- */
-public interface IEJBModelExtenderManager extends IEJBModelExtenderProvider {
-
-    IEJBModelExtenderManager INSTANCE = new EJBModelExtenderManager();
-
-    /**
-     * 
-     * @return true if the provider for which the manager is a facade has been set
-     */
-    boolean isProviderSet();
-
-    /**
-     * 
-     * @param provider the manager will act as a facade to the given provider
-     */
-    void setProvider(IEJBModelExtenderProvider provider);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderProvider.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderProvider.java
deleted file mode 100644
index 28f285b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IEJBModelExtenderProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 25, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * @author mdelder
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface IEJBModelExtenderProvider {
-
-    /**
-     * 
-     * @param context a supplied object to determine the context (e.g. IProject if available)
-     * @return the appropriate EjbModuleExtensionHelper or <b>null</b> if none exists
-     */
-    EjbModuleExtensionHelper getEJBModuleExtension(Object context);
-
-    /**
-     * 
-     * @param context a supplied object to determine the context (e.g. IProject if available)
-     * @return true if the given context has an extension 
-     */
-    boolean hasEJBModuleExtension(Object context);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IWrappedException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IWrappedException.java
deleted file mode 100644
index cce0218..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/IWrappedException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-
-
-/**
- * Common interface for WrappedRuntime and Wrapped exceptions, which can contain nested exceptions
- */
-public interface IWrappedException {
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
-public String[] getAllMessages();
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public String getConcatenatedMessages();
-public String getMessage();
-public java.lang.Exception getNestedException();
-public void printStackTrace();
-public void printStackTrace(java.io.PrintStream s);
-public void printStackTrace(java.io.PrintWriter s);
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
deleted file mode 100644
index ac78bdd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.emf.common.util.URI;
-
-
-
-/**
- * This is a catalog of useful constants for the archive support.  Can be used to
- * store relative paths to specific xml and xmi resources.  
- */
-public interface J2EEConstants extends J2EEVersionConstants {
-	//Standard Jar info
-		/** "META-INF/MANIFEST.MF" 												*/
-	String MANIFEST_URI	 				=	"META-INF/MANIFEST.MF"; //$NON-NLS-1$
-	URI MANIFEST_URI_OBJ	 			=	URI.createURI(MANIFEST_URI);
-	String MANIFEST_SHORT_NAME			= 	"MANIFEST.MF"; //$NON-NLS-1$
-
-		/** "META-INF" 															*/
-	String META_INF						=	"META-INF"; //$NON-NLS-1$
-	/** "WEB-INF"  															*/
-	String WEB_INF						= 	"WEB-INF"; //$NON-NLS-1$
-	/** "ALT-INF"  															*/
-	String ALT_INF						= 	"ALT-INF"; //$NON-NLS-1$
-	//Application client info
-	/** "Application-client_ID"  											*/
-	String APP_CLIENT_ID       			=   "Application-client_ID"; //$NON-NLS-1$
-	/** "META-INF/application-client.xml"  									*/
-	String APP_CLIENT_DD_URI			= 	"META-INF/application-client.xml"; //$NON-NLS-1$
-	URI APP_CLIENT_DD_URI_OBJ		= 	URI.createURI(APP_CLIENT_DD_URI);
-	/** "application-client.xml"  											*/
-	String APP_CLIENT_DD_SHORT_NAME		= 	"application-client.xml"; //$NON-NLS-1$
-	/** Doc type for app client deployment descriptors */
-	String APP_CLIENT_DOCTYPE 			= 	"application-client"; //$NON-NLS-1$
-	String APP_CLIENT_PUBLICID_1_2		=   "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN"; //$NON-NLS-1$
-	String APP_CLIENT_PUBLICID_1_3		=   "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"; //$NON-NLS-1$
-	String APP_CLIENT_SYSTEMID_1_2		= 	"http://java.sun.com/j2ee/dtds/application-client_1_2.dtd"; //$NON-NLS-1$
-	String APP_CLIENT_SYSTEMID_1_3		= 	"http://java.sun.com/dtd/application-client_1_3.dtd"; //$NON-NLS-1$
-	String APP_CLIENT_SCHEMA_1_4       =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";//$NON-NLS-1$
-	
-	
-	//Application constants
-	/** "Application_ID"													*/
-	String APPL_ID						=	"Application_ID"; //$NON-NLS-1$
-	/** "META-INF/application.xml" 											*/
-	String APPLICATION_DD_URI			=	"META-INF/application.xml"; //$NON-NLS-1$
-	URI APPLICATION_DD_URI_OBJ			= 	URI.createURI(APPLICATION_DD_URI);
-	/** "application.xml" 													*/
-	String APPLICATION_DD_SHORT_NAME	=	"application.xml"; //$NON-NLS-1$
-	String EAR_FILE_EXT = ".ear"; ////$NON-NLS-1$
-	/** Doc type for application deployment descriptors */
-	String APPLICATION_DOCTYPE 			= 	"application"; //$NON-NLS-1$
-	String APPLICATION_PUBLICID_1_2		=   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN"; //$NON-NLS-1$
-	String APPLICATION_PUBLICID_1_3		=   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"; //$NON-NLS-1$
-	String APPLICATION_PUBLICID_1_4		=   "-//Sun Microsystems, Inc.//DTD J2EE Application 1.4//EN"; //$NON-NLS-1$
-	String APPLICATION_SYSTEMID_1_2		= 	"http://java.sun.com/j2ee/dtds/application_1_2.dtd"; //$NON-NLS-1$
-	String APPLICATION_SYSTEMID_1_3		= 	"http://java.sun.com/dtd/application_1_3.dtd"; //$NON-NLS-1$
-	String APPLICATION_SYSTEMID_1_4		= 	"http://java.sun.com/dtd/application_1_4.dtd"; //$NON-NLS-1$
-	String APPLICATION_SCHEMA_1_4       =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";//$NON-NLS-1$
-	
-	//EJB Jar Constants
-	/** "ejb-jar_ID"														*/
-	String EJBJAR_ID					=	"ejb-jar_ID"; //$NON-NLS-1$
-	/** "AssemblyDescriptor_ID"												*/
-	String ASSEMBLYDESCRIPTOR_ID		=   "AssemblyDescriptor_ID"; //$NON-NLS-1$
-	/** "ejb-jar.xml"														*/
-	String EJBJAR_DD_SHORT_NAME			=	"ejb-jar.xml"; //$NON-NLS-1$
-	/** "META-INF/ejb-jar.xml"												*/
-	String EJBJAR_DD_URI				=	"META-INF/ejb-jar.xml"; //$NON-NLS-1$
-	URI EJBJAR_DD_URI_OBJ				= 	URI.createURI(EJBJAR_DD_URI);
-	/** "META-INF/ibm-ejb-jar-bnd.xmi"										*/
-	String EJBJAR_DOCTYPE 				= 	"ejb-jar"; //$NON-NLS-1$
-	String EJBJAR_PUBLICID_1_1		=   "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"; //$NON-NLS-1$
-	String EJBJAR_PUBLICID_2_0		=   "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"; //$NON-NLS-1$
-	String EJBJAR_SYSTEMID_1_1		= 	"http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd"; //$NON-NLS-1$
-	String EJBJAR_SYSTEMID_2_0		= 	"http://java.sun.com/dtd/ejb-jar_2_0.dtd"; //$NON-NLS-1$
-	String EJBJAR_SCHEMA_2_1        =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";//$NON-NLS-1$
-	String EJBJAR_SCHEMA_2_1_NS     =   "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";//$NON-NLS-1$
-	
-	//Web app Constants
-	/** "WebApp_ID"															*/
-	String WEBAPP_ID					=  	"WebApp_ID"; //$NON-NLS-1$
-	/** "WEB-INF/web.xml"													*/
-	String WEBAPP_DD_URI				= 	"WEB-INF/web.xml"; //$NON-NLS-1$
-	URI WEBAPP_DD_URI_OBJ				= 	URI.createURI(WEBAPP_DD_URI);
-	/** "web.xml"															*/
-	String WEBAPP_DD_SHORT_NAME			= 	"web.xml"; //$NON-NLS-1$
-	/** "WEB-INF/ibm-web-bnd.xmi"											*/
-	/** Doc type for web app deployment descriptors */
-	String WEBAPP_DOCTYPE 				= 	"web-app"; //$NON-NLS-1$
-	String CONTEXTROOT 					= "context-root"; //$NON-NLS-1$
-	String WEBAPP_PUBLICID_2_2		=   "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"; //$NON-NLS-1$
-	String WEBAPP_PUBLICID_2_3		=   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"; //$NON-NLS-1$
-	String WEBAPP_SYSTEMID_2_2		= 	"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"; //$NON-NLS-1$
-	String WEBAPP_ALT_SYSTEMID_2_2	= 	"http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"; //$NON-NLS-1$
-	String WEBAPP_SYSTEMID_2_3		= 	"http://java.sun.com/dtd/web-app_2_3.dtd"; //$NON-NLS-1$
-	String WEBAPP_SCHEMA_2_4        =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";//$NON-NLS-1$
-	//J2C Resource Adapter Constants
-	/** "J2CResourceAdapter_ID"												*/
-	String RAR_ID						=  	"J2CResourceAdapter_ID"; //$NON-NLS-1$
-	/** "META-INF/ra.xml"													*/
-	String RAR_DD_URI					= 	"META-INF/ra.xml"; //$NON-NLS-1$
-	URI RAR_DD_URI_OBJ					= 	URI.createURI(RAR_DD_URI);
-	String RAR_SHORT_NAME				=	"ra.xml"; //$NON-NLS-1$
-	//Need connector constant.
-	String CONNECTOR_ID					=	"Connector_ID"; //$NON-NLS-1$
-	/** Doc type for connector deployment descriptors */
-	String CONNECTOR_DOCTYPE 			= 	"connector"; //$NON-NLS-1$
-	String CONNECTOR_PUBLICID_1_0		=   "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"; //$NON-NLS-1$
-	String CONNECTOR_SYSTEMID_1_0		= 	"http://java.sun.com/dtd/connector_1_0.dtd"; //$NON-NLS-1$
-	String CONNECTOR_SCHEMA_1_5         =   "http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";//$NON-NLS-1$
-	
-	//Web Services Constants
-	/** Doc type for webservices deployment descriptors */
-	String WEB_SERVICES_CLIENT_DOCTYPE  	= "webservicesclient"; 	//$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_PUBLICID_1_0 = "-//IBM Corporation, Inc.//DTD J2EE Web services client 1.0//EN"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_SYSTEMID_1_0 = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$	
-	String WEB_SERVICES_CLIENT_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_SHORTNAME    = "webservicesclient.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_DD_URI			= 	"webservicesclient.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_META_INF_DD_URI	=   "META-INF/webservicesclient.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_WEB_INF_DD_URI	=   "WEB-INF/webservicesclient.xml"; //$NON-NLS-1$
-	URI WEB_SERVICES_CLIENT_DD_URI_OBJ			= 	URI.createURI(WEB_SERVICES_CLIENT_DD_URI);
-	URI WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ	= 	URI.createURI(WEB_SERVICES_CLIENT_META_INF_DD_URI);
-	URI WEB_SERVICES_CLIENT_WEB_INF_DD_URI_OBJ	= 	URI.createURI(WEB_SERVICES_CLIENT_WEB_INF_DD_URI);
-	
-	String WEB_SERVICES_DD_URI			= 	"webservices.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_META_INF_DD_URI	=   "META-INF/webservices.xml"; //$NON-NLS-1$
-	String WEB_SERVICES_WEB_INF_DD_URI	=   "WEB-INF/webservices.xml"; //$NON-NLS-1$
-	URI WEB_SERVICES_DD_URI_OBJ			= 	URI.createURI(WEB_SERVICES_DD_URI);
-	URI WEB_SERVICES_META_INF_DD_URI_OBJ	= URI.createURI(WEB_SERVICES_META_INF_DD_URI);
-	URI WEB_SERVICES_WEB_INF_DD_URI_OBJ	= 	URI.createURI(WEB_SERVICES_WEB_INF_DD_URI);
-	
-	//Miscellaneous constants
-	/** "UTF-8"																*/
-	String DEFAULT_XML_ENCODING 		= 	"UTF-8"; //$NON-NLS-1$
-	/** "1.0"																*/
-	String DEFAULT_XML_VERSION			= 	"1.0"; //$NON-NLS-1$
-	String JAVA_SUN_COM_URL				=   "http://java.sun.com"; //$NON-NLS-1$
-	String WWW_W3_ORG_URL				=   "http://www.w3.org"; //$NON-NLS-1$
-	String WWW_IBM_COM_URL				=   "http://www.ibm.com"; //$NON-NLS-1$
-	
-	String J2EE_NS_URL 						= "http://java.sun.com/xml/ns/j2ee"; //$NON-NLS-1$
-	String J2EE_1_4_XSD_SHORT_NAME			= "j2ee_1_4.xsd"; //$NON-NLS-1$
-	String XSI_NS_URL 						= "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-	String APPLICATION_SCHEMA_LOC_1_4 	= "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"; //$NON-NLS-1$
-	String APP_CLIENT_SCHEMA_LOC_1_4 	= "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"; //$NON-NLS-1$
-	String EJB_JAR_SCHEMA_LOC_2_1		= "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"; //$NON-NLS-1$
-	String CONNECTOR_SCHEMA_LOC_1_5		= "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"; //$NON-NLS-1$
-	String WEB_APP_SCHEMA_LOC_2_4		= "http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; //$NON-NLS-1$
-	String WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1 = "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"; //$NON-NLS-1$
-	String JSP_SCHEMA_LOC_2_0			=  "http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"; //$NON-NLS-1$
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java
deleted file mode 100644
index c78c5f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEInit.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.lang.reflect.Method;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceFactory;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.J2EEXMIResourceFactory;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.util.EJBAttributeMaintenanceFactoryImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.WebServicesClientResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.utilities.AdapterFactoryDescriptor;
-import org.eclipse.wst.common.internal.emf.utilities.DOMUtilities;
-import org.eclipse.wst.common.internal.emf.utilities.EncoderDecoderRegistry;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.PasswordEncoderDecoder;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-
-/**
- * Insert the type's description here.
- * Creation date: (10/3/2000 3:07:37 PM)
- * @author: Administrator
- */
-public class J2EEInit {
-	
-	
-	static {
-		try { 
-			if(Boolean.getBoolean("LOG_XERCES_VERSION")) {				 //$NON-NLS-1$
-				Class clz = ClassLoader.getSystemClassLoader().loadClass("org.apache.xerces.impl.Version"); //$NON-NLS-1$
-				Method main = clz.getDeclaredMethod("main", new Class[] { String[].class } ); //$NON-NLS-1$
-				Object version = clz.newInstance();
-				main.invoke(version, new Object[] { new String[] {} }); 
-				System.out.println(clz.getResource("Version.class"));  //$NON-NLS-1$
-			}
-		} catch(Throwable t) {
-			System.out.println("Problem while logging version " + t);
-			t.printStackTrace();
-		} 
-	}
-	
-	protected static boolean initialized = false;
-	protected static boolean plugin_initialized = false;
-	public static void init() {
-		init(true);
-	}
-
-	public static void init(boolean shouldPreRegisterPackages) {
-		if (!initialized) {
-			initialized = true;
-			setDefaultEncoderDecoder();
-			DOMUtilities.setDefaultEntityResolver(J2EEXmlDtDEntityResolver.INSTANCE);
-			org.eclipse.jem.internal.java.init.JavaInit.init(shouldPreRegisterPackages);
-			if (shouldPreRegisterPackages)
-				preRegisterPackages();
-			initResourceFactories();
-			EjbFactoryImpl.internalRegisterEJBRelationAdapterFactory(new AdapterFactoryDescriptor() {
-				public AdapterFactory createAdapterFactory() {
-					return new EJBAttributeMaintenanceFactoryImpl();
-				}
-			});
-			EjbFactoryImpl.internalRegisterRelationshipsAdapterFactory(new AdapterFactoryDescriptor() {
-				public AdapterFactory createAdapterFactory() {
-					return new EJBAttributeMaintenanceFactoryImpl();
-				}
-			});
-			//TODO: Remove this line after SED Adapter is restored.
-			RendererFactory.getDefaultRendererFactory().setValidating(false);
-
-		}
-	}
-
-	/** 
-	 * If the currently defaulted encoder is the initial pass thru encoder,
-	 * then register a Password encoder for security; otherwise if a more sophisticated
-	 * encoder is already registered, then do nothing.
-	 */
-	private static void setDefaultEncoderDecoder() {
-		EncoderDecoderRegistry reg = EncoderDecoderRegistry.getDefaultRegistry();
-		if (reg.getDefaultEncoderDecoder() == EncoderDecoderRegistry.INITIAL_DEFAULT_ENCODER) {
-			reg.setDefaultEncoderDecoder(new PasswordEncoderDecoder());
-		}
-	}
-
-	private static void preRegisterPackages() {
-		//common
-		ExtendedEcoreUtil.preRegisterPackage("common.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return CommonPackage.eINSTANCE;
-			}
-		});
-		//application
-		ExtendedEcoreUtil.preRegisterPackage("application.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return ApplicationPackage.eINSTANCE;
-			}
-		});
-		//client
-		ExtendedEcoreUtil.preRegisterPackage("client.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return ClientPackage.eINSTANCE;
-			}
-		});
-		//webapplication
-		ExtendedEcoreUtil.preRegisterPackage("webapplication.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return WebapplicationPackage.eINSTANCE;
-			}
-		});
-		//ejb
-		ExtendedEcoreUtil.preRegisterPackage("ejb.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return EjbPackage.eINSTANCE;
-			}
-		});
-		//jca
-		ExtendedEcoreUtil.preRegisterPackage("jca.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return JcaPackage.eINSTANCE;
-			}
-		});
-		//webservicesclient
-		ExtendedEcoreUtil.preRegisterPackage("webservice_client.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return Webservice_clientPackage.eINSTANCE;
-			}
-		});
-		//webservicescommon
-		ExtendedEcoreUtil.preRegisterPackage("wscommon.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return WscommonPackage.eINSTANCE;
-			}
-		});
-		//webservicesdd
-		ExtendedEcoreUtil.preRegisterPackage("wsdd.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return WsddPackage.eINSTANCE;
-			}
-		});
-		//jaxrpcmap
-		ExtendedEcoreUtil.preRegisterPackage("jaxrpcmap.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return JaxrpcmapPackage.eINSTANCE;
-			}
-		});		
-//		jsp
-		ExtendedEcoreUtil.preRegisterPackage("jsp.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return JspPackage.eINSTANCE;
-			}
-		});
-		//taglib
-		ExtendedEcoreUtil.preRegisterPackage("taglib.xmi", new EPackage.Descriptor() { //$NON-NLS-1$
-			public EPackage getEPackage() {
-				return TaglibPackage.eINSTANCE;
-			}
-		});	
-		
-	}
-
-	public static void initResourceFactories() {
-		//Make protected	
-		Revisit.revisit();
-
-		// Only register the default factories if another set has not
-		// already been registered.
-
-		Resource.Factory j2ee = J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.EJBJAR_DD_URI_OBJ);
-		Resource.Factory defaultFact = J2EEResourceFactoryRegistry.INSTANCE.getFactory(URI.createURI(Resource.Factory.Registry.DEFAULT_EXTENSION));
-		if (j2ee == defaultFact) {
-			EJBJarResourceFactory.register();
-			WebAppResourceFactory.register();
-			ApplicationClientResourceFactory.register();
-			ApplicationResourceFactory.register();
-			ConnectorResourceFactory.register();
-			WebServicesClientResourceFactory.register();
-			WsddResourceFactory.register();
-			//register() is not called on the JaxrpcmapResourceFactory because
-			//the jaxprc-mapping descriptor does not have a standard short name.
-			//The short names have to be registered once they are known.
-			J2EEXMIResourceFactory.register();
-		}
-		EJBJarResourceFactory.registerDtds();
-		WebAppResourceFactory.registerDtds();
-		ApplicationClientResourceFactory.registerDtds();
-		ApplicationResourceFactory.registerDtds();
-		ConnectorResourceFactory.registerDtds();
-		WebServicesClientResourceFactory.registerDtds();
-		WsddResourceFactory.registerDtds();
-		JaxrpcmapResourceFactory.registerDtds();
-	}
-	public static void setPluginInit(boolean bPluginInit) {
-		// Here's where the configuration file would be read.
-		plugin_initialized = bPluginInit;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEModuleExtensionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEModuleExtensionHelper.java
deleted file mode 100644
index 2b8b84d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEModuleExtensionHelper.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 19, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface J2EEModuleExtensionHelper {
-	String getDocType();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
deleted file mode 100644
index b9e776b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionConstants.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 16, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * These constants are used with the XMLResource
- */
-public interface J2EEVersionConstants {
-	public int J2EE_1_2_ID = 12;
-	public int J2EE_1_3_ID = 13;
-	public int J2EE_1_4_ID = 14;
-	public int EJB_1_0_ID = 10;	
-	public int EJB_1_1_ID = 11;	
-	public int EJB_2_0_ID = 20;	
-	public int EJB_2_1_ID = 21;	
-	public int WEB_2_2_ID = 22;
-	public int WEB_2_3_ID = 23;
-	public int WEB_2_4_ID = 24;
-	public int TAGLIB_1_1_ID = 11;
-	public int TAGLIB_1_2_ID = 12;
-	public int TAGLIB_2_0_ID = 20;
-	public int JSP_1_1_ID = 11;
-	public int JSP_1_2_ID = 12;
-	public int JSP_2_0_ID = 20;
-	public int SERVLET_2_2 = 22;
-	public int SERVLET_2_3 = 23;
-	public int SERVLET_2_4 = 24;
-	public int JCA_1_0_ID = 10;
-	public int JCA_1_5_ID = 15;
-	public int WEBSERVICES_1_0_ID = 10;
-	public int WEBSERVICES_1_1_ID = 11;
-	public String J2EE_1_4_TEXT 		= "1.4"; //$NON-NLS-1$
-	
-
-	public int VERSION_1_0 = 10;	
-	public int VERSION_1_1 = 11;	
-	public int VERSION_1_2 = 12;	
-	public int VERSION_1_3 = 13;	
-	public int VERSION_1_4 = 14;
-	public int VERSION_1_5 = 15;
-	public int VERSION_2_0 = 20;
-	public int VERSION_2_1 = 21;	
-	public int VERSION_2_2 = 22;	
-	public int VERSION_2_3 = 23;	
-	public int VERSION_2_4 = 24;	
-	public int VERSION_2_5 = 25; 
-	
-	public String VERSION_1_0_TEXT		= "1.0"; //$NON-NLS-1$
-	public String VERSION_1_1_TEXT    	= "1.1"; //$NON-NLS-1$
-	public String VERSION_1_2_TEXT		= "1.2"; //$NON-NLS-1$
-	public String VERSION_1_3_TEXT		= "1.3"; //$NON-NLS-1$
-	public String VERSION_1_4_TEXT		= "1.4"; //$NON-NLS-1$
-	public String VERSION_1_5_TEXT		= "1.5"; //$NON-NLS-1$
-	public String VERSION_2_0_TEXT		= "2.0"; //$NON-NLS-1$
-	public String VERSION_2_1_TEXT		= "2.1"; //$NON-NLS-1$
-	public String VERSION_2_2_TEXT		= "2.2"; //$NON-NLS-1$
-	public String VERSION_2_3_TEXT		= "2.3"; //$NON-NLS-1$
-	public String VERSION_2_4_TEXT		= "2.4"; //$NON-NLS-1$
-	public String VERSION_2_5_TEXT		= "2.5"; //$NON-NLS-1$
-					
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionUtil.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionUtil.java
deleted file mode 100644
index 68b756c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEVersionUtil.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Created on Mar 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal;
-
-/**
- * @author nagrawal
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEVersionUtil {
-
-	public static String getServletTextVersion(int aVersion) {
-		switch (aVersion) {
-		case J2EEVersionConstants.SERVLET_2_2:
-			return J2EEVersionConstants.VERSION_2_2_TEXT;
-
-		case J2EEVersionConstants.SERVLET_2_3:
-			return J2EEVersionConstants.VERSION_2_3_TEXT;
-
-		case J2EEVersionConstants.SERVLET_2_4:
-			return J2EEVersionConstants.VERSION_2_4_TEXT;
-		}
-		return ""; //$NON-NLS-1$
-
-	}
-
-	public static String getEJBTextVersion(int aVersion) {
-
-		switch (aVersion) {
-		case J2EEVersionConstants.EJB_1_0_ID:
-			return J2EEVersionConstants.VERSION_1_0_TEXT;
-
-		case J2EEVersionConstants.EJB_1_1_ID:
-			return J2EEVersionConstants.VERSION_1_1_TEXT;
-
-		case J2EEVersionConstants.EJB_2_0_ID:
-			return J2EEVersionConstants.VERSION_2_0_TEXT;
-
-		case J2EEVersionConstants.EJB_2_1_ID:
-			return J2EEVersionConstants.VERSION_2_1_TEXT;
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static String getJCATextVersion(int aVersion) {
-		switch (aVersion) {
-		case J2EEVersionConstants.JCA_1_0_ID:
-			return J2EEVersionConstants.VERSION_1_0_TEXT;
-
-		case J2EEVersionConstants.JCA_1_5_ID:
-			return J2EEVersionConstants.VERSION_1_5_TEXT;
-
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static String getJ2EETextVersion(int aVersion) {
-		switch (aVersion) {
-		case J2EEVersionConstants.J2EE_1_2_ID:
-			return J2EEVersionConstants.VERSION_1_2_TEXT;
-
-		case J2EEVersionConstants.J2EE_1_3_ID:
-			return J2EEVersionConstants.VERSION_1_3_TEXT;
-
-		case J2EEVersionConstants.J2EE_1_4_ID:
-			return J2EEVersionConstants.VERSION_1_4_TEXT;
-
-		}
-		return "";//$NON-NLS-1$
-	}
-
-	public static int convertAppClientVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-			return J2EEVersionConstants.J2EE_1_2_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public static int convertEJBVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_1_1_TEXT))
-			return J2EEVersionConstants.J2EE_1_2_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_0_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_1_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public static int convertWebVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_2_2_TEXT))
-			return J2EEVersionConstants.J2EE_1_2_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_3_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_2_4_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-
-	public static int convertConnectorVersionStringToJ2EEVersionID(String version) {
-		if (version.equals(J2EEVersionConstants.VERSION_1_0_TEXT))
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		if (version.equals(J2EEVersionConstants.VERSION_1_5_TEXT))
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		// default
-		return J2EEVersionConstants.J2EE_1_4_ID;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/MOFJ2EEResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/MOFJ2EEResourceHandler.java
deleted file mode 100644
index c39d9eb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/MOFJ2EEResourceHandler.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.internal;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class MOFJ2EEResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("mofj2ee");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String, String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle= getResourceBundle();
-		}
-		
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		} 
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-		
-	}
-public static String getString(String key, Object[] args) {
-
-	try {return MessageFormat.format(getString(key), args);}
-	catch (IllegalArgumentException e) {return getString(key);}
-
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java
deleted file mode 100644
index 8ed1152..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.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.internal;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXMLResourceHandler;
-
-
-
-/**
- * Base exception class for non-runtime exceptions, where a caught exception
- * causes this exception to be thrown
- */
-public abstract class WrappedException extends Exception implements IWrappedException {
-	/** The exception which necessitated this exception */
-	protected Exception nestedException;
-
-public WrappedException() {
-	super();
-}
-public WrappedException(Exception e) {
-	super();
-	setNestedException(e);
-}
-public WrappedException(String s) {
-	super(s);
-}
-public WrappedException(String s, Exception e) {
-	super(s);
-	setNestedException(e);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
-public java.lang.String[] getAllMessages() {
-	return ExceptionHelper.getAllMessages(this);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public java.lang.String getConcatenatedMessages() {
-	return ExceptionHelper.getConcatenatedMessages(this);
-}
-public java.lang.Exception getNestedException() {
-	return nestedException;
-}
-/**
- * Print out a stack trace to the system err.
- */
-public void printStackTrace() {
-	printStackTrace(System.err);
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintStream s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(J2EEXMLResourceHandler.getString("Stack_trace_of_nested_exce")); //$NON-NLS-1$ = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintWriter s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(J2EEXMLResourceHandler.getString("Stack_trace_of_nested_exce")); //$NON-NLS-1$ = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-public void setNestedException(java.lang.Exception newNestedException) {
-	nestedException = newNestedException;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java
deleted file mode 100644
index 1c0019e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.xml.J2EEXMLResourceHandler;
-
-
-
-
-public class WrappedRuntimeException extends RuntimeException implements IWrappedException {
-	/** The exception which necessitated this runtime exception, if one exists */
-	protected Exception nestedException;
-public WrappedRuntimeException() {
-	super();
-}
-public WrappedRuntimeException(Exception e) {
-	super();
-	setNestedException(e);
-}
-public WrappedRuntimeException(String s) {
-	super(s);
-}
-public WrappedRuntimeException(String s, Exception e) {
-	super(s);
-	setNestedException(e);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost
- */
-public java.lang.String[] getAllMessages() {
-	return ExceptionHelper.getAllMessages(this);
-}
-/**
- * Return the messages from this and all nested exceptions, in order from outermost to innermost,
- * concatenated as one
- */
-public java.lang.String getConcatenatedMessages() {
-	return ExceptionHelper.getConcatenatedMessages(this);
-}
-/**
- * @return java.lang.Exception
- */
-public java.lang.Exception getNestedException() {
-	return nestedException;
-}
-/**
- * Print out a stack trace to the system err.
- */
-public void printStackTrace() {
-	printStackTrace(System.err);
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintStream s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(J2EEXMLResourceHandler.getString("Stack_trace_of_nested_exce")); //$NON-NLS-1$ = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-/**
-* Prints the exception to System.err.
-* If we have a nested exception, print its stack.
-*/
-public void printStackTrace(java.io.PrintWriter s) {
-	if (nestedException != null) {
-		s.println(this);
-		s.println(J2EEXMLResourceHandler.getString("Stack_trace_of_nested_exce")); //$NON-NLS-1$ = "Stack trace of nested exception:"
-		nestedException.printStackTrace(s);
-	} else {
-		super.printStackTrace(s);
-	}
-}
-/**
- * @param newNestedException java.lang.Exception
- */
-public void setNestedException(java.lang.Exception newNestedException) {
-	nestedException = newNestedException;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/ApplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/ApplicationPackage.java
deleted file mode 100644
index 06b4a27..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/ApplicationPackage.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.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.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-
-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 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 = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE__ALT_DD = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MODULE__APPLICATION = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MODULE_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 = MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE__ALT_DD = MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE__APPLICATION = MODULE__APPLICATION;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_MODULE__CONTEXT_ROOT = MODULE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Web Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_MODULE_FEATURE_COUNT = 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 = MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLIENT_MODULE__ALT_DD = MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JAVA_CLIENT_MODULE__APPLICATION = MODULE__APPLICATION;
-
-	/**
-	 * The number of structural features of the the '<em>Java Client Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JAVA_CLIENT_MODULE_FEATURE_COUNT = 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 = MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE__ALT_DD = MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_MODULE__APPLICATION = MODULE__APPLICATION;
-
-	/**
-	 * The number of structural features of the the '<em>Ejb Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_MODULE_FEATURE_COUNT = 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 = MODULE__URI;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE__ALT_DD = MODULE__ALT_DD;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR_MODULE__APPLICATION = MODULE__APPLICATION;
-
-
-	/**
-	 * The number of structural features of the the '<em>Connector Module</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_MODULE_FEATURE_COUNT = 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.internal.application"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ApplicationPackage eINSTANCE = org.eclipse.jst.j2ee.internal.application.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.internal.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.internal.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();
-
-} //ApplicationPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationFactoryImpl.java
deleted file mode 100644
index c5ebf00..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationFactoryImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-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.internal.application.ApplicationPackage;
-
-/**
- * @generated
- */
-public class ApplicationFactoryImpl extends EFactoryImpl implements ApplicationFactory{
- 
-	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"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-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/internal/application/impl/ApplicationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationImpl.java
deleted file mode 100644
index 468c669..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationImpl.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.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.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.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.common.util.CommonUtil;
-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.eINSTANCE.getApplication();
-	}
-
-/**
- * @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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case ApplicationPackage.APPLICATION__MODULES:
-					return ((InternalEList)getModules()).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 ApplicationPackage.APPLICATION__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-					return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-				case ApplicationPackage.APPLICATION__MODULES:
-					return ((InternalEList)getModules()).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 ApplicationPackage.APPLICATION__ICONS:
-				return getIcons();
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				return getDisplayNames();
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				return getDescriptions();
-			case ApplicationPackage.APPLICATION__SMALL_ICON:
-				return getSmallIcon();
-			case ApplicationPackage.APPLICATION__LARGE_ICON:
-				return getLargeIcon();
-			case ApplicationPackage.APPLICATION__DESCRIPTION:
-				return getDescription();
-			case ApplicationPackage.APPLICATION__DISPLAY_NAME:
-				return getDisplayName();
-			case ApplicationPackage.APPLICATION__VERSION:
-				return getVersion();
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				return getSecurityRoles();
-			case ApplicationPackage.APPLICATION__MODULES:
-				return getModules();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.APPLICATION__ICONS:
-				return icons != null && !icons.isEmpty();
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case ApplicationPackage.APPLICATION__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case ApplicationPackage.APPLICATION__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case ApplicationPackage.APPLICATION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case ApplicationPackage.APPLICATION__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			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 eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.APPLICATION__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case ApplicationPackage.APPLICATION__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			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;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.APPLICATION__ICONS:
-				getIcons().clear();
-				return;
-			case ApplicationPackage.APPLICATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case ApplicationPackage.APPLICATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case ApplicationPackage.APPLICATION__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case ApplicationPackage.APPLICATION__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case ApplicationPackage.APPLICATION__MODULES:
-				getModules().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(" (version: "); //$NON-NLS-1$
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationPackageImpl.java
deleted file mode 100644
index 8e85f09..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationPackageImpl.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-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.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.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 EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ApplicationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theApplicationPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theApplicationPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-
-		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
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		applicationEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		webModuleEClass.getESuperTypes().add(this.getModule());
-		javaClientModuleEClass.getESuperTypes().add(this.getModule());
-		ejbModuleEClass.getESuperTypes().add(this.getModule());
-		connectorModuleEClass.getESuperTypes().add(this.getModule());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(applicationEClass, Application.class, "Application", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getApplication_Version(), ecorePackage.getEString(), "version", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplication_SecurityRoles(), theCommonPackage.getSecurityRole(), null, "securityRoles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplication_Modules(), this.getModule(), this.getModule_Application(), "modules", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(moduleEClass, Module.class, "Module", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getModule_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getModule_Application(), this.getApplication(), this.getApplication_Modules(), "application", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(webModuleEClass, WebModule.class, "WebModule", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getWebModule_ContextRoot(), ecorePackage.getEString(), "contextRoot", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(javaClientModuleEClass, JavaClientModule.class, "JavaClientModule", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(ejbModuleEClass, EjbModule.class, "EjbModule", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(connectorModuleEClass, ConnectorModule.class, "ConnectorModule", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //ApplicationPackageImpl
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java
deleted file mode 100644
index 5eccc7c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-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_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(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/internal/application/impl/ApplicationResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceImpl.java
deleted file mode 100644
index 550a718..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ApplicationResourceImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.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.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-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;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.APPLICATION_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/internal/application/impl/ConnectorModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ConnectorModuleImpl.java
deleted file mode 100644
index 7779a37..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ConnectorModuleImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.impl;
-
-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.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-
-/**
- * Specifies the URI of a resource adapter archive file, relative to the top level of the application package.
- */
-public class ConnectorModuleImpl extends ModuleImpl implements ConnectorModule, Module{
-
-	public ConnectorModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.eINSTANCE.getConnectorModule();
-	}
-
-	/**
-	 * <!-- 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 ApplicationPackage.CONNECTOR_MODULE__APPLICATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, ApplicationPackage.CONNECTOR_MODULE__APPLICATION, 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 ApplicationPackage.CONNECTOR_MODULE__APPLICATION:
-					return eBasicSetContainer(null, ApplicationPackage.CONNECTOR_MODULE__APPLICATION, 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 ApplicationPackage.CONNECTOR_MODULE__APPLICATION:
-					return eContainer.eInverseRemove(this, ApplicationPackage.APPLICATION__MODULES, Application.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 ApplicationPackage.CONNECTOR_MODULE__URI:
-				return getUri();
-			case ApplicationPackage.CONNECTOR_MODULE__ALT_DD:
-				return getAltDD();
-			case ApplicationPackage.CONNECTOR_MODULE__APPLICATION:
-				return getApplication();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.CONNECTOR_MODULE__URI:
-				setUri((String)newValue);
-				return;
-			case ApplicationPackage.CONNECTOR_MODULE__ALT_DD:
-				setAltDD((String)newValue);
-				return;
-			case ApplicationPackage.CONNECTOR_MODULE__APPLICATION:
-				setApplication((Application)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.CONNECTOR_MODULE__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case ApplicationPackage.CONNECTOR_MODULE__ALT_DD:
-				setAltDD(ALT_DD_EDEFAULT);
-				return;
-			case ApplicationPackage.CONNECTOR_MODULE__APPLICATION:
-				setApplication((Application)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.CONNECTOR_MODULE__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case ApplicationPackage.CONNECTOR_MODULE__ALT_DD:
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-			case ApplicationPackage.CONNECTOR_MODULE__APPLICATION:
-				return getApplication() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-public boolean isConnectorModule() {
-		return true;
-}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/EjbModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/EjbModuleImpl.java
deleted file mode 100644
index fd2a185..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/EjbModuleImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.impl;
-
-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.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-
-/**
- * Specifies the URI of a ejb-jar, relative to the top level of the application package.
-
- */
-public class EjbModuleImpl extends ModuleImpl implements EjbModule, Module {
-
-	public EjbModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.eINSTANCE.getEjbModule();
-	}
-
-	/**
-	 * <!-- 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 ApplicationPackage.EJB_MODULE__APPLICATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, ApplicationPackage.EJB_MODULE__APPLICATION, 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 ApplicationPackage.EJB_MODULE__APPLICATION:
-					return eBasicSetContainer(null, ApplicationPackage.EJB_MODULE__APPLICATION, 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 ApplicationPackage.EJB_MODULE__APPLICATION:
-					return eContainer.eInverseRemove(this, ApplicationPackage.APPLICATION__MODULES, Application.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 ApplicationPackage.EJB_MODULE__URI:
-				return getUri();
-			case ApplicationPackage.EJB_MODULE__ALT_DD:
-				return getAltDD();
-			case ApplicationPackage.EJB_MODULE__APPLICATION:
-				return getApplication();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.EJB_MODULE__URI:
-				setUri((String)newValue);
-				return;
-			case ApplicationPackage.EJB_MODULE__ALT_DD:
-				setAltDD((String)newValue);
-				return;
-			case ApplicationPackage.EJB_MODULE__APPLICATION:
-				setApplication((Application)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.EJB_MODULE__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case ApplicationPackage.EJB_MODULE__ALT_DD:
-				setAltDD(ALT_DD_EDEFAULT);
-				return;
-			case ApplicationPackage.EJB_MODULE__APPLICATION:
-				setApplication((Application)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.EJB_MODULE__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case ApplicationPackage.EJB_MODULE__ALT_DD:
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-			case ApplicationPackage.EJB_MODULE__APPLICATION:
-				return getApplication() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-public boolean isEjbModule() {
-	return true;
-}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/JavaClientModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/JavaClientModuleImpl.java
deleted file mode 100644
index 8ac4bf2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/JavaClientModuleImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.impl;
-
-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.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-
-/**
- * specifies the URI of a java application client module, relative to the top level of the application package.
-
- */
-public class JavaClientModuleImpl extends ModuleImpl implements JavaClientModule, Module {
-
-	public JavaClientModuleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return ApplicationPackage.eINSTANCE.getJavaClientModule();
-	}
-
-	/**
-	 * <!-- 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 ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION, 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 ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION:
-					return eBasicSetContainer(null, ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION, 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 ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION:
-					return eContainer.eInverseRemove(this, ApplicationPackage.APPLICATION__MODULES, Application.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 ApplicationPackage.JAVA_CLIENT_MODULE__URI:
-				return getUri();
-			case ApplicationPackage.JAVA_CLIENT_MODULE__ALT_DD:
-				return getAltDD();
-			case ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION:
-				return getApplication();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.JAVA_CLIENT_MODULE__URI:
-				setUri((String)newValue);
-				return;
-			case ApplicationPackage.JAVA_CLIENT_MODULE__ALT_DD:
-				setAltDD((String)newValue);
-				return;
-			case ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION:
-				setApplication((Application)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.JAVA_CLIENT_MODULE__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case ApplicationPackage.JAVA_CLIENT_MODULE__ALT_DD:
-				setAltDD(ALT_DD_EDEFAULT);
-				return;
-			case ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION:
-				setApplication((Application)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.JAVA_CLIENT_MODULE__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case ApplicationPackage.JAVA_CLIENT_MODULE__ALT_DD:
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-			case ApplicationPackage.JAVA_CLIENT_MODULE__APPLICATION:
-				return getApplication() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-public boolean isJavaModule() {
-	return true;
-}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ModuleImpl.java
deleted file mode 100644
index 1784bc7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/ModuleImpl.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-
-
-/**
- * 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.
-
- */
-public class ModuleImpl extends EObjectImpl implements Module, EObject {
-
-	/**
-	 * 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.eINSTANCE.getModule();
-	}
-
-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;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setApplication(Application newApplication) {
-		if (newApplication != eContainer || (eContainerFeatureID != ApplicationPackage.MODULE__APPLICATION && newApplication != null)) {
-			if (EcoreUtil.isAncestor(this, newApplication))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newApplication != null)
-				msgs = ((InternalEObject)newApplication).eInverseAdd(this, ApplicationPackage.APPLICATION__MODULES, Application.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newApplication, ApplicationPackage.MODULE__APPLICATION, 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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case ApplicationPackage.MODULE__APPLICATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, ApplicationPackage.MODULE__APPLICATION, 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 ApplicationPackage.MODULE__APPLICATION:
-					return eBasicSetContainer(null, ApplicationPackage.MODULE__APPLICATION, 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 ApplicationPackage.MODULE__APPLICATION:
-					return eContainer.eInverseRemove(this, ApplicationPackage.APPLICATION__MODULES, Application.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 ApplicationPackage.MODULE__URI:
-				return getUri();
-			case ApplicationPackage.MODULE__ALT_DD:
-				return getAltDD();
-			case ApplicationPackage.MODULE__APPLICATION:
-				return getApplication();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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 eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			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;
-		}
-		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(" (uri: "); //$NON-NLS-1$
-		result.append(uri);
-		result.append(", altDD: "); //$NON-NLS-1$
-		result.append(altDD);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/WebModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/WebModuleImpl.java
deleted file mode 100644
index 7496a27..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/impl/WebModuleImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-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.internal.application.ApplicationPackage;
-
-
-/**
- * Contains the web-uri and context-root of a web application module.
-
- */
-public class WebModuleImpl extends ModuleImpl implements WebModule, Module {
-
-	/**
-	 * 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.eINSTANCE.getWebModule();
-	}
-
-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 NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case ApplicationPackage.WEB_MODULE__APPLICATION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, ApplicationPackage.WEB_MODULE__APPLICATION, 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 ApplicationPackage.WEB_MODULE__APPLICATION:
-					return eBasicSetContainer(null, ApplicationPackage.WEB_MODULE__APPLICATION, 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 ApplicationPackage.WEB_MODULE__APPLICATION:
-					return eContainer.eInverseRemove(this, ApplicationPackage.APPLICATION__MODULES, Application.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 ApplicationPackage.WEB_MODULE__URI:
-				return getUri();
-			case ApplicationPackage.WEB_MODULE__ALT_DD:
-				return getAltDD();
-			case ApplicationPackage.WEB_MODULE__APPLICATION:
-				return getApplication();
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				return getContextRoot();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.WEB_MODULE__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case ApplicationPackage.WEB_MODULE__ALT_DD:
-				return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD);
-			case ApplicationPackage.WEB_MODULE__APPLICATION:
-				return getApplication() != null;
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				return CONTEXT_ROOT_EDEFAULT == null ? contextRoot != null : !CONTEXT_ROOT_EDEFAULT.equals(contextRoot);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.WEB_MODULE__URI:
-				setUri((String)newValue);
-				return;
-			case ApplicationPackage.WEB_MODULE__ALT_DD:
-				setAltDD((String)newValue);
-				return;
-			case ApplicationPackage.WEB_MODULE__APPLICATION:
-				setApplication((Application)newValue);
-				return;
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				setContextRoot((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ApplicationPackage.WEB_MODULE__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case ApplicationPackage.WEB_MODULE__ALT_DD:
-				setAltDD(ALT_DD_EDEFAULT);
-				return;
-			case ApplicationPackage.WEB_MODULE__APPLICATION:
-				setApplication((Application)null);
-				return;
-			case ApplicationPackage.WEB_MODULE__CONTEXT_ROOT:
-				setContextRoot(CONTEXT_ROOT_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(" (contextRoot: "); //$NON-NLS-1$
-		result.append(contextRoot);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationAdapterFactory.java
deleted file mode 100644
index e528055..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationAdapterFactory.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.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.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.internal.application.ApplicationPackage;
-
-
-
-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 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 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.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.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;
-	}
-
-} //ApplicationAdapterFactory
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationSwitch.java
deleted file mode 100644
index 00cd686..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/application/util/ApplicationSwitch.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.application.util;
-
-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.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.internal.application.ApplicationPackage;
-
-
-/**
- * <!-- 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.internal.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) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				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 = defaultCase(theEObject);
-					return result;
-				}
-				case ApplicationPackage.MODULE: {
-					Module module = (Module)theEObject;
-					Object result = caseModule(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 = caseModule(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 = caseModule(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 = caseModule(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 = caseModule(connectorModule);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		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>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;
-	}
-
-} //ApplicationSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/ClientPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/ClientPackage.java
deleted file mode 100644
index d23c6c7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/ClientPackage.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.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.client.ClientFactory;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-
-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 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.internal.client.ResAuthApplicationType <em>Res Auth Application Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.client.ResAuthApplicationType
-	 * @see org.eclipse.jst.j2ee.internal.client.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.internal.client"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ClientPackage eINSTANCE = org.eclipse.jst.j2ee.internal.client.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.internal.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.internal.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.internal.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.internal.client.ApplicationClient#getServiceRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_ServiceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.client.ApplicationClient#getMessageDestinationRefs()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.client.ApplicationClient#getMessageDestinations()
-	 * @see #getApplicationClient()
-	 * @generated
-	 */
-	EReference getApplicationClient_MessageDestinations();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.internal.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.internal.client.ResAuthApplicationType
-	 * @generated
-	 */
-	EEnum getResAuthApplicationType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	ClientFactory getClientFactory();
-
-} //ClientPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientImpl.java
deleted file mode 100644
index e49111a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientImpl.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.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.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.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-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.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.common.util.CommonUtil;
-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.eINSTANCE.getApplicationClient();
-	}
-
-/**
- * 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()) {
-			JavaClass oldCallbackHandler = callbackHandler;
-			callbackHandler = (JavaClass)eResolveProxy((InternalEObject)callbackHandler);
-			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, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case ClientPackage.APPLICATION_CLIENT__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case ClientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				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);
-				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 ClientPackage.APPLICATION_CLIENT__ICONS:
-				return getIcons();
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				return getDisplayNames();
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				return getDescriptions();
-			case ClientPackage.APPLICATION_CLIENT__SMALL_ICON:
-				return getSmallIcon();
-			case ClientPackage.APPLICATION_CLIENT__LARGE_ICON:
-				return getLargeIcon();
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTION:
-				return getDescription();
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAME:
-				return getDisplayName();
-			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 eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ClientPackage.APPLICATION_CLIENT__ICONS:
-				return icons != null && !icons.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case ClientPackage.APPLICATION_CLIENT__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case ClientPackage.APPLICATION_CLIENT__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			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 eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ClientPackage.APPLICATION_CLIENT__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			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;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case ClientPackage.APPLICATION_CLIENT__ICONS:
-				getIcons().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case ClientPackage.APPLICATION_CLIENT__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case ClientPackage.APPLICATION_CLIENT__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			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;
-		}
-		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(" (version: "); //$NON-NLS-1$
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceFactory.java
deleted file mode 100644
index f3b587a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-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_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.
-	 * @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 WTPResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.APP_CLIENT_DD_URI_OBJ);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceImpl.java
deleted file mode 100644
index a772a6f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ApplicationClientResourceImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.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.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-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;
-	}
-
-	/* (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;
-	}
-	
-	/* (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/internal/client/impl/ClientFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientFactoryImpl.java
deleted file mode 100644
index d2e2a45..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientFactoryImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.client.ResAuthApplicationType;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-
-/**
- * @generated
- */
-public class ClientFactoryImpl extends EFactoryImpl implements ClientFactory{
- 
-	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 ResAuthApplicationType.get(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 instanceValue == null ? null : instanceValue.toString();
-			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;
-	}
-
-	/**
-	 * @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/internal/client/impl/ClientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientPackageImpl.java
deleted file mode 100644
index b543d09..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/impl/ClientPackageImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.client.ResAuthApplicationType;
-import org.eclipse.jst.j2ee.internal.J2EEInit;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.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 EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ClientPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-		// init J2EE in case its not already initialized...
-		J2EEInit.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theClientPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theClientPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-
-		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
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)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); //$NON-NLS-1$
-		initEAttribute(getApplicationClient_Version(), ecorePackage.getEString(), "version", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_ResourceRefs(), theCommonPackage.getResourceRef(), null, "resourceRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_EnvironmentProps(), theCommonPackage.getEnvEntry(), null, "environmentProps", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_EjbReferences(), theCommonPackage.getEjbRef(), null, "ejbReferences", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_ResourceEnvRefs(), theCommonPackage.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_CallbackHandler(), theJavaRefPackage.getJavaClass(), null, "callbackHandler", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_ServiceRefs(), theWebservice_clientPackage.getServiceRef(), null, "serviceRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_MessageDestinationRefs(), theCommonPackage.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getApplicationClient_MessageDestinations(), theCommonPackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(resAuthApplicationTypeEEnum, ResAuthApplicationType.class, "ResAuthApplicationType"); //$NON-NLS-1$
-		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/internal/client/util/ClientAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientAdapterFactory.java
deleted file mode 100644
index 33a7d2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientAdapterFactory.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.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.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-
-
-
-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 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.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.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/internal/client/util/ClientSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientSwitch.java
deleted file mode 100644
index 6b41fb9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/client/util/ClientSwitch.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.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) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				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 = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		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>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/internal/common/CommonPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/CommonPackage.java
deleted file mode 100644
index 394dd71..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/CommonPackage.java
+++ /dev/null
@@ -1,2107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-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.CommonFactory;
-
-
-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.
-	 */
-	int EJB_REF__NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__TYPE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__HOME = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__REMOTE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__LINK = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF__DESCRIPTION = 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 = 6;
-
-	/**
-	 * The number of structural features of the the '<em>Ejb Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_REF_FEATURE_COUNT = 7;
-
-	/**
-	 * @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 ENV_ENTRY__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY__NAME = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY__VALUE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY__TYPE = 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 = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Env Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENV_ENTRY_FEATURE_COUNT = 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__NAME = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__TYPE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__AUTH = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__LINK = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_REF__RES_SHARING_SCOPE = 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 = 6;
-
-	/**
-	 * The number of structural features of the the '<em>Resource Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_REF_FEATURE_COUNT = 7;
-
-	/**
-	 * @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 SECURITY_ROLE_REF__NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE_REF__DESCRIPTION = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE_REF__LINK = 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 = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Security Role Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_REF_FEATURE_COUNT = 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_ROLE__ROLE_NAME = 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 = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Security Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_ROLE_FEATURE_COUNT = 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;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ENV_REF__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ENV_REF__NAME = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ENV_REF__TYPE = 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 = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Resource Env Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ENV_REF_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 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 = 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 = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Security Identity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_IDENTITY_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 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 = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int IDENTITY__ROLE_NAME = 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 = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Identity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDENTITY_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.IconTypeImpl <em>Icon Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.IconTypeImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getIconType()
-	 * @generated
-	 */
-	int ICON_TYPE = 9;
-
-	/**
-	 * 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 = 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 = 1;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_TYPE__LANG = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Icon Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ICON_TYPE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.DisplayNameImpl <em>Display Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.DisplayNameImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getDisplayName()
-	 * @generated
-	 */
-	int DISPLAY_NAME = 10;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME__LANG = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME__VALUE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Display Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DISPLAY_NAME_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationRefImpl <em>Message Destination Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationRefImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getMessageDestinationRef()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_REF = 11;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF__NAME = 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 = 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 = 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 = 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 = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Message Destination Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DESTINATION_REF_FEATURE_COUNT = 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationImpl <em>Message Destination</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getMessageDestination()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.ParamValueImpl <em>Param Value</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.ParamValueImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getParamValue()
-	 * @generated
-	 */
-	int PARAM_VALUE = 13;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl <em>Description Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getDescriptionGroup()
-	 * @generated
-	 */
-	int DESCRIPTION_GROUP = 14;
-
-	/**
-	 * 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 = 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 = 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 = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Description Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_GROUP_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl <em>Compatibility Description Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	int COMPATIBILITY_DESCRIPTION_GROUP = 21;
-
-	/**
-	 * 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 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 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 = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE__DESCRIPTION = 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 = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Param Value</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAM_VALUE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl <em>JNDI Env Refs Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	int JNDI_ENV_REFS_GROUP = 15;
-
-	/**
-	 * 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 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 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 meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.DescriptionImpl <em>Description</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.DescriptionImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getDescription()
-	 * @generated
-	 */
-	int DESCRIPTION = 18;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__LANG = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION__VALUE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Description</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESCRIPTION_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.QNameImpl <em>QName</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.QNameImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getQName()
-	 * @generated
-	 */
-	int QNAME = 19;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QNAME__NAMESPACE_URI = 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 = 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 = 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 = 3;
-
-	/**
-	 * The number of structural features of the the '<em>QName</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QNAME_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.impl.ListenerImpl <em>Listener</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.ListenerImpl
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getListener()
-	 * @generated
-	 */
-	int LISTENER = 20;
-
-	/**
-	 * 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 the '<em>Listener</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LISTENER_FEATURE_COUNT = COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_REF_TYPE = 24;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENV_ENTRY_TYPE = 22;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RES_AUTH_TYPE_BASE = 23;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RES_SHARING_SCOPE_TYPE = 25;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.common.MessageDestinationUsageType <em>Message Destination Usage Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.common.MessageDestinationUsageType
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl#getMessageDestinationUsageType()
-	 * @generated
-	 */
-	int MESSAGE_DESTINATION_USAGE_TYPE = 26;
-
-
-	/**
-	 * @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.internal.common"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	CommonPackage eINSTANCE = org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl.init();
-
-	/**
-	 * @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.internal.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.internal.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.internal.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.internal.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.internal.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.internal.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.internal.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.internal.common.EJBLocalRef#getLocalHome()
-	 * @see #getEJBLocalRef()
-	 * @generated
-	 */
-	EAttribute getEJBLocalRef_LocalHome();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.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.internal.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.internal.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.internal.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.internal.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.internal.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.internal.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.internal.common.Description
-	 * @generated
-	 */
-	EClass getDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.Description#getLang()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Lang();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.Description#getValue()
-	 * @see #getDescription()
-	 * @generated
-	 */
-	EAttribute getDescription_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.QName
-	 * @generated
-	 */
-	EClass getQName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.QName#getNamespaceURI()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_NamespaceURI();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.QName#getLocalPart()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_LocalPart();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.QName#getCombinedQName()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_CombinedQName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.QName#getInternalPrefixOrNsURI()
-	 * @see #getQName()
-	 * @generated
-	 */
-	EAttribute getQName_InternalPrefixOrNsURI();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.Listener
-	 * @generated
-	 */
-	EClass getListener();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.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.internal.common.Listener#getListenerClass()
-	 * @see #getListener()
-	 * @generated
-	 */
-	EReference getListener_ListenerClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	EClass getCompatibilityDescriptionGroup();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup#getSmallIcon()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup#getLargeIcon()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup#getDescription()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup#getDisplayName()
-	 * @see #getCompatibilityDescriptionGroup()
-	 * @generated
-	 */
-	EAttribute getCompatibilityDescriptionGroup_DisplayName();
-
-	/**
-	 * @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.internal.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.internal.common.Identity#getDescriptions()
-	 * @see #getIdentity()
-	 * @generated
-	 */
-	EReference getIdentity_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.IconType
-	 * @generated
-	 */
-	EClass getIconType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.IconType#getSmallIcon()
-	 * @see #getIconType()
-	 * @generated
-	 */
-	EAttribute getIconType_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.IconType#getLargeIcon()
-	 * @see #getIconType()
-	 * @generated
-	 */
-	EAttribute getIconType_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.IconType#getLang()
-	 * @see #getIconType()
-	 * @generated
-	 */
-	EAttribute getIconType_Lang();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DisplayName
-	 * @generated
-	 */
-	EClass getDisplayName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DisplayName#getLang()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	EAttribute getDisplayName_Lang();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DisplayName#getValue()
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	EAttribute getDisplayName_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestinationRef
-	 * @generated
-	 */
-	EClass getMessageDestinationRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestinationRef#getName()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestinationRef#getType()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestinationRef#getUsage()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Usage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestinationRef#getLink()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EAttribute getMessageDestinationRef_Link();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestinationRef#getDescriptions()
-	 * @see #getMessageDestinationRef()
-	 * @generated
-	 */
-	EReference getMessageDestinationRef_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestination
-	 * @generated
-	 */
-	EClass getMessageDestination();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.MessageDestination#getName()
-	 * @see #getMessageDestination()
-	 * @generated
-	 */
-	EAttribute getMessageDestination_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.ParamValue
-	 * @generated
-	 */
-	EClass getParamValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.ParamValue#getName()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.ParamValue#getValue()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.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.internal.common.ParamValue#getDescription()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EAttribute getParamValue_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.ParamValue#getDescriptions()
-	 * @see #getParamValue()
-	 * @generated
-	 */
-	EReference getParamValue_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	EClass getDescriptionGroup();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup#getIcons()
-	 * @see #getDescriptionGroup()
-	 * @generated
-	 */
-	EReference getDescriptionGroup_Icons();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup#getDisplayNames()
-	 * @see #getDescriptionGroup()
-	 * @generated
-	 */
-	EReference getDescriptionGroup_DisplayNames();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup#getDescriptions()
-	 * @see #getDescriptionGroup()
-	 * @generated
-	 */
-	EReference getDescriptionGroup_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	EClass getJNDIEnvRefsGroup();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.JNDIEnvRefsGroup#getEnvironmentProperties()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_EnvironmentProperties();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.JNDIEnvRefsGroup#getResourceRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_ResourceRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.JNDIEnvRefsGroup#getEjbRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_EjbRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.JNDIEnvRefsGroup#getResourceEnvRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_ResourceEnvRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.JNDIEnvRefsGroup#getEjbLocalRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_EjbLocalRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.common.JNDIEnvRefsGroup#getMessageDestinationRefs()
-	 * @see #getJNDIEnvRefsGroup()
-	 * @generated
-	 */
-	EReference getJNDIEnvRefsGroup_MessageDestinationRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.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.internal.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.internal.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.internal.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.internal.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.internal.common.MessageDestinationUsageType
-	 * @generated
-	 */
-	EEnum getMessageDestinationUsageType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	CommonFactory getCommonFactory();
-
-} //CommonPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEVersionResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEVersionResource.java
deleted file mode 100644
index f67c66d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEVersionResource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Common Interface used to check version of J2EE model resources
- */
-package org.eclipse.jst.j2ee.internal.common;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public interface J2EEVersionResource {
-	public int getJ2EEVersionID();
-	public int getModuleVersionID();
-	public int getVersionID();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResource.java
deleted file mode 100644
index d5db0a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResource.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResourceImpl;
-
-
-/**
- * @deprecated No longer required - change to extend CompatibilityXMIResourceImpl
- */
-public class J2EEXMIResource extends CompatibilityXMIResourceImpl implements J2EEVersionResource{
-
-	/**
-	 * Constructor for J2EEXMIResource.
-	 */
-	public J2EEXMIResource() {
-		super();
-	}
-
-	/**
-	 * Constructor for J2EEXMIResource.
-	 * @param uri
-	 */
-	public J2EEXMIResource(URI uri) {
-		super(uri);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.J2EEVersionResource#getJ2EEVersionID()
-	 */
-	public int getJ2EEVersionID() {
-		// TODO Auto-generated method stub
-		return J2EEVersionConstants.J2EE_1_3_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.J2EEVersionResource#getModuleVersionID()
-	 */
-	public int getModuleVersionID() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.J2EEVersionResource#getVersionID()
-	 */
-	public int getVersionID() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResourceFactory.java
deleted file mode 100644
index 2613866..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/J2EEXMIResourceFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityResourceFactory;
-
-
-
-
-/**
- * @author nssheth
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class J2EEXMIResourceFactory extends CompatibilityResourceFactory {
-
-	public static J2EEXMIResourceFactory INSTANCE = new J2EEXMIResourceFactory();
-	
-	public static void register() {
-		J2EEResourceFactoryRegistry.INSTANCE.getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, INSTANCE);
-	}
-
-	/**
-	 * Constructor for J2EEXMIResourceFactory.
-	 */
-	public J2EEXMIResourceFactory() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.emf.ecore.resource.Resource.Factory#createResource(URI)
-	 */
-	public Resource createResource(URI uri) {
-		J2EEXMIResource resource = new J2EEXMIResource(uri);
-		return resource;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java
deleted file mode 100644
index c5d4ce1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common;
-
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-
-
-public interface XMLResource extends TranslatorResource, J2EEVersionConstants {
-	public static final int APP_CLIENT_TYPE = 1;
-	public static final int APPLICATION_TYPE = 2;
-	public static final int EJB_TYPE = 3;
-	public static final int WEB_APP_TYPE = 4;
-	public static final int RAR_TYPE = 5;
-	public static final int WEB_SERVICES_CLIENT_TYPE = 6;
-
-	public static final String DELETED_ERROR_MSG = "This resource has been deleted and can no longer be used."; /**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	boolean isAlt();
-	public int getJ2EEVersionID();
-	public int getModuleVersionID();
-	public void setJ2EEVersionID(int id);
-	public void setModuleVersionID(int id);
-	/**
-	 * Used only if this resource is an alt; return the application which declares it
-	 */
-	Application getApplication();
-
-	void setApplication(Application newApplication);
-	/**
-	 * @deprecated use {@link #getVersionID()}
-	 * @see J2EEVersionConstants
-	 */
-	boolean isJ2EE1_3();
-
-	/**
-	 * Returns the type of this J2EE XMLResource.
-	 * You can use this method instead of using instanceof.
-	 * @see XMLResource#APP_CLIENT_TYPE
-	 * @see XMLResource#APPLICATION_TYPE
-	 * @see XMLResource#EJB_TYPE
-	 * @see XMLResource#WEB_APP_TYPE
-	 * @see XMLResource#RAR_TYPE
-	 */
-	int getType();
-	 /**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	void setIsAlt(boolean isAlternateDD);
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)}, 
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the system id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	void setSystemId(String id);
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)},
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the public id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	void setPublicId(String id);
-
-	//The following methods are to support ReferencedResource without having an actual
-	//This may be just a subset of what is available in ReferencedResource
-	void saveIfNecessary() throws Exception;
-	void releaseFromWrite();
-	void releaseFromRead();
-	void preDelete();
-	boolean isSharedForWrite();
-	boolean isShared();
-	boolean isReadOnly();
-	boolean isNew();
-	void accessForWrite();
-	void accessForRead(); 
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonFactoryImpl.java
deleted file mode 100644
index d0c83e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonFactoryImpl.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationUsageType;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResSharingScopeType;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CommonFactoryImpl extends EFactoryImpl implements CommonFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case CommonPackage.EJB_REF: return createEjbRef();
-			case CommonPackage.ENV_ENTRY: return createEnvEntry();
-			case CommonPackage.RESOURCE_REF: return createResourceRef();
-			case CommonPackage.SECURITY_ROLE_REF: return createSecurityRoleRef();
-			case CommonPackage.SECURITY_ROLE: return createSecurityRole();
-			case CommonPackage.RESOURCE_ENV_REF: return createResourceEnvRef();
-			case CommonPackage.EJB_LOCAL_REF: return createEJBLocalRef();
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY: return createRunAsSpecifiedIdentity();
-			case CommonPackage.IDENTITY: return createIdentity();
-			case CommonPackage.ICON_TYPE: return createIconType();
-			case CommonPackage.DISPLAY_NAME: return createDisplayName();
-			case CommonPackage.MESSAGE_DESTINATION_REF: return createMessageDestinationRef();
-			case CommonPackage.MESSAGE_DESTINATION: return createMessageDestination();
-			case CommonPackage.PARAM_VALUE: return createParamValue();
-			case CommonPackage.DESCRIPTION_GROUP: return createDescriptionGroup();
-			case CommonPackage.SECURITY_IDENTITY: return createSecurityIdentity();
-			case CommonPackage.USE_CALLER_IDENTITY: return createUseCallerIdentity();
-			case CommonPackage.DESCRIPTION: return createDescription();
-			case CommonPackage.QNAME: return createQName();
-			case CommonPackage.LISTENER: return createListener();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP: return createCompatibilityDescriptionGroup();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case CommonPackage.ENV_ENTRY_TYPE:
-				return EnvEntryType.get(initialValue);
-			case CommonPackage.RES_AUTH_TYPE_BASE:
-				return ResAuthTypeBase.get(initialValue);
-			case CommonPackage.EJB_REF_TYPE:
-				return EjbRefType.get(initialValue);
-			case CommonPackage.RES_SHARING_SCOPE_TYPE:
-				return ResSharingScopeType.get(initialValue);
-			case CommonPackage.MESSAGE_DESTINATION_USAGE_TYPE:
-				return MessageDestinationUsageType.get(initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case CommonPackage.ENV_ENTRY_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case CommonPackage.RES_AUTH_TYPE_BASE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case CommonPackage.EJB_REF_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case CommonPackage.RES_SHARING_SCOPE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case CommonPackage.MESSAGE_DESTINATION_USAGE_TYPE:
-				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 EjbRef createEjbRef() {
-		EjbRefImpl ejbRef = new EjbRefImpl();
-		return ejbRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnvEntry createEnvEntry() {
-		EnvEntryImpl envEntry = new EnvEntryImpl();
-		return envEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceRef createResourceRef() {
-		ResourceRefImpl resourceRef = new ResourceRefImpl();
-		return resourceRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityRoleRef createSecurityRoleRef() {
-		SecurityRoleRefImpl securityRoleRef = new SecurityRoleRefImpl();
-		return securityRoleRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityRole createSecurityRole() {
-		SecurityRoleImpl securityRole = new SecurityRoleImpl();
-		return securityRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceEnvRef createResourceEnvRef() {
-		ResourceEnvRefImpl resourceEnvRef = new ResourceEnvRefImpl();
-		return resourceEnvRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EJBLocalRef createEJBLocalRef() {
-		EJBLocalRefImpl ejbLocalRef = new EJBLocalRefImpl();
-		return ejbLocalRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RunAsSpecifiedIdentity createRunAsSpecifiedIdentity() {
-		RunAsSpecifiedIdentityImpl runAsSpecifiedIdentity = new RunAsSpecifiedIdentityImpl();
-		return runAsSpecifiedIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Identity createIdentity() {
-		IdentityImpl identity = new IdentityImpl();
-		return identity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IconType createIconType() {
-		IconTypeImpl iconType = new IconTypeImpl();
-		return iconType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DisplayName createDisplayName() {
-		DisplayNameImpl displayName = new DisplayNameImpl();
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationRef createMessageDestinationRef() {
-		MessageDestinationRefImpl messageDestinationRef = new MessageDestinationRefImpl();
-		return messageDestinationRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestination createMessageDestination() {
-		MessageDestinationImpl messageDestination = new MessageDestinationImpl();
-		return messageDestination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ParamValue createParamValue() {
-		ParamValueImpl paramValue = new ParamValueImpl();
-		return paramValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DescriptionGroup createDescriptionGroup() {
-		DescriptionGroupImpl descriptionGroup = new DescriptionGroupImpl();
-		return descriptionGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SecurityIdentity createSecurityIdentity() {
-		SecurityIdentityImpl securityIdentity = new SecurityIdentityImpl();
-		return securityIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public UseCallerIdentity createUseCallerIdentity() {
-		UseCallerIdentityImpl useCallerIdentity = new UseCallerIdentityImpl();
-		return useCallerIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Description createDescription() {
-		DescriptionImpl description = new DescriptionImpl();
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QName createQName() {
-		QNameImpl qName = new QNameImpl();
-		return qName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Listener createListener() {
-		ListenerImpl listener = new ListenerImpl();
-		return listener;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompatibilityDescriptionGroup createCompatibilityDescriptionGroup() {
-		CompatibilityDescriptionGroupImpl compatibilityDescriptionGroup = new CompatibilityDescriptionGroupImpl();
-		return compatibilityDescriptionGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonPackage getCommonPackage() {
-		return (CommonPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static CommonPackage getPackage() {
-		return CommonPackage.eINSTANCE;
-	}
-} //CommonFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonPackageImpl.java
deleted file mode 100644
index cfb52f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CommonPackageImpl.java
+++ /dev/null
@@ -1,1502 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationUsageType;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResSharingScopeType;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-
-
-public class CommonPackageImpl extends EPackageImpl implements CommonPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass envEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityRoleRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceEnvRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbLocalRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass runAsSpecifiedIdentityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityIdentityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass identityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass iconTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass displayNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDestinationRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDestinationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass paramValueEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptionGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jndiEnvRefsGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass useCallerIdentityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass descriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass qNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass listenerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass compatibilityDescriptionGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum envEntryTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resAuthTypeBaseEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum ejbRefTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resSharingScopeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum messageDestinationUsageTypeEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private CommonPackageImpl() {
-		super(eNS_URI, CommonFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static CommonPackage init() {
-		if (isInited) return (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CommonPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theCommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theCommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-
-		return theCommonPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityRole() {
-		return securityRoleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRole_Description() {
-		return (EAttribute)securityRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRole_RoleName() {
-		return (EAttribute)securityRoleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityRole_Descriptions() {
-		return (EReference)securityRoleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getResourceRef() {
-		return resourceRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Description() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Name() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Type() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Auth() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_Link() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceRef_ResSharingScope() {
-		return (EAttribute)resourceRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceRef_Descriptions() {
-		return (EReference)resourceRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEjbRef() {
-		return ejbRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Name() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Type() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Home() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Remote() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Link() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEjbRef_Description() {
-		return (EAttribute)ejbRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEjbRef_Descriptions() {
-		return (EReference)ejbRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBLocalRef() {
-		return ejbLocalRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBLocalRef_LocalHome() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBLocalRef_Local() {
-		return (EAttribute)ejbLocalRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEnvEntry() {
-		return envEntryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Description() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Name() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Value() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEnvEntry_Type() {
-		return (EAttribute)envEntryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEnvEntry_Descriptions() {
-		return (EReference)envEntryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityRoleRef() {
-		return securityRoleRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRoleRef_Name() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRoleRef_Description() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityRoleRef_Link() {
-		return (EAttribute)securityRoleRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityRoleRef_Descriptions() {
-		return (EReference)securityRoleRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRunAsSpecifiedIdentity() {
-		return runAsSpecifiedIdentityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRunAsSpecifiedIdentity_Identity() {
-		return (EReference)runAsSpecifiedIdentityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityIdentity() {
-		return securityIdentityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityIdentity_Description() {
-		return (EAttribute)securityIdentityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityIdentity_Descriptions() {
-		return (EReference)securityIdentityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getUseCallerIdentity() {
-		return useCallerIdentityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescription() {
-		return descriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Lang() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDescription_Value() {
-		return (EAttribute)descriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getQName() {
-		return qNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_NamespaceURI() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_LocalPart() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_CombinedQName() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getQName_InternalPrefixOrNsURI() {
-		return (EAttribute)qNameEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getListener() {
-		return listenerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getListener_ListenerClass() {
-		return (EReference)listenerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCompatibilityDescriptionGroup() {
-		return compatibilityDescriptionGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_SmallIcon() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_LargeIcon() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_Description() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompatibilityDescriptionGroup_DisplayName() {
-		return (EAttribute)compatibilityDescriptionGroupEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getIdentity() {
-		return identityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getIdentity_Description() {
-		return (EAttribute)identityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getIdentity_RoleName() {
-		return (EAttribute)identityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getIdentity_Descriptions() {
-		return (EReference)identityEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIconType() {
-		return iconTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIconType_SmallIcon() {
-		return (EAttribute)iconTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIconType_LargeIcon() {
-		return (EAttribute)iconTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIconType_Lang() {
-		return (EAttribute)iconTypeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDisplayName() {
-		return displayNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisplayName_Lang() {
-		return (EAttribute)displayNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDisplayName_Value() {
-		return (EAttribute)displayNameEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageDestinationRef() {
-		return messageDestinationRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Name() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Type() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Usage() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestinationRef_Link() {
-		return (EAttribute)messageDestinationRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDestinationRef_Descriptions() {
-		return (EReference)messageDestinationRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageDestination() {
-		return messageDestinationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDestination_Name() {
-		return (EAttribute)messageDestinationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getParamValue() {
-		return paramValueEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_Name() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_Value() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getParamValue_Description() {
-		return (EAttribute)paramValueEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getParamValue_Descriptions() {
-		return (EReference)paramValueEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDescriptionGroup() {
-		return descriptionGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescriptionGroup_Icons() {
-		return (EReference)descriptionGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescriptionGroup_DisplayNames() {
-		return (EReference)descriptionGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDescriptionGroup_Descriptions() {
-		return (EReference)descriptionGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJNDIEnvRefsGroup() {
-		return jndiEnvRefsGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_EnvironmentProperties() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_ResourceRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_EjbRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_ResourceEnvRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_EjbLocalRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_MessageDestinationRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJNDIEnvRefsGroup_ServiceRefs() {
-		return (EReference)jndiEnvRefsGroupEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getResourceEnvRef() {
-		return resourceEnvRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceEnvRef_Description() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceEnvRef_Name() {
-		return (EAttribute)resourceEnvRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceEnvRef_Type() {
-		return (EReference)resourceEnvRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceEnvRef_Descriptions() {
-		return (EReference)resourceEnvRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getEjbRefType() {
-		return ejbRefTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getEnvEntryType() {
-		return envEntryTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getResAuthTypeBase() {
-		return resAuthTypeBaseEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getResSharingScopeType() {
-		return resSharingScopeTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getMessageDestinationUsageType() {
-		return messageDestinationUsageTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CommonFactory getCommonFactory() {
-		return (CommonFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		ejbRefEClass = createEClass(EJB_REF);
-		createEAttribute(ejbRefEClass, EJB_REF__NAME);
-		createEAttribute(ejbRefEClass, EJB_REF__TYPE);
-		createEAttribute(ejbRefEClass, EJB_REF__HOME);
-		createEAttribute(ejbRefEClass, EJB_REF__REMOTE);
-		createEAttribute(ejbRefEClass, EJB_REF__LINK);
-		createEAttribute(ejbRefEClass, EJB_REF__DESCRIPTION);
-		createEReference(ejbRefEClass, EJB_REF__DESCRIPTIONS);
-
-		envEntryEClass = createEClass(ENV_ENTRY);
-		createEAttribute(envEntryEClass, ENV_ENTRY__DESCRIPTION);
-		createEAttribute(envEntryEClass, ENV_ENTRY__NAME);
-		createEAttribute(envEntryEClass, ENV_ENTRY__VALUE);
-		createEAttribute(envEntryEClass, ENV_ENTRY__TYPE);
-		createEReference(envEntryEClass, ENV_ENTRY__DESCRIPTIONS);
-
-		resourceRefEClass = createEClass(RESOURCE_REF);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__DESCRIPTION);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__NAME);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__TYPE);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__AUTH);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__LINK);
-		createEAttribute(resourceRefEClass, RESOURCE_REF__RES_SHARING_SCOPE);
-		createEReference(resourceRefEClass, RESOURCE_REF__DESCRIPTIONS);
-
-		securityRoleRefEClass = createEClass(SECURITY_ROLE_REF);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__NAME);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__DESCRIPTION);
-		createEAttribute(securityRoleRefEClass, SECURITY_ROLE_REF__LINK);
-		createEReference(securityRoleRefEClass, SECURITY_ROLE_REF__DESCRIPTIONS);
-
-		securityRoleEClass = createEClass(SECURITY_ROLE);
-		createEAttribute(securityRoleEClass, SECURITY_ROLE__DESCRIPTION);
-		createEAttribute(securityRoleEClass, SECURITY_ROLE__ROLE_NAME);
-		createEReference(securityRoleEClass, SECURITY_ROLE__DESCRIPTIONS);
-
-		resourceEnvRefEClass = createEClass(RESOURCE_ENV_REF);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__DESCRIPTION);
-		createEAttribute(resourceEnvRefEClass, RESOURCE_ENV_REF__NAME);
-		createEReference(resourceEnvRefEClass, RESOURCE_ENV_REF__TYPE);
-		createEReference(resourceEnvRefEClass, RESOURCE_ENV_REF__DESCRIPTIONS);
-
-		ejbLocalRefEClass = createEClass(EJB_LOCAL_REF);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__LOCAL_HOME);
-		createEAttribute(ejbLocalRefEClass, EJB_LOCAL_REF__LOCAL);
-
-		runAsSpecifiedIdentityEClass = createEClass(RUN_AS_SPECIFIED_IDENTITY);
-		createEReference(runAsSpecifiedIdentityEClass, RUN_AS_SPECIFIED_IDENTITY__IDENTITY);
-
-		identityEClass = createEClass(IDENTITY);
-		createEAttribute(identityEClass, IDENTITY__DESCRIPTION);
-		createEAttribute(identityEClass, IDENTITY__ROLE_NAME);
-		createEReference(identityEClass, IDENTITY__DESCRIPTIONS);
-
-		iconTypeEClass = createEClass(ICON_TYPE);
-		createEAttribute(iconTypeEClass, ICON_TYPE__SMALL_ICON);
-		createEAttribute(iconTypeEClass, ICON_TYPE__LARGE_ICON);
-		createEAttribute(iconTypeEClass, ICON_TYPE__LANG);
-
-		displayNameEClass = createEClass(DISPLAY_NAME);
-		createEAttribute(displayNameEClass, DISPLAY_NAME__LANG);
-		createEAttribute(displayNameEClass, DISPLAY_NAME__VALUE);
-
-		messageDestinationRefEClass = createEClass(MESSAGE_DESTINATION_REF);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__NAME);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__TYPE);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__USAGE);
-		createEAttribute(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__LINK);
-		createEReference(messageDestinationRefEClass, MESSAGE_DESTINATION_REF__DESCRIPTIONS);
-
-		messageDestinationEClass = createEClass(MESSAGE_DESTINATION);
-		createEAttribute(messageDestinationEClass, MESSAGE_DESTINATION__NAME);
-
-		paramValueEClass = createEClass(PARAM_VALUE);
-		createEAttribute(paramValueEClass, PARAM_VALUE__NAME);
-		createEAttribute(paramValueEClass, PARAM_VALUE__VALUE);
-		createEAttribute(paramValueEClass, PARAM_VALUE__DESCRIPTION);
-		createEReference(paramValueEClass, PARAM_VALUE__DESCRIPTIONS);
-
-		descriptionGroupEClass = createEClass(DESCRIPTION_GROUP);
-		createEReference(descriptionGroupEClass, DESCRIPTION_GROUP__ICONS);
-		createEReference(descriptionGroupEClass, DESCRIPTION_GROUP__DISPLAY_NAMES);
-		createEReference(descriptionGroupEClass, DESCRIPTION_GROUP__DESCRIPTIONS);
-
-		jndiEnvRefsGroupEClass = createEClass(JNDI_ENV_REFS_GROUP);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__RESOURCE_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__EJB_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS);
-		createEReference(jndiEnvRefsGroupEClass, JNDI_ENV_REFS_GROUP__SERVICE_REFS);
-
-		securityIdentityEClass = createEClass(SECURITY_IDENTITY);
-		createEAttribute(securityIdentityEClass, SECURITY_IDENTITY__DESCRIPTION);
-		createEReference(securityIdentityEClass, SECURITY_IDENTITY__DESCRIPTIONS);
-
-		useCallerIdentityEClass = createEClass(USE_CALLER_IDENTITY);
-
-		descriptionEClass = createEClass(DESCRIPTION);
-		createEAttribute(descriptionEClass, DESCRIPTION__LANG);
-		createEAttribute(descriptionEClass, DESCRIPTION__VALUE);
-
-		qNameEClass = createEClass(QNAME);
-		createEAttribute(qNameEClass, QNAME__NAMESPACE_URI);
-		createEAttribute(qNameEClass, QNAME__LOCAL_PART);
-		createEAttribute(qNameEClass, QNAME__COMBINED_QNAME);
-		createEAttribute(qNameEClass, QNAME__INTERNAL_PREFIX_OR_NS_URI);
-
-		listenerEClass = createEClass(LISTENER);
-		createEReference(listenerEClass, LISTENER__LISTENER_CLASS);
-
-		compatibilityDescriptionGroupEClass = createEClass(COMPATIBILITY_DESCRIPTION_GROUP);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION);
-		createEAttribute(compatibilityDescriptionGroupEClass, COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME);
-
-		// Create enums
-		envEntryTypeEEnum = createEEnum(ENV_ENTRY_TYPE);
-		resAuthTypeBaseEEnum = createEEnum(RES_AUTH_TYPE_BASE);
-		ejbRefTypeEEnum = createEEnum(EJB_REF_TYPE);
-		resSharingScopeTypeEEnum = createEEnum(RES_SHARING_SCOPE_TYPE);
-		messageDestinationUsageTypeEEnum = createEEnum(MESSAGE_DESTINATION_USAGE_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI);
-
-		// Add supertypes to classes
-		ejbLocalRefEClass.getESuperTypes().add(this.getEjbRef());
-		runAsSpecifiedIdentityEClass.getESuperTypes().add(this.getSecurityIdentity());
-		messageDestinationEClass.getESuperTypes().add(this.getCompatibilityDescriptionGroup());
-		jndiEnvRefsGroupEClass.getESuperTypes().add(this.getCompatibilityDescriptionGroup());
-		useCallerIdentityEClass.getESuperTypes().add(this.getSecurityIdentity());
-		listenerEClass.getESuperTypes().add(this.getCompatibilityDescriptionGroup());
-		compatibilityDescriptionGroupEClass.getESuperTypes().add(this.getDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(ejbRefEClass, EjbRef.class, "EjbRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Type(), this.getEjbRefType(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Home(), ecorePackage.getEString(), "home", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Remote(), ecorePackage.getEString(), "remote", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEjbRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEjbRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(envEntryEClass, EnvEntry.class, "EnvEntry", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEnvEntry_Type(), this.getEnvEntryType(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnvEntry_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(resourceRefEClass, ResourceRef.class, "ResourceRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getResourceRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_Auth(), this.getResAuthTypeBase(), "auth", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getResourceRef_ResSharingScope(), this.getResSharingScopeType(), "resSharingScope", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getResourceRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(securityRoleRefEClass, SecurityRoleRef.class, "SecurityRoleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getSecurityRoleRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getSecurityRoleRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getSecurityRoleRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getSecurityRoleRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(securityRoleEClass, SecurityRole.class, "SecurityRole", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getSecurityRole_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getSecurityRole_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getSecurityRole_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(resourceEnvRefEClass, ResourceEnvRef.class, "ResourceEnvRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getResourceEnvRef_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getResourceEnvRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getResourceEnvRef_Type(), theJavaRefPackage.getJavaClass(), null, "type", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getResourceEnvRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(ejbLocalRefEClass, EJBLocalRef.class, "EJBLocalRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEJBLocalRef_LocalHome(), ecorePackage.getEString(), "localHome", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEJBLocalRef_Local(), ecorePackage.getEString(), "local", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(runAsSpecifiedIdentityEClass, RunAsSpecifiedIdentity.class, "RunAsSpecifiedIdentity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getRunAsSpecifiedIdentity_Identity(), this.getIdentity(), null, "identity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(identityEClass, Identity.class, "Identity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getIdentity_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getIdentity_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getIdentity_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(iconTypeEClass, IconType.class, "IconType", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getIconType_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getIconType_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getIconType_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(displayNameEClass, DisplayName.class, "DisplayName", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDisplayName_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getDisplayName_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(messageDestinationRefEClass, MessageDestinationRef.class, "MessageDestinationRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_Usage(), this.getMessageDestinationUsageType(), "usage", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMessageDestinationRef_Link(), ecorePackage.getEString(), "link", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMessageDestinationRef_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(messageDestinationEClass, MessageDestination.class, "MessageDestination", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getMessageDestination_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(paramValueEClass, ParamValue.class, "ParamValue", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getParamValue_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getParamValue_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getParamValue_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getParamValue_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(descriptionGroupEClass, DescriptionGroup.class, "DescriptionGroup", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDescriptionGroup_Icons(), this.getIconType(), null, "icons", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getDescriptionGroup_DisplayNames(), this.getDisplayName(), null, "displayNames", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getDescriptionGroup_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(jndiEnvRefsGroupEClass, JNDIEnvRefsGroup.class, "JNDIEnvRefsGroup", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getJNDIEnvRefsGroup_EnvironmentProperties(), this.getEnvEntry(), null, "environmentProperties", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getJNDIEnvRefsGroup_ResourceRefs(), this.getResourceRef(), null, "resourceRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getJNDIEnvRefsGroup_EjbRefs(), this.getEjbRef(), null, "ejbRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getJNDIEnvRefsGroup_ResourceEnvRefs(), this.getResourceEnvRef(), null, "resourceEnvRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getJNDIEnvRefsGroup_EjbLocalRefs(), this.getEJBLocalRef(), null, "ejbLocalRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getJNDIEnvRefsGroup_MessageDestinationRefs(), this.getMessageDestinationRef(), null, "messageDestinationRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getJNDIEnvRefsGroup_ServiceRefs(), theWebservice_clientPackage.getServiceRef(), null, "serviceRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(securityIdentityEClass, SecurityIdentity.class, "SecurityIdentity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getSecurityIdentity_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getSecurityIdentity_Descriptions(), this.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(useCallerIdentityEClass, UseCallerIdentity.class, "UseCallerIdentity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDescription_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getDescription_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(qNameEClass, QName.class, "QName", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getQName_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getQName_LocalPart(), ecorePackage.getEString(), "localPart", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getQName_CombinedQName(), ecorePackage.getEString(), "combinedQName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getQName_InternalPrefixOrNsURI(), ecorePackage.getEString(), "internalPrefixOrNsURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(listenerEClass, Listener.class, "Listener", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getListener_ListenerClass(), theJavaRefPackage.getJavaClass(), null, "listenerClass", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(compatibilityDescriptionGroupEClass, CompatibilityDescriptionGroup.class, "CompatibilityDescriptionGroup", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getCompatibilityDescriptionGroup_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getCompatibilityDescriptionGroup_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getCompatibilityDescriptionGroup_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getCompatibilityDescriptionGroup_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(envEntryTypeEEnum, EnvEntryType.class, "EnvEntryType"); //$NON-NLS-1$
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.STRING_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.INTEGER_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.BOOLEAN_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.DOUBLE_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.BYTE_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.SHORT_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.LONG_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.FLOAT_LITERAL);
-		addEEnumLiteral(envEntryTypeEEnum, EnvEntryType.CHARACTER_LITERAL);
-
-		initEEnum(resAuthTypeBaseEEnum, ResAuthTypeBase.class, "ResAuthTypeBase"); //$NON-NLS-1$
-		addEEnumLiteral(resAuthTypeBaseEEnum, ResAuthTypeBase.CONTAINER_LITERAL);
-		addEEnumLiteral(resAuthTypeBaseEEnum, ResAuthTypeBase.APPLICATION_LITERAL);
-		addEEnumLiteral(resAuthTypeBaseEEnum, ResAuthTypeBase.SERVLET_LITERAL);
-
-		initEEnum(ejbRefTypeEEnum, EjbRefType.class, "EjbRefType"); //$NON-NLS-1$
-		addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.SESSION_LITERAL);
-		addEEnumLiteral(ejbRefTypeEEnum, EjbRefType.ENTITY_LITERAL);
-
-		initEEnum(resSharingScopeTypeEEnum, ResSharingScopeType.class, "ResSharingScopeType"); //$NON-NLS-1$
-		addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.SHAREABLE_LITERAL);
-		addEEnumLiteral(resSharingScopeTypeEEnum, ResSharingScopeType.UNSHAREABLE_LITERAL);
-
-		initEEnum(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.class, "MessageDestinationUsageType"); //$NON-NLS-1$
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_LITERAL);
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.PRODUCES_LITERAL);
-		addEEnumLiteral(messageDestinationUsageTypeEEnum, MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //CommonPackageImpl
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CompatibilityDescriptionGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CompatibilityDescriptionGroupImpl.java
deleted file mode 100644
index c82f829..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/CompatibilityDescriptionGroupImpl.java
+++ /dev/null
@@ -1,601 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Compatibility Description Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl#getDisplayName <em>Display Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CompatibilityDescriptionGroupImpl extends DescriptionGroupImpl implements CompatibilityDescriptionGroup {
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 */
-	protected CompatibilityDescriptionGroupImpl() {
-		super();
-		eAdapters().add(new DescriptionGroupAdapter());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup();
-	}
-
-	public String getSmallIcon() {
-		if(eResource() == null) 
-			return getSmallIconGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getSmallIconGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getIcons().size() > 0)
-				return ((IconType)getIcons().get(0)).getSmallIcon();
-		}
-		return null;
-	}
-	
-	public void setSmallIcon(String newSmallIcon) {
-		if(eResource() == null) {
-			setSmallIconGen(newSmallIcon);
-			internalSetSmallIconInList(newSmallIcon); 
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setSmallIconGen(newSmallIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetSmallIconInList(newSmallIcon); 
-			break;
-		}
-	}
-	/**
-	 * @param newSmallIcon
-	 */
-	protected void internalSetSmallIconInList(String newSmallIcon) {
-		IconType newValue = null;
-		if(getIcons().size() > 0) {
-			newValue = (IconType) getIcons().get(0);
-			newValue.setSmallIcon(newSmallIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setSmallIcon(newSmallIcon);
-			getIcons().add(newValue); 
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSmallIconGen() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSmallIconGen(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	public String getLargeIcon() {
-		if(eResource() == null) 
-			return getLargeIconGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getLargeIconGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getIcons().size() > 0)
-				return ((IconType)getIcons().get(0)).getLargeIcon();
-		}
-		return null;
-	}
-	
-	public void setLargeIcon(String newLargeIcon) {
-		if(eResource() == null) {
-			setLargeIconGen(newLargeIcon);
-			internalSetLargeIconInList(newLargeIcon);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setLargeIconGen(newLargeIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetLargeIconInList(newLargeIcon); 
-			break;
-		}
-	}
-
-	/**
-	 * @param newLargeIcon
-	 */
-	protected void internalSetLargeIconInList(String newLargeIcon) {
-		IconType newValue = null;
-		if(getIcons().size() > 0) {
-			newValue = (IconType) getIcons().get(0);
-			newValue.setLargeIcon(newLargeIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setLargeIcon(newLargeIcon);
-			getIcons().add(newValue); 
-		}
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLargeIconGen() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLargeIconGen(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-	public String getDescription() {
-		if(eResource() == null) 
-			return getDescriptionGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getDescriptionGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getDescriptions().size() > 0)
-				return ((Description)getDescriptions().get(0)).getValue();
-		}
-		return null;
-	}
-	
-	public void setDescription(String newDescription) {
-		if(eResource() == null) {
-			setDescriptionGen(newDescription);
-			internalSetDescriptionInList(newDescription);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setDescriptionGen(newDescription);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			internalSetDescriptionInList(newDescription); 
-			break;
-		}
-	}
-	
-	/**
-	 * @param newDescription
-	 */
-	protected void internalSetDescriptionInList(String newDescription) {
-		Description newValue = null;
-		if(getDescriptions().size() > 0) {
-			newValue = (Description) getDescriptions().get(0);
-			newValue.setValue(newDescription);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createDescription();
-			newValue.setValue(newDescription);
-			getDescriptions().add(newValue);
-		}
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescriptionGen() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescriptionGen(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDisplayName() {
-		if(eResource() == null) 
-			return getDisplayNameGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getDisplayNameGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getDisplayNames().size() > 0)
-				return ((DisplayName)getDisplayNames().get(0)).getValue();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.common.DescriptionGroup#setDisplayName(java.lang.String)
-	 */
-	public void setDisplayName(String newDisplayName) {
-		if(eResource() == null) {
-			setDisplayNameGen(newDisplayName);
-			internalSetDisplayNameInList(newDisplayName);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setDisplayNameGen(newDisplayName);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			internalSetDisplayNameInList(newDisplayName);
-			break;
-		}
-	}
-
-	/**
-	 * @param newDisplayName
-	 */
-	protected void internalSetDisplayNameInList(String newDisplayName) {
-		DisplayName newValue = null;
-		if(getDisplayNames().size() > 0) {
-			newValue = (DisplayName) getDisplayNames().get(0);
-			newValue.setValue(newDisplayName);
-		}
-		else  {
-			newValue = CommonFactory.eINSTANCE.createDisplayName();
-			newValue.setValue(newDisplayName);
-			getDisplayNames().add(newValue);
-		}			  
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDisplayNameGen() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayNameGen(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS:
-				return getIcons();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS:
-				return getDescriptions();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				return getSmallIcon();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				return getLargeIcon();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				return getDisplayName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS:
-				getIcons().clear();
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS:
-				return icons != null && !icons.isEmpty();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-		}
-		return 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(" (smallIcon: "); //$NON-NLS-1$
-		result.append(smallIcon);
-		result.append(", largeIcon: "); //$NON-NLS-1$
-		result.append(largeIcon);
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", displayName: "); //$NON-NLS-1$
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CompatibilityDescriptionGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupAdapter.java
deleted file mode 100644
index a6de6a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupAdapter.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 3, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-
-/**
-	 * @author cbridgha
-	 *
-	 * To change the template for this generated type comment go to
-	 * Window - Preferences - Java - Code Generation - Code and Comments
-	 */
-	public class DescriptionGroupAdapter extends AdapterImpl {
-
-			/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (msg.getFeature() == CommonPackage.eINSTANCE.getDescriptionGroup_Icons() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getIconType_LargeIcon() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getIconType_SmallIcon()) {
-					synchIcons();
-					return;
-				}
-			else if (msg.getFeature() == CommonPackage.eINSTANCE.getDescriptionGroup_Descriptions() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getDescription_Value()) {
-					synchDescription();
-					return;
-				}
-			else if (msg.getFeature() == CommonPackage.eINSTANCE.getDescriptionGroup_DisplayNames() ||
-					msg.getFeature() == CommonPackage.eINSTANCE.getDisplayName_Value()) {
-					synchDisplayName();
-					return;
-				}
-			
-		}
-
-		/**
-		 * 
-		 */
-		private void synchDescription() {
-			CompatibilityDescriptionGroup myTarget = (CompatibilityDescriptionGroup)getTarget();
-			if (myTarget.getDescriptions().isEmpty())
-				myTarget.setDescriptionGen(null);
-			else {
-				Description aDescription = (Description)myTarget.getDescriptions().get(0);
-				if (!aDescription.eAdapters().contains(this))
-					aDescription.eAdapters().add(this);
-				else 
-					myTarget.setDescriptionGen(aDescription.getValue());
-			}
-		}
-
-		/**
-		 * 
-		 */
-		private void synchDisplayName() {
-			CompatibilityDescriptionGroup myTarget = (CompatibilityDescriptionGroup)getTarget();
-			if (myTarget.getDisplayNames().isEmpty())
-				myTarget.setDisplayNameGen(null);
-			else {
-				DisplayName aDisplayName = (DisplayName)myTarget.getDisplayNames().get(0);
-				if (!aDisplayName.eAdapters().contains(this))
-					aDisplayName.eAdapters().add(this);
-				myTarget.setDisplayNameGen(aDisplayName.getValue());
-			}
-		}
-
-		/**
-		 * 
-		 */
-		private void synchIcons() {
-			CompatibilityDescriptionGroup myTarget = (CompatibilityDescriptionGroup)getTarget();
-			if (myTarget.getIcons().isEmpty()) {
-				myTarget.setLargeIconGen(null);
-				myTarget.setSmallIconGen(null);
-			}
-			else {
-				IconType anIcon = (IconType)myTarget.getIcons().get(0);
-				if (!anIcon.eAdapters().contains(this))
-					anIcon.eAdapters().add(this);
-				else {
-					myTarget.setLargeIconGen(anIcon.getLargeIcon());
-					myTarget.setSmallIconGen(anIcon.getSmallIcon());
-				}
-			}
-		}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier newTarget) {
-		if (newTarget instanceof CompatibilityDescriptionGroup)
-			super.setTarget(newTarget);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupImpl.java
deleted file mode 100644
index 5ae8f67..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionGroupImpl.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.internal.common.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-
-
-/**
- * <!-- begin-user-doc -->An implementation of the model object '<em><b>Description Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl#getIcons <em>Icons</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl#getDisplayNames <em>Display Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptionGroupImpl extends EObjectImpl implements DescriptionGroup {
-	/**
-	 * The cached value of the '{@link #getIcons() <em>Icons</em>}' containment reference list.
-	 * <!-- begin-user-doc --><!-- end-user-doc -->
-	 * 
-	 * @see #getIcons() @generated @ordered
-	 */
-	protected EList icons = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment
-	 * reference list. <!-- begin-user-doc --><!-- end-user-doc -->
-	 * 
-	 * @see #getDisplayNames() @generated @ordered
-	 */
-	protected EList displayNames = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment
-	 * reference list. <!-- begin-user-doc --><!-- end-user-doc -->
-	 * 
-	 * @see #getDescriptions() @generated @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	protected DescriptionGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getDescriptionGroup();
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public EList getIcons() {
-		if (icons == null) {
-			icons = new EObjectContainmentEList(IconType.class, this, CommonPackage.DESCRIPTION_GROUP__ICONS);
-		}
-		return icons;
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public EList getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.DESCRIPTION_GROUP__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				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 CommonPackage.DESCRIPTION_GROUP__ICONS:
-				return getIcons();
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				getIcons().clear();
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc --><!-- end-user-doc -->@generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DESCRIPTION_GROUP__ICONS:
-				return icons != null && !icons.isEmpty();
-			case CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jst.j2ee.internal.common.DescriptionGroup#getJ2EEVersionID()
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException {
-		
-		try {
-			J2EEVersionResource res = (J2EEVersionResource) eResource();
-				if (res == null)
-					throw new IllegalStateException();
-				return res.getJ2EEVersionID();
-		} catch (ClassCastException exception) {
-			return J2EEVersionConstants.J2EE_1_3_ID;
-		}
-		
-	}
-
-} //DescriptionGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionImpl.java
deleted file mode 100644
index 18cb62d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DescriptionImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.DescriptionImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.DescriptionImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DescriptionImpl extends EObjectImpl implements Description {
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getDescription();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DESCRIPTION__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DESCRIPTION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DESCRIPTION__LANG:
-				return getLang();
-			case CommonPackage.DESCRIPTION__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DESCRIPTION__LANG:
-				setLang((String)newValue);
-				return;
-			case CommonPackage.DESCRIPTION__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DESCRIPTION__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case CommonPackage.DESCRIPTION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DESCRIPTION__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case CommonPackage.DESCRIPTION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return 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(" (lang: "); //$NON-NLS-1$
-		result.append(lang);
-		result.append(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DescriptionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DisplayNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DisplayNameImpl.java
deleted file mode 100644
index 877d775..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/DisplayNameImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.DisplayNameImpl#getLang <em>Lang</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.DisplayNameImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DisplayNameImpl extends EObjectImpl implements DisplayName {
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DisplayNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getDisplayName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DISPLAY_NAME__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DISPLAY_NAME__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				return getLang();
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				setLang((String)newValue);
-				return;
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.DISPLAY_NAME__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case CommonPackage.DISPLAY_NAME__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return 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(" (lang: "); //$NON-NLS-1$
-		result.append(lang);
-		result.append(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DisplayNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EJBLocalRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EJBLocalRefImpl.java
deleted file mode 100644
index ef60810..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EJBLocalRefImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-/**
- * 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
- */
-public class EJBLocalRefImpl extends EjbRefImpl implements EJBLocalRef, EjbRef{
-
-	/**
-	 * The default value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_HOME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalHome() <em>Local Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected String localHome = LOCAL_HOME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocal() <em>Local</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocal()
-	 * @generated
-	 * @ordered
-	 */
-	protected String local = LOCAL_EDEFAULT;
-
-	public EJBLocalRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getEJBLocalRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocalHome() {
-		return localHome;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalHome(String newLocalHome) {
-		String oldLocalHome = localHome;
-		localHome = newLocalHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_LOCAL_REF__LOCAL_HOME, oldLocalHome, localHome));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocal() {
-		return local;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocal(String newLocal) {
-		String oldLocal = local;
-		local = newLocal;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_LOCAL_REF__LOCAL, oldLocal, local));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.EJB_LOCAL_REF__NAME:
-				return getName();
-			case CommonPackage.EJB_LOCAL_REF__TYPE:
-				return getType();
-			case CommonPackage.EJB_LOCAL_REF__HOME:
-				return getHome();
-			case CommonPackage.EJB_LOCAL_REF__REMOTE:
-				return getRemote();
-			case CommonPackage.EJB_LOCAL_REF__LINK:
-				return getLink();
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				return getLocalHome();
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				return getLocal();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.EJB_LOCAL_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__TYPE:
-				setType((EjbRefType)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__HOME:
-				setHome((String)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__REMOTE:
-				setRemote((String)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				setLocalHome((String)newValue);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				setLocal((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.EJB_LOCAL_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__TYPE:
-				unsetType();
-				return;
-			case CommonPackage.EJB_LOCAL_REF__HOME:
-				setHome(HOME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__REMOTE:
-				setRemote(REMOTE_EDEFAULT);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				setLocalHome(LOCAL_HOME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				setLocal(LOCAL_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.EJB_LOCAL_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.EJB_LOCAL_REF__TYPE:
-				return isSetType();
-			case CommonPackage.EJB_LOCAL_REF__HOME:
-				return HOME_EDEFAULT == null ? home != null : !HOME_EDEFAULT.equals(home);
-			case CommonPackage.EJB_LOCAL_REF__REMOTE:
-				return REMOTE_EDEFAULT == null ? remote != null : !REMOTE_EDEFAULT.equals(remote);
-			case CommonPackage.EJB_LOCAL_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.EJB_LOCAL_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case CommonPackage.EJB_LOCAL_REF__LOCAL_HOME:
-				return LOCAL_HOME_EDEFAULT == null ? localHome != null : !LOCAL_HOME_EDEFAULT.equals(localHome);
-			case CommonPackage.EJB_LOCAL_REF__LOCAL:
-				return LOCAL_EDEFAULT == null ? local != null : !LOCAL_EDEFAULT.equals(local);
-		}
-		return 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(" (localHome: "); //$NON-NLS-1$
-		result.append(localHome);
-		result.append(", local: "); //$NON-NLS-1$
-		result.append(local);
-		result.append(')');
-		return result.toString();
-	}
-
-/**
- * Return true if the ejbref is for a local ejb interface.
- */
-public boolean isLocal(){
-	return true;
-}
-	/**
-	 * <!-- 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 CommonPackage.EJB_LOCAL_REF__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, featureID, msgs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#getRemote()
-	 */
-	public String getRemote() {
-		return getLocal(); //forward to the local
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#setRemote(java.lang.String)
-	 */
-	public void setRemote(String value) {
-		setLocal(value); //forward to the local
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#getHome()
-	 */
-	public String getHome() {
-		return getLocalHome(); //forward to the local home
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.EjbRef#setHome(java.lang.String)
-	 */
-	public void setHome(String value) {
-		setLocalHome(value); //forward to the local home
-	}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EjbRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EjbRefImpl.java
deleted file mode 100644
index 3651b61..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EjbRefImpl.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EjbRefType;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-/**
- * 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.
- */
-public class EjbRefImpl extends EObjectImpl implements EjbRef, EObject{
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final EjbRefType TYPE_EDEFAULT = EjbRefType.SESSION_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EjbRefType type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The default value of the '{@link #getHome() <em>Home</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHome()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String home = HOME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRemote() <em>Remote</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRemote()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REMOTE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String remote = REMOTE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String link = LINK_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public EjbRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getEjbRef();
-	}
-
-/**
- * Return an enterprise bean referenced by the EjbRef, if one exists, within the scope of the parameter.
- * The ejb-link value of the ref must equate to a named enterprise bean contained in the jar; otherwise 
- * return null
- */
-public EnterpriseBean getLinkedEjb(EJBJar ejbJar) {
-	if (getLink() == null) {
-		return null;
-	}
-	return ejbJar.getEnterpiseBeanFromRef(this);
-}/**
- * Return an enterprise bean referenced by the EjbRef, if one exists, within the scope of the parameter.
- * The ejb-link value of the ref must equate to a named enterprise bean contained in the jar; otherwise 
- * return null
- */  
-public boolean isEquivalent(EjbRef anEjbRef) {
-	if (anEjbRef == null) return false;
-	boolean equiv = true;
-	equiv = getName() == anEjbRef.getName() || (getName() != null && getName().equals(anEjbRef.getName()));
-	if (equiv)
-		equiv = getHome() == anEjbRef.getHome() || (getHome() != null && getHome().equals(anEjbRef.getHome()));
-	if (equiv)
-		equiv = getRemote() == anEjbRef.getRemote() || (getRemote() != null && getRemote().equals(anEjbRef.getRemote()));
-	if (equiv)
-		equiv = getLink() == anEjbRef.getLink() || (getLink() != null && getLink().equals(anEjbRef.getLink()));
-	return equiv;
-}
-public boolean isLinked(EnterpriseBean anEJB) {
-	if (getLink() == null)
-		return false;
-	return getLink().equals(anEJB.getName());
-}
-/**
- * Return true if the ejbref is for a local ejb interface.
- */
-public boolean isLocal(){
-	return false;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The ejb-ref-name element contains the name of an EJB reference. This is the JNDI name that the servlet code uses to get a reference to the enterprise bean.
-	 * Example: <ejb-ref-name>ejb//Payroll<//ejb-ref-name>
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The ejb-ref-type element contains the expected type of the referenced enterprise bean. The ejb-ref-type element must be one of the following:
-	 * <ejb-ref-type>Entity<//ejb-ref-type>
-	 * <ejb-ref-type>Session<//ejb-ref-type>
-	 */
-	public EjbRefType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(EjbRefType newType) {
-		EjbRefType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		EjbRefType oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.EJB_REF__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The home element contains the fully-qualified name of the enterprise bean's home interface.
-	 * Example: <home>com.aardvark.payroll.PayrollHome<//home>
-	 */
-	public String getHome() {
-		return home;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setHome(String newHome) {
-		String oldHome = home;
-		home = newHome;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__HOME, oldHome, home));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The remote element contains the fully-qualified name of the enterprise bean's remote interface.
-	 */
-	public String getRemote() {
-		return remote;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRemote(String newRemote) {
-		String oldRemote = remote;
-		remote = newRemote;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__REMOTE, oldRemote, remote));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The ejb-link element is used in the ejb-ref element to specify that an EJB reference is linked to an enterprise bean in the encompassing J2EE Application package. The value of the ejb-link element must be the ejb-name of an enterprise bean in the same J2EE Application package. 
-	 * Example: <ejb-link>EmployeeRecord<//ejb-link>
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation The
-	 *            description element is used by the ejb-jar file producer to
-	 *            provide text describing the parent element. The description
-	 *            element should include any information that the ejb-jar file
-	 *            producer wants to provide to the consumer of the ejb-jar file
-	 *            (i.e. to the Deployer). Typically, the tools used by the
-	 *            ejb-jar file consumer will display the description when
-	 *            processing the parent element.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				d.setValue(newDescription);
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.EJB_REF__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.EJB_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.EJB_REF__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.EJB_REF__NAME:
-				return getName();
-			case CommonPackage.EJB_REF__TYPE:
-				return getType();
-			case CommonPackage.EJB_REF__HOME:
-				return getHome();
-			case CommonPackage.EJB_REF__REMOTE:
-				return getRemote();
-			case CommonPackage.EJB_REF__LINK:
-				return getLink();
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.EJB_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.EJB_REF__TYPE:
-				return isSetType();
-			case CommonPackage.EJB_REF__HOME:
-				return HOME_EDEFAULT == null ? home != null : !HOME_EDEFAULT.equals(home);
-			case CommonPackage.EJB_REF__REMOTE:
-				return REMOTE_EDEFAULT == null ? remote != null : !REMOTE_EDEFAULT.equals(remote);
-			case CommonPackage.EJB_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.EJB_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__TYPE:
-				setType((EjbRefType)newValue);
-				return;
-			case CommonPackage.EJB_REF__HOME:
-				setHome((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__REMOTE:
-				setRemote((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.EJB_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__TYPE:
-				unsetType();
-				return;
-			case CommonPackage.EJB_REF__HOME:
-				setHome(HOME_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__REMOTE:
-				setRemote(REMOTE_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.EJB_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", type: "); //$NON-NLS-1$
-		if (typeESet) result.append(type); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", home: "); //$NON-NLS-1$
-		result.append(home);
-		result.append(", remote: "); //$NON-NLS-1$
-		result.append(remote);
-		result.append(", link: "); //$NON-NLS-1$
-		result.append(link);
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EnvEntryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EnvEntryImpl.java
deleted file mode 100644
index ac4da44..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/EnvEntryImpl.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.EnvEntryType;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-/**
- * 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.
- */
-public class EnvEntryImpl extends EObjectImpl implements EnvEntry, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String value = VALUE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final EnvEntryType TYPE_EDEFAULT = EnvEntryType.STRING_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EnvEntryType type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public EnvEntryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getEnvEntry();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The env-entry-name element contains the name of an application client's environment entry. 
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The env-entry-value element contains the value of an application client's environment entry. The value must be a String that is valid for the constructor of the specified type that takes a single String parameter.
-	 * Used in: env-entry
-	 * Example:
-	 * <env-entry-value>//datasources//MyDatabase<//env-entry-value>
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The env-entry-type element contains the fully-qualified Java type of the environment entry value that is expected by the application client's code. The following are the legal values of env-entry-type: java.lang.Bool-ean, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte, java.lang.Short, java.lang.Long, and java.lang.Float. 
-	 * Example: <env-entry-type>java.lang.Boolean<//env-entry-type>
-	 */
-	public EnvEntryType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(EnvEntryType newType) {
-		EnvEntryType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ENV_ENTRY__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		EnvEntryType oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.ENV_ENTRY__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.ENV_ENTRY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.ENV_ENTRY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.ENV_ENTRY__NAME:
-				return getName();
-			case CommonPackage.ENV_ENTRY__VALUE:
-				return getValue();
-			case CommonPackage.ENV_ENTRY__TYPE:
-				return getType();
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.ENV_ENTRY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.ENV_ENTRY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case CommonPackage.ENV_ENTRY__TYPE:
-				return isSetType();
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__VALUE:
-				setValue((String)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__TYPE:
-				setType((EnvEntryType)newValue);
-				return;
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.ENV_ENTRY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.ENV_ENTRY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.ENV_ENTRY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case CommonPackage.ENV_ENTRY__TYPE:
-				unsetType();
-				return;
-			case CommonPackage.ENV_ENTRY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(", type: "); //$NON-NLS-1$
-		if (typeESet) result.append(type); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IconTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IconTypeImpl.java
deleted file mode 100644
index f6be65e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IconTypeImpl.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Icon Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.IconTypeImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.IconTypeImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.IconTypeImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IconTypeImpl extends EObjectImpl implements IconType {
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLang()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lang = LANG_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IconTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getIconType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSmallIcon() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSmallIcon(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ICON_TYPE__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLargeIcon() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLargeIcon(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ICON_TYPE__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLang() {
-		return lang;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLang(String newLang) {
-		String oldLang = lang;
-		lang = newLang;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.ICON_TYPE__LANG, oldLang, lang));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				return getSmallIcon();
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				return getLargeIcon();
-			case CommonPackage.ICON_TYPE__LANG:
-				return getLang();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case CommonPackage.ICON_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case CommonPackage.ICON_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.ICON_TYPE__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case CommonPackage.ICON_TYPE__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case CommonPackage.ICON_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-		}
-		return 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(" (smallIcon: "); //$NON-NLS-1$
-		result.append(smallIcon);
-		result.append(", largeIcon: "); //$NON-NLS-1$
-		result.append(largeIcon);
-		result.append(", lang: "); //$NON-NLS-1$
-		result.append(lang);
-		result.append(')');
-		return result.toString();
-	}
-
-} //IconTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IdentityImpl.java
deleted file mode 100644
index 386b7a9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/IdentityImpl.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * Specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.
-
- */
-public class IdentityImpl extends EObjectImpl implements Identity, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public IdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getIdentity();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the run as identity.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.IDENTITY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The role-name element contains the name of a security role.
-	 * 
-	 * The name must conform to the lexical rules for an NMTOKEN.
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.IDENTITY__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.IDENTITY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.IDENTITY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.IDENTITY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				return getRoleName();
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.IDENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.IDENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.IDENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.IDENTITY__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case CommonPackage.IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", roleName: "); //$NON-NLS-1$
-		result.append(roleName);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResouceFactorySaxRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResouceFactorySaxRegistry.java
deleted file mode 100644
index bd480ad..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResouceFactorySaxRegistry.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 11, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.common.impl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceFactory;
-import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.WebServicesClientResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory;
-
-/**
- * @author jsholl
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class J2EEResouceFactorySaxRegistry extends J2EEResourceFactoryRegistry {
-    public static J2EEResourceFactoryRegistry INSTANCE = new J2EEResouceFactorySaxRegistry();
-
-    public J2EEResouceFactorySaxRegistry() {
-        super();
-        initRegistration();
-    }
-    private void initRegistration() {
-    	EMF2SAXRendererFactory.INSTANCE.setValidating(false);
-        registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APP_CLIENT_DD_SHORT_NAME, new ApplicationClientResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-        registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(EMF2SAXRendererFactory.INSTANCE));
-	}
-    
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryDomRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryDomRegistry.java
deleted file mode 100644
index bef2ab8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryDomRegistry.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 20, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceFactory;
-import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.WebServicesClientResourceFactory;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory;
-
-
-
-/**
- * @author mdelder
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class J2EEResourceFactoryDomRegistry
-        extends J2EEResourceFactoryRegistry {
-
-    /**
-     * 
-     */
-    public J2EEResourceFactoryDomRegistry() {
-        super();
-        initRegistration();
-    }
-    
-    private void initRegistration() {
-    	EMF2SAXRendererFactory.INSTANCE.setValidating(false);
-        registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APP_CLIENT_DD_SHORT_NAME, new ApplicationClientResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.APPLICATION_DD_SHORT_NAME, new ApplicationResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-        registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryRegistry.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryRegistry.java
deleted file mode 100644
index 24ad1e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/J2EEResourceFactoryRegistry.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-
-
-public class J2EEResourceFactoryRegistry extends FileNameResourceFactoryRegistry {
-	
-	public static J2EEResourceFactoryRegistry INSTANCE = new J2EEResourceFactoryRegistry();
-
-	public J2EEResourceFactoryRegistry() {
-		super();
-	}
-	
-	public Resource.Factory delegatedGetFactory(URI uri) {
-		if (J2EEResourceFactoryRegistry.INSTANCE == this)
-			return super.delegatedGetFactory(uri);
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(uri);	
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/JNDIEnvRefsGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/JNDIEnvRefsGroupImpl.java
deleted file mode 100644
index f9cf78c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/JNDIEnvRefsGroupImpl.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.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.EStructuralFeature;
-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.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JNDI Env Refs Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl#getEnvironmentProperties <em>Environment Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl#getResourceRefs <em>Resource Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl#getEjbRefs <em>Ejb Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl#getResourceEnvRefs <em>Resource Env Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl#getEjbLocalRefs <em>Ejb Local Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl#getMessageDestinationRefs <em>Message Destination Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class JNDIEnvRefsGroupImpl extends CompatibilityDescriptionGroupImpl implements JNDIEnvRefsGroup {
-	/**
-	 * The cached value of the '{@link #getEnvironmentProperties() <em>Environment Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnvironmentProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList environmentProperties = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceRefs() <em>Resource Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbRefs() <em>Ejb Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceEnvRefs() <em>Resource Env Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceEnvRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList resourceEnvRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLocalRefs() <em>Ejb Local Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbLocalRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList ejbLocalRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinationRefs() <em>Message Destination Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinationRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinationRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList serviceRefs = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JNDIEnvRefsGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getJNDIEnvRefsGroup();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEnvironmentProperties() {
-		if (environmentProperties == null) {
-			environmentProperties = new EObjectContainmentEList(EnvEntry.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES);
-		}
-		return environmentProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getResourceRefs() {
-		if (resourceRefs == null) {
-			resourceRefs = new EObjectContainmentEList(ResourceRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS);
-		}
-		return resourceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEjbRefs() {
-		if (ejbRefs == null) {
-			ejbRefs = new EObjectContainmentEList(EjbRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS);
-		}
-		return ejbRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getResourceEnvRefs() {
-		if (resourceEnvRefs == null) {
-			resourceEnvRefs = new EObjectContainmentEList(ResourceEnvRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS);
-		}
-		return resourceEnvRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getEjbLocalRefs() {
-		if (ejbLocalRefs == null) {
-			ejbLocalRefs = new EObjectContainmentEList(EJBLocalRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS);
-		}
-		return ejbLocalRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinationRefs() {
-		if (messageDestinationRefs == null) {
-			messageDestinationRefs = new EObjectContainmentEList(MessageDestinationRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS);
-		}
-		return messageDestinationRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.JNDI_ENV_REFS_GROUP__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-					return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-					return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-					return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-					return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-					return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-					return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-				case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				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 CommonPackage.JNDI_ENV_REFS_GROUP__ICONS:
-				return getIcons();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS:
-				return getDescriptions();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON:
-				return getSmallIcon();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON:
-				return getLargeIcon();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME:
-				return getDisplayName();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				return getResourceRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				return getEjbRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				return getServiceRefs();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ICONS:
-				getIcons().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ICONS:
-				return icons != null && !icons.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //JNDIEnvRefsGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ListenerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ListenerImpl.java
deleted file mode 100644
index 88f826d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ListenerImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-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.EStructuralFeature;
-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.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * Declares a class in the application must be registered as a web application listener bean.
- */
-public class ListenerImpl extends CompatibilityDescriptionGroupImpl implements Listener {
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass listenerClass = null;
-		/**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	protected ListenerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getListener();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The listener-class element declares a class in the application must be registered as a web application listener bean.
-	 */
-	public JavaClass getListenerClass() {
-		if (listenerClass != null && listenerClass.eIsProxy()) {
-			JavaClass oldListenerClass = listenerClass;
-			listenerClass = (JavaClass)eResolveProxy((InternalEObject)listenerClass);
-			if (listenerClass != oldListenerClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonPackage.LISTENER__LISTENER_CLASS, oldListenerClass, listenerClass));
-			}
-		}
-		return listenerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetListenerClass() {
-		return listenerClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setListenerClass(JavaClass newListenerClass) {
-		JavaClass oldListenerClass = listenerClass;
-		listenerClass = newListenerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.LISTENER__LISTENER_CLASS, oldListenerClass, listenerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.LISTENER__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case CommonPackage.LISTENER__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case CommonPackage.LISTENER__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.LISTENER__ICONS:
-				return getIcons();
-			case CommonPackage.LISTENER__DISPLAY_NAMES:
-				return getDisplayNames();
-			case CommonPackage.LISTENER__DESCRIPTIONS:
-				return getDescriptions();
-			case CommonPackage.LISTENER__SMALL_ICON:
-				return getSmallIcon();
-			case CommonPackage.LISTENER__LARGE_ICON:
-				return getLargeIcon();
-			case CommonPackage.LISTENER__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.LISTENER__DISPLAY_NAME:
-				return getDisplayName();
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				if (resolve) return getListenerClass();
-				return basicGetListenerClass();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.LISTENER__ICONS:
-				return icons != null && !icons.isEmpty();
-			case CommonPackage.LISTENER__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case CommonPackage.LISTENER__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case CommonPackage.LISTENER__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case CommonPackage.LISTENER__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case CommonPackage.LISTENER__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.LISTENER__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				return listenerClass != 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 CommonPackage.LISTENER__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case CommonPackage.LISTENER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case CommonPackage.LISTENER__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case CommonPackage.LISTENER__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case CommonPackage.LISTENER__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case CommonPackage.LISTENER__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.LISTENER__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				setListenerClass((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.LISTENER__ICONS:
-				getIcons().clear();
-				return;
-			case CommonPackage.LISTENER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case CommonPackage.LISTENER__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case CommonPackage.LISTENER__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case CommonPackage.LISTENER__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case CommonPackage.LISTENER__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.LISTENER__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case CommonPackage.LISTENER__LISTENER_CLASS:
-				setListenerClass((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-/**
- * createClassRef - return a JavaURL reference to the named Java class
- */
-public JavaClass createClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-/**
- * Get the fully qualified class name for the listener.
- */
-public String getListenerClassName() {
-	getListenerClass();
-	return (listenerClass == null) ? null : listenerClass.getQualifiedName();
-}
-/**
- * Sets the listener class name.
- */
-public void setListenerClassName(String listenerClassName) {
-	eSet(CommonPackage.eINSTANCE.getListener_ListenerClass(), createClassRef(listenerClassName));
-}
-} //ListenerImpl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationImpl.java
deleted file mode 100644
index 8e6f18c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Destination</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageDestinationImpl extends CompatibilityDescriptionGroupImpl implements MessageDestination {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageDestinationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getMessageDestination();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.MESSAGE_DESTINATION__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case CommonPackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.MESSAGE_DESTINATION__ICONS:
-				return getIcons();
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				return getDisplayNames();
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				return getDescriptions();
-			case CommonPackage.MESSAGE_DESTINATION__SMALL_ICON:
-				return getSmallIcon();
-			case CommonPackage.MESSAGE_DESTINATION__LARGE_ICON:
-				return getLargeIcon();
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAME:
-				return getDisplayName();
-			case CommonPackage.MESSAGE_DESTINATION__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 CommonPackage.MESSAGE_DESTINATION__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__NAME:
-				setName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.MESSAGE_DESTINATION__ICONS:
-				getIcons().clear();
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.MESSAGE_DESTINATION__ICONS:
-				return icons != null && !icons.isEmpty();
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case CommonPackage.MESSAGE_DESTINATION__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case CommonPackage.MESSAGE_DESTINATION__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case CommonPackage.MESSAGE_DESTINATION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.MESSAGE_DESTINATION__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case CommonPackage.MESSAGE_DESTINATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		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(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageDestinationImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationRefImpl.java
deleted file mode 100644
index 9d3935c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/MessageDestinationRefImpl.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.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.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.MessageDestinationUsageType;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Destination Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationRefImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationRefImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationRefImpl#getUsage <em>Usage</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationRefImpl#getLink <em>Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.MessageDestinationRefImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageDestinationRefImpl extends EObjectImpl implements MessageDestinationRef {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUsage() <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MessageDestinationUsageType USAGE_EDEFAULT = MessageDestinationUsageType.CONSUMES_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getUsage() <em>Usage</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUsage()
-	 * @generated
-	 * @ordered
-	 */
-	protected MessageDestinationUsageType usage = USAGE_EDEFAULT;
-	/**
-	 * This is true if the Auth attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @ordered
-	 */
-	protected boolean useESet = false;
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String link = LINK_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageDestinationRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getMessageDestinationRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageDestinationUsageType getUsage() {
-		return usage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUsage(MessageDestinationUsageType newUsage) {
-		MessageDestinationUsageType oldUsage = usage;
-		usage = newUsage == null ? USAGE_EDEFAULT : newUsage;
-		boolean oldUseESet = useESet;
-		useESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__USAGE, oldUsage, usage, !oldUseESet));
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public void unsetUsage() {
-		MessageDestinationUsageType oldUsage = usage;
-		boolean oldUsageESet = useESet;
-		usage = USAGE_EDEFAULT;
-		useESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.MESSAGE_DESTINATION_REF__USAGE, oldUsage, USAGE_EDEFAULT, oldUsageESet));
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 */
-	public boolean isSetUse() {
-		return useESet;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.MESSAGE_DESTINATION_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				return getName();
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				return getType();
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				return getUsage();
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				return getLink();
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				setType((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				setUsage((MessageDestinationUsageType)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				unsetUsage();
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.MESSAGE_DESTINATION_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.MESSAGE_DESTINATION_REF__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case CommonPackage.MESSAGE_DESTINATION_REF__USAGE:
-				return isSetUse();
-			case CommonPackage.MESSAGE_DESTINATION_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.MESSAGE_DESTINATION_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return 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(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", type: "); //$NON-NLS-1$
-		result.append(type);
-		result.append(", usage: "); //$NON-NLS-1$
-		result.append(usage);
-		result.append(", link: "); //$NON-NLS-1$
-		result.append(link);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageDestinationRefImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ParamValueImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ParamValueImpl.java
deleted file mode 100644
index 6c33b4a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ParamValueImpl.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.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.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Param Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.ParamValueImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.ParamValueImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.ParamValueImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.ParamValueImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParamValueImpl extends EObjectImpl implements ParamValue {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ParamValueImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getParamValue();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.PARAM_VALUE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.PARAM_VALUE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.PARAM_VALUE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.PARAM_VALUE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.PARAM_VALUE__NAME:
-				return getName();
-			case CommonPackage.PARAM_VALUE__VALUE:
-				return getValue();
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.PARAM_VALUE__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.PARAM_VALUE__VALUE:
-				setValue((String)newValue);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.PARAM_VALUE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.PARAM_VALUE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.PARAM_VALUE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.PARAM_VALUE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case CommonPackage.PARAM_VALUE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.PARAM_VALUE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return 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(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ParamValueImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/QNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/QNameImpl.java
deleted file mode 100644
index a8fd490..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/QNameImpl.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.wst.common.internal.emf.utilities.NamespaceAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.StringUtil;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>QName</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.QNameImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.QNameImpl#getLocalPart <em>Local Part</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.QNameImpl#getCombinedQName <em>Combined QName</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.common.impl.QNameImpl#getInternalPrefixOrNsURI <em>Internal Prefix Or Ns URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QNameImpl extends EObjectImpl implements QName {
-	/**
-	 * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespaceURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespaceURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLocalPart() <em>Local Part</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCAL_PART_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalPart() <em>Local Part</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalPart()
-	 * @generated
-	 * @ordered
-	 */
-	protected String localPart = LOCAL_PART_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCombinedQName() <em>Combined QName</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCombinedQName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMBINED_QNAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCombinedQName() <em>Combined QName</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCombinedQName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String combinedQName = COMBINED_QNAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getInternalPrefixOrNsURI() <em>Internal Prefix Or Ns URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInternalPrefixOrNsURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String INTERNAL_PREFIX_OR_NS_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getInternalPrefixOrNsURI() <em>Internal Prefix Or Ns URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInternalPrefixOrNsURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String internalPrefixOrNsURI = INTERNAL_PREFIX_OR_NS_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected QNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getQName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNamespaceURIGen() {
-		return namespaceURI;
-	}
-
-	public String getNamespaceURI() {
-		if (namespaceURI != null)
-			return namespaceURI;
-		String resolved = NamespaceAdapter.getResolvedNamespaceURI(internalPrefixOrNsURI, this);
-		return resolved == null ? internalPrefixOrNsURI : resolved;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNamespaceURIGen(String newNamespaceURI) {
-		String oldNamespaceURI = namespaceURI;
-		namespaceURI = newNamespaceURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-	}
-
-	public void setNamespaceURI(String newNamespaceURI) {
-	    String prefix = getInternalPrefixOrNsURI();
-	    String oldNsURI = getInternalPrefixOrNsURI();
-	    if (!StringUtil.stringsEqual(prefix, oldNsURI))
-	        setValues(prefix, newNamespaceURI, getLocalPart());
-	    else {
-	        setNamespaceURIGen(newNamespaceURI);
-	        setInternalPrefixOrNsURI(newNamespaceURI);
-	    }
-			
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocalPart() {
-		return localPart;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalPartGen(String newLocalPart) {
-		String oldLocalPart = localPart;
-		localPart = newLocalPart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__LOCAL_PART, oldLocalPart, localPart));
-	}
-
-	public void setLocalPart(String newLocalPart) {
-		setLocalPartGen(newLocalPart);
-		updateCombine();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCombinedQName() {
-		return combinedQName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCombinedQNameGen(String newCombinedQName) {
-		String oldCombinedQName = combinedQName;
-		combinedQName = newCombinedQName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__COMBINED_QNAME, oldCombinedQName, combinedQName));
-	}
-
-	public void setCombinedQName(String newCombinedQName) {
-		setCombinedQNameGen(newCombinedQName);
-		updateParse();
-	}
-
-	/**
-	 * Parses the combined name into the components
-	 */
-	private void updateParse() {
-		String ns = null;
-		String lp = null;
-		if (combinedQName != null || combinedQName.length() > 0) {
-			int index = combinedQName.lastIndexOf(':');
-			
-			if (index < 0) { //No separator
-				ns = combinedQName;
-			} else if (index == 0) { //First char
-				lp = combinedQName.substring(1); 
-			} else if (index == combinedQName.length()-1) { //Last char
-				ns = combinedQName.substring(0, index);
-			} else { //In the middle, which is what it should be
-				ns = combinedQName.substring(0, index);
-				lp = combinedQName.substring(index+1, combinedQName.length());
-			}
-		}
-		setInternalPrefixOrNsURIGen(ns);
-		setLocalPartGen(lp);
-	}
-		
-	/**
-	 * updates the combined name from the components
-	 */
-	private void updateCombine() {
-		String cn = null;
-		if (internalPrefixOrNsURI != null || localPart != null) {
-			String ns = internalPrefixOrNsURI == null ? "" : internalPrefixOrNsURI; //$NON-NLS-1$
-			String lp = localPart == null ? "" : localPart; //$NON-NLS-1$
-			cn = ns+':'+lp;
-		}
-		setCombinedQNameGen(cn);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getInternalPrefixOrNsURI() {
-		return internalPrefixOrNsURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInternalPrefixOrNsURIGen(String newInternalPrefixOrNsURI) {
-		String oldInternalPrefixOrNsURI = internalPrefixOrNsURI;
-		internalPrefixOrNsURI = newInternalPrefixOrNsURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI, oldInternalPrefixOrNsURI, internalPrefixOrNsURI));
-	}
-
-	public void setInternalPrefixOrNsURI(String newInternalPrefixOrNsURI) {
-		setInternalPrefixOrNsURIGen(newInternalPrefixOrNsURI);
-		updateCombine();
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				return getNamespaceURI();
-			case CommonPackage.QNAME__LOCAL_PART:
-				return getLocalPart();
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				return getCombinedQName();
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				return getInternalPrefixOrNsURI();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				setNamespaceURI((String)newValue);
-				return;
-			case CommonPackage.QNAME__LOCAL_PART:
-				setLocalPart((String)newValue);
-				return;
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				setCombinedQName((String)newValue);
-				return;
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-				return;
-			case CommonPackage.QNAME__LOCAL_PART:
-				setLocalPart(LOCAL_PART_EDEFAULT);
-				return;
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				setCombinedQName(COMBINED_QNAME_EDEFAULT);
-				return;
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * eIsSet for namespace uri must be derived if null so namespaceURI ! = null and internalPrefixOrNsURI != null must both be check.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.QNAME__NAMESPACE_URI:
-				return NAMESPACE_URI_EDEFAULT == null ? (namespaceURI != null || internalPrefixOrNsURI != null) : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-			case CommonPackage.QNAME__LOCAL_PART:
-				return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-			case CommonPackage.QNAME__COMBINED_QNAME:
-				return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-			case CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI:
-				return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (namespaceURI: "); //$NON-NLS-1$
-		result.append(namespaceURI);
-		result.append(", localPart: "); //$NON-NLS-1$
-		result.append(localPart);
-		result.append(", combinedQName: "); //$NON-NLS-1$
-		result.append(combinedQName);
-		result.append(", internalPrefixOrNsURI: "); //$NON-NLS-1$
-		result.append(internalPrefixOrNsURI);
-		result.append(')');
-		return result.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.QName#setValues(java.lang.String, java.lang.String, java.lang.String)
-	 */
-	public void setValues(String prefix, String nsURI, String localPart) {
-		setInternalPrefixOrNsURIGen(prefix);
-		setLocalPartGen(localPart);
-		String existingURI = NamespaceAdapter.getNamespaceURIAtThisLevel(prefix, this);
-		boolean removed = false;
-		if (existingURI != null && !existingURI.equals(nsURI)) {
-			NamespaceAdapter.removeNamespace(prefix, this);
-			removed = true;
-		} 
-		if (existingURI == null || removed)
-			NamespaceAdapter.addNamespace(prefix, nsURI, this);
-		updateCombine();
-	}
-
-
-} //QNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceEnvRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceEnvRefImpl.java
deleted file mode 100644
index 6da3a3c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceEnvRefImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-/**
- * 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>
- */
-public class ResourceEnvRefImpl extends EObjectImpl implements ResourceEnvRef, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass type = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public ResourceEnvRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getResourceEnvRef();
-	}
-
-	/**
-	 * createClassRef - return a JavaURL reference to the named Java class
-	 */
-	public JavaClass createClassRef(String targetName) {
-		return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-	}
-
-	public String getTypeName() {
-		getType();
-		return type == null ? null : type.getQualifiedName();
-	}
-
-	public void setTypeName(String className) {
-		eSet(CommonPackage.eINSTANCE.getResourceEnvRef_Type(), createClassRef(className));
-	}
-
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				d.setValue(newDescription);
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation
-	 *            Specifies the name of a resource environment reference; its
-	 *            value is the environment entry name used in the enterprise
-	 *            bean code.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_ENV_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the type of a resource environment reference.  See the class description for an example.
-	 */
-	public JavaClass getType() {
-		if (type != null && type.eIsProxy()) {
-			JavaClass oldType = type;
-			type = (JavaClass)eResolveProxy((InternalEObject)type);
-			if (type != oldType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonPackage.RESOURCE_ENV_REF__TYPE, oldType, type));
-			}
-		}
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(JavaClass newType) {
-		JavaClass oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_ENV_REF__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				return getName();
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				return type != null;
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				setType((JavaClass)newValue);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__TYPE:
-				setType((JavaClass)null);
-				return;
-			case CommonPackage.RESOURCE_ENV_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceRefImpl.java
deleted file mode 100644
index be20020..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/ResourceRefImpl.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResSharingScopeType;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-/**
- * 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>
- */
-public class ResourceRefImpl extends EObjectImpl implements ResourceRef, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String type = TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAuth() <em>Auth</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ResAuthTypeBase AUTH_EDEFAULT = ResAuthTypeBase.CONTAINER_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ResAuthTypeBase auth = AUTH_EDEFAULT;
-	/**
-	 * This is true if the Auth attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean authESet = false;
-
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String link = LINK_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getResSharingScope() <em>Res Sharing Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResSharingScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ResSharingScopeType RES_SHARING_SCOPE_EDEFAULT = ResSharingScopeType.SHAREABLE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ResSharingScopeType resSharingScope = RES_SHARING_SCOPE_EDEFAULT;
-	/**
-	 * This is true if the Res Sharing Scope attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean resSharingScopeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public ResourceRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getResourceRef();
-	}
-
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				d.setValue(newDescription);
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-ref-name element specifies the name of the resource factory reference name. The resource factory reference name is the name of the application client's environment entry whose value contains the JNDI name of the data source.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-type element specifies the type of the data source. The type is specified by the Java interface (or class) expected to be implemented by the data source.
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__TYPE, oldType, type));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-auth element specifies whether the enterprise bean code signs on programmatically to the resource manager, or whether the Container will sign on to the resource manager on behalf of the bean. In the latter case, the Container uses information that is supplied by the Deployer.  The value of this element must be one of the two following:
-	 * <res-auth>Application<//res-auth>
-	 * <res-auth>Container<//res-auth>
-	 */
-	public ResAuthTypeBase getAuth() {
-		return auth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuth(ResAuthTypeBase newAuth) {
-		ResAuthTypeBase oldAuth = auth;
-		auth = newAuth == null ? AUTH_EDEFAULT : newAuth;
-		boolean oldAuthESet = authESet;
-		authESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__AUTH, oldAuth, auth, !oldAuthESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAuth() {
-		ResAuthTypeBase oldAuth = auth;
-		boolean oldAuthESet = authESet;
-		auth = AUTH_EDEFAULT;
-		authESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.RESOURCE_REF__AUTH, oldAuth, AUTH_EDEFAULT, oldAuthESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAuth() {
-		return authESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The res-sharing-scope element specifies whether connections obtained
-	 * through the given resource manager connection factory reference can be
-	 * shared. The value of this element, if specified, must be one of the
-	 * two following:  Shareable, Unshareable
-	 * 
-	 * The default value is Shareable.
-
-	 */
-	public ResSharingScopeType getResSharingScope() {
-		return resSharingScope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResSharingScope(ResSharingScopeType newResSharingScope) {
-		ResSharingScopeType oldResSharingScope = resSharingScope;
-		resSharingScope = newResSharingScope == null ? RES_SHARING_SCOPE_EDEFAULT : newResSharingScope;
-		boolean oldResSharingScopeESet = resSharingScopeESet;
-		resSharingScopeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE, oldResSharingScope, resSharingScope, !oldResSharingScopeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetResSharingScope() {
-		ResSharingScopeType oldResSharingScope = resSharingScope;
-		boolean oldResSharingScopeESet = resSharingScopeESet;
-		resSharingScope = RES_SHARING_SCOPE_EDEFAULT;
-		resSharingScopeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE, oldResSharingScope, RES_SHARING_SCOPE_EDEFAULT, oldResSharingScopeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetResSharingScope() {
-		return resSharingScopeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.RESOURCE_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.RESOURCE_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.RESOURCE_REF__NAME:
-				return getName();
-			case CommonPackage.RESOURCE_REF__TYPE:
-				return getType();
-			case CommonPackage.RESOURCE_REF__AUTH:
-				return getAuth();
-			case CommonPackage.RESOURCE_REF__LINK:
-				return getLink();
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				return getResSharingScope();
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.RESOURCE_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.RESOURCE_REF__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case CommonPackage.RESOURCE_REF__AUTH:
-				return isSetAuth();
-			case CommonPackage.RESOURCE_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				return isSetResSharingScope();
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__TYPE:
-				setType((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__AUTH:
-				setAuth((ResAuthTypeBase)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				setResSharingScope((ResSharingScopeType)newValue);
-				return;
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RESOURCE_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__AUTH:
-				unsetAuth();
-				return;
-			case CommonPackage.RESOURCE_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.RESOURCE_REF__RES_SHARING_SCOPE:
-				unsetResSharingScope();
-				return;
-			case CommonPackage.RESOURCE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", type: "); //$NON-NLS-1$
-		result.append(type);
-		result.append(", auth: "); //$NON-NLS-1$
-		if (authESet) result.append(auth); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", link: "); //$NON-NLS-1$
-		result.append(link);
-		result.append(", resSharingScope: "); //$NON-NLS-1$
-		if (resSharingScopeESet) result.append(resSharingScope); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/RunAsSpecifiedIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/RunAsSpecifiedIdentityImpl.java
deleted file mode 100644
index d785fb9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/RunAsSpecifiedIdentityImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It    contains an optional description and a specification of the security identity to be used.
-
- */
-public class RunAsSpecifiedIdentityImpl extends SecurityIdentityImpl implements RunAsSpecifiedIdentity, SecurityIdentity{
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Identity identity = null;
-	public RunAsSpecifiedIdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getRunAsSpecifiedIdentity();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Optional specifies the run-as identity to be used for the execution of the methods of an enterprise bean. It contains an optional description, and the name of a security role.
-	 */
-	public Identity getIdentity() {
-		return identity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIdentity(Identity newIdentity, NotificationChain msgs) {
-		Identity oldIdentity = identity;
-		identity = newIdentity;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, oldIdentity, newIdentity);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setIdentity(Identity newIdentity) {
-		if (newIdentity != identity) {
-			NotificationChain msgs = null;
-			if (identity != null)
-				msgs = ((InternalEObject)identity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, null, msgs);
-			if (newIdentity != null)
-				msgs = ((InternalEObject)newIdentity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, null, msgs);
-			msgs = basicSetIdentity(newIdentity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY, newIdentity, newIdentity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-					return basicSetIdentity(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 CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTIONS:
-				return getDescriptions();
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				return getIdentity();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				return identity != 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 CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				setIdentity((Identity)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case CommonPackage.RUN_AS_SPECIFIED_IDENTITY__IDENTITY:
-				setIdentity((Identity)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isRunAsSpecifiedIdentity()
-	 */
-	public boolean isRunAsSpecifiedIdentity() {
-		return true;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityIdentityImpl.java
deleted file mode 100644
index 24d6c56..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityIdentityImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It
- * contains an optional description and a specification of the security identity to be used.
-
- */
-public class SecurityIdentityImpl extends EObjectImpl implements SecurityIdentity, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public SecurityIdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getSecurityIdentity();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_IDENTITY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().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 CommonPackage.SECURITY_IDENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_IDENTITY__DESCRIPTIONS:
-				getDescriptions().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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isRunAsSpecifiedIdentity()
-	 */
-	public boolean isRunAsSpecifiedIdentity() {
-		return false;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isUseCallerIdentity()
-	 */
-	public boolean isUseCallerIdentity() {
-		return false;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleImpl.java
deleted file mode 100644
index f457bab..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleImpl.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WorkbenchUtil;
-
-/**
- * A semantic grouping of operations that may be performed by a subject.
- * The security-role element contains the declaration of a security role which is used in the security-constraints placed on the web application.
- */
-public class SecurityRoleImpl extends EObjectImpl implements SecurityRole, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	static boolean inEclipse = WorkbenchUtil.workbenchIsRunning();
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public SecurityRoleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getSecurityRole();
-	}
-
-public boolean equals(Object o) {
-	if (inEclipse)
-		return super.equals(o);
-		
-	if (o instanceof SecurityRoleImpl) {
-		String r1 = getRoleName();
-		String r2 = ((SecurityRole) o).getRoleName();
-		if ((r1 != null) && (r2 != null)) {
-			if (r1.equals(r2)) {
-				return true;
-			}
-		} else if (r1 == null && r2 == null)
-			return super.equals(o);
-	}
-	return false;
-}
-public int hashCode() {
-	if (inEclipse || getRoleName() == null)
-		return super.hashCode();
-	return getRoleName().hashCode();
-}
-public String toString() {
-	String name = getRoleName() == null ? "<unknown>" : getRoleName(); //$NON-NLS-1$
-	return getClass().getName() + "(" + name + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description)getDescriptions().get(0);
-			if (d != null) 
-				description = d.getValue();
-		}
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null) {
-			if (getDescriptions().isEmpty()) {
-				Description d = new DescriptionImpl();
-				d.setValue(newDescription);
-				getDescriptions().add(d);
-			}
-			else {
-				Description d = (Description)getDescriptions().get(0);
-				if (d != null)
-					d.setValue(newDescription);
-			}
-				
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The role-name element contains the name of a role. This element must contain a non-empty string.
-
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.SECURITY_ROLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				return getRoleName();
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				return (DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description))
-						|| (descriptions != null && !descriptions.isEmpty());
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_ROLE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", roleName: "); //$NON-NLS-1$
-		result.append(roleName);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleRefImpl.java
deleted file mode 100644
index 875cd02..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/SecurityRoleRefImpl.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.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.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * @generated
- */
-public class SecurityRoleRefImpl extends EObjectImpl implements SecurityRoleRef{
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String link = LINK_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public SecurityRoleRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getSecurityRoleRef();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE_REF__NAME, oldName, name));
-	}
-
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				d.setValue(newDescription);
-		}
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	public String getDescription() {
-		if (getDescriptions() != null && !getDescriptions().isEmpty()) {
-			Description d = (Description) getDescriptions().get(0);
-			if (d != null)
-				description = d.getValue();
-		}
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The role-link element is used to link a security role reference to a defined security role. The role-link element must contain the name of one of the security roles defined in the security-role elements.
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.SECURITY_ROLE_REF__LINK, oldLink, link));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.SECURITY_ROLE_REF__NAME:
-				return getName();
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				return getLink();
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME:
-				setName((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				setLink((String)newValue);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.SECURITY_ROLE_REF__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case CommonPackage.SECURITY_ROLE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", link: "); //$NON-NLS-1$
-		result.append(link);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/UseCallerIdentityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/UseCallerIdentityImpl.java
deleted file mode 100644
index 0071097..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/UseCallerIdentityImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-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.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-/**
- * 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.
-
- */
-public class UseCallerIdentityImpl extends SecurityIdentityImpl implements UseCallerIdentity, SecurityIdentity{
-
-	public UseCallerIdentityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return CommonPackage.eINSTANCE.getUseCallerIdentity();
-	}
-
-	/**
-	 * <!-- 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 CommonPackage.USE_CALLER_IDENTITY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 CommonPackage.USE_CALLER_IDENTITY__DESCRIPTION:
-				return getDescription();
-			case CommonPackage.USE_CALLER_IDENTITY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.USE_CALLER_IDENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case CommonPackage.USE_CALLER_IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.USE_CALLER_IDENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case CommonPackage.USE_CALLER_IDENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case CommonPackage.USE_CALLER_IDENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case CommonPackage.USE_CALLER_IDENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.SecurityIdentity#isUseCallerIdentity()
-	 */
-	public boolean isUseCallerIdentity() {
-		return true;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceFactory.java
deleted file mode 100644
index 182e86c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-/**
- * @deprecated Since 4/22/2003
- * This is replaced with concrete implementers of {@link com.ibm.etools.emf2xml.impl.TranslatorResourceFactory}
- */
-
-public abstract class XMLResourceFactory extends ResourceFactoryImpl {
-/**
- * EJBJarResourceFactory constructor comment.
- */
-public XMLResourceFactory() {
-	//TODO: Delete this class
-	super();
-}
-
-/**
- * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl#createResource(URI)
- */
-public final Resource createResource(URI uri) {
-	XMLResource resource = primCreateResource(uri);
-	resource.getDefaultSaveOptions().put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-    resource.getDefaultSaveOptions().put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_LINE_WIDTH, new Integer(80));
-    return resource;
-}
-
-/**
- * Method primCreateResource.
- * @param uri
- * @return XMLResource
- */
-protected abstract XMLResource primCreateResource(URI uri) ;
-
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java
deleted file mode 100644
index c52946a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl;
-import org.xml.sax.EntityResolver;
-
-
-public abstract class XMLResourceImpl extends TranslatorResourceImpl implements XMLResource,J2EEVersionResource {
-	/** Indicator to determine if this resource was loaded as an alt-dd (from an ear),
-	  * default is false */
-	protected boolean isAlt = false;
-	/** The application which declared the alt-dd for this resource; exists only if this resource is and
-	  * alt dd */
-	protected Application application;
-	protected boolean isNew = true;
-	
-	
-	private static class RootVersionAdapter extends AdapterImpl {
-		static final String ADAPTER_TYPE = RootVersionAdapter.class.getName();
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-		 */
-		public boolean isAdapterForType(Object type) {
-			return super.isAdapterForType(type);
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
-		 */
-		public void notifyChanged(Notification msg) {
-			if (msg.getFeatureID(null) == RESOURCE__CONTENTS &&
-				msg.getEventType() == Notification.ADD) {
-					((XMLResourceImpl)msg.getNotifier()).syncVersionOfRootObject();
-					((Notifier)msg.getNotifier()).eAdapters().remove(this);
-				}
-		}
-		
-		
-
-	
-	}
-	
-	/**
-	 * @deprecated since 4/29/2003 - used for compatibility
-	 * Subclasses should be using the Renderers and translator framework 
-	 */
-	public XMLResourceImpl() {
-		super();
-	}
-
-	/**
-	 * @deprecated since 4/29/2003 - used for compatibility
-	 * Subclasses should be using the Renderers and translator framework 
-	 */
-	public XMLResourceImpl(URI uri) {
-		super(uri);
-	}
-	
-	public XMLResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	public XMLResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#initializeContents()
-	 */
-	protected void initializeContents() {
-		super.initializeContents();
-		eAdapters().add(new RootVersionAdapter());
-	}
-
-	
-	/**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	public boolean isAlt() {
-		return isAlt;
-	}
-	
-	
-	public void setApplication(Application newApplication) {
-		application = newApplication;
-	}
-	/**
-	 * Is this a resource loaded as an alternate deployment descriptor?
-	 */
-	public void setIsAlt(boolean isAlternateDD) {
-		isAlt = isAlternateDD;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return J2EE_1_4_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setDoctypeValues(java.lang.String, java.lang.String)
-	 * This is setting the module version on the resource, where values are different that the J2EE version, this will be overridden
-	 */
-	public void setDoctypeValues(String publicId, String systemId) {
-		int version = J2EE_1_4_ID;
-		if (systemId == null) 
-			version = J2EE_1_4_ID;
-		else if (systemId.equals(getJ2EE_1_3_SystemID()))
-			version = J2EE_1_3_ID;
-		else if (systemId.equals(getJ2EE_1_2_SystemID()))
-			version = J2EE_1_2_ID;
-		super.setDoctypeValues(publicId, systemId);
-		setJ2EEVersionID(version);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#usesDTD()
-	 */
-	public boolean usesDTD() {
-		return getVersionID() != J2EE_1_4_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setVersionID(int)
-	 * @deprecated, Use setJ2EEVersionID() to set module version based on j2ee version
-	 **/
-	public void setVersionID(int id) {
-		setJ2EEVersionID(id);
-	}
-	protected void primSetVersionID(int id) {
-		super.setVersionID(id);
-	}
-	protected void primSetDoctypeValues(String aPublicId, String aSystemId) {
-		super.setDoctypeValues(aPublicId,aSystemId);
-	}
-	/*
-	 * Sets the module version based on the J2EE version
-	 */
-	public abstract void setJ2EEVersionID(int id);
-	/*
-	 * Sets the module version directly
-	 * */
-	 public abstract void setModuleVersionID(int id);
-	/**
-	 * @deprecated 
-	 * (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.XMLResource#isJ2EE1_3()
-	 */
-	public boolean isJ2EE1_3() {
-		return getVersionID() == J2EE_1_3_ID;
-	}
-	
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)}, 
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the system id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	public void setPublicId(String id) {
-		setDoctypeValues(id, getSystemId());
-	}
-	
-	/**
-	 * @deprecated use {@link TranslatorResource#setVersionID(int)},
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
-	 * Sets the public id of the XML document.
-	 * @see J2EEVersionConstants
-	 */
-	public void setSystemId(String id) {
-		setDoctypeValues(getPublicId(), id);
-	}
-	protected String getDefaultPublicId() {
-		switch (getVersionID()) {
-			case (J2EE_1_2_ID) :
-				return getJ2EE_1_2_PublicID();
-			case (J2EE_1_3_ID) :	
-				return getJ2EE_1_3_PublicID();
-			default :
-				return null;
-		}	
-	}
-
-	protected String getDefaultSystemId() {
-		switch (getVersionID()) {
-			case (J2EE_1_2_ID) :
-				return getJ2EE_1_2_SystemID();
-			case (J2EE_1_3_ID) :	
-				return getJ2EE_1_3_SystemID();
-			default :
-				return null;
-		}
-	}
-	public abstract String getJ2EE_1_2_PublicID();
-	public abstract String getJ2EE_1_2_SystemID();
-	public abstract String getJ2EE_1_3_PublicID();
-	public abstract String getJ2EE_1_3_SystemID();
-	
-	
-	public NotificationChain basicSetResourceSet(ResourceSet aResourceSet, NotificationChain notifications) {
-		if (aResourceSet == null && this.resourceSet != null)
-			preDelete();
-		return super.basicSetResourceSet(aResourceSet, notifications);
-	}
-		
-	public Application getApplication() {
-		return application;
-	}
-	
-	/**
-	 * @deprecated - use getJ2EEVersionID() and getModuleVersionID()
-	 */
-	public int getVersionID() {
-		return getJ2EEVersionID();
-	}
-	
-	public EntityResolver getEntityResolver() {
-		return J2EEXmlDtDEntityResolver.INSTANCE;
-	}	
-	/* All subclasses will derive this value based on their module version
-	 */
-	public abstract int getJ2EEVersionID();
-
-	
-
-	/* This will be computed during loads of the resource
-	 */
-	public int getModuleVersionID() {
-		return super.getVersionID();
-	}
-	
-	protected abstract void syncVersionOfRootObject();
-	
-	protected String getModuleVersionString() {
-		float ver = getModuleVersionID();
-		Float specVersion = new Float(ver/10);
-		return specVersion.toString();
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonAdapterFactory.java
deleted file mode 100644
index 7ab6e06..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonAdapterFactory.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-
-public class CommonAdapterFactory extends AdapterFactoryImpl {
-	protected static CommonPackage modelPackage;
-
-	public CommonAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (CommonPackage)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createSecurityRoleAdapter() {
-		return null;
-	}
-
-	public Adapter createResourceRefAdapter() {
-		return null;
-	}
-
-	public Adapter createEjbRefAdapter() {
-		return null;
-	}
-
-	public Adapter createEJBLocalRefAdapter() {
-		return null;
-	}
-
-	public Adapter createEnvEntryAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityRoleRefAdapter() {
-		return null;
-	}
-
-	public Adapter createRunAsSpecifiedIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createUseCallerIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createIdentityAdapter() {
-		return null;
-	}
-
-	public Adapter createResourceEnvRefAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CommonSwitch modelSwitch =
-		new CommonSwitch() {
-			public Object caseEjbRef(EjbRef object) {
-				return createEjbRefAdapter();
-			}
-			public Object caseEnvEntry(EnvEntry object) {
-				return createEnvEntryAdapter();
-			}
-			public Object caseResourceRef(ResourceRef object) {
-				return createResourceRefAdapter();
-			}
-			public Object caseSecurityRoleRef(SecurityRoleRef object) {
-				return createSecurityRoleRefAdapter();
-			}
-			public Object caseSecurityRole(SecurityRole object) {
-				return createSecurityRoleAdapter();
-			}
-			public Object caseResourceEnvRef(ResourceEnvRef object) {
-				return createResourceEnvRefAdapter();
-			}
-			public Object caseEJBLocalRef(EJBLocalRef object) {
-				return createEJBLocalRefAdapter();
-			}
-			public Object caseRunAsSpecifiedIdentity(RunAsSpecifiedIdentity object) {
-				return createRunAsSpecifiedIdentityAdapter();
-			}
-			public Object caseIdentity(Identity object) {
-				return createIdentityAdapter();
-			}
-			public Object caseIconType(IconType object) {
-				return createIconTypeAdapter();
-			}
-			public Object caseDisplayName(DisplayName object) {
-				return createDisplayNameAdapter();
-			}
-			public Object caseMessageDestinationRef(MessageDestinationRef object) {
-				return createMessageDestinationRefAdapter();
-			}
-			public Object caseMessageDestination(MessageDestination object) {
-				return createMessageDestinationAdapter();
-			}
-			public Object caseParamValue(ParamValue object) {
-				return createParamValueAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-				return createJNDIEnvRefsGroupAdapter();
-			}
-			public Object caseSecurityIdentity(SecurityIdentity object) {
-				return createSecurityIdentityAdapter();
-			}
-			public Object caseUseCallerIdentity(UseCallerIdentity object) {
-				return createUseCallerIdentityAdapter();
-			}
-			public Object caseDescription(Description object) {
-				return createDescriptionAdapter();
-			}
-			public Object caseQName(QName object) {
-				return createQNameAdapter();
-			}
-			public Object caseListener(Listener object) {
-				return createListenerAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityRoleAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createResourceRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEjbRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBLocalRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEnvEntryAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityRoleRefAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRunAsSpecifiedIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createUseCallerIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.Description
-	 * @generated
-	 */
-	public Adapter createDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.QName
-	 * @generated
-	 */
-	public Adapter createQNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.Listener <em>Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.Listener
-	 * @generated
-	 */
-	public Adapter createListenerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createIdentityAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.IconType <em>Icon Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.IconType
-	 * @generated
-	 */
-	public Adapter createIconTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.DisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.DisplayName
-	 * @generated
-	 */
-	public Adapter createDisplayNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.MessageDestinationRef <em>Message Destination Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.MessageDestinationRef
-	 * @generated
-	 */
-	public Adapter createMessageDestinationRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.MessageDestination <em>Message Destination</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.MessageDestination
-	 * @generated
-	 */
-	public Adapter createMessageDestinationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.ParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.ParamValue
-	 * @generated
-	 */
-	public Adapter createParamValueAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup <em>JNDI Env Refs Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	public Adapter createJNDIEnvRefsGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createResourceEnvRefAdapterGen() {
-		return null;
-	}
-
-} //CommonAdapterFactory
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonSwitch.java
deleted file mode 100644
index 9751cb4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonSwitch.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-
-
-/**
- * <!-- 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.internal.common.CommonPackage
- * @generated
- */
-public class CommonSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static CommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CommonSwitch() {
-		if (modelPackage == null) {
-			modelPackage = CommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case CommonPackage.EJB_REF: {
-					EjbRef ejbRef = (EjbRef)theEObject;
-					Object result = caseEjbRef(ejbRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.ENV_ENTRY: {
-					EnvEntry envEntry = (EnvEntry)theEObject;
-					Object result = caseEnvEntry(envEntry);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.RESOURCE_REF: {
-					ResourceRef resourceRef = (ResourceRef)theEObject;
-					Object result = caseResourceRef(resourceRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.SECURITY_ROLE_REF: {
-					SecurityRoleRef securityRoleRef = (SecurityRoleRef)theEObject;
-					Object result = caseSecurityRoleRef(securityRoleRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.SECURITY_ROLE: {
-					SecurityRole securityRole = (SecurityRole)theEObject;
-					Object result = caseSecurityRole(securityRole);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.RESOURCE_ENV_REF: {
-					ResourceEnvRef resourceEnvRef = (ResourceEnvRef)theEObject;
-					Object result = caseResourceEnvRef(resourceEnvRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.EJB_LOCAL_REF: {
-					EJBLocalRef ejbLocalRef = (EJBLocalRef)theEObject;
-					Object result = caseEJBLocalRef(ejbLocalRef);
-					if (result == null) result = caseEjbRef(ejbLocalRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.RUN_AS_SPECIFIED_IDENTITY: {
-					RunAsSpecifiedIdentity runAsSpecifiedIdentity = (RunAsSpecifiedIdentity)theEObject;
-					Object result = caseRunAsSpecifiedIdentity(runAsSpecifiedIdentity);
-					if (result == null) result = caseSecurityIdentity(runAsSpecifiedIdentity);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.IDENTITY: {
-					Identity identity = (Identity)theEObject;
-					Object result = caseIdentity(identity);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.ICON_TYPE: {
-					IconType iconType = (IconType)theEObject;
-					Object result = caseIconType(iconType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.DISPLAY_NAME: {
-					DisplayName displayName = (DisplayName)theEObject;
-					Object result = caseDisplayName(displayName);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.MESSAGE_DESTINATION_REF: {
-					MessageDestinationRef messageDestinationRef = (MessageDestinationRef)theEObject;
-					Object result = caseMessageDestinationRef(messageDestinationRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.MESSAGE_DESTINATION: {
-					MessageDestination messageDestination = (MessageDestination)theEObject;
-					Object result = caseMessageDestination(messageDestination);
-					if (result == null) result = caseCompatibilityDescriptionGroup(messageDestination);
-					if (result == null) result = caseDescriptionGroup(messageDestination);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.PARAM_VALUE: {
-					ParamValue paramValue = (ParamValue)theEObject;
-					Object result = caseParamValue(paramValue);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.DESCRIPTION_GROUP: {
-					DescriptionGroup descriptionGroup = (DescriptionGroup)theEObject;
-					Object result = caseDescriptionGroup(descriptionGroup);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.SECURITY_IDENTITY: {
-					SecurityIdentity securityIdentity = (SecurityIdentity)theEObject;
-					Object result = caseSecurityIdentity(securityIdentity);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.USE_CALLER_IDENTITY: {
-					UseCallerIdentity useCallerIdentity = (UseCallerIdentity)theEObject;
-					Object result = caseUseCallerIdentity(useCallerIdentity);
-					if (result == null) result = caseSecurityIdentity(useCallerIdentity);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.DESCRIPTION: {
-					Description description = (Description)theEObject;
-					Object result = caseDescription(description);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.QNAME: {
-					QName qName = (QName)theEObject;
-					Object result = caseQName(qName);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.LISTENER: {
-					Listener listener = (Listener)theEObject;
-					Object result = caseListener(listener);
-					if (result == null) result = caseCompatibilityDescriptionGroup(listener);
-					if (result == null) result = caseDescriptionGroup(listener);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP: {
-					CompatibilityDescriptionGroup compatibilityDescriptionGroup = (CompatibilityDescriptionGroup)theEObject;
-					Object result = caseCompatibilityDescriptionGroup(compatibilityDescriptionGroup);
-					if (result == null) result = caseDescriptionGroup(compatibilityDescriptionGroup);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Ejb Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Ejb Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEjbRef(EjbRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Env Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Env Entry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEnvEntry(EnvEntry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceRef(ResourceRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Role Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Role Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityRoleRef(SecurityRoleRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityRole(SecurityRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Env Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Env Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceEnvRef(ResourceEnvRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Local Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Local Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBLocalRef(EJBLocalRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Run As Specified Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Run As Specified Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRunAsSpecifiedIdentity(RunAsSpecifiedIdentity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityIdentity(SecurityIdentity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIdentity(Identity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Icon Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Icon Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseIconType(IconType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDisplayName(DisplayName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Destination Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Destination Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDestinationRef(MessageDestinationRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Destination</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Destination</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDestination(MessageDestination object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Param Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Param Value</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseParamValue(ParamValue object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Use Caller Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Use Caller Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUseCallerIdentity(UseCallerIdentity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescription(Description object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQName(QName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Listener</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseListener(Listener object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //CommonSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonUtil.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonUtil.java
deleted file mode 100644
index a2f33ed..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/CommonUtil.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.util;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationFactoryImpl;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaFactoryImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationFactoryImpl;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXMLResourceHandler;
-
-
-public class CommonUtil {
-public static boolean isDeploymentDescriptorRoot(EObject o) {
-	return isDeploymentDescriptorRoot(o, true);
-}
-public static boolean isDeploymentDescriptorRoot(EObject o, boolean includeEars) {
-	EObject meta = o.eClass();
-	return (includeEars && meta == eClassApplication()) ||
-		meta == eClassApplicationClient() ||
-		meta == eClassEJBJar() ||
-		meta == eClassWebApp() ||
-		meta == eClassConnector();
-}
-public static boolean isDeploymentDescriptorRoot(Object o) {
-	return isDeploymentDescriptorRoot(o, true);
-}
-public static boolean isDeploymentDescriptorRoot(Object o, boolean includeEARs) {
-	if (o instanceof EObject)
-		return isDeploymentDescriptorRoot((EObject)o, includeEARs);
-	return false;
-}
-protected static EClass eClassApplication() {
-	return ApplicationFactoryImpl.getPackage().getApplication();
-}
-protected static EClass eClassApplicationClient() {
-	return ClientFactoryImpl.getPackage().getApplicationClient();
-}
-protected static EClass eClassEJBJar() {
-	return EjbFactoryImpl.getPackage().getEJBJar();
-}
-protected static EClass eClassWebApp() {
-	return WebapplicationFactoryImpl.getPackage().getWebApp();
-}
-
-protected static EClass eClassConnector() {
-	return JcaFactoryImpl.getPackage().getConnector();
-}
-/**
- * Safety check method to ensure that the version of the dd object can be computed.
- */
-public static void checkDDObjectForVersion(EObject dd) {
-	if (dd.eIsProxy()) {
-		String proxyUri = ((InternalEObject)dd).eProxyURI().toString();
-		String message = J2EEXMLResourceHandler.getString("J2EE_VERSION_PROXY_ERROR", new Object[]{proxyUri}); //$NON-NLS-1$
-		throw new IllegalStateException(message);
-	} else if (dd.eResource() == null) {
-		String message = J2EEXMLResourceHandler.getString("J2EE_VERSION_NULL_ERROR"); //$NON-NLS-1$
-		throw new IllegalStateException(message);
-	}
-}
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultable.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultable.java
deleted file mode 100644
index af0cc25..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultable.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.util;
-
-import org.eclipse.emf.common.notify.Notifier;
-/**
- * Interface used for objects that can be "fluffed up" on demand, but not serialized unless modified
- */
-public interface Defaultable extends Notifier {
-public boolean isDefault();
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/DefaultedAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/DefaultedAdapterImpl.java
deleted file mode 100644
index 3e72e56..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/DefaultedAdapterImpl.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-/**
- * Insert the type's description here.
- * Creation date: (03/22/01 10:54:22 AM)
- * @author: Administrator
- */
-public abstract class DefaultedAdapterImpl extends AdapterImpl {
-	final static String ADAPTER_KEY = "DEFAULTED_ADAPTER"; //$NON-NLS-1$
-	protected boolean fNotify = true;
-/**
- * DefaultedAdapter constructor comment.
- */
-public DefaultedAdapterImpl() {
-	super();
-}
-public abstract EObject defaultContainer();
-public boolean isAdapterForType(Object type) {
-	return ADAPTER_KEY.equals(type);
-}
-public static boolean isDefault(Defaultable object) {
-	Defaultor defaultor = (Defaultor) retrieveDefaultContainerFor(object);
-	return defaultor != null && defaultor.isDefault(object);
-}
-		
-/**
- * Insert the method's description here.
- * Creation date: (6/13/2001 8:43:41 PM)
- * @return boolean
- */
-public boolean isNotify() {
-	return fNotify;
-}
-public static DefaultedAdapterImpl retrieveAdapterFor(Defaultable notifier) {
-	return (DefaultedAdapterImpl)EcoreUtil.getExistingAdapter(notifier,ADAPTER_KEY);
-}
-public static EObject retrieveDefaultContainerFor(Defaultable notifier) {
-	DefaultedAdapterImpl adapter = retrieveAdapterFor(notifier);
-	return adapter == null ? null : adapter.defaultContainer();
-}
-/**
- * Insert the method's description here.
- * Creation date: (6/13/2001 8:43:41 PM)
- * @param newNotify boolean
- */
-public void setNotify(boolean newNotify) {
-	fNotify = newNotify;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultor.java
deleted file mode 100644
index 6b4b3b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/Defaultor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.util;
-
-/**
- * Insert the type's description here.
- * Creation date: (6/15/2001 4:58:15 PM)
- * @author: Administrator
- */
-public interface Defaultor {
-/**
- * Returns true if this objects create @aDefaultable and it is still
- * currently default and not contained.
- * Creation date: (6/15/2001 4:59:28 PM)
- * @return boolean
- * @param aDefaultable org.eclipse.jst.j2ee.internal.common.util.Defaultable
- */
-boolean isDefault(Defaultable aDefaultable);
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/IDUtility.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/IDUtility.java
deleted file mode 100644
index 3d9d580..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/IDUtility.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.common.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
-
-
-/**
- * Utility class for generating and setting unique id's for ref objects contained within a resource.  This is needed
- * sometimes when a refobject is referenced by an object in a separate resource.  This utility will force the refobject 
- * to notify after the id gets set, using the static feature on this class.  The object must be contained in a resource
- * for the utility methods to work.
- */
-public class IDUtility {
-
-/**
- * IDUtility constructor comment.
- */
-public IDUtility() {
-	super();
-}
-/**
- * Generate a default id and notify.
- */
-protected static String primSetDefaultID(EObject object) {
-	return IDUtil.getOrAssignID(object);
-}
-	
-/**
- * Generate a default id and notify.
- * Helper for default id generation to support cross document references to non xmi resources
- * (eg, xml deployment descriptors); called from overriden accessors in selected objects;  
- */
-public static String setDefaultID(EObject object) {
-	if (object == null || object.eResource() == null)
-		return null;
-	return primSetDefaultID(object);
-}
-	
-/**
- * Generate a default id and notify, for this object and for all referenced objects that are contained
- * within the same resource.  Helper for default id generation to support cross document references to non xmi resources
- * (eg, xml deployment descriptors); useful for post copy/add  
- */
-public static String setDefaultID(EObject object, boolean recurseChildren) {
-	if (object == null || object.eResource() == null)
-		return null;
-		
-	String result = primSetDefaultID(object);
-
-	if (recurseChildren)
-		setDefaultIDForChildren(object);
-
-	return result;
-}
-	
-protected static void setDefaultIDForChildren(EObject object) {
-
-	List objects = object.eContents();
-	for (int i = 0; i < objects.size(); i++){
-		EObject o = (EObject)objects.get(i);
-		primSetDefaultID(o);
-	}
-}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/XmlSpecifiedDataAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/XmlSpecifiedDataAdapter.java
deleted file mode 100644
index 1fbeac9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/util/XmlSpecifiedDataAdapter.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.internal.common.util;
-
-/**
- * Insert the type's description here.
- * Creation date: (06/04/01 7:56:22 PM)
- * @author: Administrator
- */
-public class XmlSpecifiedDataAdapter extends org.eclipse.emf.common.notify.impl.AdapterImpl {
-	protected final static String ADAPTER_KEY = "XML_SPECIFIED_ADAPTER"; //$NON-NLS-1$
-/**
- * XmlSpecifiedDataAdapter constructor comment.
- */
-public XmlSpecifiedDataAdapter() {
-	super();
-}
-public boolean isAdapterForType(Object type) {
-	return ADAPTER_KEY.equals(type);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/EjbPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/EjbPackage.java
deleted file mode 100644
index 59ff2be..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/EjbPackage.java
+++ /dev/null
@@ -1,2776 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-
-public interface EjbPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "ejb"; //$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN = 6;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__ICONS = CommonPackage.JNDI_ENV_REFS_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__DISPLAY_NAMES = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__DESCRIPTIONS = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__SMALL_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__LARGE_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__DESCRIPTION = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__DISPLAY_NAME = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES = CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__RESOURCE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__RESOURCE_ENV_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_LOCAL_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN__SERVICE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__NAME = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__SECURITY_ROLE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_CLASS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__HOME_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__REMOTE_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__EJB_JAR = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__SECURITY_IDENTITY = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTERPRISE_BEAN__LOCAL_INTERFACE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 8;
-	/**
-	 * The number of structural features of the the '<em>Enterprise Bean</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTERPRISE_BEAN_FEATURE_COUNT = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 9;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY = 5;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__ICONS = ENTERPRISE_BEAN__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__DISPLAY_NAMES = ENTERPRISE_BEAN__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__DESCRIPTIONS = ENTERPRISE_BEAN__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__SMALL_ICON = ENTERPRISE_BEAN__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__LARGE_ICON = ENTERPRISE_BEAN__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__DESCRIPTION = ENTERPRISE_BEAN__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__DISPLAY_NAME = ENTERPRISE_BEAN__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__ENVIRONMENT_PROPERTIES = ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__RESOURCE_REFS = ENTERPRISE_BEAN__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_REFS = ENTERPRISE_BEAN__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__RESOURCE_ENV_REFS = ENTERPRISE_BEAN__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_LOCAL_REFS = ENTERPRISE_BEAN__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__MESSAGE_DESTINATION_REFS = ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__SERVICE_REFS = ENTERPRISE_BEAN__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__NAME = ENTERPRISE_BEAN__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__SECURITY_ROLE_REFS = ENTERPRISE_BEAN__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_CLASS = ENTERPRISE_BEAN__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__HOME_INTERFACE = ENTERPRISE_BEAN__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__REMOTE_INTERFACE = ENTERPRISE_BEAN__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__EJB_JAR = ENTERPRISE_BEAN__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__SECURITY_IDENTITY = ENTERPRISE_BEAN__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__LOCAL_HOME_INTERFACE = ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__LOCAL_INTERFACE = ENTERPRISE_BEAN__LOCAL_INTERFACE;
-	/**
-	 * The feature id for the '<em><b>Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY__REENTRANT = ENTERPRISE_BEAN_FEATURE_COUNT + 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ENTITY__PRIMARY_KEY = ENTERPRISE_BEAN_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the the '<em>Entity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_FEATURE_COUNT = ENTERPRISE_BEAN_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__ICONS = ENTITY__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__DISPLAY_NAMES = ENTITY__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__DESCRIPTIONS = ENTITY__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__SMALL_ICON = ENTITY__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__LARGE_ICON = ENTITY__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__DESCRIPTION = ENTITY__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__DISPLAY_NAME = ENTITY__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__ENVIRONMENT_PROPERTIES = ENTITY__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__RESOURCE_REFS = ENTITY__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_REFS = ENTITY__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__RESOURCE_ENV_REFS = ENTITY__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_LOCAL_REFS = ENTITY__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__MESSAGE_DESTINATION_REFS = ENTITY__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__SERVICE_REFS = ENTITY__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__NAME = ENTITY__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__SECURITY_ROLE_REFS = ENTITY__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_CLASS = ENTITY__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__HOME_INTERFACE = ENTITY__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__REMOTE_INTERFACE = ENTITY__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__EJB_JAR = ENTITY__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__SECURITY_IDENTITY = ENTITY__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__LOCAL_HOME_INTERFACE = ENTITY__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__LOCAL_INTERFACE = ENTITY__LOCAL_INTERFACE;
-	/**
-	 * The feature id for the '<em><b>Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__REENTRANT = ENTITY__REENTRANT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__PRIMARY_KEY = ENTITY__PRIMARY_KEY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__VERSION = ENTITY_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME = ENTITY_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES = ENTITY_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES = ENTITY_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTAINER_MANAGED_ENTITY__QUERIES = ENTITY_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>CMP Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE = ENTITY_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Prim Key Field</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD = ENTITY_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the the '<em>Container Managed Entity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTAINER_MANAGED_ENTITY_FEATURE_COUNT = ENTITY_FEATURE_COUNT + 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__UNCHECKED = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__ROLES = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_PERMISSION__METHOD_ELEMENTS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION__DESCRIPTIONS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Method Permission</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_PERMISSION_FEATURE_COUNT = 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__EJB_JAR = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__SECURITY_ROLES = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST = 4;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Assembly Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ASSEMBLY_DESCRIPTOR_FEATURE_COUNT = 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__DESCRIPTION = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_TRANSACTION__METHOD_ELEMENTS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TRANSACTION__DESCRIPTIONS = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Method Transaction</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_TRANSACTION_FEATURE_COUNT = 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMP_ATTRIBUTE = 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD = 16;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE = 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION = 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS = 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE = 15;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY = 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD = 20;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCLUDE_LIST = 19;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION = 4;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__ICONS = ENTERPRISE_BEAN__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__DISPLAY_NAMES = ENTERPRISE_BEAN__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__DESCRIPTIONS = ENTERPRISE_BEAN__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SMALL_ICON = ENTERPRISE_BEAN__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__LARGE_ICON = ENTERPRISE_BEAN__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__DESCRIPTION = ENTERPRISE_BEAN__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__DISPLAY_NAME = ENTERPRISE_BEAN__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__ENVIRONMENT_PROPERTIES = ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__RESOURCE_REFS = ENTERPRISE_BEAN__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_REFS = ENTERPRISE_BEAN__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__RESOURCE_ENV_REFS = ENTERPRISE_BEAN__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_LOCAL_REFS = ENTERPRISE_BEAN__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__MESSAGE_DESTINATION_REFS = ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__SERVICE_REFS = ENTERPRISE_BEAN__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__NAME = ENTERPRISE_BEAN__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SECURITY_ROLE_REFS = ENTERPRISE_BEAN__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_CLASS = ENTERPRISE_BEAN__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__HOME_INTERFACE = ENTERPRISE_BEAN__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__REMOTE_INTERFACE = ENTERPRISE_BEAN__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__EJB_JAR = ENTERPRISE_BEAN__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SECURITY_IDENTITY = ENTERPRISE_BEAN__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__LOCAL_HOME_INTERFACE = ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__LOCAL_INTERFACE = ENTERPRISE_BEAN__LOCAL_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__TRANSACTION_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION__SESSION_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Service Endpoint</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION__SERVICE_ENDPOINT = ENTERPRISE_BEAN_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Session</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_FEATURE_COUNT = ENTERPRISE_BEAN_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN = 17;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION = 18;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_METHOD_CATEGORY = 7;
-	/**
-	 * The number of structural features of the the '<em>EJB Method Category</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_METHOD_CATEGORY_FEATURE_COUNT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__EJB_CLIENT_JAR = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR__VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__ASSEMBLY_DESCRIPTOR = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__ENTERPRISE_BEANS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_JAR__RELATIONSHIP_LIST = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the the '<em>EJB Jar</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_JAR_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__PARMS = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__TYPE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__DESCRIPTION = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT__ENTERPRISE_BEAN = 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT__DESCRIPTIONS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Method Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METHOD_ELEMENT_FEATURE_COUNT = 6;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__EANNOTATIONS = EcorePackage.EATTRIBUTE__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_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 CMP_ATTRIBUTE__EATTRIBUTE_TYPE = EcorePackage.EATTRIBUTE__EATTRIBUTE_TYPE;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMP_ATTRIBUTE__DESCRIPTION = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE__DESCRIPTIONS = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>CMP Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMP_ATTRIBUTE_FEATURE_COUNT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS__EJB_JAR = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RELATIONSHIPS__EJB_RELATIONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS__DESCRIPTIONS = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Relationships</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIPS_FEATURE_COUNT = 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__EJB_QL = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__RETURN_TYPE_MAPPING = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__QUERY_METHOD = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY__ENTITY = 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY__DESCRIPTIONS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Query</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_FEATURE_COUNT = 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__NAME = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__RELATIONSHIP_LIST = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATION__RELATIONSHIP_ROLES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION__DESCRIPTIONS = 4;
-
-	/**
-	 * The number of structural features of the the '<em>EJB Relation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATION_FEATURE_COUNT = 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__ROLE_NAME = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__MULTIPLICITY = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__CASCADE_DELETE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__RELATIONSHIP = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__SOURCE = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EJB_RELATIONSHIP_ROLE__CMR_FIELD = 6;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE__DESCRIPTIONS = 7;
-
-	/**
-	 * The number of structural features of the the '<em>EJB Relationship Role</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EJB_RELATIONSHIP_ROLE_FEATURE_COUNT = 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE__ROLE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_SOURCE__ENTITY_BEAN = 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SOURCE__DESCRIPTIONS = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Role Source</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_SOURCE_FEATURE_COUNT = 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__EANNOTATIONS = CMP_ATTRIBUTE__EANNOTATIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__NAME = CMP_ATTRIBUTE__NAME;
-	/**
-	 * The feature id for the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__ORDERED = CMP_ATTRIBUTE__ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__UNIQUE = CMP_ATTRIBUTE__UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__LOWER_BOUND = CMP_ATTRIBUTE__LOWER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__UPPER_BOUND = CMP_ATTRIBUTE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>Many</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__MANY = CMP_ATTRIBUTE__MANY;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__REQUIRED = CMP_ATTRIBUTE__REQUIRED;
-
-	/**
-	 * The feature id for the '<em><b>EType</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__ETYPE = CMP_ATTRIBUTE__ETYPE;
-
-	/**
-	 * The feature id for the '<em><b>Changeable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__CHANGEABLE = CMP_ATTRIBUTE__CHANGEABLE;
-
-	/**
-	 * The feature id for the '<em><b>Volatile</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__VOLATILE = CMP_ATTRIBUTE__VOLATILE;
-
-	/**
-	 * The feature id for the '<em><b>Transient</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__TRANSIENT = CMP_ATTRIBUTE__TRANSIENT;
-
-	/**
-	 * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DEFAULT_VALUE_LITERAL = CMP_ATTRIBUTE__DEFAULT_VALUE_LITERAL;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DEFAULT_VALUE = CMP_ATTRIBUTE__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__UNSETTABLE = CMP_ATTRIBUTE__UNSETTABLE;
-
-	/**
-	 * The feature id for the '<em><b>Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DERIVED = CMP_ATTRIBUTE__DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__ECONTAINING_CLASS = CMP_ATTRIBUTE__ECONTAINING_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int CMR_FIELD__ID = CMP_ATTRIBUTE__ID;
-
-	/**
-	 * The feature id for the '<em><b>EAttribute Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__EATTRIBUTE_TYPE = CMP_ATTRIBUTE__EATTRIBUTE_TYPE;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__DESCRIPTION = CMP_ATTRIBUTE__DESCRIPTION;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD__DESCRIPTIONS = CMP_ATTRIBUTE__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__ROLE = CMP_ATTRIBUTE_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CMR_FIELD__COLLECTION_TYPE = CMP_ATTRIBUTE_FEATURE_COUNT + 1;
-	/**
-	 * The number of structural features of the the '<em>CMR Field</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CMR_FIELD_FEATURE_COUNT = CMP_ATTRIBUTE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__ICONS = ENTERPRISE_BEAN__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__DISPLAY_NAMES = ENTERPRISE_BEAN__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__DESCRIPTIONS = ENTERPRISE_BEAN__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__SMALL_ICON = ENTERPRISE_BEAN__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__LARGE_ICON = ENTERPRISE_BEAN__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__DESCRIPTION = ENTERPRISE_BEAN__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__DISPLAY_NAME = ENTERPRISE_BEAN__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__ENVIRONMENT_PROPERTIES = ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__RESOURCE_REFS = ENTERPRISE_BEAN__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_REFS = ENTERPRISE_BEAN__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__RESOURCE_ENV_REFS = ENTERPRISE_BEAN__RESOURCE_ENV_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_LOCAL_REFS = ENTERPRISE_BEAN__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__MESSAGE_DESTINATION_REFS = ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__SERVICE_REFS = ENTERPRISE_BEAN__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__NAME = ENTERPRISE_BEAN__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__SECURITY_ROLE_REFS = ENTERPRISE_BEAN__SECURITY_ROLE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_CLASS = ENTERPRISE_BEAN__EJB_CLASS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__HOME_INTERFACE = ENTERPRISE_BEAN__HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__REMOTE_INTERFACE = ENTERPRISE_BEAN__REMOTE_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__EJB_JAR = ENTERPRISE_BEAN__EJB_JAR;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__SECURITY_IDENTITY = ENTERPRISE_BEAN__SECURITY_IDENTITY;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__LOCAL_HOME_INTERFACE = ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__LOCAL_INTERFACE = ENTERPRISE_BEAN__LOCAL_INTERFACE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__TRANSACTION_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__MESSAGE_SELECTOR = ENTERPRISE_BEAN_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__ACKNOWLEDGE_MODE = ENTERPRISE_BEAN_FEATURE_COUNT + 2;
-	/**
-	 * The feature id for the '<em><b>Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__LINK = ENTERPRISE_BEAN_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN__DESTINATION = ENTERPRISE_BEAN_FEATURE_COUNT + 4;
-	/**
-	 * The feature id for the '<em><b>Activation Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__ACTIVATION_CONFIG = ENTERPRISE_BEAN_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Message Destination</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__MESSAGE_DESTINATION = ENTERPRISE_BEAN_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Messaging Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN__MESSAGING_TYPE = ENTERPRISE_BEAN_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the the '<em>Message Driven</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_FEATURE_COUNT = ENTERPRISE_BEAN_FEATURE_COUNT + 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION__TYPE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MESSAGE_DRIVEN_DESTINATION__BEAN = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Message Driven Destination</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_DRIVEN_DESTINATION_FEATURE_COUNT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCLUDE_LIST__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCLUDE_LIST__METHOD_ELEMENTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST__DESCRIPTIONS = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Exclude List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCLUDE_LIST_FEATURE_COUNT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__NAME = METHOD_ELEMENT__NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__PARMS = METHOD_ELEMENT__PARMS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__TYPE = METHOD_ELEMENT__TYPE;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__DESCRIPTION = METHOD_ELEMENT__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__ENTERPRISE_BEAN = METHOD_ELEMENT__ENTERPRISE_BEAN;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD__DESCRIPTIONS = METHOD_ELEMENT__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int QUERY_METHOD__QUERY = METHOD_ELEMENT_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Query Method</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int QUERY_METHOD_FEATURE_COUNT = METHOD_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigPropertyImpl <em>Activation Config Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigPropertyImpl
-	 * @see org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl#getActivationConfigProperty()
-	 * @generated
-	 */
-	int ACTIVATION_CONFIG_PROPERTY = 21;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY__VALUE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY__NAME = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Activation Config Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_PROPERTY_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigImpl <em>Activation Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigImpl
-	 * @see org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl#getActivationConfig()
-	 * @generated
-	 */
-	int ACTIVATION_CONFIG = 22;
-
-	/**
-	 * The feature id for the '<em><b>Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG__CONFIG_PROPERTIES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG__DESCRIPTIONS = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Activation Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_CONFIG_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSACTION_ATTRIBUTE_TYPE = 23;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MULTIPLICITY_KIND = 31;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RETURN_TYPE_MAPPING = 29;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int METHOD_ELEMENT_KIND = 26;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSACTION_TYPE = 24;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ACKNOWLEDGE_MODE = 27;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int DESTINATION_TYPE = 30;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SUBSCRIPTION_DURABILITY_KIND = 28;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_TYPE = 25;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "ejb.xmi"; //$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.ejb"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EjbPackage eINSTANCE = org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodPermission object
-	 */
-	EClass getMethodPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodPermission_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodPermission_Unchecked();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodPermission_AssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodPermission_Roles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodPermission_MethodElements();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.MethodPermission#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MethodPermission#getDescriptions()
-	 * @see #getMethodPermission()
-	 * @generated
-	 */
-	EReference getMethodPermission_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AssemblyDescriptor object
-	 */
-	EClass getAssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_MethodPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_MethodTransactions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_EjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_SecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAssemblyDescriptor_ExcludeList();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.AssemblyDescriptor#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.AssemblyDescriptor#getMessageDestinations()
-	 * @see #getAssemblyDescriptor()
-	 * @generated
-	 */
-	EReference getAssemblyDescriptor_MessageDestinations();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodTransaction object
-	 */
-	EClass getMethodTransaction();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodTransaction_TransactionAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodTransaction_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodTransaction_AssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodTransaction_MethodElements();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.MethodTransaction#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MethodTransaction#getDescriptions()
-	 * @see #getMethodTransaction()
-	 * @generated
-	 */
-	EReference getMethodTransaction_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EnterpriseBean object
-	 */
-	EClass getEnterpriseBean();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean#getName()
-	 * @see #getEnterpriseBean()
-	 * @generated
-	 */
-	EAttribute getEnterpriseBean_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_SecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_EjbClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_HomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_RemoteInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_EjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_SecurityIdentity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_LocalHomeInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEnterpriseBean_LocalInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Entity object
-	 */
-	EClass getEntity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.ejb.Entity#isReentrant <em>Reentrant</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reentrant</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.Entity#isReentrant()
-	 * @see #getEntity()
-	 * @generated
-	 */
-	EAttribute getEntity_Reentrant();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEntity_PrimaryKey();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContainerManagedEntity object
-	 */
-	EClass getContainerManagedEntity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getContainerManagedEntity_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getContainerManagedEntity_AbstractSchemaName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getContainerManagedEntity_PersistentAttributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getContainerManagedEntity_KeyAttributes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getQueries <em>Queries</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Queries</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getQueries()
-	 * @see #getContainerManagedEntity()
-	 * @generated
-	 */
-	EReference getContainerManagedEntity_Queries();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getCMPAttribute <em>CMP Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>CMP Attribute</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getCMPAttribute()
-	 * @see #getContainerManagedEntity()
-	 * @generated
-	 */
-	EReference getContainerManagedEntity_CMPAttribute();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getPrimKeyField <em>Prim Key Field</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Prim Key Field</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getPrimKeyField()
-	 * @see #getContainerManagedEntity()
-	 * @generated
-	 */
-	EReference getContainerManagedEntity_PrimKeyField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMPAttribute object
-	 */
-	EClass getCMPAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getCMPAttribute_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.CMPAttribute#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.CMPAttribute#getDescriptions()
-	 * @see #getCMPAttribute()
-	 * @generated
-	 */
-	EReference getCMPAttribute_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return CMRField object
-	 */
-	EClass getCMRField();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getCMRField_Role();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getCMRField_CollectionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelationshipRole object
-	 */
-	EClass getEJBRelationshipRole();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_RoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_Multiplicity();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelationshipRole_CascadeDelete();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelationshipRole_Relationship();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelationshipRole_Source();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelationshipRole_CmrField();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.EJBRelationshipRole#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EJBRelationshipRole#getDescriptions()
-	 * @see #getEJBRelationshipRole()
-	 * @generated
-	 */
-	EReference getEJBRelationshipRole_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBRelation object
-	 */
-	EClass getEJBRelation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelation_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBRelation_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelation_RelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBRelation_RelationshipRoles();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.EJBRelation#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EJBRelation#getDescriptions()
-	 * @see #getEJBRelation()
-	 * @generated
-	 */
-	EReference getEJBRelation_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Relationships object
-	 */
-	EClass getRelationships();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getRelationships_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRelationships_EjbJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRelationships_EjbRelations();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.Relationships#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.Relationships#getDescriptions()
-	 * @see #getRelationships()
-	 * @generated
-	 */
-	EReference getRelationships_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBJar object
-	 */
-	EClass getEJBJar();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getEJBJar_EjbClientJar();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.ejb.EJBJar#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EJBJar#getVersion()
-	 * @see #getEJBJar()
-	 * @generated
-	 */
-	EAttribute getEJBJar_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBJar_AssemblyDescriptor();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBJar_EnterpriseBeans();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getEJBJar_RelationshipList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleSource object
-	 */
-	EClass getRoleSource();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getRoleSource_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRoleSource_Role();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getRoleSource_EntityBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.RoleSource#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.RoleSource#getDescriptions()
-	 * @see #getRoleSource()
-	 * @generated
-	 */
-	EReference getRoleSource_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Query object
-	 */
-	EClass getQuery();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getQuery_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getQuery_EjbQL();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getQuery_ReturnTypeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getQuery_QueryMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getQuery_Entity();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.Query#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.Query#getDescriptions()
-	 * @see #getQuery()
-	 * @generated
-	 */
-	EReference getQuery_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return QueryMethod object
-	 */
-	EClass getQueryMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getQueryMethod_Query();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty <em>Activation Config Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Config Property</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty
-	 * @generated
-	 */
-	EClass getActivationConfigProperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getValue()
-	 * @see #getActivationConfigProperty()
-	 * @generated
-	 */
-	EAttribute getActivationConfigProperty_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty#getName()
-	 * @see #getActivationConfigProperty()
-	 * @generated
-	 */
-	EAttribute getActivationConfigProperty_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Config</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfig
-	 * @generated
-	 */
-	EClass getActivationConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfig#getConfigProperties <em>Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfig#getConfigProperties()
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	EReference getActivationConfig_ConfigProperties();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfig#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfig#getDescriptions()
-	 * @see #getActivationConfig()
-	 * @generated
-	 */
-	EReference getActivationConfig_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodElement object
-	 */
-	EClass getMethodElement();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Parms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMethodElement_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMethodElement_EnterpriseBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.MethodElement#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MethodElement#getDescriptions()
-	 * @see #getMethodElement()
-	 * @generated
-	 */
-	EReference getMethodElement_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExcludeList object
-	 */
-	EClass getExcludeList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getExcludeList_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getExcludeList_MethodElements();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.ejb.ExcludeList#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ExcludeList#getDescriptions()
-	 * @see #getExcludeList()
-	 * @generated
-	 */
-	EReference getExcludeList_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Session object
-	 */
-	EClass getSession();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSession_TransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSession_SessionType();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.ejb.Session#getServiceEndpoint <em>Service Endpoint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Service Endpoint</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.Session#getServiceEndpoint()
-	 * @see #getSession()
-	 * @generated
-	 */
-	EReference getSession_ServiceEndpoint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDriven object
-	 */
-	EClass getMessageDriven();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDriven_TransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDriven_MessageSelector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDriven_AcknowledgeMode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMessageDriven_Destination();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Activation Config</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getActivationConfig()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EReference getMessageDriven_ActivationConfig();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getMessageDestination <em>Message Destination</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Message Destination</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getMessageDestination()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EReference getMessageDriven_MessageDestination();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getLink <em>Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getLink()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EAttribute getMessageDriven_Link();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getMessagingType <em>Messaging Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Messaging Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.MessageDriven#getMessagingType()
-	 * @see #getMessageDriven()
-	 * @generated
-	 */
-	EReference getMessageDriven_MessagingType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MessageDrivenDestination object
-	 */
-	EClass getMessageDrivenDestination();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDrivenDestination_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMessageDrivenDestination_SubscriptionDurability();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMessageDrivenDestination_Bean();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return EJBMethodCategory object
-	 */
-	EClass getEJBMethodCategory();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransactionAttributeType object
-	 */
-	EEnum getTransactionAttributeType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MultiplicityKind object
-	 */
-	EEnum getMultiplicityKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ReturnTypeMapping object
-	 */
-	EEnum getReturnTypeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MethodElementKind object
-	 */
-	EEnum getMethodElementKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransactionType object
-	 */
-	EEnum getTransactionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AcknowledgeMode object
-	 */
-	EEnum getAcknowledgeMode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return DestinationType object
-	 */
-	EEnum getDestinationType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SubscriptionDurabilityKind object
-	 */
-	EEnum getSubscriptionDurabilityKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SessionType object
-	 */
-	EEnum getSessionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EjbFactory getEjbFactory();
-
-} //EjbPackage
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRelationshipRoleAttributeFilter.java
deleted file mode 100644
index 12b0e7b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRelationshipRoleAttributeFilter.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.internal.ejb.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/28/2000 7:06:49 PM)
- * @author: Administrator
- */
-public abstract class AbstractRelationshipRoleAttributeFilter extends ContainerManagedEntityFilter {
-/**
- * AbstractRelationshipRoleAttributeFilter constructor comment.
- */
-public AbstractRelationshipRoleAttributeFilter() {
-	super();
-}
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	List attributes = new ArrayList();
-	Iterator it = getSourceRoles(cmp).iterator();
-	CommonRelationshipRole role;
-	while (it.hasNext()) {
-		role = (CommonRelationshipRole) it.next();
-		attributes.addAll(role.getAttributes());
-	}
-	return attributes;
-}
-/**
- * Return the proper list of roles from cmpExt.
- */
-protected abstract java.util.List getSourceRoles(ContainerManagedEntity cmpExt) ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRequiredRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRequiredRelationshipRoleFilter.java
deleted file mode 100644
index c9aab73..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AbstractRequiredRelationshipRoleFilter.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * Insert the type's description here.
- * Creation date: (10/15/2001 11:37:19 AM)
- * @author: Administrator
- */
-public abstract class AbstractRequiredRelationshipRoleFilter extends ContainerManagedEntityFilter {
-/**
- * AbstractRequiredRelationshipRoleFilter constructor comment.
- */
-public AbstractRequiredRelationshipRoleFilter() {
-	super();
-}
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	List roles = new ArrayList();
-	List allRoles = getRolesToFilter(cmp);
-	CommonRelationshipRole role;
-	for (int i = 0; i < allRoles.size(); i++) {
-		role = (CommonRelationshipRole) allRoles.get(i);
-		if (shouldAddFilteredResult(role))
-			roles.add(role);
-	}
-	return roles;
-}
-protected abstract java.util.List getRolesToFilter(ContainerManagedEntity cmp) ;
-/**
- * Return true if the multiplicity for @aRole is required.
- */
-protected boolean shouldAddFilteredResult(CommonRelationshipRole aRole) {
-	boolean required = aRole.isRequired();
-	if (required) {
-		CommonRelationshipRole opposite = aRole.getOppositeAsCommonRole();
-		if (opposite != null) {
-			if (opposite.isRequired() && !aRole.isKey()) {
-				if (opposite.isKey() || aRole.isMany())
-					return false;
-				if (!opposite.isMany())
-					//both are single and not key
-					return aRole.isForward();
-			}
-		}
-	}
-	return required;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigImpl.java
deleted file mode 100644
index 1f82648..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigImpl#getConfigProperties <em>Config Properties</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationConfigImpl extends EObjectImpl implements ActivationConfig {
-	/**
-	 * The cached value of the '{@link #getConfigProperties() <em>Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList configProperties = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getActivationConfig();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ActivationConfigProperty.class, this, EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-					return ((InternalEList)getConfigProperties()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				return getConfigProperties();
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ACTIVATION_CONFIG__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-			case EjbPackage.ACTIVATION_CONFIG__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //ActivationConfigImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigPropertyImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigPropertyImpl.java
deleted file mode 100644
index 08541d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ActivationConfigPropertyImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Config Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigPropertyImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.ejb.impl.ActivationConfigPropertyImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationConfigPropertyImpl extends EObjectImpl implements ActivationConfigProperty {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationConfigPropertyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getActivationConfigProperty();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				return getValue();
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__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 EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				setValue((String)newValue);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME:
-				setName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return 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(" (value: "); //$NON-NLS-1$
-		result.append(value);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivationConfigPropertyImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AssemblyDescriptorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AssemblyDescriptorImpl.java
deleted file mode 100644
index e80f03c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/AssemblyDescriptorImpl.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-/**
- * The assembly-descriptor element contains application-assembly information.  The application-assembly information consists of the following parts: the definition of security roles, the definition of method permissions, and the definition of transaction attributes for enterprise beans with container-managed transaction demarcation. All the parts are optional in the sense that they are omitted if the lists represented by them are empty. Providing an assembly-descriptor in the deployment descriptor is optional for the ejb-jar file producer.
- */
-public class AssemblyDescriptorImpl extends EObjectImpl implements AssemblyDescriptor, EObject {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodPermissions = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodTransactions = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoles = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ExcludeList excludeList = null;
-	/**
-	 * The cached value of the '{@link #getMessageDestinations() <em>Message Destinations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinations = null;
-
-	public AssemblyDescriptorImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getAssemblyDescriptor();
-	}
-
-/**
- * Return the first method permission that contains all the roles in securityRoles and
- * is the same size
- */
-
-public MethodPermission getMethodPermission(List securityRolesList) {
-	List permissions = getMethodPermissions();
-	MethodPermission temp = null;
-	for (int i = 0; i < permissions.size(); i++) {
-		temp = (MethodPermission) permissions.get(i);
-		if (temp.getRoles().containsAll(securityRolesList) && temp.getRoles().size() == securityRolesList.size())
-			return temp;
-	}
-	return null;
-}
-public List getMethodPermissionMethodElements(EnterpriseBean anEJB) {
-	List allMethodElements = new ArrayList();
-	List permissions = getMethodPermissions();
-	MethodPermission permission;
-	for (int i = 0; i < permissions.size(); i++){
-		permission = (MethodPermission) permissions.get(i);
-		allMethodElements.addAll(permission.getMethodElements(anEJB)); 
-	}
-	return allMethodElements;
-}
-	
-
-public List getMethodTransactionMethodElements(EnterpriseBean anEJB) {
-	List allMethodElements = new ArrayList();
-	List transactions = getMethodTransactions();
-	MethodTransaction transaction;
-	for (int i = 0; i < transactions.size(); i++){
-		transaction = (MethodTransaction) transactions.get(i);
-		allMethodElements.addAll(transaction.getMethodElements(anEJB)); 
-	}
-	return allMethodElements;
-}
-	
-public SecurityRole getSecurityRoleNamed(String roleName) {
-	java.util.List tempRoles = getSecurityRoles();
-	SecurityRole role;
-	for (int i = 0; i < tempRoles.size(); i++) {
-		role = (SecurityRole) tempRoles.get(i);
-		if (role.getRoleName().equals(roleName))
-			return role;
-	}
-	return null;
-}
-
-/**
- * @see org.eclipse.jst.j2ee.internal.ejb.AssemblyDescriptor
- */
-public void renameSecurityRole(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	SecurityRole role = getSecurityRoleNamed(existingRoleName);
-	role.setRoleName(newRoleName);
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodPermissions() {
-		if (methodPermissions == null) {
-			methodPermissions = new EObjectContainmentWithInverseEList(MethodPermission.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR);
-		}
-		return methodPermissions;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies how the container must manage transaction scopes for the enterprise
-	 * bean's method invocations.  The element consists of an optional description, a
-	 * list of method elements, and a transaction attribute.The transaction attribute
-	 * is to be applied to all the specified methods.
-	 */
-	public EList getMethodTransactions() {
-		if (methodTransactions == null) {
-			methodTransactions = new EObjectContainmentWithInverseEList(MethodTransaction.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR);
-		}
-		return methodTransactions;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBJar getEjbJar() {
-		if (eContainerFeatureID != EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR) return null;
-		return (EJBJar)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbJar(EJBJar newEjbJar) {
-		if (newEjbJar != eContainer || (eContainerFeatureID != EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR && newEjbJar != null)) {
-			if (EcoreUtil.isAncestor(this, newEjbJar))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEjbJar != null)
-				msgs = ((InternalEObject)newEjbJar).eInverseAdd(this, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, EJBJar.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newEjbJar, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, newEjbJar, newEjbJar));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoles() {
-		if (securityRoles == null) {
-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
-		}
-		return securityRoles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ExcludeList getExcludeList() {
-		return excludeList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetExcludeList(ExcludeList newExcludeList, NotificationChain msgs) {
-		ExcludeList oldExcludeList = excludeList;
-		excludeList = newExcludeList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, oldExcludeList, newExcludeList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExcludeList(ExcludeList newExcludeList) {
-		if (newExcludeList != excludeList) {
-			NotificationChain msgs = null;
-			if (excludeList != null)
-				msgs = ((InternalEObject)excludeList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, null, msgs);
-			if (newExcludeList != null)
-				msgs = ((InternalEObject)newExcludeList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, null, msgs);
-			msgs = basicSetExcludeList(newExcludeList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST, newExcludeList, newExcludeList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinations() {
-		if (messageDestinations == null) {
-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
-		}
-		return messageDestinations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-					return ((InternalEList)getMethodPermissions()).basicAdd(otherEnd, msgs);
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-					return ((InternalEList)getMethodTransactions()).basicAdd(otherEnd, msgs);
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, 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 EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-					return ((InternalEList)getMethodPermissions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-					return ((InternalEList)getMethodTransactions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-					return eBasicSetContainer(null, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, msgs);
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-					return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-					return basicSetExcludeList(null, msgs);
-				case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-					return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-				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 EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, EJBJar.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 EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return getMethodPermissions();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				return getMethodTransactions();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return getSecurityRoles();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return getExcludeList();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				return methodPermissions != null && !methodPermissions.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				return methodTransactions != null && !methodTransactions.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				return securityRoles != null && !securityRoles.isEmpty();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				return excludeList != null;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				return messageDestinations != null && !messageDestinations.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				getMethodPermissions().clear();
-				getMethodPermissions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				getMethodTransactions().clear();
-				getMethodTransactions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				setExcludeList((ExcludeList)newValue);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS:
-				getMethodPermissions().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS:
-				getMethodTransactions().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST:
-				setExcludeList((ExcludeList)null);
-				return;
-			case EjbPackage.ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 */
-	public void removeData(EnterpriseBean anEJB) {
-		if (anEJB != null) {
-			removeMethodPermissionData(anEJB);
-			removeMethodTransactionData(anEJB);
-		}
-	}
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 */
-	protected void removeMethodPermissionData(EnterpriseBean anEJB) {
-		List mes = getMethodPermissionMethodElements(anEJB);
-		MethodElement me;
-		MethodPermission mp;
-		for (int i = 0; i < mes.size(); i++){
-			me = (MethodElement) mes.get(i);
-			mp = (MethodPermission)me.eContainer();
-			if (mp.getMethodElements().size() == 1){
-				ExtendedEcoreUtil.becomeProxy(mp, mp.eResource());
-				getMethodPermissions().remove(mp);
-			}
-			else{
-				ExtendedEcoreUtil.becomeProxy(me, me.eResource());
-				mp.getMethodElements().remove(me);
-			}
-		}
-	}
-	/**
-	 * Remove the MethodElements that are referencing @anEJB.
-	 */
-	protected void removeMethodTransactionData(EnterpriseBean anEJB) {
-		List mes = getMethodTransactionMethodElements(anEJB);
-		MethodElement me;
-		MethodTransaction mt;
-		for (int i = 0; i < mes.size(); i++){
-			me = (MethodElement) mes.get(i);
-			mt = (MethodTransaction)me.eContainer();
-			if (mt.getMethodElements().size() == 1){
-				ExtendedEcoreUtil.becomeProxy(mt, mt.eResource());
-				getMethodTransactions().remove(mt);
-			}
-			else{
-				ExtendedEcoreUtil.becomeProxy(me, me.eResource());	
-				mt.getMethodElements().remove(me);
-			}
-		}
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMPAttributeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMPAttributeImpl.java
deleted file mode 100644
index b20d491..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMPAttributeImpl.java
+++ /dev/null
@@ -1,605 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-/**
- * Describes a container-managed field. The field element includes an optional description of the field, and the name of the field.
-
- */
-public class CMPAttributeImpl extends EAttributeImpl implements CMPAttribute, EAttribute{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	protected transient JavaHelpers originatingType;
-	protected transient CMPAttribute targetAttribute;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected boolean derived;
-	
-	public CMPAttributeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getCMPAttribute();
-	}
-
-protected Field findExistingField() {
-	JavaClass javaClass = getEjbClass();
-	if (javaClass != null)
-		return javaClass.getFieldExtended(getName());
-	return null;
-}
-public org.eclipse.emf.ecore.EClassifier getAccessorType() {
-	if (getEjbClass() != null) {
-		Method getter = getEjbClass().getMethodExtended(getGetterName(), Collections.EMPTY_LIST);
-		if (getter != null)
-			return getter.getReturnType();
-	}
-	return null;
-}
-public ContainerManagedEntity getCMPEntity() {
-	return (ContainerManagedEntity) eContainer();
-}
-/**
- * Return the EjbClass from the CMP Entity.
- */
-
-protected JavaClass getEjbClass() {
-	ContainerManagedEntity ejb = getCMPEntity();
-	return ejb == null ? null : ejb.getEjbClass();
-}
-/**
- * Return the KeyClass from the CMP Entity.
- */
-
-protected JavaClass getKeyClass() {
-	ContainerManagedEntity ejb = getCMPEntity();
-	return ejb == null ? null : ejb.getPrimaryKey();
-}
-/**
- * @deprecated - With EJB 2.0, assuming a Java field is no longer safe.
- * 		Use getType() and getName() to get the most common field info.
- *		Or use getEjbClass() to get additional Java info.
- */
-
- public Field getField() {
-	ContainerManagedEntity ejb = getCMPEntity();
-	
-	if(ejb == null)
-		return null;
-
-	Field field = null;
-	switch(ejb.getVersionID()) {
-		case J2EEVersionConstants.EJB_1_0_ID:
-		case J2EEVersionConstants.EJB_1_1_ID:
-			field = findExistingField();
-			//Set the field type based on the attribute type if necessary
-			if (field != null && getEType() != null && field.getEType() == null)
-				field.setEType(getEType()); 
-			break;
-		case J2EEVersionConstants.EJB_2_0_ID:
-		case J2EEVersionConstants.EJB_2_1_ID: default:
-			field = ((JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI)).getJavaRefFactory().createField();
-			field.setName(getName());
-			field.setEType(getAccessorType());
-			break; 
-	}
-	return field;
-}
-public String getGetterName() {
-	if (name != null && name.length() > 0) {
-		StringBuffer b = new StringBuffer("get"); //$NON-NLS-1$
-		b.append(name.substring(0, 1).toUpperCase()).append(name.length() > 1 ? name.substring(1) : ""); //$NON-NLS-1$
-		return b.toString();
-	}
-	return name;
-}
-/**
- * Return the type of this attribute in its original form (i.e., unwrapped if
- * the type has been wrapped).
- */
-public JavaHelpers getOriginatingType() {
-	return originatingType;
-}
-public String getSetterName() {
-	return "set" + getName().substring(0, 1).toUpperCase() + (getName().length() > 1 ? getName().substring(1) : ""); //$NON-NLS-1$ //$NON-NLS-2$
-}
-public JavaHelpers getType() {
-	if (getEType() != null)
-		return (JavaHelpers) getEType();
-	// Be sensitive to CMP 2.0 beans, get type from field or get accessor type
-	ContainerManagedEntity ejb = getCMPEntity();
-	Resource res = eResource();
-	boolean modFlag = res == null ? false : res.isModified();
-	boolean deliveryFlag = eDeliver();
-	try {
-		eSetDeliver(false);
-		if(ejb != null) {
-			switch(ejb.getVersionID()) {
-				case J2EEVersionConstants.EJB_1_0_ID:
-				case J2EEVersionConstants.EJB_1_1_ID:
-					setEType(getTypeFromBeanField());
-					break;
-				case J2EEVersionConstants.EJB_2_0_ID:
-				case J2EEVersionConstants.EJB_2_1_ID: default:
-					setEType(get20Type());
-					break; 
-			} 
-		}
-	} finally {
-		eSetDeliver(deliveryFlag);
-		if (res != null && res.isTrackingModification())
-			res.setModified(modFlag);
-	}
-	return (JavaHelpers) getEType();
-}
-protected EClassifier getTypeFromBeanField() {
-	EClassifier type = null;
-	Field field = getField();
-	if (field != null)
-		type = field.getEType();
-	if (type == null)
-		type = getKeyFieldTypeFromKeyClass();
-	return type;
-}
-public EClassifier get20Type() {
-	EClassifier type = null;
-	if (getEjbClass() != null) {
-		String getterName = getGetterName();
-		if (getterName != null && getterName.length() > 0) {
-			Method getter = getEjbClass().getMethodExtended(getterName, Collections.EMPTY_LIST);
-			if (getter != null)
-				type = getter.getReturnType();
-		}
-	}
-	if (type == null)
-		type = getKeyFieldTypeFromKeyClass();
-	return type;	
-}
-/**
- * @return
- */
-private EClassifier getKeyFieldTypeFromKeyClass() {
-	if (isKey()) {
-		JavaClass key = getCMPEntity().getPrimaryKey();
-		if (key != null && key.getQualifiedName() != null && !key.getQualifiedName().startsWith("java.lang")) { //$NON-NLS-1$
-			Field field = key.getFieldExtended(getName());
-			if (field != null)
-				return field.getEType();
-		} else
-			return key;
-	}
-	return null;
-}
-public boolean isCMRField() {
-	return false;
-}
-public boolean isKey() {
-	return getCMPEntity() == null ? false : getCMPEntity().isKeyAttribute(this);
-}
-
-public boolean isPrimKeyField(){
-	return getCMPEntity() == null ? false : getCMPEntity().getPrimKeyField() == this;
-}
-
-public void setOriginatingType(JavaHelpers newOriginatingType) {
-	originatingType = newOriginatingType;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the cmr field.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMP_ATTRIBUTE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int aFeatureID, Class baseClass, NotificationChain msgs) {
-		if (aFeatureID >= 0) {
-			switch (eDerivedStructuralFeatureID(aFeatureID, baseClass)) {
-				case EjbPackage.CMP_ATTRIBUTE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case EjbPackage.CMP_ATTRIBUTE__ECONTAINING_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.CMP_ATTRIBUTE__ECONTAINING_CLASS, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, aFeatureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, aFeatureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int aFeatureID, Class baseClass, NotificationChain msgs) {
-		if (aFeatureID >= 0) {
-			switch (eDerivedStructuralFeatureID(aFeatureID, baseClass)) {
-				case EjbPackage.CMP_ATTRIBUTE__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CMP_ATTRIBUTE__ECONTAINING_CLASS:
-					return eBasicSetContainer(null, EjbPackage.CMP_ATTRIBUTE__ECONTAINING_CLASS, msgs);
-				case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, aFeatureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, aFeatureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case EjbPackage.CMP_ATTRIBUTE__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 EjbPackage.CMP_ATTRIBUTE__EANNOTATIONS:
-				return getEAnnotations();
-			case EjbPackage.CMP_ATTRIBUTE__NAME:
-				return getName();
-			case EjbPackage.CMP_ATTRIBUTE__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case EjbPackage.CMP_ATTRIBUTE__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case EjbPackage.CMP_ATTRIBUTE__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case EjbPackage.CMP_ATTRIBUTE__CHANGEABLE:
-				return isChangeable() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__VOLATILE:
-				return isVolatile() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__TRANSIENT:
-				return isTransient() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__DEFAULT_VALUE_LITERAL:
-				return getDefaultValueLiteral();
-			case EjbPackage.CMP_ATTRIBUTE__DEFAULT_VALUE:
-				return getDefaultValue();
-			case EjbPackage.CMP_ATTRIBUTE__UNSETTABLE:
-				return isUnsettable() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__DERIVED:
-				return isDerived() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__ECONTAINING_CLASS:
-				return getEContainingClass();
-			case EjbPackage.CMP_ATTRIBUTE__ID:
-				return isID() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMP_ATTRIBUTE__EATTRIBUTE_TYPE:
-				if (resolve) return getEAttributeType();
-				return basicGetEAttributeType();
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.CMP_ATTRIBUTE__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case EjbPackage.CMP_ATTRIBUTE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.CMP_ATTRIBUTE__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__MANY:
-				return isMany() != false;
-			case EjbPackage.CMP_ATTRIBUTE__REQUIRED:
-				return isRequired() != false;
-			case EjbPackage.CMP_ATTRIBUTE__ETYPE:
-				return eType != null;
-			case EjbPackage.CMP_ATTRIBUTE__CHANGEABLE:
-				return ((eFlags & CHANGEABLE_EFLAG) != 0) != CHANGEABLE_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__VOLATILE:
-				return ((eFlags & VOLATILE_EFLAG) != 0) != VOLATILE_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__TRANSIENT:
-				return ((eFlags & TRANSIENT_EFLAG) != 0) != TRANSIENT_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__DEFAULT_VALUE_LITERAL:
-				return DEFAULT_VALUE_LITERAL_EDEFAULT == null ? defaultValueLiteral != null : !DEFAULT_VALUE_LITERAL_EDEFAULT.equals(defaultValueLiteral);
-			case EjbPackage.CMP_ATTRIBUTE__DEFAULT_VALUE:
-				return getDefaultValue() != null;
-			case EjbPackage.CMP_ATTRIBUTE__UNSETTABLE:
-				return ((eFlags & UNSETTABLE_EFLAG) != 0) != UNSETTABLE_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__DERIVED:
-				return derived != DERIVED_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__ECONTAINING_CLASS:
-				return getEContainingClass() != null;
-			case EjbPackage.CMP_ATTRIBUTE__ID:
-				return ((eFlags & ID_EFLAG) != 0) != ID_EDEFAULT;
-			case EjbPackage.CMP_ATTRIBUTE__EATTRIBUTE_TYPE:
-				return basicGetEAttributeType() != null;
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.CMP_ATTRIBUTE__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__CHANGEABLE:
-				setChangeable(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__VOLATILE:
-				setVolatile(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__TRANSIENT:
-				setTransient(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral((String)newValue);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__UNSETTABLE:
-				setUnsettable(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DERIVED:
-				setDerived(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__ID:
-				setID(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().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 EjbPackage.CMP_ATTRIBUTE__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__CHANGEABLE:
-				setChangeable(CHANGEABLE_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__VOLATILE:
-				setVolatile(VOLATILE_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__TRANSIENT:
-				setTransient(TRANSIENT_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral(DEFAULT_VALUE_LITERAL_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__UNSETTABLE:
-				setUnsettable(UNSETTABLE_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DERIVED:
-				setDerived(DERIVED_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__ID:
-				setID(ID_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.CMP_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * This field/method will be replaced during code generation.
-	 */
-	public String toString() {
-		return super.toString() + " :: " + getName(); //$NON-NLS-1$
-	}
-	/**
-	 * Returns true if a targetAttribute is being used.
-	 * @return Returns a boolean
-	 */
-	public boolean isDerived() {
-		return derived;
-	}
-	public void setDerived(boolean aBoolean) {
-		if (aBoolean && getEType() == null)
-			getType(); //This ensures that the type is set.
-		derived = aBoolean;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMRFieldImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMRFieldImpl.java
deleted file mode 100644
index 595ba78..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/CMRFieldImpl.java
+++ /dev/null
@@ -1,470 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-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.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.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-/**
- * Describes the bean provider's view of a relationship. It consists of an optional description, and the name and the class type of a field in the source of a role of a relationship. The CMRField::name element corresponds to the name used for the get and set accessor methods for the relationship. The CMRField::type element is used only for collection-valued CMRFields. It specifies the type of the collection that is used (a java class name).
- * 
-
- */
-public class CMRFieldImpl extends CMPAttributeImpl implements CMRField, CMPAttribute{
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass collectionType = null;
-	public CMRFieldImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getCMRField();
-	}
-
-/**
- * createClassRef - return a JavaURL reference to the named Java class
- */
-public JavaClass createClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-public String getCollectionTypeName() {
-	getCollectionType();
-	return collectionType == null ? null : collectionType.getQualifiedName();
-}          
-
-public boolean isPrimKeyField(){
-	return false;
-}
-
-public boolean isCMRField() {
-	return true;
-}
-public void setCollectionTypeName(String typeName) {
-	eSet(EjbPackage.eINSTANCE.getCMRField_CollectionType(), createClassRef(typeName));
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBRelationshipRole getRole() {
-		if (eContainerFeatureID != EjbPackage.CMR_FIELD__ROLE) return null;
-		return (EJBRelationshipRole)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRole(EJBRelationshipRole newRole) {
-		if (newRole != eContainer || (eContainerFeatureID != EjbPackage.CMR_FIELD__ROLE && newRole != null)) {
-			if (EcoreUtil.isAncestor(this, newRole))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRole != null)
-				msgs = ((InternalEObject)newRole).eInverseAdd(this, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, EJBRelationshipRole.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newRole, EjbPackage.CMR_FIELD__ROLE, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMR_FIELD__ROLE, newRole, newRole));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getCollectionType() {
-		if (collectionType != null && collectionType.eIsProxy()) {
-			JavaClass oldCollectionType = collectionType;
-			collectionType = (JavaClass)eResolveProxy((InternalEObject)collectionType);
-			if (collectionType != oldCollectionType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.CMR_FIELD__COLLECTION_TYPE, oldCollectionType, collectionType));
-			}
-		}
-		return collectionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetCollectionType() {
-		return collectionType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCollectionType(JavaClass newCollectionType) {
-		JavaClass oldCollectionType = collectionType;
-		collectionType = newCollectionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CMR_FIELD__COLLECTION_TYPE, oldCollectionType, collectionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int aFeatureID, Class baseClass, NotificationChain msgs) {
-		if (aFeatureID >= 0) {
-			switch (eDerivedStructuralFeatureID(aFeatureID, baseClass)) {
-				case EjbPackage.CMR_FIELD__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
-				case EjbPackage.CMR_FIELD__ECONTAINING_CLASS:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.CMR_FIELD__ECONTAINING_CLASS, msgs);
-				case EjbPackage.CMR_FIELD__ROLE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.CMR_FIELD__ROLE, msgs);
-				default:
-					return eDynamicInverseAdd(otherEnd, aFeatureID, baseClass, msgs);
-			}
-		}
-		if (eContainer != null)
-			msgs = eBasicRemoveFromContainer(msgs);
-		return eBasicSetContainer(otherEnd, aFeatureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int aFeatureID, Class baseClass, NotificationChain msgs) {
-		if (aFeatureID >= 0) {
-			switch (eDerivedStructuralFeatureID(aFeatureID, baseClass)) {
-				case EjbPackage.CMR_FIELD__EANNOTATIONS:
-					return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CMR_FIELD__ECONTAINING_CLASS:
-					return eBasicSetContainer(null, EjbPackage.CMR_FIELD__ECONTAINING_CLASS, msgs);
-				case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CMR_FIELD__ROLE:
-					return eBasicSetContainer(null, EjbPackage.CMR_FIELD__ROLE, msgs);
-				default:
-					return eDynamicInverseRemove(otherEnd, aFeatureID, baseClass, msgs);
-			}
-		}
-		return eBasicSetContainer(null, aFeatureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
-		if (eContainerFeatureID >= 0) {
-			switch (eContainerFeatureID) {
-				case EjbPackage.CMR_FIELD__ECONTAINING_CLASS:
-					return eContainer.eInverseRemove(this, EcorePackage.ECLASS__ESTRUCTURAL_FEATURES, EClass.class, msgs);
-				case EjbPackage.CMR_FIELD__ROLE:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, EJBRelationshipRole.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 EjbPackage.CMR_FIELD__EANNOTATIONS:
-				return getEAnnotations();
-			case EjbPackage.CMR_FIELD__NAME:
-				return getName();
-			case EjbPackage.CMR_FIELD__ORDERED:
-				return isOrdered() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__UNIQUE:
-				return isUnique() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__LOWER_BOUND:
-				return new Integer(getLowerBound());
-			case EjbPackage.CMR_FIELD__UPPER_BOUND:
-				return new Integer(getUpperBound());
-			case EjbPackage.CMR_FIELD__MANY:
-				return isMany() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__ETYPE:
-				if (resolve) return getEType();
-				return basicGetEType();
-			case EjbPackage.CMR_FIELD__CHANGEABLE:
-				return isChangeable() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__VOLATILE:
-				return isVolatile() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__TRANSIENT:
-				return isTransient() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__DEFAULT_VALUE_LITERAL:
-				return getDefaultValueLiteral();
-			case EjbPackage.CMR_FIELD__DEFAULT_VALUE:
-				return getDefaultValue();
-			case EjbPackage.CMR_FIELD__UNSETTABLE:
-				return isUnsettable() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__DERIVED:
-				return isDerived() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__ECONTAINING_CLASS:
-				return getEContainingClass();
-			case EjbPackage.CMR_FIELD__ID:
-				return isID() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CMR_FIELD__EATTRIBUTE_TYPE:
-				if (resolve) return getEAttributeType();
-				return basicGetEAttributeType();
-			case EjbPackage.CMR_FIELD__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.CMR_FIELD__ROLE:
-				return getRole();
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				if (resolve) return getCollectionType();
-				return basicGetCollectionType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.CMR_FIELD__EANNOTATIONS:
-				return eAnnotations != null && !eAnnotations.isEmpty();
-			case EjbPackage.CMR_FIELD__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.CMR_FIELD__ORDERED:
-				return ((eFlags & ORDERED_EFLAG) != 0) != ORDERED_EDEFAULT;
-			case EjbPackage.CMR_FIELD__UNIQUE:
-				return ((eFlags & UNIQUE_EFLAG) != 0) != UNIQUE_EDEFAULT;
-			case EjbPackage.CMR_FIELD__LOWER_BOUND:
-				return lowerBound != LOWER_BOUND_EDEFAULT;
-			case EjbPackage.CMR_FIELD__UPPER_BOUND:
-				return upperBound != UPPER_BOUND_EDEFAULT;
-			case EjbPackage.CMR_FIELD__MANY:
-				return isMany() != false;
-			case EjbPackage.CMR_FIELD__REQUIRED:
-				return isRequired() != false;
-			case EjbPackage.CMR_FIELD__ETYPE:
-				return eType != null;
-			case EjbPackage.CMR_FIELD__CHANGEABLE:
-				return ((eFlags & CHANGEABLE_EFLAG) != 0) != CHANGEABLE_EDEFAULT;
-			case EjbPackage.CMR_FIELD__VOLATILE:
-				return ((eFlags & VOLATILE_EFLAG) != 0) != VOLATILE_EDEFAULT;
-			case EjbPackage.CMR_FIELD__TRANSIENT:
-				return ((eFlags & TRANSIENT_EFLAG) != 0) != TRANSIENT_EDEFAULT;
-			case EjbPackage.CMR_FIELD__DEFAULT_VALUE_LITERAL:
-				return DEFAULT_VALUE_LITERAL_EDEFAULT == null ? defaultValueLiteral != null : !DEFAULT_VALUE_LITERAL_EDEFAULT.equals(defaultValueLiteral);
-			case EjbPackage.CMR_FIELD__DEFAULT_VALUE:
-				return getDefaultValue() != null;
-			case EjbPackage.CMR_FIELD__UNSETTABLE:
-				return ((eFlags & UNSETTABLE_EFLAG) != 0) != UNSETTABLE_EDEFAULT;
-			case EjbPackage.CMR_FIELD__DERIVED:
-				return derived != DERIVED_EDEFAULT;
-			case EjbPackage.CMR_FIELD__ECONTAINING_CLASS:
-				return getEContainingClass() != null;
-			case EjbPackage.CMR_FIELD__ID:
-				return ((eFlags & ID_EFLAG) != 0) != ID_EDEFAULT;
-			case EjbPackage.CMR_FIELD__EATTRIBUTE_TYPE:
-				return basicGetEAttributeType() != null;
-			case EjbPackage.CMR_FIELD__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.CMR_FIELD__ROLE:
-				return getRole() != null;
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				return collectionType != 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 EjbPackage.CMR_FIELD__EANNOTATIONS:
-				getEAnnotations().clear();
-				getEAnnotations().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__ORDERED:
-				setOrdered(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__UNIQUE:
-				setUnique(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
-				return;
-			case EjbPackage.CMR_FIELD__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
-				return;
-			case EjbPackage.CMR_FIELD__ETYPE:
-				setEType((EClassifier)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__CHANGEABLE:
-				setChangeable(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__VOLATILE:
-				setVolatile(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__TRANSIENT:
-				setTransient(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral((String)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__UNSETTABLE:
-				setUnsettable(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__DERIVED:
-				setDerived(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__ID:
-				setID(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CMR_FIELD__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__ROLE:
-				setRole((EJBRelationshipRole)newValue);
-				return;
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				setCollectionType((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.CMR_FIELD__EANNOTATIONS:
-				getEAnnotations().clear();
-				return;
-			case EjbPackage.CMR_FIELD__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__ORDERED:
-				setOrdered(ORDERED_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__UNIQUE:
-				setUnique(UNIQUE_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__LOWER_BOUND:
-				setLowerBound(LOWER_BOUND_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__UPPER_BOUND:
-				setUpperBound(UPPER_BOUND_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__ETYPE:
-				setEType((EClassifier)null);
-				return;
-			case EjbPackage.CMR_FIELD__CHANGEABLE:
-				setChangeable(CHANGEABLE_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__VOLATILE:
-				setVolatile(VOLATILE_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__TRANSIENT:
-				setTransient(TRANSIENT_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__DEFAULT_VALUE_LITERAL:
-				setDefaultValueLiteral(DEFAULT_VALUE_LITERAL_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__UNSETTABLE:
-				setUnsettable(UNSETTABLE_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__DERIVED:
-				setDerived(DERIVED_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__ID:
-				setID(ID_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.CMR_FIELD__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.CMR_FIELD__ROLE:
-				setRole((EJBRelationshipRole)null);
-				return;
-			case EjbPackage.CMR_FIELD__COLLECTION_TYPE:
-				setCollectionType((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.impl.CMPAttributeImpl#getCMPEntity()
-	 */
-	public ContainerManagedEntity getCMPEntity() {
-		EJBRelationshipRole role = getRole();
-		if (role != null)
-			return role.getSourceEntity();
-		return null;
-	}
-
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityFilter.java
deleted file mode 100644
index 6d9a534..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityFilter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBExtensionFilter;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * Insert the type's description here. Creation date: (11/28/2000 6:28:39 PM)
- * @author: Administrator
- */
-public abstract class ContainerManagedEntityFilter implements EJBExtensionFilter {
- 
-
-    /**
-     * AttributeFilter constructor comment.
-     */
-    public ContainerManagedEntityFilter() {
-        super();
-    }
-
-    /**
-     * filter method comment.
-     */
-    public abstract List filter(ContainerManagedEntity cmp);
-
-    /**
-     * All CMPAttributeFilters only operate on ContainerManagedEntityExtension
-     * objects.
-     */
-    public List filter(EnterpriseBean ejb) {
-        if (ejb.isEntity() && ((Entity) ejb).isContainerManagedEntity()) return filter((ContainerManagedEntity) ejb);
-        return new ArrayList();
-    }
-
-    protected void filterRoleAttributesByName(List allAttributes, List roleAttributes) {
-        if (!roleAttributes.isEmpty()) {
-            int allSize, roleSize;
-            roleSize = roleAttributes.size();
-            CMPAttribute roleAtt, allAtt;
-            for (int i = 0; i < roleSize; i++) {
-                roleAtt = (CMPAttribute) roleAttributes.get(i);
-                allSize = allAttributes.size();
-                for (int j = allSize - 1; j != -1; j--) {
-                    allAtt = (CMPAttribute) allAttributes.get(j);
-                    if (roleAtt == allAtt || roleAtt.getName().equals(allAtt.getName())) {
-                        allAttributes.remove(j);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    protected EjbModuleExtensionHelper getEjbModuleExtHelper(Object context) {
-        return IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(context);
-    }
-
-    protected List getLocalRelationshipRoles(ContainerManagedEntity cmp) {
-        EjbModuleExtensionHelper modelExtender = null;
-        if (cmp.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID)
-            return cmp.getRoles();
-        else if ( (modelExtender = getEjbModuleExtHelper(cmp)) != null ){
-            return modelExtender.getLocalRelationshipRoles_cmp11(cmp);
-        } 
-        return Collections.EMPTY_LIST;
-    }
-    
-    protected List getRelationshipRoles(ContainerManagedEntity cmp) { 
-        List roles = new ArrayList(); 
-        collectRelationshipRoles(cmp, getEjbModuleExtHelper(cmp), roles);
-        return Collections.unmodifiableList(roles);
-    }
-    
-    public void collectRelationshipRoles(ContainerManagedEntity cmp, EjbModuleExtensionHelper extensionHelper, List containerList) {
-        if(cmp == null)
-            return;
-        containerList.addAll(getLocalRelationshipRoles(cmp));
-        if(extensionHelper != null)
-            collectRelationshipRoles((ContainerManagedEntity) extensionHelper.getSuperType(cmp), extensionHelper, containerList);        
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityImpl.java
deleted file mode 100644
index 6414ef2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ContainerManagedEntityImpl.java
+++ /dev/null
@@ -1,1143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.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.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBExtensionFilter;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.util.CMPKeySynchronizationAdapter;
-
-
-/**
- * @generated
- */
-public class ContainerManagedEntityImpl extends EntityImpl implements ContainerManagedEntity {
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * 
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = "1.x"; //$NON-NLS-1$
-
-	protected EClassifier fGeneratedIdType = null;
-	protected static final String PERS_FEATURE_CHNG_NOTIFIER = "PersistentFeatureChangeNotificationAdapter";	 //$NON-NLS-1$
-	protected static final String QUERY_METHOD_NAME = "QueryMethod"; //$NON-NLS-1$
-	protected static final String FIND_BY_PRIM_KEY_METHOD_NAME = "findByPrimaryKey"; //$NON-NLS-1$
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String version = VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAbstractSchemaName() <em>Abstract Schema Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAbstractSchemaName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ABSTRACT_SCHEMA_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String abstractSchemaName = ABSTRACT_SCHEMA_NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList persistentAttributes = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList keyAttributes = null;
-	/**
-	 * The cached value of the '{@link #getQueries() <em>Queries</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueries()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList queries = null;
-
-	/**
-	 * The cached value of the '{@link #getCMPAttribute() <em>CMP Attribute</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCMPAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList cmpAttribute = null;
-
-	/**
-	 * The cached value of the '{@link #getPrimKeyField() <em>Prim Key Field</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPrimKeyField()
-	 * @generated
-	 * @ordered
-	 */
-	protected CMPAttribute primKeyField = null;
-
-	/**
-	 * @generated
-	 */
-	protected ContainerManagedEntityImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getContainerManagedEntity();
-	}
-
-/**
- * Create a new instance of AttributeExtn with aName and add it to the keyFeatures.
- * Creation date: (8/2/2000 9:11:13 PM)
- * @param aName java.lang.String
- * @return CMPAttribute
- */
-public CMPAttribute addKeyAttributeName(String aName) {
-	CMPAttribute attribute = getPersistentAttribute(aName);
-	if (attribute != null) {
-		List keys = getKeyAttributes();
-		CMPAttribute key;
-		for (int i = 0; i < keys.size(); i++) {
-			key = (CMPAttribute) keys.get(i);
-			if (aName.equals(key.getName()))
-				return attribute;
-		}
-		keys.add(attribute);
-	}
-	return attribute;
-}
-/**
- * Return a List of one of the properties using aFilter.
-*/
-public List getFilteredFeatures(EJBExtensionFilter aFilter) {
-		return aFilter.filter(this);
-	}
-/**
- * Add a persistent attribute with the same name as the name for aField.
- * Creation date: (8/3/2000 8:30:42 AM)
- * @param aField org.eclipse.jem.internal.java.Field
- * @return CMPAttribute
- */
-public CMPAttribute addPersistentAttribute(Field aField) {
-	if (aField == null)
-		return null;
-	return addPersistentAttributeName(aField.getName());
-}
-/**
- * Create a new instance of AttributeExtn with aName and add it to the persistentFeatures.
- * Creation date: (8/2/2000 9:11:13 PM)
- * @param aName java.lang.String
- * @return CMPAttribute
- */
-public CMPAttribute addPersistentAttributeName(String aName) {
-	CMPAttribute attribute = getPersistentAttribute(aName);
-	if (attribute == null) {
-		attribute = createPersistentAttribute(aName);
-		getPersistentAttributes().add(attribute);
-	}
-	return attribute;
-}
-protected CMPAttribute createPersistentAttribute(String aName) {
-	CMPAttribute attribute = ((EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory().createCMPAttribute();
-	attribute.setName(aName);
-	return attribute;
-}
-public List getAllAvailableQueryMethods() {
-	Set sigs = new HashSet();
-	List javaMethods = getAvailableSelectQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	javaMethods = getAvailableLocalQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	javaMethods = getAvailableRemoteQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	List signatures = new ArrayList(sigs);
-	return createQueryMethods(signatures);
-}
-protected List createQueryMethods(List signatures) {
-	Collections.sort(signatures);
-	Enumerator enumerator = MethodElementKind.UNSPECIFIED_LITERAL;
-	return createMethodElements(QUERY_METHOD_NAME, signatures, enumerator);
-}
-
-public List getAvailableSelectQueryMethods() {
-	List methods = getAvailableSelectQueryJavaMethods();
-	List sigs = getMethodElementSignatures(methods);
-	return createQueryMethods(sigs);
-}
-protected List getAvailableSelectQueryJavaMethods() {
-	JavaClass bean = getEjbClass();
-	if (bean == null)
-		return Collections.EMPTY_LIST;
-	return bean.getOnlySpecificMethods("ejbSelect", Collections.EMPTY_LIST);	 //$NON-NLS-1$
-}
-
-public List getAvailableFindQueryMethods() {
-	Set sigs = new HashSet();
-	List javaMethods = getAvailableRemoteQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	javaMethods = getAvailableLocalQueryJavaMethods();
-	sigs.addAll(getMethodElementSignatures(javaMethods));
-	List signatures = new ArrayList(sigs);
-	return createQueryMethods(signatures);
-}
-protected List getAvailableLocalQueryJavaMethods() {
-	return getAvailableQueryJavaMethods(getLocalHomeInterface());
-}
-/**
-* This returns the CMP version id by using the module id and the <cmp-version>. 
-* Compare with J2EEVersionConstants to determine CMP level
-* This will help differentiate between 2.0,2.1,...   rather than "2.x"
-*/
-public int getCMPVersionID() throws IllegalStateException {
-	J2EEVersionResource res = (J2EEVersionResource) eResource();
-	/* If resource is null we will return based on CMP version....*/
-	if (res == null) {
-		if (getVersion().equals(ContainerManagedEntity.VERSION_1_X))
-			return J2EEVersionConstants.EJB_1_1_ID;
-		return J2EEVersionConstants.EJB_2_0_ID;
-	}
-	int cmpVersion;
-	switch (res.getModuleVersionID()) {
-		case J2EEVersionConstants.EJB_2_0_ID :
-			if (getVersion().equalsIgnoreCase(VERSION_2_X))
-				cmpVersion = J2EEVersionConstants.EJB_2_0_ID;
-			else
-				cmpVersion = J2EEVersionConstants.EJB_1_1_ID;
-			break;
-		case J2EEVersionConstants.EJB_2_1_ID :
-					if (getVersion().equalsIgnoreCase(VERSION_2_X))
-						cmpVersion = J2EEVersionConstants.EJB_2_1_ID;
-					else
-						cmpVersion = J2EEVersionConstants.EJB_1_1_ID;
-					break;
-
-		default :
-			cmpVersion = res.getModuleVersionID();
-	}
-	return cmpVersion;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean#getVersionID()
- */
-public int getVersionID() {
-	return getCMPVersionID();
-}protected List getAvailableRemoteQueryJavaMethods() {
-	return getAvailableQueryJavaMethods(getHomeInterface());
-}
-
-protected List getAvailableQueryJavaMethods(JavaClass home) {
-	if (home == null) return Collections.EMPTY_LIST;
-	List excluded = new ArrayList(1);
-	excluded.add("findByPrimaryKey"); //$NON-NLS-1$
-	return home.getOnlySpecificMethods("find", excluded); //$NON-NLS-1$
-}
-
-protected EClassifier getGeneratedIdType() {
-	if (fGeneratedIdType == null) {
-		fGeneratedIdType = JavaRefFactory.eINSTANCE.reflectType(JAVA_LANG_STRING, this);
-	}
-	return fGeneratedIdType;
-}
-/**
- * Return the keyAttribute with aName.
- * Creation date: (8/8/2000 9:25:27 PM)
- * @return EStructuralFeature
- * @param aName java.lang.String
- */
-public CMPAttribute getKeyAttribute(String aName) {
-	if (aName != null) {
-		Iterator it = getKeyAttributes().iterator();
-		CMPAttribute next;
-		while (it.hasNext()) {
-			next = (CMPAttribute) it.next();
-			if (aName.equals(next.getName()))
-				return next;
-		}
-	}
-	return null;
-}
-/**
- * Return the persistentAttribute with aName.
- * Creation date: (8/8/2000 9:25:27 PM)
- * @return EStructuralFeature
- * @param aName java.lang.String
- */
-public CMPAttribute getPersistentAttribute(String aName) {
-	if (aName != null) {
-		Iterator it = getPersistentAttributes().iterator();
-		CMPAttribute next;
-		while (it.hasNext()) {
-			next = (CMPAttribute) it.next();
-			if (aName.equals(next.getName()))
-				return next;
-		}
-	}
-	return null;
-}
-
-/**
- * If a primary key exists, return the persistent attribute; the primary key is defined as one and only one
- * key attribute, whose type is the same as the key class
- * @deprecated use getPrimKeyField()
- */
-public CMPAttribute getPrimaryKeyAttribute() {
-	return getPrimKeyField();
-}
-
-
-/**
- * isContainerManagedEntity method comment.
- */
-public boolean isContainerManagedEntity() {
-	return true;
-}
-public boolean isKeyAttribute(CMPAttribute anAttribute) {
-	java.util.List attributes = getKeyAttributes();
-	for (int i = 0; i < attributes.size(); i++){
-		if (attributes.get(i) == anAttribute)
-			return true;
-	}
-	return false;
-}
-/*
- * Return whether this bean represents an instance of the "unknown primary key" case
- * described in the specification.  This is identified by the primary key class
- * being specified as "java.lang.Object".
- * In order to deploy an unknown primary key bean, we must substitute a real key,
- * and add a corresponding field.
- */
-public boolean isUnknownPrimaryKey() {
-	String keyName = getPrimaryKeyName();
-	if (keyName == null) return false;
-	//test whether it is unknown or we have the WAS generated key for the unknown prim key
-	boolean genTest = keyName.equals(UNKNOWN_PRIMARY_KEY) || keyName.equals(WAS_GENERATED_STRING_KEY);
-	if (genTest) return true;
-	//Lastly, test for the findByPrimaryKey(Object) method on the home.
-	JavaClass home = getHomeInterface();
-	if (home == null)
-		home = getLocalHomeInterface();
-	if (home == null) return false;
-	List parmType = new ArrayList(1);
-    parmType.add(UNKNOWN_PRIMARY_KEY);
-   	return home.getMethodExtended(FIND_BY_PRIM_KEY_METHOD_NAME, parmType) != null;
-}
-/**
- * isVersion1_X method comment.
- */
-public boolean isVersion1_X() {
-	return getVersion().equals(ContainerManagedEntity.VERSION_1_X);
-}
-/**
- * isVersion2_X method comment.
- */
-public boolean isVersion2_X() {
-	return getVersion().equals(ContainerManagedEntity.VERSION_2_X);
-}
-/* 
- * listPersistentFieldNames - return the names of our CMP fields. derived from persistentFeatures
- */
-public String[] listPersistentFieldNames() {
-	java.util.List attributes = getPersistentAttributes();
-	String[] names = new String[attributes.size()];
-	for (int i = 0; i < attributes.size(); i++) {
-		names[i] = ((CMPAttribute) attributes.get(i)).getName();
-	}
-	return names;
-}
-
-/**
- * Remove the persistentAttribute with the same name as the Field's name.
- * Creation date: (8/3/2000 8:33:01 AM)
- * @param aField org.eclipse.jem.internal.java.Field
- */
-public CMPAttribute removePersistentAttribute(Field aField) {
-	if (aField != null)
-		return removePersistentAttribute(aField.getName());
-	return null;
-}
-/**
- * Remove the persistentAttribute named aName.
- * Creation date: (8/2/2000 8:59:32 PM)
- * @param aName java.lang.String
- */
-public CMPAttribute removePersistentAttribute(String aName) {
-	if (aName != null) {
-		Iterator it = getPersistentAttributes().iterator();
-		CMPAttribute next;
-		while (it.hasNext()) {
-			next = (CMPAttribute) it.next();
-			if (aName.equals(next.getName())) {
-				getPersistentAttributes().remove(next);
-				return next;
-			}
-		}
-	}
-	return null;
-}
-/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the version of an entity bean with container-managed persistence.
-	 * 
-	 * @invariant The cmp-version element must be one of the two following: 1.x , 2.x
-	 * @default 2.x
-	 * Returns "1.x" if in a 1.1 Jar (For compatibility)
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The abstract-schema-name element specifies the name of the abstract schema type of an entity bean with cmp-version 2.x. It is used in EJB QL queries.
-	 * 
-	 * For example, the abstract-schema-name for an entity bean whose local interface is com.acme.commerce.Order might be Order.
-	 * 
-
-	 */
-	public String getAbstractSchemaName() {
-		return abstractSchemaName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAbstractSchemaName(String newAbstractSchemaName) {
-		String oldAbstractSchemaName = abstractSchemaName;
-		abstractSchemaName = newAbstractSchemaName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME, oldAbstractSchemaName, abstractSchemaName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getPersistentAttributes() {
-		if (persistentAttributes == null) {
-			persistentAttributes = new EObjectContainmentEList(CMPAttribute.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES);
-		}
-		return persistentAttributes;
-	}
-
-	/**
-	 * <!-- 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 EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-					return ((InternalEList)getQueries()).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 EjbPackage.CONTAINER_MANAGED_ENTITY__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__ENVIRONMENT_PROPERTIES:
-					return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_REFS:
-					return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_REFS:
-					return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_ENV_REFS:
-					return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_LOCAL_REFS:
-					return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__MESSAGE_DESTINATION_REFS:
-					return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_ROLE_REFS:
-					return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR:
-					return eBasicSetContainer(null, EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_IDENTITY:
-					return basicSetSecurityIdentity(null, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-					return ((InternalEList)getPersistentAttributes()).basicRemove(otherEnd, msgs);
-				case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-					return ((InternalEList)getQueries()).basicRemove(otherEnd, msgs);
-				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 EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.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 EjbPackage.CONTAINER_MANAGED_ENTITY__ICONS:
-				return getIcons();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SMALL_ICON:
-				return getSmallIcon();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LARGE_ICON:
-				return getLargeIcon();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAME:
-				return getDisplayName();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__NAME:
-				return getName();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_CLASS:
-				if (resolve) return getEjbClass();
-				return basicGetEjbClass();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__HOME_INTERFACE:
-				if (resolve) return getHomeInterface();
-				return basicGetHomeInterface();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REMOTE_INTERFACE:
-				if (resolve) return getRemoteInterface();
-				return basicGetRemoteInterface();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_HOME_INTERFACE:
-				if (resolve) return getLocalHomeInterface();
-				return basicGetLocalHomeInterface();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_INTERFACE:
-				if (resolve) return getLocalInterface();
-				return basicGetLocalInterface();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REENTRANT:
-				return isReentrant() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIMARY_KEY:
-				if (resolve) return getPrimaryKey();
-				return basicGetPrimaryKey();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				return getVersion();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				return getAbstractSchemaName();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				return getPersistentAttributes();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				return getKeyAttributes();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				return getQueries();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				return getCMPAttribute();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				if (resolve) return getPrimKeyField();
-				return basicGetPrimKeyField();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_CLASS:
-				return ejbClass != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__HOME_INTERFACE:
-				return homeInterface != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REMOTE_INTERFACE:
-				return remoteInterface != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_HOME_INTERFACE:
-				return localHomeInterface != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_INTERFACE:
-				return localInterface != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REENTRANT:
-				return isSetReentrant();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIMARY_KEY:
-				return primaryKey != null;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				return ABSTRACT_SCHEMA_NAME_EDEFAULT == null ? abstractSchemaName != null : !ABSTRACT_SCHEMA_NAME_EDEFAULT.equals(abstractSchemaName);
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				return persistentAttributes != null && !persistentAttributes.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				return keyAttributes != null && !keyAttributes.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				return queries != null && !queries.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				return cmpAttribute != null && !cmpAttribute.isEmpty();
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				return primKeyField != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_CLASS:
-				setEjbClass((JavaClass)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__HOME_INTERFACE:
-				setHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REENTRANT:
-				setReentrant(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIMARY_KEY:
-				setPrimaryKey((JavaClass)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				setVersion((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				setAbstractSchemaName((String)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				getPersistentAttributes().clear();
-				getPersistentAttributes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				getKeyAttributes().clear();
-				getKeyAttributes().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				getQueries().clear();
-				getQueries().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				getCMPAttribute().clear();
-				getCMPAttribute().addAll((Collection)newValue);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				setPrimKeyField((CMPAttribute)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_CLASS:
-				setEjbClass((JavaClass)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__HOME_INTERFACE:
-				setHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__REENTRANT:
-				unsetReentrant();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIMARY_KEY:
-				setPrimaryKey((JavaClass)null);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME:
-				setAbstractSchemaName(ABSTRACT_SCHEMA_NAME_EDEFAULT);
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES:
-				getPersistentAttributes().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES:
-				getKeyAttributes().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES:
-				getQueries().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE:
-				getCMPAttribute().clear();
-				return;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD:
-				setPrimKeyField((CMPAttribute)null);
-				return;
-		}
-		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(" (version: "); //$NON-NLS-1$
-		result.append(version);
-		result.append(", abstractSchemaName: "); //$NON-NLS-1$
-		result.append(abstractSchemaName);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getKeyAttributesGen() {	    
-		if (keyAttributes == null) {
-			keyAttributes = new EObjectResolvingEList(CMPAttribute.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES);			
-		}
-		return keyAttributes;
-	}
-	
-	public EList getKeyAttributes() {
-	    if(keyAttributes == null) {
-		    CMPKeySynchronizationAdapter syncAdapter = (CMPKeySynchronizationAdapter)  EcoreUtil.getExistingAdapter(this, CMPKeySynchronizationAdapter.ADAPTER_TYPE);
-			if(syncAdapter != null) 
-			    syncAdapter.initializeKeyAttributes(); 
-	    }
-		return getKeyAttributesGen();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getQueries() {
-		if (queries == null) {
-			queries = new EObjectContainmentWithInverseEList(Query.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES, EjbPackage.QUERY__ENTITY);
-		}
-		return queries;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getCMPAttribute() {
-		if (cmpAttribute == null) {
-			cmpAttribute = new EObjectResolvingEList(CMPAttribute.class, this, EjbPackage.CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE);
-		}
-		return cmpAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMPAttribute getPrimKeyField() { 	    
-	    
-		if (primKeyField != null && primKeyField.eIsProxy()) {
-			CMPAttribute oldPrimKeyField = primKeyField;
-			primKeyField = (CMPAttribute)eResolveProxy((InternalEObject)primKeyField);
-			if (primKeyField != oldPrimKeyField) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD, oldPrimKeyField, primKeyField));
-			}
-		}
-		return primKeyField;
-	}
-
-	public void makePrimKeyFieldProxy() {
-		if (primKeyField == null) return;
-		String fieldName = primKeyField.getName();
-		if (fieldName == null) fieldName = ""; //$NON-NLS-1$
-		primKeyField = EjbFactory.eINSTANCE.createCMPAttribute();
-		((InternalEObject)primKeyField).eSetProxyURI(URI.createURI(fieldName));
-		
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CMPAttribute basicGetPrimKeyField() {
-		return primKeyField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPrimKeyField(CMPAttribute newPrimKeyField) {
-		CMPAttribute oldPrimKeyField = primKeyField;
-		primKeyField = newPrimKeyField;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD, oldPrimKeyField, primKeyField));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getCMRFields()
-	 */
-	public List getCMRFields() {
-		List myRoles = getRoles();
-		List cmrFields = Collections.EMPTY_LIST;
-		if (myRoles != null && !myRoles.isEmpty()) {
-			cmrFields = new ArrayList();
-			Iterator i = myRoles.iterator();
-			while (i.hasNext()) {
-				EJBRelationshipRole role = (EJBRelationshipRole) i.next();
-				CMRField field = role.getCmrField();
-				if (field != null)
-					cmrFields.add(field);
-			}
-		}
-		return cmrFields;
-	}
-
-	public boolean isSelfReferencing(EJBRelation rel) {
-		if (rel.getSecondRole() == null)
-			return false;
-		return (rel.getFirstRole().getSourceEntity() == this) &&
-			(rel.getSecondRole().getSourceEntity() == this);
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getRoles()
-	 */
-	public List getRoles() {
-		if (getEjbJar() == null)
-			return Collections.EMPTY_LIST;
-		List allRoles = getEjbJar().getEjbRelations();
-		List myRoles = Collections.EMPTY_LIST;
-		if (allRoles != null && !allRoles.isEmpty()) {
-			myRoles = new ArrayList();
-			Iterator i = allRoles.iterator();
-			while (i.hasNext()) {
-				EJBRelation rel = (EJBRelation) i.next();
-				EJBRelationshipRole role = rel.getFirstRole();
-				if (isSelfReferencing(rel)) {
-					myRoles.add(rel.getFirstRole());
-					myRoles.add(rel.getSecondRole());
-				}
-				else if ((role != null) && role.getSourceEntity() == this) {
-					myRoles.add(role);
-				} else {
-					role = rel.getSecondRole();
-					if ((role != null) && (role.getSourceEntity() == this))
-						myRoles.add(role);
-				}
-			}
-		}
-		return myRoles;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ContainerManagedEntity#getRole(java.lang.String)
-	 */
-	public CommonRelationshipRole getRole(String roleName) {
-		List roles = getRoles();
-		for (int i=0; i<roles.size(); i++) {
-			CommonRelationshipRole role = (CommonRelationshipRole)roles.get(i);
-			if (role.getName().equals(roleName))
-				return role;
-		}
-		return null;
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJB20FlattenedRoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJB20FlattenedRoleShapeStrategy.java
deleted file mode 100644
index 16bb023..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJB20FlattenedRoleShapeStrategy.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.IRoleShapeStrategy;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-/**
- * Insert the type's description here.
- * Creation date: (11/6/2000 11:41:33 AM)
- * @author: Administrator
- */
-public class EJB20FlattenedRoleShapeStrategy extends RoleShapeStrategy {
-	/**
-	 * FlattenedRoleShapeStrategy constructor comment.
-	 */
-	public EJB20FlattenedRoleShapeStrategy(CommonRelationshipRole aRole) {
-		super(aRole);
-	}
-	protected boolean canContinue() {
-		return !busy && role.getName() != null && (role.isForward() ||
-			(role.isMany() && (role.getOppositeAsCommonRole() == null ||
-			role.getOppositeAsCommonRole().isMany())));
-	}
-	
-	public boolean usesAttributeNamed(String attributeName) {
-		if (attributeName != null) {
-			int index = attributeName.indexOf(IRoleShapeStrategy.ATTRIBUTE_NAME_JOINER);
-			String name = attributeName.substring(0, index);
-			return getRole().getName().equals(name);
-		}
-		return false;
-	}
-
-	/**
-	 * @see RoleShapeStrategy#reconcileAttributes(CommonRelationshipRole, String, List, List)
-	 */
-	protected void reconcileAttributes(CommonRelationshipRole aRole, String attributeName, List aList, List computedNames) {
-		
-		Resource res = aRole.eResource();
-		boolean dirtyFlag = res != null ? res.isModified() : false;
-		try {		
-			if (aRole.getOppositeAsCommonRole() != null) {
-				ContainerManagedEntity entity = aRole.getOppositeAsCommonRole().getSourceEntity();
-		//	ContainerManagedEntityExtension roleType = (ContainerManagedEntityExtension)getTypeExtension(aRole);
-			if (entity != null)
-				collectAttributes(entity, attributeName, aList, computedNames);
-		}
-		} finally {
-			if (res != null)
-				res.setModified(dirtyFlag);
-		}
-	}
-
-	/**
-	 * @see com.ibm.ejs.models.base.extensions.ejbext.impl.FlattenedRoleShapeStrategy#setDerivedAttributeType(CMPAttribute, JavaHelpers)
-	 */
-	protected void setDerivedAttributeType(CMPAttribute attribute, CMPAttribute targetAttribute, boolean isNew) {
-		if (targetAttribute == null) return;
-		JavaHelpers fieldType = targetAttribute.getType();
-		if (fieldType != null) {
-			int singleRoleNameSize = getRole().getName().length() + targetAttribute.getName().length() + 1; //one for the underscore
-			if (!(attribute.getName().length() > singleRoleNameSize)) //don't set the originating type since we are derived from another derived attribute
-				attribute.setOriginatingType(fieldType);
-			attribute.setEType(fieldType.getWrapper());
-		}
-		if (isNew && !getRole().isKey())
-			attribute.setDerived(true);
-	}
-	/**
-	 * getFields method comment.
-	 */
-	protected void collectAttributes(ContainerManagedEntity type, String attributeName, List aList, List computedNames) {
-		collectKeyModelledAttributes(type, attributeName, aList, computedNames);
-		collectKeyRoleAttributes(type, attributeName, aList, computedNames);
-	}
-	/**
-	 * 
-	 */
-	protected void collectAttributes(CMPAttribute type, String attributeName, List aList, List computedNames) {
-		boolean isNewAttribute = false;
-		attributeName = appendName(attributeName, type.getName());
-		computedNames.add(attributeName);
-		CMPAttribute attribute = getCMPEntity().getPersistentAttribute(attributeName);
-		if (attribute == null) {
-			attribute = createPersistentAttribute(attributeName);
-			isNewAttribute = true;
-		}
-		//This is necessary for code generation
-		ContainerManagedEntity entity = (ContainerManagedEntity) type.eContainer();
-		if (entity != null)
-			setDerivedAttributeType(attribute, type, isNewAttribute);
-		if (isNewAttribute) {
-			if (getRole().isKey())
-				getCMPEntity().getKeyAttributes().add(attribute);
-			aList.add(attribute);
-			getCMPEntity().getPersistentAttributes().add(attribute);
-		} else {
-			if (!aList.contains(attribute))
-				aList.add(attribute);
-		}
-	}
-	protected CMPAttribute createPersistentAttribute(String aName) {
-		CMPAttribute attribute = ((EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory().createCMPAttribute();
-		attribute.setName(aName);
-		attribute.setDescription("Generated to support relationships.  Do NOT delete.");
-		return attribute;
-	}
-	/**
-	 * getFields method comment.
-	 */
-	protected void collectKeyModelledAttributes(ContainerManagedEntity entity, String attributeName, List aList, List computedNames) {
-		java.util.Iterator it = entity.getFilteredFeatures(ModelledKeyAttributeFilter.singleton()).iterator();
-		CMPAttribute attribute;
-		while (it.hasNext()) {
-			attribute = (CMPAttribute) it.next();
-			collectAttributes(attribute, attributeName, aList, computedNames);
-		}
-	}
-	/**
-	 * getFields method comment.
-	 */
-	protected void collectKeyRoleAttributes(ContainerManagedEntity entity, String attributeName, List aList, List computedNames) {
-		if(visitedKeyTypes.contains(entity)){
-			throw new RuntimeException("Key role cycle detected");
-		}
-		visitedKeyTypes.add(entity);
-		java.util.Iterator it = entity.getFilteredFeatures(KeyRelationshipRoleFilter.singleton()).iterator();
-		CommonRelationshipRole aRole;
-		while (it.hasNext()) {
-			aRole = (CommonRelationshipRole) it.next();
-			String attName = appendName(attributeName, aRole.getName());
-			reconcileAttributes(aRole, attName, aList, computedNames);
-		}
-	}
-	protected ContainerManagedEntity getCMPEntity() {
-		return getRole().getSourceEntity();
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarImpl.java
deleted file mode 100644
index e00b3d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarImpl.java
+++ /dev/null
@@ -1,817 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.common.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-/**
- * The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file
- * name; mandatory structural information about all included enterprise beans; a descriptor for container managed relationships, if any; an optional application-assembly descriptor; and an optional name of an ejb-client-jar file for the ejb-jar.
- */
-public class EJBJarImpl extends CompatibilityDescriptionGroupImpl implements EJBJar {
-
-	/**
-	 * The default value of the '{@link #getEjbClientJar() <em>Ejb Client Jar</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbClientJar()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_CLIENT_JAR_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String ejbClientJar = EJB_CLIENT_JAR_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AssemblyDescriptor assemblyDescriptor = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList enterpriseBeans = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Relationships relationshipList = null;
-	public EJBJarImpl() {
-		super();
-//		setRefId(com.ibm.etools.archive.ArchiveConstants.EJBJAR_ID);
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getEJBJar();
-	}
-
-/**
- * Return true if there are any ContainerManagedEntity beans in this jar.
- */
-public boolean containsContainerManagedBeans() {
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity())
-			return true;
-	}
-	return false;
-}
-/**
- * @see org.eclipse.jst.j2ee.internal.ejb.EJBJar
- */
-public boolean containsSecurityRole(java.lang.String name) {
-	AssemblyDescriptor ad = getAssemblyDescriptor();
-	return (ad != null) && (ad.getSecurityRoleNamed(name) != null);
-}
-/**
- * Return List of BMP beans in this jar.
- * @return java.util.List
- */
-public List getBeanManagedBeans() {
-	List allBeans, beans;
-	allBeans = getEnterpriseBeans();
-	int size = allBeans.size();
-	beans = new ArrayList(size);
-	EnterpriseBean ejb;
-	for (int i = 0; i < size; i++) {
-		ejb = (EnterpriseBean) allBeans.get(i);
-		if (ejb.isBeanManagedEntity())
-			beans.add(ejb);
-	}
-	return beans;
-}
-/**
- * Return List of ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-public List getContainerManagedBeans() {
-	List cmps = new ArrayList(getEnterpriseBeans().size());
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity())
-			cmps.add(ejb);
-	}
-	return cmps;
-}
-
-/**
- * Return List of EJB 1.1 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-public List getEJB11ContainerManagedBeans() {
-	List cmps = new ArrayList(getEnterpriseBeans().size());
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity() && ejb.getVersionID() <= J2EEVersionConstants.EJB_1_1_ID)
-			cmps.add(ejb);
-	}
-	return cmps;
-}
-
-/**
- * Return List of EJB 2.0 ContainerManagedEntity beans in this jar.
- * @return java.util.List
- */
-public List getEJB20ContainerManagedBeans() {
-	List cmps = new ArrayList(getEnterpriseBeans().size());
-	Iterator it = getEnterpriseBeans().iterator();
-	EnterpriseBean ejb;
-	while (it.hasNext()) {
-		ejb = (EnterpriseBean)it.next();
-		if (ejb.isEntity() && ((Entity)ejb).isContainerManagedEntity() && ejb.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID)
-			cmps.add(ejb);
-	}
-	return cmps;
-}
-	/*
-	 * @see EJBJar#getMessageDrivenBeans()
-	 */
-	public List getMessageDrivenBeans() {
-		List ejbs = getEnterpriseBeans();
-		int size = ejbs.size();
-		List mdbs = new ArrayList(size);
-		EnterpriseBean ejb;
-		for (int i = 0; i < size; i++) {
-			ejb = (EnterpriseBean)ejbs.get(i);
-			if (ejb.isMessageDriven())
-				mdbs.add(ejb);
-		}
-		return mdbs;
-	}
-/**
- * @return The list of EjbRelations references
- * A list of ejb-relation elements, which specify the container managed relationships.
- */
-public List getEjbRelations() {
-	return getRelationshipList() == null ? null : getRelationshipList().getEjbRelations();
-}
-/**
- * Return an enterprise bean referenced by the EjbRef, if one exists.  The ejb-link value
- * of the ref must equate to a named enterprise bean contained in the jar; otherwise return
- * null
- */
-public EnterpriseBean getEnterpiseBeanFromRef(EjbRef ref) {
-	String link = ref.getLink();
-	if (link == null) {
-		return null;
-	}
-	return getEnterpriseBeanNamed(link);
-}
-public EnterpriseBean getEnterpriseBeanNamed(String ejbName) {
-	if (ejbName == null)
-		return null;
-	EList beans = getEnterpriseBeans();
-	EnterpriseBean bean;
-	for (int i = 0; i < beans.size(); i++) {
-		bean = (EnterpriseBean) beans.get(i);
-		if (ejbName.equals(bean.getName()))
-			return bean;
-	}
-	return null;
-}
-/**
- * Return ALL EnterpriseBean(s) that are referencing @aJavaClass as a
- * home, remote, bean class, or key class.
- */
-public java.util.List getEnterpriseBeansWithReference(JavaClass aJavaClass) {
-	List beans = getEnterpriseBeans();
-	List result = new ArrayList();
-	EnterpriseBean bean = null;
-	for (int i = 0; i < beans.size(); i++){
-		bean = (EnterpriseBean) beans.get(i);
-		if (bean.hasJavaReference(aJavaClass))
-			result.add(bean);
-	}
-	return result;
-}
-/**
- * Return the *FIRST* EnterpriseBean that is referencing @aJavaClass as its
- * home, remote, bean class, or key class.
- */
-public EnterpriseBean getEnterpriseBeanWithReference(JavaClass aJavaClass) {
-	List beans = getEnterpriseBeans();
-	EnterpriseBean bean = null;
-	for (int i = 0; i < beans.size(); i++){
-		bean = (EnterpriseBean) beans.get(i);
-		if (bean.hasJavaReference(aJavaClass))
-			return bean;
-	}
-	return null;
-}
-/**
- * Return List of Session beans in this jar.
- * @return java.util.List
- */
-public List getSessionBeans() {
-	List allBeans, beans;
-	allBeans = getEnterpriseBeans();
-	int size = allBeans.size();
-	beans = new ArrayList(size);
-	EnterpriseBean ejb;
-	for (int i = 0; i < size; i++) {
-		ejb = (EnterpriseBean) allBeans.get(i);
-		if (ejb.isSession())
-			beans.add(ejb);
-	}
-	return beans;
-}
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 1.1 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion1_1Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	EJBResource ejbRes = (EJBResource) eResource();
-	return ejbRes.isEJB1_1();
-}
-/**
- * Return boolean indicating if this EJB JAR was populated from an EJB 2.0 descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_0Descriptor()  {
-	CommonUtil.checkDDObjectForVersion(this);
-	EJBResource ejbRes = (EJBResource) eResource();
-	return ejbRes.isEJB2_0();
-}
-/**
- * @see org.eclipse.jst.j2ee.internal.ejb.EJBJar
- */
-public void renameSecurityRole(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	AssemblyDescriptor ad = getAssemblyDescriptor();
-	if (ad != null)
-		ad.renameSecurityRole(existingRoleName, newRoleName);
-	List ejbs = getEnterpriseBeans();
-	for (int i = 0; i < ejbs.size(); i++) {
-		EnterpriseBean ejb = (EnterpriseBean) ejbs.get(i);
-		ejb.reSyncSecurityRoleRef(existingRoleName, newRoleName);
-	}
-}
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The optional ejb-client-jar element specifies a JAR file that contains the class files necessary for a client program to access the enterprise beans in the ejb-jar file. The Deployer should make the ejb-client JAR file accessible to the client's class-loader.  Example:<ejb-client-jar>employee_service_client.jar<//ejb-client-jar>
-
-	 */
-	public String getEjbClientJar() {
-		return ejbClientJar;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbClientJar(String newEjbClientJar) {
-		String oldEjbClientJar = ejbClientJar;
-		ejbClientJar = newEjbClientJar;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__EJB_CLIENT_JAR, oldEjbClientJar, ejbClientJar));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource ejbRes = (J2EEVersionResource) eResource();
-		if (ejbRes == null) {
-			// fix defect 3276, when resource is unloaded
-			if (version == null) 
-				throw new IllegalStateException();
-			if (version.equals("2.1")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_2_1_ID;
-			if (version.equals("2.0")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_2_0_ID;
-			if (version.equals("1.1")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_1_1_ID;
-			if (version.equals("1.0")) //$NON-NLS-1$
-				return J2EEVersionConstants.EJB_1_0_ID;
-		}
-		return ejbRes.getModuleVersionID();
-	}
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException("XMLResource is null");
-		return res.getJ2EEVersionID();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AssemblyDescriptor getAssemblyDescriptor() {
-		return assemblyDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor, NotificationChain msgs) {
-		AssemblyDescriptor oldAssemblyDescriptor = assemblyDescriptor;
-		assemblyDescriptor = newAssemblyDescriptor;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, oldAssemblyDescriptor, newAssemblyDescriptor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor) {
-		if (newAssemblyDescriptor != assemblyDescriptor) {
-			NotificationChain msgs = null;
-			if (assemblyDescriptor != null)
-				msgs = ((InternalEObject)assemblyDescriptor).eInverseRemove(this, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, AssemblyDescriptor.class, msgs);
-			if (newAssemblyDescriptor != null)
-				msgs = ((InternalEObject)newAssemblyDescriptor).eInverseAdd(this, EjbPackage.ASSEMBLY_DESCRIPTOR__EJB_JAR, AssemblyDescriptor.class, msgs);
-			msgs = basicSetAssemblyDescriptor(newAssemblyDescriptor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, newAssemblyDescriptor, newAssemblyDescriptor));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The enterprise-beans element contains the declarations of one or more
-	 * enterprise beans.
-	 */
-	public EList getEnterpriseBeans() {
-		if (enterpriseBeans == null) {
-			enterpriseBeans = new EObjectContainmentWithInverseEList(EnterpriseBean.class, this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EjbPackage.ENTERPRISE_BEAN__EJB_JAR);
-		}
-		return enterpriseBeans;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The relationships collection describes the relationships in which container managed persistence entity beans and dependent objects participate. The relationships element contains an optional description; a list of ejb-entity-ref elements (references to entity beans that participate in container managed relationships but whose abstract persistence schemas are not included in the ejb-jar file);
-	 * and a list of ejb-relation elements, which specify the container managed relationships.
-	 */
-	public Relationships getRelationshipList() {
-		return relationshipList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRelationshipList(Relationships newRelationshipList, NotificationChain msgs) {
-		Relationships oldRelationshipList = relationshipList;
-		relationshipList = newRelationshipList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, oldRelationshipList, newRelationshipList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRelationshipList(Relationships newRelationshipList) {
-		if (newRelationshipList != relationshipList) {
-			NotificationChain msgs = null;
-			if (relationshipList != null)
-				msgs = ((InternalEObject)relationshipList).eInverseRemove(this, EjbPackage.RELATIONSHIPS__EJB_JAR, Relationships.class, msgs);
-			if (newRelationshipList != null)
-				msgs = ((InternalEObject)newRelationshipList).eInverseAdd(this, EjbPackage.RELATIONSHIPS__EJB_JAR, Relationships.class, msgs);
-			msgs = basicSetRelationshipList(newRelationshipList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, newRelationshipList, newRelationshipList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-					if (assemblyDescriptor != null)
-						msgs = ((InternalEObject)assemblyDescriptor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR, null, msgs);
-					return basicSetAssemblyDescriptor((AssemblyDescriptor)otherEnd, msgs);
-				case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-					return ((InternalEList)getEnterpriseBeans()).basicAdd(otherEnd, msgs);
-				case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-					if (relationshipList != null)
-						msgs = ((InternalEObject)relationshipList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_JAR__RELATIONSHIP_LIST, null, msgs);
-					return basicSetRelationshipList((Relationships)otherEnd, msgs);
-				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 EjbPackage.EJB_JAR__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case EjbPackage.EJB_JAR__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-					return basicSetAssemblyDescriptor(null, msgs);
-				case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-					return ((InternalEList)getEnterpriseBeans()).basicRemove(otherEnd, msgs);
-				case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-					return basicSetRelationshipList(null, msgs);
-				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 EjbPackage.EJB_JAR__ICONS:
-				return getIcons();
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.EJB_JAR__SMALL_ICON:
-				return getSmallIcon();
-			case EjbPackage.EJB_JAR__LARGE_ICON:
-				return getLargeIcon();
-			case EjbPackage.EJB_JAR__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.EJB_JAR__DISPLAY_NAME:
-				return getDisplayName();
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				return getEjbClientJar();
-			case EjbPackage.EJB_JAR__VERSION:
-				return getVersion();
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor();
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return getEnterpriseBeans();
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				return getRelationshipList();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_JAR__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.EJB_JAR__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case EjbPackage.EJB_JAR__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case EjbPackage.EJB_JAR__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.EJB_JAR__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				return EJB_CLIENT_JAR_EDEFAULT == null ? ejbClientJar != null : !EJB_CLIENT_JAR_EDEFAULT.equals(ejbClientJar);
-			case EjbPackage.EJB_JAR__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				return assemblyDescriptor != null;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				return enterpriseBeans != null && !enterpriseBeans.isEmpty();
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				return relationshipList != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_JAR__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				setEjbClientJar((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__VERSION:
-				setVersion((String)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)newValue);
-				return;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				getEnterpriseBeans().clear();
-				getEnterpriseBeans().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_JAR__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.EJB_JAR__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.EJB_JAR__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.EJB_JAR__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__EJB_CLIENT_JAR:
-				setEjbClientJar(EJB_CLIENT_JAR_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case EjbPackage.EJB_JAR__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)null);
-				return;
-			case EjbPackage.EJB_JAR__ENTERPRISE_BEANS:
-				getEnterpriseBeans().clear();
-				return;
-			case EjbPackage.EJB_JAR__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)null);
-				return;
-		}
-		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(" (ejbClientJar: "); //$NON-NLS-1$
-		result.append(ejbClientJar);
-		result.append(", version: "); //$NON-NLS-1$
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-	public EJBRelationshipRole getRelationshipRole(String aRoleName, ContainerManagedEntity sourceCMP) {
-		if (aRoleName == null || sourceCMP == null) return null;
-		EJBRelationshipRole role = null;
-		if (getRelationshipList() != null) {
-			List relations = getRelationshipList().getEjbRelations();
-			int size = relations.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) relations.get(i);
-				role = rel.getRelationshipRole(aRoleName);
-				if (role != null && role.getSourceEntity() == sourceCMP)
-					return role;				
-			}
-		}
-		return null;
-	}
-	
-	public EJBRelation getEJBRelation(String aRelationName) {
-		Relationships relList = getRelationshipList();
-		if (relList != null) {
-			List rels = relList.getEjbRelations();
-			int size = rels.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) rels.get(i);
-				if (rel == null) continue;
-				if (aRelationName.equals(rel.getName()))
-					return rel;
-			}
-		}
-		return null;
-	}
-	/**
-	 * @see EJBJar#getEJBRelationsForSource(ContainerManagedEntity)
-	 */
-	public List getEJBRelationsForSource(ContainerManagedEntity cmp) {
-		Relationships relList = getRelationshipList();
-		List result = null;
-		if (relList != null) {
-			List rels = relList.getEjbRelations();
-			int size = rels.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) rels.get(i);
-				if (rel == null) continue;
-				List roles = rel.getRelationshipRoles();
-				EJBRelationshipRole role;
-				for (int j = 0; j < roles.size(); j++) {
-					role = (EJBRelationshipRole) roles.get(j);
-					if (role.getSourceEntity() == cmp) {
-						if (result == null)
-							result = new ArrayList();
-						result.add(rel);
-						break;
-					}
-				}
-			}
-		}
-		if (result == null)
-			result = Collections.EMPTY_LIST;
-		return result;
-	}
-	
-	public List getEJBRelationshipRolesForType(ContainerManagedEntity cmp) {
-		Relationships relList = getRelationshipList();
-		List result = null;
-		if (relList != null) {
-			List rels = relList.getEjbRelations();
-			int size = rels.size();
-			EJBRelation rel = null;
-			for (int i = 0; i < size; i++) {
-				rel = (EJBRelation) rels.get(i);
-				if (rel == null) continue;
-				List roles = rel.getRelationshipRoles();
-				EJBRelationshipRole role;
-				for (int j = 0; j < roles.size(); j++) {
-					role = (EJBRelationshipRole) roles.get(j);
-					if (cmp.equals(((CommonRelationshipRole) role).getTypeEntity())) {
-						if (result == null)
-							result = new ArrayList();
-						result.add(role);
-						break;
-					}
-				}
-			}
-		}
-		if (result == null)
-			result = Collections.EMPTY_LIST;
-		return result;
-	}
-
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarResourceFactory.java
deleted file mode 100644
index 67387a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBJarResourceFactory.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-/**
- * @author schacher
- */
-public class EJBJarResourceFactory extends TranslatorResourceFactory {
-	
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJBJAR_SYSTEMID_1_1, "ejb-jar_1_1.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJBJAR_SYSTEMID_2_0, "ejb-jar_2_0.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.EJB_JAR_SCHEMA_LOC_2_1, "ejb-jar_2_1.xsd"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param aRendererFactory
-	 */
-	public EJBJarResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new EJBResourceImpl(uri, aRenderer);
-	}
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(aRendererFactory));
-	}
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.EJBJAR_DD_URI_OBJ);
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(J2EEConstants.EJBJAR_DD_SHORT_NAME, new EJBJarResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBMethodCategoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBMethodCategoryImpl.java
deleted file mode 100644
index 1037003..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBMethodCategoryImpl.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.internal.ejb.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-/**
- * The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD, EJBFINDERMETHOD, EJBREMOTEMETHOD.
- */
-public class EJBMethodCategoryImpl extends EObjectImpl implements EJBMethodCategory, EObject {
-
-	public EJBMethodCategoryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getEJBMethodCategory();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationImpl.java
deleted file mode 100644
index 6e383d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationImpl.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.CommonRelationship;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * The ejb-relation element describes a relationship between two entity beans with container managed persistence. An ejb-relation element contains a description; an optional ejb-relation-name element; and exactly two relationship role declarations, defined by the ejb-relationship-roles. The name of the relationship, if specified, is unique within the ejb-jar file.
- * 
- * @invariant The name of the relationship, if specified, is unique within the ejb-jar file.
- * @invariant self.relationshipRoles.size == 2
- * @invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name
- * 
- * @migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under ejbext::EJBJarExtension
- * @migration EJB1.1 added optional attribute, description:String
- * @migration EJB1.1 added optional attribute, name:String (May have been inherited from EObject previously)
- */
-public class EJBRelationImpl extends EObjectImpl implements EJBRelation, EObject, CommonRelationship{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList relationshipRoles = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public EJBRelationImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getEJBRelation();
-	}
-
-public boolean containsRelationshipRole(EJBRelationshipRole aRole) {
-	return getRelationshipRoles().contains(aRole);
-}
-/**
- * Return the roles.
- */
-public EList getCommonRoles() {
-	return getRelationshipRoles();
-}
-/**
- * Return the first role.
- */
-public CommonRelationshipRole getFirstCommonRole() {
-	return getFirstRole();
-}
-/**
- * Return the first role.
- */
-public EJBRelationshipRole getFirstRole() {
-	List list = getRelationshipRoles();
-	if (list.size() == 0)
-		return null;
-	return (EJBRelationshipRole) list.get(0);
-}
-/**
- * Return the other role.
- */
-public EJBRelationshipRole getOppositeRole(EJBRelationshipRole aRole) {
-	if (aRole != null) {
-		if (aRole == getFirstRole())
-			return getSecondRole();
-		if (aRole == getSecondRole())
-			return getFirstRole();
-	}
-	return null;
-}
-/**
- * Return the first role.
- */
-public CommonRelationshipRole getSecondCommonRole() {
-	return getSecondRole();
-}
-/**
- * Return the second role.
- */
-public EJBRelationshipRole getSecondRole() {
-	List list = getRelationshipRoles();
-	if (list.size() < 2)
-		return null;
-	return (EJBRelationshipRole) list.get(1);
-}
-/**
- * Set the forward role.  Implemented by ensuring that the passed role is the first role 
- * which is the "tiebreaker" in case of unclear relationships, such as 1:1.
- */
-public void setFoward(EJBRelationshipRole aRole) {
-	
-	EList roles = getRelationshipRoles();
-	int currentIndex = roles.indexOf(aRole);
-	if (currentIndex != 0) {
-		if (currentIndex > -1)
-			roles.move(0, aRole);
-		else
-			roles.set(0, aRole);
-	}
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the ejb relation.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The name of the relationship. If specified, must be unique within the ejb-jar file.
-	 * @invariant self.name unique within Set<collect(ejbJar.ejbRelations.name)>
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Relationships getRelationshipList() {
-		if (eContainerFeatureID != EjbPackage.EJB_RELATION__RELATIONSHIP_LIST) return null;
-		return (Relationships)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRelationshipList(Relationships newRelationshipList) {
-		if (newRelationshipList != eContainer || (eContainerFeatureID != EjbPackage.EJB_RELATION__RELATIONSHIP_LIST && newRelationshipList != null)) {
-			if (EcoreUtil.isAncestor(this, newRelationshipList))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRelationshipList != null)
-				msgs = ((InternalEObject)newRelationshipList).eInverseAdd(this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS, Relationships.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newRelationshipList, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST, newRelationshipList, newRelationshipList));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A collection containing exactly two relationship roles.
-	 * 
-	 * @migration EJB1.1 Containment used to be by reference on relation--now by value.
-
-	 */
-	public EList getRelationshipRoles() {
-		if (relationshipRoles == null) {
-			relationshipRoles = new EObjectContainmentWithInverseEList(EJBRelationshipRole.class, this, EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP);
-		}
-		return relationshipRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST, msgs);
-				case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-					return ((InternalEList)getRelationshipRoles()).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 EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-					return eBasicSetContainer(null, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST, msgs);
-				case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-					return ((InternalEList)getRelationshipRoles()).basicRemove(otherEnd, msgs);
-				case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-					return eContainer.eInverseRemove(this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS, Relationships.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 EjbPackage.EJB_RELATION__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.EJB_RELATION__NAME:
-				return getName();
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				return getRelationshipList();
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				return getRelationshipRoles();
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_RELATION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.EJB_RELATION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				return getRelationshipList() != null;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				return relationshipRoles != null && !relationshipRoles.isEmpty();
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_RELATION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				getRelationshipRoles().clear();
-				getRelationshipRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_RELATION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_LIST:
-				setRelationshipList((Relationships)null);
-				return;
-			case EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES:
-				getRelationshipRoles().clear();
-				return;
-			case EjbPackage.EJB_RELATION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	public EJBRelationshipRole getRelationshipRole(String aRoleName) {
-		if (aRoleName == null) return null;
-		List roles = getRelationshipRoles();
-		EJBRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (EJBRelationshipRole) roles.get(i);
-			if (aRoleName.equals(role.getName()))
-				return role;
-		}
-		return null;
-	}		
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java
deleted file mode 100644
index 71190ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java
+++ /dev/null
@@ -1,1011 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.lang.reflect.Constructor;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.CommonRelationship;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.IRoleShapeStrategy;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.wst.common.internal.emf.utilities.IDUtil;
-/**
- * The ejb-relationship-role element describes a role within a relationship.
- * There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is "not aware" of the relationship.
- * 
- * @invariant multiplicity != null
- * @invariant roleSource != null
- * @invariant Cascade delete can only be specified in an EJBRelationshipRole element in which the roleSource element specifies a dependent object class. 
- * @invariant Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBRelation in which the other EJBRelationshipRole element specifies a multiplicity of One.
- * 
- * Example:
- * <ejb-relation>
- *   <ejb-relation-name>Product-LineItem<//ejb-relation-name>
- *   <ejb-relationship-role>
- *     <ejb-relationship-role-name>product-has-lineitems<//ejb-relationship-role-name>
- *     <multiplicity>One<//multiplicity>
- *     <relationship-role-source>
- *       <ejb-name>ProductEJB<//ejb-name>
- *     <//relationship-role-source>
- *   <//ejb-relationship-role>
- * ...
- */
-public class EJBRelationshipRoleImpl extends EObjectImpl implements EJBRelationshipRole, EObject, CommonRelationshipRole {
-
-
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	protected static final EList EMPTY_ELIST = new org.eclipse.emf.common.util.BasicEList(0);
-
-	// Need to cache the computed attributes so that they maintain identity
-	protected EList fAttributes = null;
-	protected String fName = null;
-	protected IRoleShapeStrategy roleShapeStrategy;
-	private static final String ROLE_STRATEGY_CLASS_NAME = "org.eclipse.jst.j2ee.internal.ejb.impl.EJB20FlattenedRoleShapeStrategy"; //$NON-NLS-1$
-	private static final String COMMON_ROLE_CLASS_NAME = "org.eclipse.jst.j2ee.ejb.CommonRelationshipRole"; //$NON-NLS-1$
-	private static Class COMMON_ROLE_CLASS;
-	private static Class ROLE_STRATEGY_CLASS;
-	private static Constructor ROLE_STRATEGY_CONSTRUCTOR;
-	private static final String NAME_SUFFIX = "Inverse"; //$NON-NLS-1$
-    
-	private boolean toStringGuard;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMultiplicity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MultiplicityKind MULTIPLICITY_EDEFAULT = MultiplicityKind.ONE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected MultiplicityKind multiplicity = MULTIPLICITY_EDEFAULT;
-	/**
-	 * This is true if the Multiplicity attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean multiplicityESet = false;
-
-	/**
-	 * The default value of the '{@link #isCascadeDelete() <em>Cascade Delete</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCascadeDelete()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CASCADE_DELETE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean cascadeDelete = CASCADE_DELETE_EDEFAULT;
-	/**
-	 * This is true if the Cascade Delete attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean cascadeDeleteESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected RoleSource source = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected CMRField cmrField = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	private boolean wasForward = false;
-	private boolean wasMany = false;
-    
-	private boolean isKeySet = false;
-	private boolean key = false;
-	
-	private transient Boolean required = null;
-
-	public EJBRelationshipRoleImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getEJBRelationshipRole();
-	}
-
-	/**
-	 * Return the persistentAttributes from my Entity that are used
-	 * by this role.
-	 */
-	
-	public EList getAttributes() {
-		if (fAttributes == null) {
-			fAttributes = new BasicEList(1);
-		}
-		if (fAttributes.isEmpty()) {
-			getRoleShapeStrategy().reconcileAttributes(fAttributes);
-		}
-		return fAttributes;
-	}
-	/**
-	 * Return our parent relationship as a CommonRelationship
-	 */
-
-	public CommonRelationship getCommonRelationship() {
-		return getRelationship();
-	}
-	protected IRoleShapeStrategy getDefaultRoleShapeStrategy() {
-		try {
-			return (IRoleShapeStrategy) getRoleStrategyConstructor(this).newInstance(new Object[] { this });
-		} catch (Throwable t) {
-			Logger.getLogger().logError("EJBRelationshipRoleImpl:Could not instantiate role shape strategy; this requires extensions"); //$NON-NLS-1$
-			Logger.getLogger().logError(t);
-			return null;
-		}
-
-	}
-
-
-	/**
-	 * @return The logical name which can be used for naming this role.
-	 * Required to be unique within a JAR.
-	 * If a cmr-field is defined, then a name in the form %source-ejb-name%_%cmr-field-name% is computed.
-	 * Otherwise a default ID is generated.
-	 */
-	public String getLogicalName() {
-		String result = null;
-		String qualifier = getCmrField().getName();
-		if (qualifier != null) {
-			result = getSource().getEntityBean().getName() + "_" + qualifier; //$NON-NLS-1$
-		} else {
-			// Apply a default ID
-			result = IDUtil.getOrAssignID(this);
-		}
-		return result;
-	}
-	/**
-	 * @return The name for this role, derived from the CMR-field name
-	 * Used to determine the name used in querying this role as well as the accessor method names which implement it.
-	 * Note: may return the XMI ID for non-navigable roles, ie - where there is no CMR-field.
-	 */
-	public String getName() {
-		if (fName == null) {
-			if (getCmrField() != null)
-				fName = getCmrField().getName();
-			else if (getOpposite() != null) {
-				EJBRelationshipRole op = getOpposite();
-				if (op.getCmrField() != null)
-					fName = op.getCmrField().getName() + op.getSourceEntity().getName() + NAME_SUFFIX;
-			} else {
-				if (eGetId() == null) 
-					eSetId();
-				fName = eGetId();
-			}
-		}
-		return fName;
-	}
-	/**
-	 * Return the other role.
-	 */
-	public EJBRelationshipRole getOpposite() {
-		if (getRelationship() != null)
-			return getRelationship().getOppositeRole(this);
-		return null;
-	}
-	/**
-	 * Return the other role.
-	 */
-	public CommonRelationshipRole getOppositeAsCommonRole() {
-		return getOpposite();
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (11/15/2000 6:50:30 PM)
-	 * @return com.ibm.ejs.models.base.extensions.ejbext.impl.IRoleShapeStrategy
-	 */
-	public IRoleShapeStrategy getRoleShapeStrategy() {
-		if (roleShapeStrategy == null)
-			roleShapeStrategy = getDefaultRoleShapeStrategy();
-		return roleShapeStrategy;
-	}
-	/**
-	 * @return The Source ejb
-	 * Compute the ContainerManagedEntity which is the source of a role that participates in a relationship. 
-	 */
-	public ContainerManagedEntity getSourceEntity() {
-		if(null == getSource()) {
-			return null;
-		}
-		return getSource().getEntityBean();
-	}
-	/**
-	* @return The computed value of the isForward attribute
-	* Specifies whether this role should be mapped to a persistent reference, such as a foreign key.
-	* The current implementation is:
-	* - if the role is many, it cannot be forward
-	* - if the role is single and not navigable, it cannot be forward
-	* - all other things being equal, the first role is considered to be forward
-	* - clients can manipulate this by setting an ambiguous role to be fwd (by manipulating the role order under the covers).
-	*/
-	public boolean isForward() {
-		if (this.isMany())
-			return false;
-		if (getOppositeAsCommonRole() == null)
-			return wasForward;
-		if (getOppositeAsCommonRole().isMany())
-			return true;
-	   // if (!this.isNavigable())  removed to allow non-navigable role in key
-	   //    return false;
-		if (getRelationship() == null)
-			return wasForward;
-		return (getRelationship().getFirstRole() == this);
-	}
-	/**
-	* @return The computed value isKey
-	*/
-	public boolean isKey() {
-		if (isKeySet)
-			return key;
-		return isKeyFromAttributes();
-	}
-    
-	protected boolean isKeyFromAttributes() {
-		List list = getAttributes();
-		if (list.isEmpty())
-			return false;
-		Iterator it = list.iterator();
-		CMPAttribute attribute;
-		while (it.hasNext()) {
-			attribute = (CMPAttribute) it.next();
-			if (!attribute.isKey())
-				return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * This allows you to set the Role as being key so it will
-	 * not traverse it attributes to determine if it is key.
-	 */
-	public void setKey(boolean aBoolean) {
-		key = aBoolean;
-		isKeySet = true;
-	} 
- 
-	/**
-	 * Handwritten version of isMany():
-	 */
- 
- 
-	public boolean isMany()  { 
-		if (getOpposite() == null) 
-			 return wasMany;  
-		return getOpposite().getMultiplicity() == MultiplicityKind.MANY_LITERAL;  
-	} 
- 
-         
-
-	/**
-	* @return The computed value of the isNavigable attribute
-	* Specifies that accessors should be generated for this relationship role.
-	* Current implementation is to test whether or not a CMR field exists.
-	*/
-	public boolean isNavigable() {
-		return getCmrField() != null;
-	}
-
-
-	public void reconcileAttributes() {
-		if (fAttributes != null)
-			getRoleShapeStrategy().reconcileAttributes(fAttributes);
-	}
-
-
-	/**
-	 * Set this role to be the forward role.
-	 */
-	public void setFoward() {
-		getRelationship().setFoward(this);
-	}
-	public void setName(java.lang.String uniqueName) {
-		fName = uniqueName;
-	}
-	public String toString() {
-		if (toStringGuard) return super.toString();
-		try {
-			toStringGuard = true;
-			String oppositeType = getOpposite() != null ? getTypeEntity().getName() : "<<unknown>>"; //$NON-NLS-1$
-			return getName() + "(" + oppositeType + ")" + (isMany() ? " *" : " 1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		} catch (Exception e) {
-			return e.toString();
-		} finally {
-			toStringGuard = false;
-		}
-	}
-
-	private static Class getCommonRoleClass(Object caller) throws ClassNotFoundException {
-
-		if (COMMON_ROLE_CLASS == null) {
-			COMMON_ROLE_CLASS = loadClass(COMMON_ROLE_CLASS_NAME, caller);
-		}
-		return COMMON_ROLE_CLASS;
-	}
-
-	private static Class loadClass(String name, Object caller) throws ClassNotFoundException {
-		ClassLoader cl = caller.getClass().getClassLoader();
-		if (cl != null)
-			return cl.loadClass(name);
-		return Class.forName(name);
-	}
-
-	private static Class getRoleStrategyClass(Object caller) throws ClassNotFoundException {
-		if (ROLE_STRATEGY_CLASS == null)
-			ROLE_STRATEGY_CLASS = loadClass(ROLE_STRATEGY_CLASS_NAME, caller);
-		return ROLE_STRATEGY_CLASS;
-	}
-
-	private static Constructor getRoleStrategyConstructor(Object caller) throws ClassNotFoundException, NoSuchMethodException {
-		if (ROLE_STRATEGY_CONSTRUCTOR == null) {
-			Class[] parmTypes = new Class[] { getCommonRoleClass(caller)};
-			ROLE_STRATEGY_CONSTRUCTOR = getRoleStrategyClass(caller).getConstructor(parmTypes);
-		}
-		return ROLE_STRATEGY_CONSTRUCTOR;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing 
-	 * the ejb relationship role.
-	 * 
-	 * The description should include any information that the ejb-jar file producer
-	 * wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer).
-	 * Typically, the tools used by the ejb-jar file consumer will display the
-	 * description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines a name for a role that is unique within an ejb-relation. Different
-	 * relationships can use the same name for a role.
-
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MultiplicityKind getMultiplicity() {
-		return multiplicity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMultiplicity(MultiplicityKind newMultiplicity) {
-		MultiplicityKind oldMultiplicity = multiplicity;
-		multiplicity = newMultiplicity == null ? MULTIPLICITY_EDEFAULT : newMultiplicity;
-		boolean oldMultiplicityESet = multiplicityESet;
-		multiplicityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY, oldMultiplicity, multiplicity, !oldMultiplicityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetMultiplicity() {
-		MultiplicityKind oldMultiplicity = multiplicity;
-		boolean oldMultiplicityESet = multiplicityESet;
-		multiplicity = MULTIPLICITY_EDEFAULT;
-		multiplicityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY, oldMultiplicity, MULTIPLICITY_EDEFAULT, oldMultiplicityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetMultiplicity() {
-		return multiplicityESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies that, within a particular relationship, the lifetime of one or more
-	 * entity beans is dependent upon the lifetime of another entity bean. The
-	 * cascade-delete element can Cascade delete can only be specified for an
-	 * EJBRelationshipRole contained in an EJBrelation in which the other
-	 * EJBRelationshipRole element specifies a multiplicity of One.
-	 * 
-	 * 
-
-	 */
-	public boolean isCascadeDelete() {
-		return cascadeDelete;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCascadeDelete(boolean newCascadeDelete) {
-		boolean oldCascadeDelete = cascadeDelete;
-		cascadeDelete = newCascadeDelete;
-		boolean oldCascadeDeleteESet = cascadeDeleteESet;
-		cascadeDeleteESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, oldCascadeDelete, cascadeDelete, !oldCascadeDeleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetCascadeDelete() {
-		boolean oldCascadeDelete = cascadeDelete;
-		boolean oldCascadeDeleteESet = cascadeDeleteESet;
-		cascadeDelete = CASCADE_DELETE_EDEFAULT;
-		cascadeDeleteESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE, oldCascadeDelete, CASCADE_DELETE_EDEFAULT, oldCascadeDeleteESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetCascadeDelete() {
-		return cascadeDeleteESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBRelation getRelationship() {
-		if (eContainerFeatureID != EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP) return null;
-		return (EJBRelation)eContainer;
-	}
-
-	/**
-	 * This field/method will be replaced during code generation.
-	 */
-	public void setRelationship(EJBRelation newContainer) {
-		if (newContainer == null && getRelationship() != null) {
-			updateCachedSettings();
-			EJBRelationshipRoleImpl roleOpposite = (EJBRelationshipRoleImpl) getOpposite();
-			if (roleOpposite != null)
-				roleOpposite.updateCachedSettings();
-		} else
-			wasForward = false;
-		setRelationshipGen(newContainer);
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.CommonRelationshipRole#getTargetAttributeName(org.eclipse.jst.j2ee.internal.ejb.CMPAttribute)
-	 */
-	public String getTargetAttributeName(CMPAttribute roleAttribute) {
-		int roleNameSize = getName().length();
-		return roleAttribute.getName().substring(roleNameSize + 1);
-	}
-	/**
-	 * Method updateCachedSettings.
-	 */
-	protected void updateCachedSettings() {
-		wasForward = isForward();
-		wasMany = isMany();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Designates the source of a role that participates in a relationship. A
-	 * relationship-role-source element uniquely identifies an entity bean.
-	 * @migration EJB1.1: was ibmejbext::EjbRelationshipRole::sourceEJBName, but that
-	 * may not be sufficient, as this can now refer to dependent class names or ejb
-	 * refs
-	 */
-	public RoleSource getSource() {
-		return source;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSource(RoleSource newSource, NotificationChain msgs) {
-		RoleSource oldSource = source;
-		source = newSource;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, oldSource, newSource);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSource(RoleSource newSource) {
-		if (newSource != source) {
-			NotificationChain msgs = null;
-			if (source != null)
-				msgs = ((InternalEObject)source).eInverseRemove(this, EjbPackage.ROLE_SOURCE__ROLE, RoleSource.class, msgs);
-			if (newSource != null)
-				msgs = ((InternalEObject)newSource).eInverseAdd(this, EjbPackage.ROLE_SOURCE__ROLE, RoleSource.class, msgs);
-			msgs = basicSetSource(newSource, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, newSource, newSource));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A declaration of the CMRField, if any, by means of which the other side of the
-	 * relationship is accessed from the perspective of the role source
-	 * 
-	 * @migration EJB1.1: Used to be handled via ibmejbext::EjbRole::attributes list
-	 */
-	public CMRField getCmrField() {
-		return cmrField;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCmrField(CMRField newCmrField, NotificationChain msgs) {
-		CMRField oldCmrField = cmrField;
-		cmrField = newCmrField;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, oldCmrField, newCmrField);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCmrField(CMRField newCmrField) {
-		if (newCmrField != cmrField) {
-			NotificationChain msgs = null;
-			if (cmrField != null)
-				msgs = ((InternalEObject)cmrField).eInverseRemove(this, EjbPackage.CMR_FIELD__ROLE, CMRField.class, msgs);
-			if (newCmrField != null)
-				msgs = ((InternalEObject)newCmrField).eInverseAdd(this, EjbPackage.CMR_FIELD__ROLE, CMRField.class, msgs);
-			msgs = basicSetCmrField(newCmrField, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, newCmrField, newCmrField));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP, msgs);
-				case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-					if (source != null)
-						msgs = ((InternalEObject)source).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, null, msgs);
-					return basicSetSource((RoleSource)otherEnd, msgs);
-				case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-					if (cmrField != null)
-						msgs = ((InternalEObject)cmrField).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD, null, msgs);
-					return basicSetCmrField((CMRField)otherEnd, msgs);
-				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 EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-					return eBasicSetContainer(null, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP, msgs);
-				case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-					return basicSetSource(null, msgs);
-				case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-					return basicSetCmrField(null, msgs);
-				case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				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 EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES, EJBRelation.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 EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				return getRoleName();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				return getMultiplicity();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				return isCascadeDelete() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				return getRelationship();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				return getSource();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return getCmrField();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				return isSetMultiplicity();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				return isSetCascadeDelete();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				return getRelationship() != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				return source != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				return cmrField != null;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				setMultiplicity((MultiplicityKind)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				setCascadeDelete(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				setRelationship((EJBRelation)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				setSource((RoleSource)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				setCmrField((CMRField)newValue);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__ROLE_NAME:
-				setRoleName(ROLE_NAME_EDEFAULT);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__MULTIPLICITY:
-				unsetMultiplicity();
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CASCADE_DELETE:
-				unsetCascadeDelete();
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP:
-				setRelationship((EJBRelation)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE:
-				setSource((RoleSource)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__CMR_FIELD:
-				setCmrField((CMRField)null);
-				return;
-			case EjbPackage.EJB_RELATIONSHIP_ROLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", roleName: "); //$NON-NLS-1$
-		result.append(roleName);
-		result.append(", multiplicity: "); //$NON-NLS-1$
-		if (multiplicityESet) result.append(multiplicity); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", cascadeDelete: "); //$NON-NLS-1$
-		if (cascadeDeleteESet) result.append(cascadeDelete); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * @see CommonRelationshipRole#getTypeEntity()
-	 */
-	public ContainerManagedEntity getTypeEntity() {
-		if (getOpposite() != null)
-			return getOpposite().getSourceEntity();
-		return null;
-	}
-
-	/**
-	 * @see CommonRelationshipRole#isRequired()
-	 */
-	public boolean isRequired() {
-		if (required!=null)
-			return required.booleanValue();
-		return isKey();
-	}
-	
-	/**
-	 * Set the isRequired flag for bottom up
-	 */
-	public void setRequired(Boolean isRequired) {
-		required = isRequired;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRelationshipGen(EJBRelation newRelationship) {
-		if (newRelationship != eContainer || (eContainerFeatureID != EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP && newRelationship != null)) {
-			if (EcoreUtil.isAncestor(this, newRelationship))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRelationship != null)
-				msgs = ((InternalEObject)newRelationship).eInverseAdd(this, EjbPackage.EJB_RELATION__RELATIONSHIP_ROLES, EJBRelation.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newRelationship, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EJB_RELATIONSHIP_ROLE__RELATIONSHIP, newRelationship, newRelationship));
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.CommonRelationshipRole#setLower(int)
-	 */
-	public void setLower(int lowerBound) {
-		// Do nothing...  Only upperbound is relevant here
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.CommonRelationshipRole#setUpper(int)
-	 */
-	public void setUpper(int upperBound) {
-		switch (upperBound) {
-			case MultiplicityKind.ONE :
-				setMultiplicity(MultiplicityKind.ONE_LITERAL);
-				break;
-			default :
-				setMultiplicity(MultiplicityKind.MANY_LITERAL);
-				break;
-		}
-	}
-	
-	/**
-	  Gets the MOF XMI ref id for this object.
-	 */
-	private String eGetId() {
-		XMIResource res = (XMIResource)eResource();
-		if (res == null)
-			return null;
-		return res.getID(this);
-	}
-
-	
-	/**
-	 * Set and return The id of this element
-	 */
-	private String eSetId() {
-
-
-		IDUtil.getOrAssignID(this);
-
-		return eGetId();
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBResourceImpl.java
deleted file mode 100644
index 263b080..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBResourceImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.model.translator.ejb.EJBJarTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class EJBResourceImpl extends XMLResourceImpl implements EJBResource {
-
-	/**
-	 * @param uri
-	 * @param aRenderer
-	 */
-	public EJBResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	/**
-	 * @param aRenderer
-	 */
-	public EJBResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	/*
-	 * @see EJBResource#isEJB1_1()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isEJB1_1() {
-		return getModuleVersionID() == EJB_1_1_ID;
-	}
-
-	/*
-	 * @see EJBResource#isEJB2_0()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isEJB2_0() {
-		return getModuleVersionID() == EJB_2_0_ID;
-	}
-
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResource#getType()
-	 */
-	public int getType() {
-		return XMLResource.EJB_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.EJBJAR_DOCTYPE;
-			default :
-				return null;
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.EJBJAR_PUBLICID_1_1;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.EJBJAR_SYSTEMID_1_1;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.EJBJAR_PUBLICID_2_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.EJBJAR_SYSTEMID_2_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return EJBJarTranslator.INSTANCE;
-	}
-	
-	/* Return J2EE version based on module version
-	 */
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.EJB_1_0_ID :
-				return J2EEVersionConstants.J2EE_1_2_ID;
-			case J2EEVersionConstants.EJB_1_1_ID :
-				return J2EEVersionConstants.J2EE_1_2_ID;
-			case J2EEVersionConstants.EJB_2_0_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.EJB_2_1_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-	
-	/**
-	 * Return the first element in the EList.
-	 */
-	public EJBJar getEJBJar() {
-		return (EJBJar) getRootObject();
-	}
-	
-	public void setBatchMode(boolean isBatch) {
-		renderer.setBatchMode(isBatch);
-
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (EJB_2_1_ID) :
-					super.setDoctypeValues(null, null);
-					break;
-				case (EJB_2_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					break;
-				case (EJB_1_1_ID) :
-					super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					break;
-				case (EJB_1_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					
-			}
-		syncVersionOfRootObject();
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) {
-	switch (id) {
-		case (J2EE_1_4_ID) :
-					primSetDoctypeValues(null, null);
-					primSetVersionID(EJB_2_1_ID);
-					break;
-		case (J2EE_1_3_ID) :
-					primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					primSetVersionID(EJB_2_0_ID);
-					break;
-		case (J2EE_1_2_ID) :
-					primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					primSetVersionID(EJB_1_1_ID);
-			}
-		syncVersionOfRootObject();
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return EJB_2_1_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		EJBJar ejbJar = getEJBJar();
-		if (ejbJar == null)
-			return;
-		
-		String version = ejbJar.getVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			ejbJar.setVersion(newVersion);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbFactoryImpl.java
deleted file mode 100644
index 232e6d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbFactoryImpl.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.ReturnTypeMapping;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind;
-import org.eclipse.jst.j2ee.ejb.TransactionAttributeType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.util.CMPKeySynchronizationAdapter;
-import org.eclipse.wst.common.internal.emf.utilities.AdapterFactoryDescriptor;
-import org.eclipse.wst.common.internal.emf.utilities.AdapterFactoryUtil;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-
-/**
- * @generated
- */
-public class EjbFactoryImpl extends EFactoryImpl implements EjbFactory{
-	private static List CMP_ADAPTER_FACTORIES = new ArrayList(1);
-	private static List CMP_ADAPTER_FACTORY_DESCRIPTORS = new ArrayList(1);
-	private static List EJB_RELATION_ADAPTER_FACTORIES = new ArrayList(1);
-	private static List EJB_RELATION_ADAPTER_FACTORY_DESCRIPTORS = new ArrayList(1);
-	private static List RELATIONSHIPS_ADAPTER_FACTORIES = new ArrayList(1);
-	private static List RELATIONSHIPS_ADAPTER_FACTORY_DESCRIPTORS = new ArrayList(1);
-	public static final String MM_VERSION = "1.1";  //$NON-NLS-1$
-	private boolean createdAdapterFactories = false;
-
-	public EjbFactoryImpl() {
-		super(); 
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case EjbPackage.CONTAINER_MANAGED_ENTITY: return createContainerManagedEntity();
-			case EjbPackage.METHOD_PERMISSION: return createMethodPermission();
-			case EjbPackage.ASSEMBLY_DESCRIPTOR: return createAssemblyDescriptor();
-			case EjbPackage.METHOD_TRANSACTION: return createMethodTransaction();
-			case EjbPackage.SESSION: return createSession();
-			case EjbPackage.ENTITY: return createEntity();
-			case EjbPackage.EJB_METHOD_CATEGORY: return createEJBMethodCategory();
-			case EjbPackage.EJB_JAR: return createEJBJar();
-			case EjbPackage.METHOD_ELEMENT: return createMethodElement();
-			case EjbPackage.CMP_ATTRIBUTE: return createCMPAttribute();
-			case EjbPackage.RELATIONSHIPS: return createRelationships();
-			case EjbPackage.QUERY: return createQuery();
-			case EjbPackage.EJB_RELATION: return createEJBRelation();
-			case EjbPackage.EJB_RELATIONSHIP_ROLE: return createEJBRelationshipRole();
-			case EjbPackage.ROLE_SOURCE: return createRoleSource();
-			case EjbPackage.CMR_FIELD: return createCMRField();
-			case EjbPackage.MESSAGE_DRIVEN: return createMessageDriven();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION: return createMessageDrivenDestination();
-			case EjbPackage.EXCLUDE_LIST: return createExcludeList();
-			case EjbPackage.QUERY_METHOD: return createQueryMethod();
-			case EjbPackage.ACTIVATION_CONFIG_PROPERTY: return createActivationConfigProperty();
-			case EjbPackage.ACTIVATION_CONFIG: return createActivationConfig();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
-				return TransactionAttributeType.get(initialValue);
-			case EjbPackage.TRANSACTION_TYPE:
-				return TransactionType.get(initialValue);
-			case EjbPackage.SESSION_TYPE:
-				return SessionType.get(initialValue);
-			case EjbPackage.METHOD_ELEMENT_KIND:
-				return MethodElementKind.get(initialValue);
-			case EjbPackage.ACKNOWLEDGE_MODE:
-				return AcknowledgeMode.get(initialValue);
-			case EjbPackage.SUBSCRIPTION_DURABILITY_KIND:
-				return SubscriptionDurabilityKind.get(initialValue);
-			case EjbPackage.RETURN_TYPE_MAPPING:
-				return ReturnTypeMapping.get(initialValue);
-			case EjbPackage.DESTINATION_TYPE:
-				return DestinationType.get(initialValue);
-			case EjbPackage.MULTIPLICITY_KIND:
-				return MultiplicityKind.get(initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case EjbPackage.TRANSACTION_ATTRIBUTE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.TRANSACTION_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.SESSION_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.METHOD_ELEMENT_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.ACKNOWLEDGE_MODE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.SUBSCRIPTION_DURABILITY_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.RETURN_TYPE_MAPPING:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.DESTINATION_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case EjbPackage.MULTIPLICITY_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-public MethodElement createMethodElement(String aSignature) {
-	MethodElement me = createMethodElement();
-	me.initializeFromSignature(aSignature);
-	return me;
-}
-/**
- * Helper method to create a MethodElement from a java method.   Defaults the type to "Unspecified".
- */
-public MethodElement createMethodElementFrom(
-	Method method) {
-
-	MethodElement element = createMethodElement();
-	element.setName(method.getName());
-	element.setType(MethodElementKind.UNSPECIFIED_LITERAL);
-
-	JavaParameter[] params = 
-		method.listParametersWithoutReturn();
-	if (params.length == 0)
-		element.applyZeroParams();
-	else { 
-		for (int i = 0; i < params.length; i++) {
-			JavaHelpers helper = (JavaHelpers) params[i].getEType();
-			element.addMethodParams(helper.getQualifiedName());
-		}
-	}
-	return element;
-} 
-/**
- * Helper method to reflect the method and create a MethodElement.  If the parameter is null, creates an element
- * with a name of "*".  Defaults the type to "Unspecified".
- */
-public MethodElement createMethodElementFrom(java.lang.reflect.Method method) {
-
-	String methodName = method == null ? "*" : method.getName(); //$NON-NLS-1$
-	MethodElement me = createMethodElement();
-	me.setName(methodName);
-	me.setType(MethodElementKind.UNSPECIFIED_LITERAL);
-	if (method != null) {
-		Class[] types = method.getParameterTypes();
-		for (int i = 0; i < types.length; i++) {
-			me.addMethodParams(getTypeName(types[i]));
-		}
-	}
-	return me;
-}
-public static EjbFactory getActiveFactory() {
-	return (EjbFactory) getPackage().getEFactoryInstance();
-}
-/*
- * Utility routine to paper over array type names
- * Borrowed from a package-visibility helper on java.lang.reflect.Field
- */
-static String getTypeName(Class type) {
-	if (type.isArray()) {
-		try {
-			Class cl = type;
-			int dimensions = 0;
-			while (cl.isArray()) {
-				dimensions++;
-				cl = cl.getComponentType();
-			}
-			StringBuffer sb = new StringBuffer();
-			sb.append(cl.getName());
-			for (int i = 0; i < dimensions; i++) {
-				sb.append("[]");//$NON-NLS-1$
-			}
-			return sb.toString();
-		} catch (Throwable e) { /*FALLTHRU*/
-		}
-	}
-	return type.getName();
-}
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MethodPermission createMethodPermission() {
-		MethodPermissionImpl methodPermission = new MethodPermissionImpl();
-		return methodPermission;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public AssemblyDescriptor createAssemblyDescriptor() {
-		AssemblyDescriptorImpl assemblyDescriptor = new AssemblyDescriptorImpl();
-		return assemblyDescriptor;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MethodTransaction createMethodTransaction() {
-		MethodTransactionImpl methodTransaction = new MethodTransactionImpl();
-		return methodTransaction;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Entity createEntity() {
-		EntityImpl entity = new EntityImpl();
-		return entity;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ContainerManagedEntity createContainerManagedEntityGen() {
-		ContainerManagedEntityImpl containerManagedEntity = new ContainerManagedEntityImpl();
-		return containerManagedEntity;
-	}
-
-  	public ContainerManagedEntity createContainerManagedEntity() {
-  		ContainerManagedEntity cmp = createContainerManagedEntityGen();
-  		adaptNew(cmp, CMP_ADAPTER_FACTORIES);
-  		addKeySynchronizationAdapter(cmp);
-  		return cmp;
-  	}
-  	
-	/**
-	 * @param cmp
-	 */
-	private void addKeySynchronizationAdapter(ContainerManagedEntity cmp) {
-		CMPKeySynchronizationAdapter cmpAdapter = new CMPKeySynchronizationAdapter(cmp);
-		Adapter loadingAdapter = ExtendedEcoreUtil.createAdapterForLoading(cmpAdapter,cmp);
-		cmp.eAdapters().add(loadingAdapter);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CMPAttribute createCMPAttribute() {
-		CMPAttributeImpl cmpAttribute = new CMPAttributeImpl();
-		return cmpAttribute;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public CMRField createCMRField() {
-		CMRFieldImpl cmrField = new CMRFieldImpl();
-		return cmrField;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBRelationshipRole createEJBRelationshipRole() {
-		EJBRelationshipRoleImpl ejbRelationshipRole = new EJBRelationshipRoleImpl();
-		return ejbRelationshipRole;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBRelation createEJBRelationGen() {
-		EJBRelationImpl ejbRelation = new EJBRelationImpl();
-		return ejbRelation;
-	}
-
-  	public EJBRelation createEJBRelation() {
-  		EJBRelation rel = createEJBRelationGen();
-  		adaptNew(rel, EJB_RELATION_ADAPTER_FACTORIES);
-  		return rel;
-  	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Relationships createRelationshipsGen() {
-		RelationshipsImpl relationships = new RelationshipsImpl();
-		return relationships;
-	}
-
-	public Relationships createRelationships() {
-		Relationships rel = createRelationshipsGen();
-		adaptNew(rel, RELATIONSHIPS_ADAPTER_FACTORIES);
-		return rel;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBJar createEJBJar() {
-		EJBJarImpl ejbJar = new EJBJarImpl();
-		return ejbJar;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public RoleSource createRoleSource() {
-		RoleSourceImpl roleSource = new RoleSourceImpl();
-		return roleSource;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Query createQuery() {
-		QueryImpl query = new QueryImpl();
-		return query;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public QueryMethod createQueryMethod() {
-		QueryMethodImpl queryMethod = new QueryMethodImpl();
-		return queryMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfigProperty createActivationConfigProperty() {
-		ActivationConfigPropertyImpl activationConfigProperty = new ActivationConfigPropertyImpl();
-		return activationConfigProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfig createActivationConfig() {
-		ActivationConfigImpl activationConfig = new ActivationConfigImpl();
-		return activationConfig;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MethodElement createMethodElement() {
-		MethodElementImpl methodElement = new MethodElementImpl();
-		return methodElement;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ExcludeList createExcludeList() {
-		ExcludeListImpl excludeList = new ExcludeListImpl();
-		return excludeList;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Session createSession() {
-		SessionImpl session = new SessionImpl();
-		return session;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MessageDriven createMessageDriven() {
-		MessageDrivenImpl messageDriven = new MessageDrivenImpl();
-		return messageDriven;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MessageDrivenDestination createMessageDrivenDestination() {
-		MessageDrivenDestinationImpl messageDrivenDestination = new MessageDrivenDestinationImpl();
-		return messageDrivenDestination;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EJBMethodCategory createEJBMethodCategory() {
-		EJBMethodCategoryImpl ejbMethodCategory = new EJBMethodCategoryImpl();
-		return ejbMethodCategory;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EjbPackage getEjbPackage() {
-		return (EjbPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static EjbPackage getPackage() {
-		return EjbPackage.eINSTANCE;
-	}
-	public static void internalRegisterCMPAdapterFactory(AdapterFactoryDescriptor config) {
-		CMP_ADAPTER_FACTORY_DESCRIPTORS.add(config);
-		
-	}
-	public static void internalRegisterEJBRelationAdapterFactory(AdapterFactoryDescriptor config) {
-		EJB_RELATION_ADAPTER_FACTORY_DESCRIPTORS.add(config);
-	}
-	public static void internalRegisterRelationshipsAdapterFactory(AdapterFactoryDescriptor config) {
-		RELATIONSHIPS_ADAPTER_FACTORY_DESCRIPTORS.add(config);
-	}
-	
-	
-	private void createAdapterFactories() {
-		createdAdapterFactories = true;
-		AdapterFactoryUtil.createAdapterFactories(CMP_ADAPTER_FACTORY_DESCRIPTORS, CMP_ADAPTER_FACTORIES);
-		AdapterFactoryUtil.createAdapterFactories(EJB_RELATION_ADAPTER_FACTORY_DESCRIPTORS, EJB_RELATION_ADAPTER_FACTORIES);
-		AdapterFactoryUtil.createAdapterFactories(RELATIONSHIPS_ADAPTER_FACTORY_DESCRIPTORS, RELATIONSHIPS_ADAPTER_FACTORIES);
-	}
-	
-	private void adaptNew(Notifier notifier, List factories) {
-		if (!createdAdapterFactories)
-			createAdapterFactories();
-		AdapterFactoryUtil.adaptNew(notifier, factories);
-	}
-
-}
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbPackageImpl.java
deleted file mode 100644
index df85b81..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EjbPackageImpl.java
+++ /dev/null
@@ -1,1772 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.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.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.ReturnTypeMapping;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind;
-import org.eclipse.jst.j2ee.ejb.TransactionAttributeType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-
-
-public class EjbPackageImpl extends EPackageImpl implements EjbPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass containerManagedEntityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodPermissionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass assemblyDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodTransactionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sessionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass enterpriseBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbMethodCategoryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbJarEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass methodElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cmpAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass relationshipsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass queryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRelationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ejbRelationshipRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleSourceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass cmrFieldEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDrivenEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageDrivenDestinationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass excludeListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass queryMethodEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationConfigPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionAttributeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum sessionTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum methodElementKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum acknowledgeModeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum subscriptionDurabilityKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum returnTypeMappingEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum destinationTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum multiplicityKindEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private EjbPackageImpl() {
-		super(eNS_URI, EjbFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static EjbPackage init() {
-		if (isInited) return (EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EjbPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-
-		// Step 1: create meta-model objects
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-
-		return theEjbPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMethodPermission() {
-		return methodPermissionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodPermission_Description() {
-		return (EAttribute)methodPermissionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodPermission_Unchecked() {
-		return (EAttribute)methodPermissionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodPermission_AssemblyDescriptor() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodPermission_Roles() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodPermission_MethodElements() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodPermission_Descriptions() {
-		return (EReference)methodPermissionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getAssemblyDescriptor() {
-		return assemblyDescriptorEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_MethodPermissions() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_MethodTransactions() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_EjbJar() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_SecurityRoles() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAssemblyDescriptor_ExcludeList() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAssemblyDescriptor_MessageDestinations() {
-		return (EReference)assemblyDescriptorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMethodTransaction() {
-		return methodTransactionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodTransaction_TransactionAttribute() {
-		return (EAttribute)methodTransactionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodTransaction_Description() {
-		return (EAttribute)methodTransactionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodTransaction_AssemblyDescriptor() {
-		return (EReference)methodTransactionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodTransaction_MethodElements() {
-		return (EReference)methodTransactionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodTransaction_Descriptions() {
-		return (EReference)methodTransactionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEnterpriseBean() {
-		return enterpriseBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEnterpriseBean_Name() {
-		return (EAttribute)enterpriseBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_SecurityRoleRefs() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_EjbClass() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_HomeInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_RemoteInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_EjbJar() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_SecurityIdentity() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_LocalHomeInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEnterpriseBean_LocalInterface() {
-		return (EReference)enterpriseBeanEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEntity() {
-		return entityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntity_Reentrant() {
-		return (EAttribute)entityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEntity_PrimaryKey() {
-		return (EReference)entityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getContainerManagedEntity() {
-		return containerManagedEntityEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContainerManagedEntity_Version() {
-		return (EAttribute)containerManagedEntityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContainerManagedEntity_AbstractSchemaName() {
-		return (EAttribute)containerManagedEntityEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getContainerManagedEntity_PersistentAttributes() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getContainerManagedEntity_KeyAttributes() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerManagedEntity_Queries() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerManagedEntity_CMPAttribute() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainerManagedEntity_PrimKeyField() {
-		return (EReference)containerManagedEntityEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getCMPAttribute() {
-		return cmpAttributeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getCMPAttribute_Description() {
-		return (EAttribute)cmpAttributeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCMPAttribute_Descriptions() {
-		return (EReference)cmpAttributeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getCMRField() {
-		return cmrFieldEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getCMRField_Role() {
-		return (EReference)cmrFieldEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getCMRField_CollectionType() {
-		return (EReference)cmrFieldEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBRelationshipRole() {
-		return ejbRelationshipRoleEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_Description() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_RoleName() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_Multiplicity() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelationshipRole_CascadeDelete() {
-		return (EAttribute)ejbRelationshipRoleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelationshipRole_Relationship() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelationshipRole_Source() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelationshipRole_CmrField() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelationshipRole_Descriptions() {
-		return (EReference)ejbRelationshipRoleEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBRelation() {
-		return ejbRelationEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelation_Description() {
-		return (EAttribute)ejbRelationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBRelation_Name() {
-		return (EAttribute)ejbRelationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelation_RelationshipList() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBRelation_RelationshipRoles() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getEJBRelation_Descriptions() {
-		return (EReference)ejbRelationEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRelationships() {
-		return relationshipsEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getRelationships_Description() {
-		return (EAttribute)relationshipsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRelationships_EjbJar() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRelationships_EjbRelations() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRelationships_Descriptions() {
-		return (EReference)relationshipsEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBJar() {
-		return ejbJarEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getEJBJar_EjbClientJar() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEJBJar_Version() {
-		return (EAttribute)ejbJarEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBJar_AssemblyDescriptor() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBJar_EnterpriseBeans() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getEJBJar_RelationshipList() {
-		return (EReference)ejbJarEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRoleSource() {
-		return roleSourceEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getRoleSource_Description() {
-		return (EAttribute)roleSourceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRoleSource_Role() {
-		return (EReference)roleSourceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getRoleSource_EntityBean() {
-		return (EReference)roleSourceEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRoleSource_Descriptions() {
-		return (EReference)roleSourceEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getQuery() {
-		return queryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getQuery_Description() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getQuery_EjbQL() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getQuery_ReturnTypeMapping() {
-		return (EAttribute)queryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getQuery_QueryMethod() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getQuery_Entity() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getQuery_Descriptions() {
-		return (EReference)queryEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getQueryMethod() {
-		return queryMethodEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getQueryMethod_Query() {
-		return (EReference)queryMethodEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationConfigProperty() {
-		return activationConfigPropertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfigProperty_Value() {
-		return (EAttribute)activationConfigPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationConfigProperty_Name() {
-		return (EAttribute)activationConfigPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationConfig() {
-		return activationConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationConfig_ConfigProperties() {
-		return (EReference)activationConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationConfig_Descriptions() {
-		return (EReference)activationConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMethodElement() {
-		return methodElementEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Name() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Parms() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Type() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMethodElement_Description() {
-		return (EAttribute)methodElementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMethodElement_EnterpriseBean() {
-		return (EReference)methodElementEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMethodElement_Descriptions() {
-		return (EReference)methodElementEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getExcludeList() {
-		return excludeListEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getExcludeList_Description() {
-		return (EAttribute)excludeListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getExcludeList_MethodElements() {
-		return (EReference)excludeListEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExcludeList_Descriptions() {
-		return (EReference)excludeListEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSession() {
-		return sessionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSession_TransactionType() {
-		return (EAttribute)sessionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSession_SessionType() {
-		return (EAttribute)sessionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSession_ServiceEndpoint() {
-		return (EReference)sessionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMessageDriven() {
-		return messageDrivenEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDriven_TransactionType() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDriven_MessageSelector() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDriven_AcknowledgeMode() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMessageDriven_Destination() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDriven_ActivationConfig() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDriven_MessageDestination() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageDriven_Link() {
-		return (EAttribute)messageDrivenEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageDriven_MessagingType() {
-		return (EReference)messageDrivenEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMessageDrivenDestination() {
-		return messageDrivenDestinationEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDrivenDestination_Type() {
-		return (EAttribute)messageDrivenDestinationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMessageDrivenDestination_SubscriptionDurability() {
-		return (EAttribute)messageDrivenDestinationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMessageDrivenDestination_Bean() {
-		return (EReference)messageDrivenDestinationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getEJBMethodCategory() {
-		return ejbMethodCategoryEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransactionAttributeType() {
-		return transactionAttributeTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getMultiplicityKind() {
-		return multiplicityKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getReturnTypeMapping() {
-		return returnTypeMappingEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getMethodElementKind() {
-		return methodElementKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransactionType() {
-		return transactionTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getAcknowledgeMode() {
-		return acknowledgeModeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getDestinationType() {
-		return destinationTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getSubscriptionDurabilityKind() {
-		return subscriptionDurabilityKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getSessionType() {
-		return sessionTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EjbFactory getEjbFactory() {
-		return (EjbFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		containerManagedEntityEClass = createEClass(CONTAINER_MANAGED_ENTITY);
-		createEAttribute(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__VERSION);
-		createEAttribute(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__ABSTRACT_SCHEMA_NAME);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__QUERIES);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__CMP_ATTRIBUTE);
-		createEReference(containerManagedEntityEClass, CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD);
-
-		methodPermissionEClass = createEClass(METHOD_PERMISSION);
-		createEAttribute(methodPermissionEClass, METHOD_PERMISSION__DESCRIPTION);
-		createEAttribute(methodPermissionEClass, METHOD_PERMISSION__UNCHECKED);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__ROLES);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__METHOD_ELEMENTS);
-		createEReference(methodPermissionEClass, METHOD_PERMISSION__DESCRIPTIONS);
-
-		assemblyDescriptorEClass = createEClass(ASSEMBLY_DESCRIPTOR);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__EJB_JAR);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__SECURITY_ROLES);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__EXCLUDE_LIST);
-		createEReference(assemblyDescriptorEClass, ASSEMBLY_DESCRIPTOR__MESSAGE_DESTINATIONS);
-
-		methodTransactionEClass = createEClass(METHOD_TRANSACTION);
-		createEAttribute(methodTransactionEClass, METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE);
-		createEAttribute(methodTransactionEClass, METHOD_TRANSACTION__DESCRIPTION);
-		createEReference(methodTransactionEClass, METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR);
-		createEReference(methodTransactionEClass, METHOD_TRANSACTION__METHOD_ELEMENTS);
-		createEReference(methodTransactionEClass, METHOD_TRANSACTION__DESCRIPTIONS);
-
-		sessionEClass = createEClass(SESSION);
-		createEAttribute(sessionEClass, SESSION__TRANSACTION_TYPE);
-		createEAttribute(sessionEClass, SESSION__SESSION_TYPE);
-		createEReference(sessionEClass, SESSION__SERVICE_ENDPOINT);
-
-		entityEClass = createEClass(ENTITY);
-		createEAttribute(entityEClass, ENTITY__REENTRANT);
-		createEReference(entityEClass, ENTITY__PRIMARY_KEY);
-
-		enterpriseBeanEClass = createEClass(ENTERPRISE_BEAN);
-		createEAttribute(enterpriseBeanEClass, ENTERPRISE_BEAN__NAME);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__SECURITY_ROLE_REFS);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__EJB_CLASS);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__HOME_INTERFACE);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__REMOTE_INTERFACE);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__EJB_JAR);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__SECURITY_IDENTITY);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE);
-		createEReference(enterpriseBeanEClass, ENTERPRISE_BEAN__LOCAL_INTERFACE);
-
-		ejbMethodCategoryEClass = createEClass(EJB_METHOD_CATEGORY);
-
-		ejbJarEClass = createEClass(EJB_JAR);
-		createEAttribute(ejbJarEClass, EJB_JAR__EJB_CLIENT_JAR);
-		createEAttribute(ejbJarEClass, EJB_JAR__VERSION);
-		createEReference(ejbJarEClass, EJB_JAR__ASSEMBLY_DESCRIPTOR);
-		createEReference(ejbJarEClass, EJB_JAR__ENTERPRISE_BEANS);
-		createEReference(ejbJarEClass, EJB_JAR__RELATIONSHIP_LIST);
-
-		methodElementEClass = createEClass(METHOD_ELEMENT);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__NAME);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__PARMS);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__TYPE);
-		createEAttribute(methodElementEClass, METHOD_ELEMENT__DESCRIPTION);
-		createEReference(methodElementEClass, METHOD_ELEMENT__ENTERPRISE_BEAN);
-		createEReference(methodElementEClass, METHOD_ELEMENT__DESCRIPTIONS);
-
-		cmpAttributeEClass = createEClass(CMP_ATTRIBUTE);
-		createEAttribute(cmpAttributeEClass, CMP_ATTRIBUTE__DESCRIPTION);
-		createEReference(cmpAttributeEClass, CMP_ATTRIBUTE__DESCRIPTIONS);
-
-		relationshipsEClass = createEClass(RELATIONSHIPS);
-		createEAttribute(relationshipsEClass, RELATIONSHIPS__DESCRIPTION);
-		createEReference(relationshipsEClass, RELATIONSHIPS__EJB_JAR);
-		createEReference(relationshipsEClass, RELATIONSHIPS__EJB_RELATIONS);
-		createEReference(relationshipsEClass, RELATIONSHIPS__DESCRIPTIONS);
-
-		queryEClass = createEClass(QUERY);
-		createEAttribute(queryEClass, QUERY__DESCRIPTION);
-		createEAttribute(queryEClass, QUERY__EJB_QL);
-		createEAttribute(queryEClass, QUERY__RETURN_TYPE_MAPPING);
-		createEReference(queryEClass, QUERY__QUERY_METHOD);
-		createEReference(queryEClass, QUERY__ENTITY);
-		createEReference(queryEClass, QUERY__DESCRIPTIONS);
-
-		ejbRelationEClass = createEClass(EJB_RELATION);
-		createEAttribute(ejbRelationEClass, EJB_RELATION__DESCRIPTION);
-		createEAttribute(ejbRelationEClass, EJB_RELATION__NAME);
-		createEReference(ejbRelationEClass, EJB_RELATION__RELATIONSHIP_LIST);
-		createEReference(ejbRelationEClass, EJB_RELATION__RELATIONSHIP_ROLES);
-		createEReference(ejbRelationEClass, EJB_RELATION__DESCRIPTIONS);
-
-		ejbRelationshipRoleEClass = createEClass(EJB_RELATIONSHIP_ROLE);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__DESCRIPTION);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__ROLE_NAME);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__MULTIPLICITY);
-		createEAttribute(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__CASCADE_DELETE);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__RELATIONSHIP);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__SOURCE);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__CMR_FIELD);
-		createEReference(ejbRelationshipRoleEClass, EJB_RELATIONSHIP_ROLE__DESCRIPTIONS);
-
-		roleSourceEClass = createEClass(ROLE_SOURCE);
-		createEAttribute(roleSourceEClass, ROLE_SOURCE__DESCRIPTION);
-		createEReference(roleSourceEClass, ROLE_SOURCE__ROLE);
-		createEReference(roleSourceEClass, ROLE_SOURCE__ENTITY_BEAN);
-		createEReference(roleSourceEClass, ROLE_SOURCE__DESCRIPTIONS);
-
-		cmrFieldEClass = createEClass(CMR_FIELD);
-		createEReference(cmrFieldEClass, CMR_FIELD__ROLE);
-		createEReference(cmrFieldEClass, CMR_FIELD__COLLECTION_TYPE);
-
-		messageDrivenEClass = createEClass(MESSAGE_DRIVEN);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__TRANSACTION_TYPE);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__MESSAGE_SELECTOR);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__ACKNOWLEDGE_MODE);
-		createEAttribute(messageDrivenEClass, MESSAGE_DRIVEN__LINK);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__DESTINATION);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__ACTIVATION_CONFIG);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__MESSAGE_DESTINATION);
-		createEReference(messageDrivenEClass, MESSAGE_DRIVEN__MESSAGING_TYPE);
-
-		messageDrivenDestinationEClass = createEClass(MESSAGE_DRIVEN_DESTINATION);
-		createEAttribute(messageDrivenDestinationEClass, MESSAGE_DRIVEN_DESTINATION__TYPE);
-		createEAttribute(messageDrivenDestinationEClass, MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY);
-		createEReference(messageDrivenDestinationEClass, MESSAGE_DRIVEN_DESTINATION__BEAN);
-
-		excludeListEClass = createEClass(EXCLUDE_LIST);
-		createEAttribute(excludeListEClass, EXCLUDE_LIST__DESCRIPTION);
-		createEReference(excludeListEClass, EXCLUDE_LIST__METHOD_ELEMENTS);
-		createEReference(excludeListEClass, EXCLUDE_LIST__DESCRIPTIONS);
-
-		queryMethodEClass = createEClass(QUERY_METHOD);
-		createEReference(queryMethodEClass, QUERY_METHOD__QUERY);
-
-		activationConfigPropertyEClass = createEClass(ACTIVATION_CONFIG_PROPERTY);
-		createEAttribute(activationConfigPropertyEClass, ACTIVATION_CONFIG_PROPERTY__VALUE);
-		createEAttribute(activationConfigPropertyEClass, ACTIVATION_CONFIG_PROPERTY__NAME);
-
-		activationConfigEClass = createEClass(ACTIVATION_CONFIG);
-		createEReference(activationConfigEClass, ACTIVATION_CONFIG__CONFIG_PROPERTIES);
-		createEReference(activationConfigEClass, ACTIVATION_CONFIG__DESCRIPTIONS);
-
-		// Create enums
-		transactionAttributeTypeEEnum = createEEnum(TRANSACTION_ATTRIBUTE_TYPE);
-		transactionTypeEEnum = createEEnum(TRANSACTION_TYPE);
-		sessionTypeEEnum = createEEnum(SESSION_TYPE);
-		methodElementKindEEnum = createEEnum(METHOD_ELEMENT_KIND);
-		acknowledgeModeEEnum = createEEnum(ACKNOWLEDGE_MODE);
-		subscriptionDurabilityKindEEnum = createEEnum(SUBSCRIPTION_DURABILITY_KIND);
-		returnTypeMappingEEnum = createEEnum(RETURN_TYPE_MAPPING);
-		destinationTypeEEnum = createEEnum(DESTINATION_TYPE);
-		multiplicityKindEEnum = createEEnum(MULTIPLICITY_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Add supertypes to classes
-		containerManagedEntityEClass.getESuperTypes().add(this.getEntity());
-		sessionEClass.getESuperTypes().add(this.getEnterpriseBean());
-		entityEClass.getESuperTypes().add(this.getEnterpriseBean());
-		enterpriseBeanEClass.getESuperTypes().add(theCommonPackage.getJNDIEnvRefsGroup());
-		ejbJarEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		cmpAttributeEClass.getESuperTypes().add(theEcorePackage.getEAttribute());
-		cmrFieldEClass.getESuperTypes().add(this.getCMPAttribute());
-		messageDrivenEClass.getESuperTypes().add(this.getEnterpriseBean());
-		queryMethodEClass.getESuperTypes().add(this.getMethodElement());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(containerManagedEntityEClass, ContainerManagedEntity.class, "ContainerManagedEntity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getContainerManagedEntity_Version(), ecorePackage.getEString(), "version", "2.x", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getContainerManagedEntity_AbstractSchemaName(), ecorePackage.getEString(), "abstractSchemaName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getContainerManagedEntity_PersistentAttributes(), this.getCMPAttribute(), null, "persistentAttributes", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getContainerManagedEntity_KeyAttributes(), this.getCMPAttribute(), null, "keyAttributes", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getContainerManagedEntity_Queries(), this.getQuery(), this.getQuery_Entity(), "queries", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getContainerManagedEntity_CMPAttribute(), this.getCMPAttribute(), null, "CMPAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getContainerManagedEntity_PrimKeyField(), this.getCMPAttribute(), null, "primKeyField", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(methodPermissionEClass, MethodPermission.class, "MethodPermission", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getMethodPermission_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMethodPermission_Unchecked(), ecorePackage.getEBoolean(), "unchecked", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodPermission_AssemblyDescriptor(), this.getAssemblyDescriptor(), this.getAssemblyDescriptor_MethodPermissions(), "assemblyDescriptor", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodPermission_Roles(), theCommonPackage.getSecurityRole(), null, "roles", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodPermission_MethodElements(), this.getMethodElement(), null, "methodElements", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodPermission_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(assemblyDescriptorEClass, AssemblyDescriptor.class, "AssemblyDescriptor", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_MethodPermissions(), this.getMethodPermission(), this.getMethodPermission_AssemblyDescriptor(), "methodPermissions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_MethodTransactions(), this.getMethodTransaction(), this.getMethodTransaction_AssemblyDescriptor(), "methodTransactions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_EjbJar(), this.getEJBJar(), this.getEJBJar_AssemblyDescriptor(), "ejbJar", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_SecurityRoles(), theCommonPackage.getSecurityRole(), null, "securityRoles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_ExcludeList(), this.getExcludeList(), null, "excludeList", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getAssemblyDescriptor_MessageDestinations(), theCommonPackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(methodTransactionEClass, MethodTransaction.class, "MethodTransaction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getMethodTransaction_TransactionAttribute(), this.getTransactionAttributeType(), "transactionAttribute", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMethodTransaction_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodTransaction_AssemblyDescriptor(), this.getAssemblyDescriptor(), this.getAssemblyDescriptor_MethodTransactions(), "assemblyDescriptor", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodTransaction_MethodElements(), this.getMethodElement(), null, "methodElements", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodTransaction_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(sessionEClass, Session.class, "Session", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getSession_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getSession_SessionType(), this.getSessionType(), "sessionType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getSession_ServiceEndpoint(), theJavaRefPackage.getJavaClass(), null, "serviceEndpoint", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(entityEClass, Entity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEntity_Reentrant(), ecorePackage.getEBoolean(), "reentrant", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEntity_PrimaryKey(), theJavaRefPackage.getJavaClass(), null, "primaryKey", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(enterpriseBeanEClass, EnterpriseBean.class, "EnterpriseBean", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEnterpriseBean_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_SecurityRoleRefs(), theCommonPackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_EjbClass(), theJavaRefPackage.getJavaClass(), null, "ejbClass", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_HomeInterface(), theJavaRefPackage.getJavaClass(), null, "homeInterface", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_RemoteInterface(), theJavaRefPackage.getJavaClass(), null, "remoteInterface", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_EjbJar(), this.getEJBJar(), this.getEJBJar_EnterpriseBeans(), "ejbJar", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_SecurityIdentity(), theCommonPackage.getSecurityIdentity(), null, "securityIdentity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_LocalHomeInterface(), theJavaRefPackage.getJavaClass(), null, "localHomeInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEnterpriseBean_LocalInterface(), theJavaRefPackage.getJavaClass(), null, "localInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(ejbMethodCategoryEClass, EJBMethodCategory.class, "EJBMethodCategory", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(ejbJarEClass, EJBJar.class, "EJBJar", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEJBJar_EjbClientJar(), ecorePackage.getEString(), "ejbClientJar", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEJBJar_Version(), ecorePackage.getEString(), "version", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBJar_AssemblyDescriptor(), this.getAssemblyDescriptor(), this.getAssemblyDescriptor_EjbJar(), "assemblyDescriptor", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBJar_EnterpriseBeans(), this.getEnterpriseBean(), this.getEnterpriseBean_EjbJar(), "enterpriseBeans", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBJar_RelationshipList(), this.getRelationships(), this.getRelationships_EjbJar(), "relationshipList", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(methodElementEClass, MethodElement.class, "MethodElement", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getMethodElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMethodElement_Parms(), ecorePackage.getEString(), "parms", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMethodElement_Type(), this.getMethodElementKind(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMethodElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodElement_EnterpriseBean(), this.getEnterpriseBean(), null, "enterpriseBean", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMethodElement_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(cmpAttributeEClass, CMPAttribute.class, "CMPAttribute", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getCMPAttribute_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getCMPAttribute_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(relationshipsEClass, Relationships.class, "Relationships", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getRelationships_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getRelationships_EjbJar(), this.getEJBJar(), this.getEJBJar_RelationshipList(), "ejbJar", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getRelationships_EjbRelations(), this.getEJBRelation(), this.getEJBRelation_RelationshipList(), "ejbRelations", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getRelationships_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(queryEClass, Query.class, "Query", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getQuery_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getQuery_EjbQL(), ecorePackage.getEString(), "ejbQL", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getQuery_ReturnTypeMapping(), this.getReturnTypeMapping(), "returnTypeMapping", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getQuery_QueryMethod(), this.getQueryMethod(), this.getQueryMethod_Query(), "queryMethod", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getQuery_Entity(), this.getContainerManagedEntity(), this.getContainerManagedEntity_Queries(), "entity", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getQuery_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(ejbRelationEClass, EJBRelation.class, "EJBRelation", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEJBRelation_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEJBRelation_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBRelation_RelationshipList(), this.getRelationships(), this.getRelationships_EjbRelations(), "relationshipList", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBRelation_RelationshipRoles(), this.getEJBRelationshipRole(), this.getEJBRelationshipRole_Relationship(), "relationshipRoles", null, 2, 2, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBRelation_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(ejbRelationshipRoleEClass, EJBRelationshipRole.class, "EJBRelationshipRole", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getEJBRelationshipRole_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEJBRelationshipRole_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEJBRelationshipRole_Multiplicity(), this.getMultiplicityKind(), "multiplicity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getEJBRelationshipRole_CascadeDelete(), ecorePackage.getEBoolean(), "cascadeDelete", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBRelationshipRole_Relationship(), this.getEJBRelation(), this.getEJBRelation_RelationshipRoles(), "relationship", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBRelationshipRole_Source(), this.getRoleSource(), this.getRoleSource_Role(), "source", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBRelationshipRole_CmrField(), this.getCMRField(), this.getCMRField_Role(), "cmrField", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getEJBRelationshipRole_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(roleSourceEClass, RoleSource.class, "RoleSource", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getRoleSource_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getRoleSource_Role(), this.getEJBRelationshipRole(), this.getEJBRelationshipRole_Source(), "role", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getRoleSource_EntityBean(), this.getContainerManagedEntity(), null, "entityBean", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getRoleSource_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(cmrFieldEClass, CMRField.class, "CMRField", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getCMRField_Role(), this.getEJBRelationshipRole(), this.getEJBRelationshipRole_CmrField(), "role", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getCMRField_CollectionType(), theJavaRefPackage.getJavaClass(), null, "collectionType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(messageDrivenEClass, MessageDriven.class, "MessageDriven", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getMessageDriven_TransactionType(), this.getTransactionType(), "transactionType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMessageDriven_MessageSelector(), ecorePackage.getEString(), "messageSelector", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMessageDriven_AcknowledgeMode(), this.getAcknowledgeMode(), "acknowledgeMode", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMessageDriven_Link(), ecorePackage.getEString(), "link", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMessageDriven_Destination(), this.getMessageDrivenDestination(), this.getMessageDrivenDestination_Bean(), "destination", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMessageDriven_ActivationConfig(), this.getActivationConfig(), null, "activationConfig", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMessageDriven_MessageDestination(), theJavaRefPackage.getJavaClass(), null, "messageDestination", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMessageDriven_MessagingType(), theJavaRefPackage.getJavaClass(), null, "messagingType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(messageDrivenDestinationEClass, MessageDrivenDestination.class, "MessageDrivenDestination", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenDestination_Type(), this.getDestinationType(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getMessageDrivenDestination_SubscriptionDurability(), this.getSubscriptionDurabilityKind(), "subscriptionDurability", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getMessageDrivenDestination_Bean(), this.getMessageDriven(), this.getMessageDriven_Destination(), "bean", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(excludeListEClass, ExcludeList.class, "ExcludeList", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getExcludeList_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getExcludeList_MethodElements(), this.getMethodElement(), null, "methodElements", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getExcludeList_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(queryMethodEClass, QueryMethod.class, "QueryMethod", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getQueryMethod_Query(), this.getQuery(), this.getQuery_QueryMethod(), "query", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(activationConfigPropertyEClass, ActivationConfigProperty.class, "ActivationConfigProperty", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getActivationConfigProperty_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getActivationConfigProperty_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		initEClass(activationConfigEClass, ActivationConfig.class, "ActivationConfig", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getActivationConfig_ConfigProperties(), this.getActivationConfigProperty(), null, "configProperties", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getActivationConfig_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(transactionAttributeTypeEEnum, TransactionAttributeType.class, "TransactionAttributeType"); //$NON-NLS-1$
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.NOT_SUPPORTED_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.SUPPORTS_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.REQUIRED_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.REQUIRES_NEW_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.MANDATORY_LITERAL);
-		addEEnumLiteral(transactionAttributeTypeEEnum, TransactionAttributeType.NEVER_LITERAL);
-
-		initEEnum(transactionTypeEEnum, TransactionType.class, "TransactionType"); //$NON-NLS-1$
-		addEEnumLiteral(transactionTypeEEnum, TransactionType.BEAN_LITERAL);
-		addEEnumLiteral(transactionTypeEEnum, TransactionType.CONTAINER_LITERAL);
-
-		initEEnum(sessionTypeEEnum, SessionType.class, "SessionType"); //$NON-NLS-1$
-		addEEnumLiteral(sessionTypeEEnum, SessionType.STATEFUL_LITERAL);
-		addEEnumLiteral(sessionTypeEEnum, SessionType.STATELESS_LITERAL);
-
-		initEEnum(methodElementKindEEnum, MethodElementKind.class, "MethodElementKind"); //$NON-NLS-1$
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.UNSPECIFIED_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.REMOTE_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.HOME_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.LOCAL_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.LOCAL_HOME_LITERAL);
-		addEEnumLiteral(methodElementKindEEnum, MethodElementKind.SERVICE_ENDPOINT_LITERAL);
-
-		initEEnum(acknowledgeModeEEnum, AcknowledgeMode.class, "AcknowledgeMode"); //$NON-NLS-1$
-		addEEnumLiteral(acknowledgeModeEEnum, AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL);
-		addEEnumLiteral(acknowledgeModeEEnum, AcknowledgeMode.DUPS_OK_ACKNOWLEDGE_LITERAL);
-
-		initEEnum(subscriptionDurabilityKindEEnum, SubscriptionDurabilityKind.class, "SubscriptionDurabilityKind"); //$NON-NLS-1$
-		addEEnumLiteral(subscriptionDurabilityKindEEnum, SubscriptionDurabilityKind.DURABLE_LITERAL);
-		addEEnumLiteral(subscriptionDurabilityKindEEnum, SubscriptionDurabilityKind.NON_DURABLE_LITERAL);
-
-		initEEnum(returnTypeMappingEEnum, ReturnTypeMapping.class, "ReturnTypeMapping"); //$NON-NLS-1$
-		addEEnumLiteral(returnTypeMappingEEnum, ReturnTypeMapping.LOCAL_LITERAL);
-		addEEnumLiteral(returnTypeMappingEEnum, ReturnTypeMapping.REMOTE_LITERAL);
-
-		initEEnum(destinationTypeEEnum, DestinationType.class, "DestinationType"); //$NON-NLS-1$
-		addEEnumLiteral(destinationTypeEEnum, DestinationType.QUEUE_LITERAL);
-		addEEnumLiteral(destinationTypeEEnum, DestinationType.TOPIC_LITERAL);
-
-		initEEnum(multiplicityKindEEnum, MultiplicityKind.class, "MultiplicityKind"); //$NON-NLS-1$
-		addEEnumLiteral(multiplicityKindEEnum, MultiplicityKind.ONE_LITERAL);
-		addEEnumLiteral(multiplicityKindEEnum, MultiplicityKind.MANY_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //EjbPackageImpl
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EnterpriseBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EnterpriseBeanImpl.java
deleted file mode 100644
index 0b252eb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EnterpriseBeanImpl.java
+++ /dev/null
@@ -1,1447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbMethodElementComparator;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.wst.common.internal.emf.utilities.Revisit;
-
-/**
- * @generated
- * EnterpriseJavaBean is a class.  It can have instances, someone could write an instance document containing Departments and Employees.  It also has attributes, operations, and associations.  These are actually derived//filtered from its implementation classes and interfaces.  For mapping and browsing purposes, though, you would like the EJB to appear as a class.  
- * 
- * In this light, even Session Beans can have associations and properties implemented by their bean.  For example, it would be meaningful to describe associations from a Session to the Entities which it uses to perform its work.
- */
-public abstract class EnterpriseBeanImpl extends JNDIEnvRefsGroupImpl implements EnterpriseBean {
-
-	protected final static Method[] EMPTY_METHOD_ARRAY = new Method[0];
-	protected static final String METHOD_ELEMENT_NAME = "MethodElement"; //$NON-NLS-1$
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoleRefs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass ejbClass = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass homeInterface = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass remoteInterface = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SecurityIdentity securityIdentity = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass localHomeInterface = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass localInterface = null;
-	protected EjbMethodElementComparator defaultMethodElementComparator;
-	public EnterpriseBeanImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getEnterpriseBean();
-	}
-
-	/**
-	 * createClassRef - return a JavaURL reference to the named Java class
-	 */
-	public JavaClass createClassRef(String targetName) {
-		return getJavaRefFactory().createClassRef(targetName);
-	}
-
-	protected List createMethodElements(List signatures, Enumerator aType) {
-		return createMethodElements(METHOD_ELEMENT_NAME, signatures, aType);
-	}
-	
-	protected List createMethodElements(String meTypeName, List signatures, Enumerator aType) {
-		int size = signatures.size();
-		List methodElements = new ArrayList(size);
-		String signature;
-		MethodElement me;
-		for (int i = 0; i < size; i++) {
-			signature = (String) signatures.get(i);
-			me = (MethodElement) getEjbFactory().create((EClass)getEjbPackage().getEClassifier(meTypeName));
-			me.initializeFromSignature(signature);
-			me.setEnterpriseBean(this);
-			me.setType((MethodElementKind)aType);
-			methodElements.add(me);
-		}
-		return methodElements;
-	}
-
-	public List createMethodElements(List someMethods, JavaClass anInterface) {
-		return createMethodElements(METHOD_ELEMENT_NAME, someMethods, anInterface);
-	}
-	
-	public List createMethodElements(String meTypeName, List someMethods, JavaClass anInterface) {
-		if (anInterface == null)
-			return Collections.EMPTY_LIST;
-		List signatures = getMethodElementSignatures(someMethods);
-		Collections.sort(signatures);
-		Enumerator enumerator = getMethodElementKindLiteral(anInterface);
-		return createMethodElements(meTypeName, signatures, enumerator);
-	}
-	
-	protected Enumerator getMethodElementKindLiteral(JavaClass anInterface) {
-		Enumerator enumerator = MethodElementKind.UNSPECIFIED_LITERAL;
-		if (anInterface == getHomeInterface())
-			enumerator = MethodElementKind.HOME_LITERAL;
-		else if (anInterface == getRemoteInterface())
-			enumerator = MethodElementKind.REMOTE_LITERAL;
-		else if (anInterface == getLocalHomeInterface())
-			enumerator = MethodElementKind.LOCAL_HOME_LITERAL;
-		else if (anInterface == getLocalInterface())
-			enumerator = MethodElementKind.LOCAL_LITERAL;
-		return enumerator;
-	}
-	
-	protected List getMethodElementSignatures(List someMethods) {
-		int size = someMethods.size();
-		List signatures = new ArrayList(size);
-		Method method;
-		for (int i = 0; i < size; i++) {
-			method = (Method) someMethods.get(i);
-			signatures.add(method.getMethodElementSignature());
-		}
-		return signatures;
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 * @deprecated use getAvailableUnspecifiedMethodElements();
-	 */
-	public List getAvailableCommonMethodElements() {
-		return getAvailableUnspecifiedMethodElements();
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableUnspecifiedMethodElements() {
-		List commonSigs = getAvailableUnspecifiedMethodElementSignatures();
-		return createMethodElements(commonSigs, MethodElementKind.UNSPECIFIED_LITERAL);
-	}
-	protected List gatherCommonSignatures(List sigCollections) {
-		if (sigCollections.isEmpty()) return sigCollections;
-		List first = (List)sigCollections.get(0);
-		if (sigCollections.size() == 1) return first;
-		List result = new ArrayList(first.size());
-		sigCollections.remove(0);
-		String sig = null;
-		boolean contains = false;
-		for (int i = 0; i < first.size(); i++) {
-			contains = false;
-			sig = (String) first.get(i);
-			List list = null;
-			for (int j = 0; j < sigCollections.size(); j++) {
-				list = (List) sigCollections.get(j);
-				if (list.contains(sig))
-					contains = true;
-			}
-			if (contains)
-				result.add(sig);
-		}
-		return result;
-	}
-	/**
-	 * Return a List of MethodElements that are set for a particular EObject
-	 * which can be a MethodTransaction or a MethodPermission.
-	 */
-	protected List getExistingMethodElements(EObject refObject) {
-		if (refObject != null) {
-			EjbPackage pack = getEjbPackage();
-			if (refObject.eClass() == pack.getMethodTransaction())
-				return ((MethodTransaction)refObject).getMethodElements(this);
-			if (refObject.eClass() == pack.getMethodPermission())
-				return ((MethodPermission)refObject).getMethodElements(this);
-		}
-		return Collections.EMPTY_LIST;
-	}
-	/**
-	 * This method will return a List of MethodElements signatures
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.
-	 * @deprecated use getAvailableUnspecifiedMethodElementSignatures();
-	 */
-	public List getAvailableCommonMethodElementSignatures() {
-		return getAvailableUnspecifiedMethodElementSignatures();
-	}
-	/**
-	 * This method will return a List of MethodElements signatures
-	 * that represent all the possible MethodElements that can be created
-	 * and are common to both the Home and Remote interfaces.
-	 */
-	public List getAvailableUnspecifiedMethodElementSignatures() {
-		List sigCollections = new ArrayList();
-		if (getHomeInterface() != null)
-			sigCollections.add(getHomeInterface().getMethodElementSignatures());
-		if (getRemoteInterface() != null)
-			sigCollections.add(getRemoteInterface().getMethodElementSignatures());
-		if (getLocalHomeInterface() != null)
-			sigCollections.add(getLocalHomeInterface().getMethodElementSignatures());
-		if (getLocalInterface() != null)
-			sigCollections.add(getLocalInterface().getMethodElementSignatures());	
-		return gatherCommonSignatures(sigCollections);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Home interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableHomeMethodElements() {
-		return getAvailableMethodElements(getHomeInterface(), MethodElementKind.HOME_LITERAL);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Local Home interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableLocalHomeMethodElements() {
-		return getAvailableMethodElements(getLocalHomeInterface(), MethodElementKind.LOCAL_HOME_LITERAL);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Local interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableLocalMethodElements() {
-		return getAvailableMethodElements(getLocalInterface(), MethodElementKind.LOCAL_LITERAL);
-	}
-
-	public List getAvailableServiceEndpointMethodElements(){
-		return getAvailableMethodElements(getServiceEndpoint(), MethodElementKind.SERVICE_ENDPOINT_LITERAL);
-	}
-	
-	protected List getAvailableMethodElements(JavaClass anInterface, Enumerator aType) {
-		if (anInterface == null)
-			return Collections.EMPTY_LIST;
-		List signatures = anInterface.getMethodElementSignatures();
-		return createMethodElements(signatures, aType);
-	}
-	/**
-	 * This method will return a List of newly created MethodElements
-	 * that represent all the possible MethodElements that can be created
-	 * for the Remote interface.  These MethodElements are not contained and will
-	 * not be serialized and should not be added to the model.  Their intention is
-	 * solely for comparing with actual MethodElements contained in the model.
-	 */
-	public List getAvailableRemoteMethodElements() {
-		return getAvailableMethodElements(getRemoteInterface(), MethodElementKind.REMOTE_LITERAL);
-	}
-	
-	/*
-	 * See EnterpriseBean#getExistingOrAvailableMethodElements(EObject, Comparator);
-	 */
-	public List getExistingOrAvailableMethodElements(EObject refObject, Comparator comparator) {
-		List result = new ArrayList();
-		result.addAll(getAvailableHomeMethodElements());
-		result.addAll(getAvailableRemoteMethodElements());
-		result.addAll(getAvailableLocalHomeMethodElements());
-		result.addAll(getAvailableLocalMethodElements());
-		result.addAll(getAvailableServiceEndpointMethodElements());
-		result.addAll(getAvailableUnspecifiedMethodElements());
-		unionMethodElements(result, getExistingMethodElements(refObject));
-		Collections.sort(result, comparator);
-		return result;
-	}
-	/*
-	 * See EnterpriseBean#getExistingOrAvailableMethodElements(EObject);
-	 */
-	public List getExistingOrAvailableMethodElements(EObject refObject) {
-		return getExistingOrAvailableMethodElements(refObject, getDefaultMethodElementComparator());	
-	}
-	
-	protected EjbMethodElementComparator getDefaultMethodElementComparator() {
-		if (defaultMethodElementComparator == null)
-			defaultMethodElementComparator = new EjbMethodElementComparator();
-		return defaultMethodElementComparator;
-	}
-	protected void unionMethodElements(List sourceMethodElements, List additionalMethodElements) {
-		MethodElement sourceME, additionalME;
-		int sourceSize, addSize;
-		sourceSize = sourceMethodElements.size();
-		addSize = additionalMethodElements.size();
-		List foundElements = new ArrayList(addSize);
-		boolean found = false;
-		for (int i = 0; i < addSize; i++){
-			found = false;
-			additionalME = (MethodElement) additionalMethodElements.get(i);
-			sourceME = null;
-			for (int ii = 0; ii < sourceSize; ii++){
-				sourceME = (MethodElement) sourceMethodElements.get(ii);
-				if (sourceME.isEquivalent(additionalME)) {
-					found = true;
-					break;
-				}
-			}
-			if (found)
-				foundElements.add(sourceME);
-		}
-		sourceMethodElements.removeAll(foundElements);
-		sourceMethodElements.addAll(additionalMethodElements);
-	}
-	public String getEjbClassName() {
-		getEjbClass();
-		return (ejbClass == null) ? null : ejbClass.getQualifiedName();
-	}
-	protected EjbPackage getEjbPackage() {
-		return EjbFactoryImpl.getPackage();
-	}
-	protected EjbFactory getEjbFactory() {
-		return ((EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory();
-	}
-	public EjbRef getEquivalentEjbRef(EjbRef anEjbRef) {
-		return getEquivalentEjbRef(anEjbRef, getEjbRefs());
-	}
-	public EJBLocalRef getEquivalentEJBLocalRef(EJBLocalRef anEjbLocalRef) {
-		return (EJBLocalRef) getEquivalentEjbRef(anEjbLocalRef, getEjbLocalRefs());
-	}
-	private EjbRef getEquivalentEjbRef(EjbRef anEjbRef, List someRefs) {
-		if (anEjbRef == null)
-			return null;
-		int size = someRefs.size();
-		EjbRef ref;
-		for (int i = 0; i < size; i++) {
-			ref = (EjbRef) someRefs.get(i);
-			if (ref.isEquivalent(anEjbRef))
-				return ref;
-		}
-		return null;
-	}
-	public String getHomeInterfaceName() {
-		getHomeInterface();
-		return homeInterface == null ? null : homeInterface.getQualifiedName();
-	}
-	/**
-	 * See <code>getMethods<code> for comment
-	 */
-	public Method[] getHomeMethodsForDeployment() {
-		return (getHomeInterface() != null ? getMethods(getHomeInterface()) : EMPTY_METHOD_ARRAY);
-	}
-	private JavaRefFactory getJavaRefFactory() {
-		return ((JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI)).getJavaRefFactory();
-	}
-	public EjbRef getLinkedEJBReference(EnterpriseBean anEJB) {
-		return getLinkedEJBReference(anEJB, getEjbRefs());
-	}
-	public EJBLocalRef getLinkedEJBLocalReference(EnterpriseBean anEJB) {
-		return (EJBLocalRef) getLinkedEJBReference(anEJB, getEjbLocalRefs());
-	}
-	private EjbRef getLinkedEJBReference(EnterpriseBean anEJB, List someRefs) {
-		if (anEJB == null)
-			return null;
-		int size = someRefs.size();
-		EjbRef ref;
-		for (int i = 0; i < size; i++) {
-			ref = (EjbRef) someRefs.get(i);
-			if (ref.isLinked(anEJB))
-				return ref;
-		}
-		return null;
-	}
-	public String getLocalHomeInterfaceName() {
-		getLocalHomeInterface();
-		return localHomeInterface == null ? null : localHomeInterface.getQualifiedName();
-	}
-	/**
-	 * See <code>getMethods<code> for comment
-	 */
-	public Method[] getLocalHomeMethodsForDeployment() {
-		return (getLocalHomeInterface() != null ? getMethods(getLocalHomeInterface()) : EMPTY_METHOD_ARRAY);
-	}
-	public String getLocalInterfaceName() {
-		getLocalInterface();
-		return localInterface == null ? null : localInterface.getQualifiedName();
-	}
-	/**
-	 * Retrieve an ordered list of methods for the given JavaClass.
-	 * The list should include all non-static, public methods that are
-	 * not inherited from javax.ejb.EJBObject
-	 * This uses the algorithm that web sphere currently uses, and could
-	 * be subject to change
-	 * Creation date: (8/21/00 1:41:03 PM)
-	 * @param intf JavaClass
-	 */
-	public static Method[] getMethods(JavaClass intf) {
-		Method[] allMethods = intf.listMethodExtended();
-		java.util.Vector resultVector = new java.util.Vector(allMethods.length);
-		java.util.Hashtable methodNameTable = new java.util.Hashtable();
-
-		//----------------------------------------------------------------
-		// Iterate over the list returned by "listMethodExtended" and
-		// filter out methods belonging to the EJBObject interface
-		// and method synonyms. 
-		//
-		// Method synonyms correspond to overrides. For all synonyms
-		// keep the method instance declared on the most specific class. 
-		// How do you determine the most specific class? Don't know.
-		// For now, if the method is declared on the interface class
-		// it always overrides others.
-		//----------------------------------------------------------------
-
-		Method[] result = null;
-
-		for (int i = 0; i < allMethods.length; i++) {
-			Method m = allMethods[i];
-
-			//---------------------------
-			// Filter out static methods
-			//---------------------------
-
-			if (m.isStatic()) {
-				continue;
-			}
-
-			String mKey = methodKey(m);
-
-			String interfaceName = m.getContainingJavaClass().getJavaName();
-			if (!interfaceName.equals("javax.ejb.EJBObject")) { //$NON-NLS-1$
-				Method synonym = (Method) methodNameTable.get(mKey);
-				if (synonym == null) {
-					methodNameTable.put(mKey, m);
-					resultVector.addElement(m);
-				} else {
-					//---------------------------------------------
-					// Method declared on most specific class wins
-					//---------------------------------------------
-					JavaClass mClass = m.getContainingJavaClass();
-					JavaClass sClass = synonym.getContainingJavaClass();
-					if (sClass.implementsInterface(mClass)) {
-						resultVector.removeElement(synonym);
-						methodNameTable.put(mKey, m);
-						resultVector.addElement(m);
-					}
-				}
-			}
-		}
-
-		result = new Method[resultVector.size()];
-		resultVector.copyInto(result);
-		return sortMethods(result);
-	}
-	public String getRemoteInterfaceName() {
-		getRemoteInterface();
-		return remoteInterface == null ? null : remoteInterface.getQualifiedName();
-	}
-	/**
-	 * See <code>getMethods<code> for comment
-	 */
-	public Method[] getRemoteMethodsForDeployment() {
-		return getMethods(getRemoteInterface());
-	}
-	/**
-	 * Return true if @aJavaClass as equal to the
-	 * home, remote, bean class, or key class.
-	 */
-	public boolean hasJavaReference(JavaClass aJavaClass) {
-		if (aJavaClass != null) {
-			return aJavaClass.equals(getEjbClass())||
-					aJavaClass.equals(getRemoteInterface()) || 
-					aJavaClass.equals(getHomeInterface()) || 
-					aJavaClass.equals(getLocalInterface()) ||
-					aJavaClass.equals(getLocalHomeInterface());
-		}
-		return false;
-	}
-	/**
-	 * Return true if this ejb has BeanManagedPersistance.
-	 */
-	public boolean isBeanManagedEntity() {
-		return isEntity() && !isContainerManagedEntity();
-	}
-	/**
-	 * isContainerManagedEntity method comment.
-	 */
-	public boolean isContainerManagedEntity() {
-		return false;
-	}
-	//Return false by default
-	public boolean isEntity() {
-		return false;
-	}
-	//Return false by default
-	public boolean isMessageDriven() {
-		return false;
-	}
-	//Return false by default
-	public boolean isSession() {
-		return false;
-	}
-	/**
-	 * @deprecated - Use getEjbJar().getVersionID()
-	 * isVersion1_X method comment.
-	 */
-	public boolean isVersion1_X() {
-		if (getEjbJar() != null)
-			return getEjbJar().getVersionID() <= J2EEVersionConstants.EJB_1_1_ID;
-		Revisit.revisit(); //jsholl this should throw an exception. if there is not JAR then the version is undefined
-		return false;
-	}
-	/**
-	 * @deprecated - Use getEjbJar().getVersionID()
-	 * isVersion2_X method comment.
-	 */
-	public boolean isVersion2_X() {
-		if (getEjbJar() != null) {
-			return getEjbJar().getVersionID() >= J2EEVersionConstants.EJB_1_1_ID;
-		}
-		Revisit.revisit(); //jsholl this should throw an exception. if there is not JAR then the version is undefined
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean#getVersionID()
-	 */
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getModuleVersionID();
-	}
-
-	
-	/*
-	 * @see EnterpriseBean#hasLocalClient()
-	 */
-	public boolean hasLocalClient() {
-		return getLocalInterface() != null && getLocalHomeInterface() != null;
-	}
-
-	/*
-	 * @see EnterpriseBean#hasRemoteClient()
-	 */
-	public boolean hasRemoteClient() {
-		return getRemoteInterface() != null && getHomeInterface() != null;
-	}
-	
-	/**
-	 *  Get method name string of form: 
-	 *  methodName(class name of arg1,class name of arg2,...)
-	 * Creation date: (8/24/00 1:21:10 PM)
-	 * @return String
-	 * @param m Method
-	 */
-	private static String methodKey(Method m) {
-		StringBuffer result = new StringBuffer(m.getName());
-
-		result.append("("); //$NON-NLS-1$
-
-		java.util.List args = m.getParameters();
-		JavaParameter arg;
-		for (int i = 0; i < args.size(); i++) {
-			arg = (JavaParameter) args.get(i);
-			result.append(((JavaHelpers) arg.getEType()).getJavaName());
-			result.append(","); //$NON-NLS-1$
-		}
-		result.append(")"); //$NON-NLS-1$
-		return result.toString();
-	}
-	public Object primRefValue(EObject feature) {
-		switch (eDerivedStructuralFeatureID(((EStructuralFeature)feature).getFeatureID(), ((EStructuralFeature)feature).getContainerClass())) {
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTION :
-				return getDescription();
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAME :
-				return getDisplayName();
-			case EjbPackage.ENTERPRISE_BEAN__SMALL_ICON :
-				return getSmallIcon();
-			case EjbPackage.ENTERPRISE_BEAN__LARGE_ICON :
-				return getLargeIcon();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_REFS :
-				return getResourceRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS :
-				return getEjbClass();
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE :
-				return getHomeInterface();
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE :
-				return getRemoteInterface();
-			case EjbPackage.ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES :
-				return getEnvironmentProperties();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS :
-				return getSecurityRoleRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_REFS :
-				return getEjbRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_LOCAL_REFS :
-				return getEjbLocalRefs();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_ENV_REFS :
-				return getResourceEnvRefs();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY :
-				return getSecurityIdentity();
-			case EjbPackage.ENTERPRISE_BEAN__NAME :
-				return getName();
-		}
-		return null;
-	}
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.EnterpriseBean
-	 */
-	public void reSyncSecurityRoleRef(java.lang.String existingRoleName, java.lang.String newRoleName) {
-		List roleRefs = getSecurityRoleRefs();
-		for (int i = 0; i < roleRefs.size(); i++) {
-			SecurityRoleRef roleRef = (SecurityRoleRef) roleRefs.get(i);
-			if (roleRef.getLink() != null && roleRef.getLink().equals(existingRoleName))
-				roleRef.setLink(newRoleName);
-		}
-	}
-	public void setEjbClassName(String ejbClassName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_EjbClass(), createClassRef(ejbClassName));
-	}
-	public void setHomeInterfaceName(String homeInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface(), createClassRef(homeInterfaceName));
-	}
-	public void setLocalHomeInterfaceName(String localHomeInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalHomeInterface(), createClassRef(localHomeInterfaceName));
-	}
-	public void setLocalInterfaceName(String localInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface(), createClassRef(localInterfaceName));
-	}
-	public void setRemoteInterfaceName(String remoteInterfaceName) {
-		eSet(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface(), createClassRef(remoteInterfaceName));
-	}
-	/**
-	 * Insert the method's description here.
-	 * Creation date: (8/24/00 1:32:13 PM)
-	 * @return Method[]
-	 * @param methods Method[]
-	 */
-	private static Method[] sortMethods(Method[] methods) {
-		Method result[] = new Method[methods.length];
-
-		/**
-		 *  Insert each element of given list of methods into result
-		 *  arary in sorted order
-		 */
-
-		for (int i = 0; i < methods.length; i++) {
-			Method currMethod = methods[i];
-			String currMethodName = currMethod.getSignature();
-			int insertIndex = 0;
-			while (insertIndex < i) {
-				if (currMethodName.compareTo(result[insertIndex].getSignature()) <= 0) {
-					break;
-				}
-				insertIndex++;
-			}
-
-			for (int j = insertIndex; j <= i; j++) {
-				Method tmpMethod = result[j];
-				result[j] = currMethod;
-				currMethod = tmpMethod;
-			}
-		}
-		return result;
-	}
-	public String toString() {
-		return getClass().getName() + "(" + getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoleRefs() {
-		if (securityRoleRefs == null) {
-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS);
-		}
-		return securityRoleRefs;
-	}
-
-    /**
-     * Handwritten version of getEjbClass():
-     */
- 
- 
-    public JavaClass getEjbClass()  { 
-       if (ejbClass != null && ejbClass.eIsProxy()) { 
-          JavaClass oldEjbClass = ejbClass; 
-          JavaClass resolved = (JavaClass)EcoreUtil.resolve(ejbClass, this); 
-          resolved(this.ejbClass, resolved);
-          this.ejbClass = resolved;
-          if (ejbClass != oldEjbClass) { 
-             if (eNotificationRequired()) 
-                eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldEjbClass, ejbClass)); 
-          } 
-       } 
-       return ejbClass; 
-    } 
- 
-         
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbClass(JavaClass newEjbClass) {
-		JavaClass oldEjbClass = ejbClass;
-		ejbClass = newEjbClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldEjbClass, ejbClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getHomeInterface() {
-		if (homeInterface != null && homeInterface.eIsProxy()) {
-			JavaClass oldHomeInterface = homeInterface;
-			homeInterface = (JavaClass)eResolveProxy((InternalEObject)homeInterface);
-			if (homeInterface != oldHomeInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE, oldHomeInterface, homeInterface));
-			}
-		}
-		return homeInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetHomeInterface() {
-		return homeInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setHomeInterface(JavaClass newHomeInterface) {
-		JavaClass oldHomeInterface = homeInterface;
-		homeInterface = newHomeInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE, oldHomeInterface, homeInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getRemoteInterface() {
-		if (remoteInterface != null && remoteInterface.eIsProxy()) {
-			JavaClass oldRemoteInterface = remoteInterface;
-			remoteInterface = (JavaClass)eResolveProxy((InternalEObject)remoteInterface);
-			if (remoteInterface != oldRemoteInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE, oldRemoteInterface, remoteInterface));
-			}
-		}
-		return remoteInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetRemoteInterface() {
-		return remoteInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRemoteInterface(JavaClass newRemoteInterface) {
-		JavaClass oldRemoteInterface = remoteInterface;
-		remoteInterface = newRemoteInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE, oldRemoteInterface, remoteInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBJar getEjbJar() {
-		if (eContainerFeatureID != EjbPackage.ENTERPRISE_BEAN__EJB_JAR) return null;
-		return (EJBJar)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbJar(EJBJar newEjbJar) {
-		if (newEjbJar != eContainer || (eContainerFeatureID != EjbPackage.ENTERPRISE_BEAN__EJB_JAR && newEjbJar != null)) {
-			if (EcoreUtil.isAncestor(this, newEjbJar))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEjbJar != null)
-				msgs = ((InternalEObject)newEjbJar).eInverseAdd(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newEjbJar, EjbPackage.ENTERPRISE_BEAN__EJB_JAR, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__EJB_JAR, newEjbJar, newEjbJar));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The security-identity element specifies whether the caller's security identity is to be used for the execution of the methods of the enterprise bean or whether a specific run-as identity is to be used. It
-	 * contains an optional description and a specification of the security identity to be used.
-	 */
-	public SecurityIdentity getSecurityIdentity() {
-		return securityIdentity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSecurityIdentity(SecurityIdentity newSecurityIdentity, NotificationChain msgs) {
-		SecurityIdentity oldSecurityIdentity = securityIdentity;
-		securityIdentity = newSecurityIdentity;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, oldSecurityIdentity, newSecurityIdentity);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecurityIdentity(SecurityIdentity newSecurityIdentity) {
-		if (newSecurityIdentity != securityIdentity) {
-			NotificationChain msgs = null;
-			if (securityIdentity != null)
-				msgs = ((InternalEObject)securityIdentity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, null, msgs);
-			if (newSecurityIdentity != null)
-				msgs = ((InternalEObject)newSecurityIdentity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, null, msgs);
-			msgs = basicSetSecurityIdentity(newSecurityIdentity, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY, newSecurityIdentity, newSecurityIdentity));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getLocalHomeInterface() {
-		if (localHomeInterface != null && localHomeInterface.eIsProxy()) {
-			JavaClass oldLocalHomeInterface = localHomeInterface;
-			localHomeInterface = (JavaClass)eResolveProxy((InternalEObject)localHomeInterface);
-			if (localHomeInterface != oldLocalHomeInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE, oldLocalHomeInterface, localHomeInterface));
-			}
-		}
-		return localHomeInterface;
-	}
-	
-	public JavaClass getServiceEndpoint() {
-		return null;
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetLocalHomeInterface() {
-		return localHomeInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLocalHomeInterface(JavaClass newLocalHomeInterface) {
-		JavaClass oldLocalHomeInterface = localHomeInterface;
-		localHomeInterface = newLocalHomeInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE, oldLocalHomeInterface, localHomeInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getLocalInterface() {
-		if (localInterface != null && localInterface.eIsProxy()) {
-			JavaClass oldLocalInterface = localInterface;
-			localInterface = (JavaClass)eResolveProxy((InternalEObject)localInterface);
-			if (localInterface != oldLocalInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE, oldLocalInterface, localInterface));
-			}
-		}
-		return localInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetLocalInterface() {
-		return localInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLocalInterface(JavaClass newLocalInterface) {
-		JavaClass oldLocalInterface = localInterface;
-		localInterface = newLocalInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE, oldLocalInterface, localInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.ENTERPRISE_BEAN__EJB_JAR, 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 EjbPackage.ENTERPRISE_BEAN__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES:
-					return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__RESOURCE_REFS:
-					return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__EJB_REFS:
-					return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__RESOURCE_ENV_REFS:
-					return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__EJB_LOCAL_REFS:
-					return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS:
-					return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-					return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-					return eBasicSetContainer(null, EjbPackage.ENTERPRISE_BEAN__EJB_JAR, msgs);
-				case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-					return basicSetSecurityIdentity(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 EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.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 EjbPackage.ENTERPRISE_BEAN__ICONS:
-				return getIcons();
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.ENTERPRISE_BEAN__SMALL_ICON:
-				return getSmallIcon();
-			case EjbPackage.ENTERPRISE_BEAN__LARGE_ICON:
-				return getLargeIcon();
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAME:
-				return getDisplayName();
-			case EjbPackage.ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.ENTERPRISE_BEAN__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				return getName();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				if (resolve) return getEjbClass();
-				return basicGetEjbClass();
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				if (resolve) return getHomeInterface();
-				return basicGetHomeInterface();
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				if (resolve) return getRemoteInterface();
-				return basicGetRemoteInterface();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				if (resolve) return getLocalHomeInterface();
-				return basicGetLocalHomeInterface();
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				if (resolve) return getLocalInterface();
-				return basicGetLocalInterface();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ENTERPRISE_BEAN__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case EjbPackage.ENTERPRISE_BEAN__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case EjbPackage.ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				return ejbClass != null;
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				return homeInterface != null;
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				return remoteInterface != null;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				return localHomeInterface != null;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				return localInterface != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ENTERPRISE_BEAN__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				setEjbClass((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				setHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ENTERPRISE_BEAN__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_CLASS:
-				setEjbClass((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__HOME_INTERFACE:
-				setHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTERPRISE_BEAN__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public String toStringGen() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * Preserve adapters when object is resolved.
-	 */
-	protected void resolved(EObject originalObject, EObject resolvedObject) {
-		if (originalObject != null && resolvedObject != null && originalObject != resolvedObject) {
-			Collection col = originalObject.eAdapters();
-			if (!col.isEmpty()) {
-				Iterator it = col.iterator();
-				Adapter a;
-				while (it.hasNext()) {
-					a = (Adapter) it.next();
-					if (a == null) continue;
-					resolvedObject.eAdapters().add(a);
-				}
-			}
-		}
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getEjbClassGen() {
-		if (ejbClass != null && ejbClass.eIsProxy()) {
-			JavaClass oldEjbClass = ejbClass;
-			ejbClass = (JavaClass)eResolveProxy((InternalEObject)ejbClass);
-			if (ejbClass != oldEjbClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldEjbClass, ejbClass));
-			}
-		}
-		return ejbClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetEjbClass() {
-		return ejbClass;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EModelElement#getEAnnotation(java.lang.String)
-	 */
-	public EAnnotation getEAnnotation(String source) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.ecore.EModelElement#getEAnnotations()
-	 */
-	public EList getEAnnotations() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EntityImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EntityImpl.java
deleted file mode 100644
index 78e062a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EntityImpl.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-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.ejb.EjbPackage;
-
-
-/**
- * The entity element declares an entity bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a unique name assigned to the enterprise bean in the deployment descriptor; the names of the entity bean's home and remote interfaces, if any; the names of the entity bean's local home and local interface, if any; the entity bean's implementation class; the entity bean's persistence management type; the entity bean's primary key class name; an indication of the entity bean's reentrancy; an optional specification of the entity bean's cmp-version; an optional specification of the entity bean's abstract schema name; an optional list of container-managed fields; an optional specification of the primary key field; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; an optional declaration of the bean's resource environment references; an optional set of query declarations for finder and select methods for an entity bean with cmp-version 2.x.
- * The optional abstract-schema-name element must be specified for an entity bean with container managed persistence and cmp-version 2.x. The optional primkey-field may be present in the descriptor if the entity's persistence-type is Container. The optional cmp-version element may be present in the descriptor if the entity's persistence-type is Container. If the persistence-type is Container and the cmp-version element is not specified, its value defaults to 2.x.
- * The optional home and remote elements must be specified if the entity bean cmp-version is 1.x.
- * The optional local-home and local elements must be specified if the entity bean has a local home and local interface.
- * The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.
- * The other elements that are optional are "optional" in the sense that they are omitted if the lists represented by them are empty. At least one cmp-field element must be present in the descriptor if
- * the entity's persistence-type is Container and the cmp-version is 1.x, and none must not be present if the entity's persistence-type is Bean.
- */
-public class EntityImpl extends EnterpriseBeanImpl implements Entity, EnterpriseBean {
-
-	/**
-	 * The default value of the '{@link #isReentrant() <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReentrant()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REENTRANT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isReentrant() <em>Reentrant</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReentrant()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reentrant = REENTRANT_EDEFAULT;
-
-	/**
-	 * This is true if the Reentrant attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean reentrantESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass primaryKey = null;
-	public EntityImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getEntity();
-	}
-
-public String getPrimaryKeyName() {
-	getPrimaryKey();
-	return primaryKey == null ? null : primaryKey.getQualifiedName();
-}
-/**
- * Return true if @aJavaClass as equal to the
- * home, remote, bean class, or key class.
- */
-public boolean hasJavaReference(JavaClass aJavaClass) {
-	boolean result = super.hasJavaReference(aJavaClass);
-	if (!result && aJavaClass != null)
-		result = aJavaClass.equals(getPrimaryKey());
-	return result;
-}
-//Return false by default
-public boolean isContainerManagedEntity() {
-	return false;
-}
-public boolean isEntity() {
-	return true;
-}
-protected boolean primGetIsReentrant() {
-   return isReentrant();
-}
-protected JavaClass primGetPrimaryKey() {
-	return getPrimaryKey();
-}
-
-public java.lang.Object primRefValue(EObject feature) {
-	switch (eDerivedStructuralFeatureID(((EStructuralFeature)feature).getFeatureID(), ((EStructuralFeature)feature).getContainerClass())) {
-		case EjbPackage.ENTITY__REENTRANT: return new Boolean(isReentrant());
-		case EjbPackage.ENTITY__PRIMARY_KEY: return getPrimaryKey();
-	}
-	return super.primRefValue(feature);
-}
-public void setPrimaryKeyName(String primaryKeyName) {
-	eSet(EjbPackage.eINSTANCE.getEntity_PrimaryKey(), createClassRef(primaryKeyName));
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The reentrant element specifies whether an entity bean is reentrant or not.
-
-	 */
-	public boolean isReentrant() {
-		return reentrant;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReentrant(boolean newReentrant) {
-		boolean oldReentrant = reentrant;
-		reentrant = newReentrant;
-		boolean oldReentrantESet = reentrantESet;
-		reentrantESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY__REENTRANT, oldReentrant, reentrant, !oldReentrantESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetReentrant() {
-		boolean oldReentrant = reentrant;
-		boolean oldReentrantESet = reentrantESet;
-		reentrant = REENTRANT_EDEFAULT;
-		reentrantESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.ENTITY__REENTRANT, oldReentrant, REENTRANT_EDEFAULT, oldReentrantESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetReentrant() {
-		return reentrantESet;
-	}
-
-    /**
-     * Handwritten version of getPrimaryKey():
-     */
- 
- 
-    public JavaClass getPrimaryKey()  { 
-       if (primaryKey != null && primaryKey.eIsProxy()) { 
-          JavaClass oldPrimaryKey = primaryKey; 
-          JavaClass resolved = (JavaClass)EcoreUtil.resolve(primaryKey, this); 
-          resolved(this.primaryKey, resolved);
-          this.primaryKey = resolved;
-          if (primaryKey != oldPrimaryKey) { 
-             if (eNotificationRequired()) 
-                eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTERPRISE_BEAN__EJB_CLASS, oldPrimaryKey, primaryKey)); 
-          } 
-       } 
-       return primaryKey; 
-    } 
- 
-         
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setPrimaryKey(JavaClass newPrimaryKey) {
-		JavaClass oldPrimaryKey = primaryKey;
-		primaryKey = newPrimaryKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ENTITY__PRIMARY_KEY, oldPrimaryKey, primaryKey));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.ENTITY__EJB_JAR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.ENTITY__EJB_JAR, 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 EjbPackage.ENTITY__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__ENVIRONMENT_PROPERTIES:
-					return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__RESOURCE_REFS:
-					return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__EJB_REFS:
-					return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__RESOURCE_ENV_REFS:
-					return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__EJB_LOCAL_REFS:
-					return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__MESSAGE_DESTINATION_REFS:
-					return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__SECURITY_ROLE_REFS:
-					return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.ENTITY__EJB_JAR:
-					return eBasicSetContainer(null, EjbPackage.ENTITY__EJB_JAR, msgs);
-				case EjbPackage.ENTITY__SECURITY_IDENTITY:
-					return basicSetSecurityIdentity(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 EjbPackage.ENTITY__EJB_JAR:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.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 EjbPackage.ENTITY__ICONS:
-				return getIcons();
-			case EjbPackage.ENTITY__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.ENTITY__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.ENTITY__SMALL_ICON:
-				return getSmallIcon();
-			case EjbPackage.ENTITY__LARGE_ICON:
-				return getLargeIcon();
-			case EjbPackage.ENTITY__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.ENTITY__DISPLAY_NAME:
-				return getDisplayName();
-			case EjbPackage.ENTITY__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case EjbPackage.ENTITY__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.ENTITY__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.ENTITY__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.ENTITY__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.ENTITY__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.ENTITY__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.ENTITY__NAME:
-				return getName();
-			case EjbPackage.ENTITY__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.ENTITY__EJB_CLASS:
-				if (resolve) return getEjbClass();
-				return basicGetEjbClass();
-			case EjbPackage.ENTITY__HOME_INTERFACE:
-				if (resolve) return getHomeInterface();
-				return basicGetHomeInterface();
-			case EjbPackage.ENTITY__REMOTE_INTERFACE:
-				if (resolve) return getRemoteInterface();
-				return basicGetRemoteInterface();
-			case EjbPackage.ENTITY__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.ENTITY__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.ENTITY__LOCAL_HOME_INTERFACE:
-				if (resolve) return getLocalHomeInterface();
-				return basicGetLocalHomeInterface();
-			case EjbPackage.ENTITY__LOCAL_INTERFACE:
-				if (resolve) return getLocalInterface();
-				return basicGetLocalInterface();
-			case EjbPackage.ENTITY__REENTRANT:
-				return isReentrant() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				if (resolve) return getPrimaryKey();
-				return basicGetPrimaryKey();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ENTITY__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.ENTITY__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.ENTITY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.ENTITY__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case EjbPackage.ENTITY__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case EjbPackage.ENTITY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.ENTITY__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case EjbPackage.ENTITY__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case EjbPackage.ENTITY__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.ENTITY__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.ENTITY__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.ENTITY__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.ENTITY__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.ENTITY__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.ENTITY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.ENTITY__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.ENTITY__EJB_CLASS:
-				return ejbClass != null;
-			case EjbPackage.ENTITY__HOME_INTERFACE:
-				return homeInterface != null;
-			case EjbPackage.ENTITY__REMOTE_INTERFACE:
-				return remoteInterface != null;
-			case EjbPackage.ENTITY__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.ENTITY__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.ENTITY__LOCAL_HOME_INTERFACE:
-				return localHomeInterface != null;
-			case EjbPackage.ENTITY__LOCAL_INTERFACE:
-				return localInterface != null;
-			case EjbPackage.ENTITY__REENTRANT:
-				return isSetReentrant();
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				return primaryKey != 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 EjbPackage.ENTITY__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case EjbPackage.ENTITY__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case EjbPackage.ENTITY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.ENTITY__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case EjbPackage.ENTITY__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.ENTITY__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.ENTITY__EJB_CLASS:
-				setEjbClass((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTITY__HOME_INTERFACE:
-				setHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTITY__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTITY__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.ENTITY__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)newValue);
-				return;
-			case EjbPackage.ENTITY__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTITY__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.ENTITY__REENTRANT:
-				setReentrant(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				setPrimaryKey((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ENTITY__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.ENTITY__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.ENTITY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.ENTITY__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case EjbPackage.ENTITY__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.ENTITY__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.ENTITY__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.ENTITY__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.ENTITY__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.ENTITY__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.ENTITY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.ENTITY__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.ENTITY__EJB_CLASS:
-				setEjbClass((JavaClass)null);
-				return;
-			case EjbPackage.ENTITY__HOME_INTERFACE:
-				setHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTITY__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTITY__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.ENTITY__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)null);
-				return;
-			case EjbPackage.ENTITY__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTITY__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)null);
-				return;
-			case EjbPackage.ENTITY__REENTRANT:
-				unsetReentrant();
-				return;
-			case EjbPackage.ENTITY__PRIMARY_KEY:
-				setPrimaryKey((JavaClass)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(" (reentrant: "); //$NON-NLS-1$
-		if (reentrantESet) result.append(reentrant); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The primkey-field element is used to specify the name of the primary key field
-	 * for an entity with container-managed persistence.  The primkey-field must be
-	 * one of the fields declared in the cmp-field
-	 * element, and the type of the field must be the same as the primary key type. 
-	 * The primkey-field element is not used if the primary key maps to multiple
-	 * container-managed fields (i.e. the key is a compound key). In this case, the
-	 * fields of the primary key class must be public, and their names must correspond 
-	 * to the field names of the entity bean class that comprise the key.
-	 * Examples:<prim-key-class>java.lang.String<//prim-key-class>
-	 * 	<prim-key-class>com.wombat.empl.EmployeeID<//prim-key-class>
-	 * 	<prim-key-class>java.lang.Object<//prim-key-class>
-
-	 */
-	public JavaClass getPrimaryKeyGen() {
-		if (primaryKey != null && primaryKey.eIsProxy()) {
-			JavaClass oldPrimaryKey = primaryKey;
-			primaryKey = (JavaClass)eResolveProxy((InternalEObject)primaryKey);
-			if (primaryKey != oldPrimaryKey) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ENTITY__PRIMARY_KEY, oldPrimaryKey, primaryKey));
-			}
-		}
-		return primaryKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetPrimaryKey() {
-		return primaryKey;
-	}
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ExcludeListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ExcludeListImpl.java
deleted file mode 100644
index 38d6876..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ExcludeListImpl.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * The exclude list element defines a set of methods which the Assembler marks to be uncallable. It contains one or more methods.
- * 
- * If the method permission relation contains methods that are in the exclude list, the Deployer must consider those methods to be uncallable.
-
- */
-public class ExcludeListImpl extends EObjectImpl implements ExcludeList, EObject {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodElements = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public ExcludeListImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getExcludeList();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.EXCLUDE_LIST__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodElements() {
-		if (methodElements == null) {
-			methodElements = new EObjectContainmentEList(MethodElement.class, this, EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS);
-		}
-		return methodElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.EXCLUDE_LIST__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-					return ((InternalEList)getMethodElements()).basicRemove(otherEnd, msgs);
-				case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				return getMethodElements();
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				return methodElements != null && !methodElements.isEmpty();
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				getMethodElements().addAll((Collection)newValue);
-				return;
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.EXCLUDE_LIST__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				return;
-			case EjbPackage.EXCLUDE_LIST__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-	public List getMethodElements(EnterpriseBean anEJB) {
-		if (anEJB == null)
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		List elements = getMethodElements();
-		MethodElement me;
-		for (int i = 0; i < elements.size(); i++) {
-			me = (MethodElement) elements.get(i);
-			if (anEJB.equals(me.getEnterpriseBean()))
-				result.add(me);
-		}
-		return result;
-	}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleAttributeFilter.java
deleted file mode 100644
index 11aec60..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleAttributeFilter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the keyAttributes (this includes inherited 
- * key attributes) from the ContainerManagedEntityExtension that is passed as an
- * argument to the filter method.
- * It will remove any key attribute that is not pointed to by an EjbRelationshipRole.
- * Thus, the returned list will contain key attributes (including inherited key attributes) that only
- * belong to roles.
- * Creation date: (11/28/2000 7:23:22 PM)
- * @author: Administrator
- */
-public class KeyRelationshipRoleAttributeFilter extends AbstractRelationshipRoleAttributeFilter {
-	private static KeyRelationshipRoleAttributeFilter singleton;
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected java.util.List getSourceRoles(ContainerManagedEntity cmp) {
-	return cmp.getFilteredFeatures(KeyRelationshipRoleFilter.singleton());
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.KeyRelationshipRoleAttributeFilter
- */
-public static KeyRelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new KeyRelationshipRoleAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleFilter.java
deleted file mode 100644
index bd4d6b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/KeyRelationshipRoleFilter.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.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the relationshipRoles (this includes
- * inherited EjbRelationshipRoles) from the ContainerManagedEntityExtension
- * that is passed as an argument to the filter method. It will remove any
- * EjbRelationshipRole that is not part of the key. Creation date: (11/28/2000
- * 7:14:57 PM) @author: Administrator
- */
-public class KeyRelationshipRoleFilter extends ContainerManagedEntityFilter {
-
-    private static KeyRelationshipRoleFilter singleton;
-
-    /**
-     * filter method comment.
-     */
-    public java.util.List filter(ContainerManagedEntity cmp) {
-        List keyRoles = new ArrayList();
-        Iterator it = getRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role;
-        while (it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            if (role.isKey()) keyRoles.add(role);
-        }
-        return keyRoles;
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (11/28/2000 7:15:37
-     * PM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.KeyRelationshipRoleFilter
-     */
-    public static KeyRelationshipRoleFilter singleton() {
-        if (singleton == null) singleton = new KeyRelationshipRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalKeyAttributeFilter.java
deleted file mode 100644
index 53d0f43..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalKeyAttributeFilter.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import java.util.ArrayList;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the keyAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any keyPersistentAttributes that are inherited by any supertypes.
- * That means the returned list of CMPAttributes will be key attributes that were defined locally
- * for the ContainerManagedEntity held by the ContainerManagedEntityExtension plus key attributes
- * that were added from EjbRelationshipRoles that are held by the ContainerManagedEntityExtension.
- * Creation date: (11/28/2000 6:24:33 PM)
- * @author: Administrator
- */
-public class LocalKeyAttributeFilter extends SupertypeCMPAttributeFilter {
-	private static LocalKeyAttributeFilter singleton;
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	return new ArrayList(cmp.getKeyAttributes());
-}
-/**
- * Return a boolean indicating whether anAttribute also exists in the superEntity.
- * For this filter, only the name has to be the same.
- */
-protected boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) {
-	CMPAttribute found = superEntity.getKeyAttribute(anAttribute.getName());
-	return found != null;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalKeyAttributeFilter
- */
-public static LocalKeyAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalKeyAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalModelledPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalModelledPersistentAttributeFilter.java
deleted file mode 100644
index 67e7311..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalModelledPersistentAttributeFilter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-/**
- * This filter will return a subset of the persistentAttributes from the
- * ContainerManagedEntityExtension that is passed as an argument to the filter
- * method. It will remove any inherited persistentAttributes and any
- * persistentAttributes that are held by EjbRelationshipRole objects (including
- * inherited EjbRelationshipRole attributes). That means the returned list of
- * CMPAttributes will be attributes that were defined locally minus all
- * inherited attributes and minus any attributes pointed to by
- * EjbRelationshipRoles, thus the attributes will only be attributes that were
- * defined locally by the user. Creation date: (11/28/2000 7:31:42 PM) @author:
- * Administrator
- */
-public class LocalModelledPersistentAttributeFilter extends SupertypeCMPAttributeFilter {
-	private static LocalModelledPersistentAttributeFilter singleton;
-	/**
-	 * Return the proper list of attributes from cmpExt. Return local
-	 * attributes minus those added due to Relationship Roles.
-	 */
-	protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-		java.util.List local = null, localRoleAttributes; 
-		local = cmp.getFilteredFeatures(LocalPersistentAttributeFilter.singleton());
-		localRoleAttributes = cmp.getFilteredFeatures(LocalRelationshipRoleAttributeFilter.singleton());
-		if(local != null)
-		  local.removeAll(localRoleAttributes);
-		return local;
-	}
-	/**
-	 * Return a boolean indicating whether anAttribute also exists in the
-	 * superEntity. For this filter, only the name has to be the same.
-	 */
-	protected boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) {
-		CMPAttribute found = superEntity.getPersistentAttribute(anAttribute.getName());
-		return found != null;
-	}
-	/**
-	 * Insert the method's description here. Creation date: (11/28/2000 5:36:00
-	 * PM)
-	 * 
-	 * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalModelledPersistentAttributeFilter
-	 */
-	public static LocalModelledPersistentAttributeFilter singleton() {
-		if (singleton == null)
-			singleton = new LocalModelledPersistentAttributeFilter();
-		return singleton;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalOppositeRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalOppositeRelationshipRoleFilter.java
deleted file mode 100644
index f444bf3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalOppositeRelationshipRoleFilter.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.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the relationshipRoles (this includes
- * inherited EjbRelationshipRoles) from the ContainerManagedEntityExtension
- * that is passed as an argument to the filter method. It will remove any
- * EjbRelationshipRole that is inherited and it will return the opposite role.
- * Creation date: (11/28/2000 7:14:57 PM) @author: Administrator
- */
-public class LocalOppositeRelationshipRoleFilter extends ContainerManagedEntityFilter {
-
-    private static LocalOppositeRelationshipRoleFilter singleton;
-
-    /**
-     * Return a List with the opposite roles for the local relationship roles.
-     */
-    public List filter(ContainerManagedEntity cmp) {
-        List oppositeRoles = new ArrayList();
-        Iterator it = getLocalRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role, opposite;
-        while (it != null && it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            opposite = role.getOppositeAsCommonRole();
-            if (opposite != null) oppositeRoles.add(opposite);
-        }
-        return oppositeRoles;
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (11/28/2000 7:15:37
-     * PM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalOppositeRelationshipRoleFilter
-     */
-    public static LocalOppositeRelationshipRoleFilter singleton() {
-        if (singleton == null) singleton = new LocalOppositeRelationshipRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalPersistentAttributeFilter.java
deleted file mode 100644
index 8bf0340..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalPersistentAttributeFilter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import java.util.ArrayList;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * This filter will return a subset of the persistentAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any persistentAttributes that are inherited by any supertypes.
- * That means the returned list of CMPAttributes will be attributes that were defined locally
- * for the ContainerManagedEntity held by the ContainerManagedEntityExtension plus attributes
- * that were added from EjbRelationshipRoles that are held by the ContainerManagedEntityExtension.
- * Creation date: (11/28/2000 5:35:03 PM)
- * @author: Administrator
- */
-public class LocalPersistentAttributeFilter extends SupertypeCMPAttributeFilter {
-	private static LocalPersistentAttributeFilter singleton;
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	return new ArrayList(cmp.getPersistentAttributes());
-}
-/**
- * Return a boolean indicating whether anAttribute also exists in the superEntity.
- * For this filter, only the name has to be the same.
- */
-protected boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) {
-	CMPAttribute found = superEntity.getPersistentAttribute(anAttribute.getName());
-	return found != null;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalPersistentAttributeFilter
- */
-public static LocalPersistentAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalPersistentAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleAttributeFilter.java
deleted file mode 100644
index a033f9f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleAttributeFilter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the persistentAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any attribute that is not pointed to by an EjbRelationshipRole and
- * it will further remove attributes pointed to by inherited EjbRelationshipRoles.
- * Thus, the returned list will contain attributes that only belong to local
- * EjbRelationshipRoles (not including iherited roles).
- * Creation date: (11/28/2000 6:46:08 PM)
- * @author: Administrator
- */
-public class LocalRelationshipRoleAttributeFilter extends AbstractRelationshipRoleAttributeFilter {
-	private static LocalRelationshipRoleAttributeFilter singleton;
-/**
- * Return the proper list of roles from cmpExt.
- */
-protected java.util.List getSourceRoles(ContainerManagedEntity cmp) {
-   return getRelationshipRoles(cmp); 
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.LocalRelationshipRoleAttributeFilter
- */
-public static LocalRelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalRelationshipRoleAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleKeyAttributeFilter.java
deleted file mode 100644
index 18a7983..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/LocalRelationshipRoleKeyAttributeFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * @author jlanuti
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class LocalRelationshipRoleKeyAttributeFilter extends LocalRelationshipRoleAttributeFilter {
-
-	private static LocalRelationshipRoleKeyAttributeFilter singleton;
-
-public static LocalRelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new LocalRelationshipRoleKeyAttributeFilter();
-	return singleton;
-}
-
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	List attributes = new ArrayList();
-	Iterator it = getSourceRoles(cmp).iterator();
-	CommonRelationshipRole role;
-	while (it.hasNext()) {
-		role = (CommonRelationshipRole) it.next();
-		if (role.isKey())
-			attributes.addAll(role.getAttributes());
-	}
-	return attributes;
-}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenDestinationImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenDestinationImpl.java
deleted file mode 100644
index b0ae721..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenDestinationImpl.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-/**
- * 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.
- */
-public class MessageDrivenDestinationImpl extends EObjectImpl implements MessageDrivenDestination, EObject{
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final DestinationType TYPE_EDEFAULT = DestinationType.QUEUE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected DestinationType type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The default value of the '{@link #getSubscriptionDurability() <em>Subscription Durability</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSubscriptionDurability()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final SubscriptionDurabilityKind SUBSCRIPTION_DURABILITY_EDEFAULT = SubscriptionDurabilityKind.DURABLE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SubscriptionDurabilityKind subscriptionDurability = SUBSCRIPTION_DURABILITY_EDEFAULT;
-	/**
-	 * This is true if the Subscription Durability attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean subscriptionDurabilityESet = false;
-
-	public MessageDrivenDestinationImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getMessageDrivenDestination();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The destination-type element specifies the type of the JMS destination. The type is specified by the Java interface expected to be implemented by the destination.
-	 * 
-	 * The destination-type element must be one of the two following: javax.jms.Queue, javax.jms.Topic
-	 */
-	public DestinationType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(DestinationType newType) {
-		DestinationType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		DestinationType oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The subscription-durability element specifies whether a JMS topic subscription is intended to be durable or nondurable.
-	 * 
-	 * The subscription-durability element must be one of the two following:  Durable, NonDurable
-
-	 */
-	public SubscriptionDurabilityKind getSubscriptionDurability() {
-		return subscriptionDurability;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSubscriptionDurability(SubscriptionDurabilityKind newSubscriptionDurability) {
-		SubscriptionDurabilityKind oldSubscriptionDurability = subscriptionDurability;
-		subscriptionDurability = newSubscriptionDurability == null ? SUBSCRIPTION_DURABILITY_EDEFAULT : newSubscriptionDurability;
-		boolean oldSubscriptionDurabilityESet = subscriptionDurabilityESet;
-		subscriptionDurabilityESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY, oldSubscriptionDurability, subscriptionDurability, !oldSubscriptionDurabilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSubscriptionDurability() {
-		SubscriptionDurabilityKind oldSubscriptionDurability = subscriptionDurability;
-		boolean oldSubscriptionDurabilityESet = subscriptionDurabilityESet;
-		subscriptionDurability = SUBSCRIPTION_DURABILITY_EDEFAULT;
-		subscriptionDurabilityESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY, oldSubscriptionDurability, SUBSCRIPTION_DURABILITY_EDEFAULT, oldSubscriptionDurabilityESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSubscriptionDurability() {
-		return subscriptionDurabilityESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public MessageDriven getBean() {
-		if (eContainerFeatureID != EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN) return null;
-		return (MessageDriven)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setBean(MessageDriven newBean) {
-		if (newBean != eContainer || (eContainerFeatureID != EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN && newBean != null)) {
-			if (EcoreUtil.isAncestor(this, newBean))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newBean != null)
-				msgs = ((InternalEObject)newBean).eInverseAdd(this, EjbPackage.MESSAGE_DRIVEN__DESTINATION, MessageDriven.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newBean, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, newBean, newBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, 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 EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-					return eBasicSetContainer(null, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, 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 EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-					return eContainer.eInverseRemove(this, EjbPackage.MESSAGE_DRIVEN__DESTINATION, MessageDriven.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 EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				return getType();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				return getSubscriptionDurability();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				return getBean();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				return isSetType();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				return isSetSubscriptionDurability();
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				return getBean() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				setType((DestinationType)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				setSubscriptionDurability((SubscriptionDurabilityKind)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				setBean((MessageDriven)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__TYPE:
-				unsetType();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__SUBSCRIPTION_DURABILITY:
-				unsetSubscriptionDurability();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN:
-				setBean((MessageDriven)null);
-				return;
-		}
-		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(" (type: "); //$NON-NLS-1$
-		if (typeESet) result.append(type); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", subscriptionDurability: "); //$NON-NLS-1$
-		if (subscriptionDurabilityESet) result.append(subscriptionDurability); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenImpl.java
deleted file mode 100644
index 0f0dcb4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MessageDrivenImpl.java
+++ /dev/null
@@ -1,982 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.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.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * @generated
- */
-public class MessageDrivenImpl extends EnterpriseBeanImpl implements MessageDriven{
-
-	/**
-	 * The default value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionType TRANSACTION_TYPE_EDEFAULT = TransactionType.BEAN_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionType transactionType = TRANSACTION_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Transaction Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getMessageSelector() <em>Message Selector</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageSelector()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_SELECTOR_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String messageSelector = MESSAGE_SELECTOR_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAcknowledgeMode() <em>Acknowledge Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAcknowledgeMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final AcknowledgeMode ACKNOWLEDGE_MODE_EDEFAULT = AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AcknowledgeMode acknowledgeMode = ACKNOWLEDGE_MODE_EDEFAULT;
-	/**
-	 * This is true if the Acknowledge Mode attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean acknowledgeModeESet = false;
-
-	/**
-	 * The default value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLink() <em>Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String link = LINK_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected MessageDrivenDestination destination = null;
-	/**
-	 * The cached value of the '{@link #getActivationConfig() <em>Activation Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationConfig()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActivationConfig activationConfig = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestination() <em>Message Destination</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestination()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass messageDestination = null;
-
-	/**
-	 * The cached value of the '{@link #getMessagingType() <em>Messaging Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessagingType()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass messagingType = null;
-
-	public MessageDrivenImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getMessageDriven();
-	}
-
-public boolean isMessageDriven() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transaction-type element specifies an enterprise bean's transaction management type.
-	 * 
-	 * The transaction-type element must be one of the two following: Bean, Container
-	 */
-	public TransactionType getTransactionType() {
-		return transactionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionType(TransactionType newTransactionType) {
-		TransactionType oldTransactionType = transactionType;
-		transactionType = newTransactionType == null ? TRANSACTION_TYPE_EDEFAULT : newTransactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE, oldTransactionType, transactionType, !oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionType() {
-		TransactionType oldTransactionType = transactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionType = TRANSACTION_TYPE_EDEFAULT;
-		transactionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE, oldTransactionType, TRANSACTION_TYPE_EDEFAULT, oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionType() {
-		return transactionTypeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The message-selector element is used to specify the JMS message
-	 * selector to be used in determining which messages a message-driven
-	 * bean is to receive.
-	 * 
-	 * Example value: 
-	 * JMSType = `car' AND color = `blue' AND weight > 2500
-
-	 */
-	public String getMessageSelector() {
-		return messageSelector;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setMessageSelector(String newMessageSelector) {
-		String oldMessageSelector = messageSelector;
-		messageSelector = newMessageSelector;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR, oldMessageSelector, messageSelector));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * an optional declaration of the acknowledgment mode for the message-driven bean if bean-managed transaction demarcation is used (ie. self.transactionType = Bean)
-	 * 
-	 * The acknowledge-mode specifies whether JMS AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used for the onMessage message of a message-driven bean that uses bean managed transaction demarcation.
-	 * 
-	 * The acknowledge-mode must be one of the two following:  Auto-acknowledge, Dups-ok-acknowledge
-
-	 */
-	public AcknowledgeMode getAcknowledgeMode() {
-		return acknowledgeMode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAcknowledgeMode(AcknowledgeMode newAcknowledgeMode) {
-		AcknowledgeMode oldAcknowledgeMode = acknowledgeMode;
-		acknowledgeMode = newAcknowledgeMode == null ? ACKNOWLEDGE_MODE_EDEFAULT : newAcknowledgeMode;
-		boolean oldAcknowledgeModeESet = acknowledgeModeESet;
-		acknowledgeModeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE, oldAcknowledgeMode, acknowledgeMode, !oldAcknowledgeModeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAcknowledgeMode() {
-		AcknowledgeMode oldAcknowledgeMode = acknowledgeMode;
-		boolean oldAcknowledgeModeESet = acknowledgeModeESet;
-		acknowledgeMode = ACKNOWLEDGE_MODE_EDEFAULT;
-		acknowledgeModeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE, oldAcknowledgeMode, ACKNOWLEDGE_MODE_EDEFAULT, oldAcknowledgeModeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAcknowledgeMode() {
-		return acknowledgeModeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * An optional declaration of the intended destination type of the message-driven bean
-	 */
-	public MessageDrivenDestination getDestination() {
-		return destination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDestination(MessageDrivenDestination newDestination, NotificationChain msgs) {
-		MessageDrivenDestination oldDestination = destination;
-		destination = newDestination;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__DESTINATION, oldDestination, newDestination);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDestination(MessageDrivenDestination newDestination) {
-		if (newDestination != destination) {
-			NotificationChain msgs = null;
-			if (destination != null)
-				msgs = ((InternalEObject)destination).eInverseRemove(this, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, MessageDrivenDestination.class, msgs);
-			if (newDestination != null)
-				msgs = ((InternalEObject)newDestination).eInverseAdd(this, EjbPackage.MESSAGE_DRIVEN_DESTINATION__BEAN, MessageDrivenDestination.class, msgs);
-			msgs = basicSetDestination(newDestination, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__DESTINATION, newDestination, newDestination));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationConfig getActivationConfig() {
-		return activationConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetActivationConfig(ActivationConfig newActivationConfig, NotificationChain msgs) {
-		ActivationConfig oldActivationConfig = activationConfig;
-		activationConfig = newActivationConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, oldActivationConfig, newActivationConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationConfig(ActivationConfig newActivationConfig) {
-		if (newActivationConfig != activationConfig) {
-			NotificationChain msgs = null;
-			if (activationConfig != null)
-				msgs = ((InternalEObject)activationConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, null, msgs);
-			if (newActivationConfig != null)
-				msgs = ((InternalEObject)newActivationConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, null, msgs);
-			msgs = basicSetActivationConfig(newActivationConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG, newActivationConfig, newActivationConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getMessageDestination() {
-		if (messageDestination != null && messageDestination.eIsProxy()) {
-			JavaClass oldMessageDestination = messageDestination;
-			messageDestination = (JavaClass)eResolveProxy((InternalEObject)messageDestination);
-			if (messageDestination != oldMessageDestination) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION, oldMessageDestination, messageDestination));
-			}
-		}
-		return messageDestination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetMessageDestination() {
-		return messageDestination;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageDestination(JavaClass newMessageDestination) {
-		JavaClass oldMessageDestination = messageDestination;
-		messageDestination = newMessageDestination;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION, oldMessageDestination, messageDestination));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLink() {
-		return link;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLink(String newLink) {
-		String oldLink = link;
-		link = newLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__LINK, oldLink, link));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getMessagingType() {
-		if (messagingType != null && messagingType.eIsProxy()) {
-			JavaClass oldMessagingType = messagingType;
-			messagingType = (JavaClass)eResolveProxy((InternalEObject)messagingType);
-			if (messagingType != oldMessagingType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE, oldMessagingType, messagingType));
-			}
-		}
-		return messagingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetMessagingType() {
-		return messagingType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessagingType(JavaClass newMessagingType) {
-		JavaClass oldMessagingType = messagingType;
-		messagingType = newMessagingType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE, oldMessagingType, messagingType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.MESSAGE_DRIVEN__EJB_JAR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.MESSAGE_DRIVEN__EJB_JAR, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-					if (destination != null)
-						msgs = ((InternalEObject)destination).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.MESSAGE_DRIVEN__DESTINATION, null, msgs);
-					return basicSetDestination((MessageDrivenDestination)otherEnd, msgs);
-				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 EjbPackage.MESSAGE_DRIVEN__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__ENVIRONMENT_PROPERTIES:
-					return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__RESOURCE_REFS:
-					return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__EJB_REFS:
-					return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__RESOURCE_ENV_REFS:
-					return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__EJB_LOCAL_REFS:
-					return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION_REFS:
-					return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__SECURITY_ROLE_REFS:
-					return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__EJB_JAR:
-					return eBasicSetContainer(null, EjbPackage.MESSAGE_DRIVEN__EJB_JAR, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__SECURITY_IDENTITY:
-					return basicSetSecurityIdentity(null, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-					return basicSetDestination(null, msgs);
-				case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-					return basicSetActivationConfig(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 EjbPackage.MESSAGE_DRIVEN__EJB_JAR:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.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 EjbPackage.MESSAGE_DRIVEN__ICONS:
-				return getIcons();
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.MESSAGE_DRIVEN__SMALL_ICON:
-				return getSmallIcon();
-			case EjbPackage.MESSAGE_DRIVEN__LARGE_ICON:
-				return getLargeIcon();
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAME:
-				return getDisplayName();
-			case EjbPackage.MESSAGE_DRIVEN__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.MESSAGE_DRIVEN__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.MESSAGE_DRIVEN__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.MESSAGE_DRIVEN__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.MESSAGE_DRIVEN__NAME:
-				return getName();
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.MESSAGE_DRIVEN__EJB_CLASS:
-				if (resolve) return getEjbClass();
-				return basicGetEjbClass();
-			case EjbPackage.MESSAGE_DRIVEN__HOME_INTERFACE:
-				if (resolve) return getHomeInterface();
-				return basicGetHomeInterface();
-			case EjbPackage.MESSAGE_DRIVEN__REMOTE_INTERFACE:
-				if (resolve) return getRemoteInterface();
-				return basicGetRemoteInterface();
-			case EjbPackage.MESSAGE_DRIVEN__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_HOME_INTERFACE:
-				if (resolve) return getLocalHomeInterface();
-				return basicGetLocalHomeInterface();
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_INTERFACE:
-				if (resolve) return getLocalInterface();
-				return basicGetLocalInterface();
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				return getTransactionType();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				return getMessageSelector();
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				return getAcknowledgeMode();
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				return getLink();
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				return getDestination();
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				return getActivationConfig();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				if (resolve) return getMessageDestination();
-				return basicGetMessageDestination();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				if (resolve) return getMessagingType();
-				return basicGetMessagingType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.MESSAGE_DRIVEN__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case EjbPackage.MESSAGE_DRIVEN__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case EjbPackage.MESSAGE_DRIVEN__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.MESSAGE_DRIVEN__EJB_CLASS:
-				return ejbClass != null;
-			case EjbPackage.MESSAGE_DRIVEN__HOME_INTERFACE:
-				return homeInterface != null;
-			case EjbPackage.MESSAGE_DRIVEN__REMOTE_INTERFACE:
-				return remoteInterface != null;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_HOME_INTERFACE:
-				return localHomeInterface != null;
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_INTERFACE:
-				return localInterface != null;
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				return isSetTransactionType();
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				return MESSAGE_SELECTOR_EDEFAULT == null ? messageSelector != null : !MESSAGE_SELECTOR_EDEFAULT.equals(messageSelector);
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				return isSetAcknowledgeMode();
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				return LINK_EDEFAULT == null ? link != null : !LINK_EDEFAULT.equals(link);
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				return destination != null;
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				return activationConfig != null;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				return messageDestination != null;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				return messagingType != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.MESSAGE_DRIVEN__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_CLASS:
-				setEjbClass((JavaClass)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__HOME_INTERFACE:
-				setHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				setTransactionType((TransactionType)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				setMessageSelector((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				setAcknowledgeMode((AcknowledgeMode)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				setLink((String)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				setDestination((MessageDrivenDestination)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				setActivationConfig((ActivationConfig)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				setMessageDestination((JavaClass)newValue);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				setMessagingType((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.MESSAGE_DRIVEN__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_CLASS:
-				setEjbClass((JavaClass)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__HOME_INTERFACE:
-				setHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__TRANSACTION_TYPE:
-				unsetTransactionType();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_SELECTOR:
-				setMessageSelector(MESSAGE_SELECTOR_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACKNOWLEDGE_MODE:
-				unsetAcknowledgeMode();
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__LINK:
-				setLink(LINK_EDEFAULT);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__DESTINATION:
-				setDestination((MessageDrivenDestination)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__ACTIVATION_CONFIG:
-				setActivationConfig((ActivationConfig)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGE_DESTINATION:
-				setMessageDestination((JavaClass)null);
-				return;
-			case EjbPackage.MESSAGE_DRIVEN__MESSAGING_TYPE:
-				setMessagingType((JavaClass)null);
-				return;
-		}
-		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(" (transactionType: "); //$NON-NLS-1$
-		if (transactionTypeESet) result.append(transactionType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", messageSelector: "); //$NON-NLS-1$
-		result.append(messageSelector);
-		result.append(", acknowledgeMode: "); //$NON-NLS-1$
-		if (acknowledgeModeESet) result.append(acknowledgeMode); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", link: "); //$NON-NLS-1$
-		result.append(link);
-		result.append(')');
-		return result.toString();
-	}
-
-	/*
-	 * @see EnterpriseBean#getAvailableLocalHomeMethodElements()
-	 */
-	public List getAvailableLocalHomeMethodElements() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * @see EnterpriseBean#getAvailableLocalMethodElements()
-	 */
-	public List getAvailableLocalMethodElements() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * @see EnterpriseBean#getAvailableRemoteMethodElements()
-	 */
-	public List getAvailableRemoteMethodElements() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/*
-	 * @see EnterpriseBeanImpl#getAvailableUnspecifiedMethodElementSignatures()
-	 */
-	public List getAvailableUnspecifiedMethodElementSignatures() {
-		//There is only the onMessage method
-		List sigs = new ArrayList(1);
-		sigs.add("onMessage(javax.jms.Message)"); //$NON-NLS-1$
-		return sigs;
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodElementImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodElementImpl.java
deleted file mode 100644
index f9b935d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodElementImpl.java
+++ /dev/null
@@ -1,1039 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-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.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.util.MethodElementHelper;
-
-
-/**
- * The method element is used to denote a method of an enterprise bean's
- * home or remote interface, or a set of methods. The ejb-name element
- * must be the name of one of the enterprise beans in declared in the
- * deployment descriptor; the optional method-intf element allows to
- * distinguish between a method with the same signature that is defined in
- * both the home and remote interface; the method-name element specifies
- * the method name; and the optional method-params elements identify a
- * single method among multiple methods with an overloaded method name.
- * 
- * There are three possible styles of the method element syntax:
- * 
- * 1. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>*<//method-name>
- * 	<//method>
- * 
- *    This style is used to refer to all the methods of the specified
- *    enterprise bean's home and remote interfaces.
- * 
- * 2. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 	<//method>>
- * 
- *    This style is used to refer to the specified method of the
- *    specified enterprise bean. If there are multiple methods with
- *    the same overloaded name, the element of this style refers to
- *    all the methods with the overloaded name.
- * 
- * 
- * 
- * 
- * 
- * 3. 	<method>
- * 		<ejb-name>EJBNAME<//ejb-name>
- *    		<method-name>METHOD<//method-name>
- * 		<method-params>
- *    			<method-param>PARAM-1<//method-param>
- *    			<method-param>PARAM-2<//method-param>
- *           			...
- *    			<method-param>PARAM-n<//method-param>
- * 		<//method-params>
- * 	<method>	
- * 
- *    This style is used to refer to a single method within a set of
- *    methods with an overloaded name. PARAM-1 through PARAM-n are the
- *    fully-qualified Java types of the method's input parameters (if
- *    the method has no input arguments, the method-params element
- *    contains no method-param elements). Arrays are specified by the
- *    array element's type, followed by one or more pair of square
- *    brackets (e.g. int[][]).
- * 
- * 
- * Used in: method-permission and container-transaction
- * 
- * Examples:
- * 
- *     Style 1: The following method element refers to all the methods of
- * 		the EmployeeService bean's home and remote interfaces:
- * 
- * 		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>*<//method-name>
- * 		<//method>
- * 
- * 	Style 2: The following method element refers to all the create
- * 		methods of the EmployeeService bean's home interface:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 		<//method>
- * 
- * 	Style 3: The following method element refers to the
- * 		create(String firstName, String LastName) method of the
- * 	 	EmployeeService bean's home interface.
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	
- * 	The following example illustrates a Style 3 element with
- * 	more complex parameter types. The method
- * 			foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
- * 				mypackage.MyClass[][] myclaar)
- *         would be specified as:
- * 
- *     		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-name>foobar<//method-name>
- * 			<method-params>
- * 				<method-param>char<//method-param>
- * 				<method-param>int<//method-param>
- * 				<method-param>int[]<//method-param>
- * 				<method-param>mypackage.MyClass<//method-param>
- * 				<method-param>mypackage.MyClass[][]<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	The optional method-intf element can be used when it becomes
- *    necessary to differentiate between a method defined in the home
- *    interface and a method with the same name and signature that is
- *    defined in the remote interface.
- * 
- * 	For example, the method element
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Remote<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
- * 
- * 	can be used to differentiate the create(String, String) method
- *    defined in the remote interface from the create(String, String)
- *    method defined in the home interface, which would be defined as
- * 
- *    		<method>
- * 			<ejb-name>EmployeeService<//ejb-name>
- * 			<method-intf>Home<//method-intf>
- * 			<method-name>create<//method-name>
- * 			<method-params>
- * 				<method-param>java.lang.String<//method-param>
- * 				<method-param>java.lang.String<//method-param>
- * 			<//method-params>
- * 		<//method>
-
- */
-public class MethodElementImpl extends EObjectImpl implements MethodElement {
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getParms() <em>Parms</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParms()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARMS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String parms = PARMS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final MethodElementKind TYPE_EDEFAULT = MethodElementKind.UNSPECIFIED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected MethodElementKind type = TYPE_EDEFAULT;
-	/**
-	 * This is true if the Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean typeESet = false;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EnterpriseBean enterpriseBean = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public MethodElementImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getMethodElement();
-	}
-
-public void addMethodParams(String param) { 
-	String oldParms = getParms();
-	if (oldParms == null) {
-		setParms(param);
-	} else {
-		setParms(oldParms.concat(" ").concat(param)); //$NON-NLS-1$
-	}
-}
-/**
- * Set the params for this method element to an empty array, as opposed
- * to null.
- */
-public void applyZeroParams() {
-	setParms(""); //$NON-NLS-1$
-}
-public boolean equalSignature(MethodElement anotherMethodElement) {
-	boolean equal = getName().equals(anotherMethodElement.getName());
-	if (equal) {
-		equal = parmsEqual(anotherMethodElement);
-		if (equal) {
-			if (getType() == null)
-				equal = anotherMethodElement.getType() == null;
-			else
-				equal = getType().equals(anotherMethodElement.getType());
-		}
-	}
-	return equal;
-}
-public java.util.List getMethodParams() { 
-	StringTokenizer tok = getMethodParamsTokenizer();
-	java.util.List v = new ArrayList();
-	java.util.List paramsList = new ArrayList();
-	String current = null;
-	if (tok != null) {
-		while (current != null || tok.hasMoreTokens()) {
-			String peek = null;
-			if (current == null)
-				current = tok.nextToken();
-			if (tok.hasMoreTokens()) {
-				peek = tok.nextToken();
-				if (peek.startsWith("[")) { //$NON-NLS-1$
-					current += peek;
-					peek = null;
-				}
-			}
-			v.add(current);
-			if (peek != null)
-				current = peek;
-			else
-				current = null;
-		}
-
-	}
-	
-	/*
-		 * This is a hack to make sure that for old XMI generated files, that ven if there was ',' separated 
-		 * params, it parses them back out right.  To support 4.0.X AAT generated XMI files with runAs roles 
-		 * for methods.
-		 */
-	for (int i = 0; i < v.size(); i++)
-	{
-		tok = new StringTokenizer((String)v.get(i),","); //$NON-NLS-1$
-		if (tok != null)
-		{
-			while (tok.hasMoreTokens())
-			{
-				paramsList.add(tok.nextToken());
-			}
-		}
-	}
-	return paramsList;
-}
-private StringTokenizer getMethodParamsTokenizer() {
-	//This method is a hack for now; the cardinality is wrong for the params
-	String aParms = getParms();
-	if (aParms == null || aParms.length() == 0) {
-		return null;
-	}
-	return new StringTokenizer(getParms());
-}
-/**
- * Answer a list of all the methods for which this method element applies.  The following rules are used:
- *
- * 1)  If the method element type is unspecified, the methods are obtained from the remote interface of the ejb;
- *		If it is specified, then the appropriate interface is used
- *
- * 2)  If the method name = "*", then all the PUBLIC methods for that interface are returned
- *
- * 3)  If the method name is specified, and no method params are specified, then all public methods for the interface
- *      having the same name are returned.
- *
- * 4)  If the method name and params are specified, then a zero or one element array is returned, containing the one and only method
- *      on the interface with the appropriate signature, if it exists
- */
-public Method[] getMethods() {
-	EnterpriseBean ejb = getEnterpriseBean();
-	if(ejb == null)
-	    return new Method[0];
-	List result = null;
-	switch (getType().getValue()) {
-		case MethodElementKind.HOME :
-			{
-				result = getMethods(ejb.getHomeInterface());
-				break;
-			}
-		case MethodElementKind.REMOTE :
-			{
-				result = getMethods(ejb.getRemoteInterface());
-				break;
-			}
-		case MethodElementKind.LOCAL_HOME :
-			{
-				result = getMethods(ejb.getLocalHomeInterface());
-				break;
-			}
-		case MethodElementKind.LOCAL :
-			{
-				result = getMethods(ejb.getLocalInterface());
-				break;
-			}
-		case MethodElementKind.SERVICE_ENDPOINT :
-		   {
-		    	if(ejb.isSession()) {
-		    	    result = getMethods(((Session)ejb).getServiceEndpoint());
-		    	    break;
-		    	}
-		   }
-		case MethodElementKind.UNSPECIFIED :
-			{
-				if (ejb.isMessageDriven())
-					result = getMethods(ejb.getEjbClass());
-				else {
-					result = new ArrayList();
-					result.addAll(getMethods(ejb.getHomeInterface()));
-					result.addAll(getMethods(ejb.getRemoteInterface()));
-					result.addAll(getMethods(ejb.getLocalHomeInterface()));
-					result.addAll(getMethods(ejb.getLocalInterface()));
-				}
-				break;
-			}
-	}
-	return (Method[]) result.toArray(new Method[result.size()]);
-}
-/**
- * Answer a list of all the methods for which this method element applies.  The following rules are used:
- *
- * 1)  If the method element type is unspecified, the methods are obtained from the remote interface of the ejb;
- *		If it is specified, then the appropriate interface is used
- *
- * 2)  If the method name = "*", then all the PUBLIC methods for that interface are returned
- *
- * 3)  If the method name is specified, and no method params are specified, then all public methods for the interface
- *      having the same name are returned.
- *
- * 4)  If the method name and params are specified, then a zero or one element array is returned, containing the one and only method
- *      on the interface with the appropriate signature, if it exists
- */
-private List getMethods(JavaClass javaClass) {
-	if (javaClass == null) return Collections.EMPTY_LIST;
-	List result = null;
-	String methodName = getName().trim();
-	if (name.equals("*"))  //$NON-NLS-1$
-		result = javaClass.getPublicMethodsExtended();
-	else if (hasMethodParams()) {
-		result = new ArrayList();
-		Method method = javaClass.getPublicMethodExtended(name, getMethodParams());
-		if (method != null)
-			result.add(method);
-	} else
- 		result = javaClass.getPublicMethodsExtendedNamed(methodName);
- 
- 	return result;
-}
-/**
- * Return the MethodElement that is most specific.
- */
-public MethodElement getMostSpecific(MethodElement aMethodElement, JavaClass aClass) {
-	if (aMethodElement == null) return this;
-	if (aMethodElement.isDefault() && !isDefault())
-		return this;
-	if (!aMethodElement.isDefault() && isDefault())
-		return aMethodElement;
-	if (aMethodElement.hasMethodParams() && !hasMethodParams())
-		return aMethodElement;
-	if (!aMethodElement.hasMethodParams() && hasMethodParams())
-		return this;
-	if (isUnspecified() && !aMethodElement.isUnspecified())
-		return aMethodElement;
-	return this;
-}
-public static MethodElement getMostSpecificMethodElement(List methodElements, Method aMethod) {
-	MethodElement specificME = null;
-	if (aMethod != null) {
-		Iterator it = methodElements.iterator();
-		MethodElement me;
-		while (it.hasNext()) {
-			me = (MethodElement) it.next();
-			if (me.represents(aMethod)) {
-				if (me.uniquelyIdentifies(aMethod))
-					return me;
-				else if (specificME == null)
-					specificME = me;
-				else
-					specificME = specificME.getMostSpecific(me, aMethod.getJavaClass());
-			}
-		}
-	}
-	return specificME;
-}
-protected String getParmsString() {
-	String parmString = getParms();
-	if (parmString == null)
-		parmString = ""; //$NON-NLS-1$
-	return parmString;
-}
-/**
- * Return a String array for the possible MethodElement type names.
- */
-public static String[] getPossibleTypeNames() {
-	EjbPackage pack = EjbFactoryImpl.getPackage();
-	List literals = pack.getMethodElementKind().getELiterals();
-	String[] names = new String[literals.size()];
-	for (int i = 0; i < literals.size(); i++)
-		names[i] = literals.get(i).toString();
-	return names;
-}
-/**
- * Return the signature.
- * For example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-public String getSignature() {
-	if (isDefault())
-		return getName();
-	StringBuffer buf = new StringBuffer();
-	buf.append(getName());
-	if (hasMethodParams()){
-		buf.append(RIGHT_PAREN);
-		StringTokenizer tok = getMethodParamsTokenizer();
-		if (tok != null) {
-			while (tok.hasMoreTokens()) {
-				buf.append(tok.nextToken());
-				if (tok.hasMoreTokens())
-					buf.append(COMMA);		
-			}			
-		}
-		buf.append(LEFT_PAREN);
-	}
-	return buf.toString();
-}
-// Returns null if the EEnum is UNSPECIFIED
-// unless it is a MessageDriven bean.
-public JavaClass getTypeJavaClass() {
-	if (isHome())
-		return getEnterpriseBean().getHomeInterface();
-	else if (isRemote())
-		return getEnterpriseBean().getRemoteInterface();
-	else if (isLocalHome())
-		return getEnterpriseBean().getLocalHomeInterface();
-	else if (isLocal())
-		return getEnterpriseBean().getLocalInterface();
-	else if (isUnspecified() && getEnterpriseBean().isMessageDriven())
-		return getEnterpriseBean().getEjbClass();
-	else
-		return null;
-}
-	/**
- * Answer whether method params apply to this method, e.g., it is specific to one
- * overloaded method, even if the method is a zero parameter method.  Answer false if no
- * parameters apply, that is, the method element applies to all overloaded methods with this name
- */
-public boolean hasMethodParams() {
-	return getParms() != null;
-}
-/**
- * Parse @aSignature setting the name and the params.
- * A signature example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-public void initializeFromSignature(String aSignature) {
-	parseSignature(aSignature);
-}
-public boolean isDefault() {
-    return JavaClass.DEFAULT_METHOD_NAME.equals(getName());
-}
-/**
- * Return true if this MethodElement and @anotherMethodElement
- * represent the same exact methods.
- */
-public boolean isEquivalent(MethodElement anotherMethodElement) {
-	boolean equal = equalSignature(anotherMethodElement);
-	if (equal)
-		equal = getEnterpriseBean() == anotherMethodElement.getEnterpriseBean();
-	return equal;
-}
-public boolean isHome() {
-	return getType().getValue() == MethodElementKind.HOME;
-}
-public boolean isRemote() {
-	return getType().getValue() == MethodElementKind.REMOTE;
-}
-public boolean isUnspecified() {
-	return getType().getValue() == MethodElementKind.UNSPECIFIED;
-}
-public boolean isLocalHome() {
-	return getType().getValue() == MethodElementKind.LOCAL_HOME;
-}
-public boolean isLocal() {
-	return getType().getValue() == MethodElementKind.LOCAL;
-}
-/**
- * Return true if this MethodElement represents one or more
- * methods.
- */
-public boolean isValid() {
-	return getMethods().length > 0;
-}
-/**
- * Return true only if all the parameters for @aMethod
- * matches the names in the list of parameters.
- */
-public boolean matchesParams(Method aMethod) {
-	if (aMethod == null) return false;
-	List params = getMethodParams();
-	JavaParameter[] methodParams = aMethod.listParametersWithoutReturn();
-	if (params.size() != methodParams.length)
-		return false;
-	for (int i = 0; i < methodParams.length; i++){
-		String parameterType = ((JavaHelpers)methodParams[i].getEType()).getQualifiedName();
-		if (!params.get(i).equals(parameterType)) 
-			return false;
-	}
-	return true;
-}
-/**
- * Return true if this MethodElement has the same basic signature as
- * @aMethod, ignoring the return type, thrown exceptions, and declaring class of 
- * this instance or @aMethod.  Return false, if params is null
- */
-public boolean nameAndParamsEquals(Method aMethod) {
-	if (aMethod != null) {
-		if (getName().equals(aMethod.getName())) {
-			if (hasMethodParams())
-				return matchesParams(aMethod);
-			return false;
-		}
-	}
-	return false;
-}
-protected boolean parmsEqual(MethodElement me) {
-	if (me == null) return false;
-	List myParms, otherParms;
-	myParms = getMethodParams();
-	otherParms = me.getMethodParams();
-	if (myParms.size() != otherParms.size()) return false;
-	for (int i = 0; i < myParms.size(); i++){
-		if (!myParms.get(i).equals(otherParms.get(i)))
-			return false;
-	}
-	return true;
-}
-/**
- * Parse @aSignature setting the name and the params.
- * A signature example:  setTwoParamMethod(java.lang.String, java.lang.String)
- */
-protected void parseSignature(String aSignature) {
-	int index = aSignature.indexOf(RIGHT_PAREN);
-
-	int endIndex = aSignature.indexOf(LEFT_PAREN);
-	if (endIndex < 0)
-	{
-		endIndex = aSignature.length() - 1;	
-	}	
-
-	if (index < 0){
-		setName(aSignature);
-		setParms(null); //There are no parameters in the sig so set to null
-	}
-	else {
-		String sigName = aSignature.substring(0, index);
-
-		setName(sigName);
-		String sigParms = aSignature.substring(index + 1, endIndex);
-
-		if (sigParms.length() > 0) {
-			char commaChar = COMMA.charAt(0);
-			char[] sigParmsChars = sigParms.toCharArray();
-			StringBuffer buf = new StringBuffer();
-			for (int i = 0; i < sigParmsChars.length; i++) {
-				if (sigParmsChars[i] != commaChar) {
-					buf.append(sigParmsChars[i]);
-				} else {
-					addMethodParams(buf.toString());
-					buf = new StringBuffer();
-				}
-			}
-			addMethodParams(buf.toString());
-		} else
-			applyZeroParams();
-	}
-}
-public void removeMethodParams(String param) { 
-	String myParams = getParms();
-	if (myParams == null || myParams.length() == 0) {
-		return;
-	}
-	StringTokenizer tok = new StringTokenizer(myParams);
-	StringBuffer newParms = new StringBuffer();
-	while (tok.hasMoreElements()) {
-		String token = tok.nextToken();
-		if (!token.equals(param)) {
-			newParms.append(token);
-			newParms.append(" "); //$NON-NLS-1$
-		}
-	}
-	setParms(newParms.toString().trim());
-}
-/**
- * represents method comment.
- */
-public boolean represents(Method aMethod) {
-	if (aMethod != null) {
-		if (isUnspecified() || typeClassImplementsInterface(aMethod.getJavaClass())) {
-			if (isDefault())
-				return true;
-			else 
-				if (getName().equals(aMethod.getName())) {
-					if (hasMethodParams())
-						return matchesParams(aMethod);
-					return true;
-				}
-		}
-	}					
-	return false;
-}
-/**
- * Sets the id to be [MethodTransactionID| MethodPermissionID]_EJBNAME_MethodName,
- * or [MethodTransactionID| MethodPermissionID]_EJBNAME_MethodName_Parms, if parms exist
- */
-public void setIdToReadableString() { 
-	String aParms = getParms() == null ? "" : "_"+getParms().replace(' ', '_'); //$NON-NLS-1$ //$NON-NLS-2$
-	String prefix = ""; //$NON-NLS-1$
-	switch (MethodElementHelper.getContainedType(this)) {
-		case MethodElementHelper.METHOD_PERMISSION :	
-			prefix = ((XMIResource)eContainer.eResource()).getID(eContainer);
-			break;
-		case MethodElementHelper.METHOD_TRANSACTION :
-			prefix = ((XMIResource)eContainer.eResource()).getID(eContainer);
-			break;
-	}
-	((XMIResource)eResource()).setID(this,prefix + "_" + getEnterpriseBean().getName() + "_" + getName() + aParms); //$NON-NLS-1$ //$NON-NLS-2$
-}
-protected boolean typeClassImplementsInterface(JavaClass anInterface) {
-	if (getTypeJavaClass() == null || anInterface == null) return false;
-	return getTypeJavaClass().implementsInterface(anInterface);
-}
-/**
- * Return true if this MethodElement uniquely identifies
- * @aMethod.  Return false, even if the MethodElement represents
- * @aMethod (i.e., @aMethod is contained in its list of methods).
- */
-public boolean uniquelyIdentifies(Method aMethod) {
-	if (aMethod != null) {
-		if (getTypeJavaClass() != null && 
-	        typeClassImplementsInterface(aMethod.getJavaClass()) && 
-	        getName().equals(aMethod.getName())) {
-			if (hasMethodParams())
-				return matchesParams(aMethod);
-			return aMethod.listParametersWithoutReturn().length==0;
-		}
-	}
-	return false;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The method-name element contains a name of an enterprise bean method,
-	 * or the asterisk (*) character. The asterisk is used when the element
-	 * denotes all the methods of an enterprise bean's remote and home
-	 * interfaces.
-
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getParms() {
-		return parms;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParms(String newParms) {
-		String oldParms = parms;
-		parms = newParms;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__PARMS, oldParms, parms));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public MethodElementKind getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(MethodElementKind newType) {
-		MethodElementKind oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		boolean oldTypeESet = typeESet;
-		typeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__TYPE, oldType, type, !oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetType() {
-		MethodElementKind oldType = type;
-		boolean oldTypeESet = typeESet;
-		type = TYPE_EDEFAULT;
-		typeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.METHOD_ELEMENT__TYPE, oldType, TYPE_EDEFAULT, oldTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetType() {
-		return typeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EnterpriseBean getEnterpriseBean() {
-		if (enterpriseBean != null && enterpriseBean.eIsProxy()) {
-			EnterpriseBean oldEnterpriseBean = enterpriseBean;
-			enterpriseBean = (EnterpriseBean)eResolveProxy((InternalEObject)enterpriseBean);
-			if (enterpriseBean != oldEnterpriseBean) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN, oldEnterpriseBean, enterpriseBean));
-			}
-		}
-		return enterpriseBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EnterpriseBean basicGetEnterpriseBean() {
-		return enterpriseBean;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEnterpriseBean(EnterpriseBean newEnterpriseBean) {
-		EnterpriseBean oldEnterpriseBean = enterpriseBean;
-		enterpriseBean = newEnterpriseBean;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN, oldEnterpriseBean, enterpriseBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_ELEMENT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.METHOD_ELEMENT__NAME:
-				return getName();
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				return getParms();
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				return getType();
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				if (resolve) return getEnterpriseBean();
-				return basicGetEnterpriseBean();
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_ELEMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				return PARMS_EDEFAULT == null ? parms != null : !PARMS_EDEFAULT.equals(parms);
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				return isSetType();
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				return enterpriseBean != null;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_ELEMENT__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				setParms((String)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				setType((MethodElementKind)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				setEnterpriseBean((EnterpriseBean)newValue);
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_ELEMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_ELEMENT__PARMS:
-				setParms(PARMS_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_ELEMENT__TYPE:
-				unsetType();
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_ELEMENT__ENTERPRISE_BEAN:
-				setEnterpriseBean((EnterpriseBean)null);
-				return;
-			case EjbPackage.METHOD_ELEMENT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (name: "); //$NON-NLS-1$
-		result.append(name);
-		result.append(", parms: "); //$NON-NLS-1$
-		result.append(parms);
-		result.append(", type: "); //$NON-NLS-1$
-		if (typeESet) result.append(type); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodPermissionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodPermissionImpl.java
deleted file mode 100644
index e577dde..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodPermissionImpl.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-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.internal.ejb.EjbPackage;
-
-
-/**
- * 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.
- */
-public class MethodPermissionImpl extends EObjectImpl implements MethodPermission, EObject {
-
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isUnchecked() <em>Unchecked</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUnchecked()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean UNCHECKED_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean unchecked = UNCHECKED_EDEFAULT;
-	/**
-	 * This is true if the Unchecked attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean uncheckedESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList roles = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodElements = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public MethodPermissionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getMethodPermission();
-	}
-
-public List getMethodElements(EnterpriseBean anEJB) {
-	if (anEJB == null) return Collections.EMPTY_LIST;
-	List result = new ArrayList();
-	List elements = getMethodElements();
-	MethodElement me;
-	for (int i = 0; i < elements.size(); i++){
-		me = (MethodElement) elements.get(i);
-		if (anEJB.equals(me.getEnterpriseBean()))
-			result.add(me);			
-	}
-	return result;
-}
-public SecurityRole getSecurityRole(String aRoleName) {
-	if (aRoleName == null) return null;
-	List myRoles = getRoles();
-	int size = myRoles.size();
-	SecurityRole role;
-	for (int i = 0; i < size; i++){
-		role = (SecurityRole) myRoles.get(i);
-		if (aRoleName.equals(role.getRoleName()))
-			return role;
-	}
-	return null;
-}
-/**
- * Return true if this permission contains @aSecurityRole
- */
-public boolean hasSecurityRole(SecurityRole aSecurityRole) {
-	if (aSecurityRole == null)
-		return false;
-	List myRoles = getRoles();
-	int size = myRoles.size();
-	for (int i = 0; i < size; i++) {
-		if (aSecurityRole == myRoles.get(i))
-			return true;
-	}
-	return false;
-}
-public boolean hasSecurityRole(String aRoleName) {
-	return getSecurityRole(aRoleName) != null;
-}
-/**
- * Return true if this MethodPermission and @anotherMethodPermission
- * have the same roles.
- */
-public boolean isEquivalent(MethodPermission anotherMethodPermission) {
-	if (anotherMethodPermission == null) return false;
-	return getRoles().size() == anotherMethodPermission.getRoles().size() &&
-			getRoles().containsAll(anotherMethodPermission.getRoles());
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isUnchecked() {
-		return unchecked;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUnchecked(boolean newUnchecked) {
-		boolean oldUnchecked = unchecked;
-		unchecked = newUnchecked;
-		boolean oldUncheckedESet = uncheckedESet;
-		uncheckedESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__UNCHECKED, oldUnchecked, unchecked, !oldUncheckedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetUnchecked() {
-		boolean oldUnchecked = unchecked;
-		boolean oldUncheckedESet = uncheckedESet;
-		unchecked = UNCHECKED_EDEFAULT;
-		uncheckedESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.METHOD_PERMISSION__UNCHECKED, oldUnchecked, UNCHECKED_EDEFAULT, oldUncheckedESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetUnchecked() {
-		return uncheckedESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AssemblyDescriptor getAssemblyDescriptor() {
-		if (eContainerFeatureID != EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR) return null;
-		return (AssemblyDescriptor)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor) {
-		if (newAssemblyDescriptor != eContainer || (eContainerFeatureID != EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR && newAssemblyDescriptor != null)) {
-			if (EcoreUtil.isAncestor(this, newAssemblyDescriptor))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newAssemblyDescriptor != null)
-				msgs = ((InternalEObject)newAssemblyDescriptor).eInverseAdd(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS, AssemblyDescriptor.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newAssemblyDescriptor, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR, newAssemblyDescriptor, newAssemblyDescriptor));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getRoles() {
-		if (roles == null) {
-			roles = new EObjectResolvingEList(SecurityRole.class, this, EjbPackage.METHOD_PERMISSION__ROLES);
-		}
-		return roles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodElements() {
-		if (methodElements == null) {
-			methodElements = new EObjectContainmentEList(MethodElement.class, this, EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS);
-		}
-		return methodElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_PERMISSION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR, 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 EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-					return eBasicSetContainer(null, EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR, msgs);
-				case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-					return ((InternalEList)getMethodElements()).basicRemove(otherEnd, msgs);
-				case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-					return eContainer.eInverseRemove(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_PERMISSIONS, AssemblyDescriptor.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 EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				return isUnchecked() ? Boolean.TRUE : Boolean.FALSE;
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor();
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				return getRoles();
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				return getMethodElements();
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				return isSetUnchecked();
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor() != null;
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				return roles != null && !roles.isEmpty();
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				return methodElements != null && !methodElements.isEmpty();
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				setUnchecked(((Boolean)newValue).booleanValue());
-				return;
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				getRoles().clear();
-				getRoles().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				getMethodElements().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_PERMISSION__UNCHECKED:
-				unsetUnchecked();
-				return;
-			case EjbPackage.METHOD_PERMISSION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)null);
-				return;
-			case EjbPackage.METHOD_PERMISSION__ROLES:
-				getRoles().clear();
-				return;
-			case EjbPackage.METHOD_PERMISSION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				return;
-			case EjbPackage.METHOD_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", unchecked: "); //$NON-NLS-1$
-		if (uncheckedESet) result.append(unchecked); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodTransactionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodTransactionImpl.java
deleted file mode 100644
index 9fa09ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/MethodTransactionImpl.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.TransactionAttributeType;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * 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.
- */
-public class MethodTransactionImpl extends EObjectImpl implements MethodTransaction, EObject {
-
-	/**
-	 * The default value of the '{@link #getTransactionAttribute() <em>Transaction Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionAttributeType TRANSACTION_ATTRIBUTE_EDEFAULT = TransactionAttributeType.NOT_SUPPORTED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionAttributeType transactionAttribute = TRANSACTION_ATTRIBUTE_EDEFAULT;
-	/**
-	 * This is true if the Transaction Attribute attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionAttributeESet = false;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList methodElements = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public MethodTransactionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getMethodTransaction();
-	}
-
-/**
- * Return an array of Strings for all the EEnumLiteral values
- * for the transactionAttribute enumeration.
- */
-public static String[] getAvailableTransactionAttributeNames() {
-	List l = getAvailableTransactionAttributes();
-	String[] names = new String[l.size()];
-	for (int i = 0; i < l.size(); i++)
-		names[i] = ((EEnumLiteral)l.get(i)).toString();
-	return names;
-}
-/**
- * Return a List of the all the EEnumLiteral values
- * for the transactionAttribute enumeration.
- * The toString() method for a EEnumLiteral will display
- * the String value for the enumeration value.
- */
-public static List getAvailableTransactionAttributes() {
-	EjbPackage pack = (EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-	return pack.getTransactionAttributeType().getELiterals();
-}
-public List getMethodElements(EnterpriseBean anEJB) {
-	List result = new ArrayList();
-	List elements = getMethodElements();
-	MethodElement me;
-	for (int i = 0; i < elements.size(); i++){
-		me = (MethodElement) elements.get(i);
-		if (me.getEnterpriseBean() != null && me.getEnterpriseBean().equals(anEJB))
-			result.add(me);			
-	}
-	return result;
-}
-public MethodElement getMostSpecificMethodElement(Method aMethod) {
-   return MethodElementImpl.getMostSpecificMethodElement(getMethodElements(), aMethod);
-}
-public boolean isEquivalent(MethodTransaction anotherMethodTransaction) {
-	return getTransactionAttribute() == anotherMethodTransaction.getTransactionAttribute();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The trans-attribute element specifies how the container must manage the transaction boundaries when delegating a method invocation to an enterprise bean's business method.
-
-	 */
-	public TransactionAttributeType getTransactionAttribute() {
-		return transactionAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionAttribute(TransactionAttributeType newTransactionAttribute) {
-		TransactionAttributeType oldTransactionAttribute = transactionAttribute;
-		transactionAttribute = newTransactionAttribute == null ? TRANSACTION_ATTRIBUTE_EDEFAULT : newTransactionAttribute;
-		boolean oldTransactionAttributeESet = transactionAttributeESet;
-		transactionAttributeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE, oldTransactionAttribute, transactionAttribute, !oldTransactionAttributeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionAttribute() {
-		TransactionAttributeType oldTransactionAttribute = transactionAttribute;
-		boolean oldTransactionAttributeESet = transactionAttributeESet;
-		transactionAttribute = TRANSACTION_ATTRIBUTE_EDEFAULT;
-		transactionAttributeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE, oldTransactionAttribute, TRANSACTION_ATTRIBUTE_EDEFAULT, oldTransactionAttributeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionAttribute() {
-		return transactionAttributeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description element is used by the ejb-jar file producer to provide text describing the parent element.  The description element should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the parent element.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TRANSACTION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AssemblyDescriptor getAssemblyDescriptor() {
-		if (eContainerFeatureID != EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR) return null;
-		return (AssemblyDescriptor)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAssemblyDescriptor(AssemblyDescriptor newAssemblyDescriptor) {
-		if (newAssemblyDescriptor != eContainer || (eContainerFeatureID != EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR && newAssemblyDescriptor != null)) {
-			if (EcoreUtil.isAncestor(this, newAssemblyDescriptor))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newAssemblyDescriptor != null)
-				msgs = ((InternalEObject)newAssemblyDescriptor).eInverseAdd(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS, AssemblyDescriptor.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newAssemblyDescriptor, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR, newAssemblyDescriptor, newAssemblyDescriptor));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMethodElements() {
-		if (methodElements == null) {
-			methodElements = new EObjectContainmentEList(MethodElement.class, this, EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS);
-		}
-		return methodElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR, 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 EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-					return eBasicSetContainer(null, EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR, msgs);
-				case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-					return ((InternalEList)getMethodElements()).basicRemove(otherEnd, msgs);
-				case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-					return eContainer.eInverseRemove(this, EjbPackage.ASSEMBLY_DESCRIPTOR__METHOD_TRANSACTIONS, AssemblyDescriptor.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 EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				return getTransactionAttribute();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor();
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				return getMethodElements();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				return isSetTransactionAttribute();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				return getAssemblyDescriptor() != null;
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				return methodElements != null && !methodElements.isEmpty();
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				setTransactionAttribute((TransactionAttributeType)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				getMethodElements().addAll((Collection)newValue);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.METHOD_TRANSACTION__TRANSACTION_ATTRIBUTE:
-				unsetTransactionAttribute();
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__ASSEMBLY_DESCRIPTOR:
-				setAssemblyDescriptor((AssemblyDescriptor)null);
-				return;
-			case EjbPackage.METHOD_TRANSACTION__METHOD_ELEMENTS:
-				getMethodElements().clear();
-				return;
-			case EjbPackage.METHOD_TRANSACTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (transactionAttribute: "); //$NON-NLS-1$
-		if (transactionAttributeESet) result.append(transactionAttribute); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledKeyAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledKeyAttributeFilter.java
deleted file mode 100644
index 9670b43..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledKeyAttributeFilter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the keyAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any keyAttributes that are held by EjbRelationshipRole objects (including
- * inherited EjbRelationshipRole attributes).
- * That means the returned list of CMPAttributes will be key attributes that were defined locally
- * and all inherited key attributes minus any key attributes pointed to by EjbRelationshipRoles, thus the
- * key attributes will only be key attributes that were defined by the user.
- * Creation date: (11/28/2000 8:09:10 PM)
- * @author: Administrator
- */
-public class ModelledKeyAttributeFilter extends ContainerManagedEntityFilter {
-	private static ModelledKeyAttributeFilter singleton;
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	return getSourceAttributes(cmp);
-}
-/**
- * Return the proper list of attributes from cmpExt.
- * Return all attributes minus those added due to Relationship Roles.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	java.util.List all, localRoleKeyAttributes;
-	all = new java.util.ArrayList(cmp.getKeyAttributes());
-	localRoleKeyAttributes = cmp.getFilteredFeatures(KeyRelationshipRoleAttributeFilter.singleton());
-	filterRoleAttributesByName(all, localRoleKeyAttributes);
-	return all;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.ModelledKeyAttributeFilter
- */
-public static ModelledKeyAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new ModelledKeyAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledPersistentAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledPersistentAttributeFilter.java
deleted file mode 100644
index 5259acc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/ModelledPersistentAttributeFilter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the persistentAttributes from the 
- * ContainerManagedEntityExtension that is passed as an argument to the filter method.
- * It will remove any persistentAttributes that are held by EjbRelationshipRole objects (including
- * inherited EjbRelationshipRole attributes).
- * That means the returned list of CMPAttributes will be attributes that were defined locally
- * and all inherited attributes minus any attributes pointed to by EjbRelationshipRoles, thus the
- * attributes will only be attributes that were defined by the user.
- * Creation date: (11/28/2000 7:31:42 PM)
- * @author: Administrator
- */
-public class ModelledPersistentAttributeFilter extends ContainerManagedEntityFilter {
-	private static ModelledPersistentAttributeFilter singleton;
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	return getSourceAttributes(cmp);
-}
-/**
- * Return the proper list of attributes from cmpExt.
- * Return all attributes minus those added due to Relationship Roles.
- */
-protected java.util.List getSourceAttributes(ContainerManagedEntity cmp) {
-	java.util.List all, roleAttributes;
-	all = new java.util.ArrayList(cmp.getPersistentAttributes());
-	roleAttributes = cmp.getFilteredFeatures(RelationshipRoleAttributeFilter.singleton());
-	filterRoleAttributesByName(all, roleAttributes);
-	return all;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.ModelledPersistentAttributeFilter
- */
-public static ModelledPersistentAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new ModelledPersistentAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/NonKeyRequiredRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/NonKeyRequiredRoleFilter.java
deleted file mode 100644
index 0c0b3cb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/NonKeyRequiredRoleFilter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 5, 2003
- * 
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class NonKeyRequiredRoleFilter extends ContainerManagedEntityFilter {
-
-    private static NonKeyRequiredRoleFilter singleton;
-
-    /**
-     * filter method comment.
-     */
-    public List filter(ContainerManagedEntity cmp) {
-        List roles = new ArrayList();
-        Iterator it = getRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role;
-        while (it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            if (!role.isKey() && role.isRequired()) roles.add(role);
-        }
-        return roles;
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (11/28/2000 7:15:37
-     * PM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.KeyRelationshipRoleFilter
-     */
-    public static NonKeyRequiredRoleFilter singleton() {
-        if (singleton == null) singleton = new NonKeyRequiredRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryImpl.java
deleted file mode 100644
index a2f6573..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryImpl.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.ReturnTypeMapping;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * The query element is used to specify a finder or select query. It contains an optional description of the query; the specification of the finder or select method it is used by; a specification of the return type mapping, if any, if the query is for a select method; and the EJB QL query string that defines the query. Queries that are expressible in EJB QL must use the ejb-ql element to specify the query. If a query
- * is not expressible in EJB QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty.
- */
-public class QueryImpl extends EObjectImpl implements Query, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getEjbQL() <em>Ejb QL</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEjbQL()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EJB_QL_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String ejbQL = EJB_QL_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getReturnTypeMapping() <em>Return Type Mapping</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReturnTypeMapping()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ReturnTypeMapping RETURN_TYPE_MAPPING_EDEFAULT = ReturnTypeMapping.LOCAL_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ReturnTypeMapping returnTypeMapping = RETURN_TYPE_MAPPING_EDEFAULT;
-	/**
-	 * This is true if the Return Type Mapping attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean returnTypeMappingESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected QueryMethod queryMethod = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public QueryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getQuery();
-	}
-
-public boolean isLocalResultMapping() {
-	// override bug in the model which made Remote the default
-	return getReturnTypeMapping().getValue() == ReturnTypeMapping.LOCAL;
-}
-public boolean isRemoteResultMapping() {
-	return getReturnTypeMapping().getValue() == ReturnTypeMapping.REMOTE;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the query.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the EJB QL query string that defines a finder or select query. This element is defined within the scope of a query element whose contents specify the finder or the select method that uses the query. The content must be a valid EJB QL query string for the entity bean for which the query is specified. The ejb-ql element must be specified for all queries that are expressible in EJB QL.
-	 * 
-	 * @invariant The value must be a valid EJB QL query string for the entity bean or dependent object class for which the query is specified.
-	 * @invariant The ejb-ql element must be specified for all queries that are expressible in EJB QL.
-	 * 
-	 * Example:
-	 * <query>
-	 * <query-method>
-	 * <method-name>ejbSelectPendingLineitems<//method-name>
-	 * <method-params//>
-	 * <//query-method>
-	 * <ejb-ql>SELECT ENTITY(l)
-	 * FROM LineItems l
-	 * WHERE l.shipped is FALSE
-	 * <//ejb-ql>
-	 * <//query>
-	 */
-	public String getEjbQL() {
-		return ejbQL;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbQL(String newEjbQL) {
-		String oldEjbQL = ejbQL;
-		ejbQL = newEjbQL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__EJB_QL, oldEjbQL, ejbQL));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The return-type-mapping element is used in the query element to specify whether an abstract schema type that is returned by a query for a select method is to be mapped to an EJBLocalObject or EJBObject type.  The value of the return-type-mapping element, if specified must be one of the following.
-	 */
-	public ReturnTypeMapping getReturnTypeMapping() {
-		return returnTypeMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReturnTypeMapping(ReturnTypeMapping newReturnTypeMapping) {
-		ReturnTypeMapping oldReturnTypeMapping = returnTypeMapping;
-		returnTypeMapping = newReturnTypeMapping == null ? RETURN_TYPE_MAPPING_EDEFAULT : newReturnTypeMapping;
-		boolean oldReturnTypeMappingESet = returnTypeMappingESet;
-		returnTypeMappingESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__RETURN_TYPE_MAPPING, oldReturnTypeMapping, returnTypeMapping, !oldReturnTypeMappingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReturnTypeMapping() {
-		ReturnTypeMapping oldReturnTypeMapping = returnTypeMapping;
-		boolean oldReturnTypeMappingESet = returnTypeMappingESet;
-		returnTypeMapping = RETURN_TYPE_MAPPING_EDEFAULT;
-		returnTypeMappingESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.QUERY__RETURN_TYPE_MAPPING, oldReturnTypeMapping, RETURN_TYPE_MAPPING_EDEFAULT, oldReturnTypeMappingESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReturnTypeMapping() {
-		return returnTypeMappingESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The query-method element is used to specify the method (DB//SR//CM-"on the home") for a finder or
-	 * select query.
-	 * 
-	 * The method-name element specifies the name of a finder or select
-	 * method in the entity bean's implementation class or a select method in
-	 * the dependent object class.
-	 * 
-	 * Each method-param must be defined for a query-method using the
-	 * method-params element.
-	 * 
-	 * Used in: query
-	 * 
-	 * Example:
-	 * 
-	 * Example:
-	 * <query>
-	 *   <description>Method finds large orders<//description>
-	 *   <query-method>
-	 *     <method-name>findLargeOrders<//method-name>
-	 *     <method-params><//method-params>
-	 *   <//query-method>
-	 *   <ejb-ql>SELECT ENTITY(o) FROM Order o WHERE o.amount &gt; 1000<//ejb-ql>
-	 * <//query>
-	 */
-	public QueryMethod getQueryMethod() {
-		return queryMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetQueryMethod(QueryMethod newQueryMethod, NotificationChain msgs) {
-		QueryMethod oldQueryMethod = queryMethod;
-		queryMethod = newQueryMethod;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__QUERY_METHOD, oldQueryMethod, newQueryMethod);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setQueryMethod(QueryMethod newQueryMethod) {
-		if (newQueryMethod != queryMethod) {
-			NotificationChain msgs = null;
-			if (queryMethod != null)
-				msgs = ((InternalEObject)queryMethod).eInverseRemove(this, EjbPackage.QUERY_METHOD__QUERY, QueryMethod.class, msgs);
-			if (newQueryMethod != null)
-				msgs = ((InternalEObject)newQueryMethod).eInverseAdd(this, EjbPackage.QUERY_METHOD__QUERY, QueryMethod.class, msgs);
-			msgs = basicSetQueryMethod(newQueryMethod, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__QUERY_METHOD, newQueryMethod, newQueryMethod));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ContainerManagedEntity getEntity() {
-		if (eContainerFeatureID != EjbPackage.QUERY__ENTITY) return null;
-		return (ContainerManagedEntity)eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEntity(ContainerManagedEntity newEntity) {
-		if (newEntity != eContainer || (eContainerFeatureID != EjbPackage.QUERY__ENTITY && newEntity != null)) {
-			if (EcoreUtil.isAncestor(this, newEntity))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEntity != null)
-				msgs = ((InternalEObject)newEntity).eInverseAdd(this, EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES, ContainerManagedEntity.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newEntity, EjbPackage.QUERY__ENTITY, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY__ENTITY, newEntity, newEntity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.QUERY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.QUERY__QUERY_METHOD:
-					if (queryMethod != null)
-						msgs = ((InternalEObject)queryMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EjbPackage.QUERY__QUERY_METHOD, null, msgs);
-					return basicSetQueryMethod((QueryMethod)otherEnd, msgs);
-				case EjbPackage.QUERY__ENTITY:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.QUERY__ENTITY, 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 EjbPackage.QUERY__QUERY_METHOD:
-					return basicSetQueryMethod(null, msgs);
-				case EjbPackage.QUERY__ENTITY:
-					return eBasicSetContainer(null, EjbPackage.QUERY__ENTITY, msgs);
-				case EjbPackage.QUERY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.QUERY__ENTITY:
-					return eContainer.eInverseRemove(this, EjbPackage.CONTAINER_MANAGED_ENTITY__QUERIES, ContainerManagedEntity.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 EjbPackage.QUERY__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.QUERY__EJB_QL:
-				return getEjbQL();
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				return getReturnTypeMapping();
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return getQueryMethod();
-			case EjbPackage.QUERY__ENTITY:
-				return getEntity();
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.QUERY__EJB_QL:
-				return EJB_QL_EDEFAULT == null ? ejbQL != null : !EJB_QL_EDEFAULT.equals(ejbQL);
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				return isSetReturnTypeMapping();
-			case EjbPackage.QUERY__QUERY_METHOD:
-				return queryMethod != null;
-			case EjbPackage.QUERY__ENTITY:
-				return getEntity() != null;
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.QUERY__EJB_QL:
-				setEjbQL((String)newValue);
-				return;
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				setReturnTypeMapping((ReturnTypeMapping)newValue);
-				return;
-			case EjbPackage.QUERY__QUERY_METHOD:
-				setQueryMethod((QueryMethod)newValue);
-				return;
-			case EjbPackage.QUERY__ENTITY:
-				setEntity((ContainerManagedEntity)newValue);
-				return;
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.QUERY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.QUERY__EJB_QL:
-				setEjbQL(EJB_QL_EDEFAULT);
-				return;
-			case EjbPackage.QUERY__RETURN_TYPE_MAPPING:
-				unsetReturnTypeMapping();
-				return;
-			case EjbPackage.QUERY__QUERY_METHOD:
-				setQueryMethod((QueryMethod)null);
-				return;
-			case EjbPackage.QUERY__ENTITY:
-				setEntity((ContainerManagedEntity)null);
-				return;
-			case EjbPackage.QUERY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(", ejbQL: "); //$NON-NLS-1$
-		result.append(ejbQL);
-		result.append(", returnTypeMapping: "); //$NON-NLS-1$
-		if (returnTypeMappingESet) result.append(returnTypeMapping); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryMethodImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryMethodImpl.java
deleted file mode 100644
index 94eea59..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/QueryMethodImpl.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.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.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-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.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-/**
- * @generated
- */
-public class QueryMethodImpl extends MethodElementImpl implements QueryMethod{
-
-	public QueryMethodImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getQueryMethod();
-	}
-
-/**
- * For Query methods, their enterprise bean must be derived.
- * It is the Entity which contains the Query.
- */
-public EnterpriseBean getEnterpriseBean() {
-	if (enterpriseBean == null) {
-		if (getQuery() != null)
-			enterpriseBean = getQuery().getEntity();
-	}
-	return enterpriseBean;
-}
-/**
- * Answer the method for which this method element applies in the HOME INTERFACE.
- */
-protected Method getHomeMethod() {
-	Method result = null;
-	JavaClass javaClass = getEnterpriseBean().getHomeInterface();
-	if (javaClass != null) {
-		String methodName = getName().trim();
-		if (hasMethodParams())
-			result = javaClass.getPublicMethodExtended(methodName, getMethodParams());
-		else {
-			List methods = javaClass.getPublicMethodsExtendedNamed(methodName);
-			if (!methods.isEmpty())
-				result = (Method) methods.get(0);
-		}
-	}
-	return result;
-}
-/**
- * Answer the method for which this method element applies in the LOCAL HOME INTERFACE.
- */
-protected Method getLocalHomeMethod() {
-	Method result = null;
-	JavaClass javaClass = getEnterpriseBean().getLocalHomeInterface();
-	if (javaClass != null) {
-		String methodName = getName().trim();
-		if (hasMethodParams())
-			result = javaClass.getPublicMethodExtended(methodName, getMethodParams());
-		else {
-			List methods = javaClass.getPublicMethodsExtendedNamed(methodName);
-			if (!methods.isEmpty())
-				result = (Method) methods.get(0);
-		}
-	}
-	return result;
-}
-
-
-
-protected void addMethodIfNotNull(List aList, Method aMethod) {
-	if (aMethod != null)
-		aList.add(aMethod);
-}
-/**
- * This method will return a zero-length Method[] if there is no matching method
- * on the home, local home, or bean class.  It will return exactly one method
- * for ejbSelect, and one or two methods for finders.  The two method case occurs
- * when the same method with the same signature exists on both the home and
- * local home.
- */
-public Method[] getMethods() {
-	List result = new ArrayList(2);
-	if (getName().startsWith("ejbSelect")) { //$NON-NLS-1$
-		addMethodIfNotNull(result, getSelectMethod());
-	} else {
-		addMethodIfNotNull(result, getHomeMethod());
-		addMethodIfNotNull(result, getLocalHomeMethod());
-	}
-	return (Method[])result.toArray(new Method[result.size()]);
-}
-/**
- * Answer the method for which this method element applies in the HOME INTERFACE.
- */
-protected Method getSelectMethod() {
-	Method result = null;
-	JavaClass javaClass = getEnterpriseBean().getEjbClass();
-	String methodName = getName().trim();
-	if (hasMethodParams())
-		result = javaClass.getPublicMethodExtended(name, getMethodParams());
-	else {
-		List methods = javaClass.getPublicMethodsExtendedNamed(methodName);
-		if (!methods.isEmpty())
-			result = (Method) methods.iterator().next();
-	}
-	return result;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Query getQuery() {
-		if (eContainerFeatureID != EjbPackage.QUERY_METHOD__QUERY) return null;
-		return (Query)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setQuery(Query newQuery) {
-		if (newQuery != eContainer || (eContainerFeatureID != EjbPackage.QUERY_METHOD__QUERY && newQuery != null)) {
-			if (EcoreUtil.isAncestor(this, newQuery))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newQuery != null)
-				msgs = ((InternalEObject)newQuery).eInverseAdd(this, EjbPackage.QUERY__QUERY_METHOD, Query.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newQuery, EjbPackage.QUERY_METHOD__QUERY, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.QUERY_METHOD__QUERY, newQuery, newQuery));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.QUERY_METHOD__QUERY:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.QUERY_METHOD__QUERY, 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 EjbPackage.QUERY_METHOD__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.QUERY_METHOD__QUERY:
-					return eBasicSetContainer(null, EjbPackage.QUERY_METHOD__QUERY, 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 EjbPackage.QUERY_METHOD__QUERY:
-					return eContainer.eInverseRemove(this, EjbPackage.QUERY__QUERY_METHOD, Query.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 EjbPackage.QUERY_METHOD__NAME:
-				return getName();
-			case EjbPackage.QUERY_METHOD__PARMS:
-				return getParms();
-			case EjbPackage.QUERY_METHOD__TYPE:
-				return getType();
-			case EjbPackage.QUERY_METHOD__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.QUERY_METHOD__ENTERPRISE_BEAN:
-				if (resolve) return getEnterpriseBean();
-				return basicGetEnterpriseBean();
-			case EjbPackage.QUERY_METHOD__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.QUERY_METHOD__QUERY:
-				return getQuery();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.QUERY_METHOD__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.QUERY_METHOD__PARMS:
-				return PARMS_EDEFAULT == null ? parms != null : !PARMS_EDEFAULT.equals(parms);
-			case EjbPackage.QUERY_METHOD__TYPE:
-				return isSetType();
-			case EjbPackage.QUERY_METHOD__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.QUERY_METHOD__ENTERPRISE_BEAN:
-				return enterpriseBean != null;
-			case EjbPackage.QUERY_METHOD__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.QUERY_METHOD__QUERY:
-				return getQuery() != 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 EjbPackage.QUERY_METHOD__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__PARMS:
-				setParms((String)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__TYPE:
-				setType((MethodElementKind)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__ENTERPRISE_BEAN:
-				setEnterpriseBean((EnterpriseBean)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.QUERY_METHOD__QUERY:
-				setQuery((Query)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.QUERY_METHOD__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.QUERY_METHOD__PARMS:
-				setParms(PARMS_EDEFAULT);
-				return;
-			case EjbPackage.QUERY_METHOD__TYPE:
-				unsetType();
-				return;
-			case EjbPackage.QUERY_METHOD__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.QUERY_METHOD__ENTERPRISE_BEAN:
-				setEnterpriseBean((EnterpriseBean)null);
-				return;
-			case EjbPackage.QUERY_METHOD__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.QUERY_METHOD__QUERY:
-				setQuery((Query)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * You should use getClientTypeJavaClasses to ensure you pick up both home interfaces
-	 * if they exist.
-	 */
-	public JavaClass getTypeJavaClass() {
-		JavaClass[] result = getClientTypeJavaClasses();
-		if (result != null && result.length > 0)
-			return result[0];
-		return null;
-	}
-	
-	/**
-	 * Return an array of JavaClasses of all the interfaces or bean class that this method is presented
-	 * to a client.  If it is an ejbSelect... on the bean class will be returned and if
-	 * it if a find both home interfaces will be returned if they exist.
-	 * 
-	 * May return null.
-	 */
-	public JavaClass[] getClientTypeJavaClasses() {
-		if (getName() == null || getEnterpriseBean() == null) return null;
-		EnterpriseBean ejb = getEnterpriseBean();
-		if (getName().startsWith(SELECT_PREFIX))
-			return new JavaClass[]{ejb.getEjbClass()};
-		//Next case is tougher since you could have both a remove and local client
-		//We want to return the home interface in this case.
-		if (getName().startsWith(FIND_PREFIX)) {
-			if (ejb.hasLocalClient() && !ejb.hasRemoteClient())
-				return new JavaClass[]{getEnterpriseBean().getLocalHomeInterface()};
-			if (ejb.hasRemoteClient() && !ejb.hasLocalClient())
-				return new JavaClass[]{ejb.getHomeInterface()};
-			if (ejb.hasRemoteClient() && ejb.hasLocalClient())
-				return new JavaClass[]{ejb.getLocalHomeInterface(), ejb.getHomeInterface()};
-		}
-		return null;
-	}
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipRoleAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipRoleAttributeFilter.java
deleted file mode 100644
index a4ae157..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipRoleAttributeFilter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-/**
- * This filter will return a subset of the persistentAttributes (this includes inherited 
- * attributes) from the ContainerManagedEntityExtension that is passed as an
- * argument to the filter method.
- * It will remove any attribute that is not pointed to by an EjbRelationshipRole.
- * Thus, the returned list will contain attributes (including inherited attributes) that only
- * belong to roles.
- * Creation date: (11/28/2000 6:46:08 PM)
- * @author: Administrator
- */
-public class RelationshipRoleAttributeFilter extends AbstractRelationshipRoleAttributeFilter {
-	private static RelationshipRoleAttributeFilter singleton;
-/**
- * Return the proper list of roles from cmpExt.
- */
-protected java.util.List getSourceRoles(ContainerManagedEntity cmp) { 
-	   return getRelationshipRoles(cmp); 
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/28/2000 5:36:00 PM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.RelationshipRoleAttributeFilter
- */
-public static RelationshipRoleAttributeFilter singleton() {
-	if (singleton == null)
-		singleton = new RelationshipRoleAttributeFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipsImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipsImpl.java
deleted file mode 100644
index 5292b3b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RelationshipsImpl.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * 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.
- */
-public class RelationshipsImpl extends EObjectImpl implements Relationships, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList ejbRelations = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public RelationshipsImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getRelationships();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The description is used by the ejb-jar file producer to provide text describing the collection of relationships.
-	 * 
-	 * The description should include any information that the ejb-jar file producer wants to provide to the consumer of the ejb-jar file (i.e. to the Deployer). Typically, the tools used by the ejb-jar file consumer will display the description when processing the list of dependents.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.RELATIONSHIPS__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBJar getEjbJar() {
-		if (eContainerFeatureID != EjbPackage.RELATIONSHIPS__EJB_JAR) return null;
-		return (EJBJar)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEjbJar(EJBJar newEjbJar) {
-		if (newEjbJar != eContainer || (eContainerFeatureID != EjbPackage.RELATIONSHIPS__EJB_JAR && newEjbJar != null)) {
-			if (EcoreUtil.isAncestor(this, newEjbJar))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newEjbJar != null)
-				msgs = ((InternalEObject)newEjbJar).eInverseAdd(this, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, EJBJar.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newEjbJar, EjbPackage.RELATIONSHIPS__EJB_JAR, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.RELATIONSHIPS__EJB_JAR, newEjbJar, newEjbJar));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A list of ejb-relation elements, which specify the container managed
-	 * relationships.
-	 */
-	public EList getEjbRelations() {
-		if (ejbRelations == null) {
-			ejbRelations = new EObjectContainmentWithInverseEList(EJBRelation.class, this, EjbPackage.RELATIONSHIPS__EJB_RELATIONS, EjbPackage.EJB_RELATION__RELATIONSHIP_LIST);
-		}
-		return ejbRelations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.RELATIONSHIPS__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.RELATIONSHIPS__EJB_JAR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.RELATIONSHIPS__EJB_JAR, msgs);
-				case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-					return ((InternalEList)getEjbRelations()).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 EjbPackage.RELATIONSHIPS__EJB_JAR:
-					return eBasicSetContainer(null, EjbPackage.RELATIONSHIPS__EJB_JAR, msgs);
-				case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-					return ((InternalEList)getEjbRelations()).basicRemove(otherEnd, msgs);
-				case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.RELATIONSHIPS__EJB_JAR:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_JAR__RELATIONSHIP_LIST, EJBJar.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 EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return getEjbRelations();
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				return ejbRelations != null && !ejbRelations.isEmpty();
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				getEjbRelations().clear();
-				getEjbRelations().addAll((Collection)newValue);
-				return;
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.RELATIONSHIPS__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.RELATIONSHIPS__EJB_RELATIONS:
-				getEjbRelations().clear();
-				return;
-			case EjbPackage.RELATIONSHIPS__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredLocalRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredLocalRelationshipRoleFilter.java
deleted file mode 100644
index 40ca6b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredLocalRelationshipRoleFilter.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.internal.ejb.impl;
-
-import java.util.Collections;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (10/15/2001 11:35:00 AM)
- * @author: Administrator
- */
-public class RequiredLocalRelationshipRoleFilter extends AbstractRequiredRelationshipRoleFilter {
-	private static RequiredLocalRelationshipRoleFilter singleton;
-protected java.util.List getRolesToFilter(ContainerManagedEntity cmp) {
-    EjbModuleExtensionHelper modHelper = getEjbModuleExtHelper(cmp);
-	if(modHelper != null)
-	  return modHelper.getLocalRelationshipRoles_cmp11(cmp);
-	return Collections.EMPTY_LIST;
-}
-/**
- * Insert the method's description here.
- * Creation date: (8/6/2001 11:27:25 AM)
- * @return com.ibm.ejs.models.base.extensions.ejbext.impl.RequiredLocalRelationshipRoleFilter
- */
-public static RequiredLocalRelationshipRoleFilter singleton() {
-	if (singleton == null)
-		singleton = new RequiredLocalRelationshipRoleFilter();
-	return singleton;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredRelationshipRoleFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredRelationshipRoleFilter.java
deleted file mode 100644
index bd83244..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RequiredRelationshipRoleFilter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-
-
-/**
- * Insert the type's description here. Creation date: (8/6/2001 11:26:10 AM)
- * @author: Administrator
- */
-public class RequiredRelationshipRoleFilter extends ContainerManagedEntityFilter {
-
-    private static RequiredRelationshipRoleFilter singleton;
-
-    /**
-     * filter method comment.
-     */
-    public List filter(ContainerManagedEntity cmp) {
-        List roles = new ArrayList();
-        Iterator it = getRelationshipRoles(cmp).iterator();
-        CommonRelationshipRole role;
-        while (it.hasNext()) {
-            role = (CommonRelationshipRole) it.next();
-            if (shouldAddFilteredResult(role)) roles.add(role);
-        }
-        return roles;
-    }
-
-    /**
-     * Return true if the multiplicity for @aRole is required.
-     */
-    protected boolean shouldAddFilteredResult(CommonRelationshipRole aRole) {
-        return aRole.isRequired();
-    }
-
-    /**
-     * Insert the method's description here. Creation date: (8/6/2001 11:27:25
-     * AM)
-     * 
-     * @return com.ibm.ejs.models.base.extensions.ejbext.impl.RequiredRelationshipRoleFilter
-     */
-    public static RequiredRelationshipRoleFilter singleton() {
-        if (singleton == null) singleton = new RequiredRelationshipRoleFilter();
-        return singleton;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleShapeStrategy.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleShapeStrategy.java
deleted file mode 100644
index d75398e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleShapeStrategy.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.IRoleShapeStrategy;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/6/2000 11:41:33 AM)
- * @author: Administrator
- */
-public abstract class RoleShapeStrategy implements IRoleShapeStrategy {
-	protected boolean busy = false;
-	protected CommonRelationshipRole role;
-	protected ArrayList visitedKeyTypes = new ArrayList(5);
-/**
- * FlattenedRoleShapeStrategy constructor comment.
- */
-public RoleShapeStrategy(CommonRelationshipRole aRole) {
-	super();
-	setRole(aRole);
-}
-protected String appendName(String fullName, String additionalName) {
-	return fullName + ATTRIBUTE_NAME_JOINER + additionalName;
-}
-protected boolean canContinue() {
-	return !busy && role.isForward() && role.getName() != null;
-}
-protected boolean canComputeNames() {
-	//return getRole().getOpposite() != null;
-	return true;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/16/00 9:19:27 PM)
- * @return CommonRelationshipRole
- */
-public CommonRelationshipRole getRole() {
-	return role;
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/16/00 9:19:27 PM)
- * @return CommonRelationshipRole
- */
-
-public boolean isFlat () {
-	return false;
-}
-public boolean isRound () {
-	return false;
-}
-/**
- * Creates an appended name while uppercasing the first letter of the secondName.
- */
-public static String makeJavaName(String firstName, String secondName) {
-	StringBuffer nameBuffer = new StringBuffer(firstName);
-	nameBuffer.append(Character.toUpperCase(secondName.charAt(0)));
-	for (int i = 1; i < secondName.length(); i++)
-		nameBuffer.append(secondName.charAt(i));
-	return nameBuffer.toString();
-}
-public void reconcileAttributes(List roleAttributes) {
-	if (canContinue()) {
-		busy = true;
-		String attributeName = getRole().getName();
-		List computedNames = new ArrayList();
-		if (canComputeNames()){
-			visitedKeyTypes.clear();
-			reconcileAttributes(getRole(), attributeName, roleAttributes, computedNames);
-		}
-		removeExtraAttributes(computedNames);
-		busy = false;
-	}
-}
-/**
- * getFields method comment.
- */
-protected abstract void reconcileAttributes(CommonRelationshipRole aRole, String attributeName, List aList, List computedNames);
-/**
- * Remove attributes from our role whose name is not contained in the list of
- * @computedNames.  Also, remove from the role's source EJB.
- */
-protected void removeExtraAttributes(List computedNames) {
-	if (!getRole().getAttributes().isEmpty()) {
-		java.util.Iterator it = getRole().getAttributes().iterator();
-		ContainerManagedEntity cmp = getRole().getSourceEntity();
-		CMPAttribute attribute;
-		while (it.hasNext()) {
-			attribute = (CMPAttribute) it.next();
-			if (computedNames.contains(attribute.getName()))
-				continue;
-			it.remove();
-			cmp.getKeyAttributes().remove(attribute);
-			cmp.getPersistentAttributes().remove(attribute);
-		}
-	}
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/16/00 9:19:27 PM)
- * @param newRole com.ibm.ejs.models.base.extensions.ejbext.EjbRelationshipRole
- */
-public void setRole(CommonRelationshipRole newRole) {
-	role = newRole;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleSourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleSourceImpl.java
deleted file mode 100644
index c6beeaf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/RoleSourceImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.
- * @invariant The content of each role-source element shall refer to an existing entity bean, entity bean reference.
- */
-public class RoleSourceImpl extends EObjectImpl implements RoleSource, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ContainerManagedEntity entityBean = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public RoleSourceImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getRoleSource();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ROLE_SOURCE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EJBRelationshipRole getRole() {
-		if (eContainerFeatureID != EjbPackage.ROLE_SOURCE__ROLE) return null;
-		return (EJBRelationshipRole)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRole(EJBRelationshipRole newRole) {
-		if (newRole != eContainer || (eContainerFeatureID != EjbPackage.ROLE_SOURCE__ROLE && newRole != null)) {
-			if (EcoreUtil.isAncestor(this, newRole))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newRole != null)
-				msgs = ((InternalEObject)newRole).eInverseAdd(this, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, EJBRelationshipRole.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newRole, EjbPackage.ROLE_SOURCE__ROLE, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ROLE_SOURCE__ROLE, newRole, newRole));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ContainerManagedEntity getEntityBean() {
-		if (entityBean != null && entityBean.eIsProxy()) {
-			ContainerManagedEntity oldEntityBean = entityBean;
-			entityBean = (ContainerManagedEntity)eResolveProxy((InternalEObject)entityBean);
-			if (entityBean != oldEntityBean) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.ROLE_SOURCE__ENTITY_BEAN, oldEntityBean, entityBean));
-			}
-		}
-		return entityBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContainerManagedEntity basicGetEntityBean() {
-		return entityBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEntityBean(ContainerManagedEntity newEntityBean) {
-		ContainerManagedEntity oldEntityBean = entityBean;
-		entityBean = newEntityBean;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.ROLE_SOURCE__ENTITY_BEAN, oldEntityBean, entityBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, EjbPackage.ROLE_SOURCE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.ROLE_SOURCE__ROLE:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.ROLE_SOURCE__ROLE, 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 EjbPackage.ROLE_SOURCE__ROLE:
-					return eBasicSetContainer(null, EjbPackage.ROLE_SOURCE__ROLE, msgs);
-				case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 EjbPackage.ROLE_SOURCE__ROLE:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_RELATIONSHIP_ROLE__SOURCE, EJBRelationshipRole.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 EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				return getRole();
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				if (resolve) return getEntityBean();
-				return basicGetEntityBean();
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				return getRole() != null;
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				return entityBean != null;
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				setRole((EJBRelationshipRole)newValue);
-				return;
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				setEntityBean((ContainerManagedEntity)newValue);
-				return;
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.ROLE_SOURCE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.ROLE_SOURCE__ROLE:
-				setRole((EJBRelationshipRole)null);
-				return;
-			case EjbPackage.ROLE_SOURCE__ENTITY_BEAN:
-				setEntityBean((ContainerManagedEntity)null);
-				return;
-			case EjbPackage.ROLE_SOURCE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SessionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SessionImpl.java
deleted file mode 100644
index 7b56af9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SessionImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-
-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.EStructuralFeature;
-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.JavaClass;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.TransactionType;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * The session element declares an session bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a name assigned
- * to the enterprise bean in the deployment description; the names of the session bean's home and remote interfaces, if any; the names of the session bean's local home and local interfaces, if any; the session bean's implementation class; the session bean's state management type; the session bean's transaction management type; an optional declaration of the bean's environment entries; an optional declaration of the bean's EJB references; an optional declaration of the bean's local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the bean's methods; an optional declaration of the bean's resource manager connection factory references; and an optional declaration of the bean's resource environment references. The elements that are optional are "optional" in the sense that they are omitted when if lists represented by them are empty.
- */
-public class SessionImpl extends EnterpriseBeanImpl implements Session, EnterpriseBean {
-
-	/**
-	 * The default value of the '{@link #getTransactionType() <em>Transaction Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionType TRANSACTION_TYPE_EDEFAULT = TransactionType.BEAN_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionType transactionType = TRANSACTION_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Transaction Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getSessionType() <em>Session Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final SessionType SESSION_TYPE_EDEFAULT = SessionType.STATEFUL_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SessionType sessionType = SESSION_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Session Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean sessionTypeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpoint() <em>Service Endpoint</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpoint()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass serviceEndpoint = null;
-
-	public SessionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return EjbPackage.eINSTANCE.getSession();
-	}
-
-	public boolean isSession() {
-		return true;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transaction-type element specifies an enterprise bean's transaction management type.
-	 * 
-
-	 */
-	public TransactionType getTransactionType() {
-		return transactionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionType(TransactionType newTransactionType) {
-		TransactionType oldTransactionType = transactionType;
-		transactionType = newTransactionType == null ? TRANSACTION_TYPE_EDEFAULT : newTransactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION__TRANSACTION_TYPE, oldTransactionType, transactionType, !oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionType() {
-		TransactionType oldTransactionType = transactionType;
-		boolean oldTransactionTypeESet = transactionTypeESet;
-		transactionType = TRANSACTION_TYPE_EDEFAULT;
-		transactionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION__TRANSACTION_TYPE, oldTransactionType, TRANSACTION_TYPE_EDEFAULT, oldTransactionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionType() {
-		return transactionTypeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SessionType getSessionType() {
-		return sessionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSessionType(SessionType newSessionType) {
-		SessionType oldSessionType = sessionType;
-		sessionType = newSessionType == null ? SESSION_TYPE_EDEFAULT : newSessionType;
-		boolean oldSessionTypeESet = sessionTypeESet;
-		sessionTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION__SESSION_TYPE, oldSessionType, sessionType, !oldSessionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetSessionType() {
-		SessionType oldSessionType = sessionType;
-		boolean oldSessionTypeESet = sessionTypeESet;
-		sessionType = SESSION_TYPE_EDEFAULT;
-		sessionTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, EjbPackage.SESSION__SESSION_TYPE, oldSessionType, SESSION_TYPE_EDEFAULT, oldSessionTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetSessionType() {
-		return sessionTypeESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getServiceEndpoint() {
-		if (serviceEndpoint != null && serviceEndpoint.eIsProxy()) {
-			JavaClass oldServiceEndpoint = serviceEndpoint;
-			serviceEndpoint = (JavaClass)eResolveProxy((InternalEObject)serviceEndpoint);
-			if (serviceEndpoint != oldServiceEndpoint) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, EjbPackage.SESSION__SERVICE_ENDPOINT, oldServiceEndpoint, serviceEndpoint));
-			}
-		}
-		return serviceEndpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetServiceEndpoint() {
-		return serviceEndpoint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceEndpoint(JavaClass newServiceEndpoint) {
-		JavaClass oldServiceEndpoint = serviceEndpoint;
-		serviceEndpoint = newServiceEndpoint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EjbPackage.SESSION__SERVICE_ENDPOINT, oldServiceEndpoint, serviceEndpoint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case EjbPackage.SESSION__EJB_JAR:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, EjbPackage.SESSION__EJB_JAR, 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 EjbPackage.SESSION__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__ENVIRONMENT_PROPERTIES:
-					return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__RESOURCE_REFS:
-					return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__EJB_REFS:
-					return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__RESOURCE_ENV_REFS:
-					return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__EJB_LOCAL_REFS:
-					return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__MESSAGE_DESTINATION_REFS:
-					return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__SECURITY_ROLE_REFS:
-					return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-				case EjbPackage.SESSION__EJB_JAR:
-					return eBasicSetContainer(null, EjbPackage.SESSION__EJB_JAR, msgs);
-				case EjbPackage.SESSION__SECURITY_IDENTITY:
-					return basicSetSecurityIdentity(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 EjbPackage.SESSION__EJB_JAR:
-					return eContainer.eInverseRemove(this, EjbPackage.EJB_JAR__ENTERPRISE_BEANS, EJBJar.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 EjbPackage.SESSION__ICONS:
-				return getIcons();
-			case EjbPackage.SESSION__DISPLAY_NAMES:
-				return getDisplayNames();
-			case EjbPackage.SESSION__DESCRIPTIONS:
-				return getDescriptions();
-			case EjbPackage.SESSION__SMALL_ICON:
-				return getSmallIcon();
-			case EjbPackage.SESSION__LARGE_ICON:
-				return getLargeIcon();
-			case EjbPackage.SESSION__DESCRIPTION:
-				return getDescription();
-			case EjbPackage.SESSION__DISPLAY_NAME:
-				return getDisplayName();
-			case EjbPackage.SESSION__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case EjbPackage.SESSION__RESOURCE_REFS:
-				return getResourceRefs();
-			case EjbPackage.SESSION__EJB_REFS:
-				return getEjbRefs();
-			case EjbPackage.SESSION__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case EjbPackage.SESSION__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case EjbPackage.SESSION__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case EjbPackage.SESSION__SERVICE_REFS:
-				return getServiceRefs();
-			case EjbPackage.SESSION__NAME:
-				return getName();
-			case EjbPackage.SESSION__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case EjbPackage.SESSION__EJB_CLASS:
-				if (resolve) return getEjbClass();
-				return basicGetEjbClass();
-			case EjbPackage.SESSION__HOME_INTERFACE:
-				if (resolve) return getHomeInterface();
-				return basicGetHomeInterface();
-			case EjbPackage.SESSION__REMOTE_INTERFACE:
-				if (resolve) return getRemoteInterface();
-				return basicGetRemoteInterface();
-			case EjbPackage.SESSION__EJB_JAR:
-				return getEjbJar();
-			case EjbPackage.SESSION__SECURITY_IDENTITY:
-				return getSecurityIdentity();
-			case EjbPackage.SESSION__LOCAL_HOME_INTERFACE:
-				if (resolve) return getLocalHomeInterface();
-				return basicGetLocalHomeInterface();
-			case EjbPackage.SESSION__LOCAL_INTERFACE:
-				if (resolve) return getLocalInterface();
-				return basicGetLocalInterface();
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				return getTransactionType();
-			case EjbPackage.SESSION__SESSION_TYPE:
-				return getSessionType();
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				if (resolve) return getServiceEndpoint();
-				return basicGetServiceEndpoint();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.SESSION__ICONS:
-				return icons != null && !icons.isEmpty();
-			case EjbPackage.SESSION__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case EjbPackage.SESSION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case EjbPackage.SESSION__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case EjbPackage.SESSION__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case EjbPackage.SESSION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case EjbPackage.SESSION__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case EjbPackage.SESSION__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case EjbPackage.SESSION__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case EjbPackage.SESSION__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case EjbPackage.SESSION__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case EjbPackage.SESSION__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case EjbPackage.SESSION__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case EjbPackage.SESSION__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case EjbPackage.SESSION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EjbPackage.SESSION__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case EjbPackage.SESSION__EJB_CLASS:
-				return ejbClass != null;
-			case EjbPackage.SESSION__HOME_INTERFACE:
-				return homeInterface != null;
-			case EjbPackage.SESSION__REMOTE_INTERFACE:
-				return remoteInterface != null;
-			case EjbPackage.SESSION__EJB_JAR:
-				return getEjbJar() != null;
-			case EjbPackage.SESSION__SECURITY_IDENTITY:
-				return securityIdentity != null;
-			case EjbPackage.SESSION__LOCAL_HOME_INTERFACE:
-				return localHomeInterface != null;
-			case EjbPackage.SESSION__LOCAL_INTERFACE:
-				return localInterface != null;
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				return isSetTransactionType();
-			case EjbPackage.SESSION__SESSION_TYPE:
-				return isSetSessionType();
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				return serviceEndpoint != 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 EjbPackage.SESSION__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case EjbPackage.SESSION__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case EjbPackage.SESSION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case EjbPackage.SESSION__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case EjbPackage.SESSION__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__NAME:
-				setName((String)newValue);
-				return;
-			case EjbPackage.SESSION__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case EjbPackage.SESSION__EJB_CLASS:
-				setEjbClass((JavaClass)newValue);
-				return;
-			case EjbPackage.SESSION__HOME_INTERFACE:
-				setHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.SESSION__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.SESSION__EJB_JAR:
-				setEjbJar((EJBJar)newValue);
-				return;
-			case EjbPackage.SESSION__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)newValue);
-				return;
-			case EjbPackage.SESSION__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.SESSION__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)newValue);
-				return;
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				setTransactionType((TransactionType)newValue);
-				return;
-			case EjbPackage.SESSION__SESSION_TYPE:
-				setSessionType((SessionType)newValue);
-				return;
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				setServiceEndpoint((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case EjbPackage.SESSION__ICONS:
-				getIcons().clear();
-				return;
-			case EjbPackage.SESSION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case EjbPackage.SESSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case EjbPackage.SESSION__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case EjbPackage.SESSION__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case EjbPackage.SESSION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case EjbPackage.SESSION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case EjbPackage.SESSION__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case EjbPackage.SESSION__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case EjbPackage.SESSION__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case EjbPackage.SESSION__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case EjbPackage.SESSION__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case EjbPackage.SESSION__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case EjbPackage.SESSION__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case EjbPackage.SESSION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EjbPackage.SESSION__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case EjbPackage.SESSION__EJB_CLASS:
-				setEjbClass((JavaClass)null);
-				return;
-			case EjbPackage.SESSION__HOME_INTERFACE:
-				setHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.SESSION__REMOTE_INTERFACE:
-				setRemoteInterface((JavaClass)null);
-				return;
-			case EjbPackage.SESSION__EJB_JAR:
-				setEjbJar((EJBJar)null);
-				return;
-			case EjbPackage.SESSION__SECURITY_IDENTITY:
-				setSecurityIdentity((SecurityIdentity)null);
-				return;
-			case EjbPackage.SESSION__LOCAL_HOME_INTERFACE:
-				setLocalHomeInterface((JavaClass)null);
-				return;
-			case EjbPackage.SESSION__LOCAL_INTERFACE:
-				setLocalInterface((JavaClass)null);
-				return;
-			case EjbPackage.SESSION__TRANSACTION_TYPE:
-				unsetTransactionType();
-				return;
-			case EjbPackage.SESSION__SESSION_TYPE:
-				unsetSessionType();
-				return;
-			case EjbPackage.SESSION__SERVICE_ENDPOINT:
-				setServiceEndpoint((JavaClass)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(" (transactionType: "); //$NON-NLS-1$
-		if (transactionTypeESet) result.append(transactionType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(", sessionType: "); //$NON-NLS-1$
-		if (sessionTypeESet) result.append(sessionType); else result.append("<unset>"); //$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-    /* (non-Javadoc)
-     * @see org.eclipse.jst.j2ee.internal.ejb.Session#setServiceEndpointName(java.lang.String)
-     */
-    public void setServiceEndpointName(String serviceEndpointName) {
-        eSet(EjbPackage.eINSTANCE.getSession_ServiceEndpoint(), createClassRef(serviceEndpointName));
-    }
-	/*
-	 * @see EnterpriseBean#hasLocalClient()
-	 */
-	public boolean hasServiceEndpoint() {
-		return getServiceEndpoint() != null;
-	}
-	public String getServiceEndpointName() {
-		getServiceEndpoint();
-		return serviceEndpoint == null ? null : serviceEndpoint.getQualifiedName();
-	}
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SupertypeCMPAttributeFilter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SupertypeCMPAttributeFilter.java
deleted file mode 100644
index 0d30415..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/SupertypeCMPAttributeFilter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.impl;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/28/2000 6:54:26 PM)
- * @author: Administrator
- */
-public abstract class SupertypeCMPAttributeFilter extends ContainerManagedEntityFilter {
-/**
- * SupertypeCMPAttributeFilter constructor comment.
- */
-public SupertypeCMPAttributeFilter() {
-	super();
-}
-/**
- * filter method comment.
- */
-public List filter(ContainerManagedEntity cmp) {
-	ContainerManagedEntity supertype = null;
-	EjbModuleExtensionHelper extensionHelper = getEjbModuleExtHelper(cmp);
-	if(extensionHelper != null)
-	   supertype = (ContainerManagedEntity)extensionHelper.getSuperType(cmp);
-	if (supertype == null)
-		return getSourceAttributes(cmp);
-	return filterUsingSupertype(cmp, supertype);
-}
-/**
- * filter method comment.
- */
-protected java.util.List filterUsingSupertype(ContainerManagedEntity cmp, ContainerManagedEntity supertype) {
-	ContainerManagedEntity superEntity = supertype;
-	List result = new ArrayList();
-	Iterator it = getSourceAttributes(cmp).iterator();
-	CMPAttribute attribute;
-	while (it.hasNext()) {
-		attribute = (CMPAttribute) it.next();
-		if (!isSupertypeAttribute(superEntity, attribute))
-			result.add(attribute);
-	}
-	return result;
-}
-/**
- * Return the proper list of attributes from cmpExt.
- */
-protected abstract java.util.List getSourceAttributes(ContainerManagedEntity cmp) ;
-/**
- * Return a boolean indicating whether anAttribute also exists in the superEntity.
- */
-protected abstract boolean isSupertypeAttribute(ContainerManagedEntity superEntity, CMPAttribute anAttribute) ;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPFieldDescriptor.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPFieldDescriptor.java
deleted file mode 100644
index a90b372..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPFieldDescriptor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.util;
-
-/**
- * A parameter descriptor is used to describe a method parameter.
- * It holds the parameter name and type.  The type is held in
- * Java readable form (not a signature).
- */
-public class CMPFieldDescriptor {
-	private String fType = null;
-	private String fName = null;
-/**
- * JavaParameterDescriptor default constructor.
- */
-public CMPFieldDescriptor() {
-	super();
-}
-/**
- * @return the parameter name.
- */
-public String getName() {
-	return fName;
-}
-/**
- * Returns the parameter type.
- * @return The parameter type in Java readable form (not a signature)
- */
-public String getType() {
-	return fType;
-}
-/**
- * Sets the parameter name.
- */
-public void setName(String newName) {
-	fName = (newName == null) ? null : newName.trim();
-}
-/**
- * Sets the parameter type.
- * @param newType The parameter name in Java readable form (not a signature)
- */
-public void setType(String newType) {
-	fType = (newType == null) ? null : newType.trim();
-}
-/**
- * Returns "type name".  The {@link JavaParameterDescriptor#getType()}
- * and {@link JavaParameterDescriptor#getName()} methods are used
- * to build the result.
- */
-public String toString() {
-	StringBuffer sb = new StringBuffer(100);
-	sb.append(getType());
-	sb.append(' ');
-	sb.append(getName());
-	return sb.toString();
-}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPHelper.java
deleted file mode 100644
index 5628a37..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPHelper.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-public class CMPHelper {
-	
-	public static final String GET = "get"; //$NON-NLS-1$
-	public static final String SET = "set"; //$NON-NLS-1$
-	protected static Comparator methodComparator = new Comparator() {
-		/**
-		 * @see Comparator#compare(Object, Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			Method m1 = (Method) o1;
-			Method m2 = (Method) o2;
-			String s1 = m1.getName();
-			String s2 = m2.getName();
-			if (s1 == null)
-				return "".compareTo(s2); //$NON-NLS-1$
-			return s1.compareTo(s2);
-		}
-	};
-	
-	public interface CMPFieldExistTester {
-		boolean isExisting(Field aField);
-		boolean isExisting(Method aMethod);
-	}
-
-	protected CMPHelper() {
-		super();
-	}
-	
-	/**
-	 * For CMP 2.0 beans, the bean class is abstract and
-	 * contains abstract get/set methods for the fields
-	 * This infers the those fields based on the get/set methods
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP20FieldDescriptors(JavaClass beanClass) {
-		return getAvailableCMP20FieldDescriptors(beanClass, null);
-	}
-	
-	/**
-	 * For CMP 2.0 beans, the bean class is abstract and
-	 * contains abstract get/set methods for the fields
-	 * This infers the those fields based on the get/set methods
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP20FieldDescriptors(JavaClass beanClass, CMPHelper.CMPFieldExistTester fieldTester) {
-		if (beanClass == null)
-			return Collections.EMPTY_LIST;
-		List result = new ArrayList();
-		Map getters = new HashMap();	
-		List methods = beanClass.getPublicMethodsExtended();
-		Collections.sort(methods, methodComparator);
-		for (int i = 0; i < methods.size(); i++) {
-			Method aMethod = (Method) methods.get(i);
-			if (isGetter(aMethod) && aMethod.isAbstract() && !aMethod.isStatic() && 
-				(fieldTester == null || fieldTester.isExisting(aMethod))) 
-				getters.put(getFieldName(aMethod), aMethod);
-			else if (isSetter(aMethod) && aMethod.isAbstract() && !aMethod.isStatic()) {
-				String fieldName = getFieldName(aMethod);
-				Method getter = (Method) getters.get(fieldName);
-				if (typesAgree(getter, aMethod)) {
-					String typeName = getReturnTypeName(getter);
-					if (typeName != null && (fieldTester == null || fieldTester.isExisting(getter)))
-						result.add(createFieldDescriptor(fieldName, typeName));
-				}
-			}
-		}
-		return result;	
-	}
-	
-	/**
-	 * For CMP 1.1 beans, the list is simply the fields, extended, 
-	 * on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP11FieldDescriptors(JavaClass beanClass) {
-		return getAvailableCMP11FieldDescriptors(beanClass, null);
-	}
-	
-	/**
-	 * For CMP 1.1 beans, the list is simply the fields, extended, 
-	 * on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMP11FieldDescriptors(JavaClass beanClass, CMPHelper.CMPFieldExistTester fieldTester) {
-		if (beanClass == null)
-			return Collections.EMPTY_LIST;
-		List fields = beanClass.getFieldsExtended();
-		List result = new ArrayList();
-		for (int i = 0; i < fields.size(); i++) {
-			Field aField = (Field) fields.get(i);
-			if (!isPublic(aField) || aField.isStatic() || aField.isTransient() ||
-			(fieldTester != null && !fieldTester.isExisting(aField)))
-				continue;
-			String name = aField.getName();
-			String typeName = getTypeName(aField);
-			if (typeName != null && name != null)
-				result.add(createFieldDescriptor(name, typeName));
-		}
-		return result;
-	}	
-	
-	/**
-	 * Get a list of available cmp fields for the CMP bean; if the bean
-	 * is v1.1, this is the fields on the bean class; if it is 2.0, this 
-	 * is defined by the abstract get/set methods on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMPFieldDescriptors(ContainerManagedEntity cmpBean) {
-		return getAvailableCMPFieldDescriptors(cmpBean, null);
-	}
-	
-	/**
-	 * Get a list of available cmp fields for the CMP bean; if the bean
-	 * is v1.1, this is the fields on the bean class; if it is 2.0, this 
-	 * is defined by the abstract get/set methods on the bean class
-	 * 
-	 * @return java.util.List of {@link CMPFieldDescriptor}
-	 */
-	public static List getAvailableCMPFieldDescriptors(ContainerManagedEntity cmpBean, CMPHelper.CMPFieldExistTester fieldTester) {
-		JavaClass beanClass = cmpBean.getEjbClass();
-		if (beanClass == null)
-			return Collections.EMPTY_LIST;
-		switch(cmpBean.getVersionID()) {
-			case J2EEVersionConstants.EJB_1_0_ID:
-			case J2EEVersionConstants.EJB_1_1_ID:
-				return getAvailableCMP11FieldDescriptors(beanClass, fieldTester); 
-			case J2EEVersionConstants.EJB_2_0_ID:
-			case J2EEVersionConstants.EJB_2_1_ID: default:
-				return getAvailableCMP20FieldDescriptors(beanClass, fieldTester); 
-		}  
-	}
-	
-	/**
-	 * Does the method name start with "get", and is the method a zero arg
-	 * method, that does not return void?
-	 */
-	protected static boolean isGetter(Method aMethod) {
-		String name = aMethod.getName();
-		return name != null &&
-			name.startsWith(GET) &&
-			name.length() > 3 &&
-			aMethod.listParametersWithoutReturn().length==0 &&
-			!aMethod.isVoid();		
-	}
-	
-	
-	/**
-	 * Does the method name start with "get", and is the method a one arg
-	 * method, that is void
-	 */
-	protected static boolean isSetter(Method aMethod) {
-		String name = aMethod.getName();
-		return name != null &&
-			name.startsWith(SET) &&
-			name.length() > 3 &&
-			aMethod.listParametersWithoutReturn().length == 1 &&
-			aMethod.isVoid();
-	}
-			
-	protected static String getFieldName(Method aMethod) {
-		if (aMethod == null)
-			return null;
-			
-		return getFieldName(aMethod.getName());
-	}
-	
-	public static String getFieldName(String methodName) {
-		if (methodName == null)
-			return null;
-		StringBuffer sb = new StringBuffer(methodName);
-		sb.delete(0, 3);
-		char lower = Character.toLowerCase(sb.charAt(0));
-		sb.setCharAt(0, lower);
-		return sb.toString();
-	}
-	
-	protected static String getReturnTypeName(Method getter) {
-		if (getter == null)
-			return null;
-		JavaHelpers retType = getter.getReturnType();
-		return getTypeName(retType);
-	}
-	
-	protected static String getTypeName(Field aField) {
-		if (aField == null)
-			return null;
-		JavaHelpers type = (JavaHelpers)aField.getEType();
-		return getTypeName(type);
-	}
-	
-	protected static String getTypeName(JavaHelpers helpers) {
-		if (helpers == null)
-			return null;
-		return helpers.getQualifiedName();
-	}
-	/**
-	 * Precondition: setter must take one parameter, and getter must return
-	 * a type, not void
-	 */
-	protected static boolean typesAgree(Method getter, Method setter) {
-		if (getter == null || getter.isVoid() || setter == null)
-			return false;
-			
-		JavaParameter[] parameters = setter.listParametersWithoutReturn();
-		if (parameters.length != 1)
-			return false;
-			
-		JavaParameter param = parameters[0];
-		return param.getEType() != null &&
-				param.getEType() == getter.getReturnType();							
-	}
-	
-	protected static CMPFieldDescriptor createFieldDescriptor(String name, String typeName) {
-		CMPFieldDescriptor desc = new CMPFieldDescriptor();
-		desc.setName(name);
-		desc.setType(typeName);
-		return desc;
-	}
-	
-	protected static boolean isPublic(Field field) {
-		if (field == null)
-			return false;
-		return (JavaVisibilityKind.PUBLIC_LITERAL.getValue() == field.getJavaVisibility().getValue());
-	}
-		
-		
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPKeySynchronizationAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPKeySynchronizationAdapter.java
deleted file mode 100644
index b8e4fd1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CMPKeySynchronizationAdapter.java
+++ /dev/null
@@ -1,398 +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 Oct 24, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.ContainerManagedEntityImpl;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CMPKeySynchronizationAdapter extends AdapterImpl {
-    
-    public static final String ADAPTER_TYPE = CMPKeySynchronizationAdapter.class.getName();
-    
-    private boolean initialized = false;
-
-	protected ContainerManagedEntity cmp = null;
-	private boolean isUpdating = false;
-	private boolean isEnabled = true;
-	
-	/**
-	 * Default constructor
-	 */
-	public CMPKeySynchronizationAdapter(ContainerManagedEntity cmp) {
-		super();
-		this.cmp = cmp;
-	}
-
-	/**
-	 * If the keyAttributes list is empty, try to reflect
-	 * the keyAttributes from the fields of the primaryKey class.
-	 */
-	public void initializeKeyAttributes() {
-	    if(cmp == null || initialized)
-	        return;
-	    
-	    Resource res = cmp.eResource();
-	    if(res == null)
-	        return;
-	    
-	    boolean cachedIsModified = res.isModified(); 
-
-	    try {
-			// Handle primkeyfield scenario
-			if (cmp.getPrimKeyField()!=null)
-				initializeForPrimKey();
-			
-			// Handle compound key scenario
-			else 
-				initializeForCompoundKey();
-	    } finally {
-	        res.setModified(cachedIsModified);
-	    }
-
-        initialized = true;
-	}
-	
-	protected void initializeForPrimKey() { 
-		// Ensure the key attributes list contains only the primKeyField attribute
-		if (!(getKeyAttributes().size()==1 && getKeyAttributes().contains(cmp.getPrimKeyField())))
-			primKeyFieldChanged(cmp.getPrimKeyField());
-	}
-	
-	protected void initializeForCompoundKey() { 
-		List keys = getKeyAttributes();
-		// clear key list
-		keys.clear();
-		//ensure the key class is not null
-		JavaClass keyClass = cmp.getPrimaryKey();
-		if (keyClass == null)
-			return;
-		keyClass.eAdapters().add(this);
-		
-		// reflect key fields into key attributes list
-		List keyFields = keyClass.getFieldsExtended();
-		for (int i = 0; i < keyFields.size(); i++) {
-			Field field = (Field) keyFields.get(i);
-			if (field.getJavaVisibility() == JavaVisibilityKind.PUBLIC_LITERAL) { //only public fields
-				CMPAttribute keyAttribute = cmp.getPersistentAttribute(field.getName());
-				if (keyAttribute != null)
-					keys.add(keyAttribute);
-			}	
-		}
-	}
-	
-	public void notifyChanged(Notification notification) {
-		if (isUpdating || !isEnabled) return; //we don't want to react to our own changes
-		try {
-			isUpdating = true;
-			EClass featureClass = ((EObject)notification.getNotifier()).eClass();
-			if (EjbPackage.eINSTANCE.getContainerManagedEntity().equals(featureClass)) {			
-				switch (notification.getFeatureID(ContainerManagedEntity.class)) {
-					// handle if cmp attribute is updated, added, removed
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__PERSISTENT_ATTRIBUTES : {
-						handleCMPAttributeEvent(notification);
-						break;	
-					}
-					// handle the key attributes list is updated programatically
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__KEY_ATTRIBUTES : {
-						handleCMPAttributeEvent(notification);
-						break;	
-					}	
-					// handle if the key class is changed,added, removed
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIMARY_KEY : {
-						handleKeyClassEvent(notification);
-						break;
-					}
-					// handle prim key field sets, adds, removes
-					case EjbPackage.CONTAINER_MANAGED_ENTITY__PRIM_KEY_FIELD : {
-						handlePrimKeyFieldEvent(notification);
-						break;
-					}
-				}
-			} else if (EjbPackage.eINSTANCE.getCMPAttribute().equals(featureClass)) {
-				switch (notification.getFeatureID(CMPAttribute.class)) {
-					// handle a set or change of an attribute name
-					case (EjbPackage.CMP_ATTRIBUTE__NAME) : {
-						handleCMPAttributeRenameEvent((CMPAttribute)notification.getNotifier(), notification.getOldValue());
-						break;	
-					}
-				}
-			}
-		} finally { 
-			// restore initial notification state
-			isUpdating = false;
-		}		
-	}
-
-	/**
-	 * @param attribute
-	 */
-	private void handleCMPAttributeRenameEvent(CMPAttribute attribute, Object oldValue) {
-		// if renamed attribute was in key and is not anymore, remove it from key list
-		if (getKeyAttributes().contains(attribute)) {
-			if (!isAttributeKeyClassField(attribute.getName()))
-				removeKeyAttribute(attribute,(String)oldValue);
-		}
-		// if renamed attribute is now part of the key, add it to the key list		
-		else
-			attributeAdded(attribute);	
-	}
-
-	/**
-	 * @param notification
-	 */
-	private void handlePrimKeyFieldEvent(Notification notification) {
-		EObject newPrimKeyField = (EObject)notification.getNewValue();
-		cmp.setPrimKeyField((CMPAttribute)newPrimKeyField);
-		// if primKeyField is removed or a proxy, recompute key attributes based on key class
-		if (newPrimKeyField == null || newPrimKeyField.eIsProxy()) {
-			CMPAttribute primField = (CMPAttribute)newPrimKeyField;
-			if (primField!=null && primField.getName() == null) {
-				primField.setName(((InternalEObject)primField).eProxyURI().toString());
-				makePrimKeyFieldProxy(primField.getName());
-			}
-			removeAllKeyAttributes();
-			initialized = false;
-			initializeKeyAttributes();
-		}
-		// Ensure the key attributes list contains only the primKeyField attribute
-		else if (!(getKeyAttributes().size()==1 && getKeyAttributes().contains(newPrimKeyField))) {
-			primKeyFieldChanged(newPrimKeyField);
-		}		
-			
-	}
-
-	/**
-	 * @param notification
-	 */
-	private void handleKeyClassEvent(Notification notification) {
-		// if primkey null or proxy, clear key fields and reinitialize if key class not null
-		if (cmp.getPrimKeyField()==null || cmp.getPrimKeyField().eIsProxy()) {
-			keyClassChanged();
-		}
-		// if primkey is not null, then do nothing
-		
-	}
-
-	/**
-	 * @param notification
-	 */
-	private void handleCMPAttributeEvent(Notification notification) {
-		int eventType = notification.getEventType();
-		// handle a CMPAttribute added
-		 if (eventType == Notification.ADD) {
-			 attributeAdded((CMPAttribute)notification.getNewValue());
-		 }
-		 // handle a CMPAttribute removed
-		 else if (eventType == Notification.REMOVE) {
-		 	CMPAttribute attribute = (CMPAttribute)notification.getOldValue();
-			// remove this adapter from the deleted attribute
-			attribute.eAdapters().remove(this);
-			removeKeyAttribute(attribute, attribute.getName());
-			
-		 }
-	}
-
-	protected void removeKeyAttribute(CMPAttribute attribute, String oldName) {
-		
-		// if attribute was a key attribute it will be removed, otherwise do nothing
-		getKeyAttributes().remove(attribute);
-		
-		// if it is the prim key attribute, then make the prim key attribute a proxy
-		if (cmp.getPrimKeyField()!=null && cmp.getPrimKeyField().equals(attribute)) {
-			makePrimKeyFieldProxy(oldName);
-		}
-			
-	}
-	
-	public void makePrimKeyFieldProxy(String oldName) {
-		if (cmp.getPrimKeyField() == null) return;
-		cmp.setPrimKeyField(EjbFactory.eINSTANCE.createCMPAttribute());
-		cmp.getPrimKeyField().setName(oldName);
-		((InternalEObject)cmp.getPrimKeyField()).eSetProxyURI(URI.createURI(oldName));
-		
-	}
-	
-	protected void removeAllKeyAttributes() {
-		// clear key attributes list on cmp
-		getKeyAttributes().clear();
-	}
-	
-	protected void addKeyAttribute(CMPAttribute attribute) {
-		
-		CMPAttribute primKeyField = cmp.getPrimKeyField();
-		// if prim key is null add attribute to key list
-		if (primKeyField==null || primKeyField.eIsProxy()) {
-			if (!getKeyAttributes().contains(attribute))
-				getKeyAttributes().add(attribute);
-			// if att is only key att, and type is the key class type, set the prim key field
-			if (getKeyAttributes().size()==1 && attribute.getType().equals(cmp.getPrimaryKey()))
-				cmp.setPrimKeyField(attribute);
-		}
-		// if primkey set + primkeyfield is the new attribute ensure its the only one
-		else if (primKeyField.equals(attribute)) {
-			if (!(getKeyAttributes().size()==1 && getKeyAttributes().contains(attribute))) {
-				getKeyAttributes().clear();
-				getKeyAttributes().add(attribute);
-			}	
-		}
-		// if primkey set,new attribute not prim key, key atts > 1, remove primkey field
-		else {
-			cmp.setPrimKeyField(null);
-			if (!getKeyAttributes().contains(attribute))
-				getKeyAttributes().add(attribute);
-		}		
-	}
-	
-	protected void attributeAdded(CMPAttribute attribute) {
-		//Make sure cmp key adapters are initialized if needed
-		cmp.getKeyAttributes();
-		
-		// add this as a listener to name changes on this attribute
-		if (!attribute.eAdapters().contains(this))
-			attribute.eAdapters().add(this);
-		
-		if (attribute.getName() ==null) return;
-		// add it to the key list if applicable and sort the key list
-		if (isAttributeKeyClassField(attribute.getName())) {
-			addKeyAttribute(attribute);
-			sortKeyAttributeList();
-		}
-		// if new attribute name is now prim key name, fix up prim key field
-		else if (cmp.getPrimKeyField()!=null && cmp.getPrimKeyField().eIsProxy() && attribute.getName().equals(cmp.getPrimKeyField().getName())) {
-			cmp.setPrimKeyField(attribute);
-			primKeyFieldChanged(attribute);
-		}	
-	}
-	
-
-	/**
-	 * Is the cmp attribute also a field in the key class?
-	 */
-	protected boolean isAttributeKeyClassField(String attributeName) {
-		// ensure key class is not null
-		JavaClass keyClass = cmp.getPrimaryKey();
-		if (keyClass == null)
-			return false;
-		// see if the attribute name matchs any of the reflected key class public field names
-		List keyFields = keyClass.getFieldsExtended();
-		for (int i = 0; i < keyFields.size(); i++) {
-			Field field = (Field) keyFields.get(i);
-			if (field.getJavaVisibility() == JavaVisibilityKind.PUBLIC_LITERAL) {
-				if (field.getName().equals(attributeName))
-					return true;
-			}	
-		}
-		return false;	
-	}
-	
-	/**
-	 * Sort the list of the key attributes to match the order of the key class
-	 */
-	private void sortKeyAttributeList() {
-		
-		List result = new ArrayList();
-		JavaClass keyClass = cmp.getPrimaryKey();
-		if (keyClass == null) return;
-		List keyFields = keyClass.getFieldsExtended();
-		List currentKeys = getKeyAttributes();
-		
-		// create a new list of the attributes in order of key class fields.
-		for (int i = 0; i < keyFields.size(); i++) {
-			Field field = (Field) keyFields.get(i);
-			if (field.getJavaVisibility() == JavaVisibilityKind.PUBLIC_LITERAL) { //only public fields
-				for (int j=0; j<currentKeys.size(); j++) {
-					CMPAttribute attribute = (CMPAttribute) currentKeys.get(j);
-					if (field.getName().equals(attribute.getName()))
-						result.add(attribute);	
-				}			
-			}	
-		}
-		//clear list and set the new key attribute order on the cmp
-		getKeyAttributes().clear();
-		getKeyAttributes().addAll(result);
-	}
-	
-	protected void keyClassChanged() {
-		JavaClass key = cmp.getPrimaryKey();
-		if (key !=null)
-			key.eAdapters().remove(this);
-		// if not prim key class, clear key attribute list
-		removeAllKeyAttributes();
-		initialized = false;
-		initializeKeyAttributes();
-	}
-	
-	protected void primKeyFieldChanged(EObject primKeyField) {
-		// if a primKeyField is added, do a remove all and an add
-		removeAllKeyAttributes();
-		
-		if (primKeyField != null && !primKeyField.eIsProxy()) {
-			if (!primKeyField.eAdapters().contains(this))
-				primKeyField.eAdapters().add(this);
-			getKeyAttributes().add(primKeyField);
-		}
-	}
-	
-	private EList getKeyAttributes() {
-	    return ((ContainerManagedEntityImpl)cmp).getKeyAttributesGen();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier newTarget) {
-		super.setTarget(newTarget); 
-	}
-	
-	
-    /* (non-Javadoc)
-     * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
-     */
-    public boolean isAdapterForType(Object type) {
-        return ADAPTER_TYPE.equals(type);
-    }
-    //To turn sync on or off
-    public void setEnabled(boolean enabled){
-    	isEnabled = enabled;
-    }
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CommonRelationshipAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CommonRelationshipAttributeMaintenanceAdapter.java
deleted file mode 100644
index ff884cc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/CommonRelationshipAttributeMaintenanceAdapter.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.util;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CommonRelationship;
-import org.eclipse.jst.j2ee.ejb.CommonRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl;
-
-public abstract class CommonRelationshipAttributeMaintenanceAdapter extends AdapterImpl {
-	protected static EjbPackage EJB_PACK = EjbFactoryImpl.getPackage();
-	/**
-	 * Constructor for CommonRelationshipAttributeMaintenanceAdapter.
-	 */
-	public CommonRelationshipAttributeMaintenanceAdapter() {
-		super();
-	}
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		switch (msg.getEventType()) {
-			case Notification.ADD :
-				addedNotification(msg);
-				break;
-			case Notification.REMOVE :
-				removedNotification(msg);
-				break;
-		}
-	}
-	protected void addedNotification(Notification msg) {
-		if ((EStructuralFeature)msg.getFeature() == EJB_PACK.getContainerManagedEntity_KeyAttributes())
-			addedKeyAttribute((ContainerManagedEntity) msg.getNotifier(), (CMPAttribute) msg.getNewValue());
-		else if (isRelationshipsSF((EStructuralFeature)msg.getFeature()))
-			added();
-		else if (isRelationshipRolesSF((EStructuralFeature)msg.getFeature()))
-			addedRole((CommonRelationshipRole) msg.getNewValue());
-	}
-	protected void removedNotification(Notification msg) {
-		if ((EStructuralFeature)msg.getFeature() == EJB_PACK.getContainerManagedEntity_KeyAttributes())
-			removedKeyAttribute((ContainerManagedEntity) msg.getNotifier(), (CMPAttribute) msg.getOldValue());
-		else if (isRelationshipsSF((EStructuralFeature)msg.getFeature()))
-			removed();
-		else if (isRelationshipRolesSF((EStructuralFeature)msg.getFeature()))
-			removedRole((CommonRelationshipRole) msg.getOldValue());
-	}
-	protected abstract boolean isRelationshipRolesSF(EObject sf);
-	protected abstract boolean isRelationshipsSF(EObject sf);
-	//Same as the add
-	private void removedKeyAttribute(ContainerManagedEntity aCMPEntity, CMPAttribute cmpAttribute) {
-		addedKeyAttribute(aCMPEntity, cmpAttribute);
-	}
-	protected void addedKeyAttribute(ContainerManagedEntity aCMPEntity, CMPAttribute newAttribute) {
-		CommonRelationshipRole role, inverse;
-		role = getRole(aCMPEntity);
-		if (role != null && !role.isForward()) {
-			inverse = role.getOppositeAsCommonRole();
-			if (inverse != null)
-				inverse.reconcileAttributes();
-		}
-	}
-	protected CommonRelationshipRole getRole(ContainerManagedEntity aCMPEntity) {
-	    CommonRelationship relation = getRelationship();
-	    if (relation == null) return null;
-		List roles = relation.getCommonRoles();
-		if (roles.isEmpty())
-			return null;
-		CommonRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (CommonRelationshipRole) roles.get(i);
-			if (role.getSourceEntity() == aCMPEntity)
-				return role;
-		}
-		return role;
-	}
-	protected CommonRelationship getRelationship() {
-		return  (CommonRelationship) getTarget();
-	}
-	protected void reconcileRoleAttributes() {
-		List roles = getRelationship().getCommonRoles();
-		if (roles.isEmpty())
-			return;
-		CommonRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (CommonRelationshipRole) roles.get(i);
-			role.reconcileAttributes();
-		}
-	}
-	protected void added() {
-		reconcileRoleAttributes();
-	}
-	protected void removed() {
-		if (getRelationship().getCommonRoles().size() > 1) {
-			//remove one force a disconnect
-			getRelationship().getCommonRoles().remove(0);
-		}
-	}
-	/**
-	* Add this Adapter to @aRole and the ContainerManagedEntity
-	* that the ContainerManagedEntityExtension container is pointing to.
-	* This only works if @aRole is contained.
-	*/
-	protected void addAdaptors(CommonRelationshipRole aRole) {
-		removeAdaptors(aRole); //to ensure this adapter is not added twice
-		aRole.eAdapters().add(this);
-		ContainerManagedEntity cmp = aRole.getSourceEntity();
-		if (cmp != null)
-			cmp.eAdapters().add(this);
-	}
-	/**
-	 * Remove this Adapter from @aRole and the ContainerManagedEntity
-	 * that the ContainerManagedEntityExtension container is pointing to.
-	 * This only works if @aRole is contained.
-	 */
-	protected void removeAdaptors(CommonRelationshipRole aRole) {
-		aRole.eAdapters().remove(this);
-		ContainerManagedEntity cmp = aRole.getSourceEntity();
-		if (cmp != null)
-			cmp.eAdapters().remove(this);
-	}
-	protected void addedRole(CommonRelationshipRole aRole) {
-		addAdaptors(aRole);
-		if ((getRelationship().eContainer() != null) && rolesFullyReflected())
-			reconcileRoleAttributes();
-	}
-	protected boolean rolesFullyReflected() {
-		List roles = getRelationship().getCommonRoles();
-		if (roles.isEmpty())
-			return false;
-		CommonRelationshipRole role = null;
-		for (int i = 0; i < roles.size(); i++) {
-			role = (CommonRelationshipRole) roles.get(i);
-			if (role.getSourceEntity() == null)
-				return false;
-		}
-		return true;
-	}
-		
-	protected void removedRole(CommonRelationshipRole aRole) {
-		removeAdaptors(aRole);
-		if (getRelationship().eContainer() != null) {
-			aRole.reconcileAttributes();
-			reconcileRoleAttributes();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier notifier) {
-		//Only set the target if it is a CommonRelationship
-		if (notifier == null || notifier instanceof CommonRelationship)
-			super.setTarget(notifier);
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/ConvertedEJBAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/ConvertedEJBAdapter.java
deleted file mode 100644
index 28cde94..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/ConvertedEJBAdapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-
-public class ConvertedEJBAdapter extends AdapterImpl {
-
-	public static final String ADAPTER_KEY = "ConvertedEJBAdpater";  //$NON-NLS-1$
-	public static final int VERSION_1_0 = 1;
-	
-	protected int version = -1;
-	protected boolean readOnly = false;
-	
-	
-	/**
-	 * Constructor for ConvertedEJBAdapter.
-	 */
-	public ConvertedEJBAdapter() {
-		super();
-	}
-
-	/**
-	 * Gets the version.  This will be one of the static constants.
-	 * @return Returns a int
-	 */
-	public int getVersion() {
-		return version;
-	}
-
-	/**
-	 * Sets the version.  This should be one of the static constants.
-	 * @param version The version to set
-	 */
-	public void setVersion(int version) {
-		this.version = version;
-	}
-
-	/**
-	 * Gets the readOnly.
-	 * @return Returns a boolean
-	 */
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-	/**
-	 * Sets the readOnly.
-	 * @param readOnly The readOnly to set
-	 */
-	public void setReadOnly(boolean readOnly) {
-		this.readOnly = readOnly;
-	}
-	
-	public boolean isFromVersion1_0() {
-		return version == VERSION_1_0;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBAttributeMaintenanceFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBAttributeMaintenanceFactoryImpl.java
deleted file mode 100644
index bed9d55..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBAttributeMaintenanceFactoryImpl.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.internal.ejb.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil;
-
-
-public class EJBAttributeMaintenanceFactoryImpl extends EjbAdapterFactory {
-	public static final String ADAPTER_KEY = "EJBAttributeMaintenance"; //$NON-NLS-1$
-	
-	public EJBAttributeMaintenanceFactoryImpl() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.ejb.util.EjbAdapterFactory#createAdapter(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public Adapter createAdapter(Notifier target) {
-		Adapter targetAdapter = (Adapter) modelSwitch.doSwitch((EObject)target);
-		return ExtendedEcoreUtil.createAdapterForLoading(targetAdapter, (EObject) target);
-	}
-
-
-	public Adapter createEJBRelationAdapter() {
-		return new EJBRelationAttributeMaintenanceAdapter();
-	}
-	
-	public Adapter createRelationshipsAdapter() {
-		return new RelationshipsAttributeMaintenanceAdapter();
-	}
-
-	public boolean isFactoryForType(Object type) {
-		return ADAPTER_KEY == type;
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBRelationAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBRelationAttributeMaintenanceAdapter.java
deleted file mode 100644
index 08117bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EJBRelationAttributeMaintenanceAdapter.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.internal.ejb.util;
-
-import org.eclipse.emf.ecore.EObject;
-
-public class EJBRelationAttributeMaintenanceAdapter extends CommonRelationshipAttributeMaintenanceAdapter {
-	/**
-	 * Constructor for EJBRelationAttributeMaintenanceAdapter.
-	 * @param aRelationship
-	 */
-	public EJBRelationAttributeMaintenanceAdapter() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.util.CommonRelationshipAttributeMaintenanceAdapter#isRelationshipRolesSF(EObject)
-	 */
-	protected boolean isRelationshipRolesSF(EObject sf) {
-		return sf == EJB_PACK.getEJBRelation_RelationshipRoles();
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.ejb.util.CommonRelationshipAttributeMaintenanceAdapter#isRelationshipsSF(EObject)
-	 */
-	protected boolean isRelationshipsSF(EObject sf) {
-		return sf == EJB_PACK.getRelationships_EjbRelations();
-	}
-
-	/**
-	 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return EJBAttributeMaintenanceFactoryImpl.ADAPTER_KEY == type;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbAdapterFactory.java
deleted file mode 100644
index 7d4a7fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbAdapterFactory.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.util;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.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.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-public class EjbAdapterFactory extends AdapterFactoryImpl {
-	protected static EjbPackage modelPackage;
-	public EjbAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (EjbPackage) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject) type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-	protected EjbSwitch sw = new EjbSwitch() {
-		public Object caseMethodPermission(MethodPermission object) {
-			return createMethodPermissionAdapter();
-		}
-		public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-			return createAssemblyDescriptorAdapter();
-		}
-		public Object caseMethodTransaction(MethodTransaction object) {
-			return createMethodTransactionAdapter();
-		}
-		public Object caseEnterpriseBean(EnterpriseBean object) {
-			return createEnterpriseBeanAdapter();
-		}
-		public Object caseEntity(Entity object) {
-			return createEntityAdapter();
-		}
-		public Object caseContainerManagedEntity(ContainerManagedEntity object) {
-			return createContainerManagedEntityAdapter();
-		}
-		public Object caseCMPAttribute(CMPAttribute object) {
-			return createCMPAttributeAdapter();
-		}
-		public Object caseCMRField(CMRField object) {
-			return createCMRFieldAdapter();
-		}
-		public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-			return createEJBRelationshipRoleAdapter();
-		}
-		public Object caseEJBRelation(EJBRelation object) {
-			return createEJBRelationAdapter();
-		}
-		public Object caseRelationships(Relationships object) {
-			return createRelationshipsAdapter();
-		}
-		public Object caseEJBJar(EJBJar object) {
-			return createEJBJarAdapter();
-		}
-		public Object caseRoleSource(RoleSource object) {
-			return createRoleSourceAdapter();
-		}
-		public Object caseQuery(Query object) {
-			return createQueryAdapter();
-		}
-		public Object caseQueryMethod(QueryMethod object) {
-			return createQueryMethodAdapter();
-		}
-		public Object caseMethodElement(MethodElement object) {
-			return createMethodElementAdapter();
-		}
-		public Object caseExcludeList(ExcludeList object) {
-			return createExcludeListAdapter();
-		}
-		public Object caseSession(Session object) {
-			return createSessionAdapter();
-		}
-		public Object caseMessageDriven(MessageDriven object) {
-			return createMessageDrivenAdapter();
-		}
-		public Object caseMessageDrivenDestination(MessageDrivenDestination object) {
-			return createMessageDrivenDestinationAdapter();
-		}
-		public Object caseActivationConfig(ActivationConfig object) {
-			return createActivationConfigAdapter();
-		}
-		public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-			return createActivationConfigPropertyAdapter();
-		}
-		public Object caseEJBMethodCategory(EJBMethodCategory object) {
-			return createEJBMethodCategoryAdapter();
-		}
-		public Object caseEClass(EClass object) {
-			return createEClassAdapter();
-		}
-		public Object caseEAttribute(EAttribute object) {
-			return createEAttributeAdapter();
-		}
-		public Object caseEStructuralFeature(EStructuralFeature object) {
-			return createEStructuralFeatureAdapter();
-		}
-		public Object caseEClassifier(EClassifier object) {
-			return createEClassifierAdapter();
-		}
-		public Object caseEModelElement(EModelElement object) {
-			return createEModelElementAdapter();
-		}
-		public Object caseENamedElement(ENamedElement object) {
-			return createENamedElementAdapter();
-		}
-	};
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter) sw.doSwitch((EObject) target);
-	}
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases
-	 * anyway.
-	 */
-	public Adapter createMethodPermissionAdapter() {
-		return null;
-	}
-	public Adapter createAssemblyDescriptorAdapter() {
-		return null;
-	}
-	public Adapter createMethodTransactionAdapter() {
-		return null;
-	}
-	public Adapter createEnterpriseBeanAdapter() {
-		return null;
-	}
-	public Adapter createEntityAdapter() {
-		return null;
-	}
-	public Adapter createContainerManagedEntityAdapter() {
-		return null;
-	}
-	public Adapter createCMPAttributeAdapter() {
-		return null;
-	}
-	public Adapter createCMRFieldAdapter() {
-		return null;
-	}
-	public Adapter createEJBRelationshipRoleAdapter() {
-		return null;
-	}
-	public Adapter createEJBRelationAdapter() {
-		return null;
-	}
-	public Adapter createRelationshipsAdapter() {
-		return null;
-	}
-	public Adapter createEJBJarAdapter() {
-		return null;
-	}
-	public Adapter createRoleSourceAdapter() {
-		return null;
-	}
-	public Adapter createQueryAdapter() {
-		return null;
-	}
-	public Adapter createQueryMethodAdapter() {
-		return null;
-	}
-	public Adapter createMethodElementAdapter() {
-		return null;
-	}
-	public Adapter createExcludeListAdapter() {
-		return null;
-	}
-	public Adapter createSessionAdapter() {
-		return null;
-	}
-	public Adapter createMessageDrivenAdapter() {
-		return null;
-	}
-	public Adapter createMessageDrivenDestinationAdapter() {
-		return null;
-	}
-	public Adapter createEJBMethodCategoryAdapter() {
-		return null;
-	}
-	public Adapter createEClassAdapter() {
-		return null;
-	}
-	public Adapter createEAttributeAdapter() {
-		return null;
-	}
-	public Adapter createEStructuralFeatureAdapter() {
-		return null;
-	}
-	public Adapter createEClassifierAdapter() {
-		return null;
-	}
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-	public Adapter createENamedElementAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EjbSwitch modelSwitch = new EjbSwitch() {
-		public Object caseContainerManagedEntity(ContainerManagedEntity object) {
-			return createContainerManagedEntityAdapter();
-		}
-		public Object caseMethodPermission(MethodPermission object) {
-			return createMethodPermissionAdapter();
-		}
-		public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-			return createAssemblyDescriptorAdapter();
-		}
-		public Object caseMethodTransaction(MethodTransaction object) {
-			return createMethodTransactionAdapter();
-		}
-		public Object caseSession(Session object) {
-			return createSessionAdapter();
-		}
-		public Object caseEntity(Entity object) {
-			return createEntityAdapter();
-		}
-		public Object caseEnterpriseBean(EnterpriseBean object) {
-			return createEnterpriseBeanAdapter();
-		}
-		public Object caseEJBMethodCategory(EJBMethodCategory object) {
-			return createEJBMethodCategoryAdapter();
-		}
-		public Object caseEJBJar(EJBJar object) {
-			return createEJBJarAdapter();
-		}
-		public Object caseMethodElement(MethodElement object) {
-			return createMethodElementAdapter();
-		}
-		public Object caseCMPAttribute(CMPAttribute object) {
-			return createCMPAttributeAdapter();
-		}
-		public Object caseRelationships(Relationships object) {
-			return createRelationshipsAdapter();
-		}
-		public Object caseQuery(Query object) {
-			return createQueryAdapter();
-		}
-		public Object caseEJBRelation(EJBRelation object) {
-			return createEJBRelationAdapter();
-		}
-		public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-			return createEJBRelationshipRoleAdapter();
-		}
-		public Object caseRoleSource(RoleSource object) {
-			return createRoleSourceAdapter();
-		}
-		public Object caseCMRField(CMRField object) {
-			return createCMRFieldAdapter();
-		}
-		public Object caseMessageDriven(MessageDriven object) {
-			return createMessageDrivenAdapter();
-		}
-		public Object caseMessageDrivenDestination(MessageDrivenDestination object) {
-			return createMessageDrivenDestinationAdapter();
-		}
-		public Object caseExcludeList(ExcludeList object) {
-			return createExcludeListAdapter();
-		}
-		public Object caseQueryMethod(QueryMethod object) {
-			return createQueryMethodAdapter();
-		}
-		public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-			return createActivationConfigPropertyAdapter();
-		}
-		public Object caseActivationConfig(ActivationConfig object) {
-			return createActivationConfigAdapter();
-		}
-		public Object caseDescriptionGroup(DescriptionGroup object) {
-			return createDescriptionGroupAdapter();
-		}
-		public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-			return createCompatibilityDescriptionGroupAdapter();
-		}
-		public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-			return createJNDIEnvRefsGroupAdapter();
-		}
-		public Object caseEModelElement(EModelElement object) {
-			return createEModelElementAdapter();
-		}
-		public Object caseENamedElement(ENamedElement object) {
-			return createENamedElementAdapter();
-		}
-		public Object caseETypedElement(ETypedElement object) {
-			return createETypedElementAdapter();
-		}
-		public Object caseEStructuralFeature(EStructuralFeature object) {
-			return createEStructuralFeatureAdapter();
-		}
-		public Object caseEAttribute(EAttribute object) {
-			return createEAttributeAdapter();
-		}
-		public Object defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter) modelSwitch.doSwitch((EObject) target);
-	}
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases
-	 * anyway.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMethodPermissionAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAssemblyDescriptorAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMethodTransactionAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEnterpriseBeanAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEntityAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createContainerManagedEntityAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createCMPAttributeAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createCMRFieldAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBRelationshipRoleAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBRelationAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRelationshipsAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBJarAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRoleSourceAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createQueryAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createQueryMethodAdapterGen() {
-		return null;
-	}
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty <em>Activation Config Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfigProperty
-	 * @generated
-	 */
-	public Adapter createActivationConfigPropertyAdapter() {
-		return null;
-	}
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.ejb.ActivationConfig <em>Activation Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.ejb.ActivationConfig
-	 * @generated
-	 */
-	public Adapter createActivationConfigAdapter() {
-		return null;
-	}
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup <em>JNDI Env Refs Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	public Adapter createJNDIEnvRefsGroupAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMethodElementAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createExcludeListAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSessionAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMessageDrivenAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMessageDrivenDestinationAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEJBMethodCategoryAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEAttributeAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEStructuralFeatureAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createEModelElementAdapterGen() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createENamedElementAdapterGen() {
-		return null;
-	}
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ETypedElement <em>ETyped Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.ETypedElement
-	 * @generated
-	 */
-	public Adapter createETypedElementAdapter() {
-		return null;
-	}
-} //EjbAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbSwitch.java
deleted file mode 100644
index 89be9ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/EjbSwitch.java
+++ /dev/null
@@ -1,743 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.util;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-
-
-/**
- * <!-- 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.internal.ejb.EjbPackage
- * @generated
- */
-public class EjbSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EjbPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EjbSwitch() {
-		if (modelPackage == null) {
-			modelPackage = EjbPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case EjbPackage.CONTAINER_MANAGED_ENTITY: {
-					ContainerManagedEntity containerManagedEntity = (ContainerManagedEntity)theEObject;
-					Object result = caseContainerManagedEntity(containerManagedEntity);
-					if (result == null) result = caseEntity(containerManagedEntity);
-					if (result == null) result = caseEnterpriseBean(containerManagedEntity);
-					if (result == null) result = caseJNDIEnvRefsGroup(containerManagedEntity);
-					if (result == null) result = caseCompatibilityDescriptionGroup(containerManagedEntity);
-					if (result == null) result = caseDescriptionGroup(containerManagedEntity);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.METHOD_PERMISSION: {
-					MethodPermission methodPermission = (MethodPermission)theEObject;
-					Object result = caseMethodPermission(methodPermission);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.ASSEMBLY_DESCRIPTOR: {
-					AssemblyDescriptor assemblyDescriptor = (AssemblyDescriptor)theEObject;
-					Object result = caseAssemblyDescriptor(assemblyDescriptor);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.METHOD_TRANSACTION: {
-					MethodTransaction methodTransaction = (MethodTransaction)theEObject;
-					Object result = caseMethodTransaction(methodTransaction);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.SESSION: {
-					Session session = (Session)theEObject;
-					Object result = caseSession(session);
-					if (result == null) result = caseEnterpriseBean(session);
-					if (result == null) result = caseJNDIEnvRefsGroup(session);
-					if (result == null) result = caseCompatibilityDescriptionGroup(session);
-					if (result == null) result = caseDescriptionGroup(session);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.ENTITY: {
-					Entity entity = (Entity)theEObject;
-					Object result = caseEntity(entity);
-					if (result == null) result = caseEnterpriseBean(entity);
-					if (result == null) result = caseJNDIEnvRefsGroup(entity);
-					if (result == null) result = caseCompatibilityDescriptionGroup(entity);
-					if (result == null) result = caseDescriptionGroup(entity);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.EJB_METHOD_CATEGORY: {
-					EJBMethodCategory ejbMethodCategory = (EJBMethodCategory)theEObject;
-					Object result = caseEJBMethodCategory(ejbMethodCategory);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.EJB_JAR: {
-					EJBJar ejbJar = (EJBJar)theEObject;
-					Object result = caseEJBJar(ejbJar);
-					if (result == null) result = caseCompatibilityDescriptionGroup(ejbJar);
-					if (result == null) result = caseDescriptionGroup(ejbJar);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.METHOD_ELEMENT: {
-					MethodElement methodElement = (MethodElement)theEObject;
-					Object result = caseMethodElement(methodElement);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.CMP_ATTRIBUTE: {
-					CMPAttribute cmpAttribute = (CMPAttribute)theEObject;
-					Object result = caseCMPAttribute(cmpAttribute);
-					if (result == null) result = caseEAttribute(cmpAttribute);
-					if (result == null) result = caseEStructuralFeature(cmpAttribute);
-					if (result == null) result = caseETypedElement(cmpAttribute);
-					if (result == null) result = caseENamedElement(cmpAttribute);
-					if (result == null) result = caseEModelElement(cmpAttribute);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.RELATIONSHIPS: {
-					Relationships relationships = (Relationships)theEObject;
-					Object result = caseRelationships(relationships);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.QUERY: {
-					Query query = (Query)theEObject;
-					Object result = caseQuery(query);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.EJB_RELATION: {
-					EJBRelation ejbRelation = (EJBRelation)theEObject;
-					Object result = caseEJBRelation(ejbRelation);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.EJB_RELATIONSHIP_ROLE: {
-					EJBRelationshipRole ejbRelationshipRole = (EJBRelationshipRole)theEObject;
-					Object result = caseEJBRelationshipRole(ejbRelationshipRole);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.ROLE_SOURCE: {
-					RoleSource roleSource = (RoleSource)theEObject;
-					Object result = caseRoleSource(roleSource);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.CMR_FIELD: {
-					CMRField cmrField = (CMRField)theEObject;
-					Object result = caseCMRField(cmrField);
-					if (result == null) result = caseCMPAttribute(cmrField);
-					if (result == null) result = caseEAttribute(cmrField);
-					if (result == null) result = caseEStructuralFeature(cmrField);
-					if (result == null) result = caseETypedElement(cmrField);
-					if (result == null) result = caseENamedElement(cmrField);
-					if (result == null) result = caseEModelElement(cmrField);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.MESSAGE_DRIVEN: {
-					MessageDriven messageDriven = (MessageDriven)theEObject;
-					Object result = caseMessageDriven(messageDriven);
-					if (result == null) result = caseEnterpriseBean(messageDriven);
-					if (result == null) result = caseJNDIEnvRefsGroup(messageDriven);
-					if (result == null) result = caseCompatibilityDescriptionGroup(messageDriven);
-					if (result == null) result = caseDescriptionGroup(messageDriven);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.MESSAGE_DRIVEN_DESTINATION: {
-					MessageDrivenDestination messageDrivenDestination = (MessageDrivenDestination)theEObject;
-					Object result = caseMessageDrivenDestination(messageDrivenDestination);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.EXCLUDE_LIST: {
-					ExcludeList excludeList = (ExcludeList)theEObject;
-					Object result = caseExcludeList(excludeList);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.QUERY_METHOD: {
-					QueryMethod queryMethod = (QueryMethod)theEObject;
-					Object result = caseQueryMethod(queryMethod);
-					if (result == null) result = caseMethodElement(queryMethod);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.ACTIVATION_CONFIG_PROPERTY: {
-					ActivationConfigProperty activationConfigProperty = (ActivationConfigProperty)theEObject;
-					Object result = caseActivationConfigProperty(activationConfigProperty);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case EjbPackage.ACTIVATION_CONFIG: {
-					ActivationConfig activationConfig = (ActivationConfig)theEObject;
-					Object result = caseActivationConfig(activationConfig);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Container Managed Entity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Container Managed Entity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContainerManagedEntity(ContainerManagedEntity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Permission</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodPermission(MethodPermission object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Assembly Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Assembly Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAssemblyDescriptor(AssemblyDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Transaction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Transaction</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodTransaction(MethodTransaction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Session</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Session</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSession(Session object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Entity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Entity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEntity(Entity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Enterprise Bean</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Enterprise Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEnterpriseBean(EnterpriseBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Method Category</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Method Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBMethodCategory(EJBMethodCategory object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Jar</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Jar</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBJar(EJBJar object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Method Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMethodElement(MethodElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>CMP Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>CMP Attribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCMPAttribute(CMPAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Relationships</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Relationships</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRelationships(Relationships object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Query</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Query</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQuery(Query object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Relation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Relation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBRelation(EJBRelation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Relationship Role</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Relationship Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEJBRelationshipRole(EJBRelationshipRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Source</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Source</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleSource(RoleSource object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>CMR Field</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>CMR Field</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCMRField(CMRField object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Driven</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Driven</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDriven(MessageDriven object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Driven Destination</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Driven Destination</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageDrivenDestination(MessageDrivenDestination object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Exclude List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Exclude List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExcludeList(ExcludeList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Query Method</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Query Method</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseQueryMethod(QueryMethod object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Config Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationConfigProperty(ActivationConfigProperty object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationConfig(ActivationConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseENamedElement(ENamedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseETypedElement(ETypedElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEStructuralFeature(EStructuralFeature object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EAttribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EAttribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseEAttribute(EAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //EjbSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/MethodElementHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/MethodElementHelper.java
deleted file mode 100644
index d80b520..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/MethodElementHelper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-
-
-/**
- * @author cbridgha
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class MethodElementHelper {
-	public static final int NONE = 0;
-	public static final int METHOD_PERMISSION = 1;
-	public static final int METHOD_TRANSACTION = 2;
-	public static final int EXCLUDE_LIST = 3;
-	public static int getContainedType(MethodElement me) {
-		EObject container = me.eContainer();
-		if (container == null)
-			return NONE;
-		if (container instanceof MethodPermission)
-			return METHOD_PERMISSION;
-		if (container instanceof MethodTransaction)
-			return METHOD_TRANSACTION;
-		if (container instanceof ExcludeList)
-			return EXCLUDE_LIST;
-		return NONE;
-	}
-	public static MethodPermission getMethodPermission(MethodElement me) {
-		if (METHOD_PERMISSION == getContainedType(me))
-			return (MethodPermission) me.eContainer();
-		return null;
-	}
-	public static MethodTransaction getMethodTransaction(MethodElement me) {
-		if (METHOD_TRANSACTION == getContainedType(me))
-			return (MethodTransaction) me.eContainer();
-		return null;
-	}
-	public static ExcludeList getExcludeList(MethodElement me) {
-		if (EXCLUDE_LIST == getContainedType(me))
-			return (ExcludeList) me.eContainer();
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/RelationshipsAttributeMaintenanceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/RelationshipsAttributeMaintenanceAdapter.java
deleted file mode 100644
index 28d9af7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/util/RelationshipsAttributeMaintenanceAdapter.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.internal.ejb.util;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl;
-
-public class RelationshipsAttributeMaintenanceAdapter extends AdapterImpl {
-	/**
-	 * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(Notification)
-	 */
-	public void notifyChanged(Notification msg) {
-		if ((EStructuralFeature)msg.getFeature() == EjbFactoryImpl.getPackage().getRelationships_EjbRelations()) {
-			switch (msg.getEventType()) {
-				case Notification.ADD :
-					addedEJBRelation((EJBRelation) msg.getNewValue(), (EStructuralFeature)msg.getFeature());
-					break;
-				case Notification.REMOVE :
-					removedEJBRelation((EJBRelation) msg.getOldValue(), (EStructuralFeature)msg.getFeature());
-					break;
-			}
-		}
-	}
-	private void removedEJBRelation(EJBRelation aRelation, EObject sf) {
-		Adapter a = getAdapter(aRelation);
-		if (a != null) {
-			Notification not = new ENotificationImpl((InternalEObject)aRelation, Notification.REMOVE,(EStructuralFeature) sf, aRelation, null, Notification.NO_INDEX);
-			a.notifyChanged(not);
-		}
-	}
-	private void addedEJBRelation(EJBRelation aRelation, EObject sf) {
-		Adapter a = getAdapter(aRelation);
-		if (a != null) {
-			Notification not = new ENotificationImpl((InternalEObject)aRelation, Notification.ADD,(EStructuralFeature) sf, null, aRelation, Notification.NO_INDEX);
-			a.notifyChanged(not);
-		}
-	}
-	private Adapter getAdapter(EObject anObject) {
-		return EcoreUtil.getAdapter(anObject.eAdapters(),EJBAttributeMaintenanceFactoryImpl.ADAPTER_KEY);
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/JcaPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/JcaPackage.java
deleted file mode 100644
index 8912809..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/JcaPackage.java
+++ /dev/null
@@ -1,2088 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-
-
-
-public interface JcaPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "jca";//$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__VENDOR_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__SPEC_VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__EIS_TYPE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__LICENSE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONNECTOR__RESOURCE_ADAPTER = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * The number of structural features of the the '<em>Connector</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTOR_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LICENSE = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_INTERFACE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__TRANSACTION_SUPPORT = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT = 6;
-	/**
-	 * The feature id for the '<em><b>Resource Adapter Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS = 7;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__SECURITY_PERMISSIONS = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int RESOURCE_ADAPTER__CONFIG_PROPERTIES = 10;
-	/**
-	 * The feature id for the '<em><b>Outbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER = 11;
-
-	/**
-	 * The feature id for the '<em><b>Inbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER = 12;
-
-	/**
-	 * The feature id for the '<em><b>Admin Objects</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER__ADMIN_OBJECTS = 13;
-
-	/**
-	 * The number of structural features of the the '<em>Resource Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RESOURCE_ADAPTER_FEATURE_COUNT = 14;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_PERMISSION = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__DESCRIPTION = 0;
-	/**
-	 * The feature id for the '<em><b>Authentication Mechanism</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM = 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSACTION_SUPPORT_KIND = 15;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM_TYPE = 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "jca.xmi";//$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.jca";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JcaPackage eINSTANCE = org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE = 4;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTHENTICATION_MECHANISM__DESCRIPTIONS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Authentication Mechanism</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTHENTICATION_MECHANISM_FEATURE_COUNT = 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__NAME = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__TYPE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONFIG_PROPERTY__VALUE = 3;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIG_PROPERTY__DESCRIPTIONS = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Config Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONFIG_PROPERTY_FEATURE_COUNT = 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_PERMISSION__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_PERMISSION__SPECIFICATION = 1;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_PERMISSION__DESCRIPTIONS = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Security Permission</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_PERMISSION_FEATURE_COUNT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LICENSE__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LICENSE__REQUIRED = 1;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LICENSE__DESCRIPTIONS = 2;
-
-	/**
-	 * The number of structural features of the the '<em>License</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LICENSE_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.InboundResourceAdapterImpl <em>Inbound Resource Adapter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.InboundResourceAdapterImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getInboundResourceAdapter()
-	 * @generated
-	 */
-	int INBOUND_RESOURCE_ADAPTER = 6;
-
-	/**
-	 * The feature id for the '<em><b>Message Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Inbound Resource Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INBOUND_RESOURCE_ADAPTER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.OutboundResourceAdapterImpl <em>Outbound Resource Adapter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.OutboundResourceAdapterImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getOutboundResourceAdapter()
-	 * @generated
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER = 7;
-
-	/**
-	 * The feature id for the '<em><b>Reauthentication Support</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Transaction Support</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Connection Definitions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Authentication Mechanisms</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Outbound Resource Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OUTBOUND_RESOURCE_ADAPTER_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.MessageAdapterImpl <em>Message Adapter</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.MessageAdapterImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getMessageAdapter()
-	 * @generated
-	 */
-	int MESSAGE_ADAPTER = 8;
-
-	/**
-	 * The feature id for the '<em><b>Message Listeners</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_ADAPTER__MESSAGE_LISTENERS = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Message Adapter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_ADAPTER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl <em>Connection Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getConnectionDefinition()
-	 * @generated
-	 */
-	int CONNECTION_DEFINITION = 9;
-
-	/**
-	 * The feature id for the '<em><b>Managed Connection Factory Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Connection Factory Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Connection Factory Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Connection Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_INTERFACE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Connection Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION__CONFIG_PROPERTIES = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Connection Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_DEFINITION_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.AdminObjectImpl <em>Admin Object</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.AdminObjectImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getAdminObject()
-	 * @generated
-	 */
-	int ADMIN_OBJECT = 10;
-
-	/**
-	 * The feature id for the '<em><b>Admin Object Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Admin Object Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT__ADMIN_OBJECT_CLASS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT__CONFIG_PROPERTIES = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Admin Object</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ADMIN_OBJECT_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.MessageListenerImpl <em>Message Listener</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.MessageListenerImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getMessageListener()
-	 * @generated
-	 */
-	int MESSAGE_LISTENER = 11;
-
-	/**
-	 * The feature id for the '<em><b>Message Listener Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Activation Spec</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_LISTENER__ACTIVATION_SPEC = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Message Listener</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_LISTENER_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.ActivationSpecImpl <em>Activation Spec</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.ActivationSpecImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getActivationSpec()
-	 * @generated
-	 */
-	int ACTIVATION_SPEC = 12;
-
-	/**
-	 * The feature id for the '<em><b>Activation Spec Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Required Config Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Activation Spec</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTIVATION_SPEC_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jca.impl.RequiredConfigPropertyTypeImpl <em>Required Config Property Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.RequiredConfigPropertyTypeImpl
-	 * @see org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl#getRequiredConfigPropertyType()
-	 * @generated
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE = 13;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Required Config Property Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REQUIRED_CONFIG_PROPERTY_TYPE_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Connector object
-	 */
-	EClass getConnector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_VendorName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_SpecVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_EisType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConnector_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getConnector_License();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getConnector_ResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return License object
-	 */
-	EClass getLicense();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLicense_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLicense_Required();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.License#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.License#getDescriptions()
-	 * @see #getLicense()
-	 * @generated
-	 */
-	EReference getLicense_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter <em>Inbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Inbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter
-	 * @generated
-	 */
-	EClass getInboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter#getMessageAdapter <em>Message Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Message Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter#getMessageAdapter()
-	 * @see #getInboundResourceAdapter()
-	 * @generated
-	 */
-	EReference getInboundResourceAdapter_MessageAdapter();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter <em>Outbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Outbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter
-	 * @generated
-	 */
-	EClass getOutboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Reauthentication Support</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#isReauthenticationSupport()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EAttribute getOutboundResourceAdapter_ReauthenticationSupport();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Transaction Support</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getTransactionSupport()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EAttribute getOutboundResourceAdapter_TransactionSupport();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getConnectionDefinitions <em>Connection Definitions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Connection Definitions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getConnectionDefinitions()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EReference getOutboundResourceAdapter_ConnectionDefinitions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getAuthenticationMechanisms <em>Authentication Mechanisms</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Authentication Mechanisms</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getAuthenticationMechanisms()
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	EReference getOutboundResourceAdapter_AuthenticationMechanisms();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.MessageAdapter <em>Message Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.MessageAdapter
-	 * @generated
-	 */
-	EClass getMessageAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.MessageAdapter#getMessageListeners <em>Message Listeners</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Listeners</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.MessageAdapter#getMessageListeners()
-	 * @see #getMessageAdapter()
-	 * @generated
-	 */
-	EReference getMessageAdapter_MessageListeners();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition <em>Connection Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Connection Definition</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition
-	 * @generated
-	 */
-	EClass getConnectionDefinition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Managed Connection Factory Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getManagedConnectionFactoryClass()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ManagedConnectionFactoryClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryInterface <em>Connection Factory Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Factory Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryInterface()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionFactoryInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Factory Impl Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryImplClass()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionFactoryImplClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionInterface <em>Connection Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionInterface()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionImplClass <em>Connection Impl Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Connection Impl Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionImplClass()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EAttribute getConnectionDefinition_ConnectionImplClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConfigProperties <em>Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConfigProperties()
-	 * @see #getConnectionDefinition()
-	 * @generated
-	 */
-	EReference getConnectionDefinition_ConfigProperties();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.AdminObject <em>Admin Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Admin Object</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AdminObject
-	 * @generated
-	 */
-	EClass getAdminObject();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectInterface <em>Admin Object Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Admin Object Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectInterface()
-	 * @see #getAdminObject()
-	 * @generated
-	 */
-	EAttribute getAdminObject_AdminObjectInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectClass <em>Admin Object Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Admin Object Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectClass()
-	 * @see #getAdminObject()
-	 * @generated
-	 */
-	EAttribute getAdminObject_AdminObjectClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getConfigProperties <em>Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AdminObject#getConfigProperties()
-	 * @see #getAdminObject()
-	 * @generated
-	 */
-	EReference getAdminObject_ConfigProperties();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.MessageListener <em>Message Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Message Listener</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.MessageListener
-	 * @generated
-	 */
-	EClass getMessageListener();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.MessageListener#getMessageListenerType <em>Message Listener Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message Listener Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.MessageListener#getMessageListenerType()
-	 * @see #getMessageListener()
-	 * @generated
-	 */
-	EAttribute getMessageListener_MessageListenerType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.jca.MessageListener#getActivationSpec <em>Activation Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Activation Spec</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.MessageListener#getActivationSpec()
-	 * @see #getMessageListener()
-	 * @generated
-	 */
-	EReference getMessageListener_ActivationSpec();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.ActivationSpec <em>Activation Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Activation Spec</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ActivationSpec
-	 * @generated
-	 */
-	EClass getActivationSpec();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.ActivationSpec#getActivationSpecClass <em>Activation Spec Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Activation Spec Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ActivationSpec#getActivationSpecClass()
-	 * @see #getActivationSpec()
-	 * @generated
-	 */
-	EAttribute getActivationSpec_ActivationSpecClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.ActivationSpec#getRequiredConfigProperties <em>Required Config Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Required Config Properties</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ActivationSpec#getRequiredConfigProperties()
-	 * @see #getActivationSpec()
-	 * @generated
-	 */
-	EReference getActivationSpec_RequiredConfigProperties();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType <em>Required Config Property Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Required Config Property Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType
-	 * @generated
-	 */
-	EClass getRequiredConfigPropertyType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType#getName()
-	 * @see #getRequiredConfigPropertyType()
-	 * @generated
-	 */
-	EAttribute getRequiredConfigPropertyType_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType#getDescriptions()
-	 * @see #getRequiredConfigPropertyType()
-	 * @generated
-	 */
-	EReference getRequiredConfigPropertyType_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResourceAdapter object
-	 */
-	EClass getResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ManagedConnectionFactoryClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionFactoryInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionFactoryImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ConnectionImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_TransactionSupport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getResourceAdapter_ReauthenticationSupport();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getResourceAdapterClass <em>Resource Adapter Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resource Adapter Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getResourceAdapterClass()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EAttribute getResourceAdapter_ResourceAdapterClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getResourceAdapter_SecurityPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getResourceAdapter_AuthenticationMechanisms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getResourceAdapter_ConfigProperties();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getOutboundResourceAdapter <em>Outbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Outbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getOutboundResourceAdapter()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EReference getResourceAdapter_OutboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getInboundResourceAdapter <em>Inbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Inbound Resource Adapter</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getInboundResourceAdapter()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EReference getResourceAdapter_InboundResourceAdapter();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getAdminObjects <em>Admin Objects</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Admin Objects</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getAdminObjects()
-	 * @see #getResourceAdapter()
-	 * @generated
-	 */
-	EReference getResourceAdapter_AdminObjects();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityPermission object
-	 */
-	EClass getSecurityPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityPermission_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSecurityPermission_Specification();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.SecurityPermission#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.SecurityPermission#getDescriptions()
-	 * @see #getSecurityPermission()
-	 * @generated
-	 */
-	EReference getSecurityPermission_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthenticationMechanism object
-	 */
-	EClass getAuthenticationMechanism();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getAuthenticationMechanism <em>Authentication Mechanism</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authentication Mechanism</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getAuthenticationMechanism()
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 */
-	EAttribute getAuthenticationMechanism_AuthenticationMechanism();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_AuthenticationMechanismType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_CredentialInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ConfigProperty object
-	 */
-	EClass getConfigProperty();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Type();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getConfigProperty_Value();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.ConfigProperty#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConfigProperty#getDescriptions()
-	 * @see #getConfigProperty()
-	 * @generated
-	 */
-	EReference getConfigProperty_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransactionSupportKind object
-	 */
-	EEnum getTransactionSupportKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthenticationMechanismType object
-	 */
-	EEnum getAuthenticationMechanismType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	JcaFactory getJcaFactory();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthenticationMechanism_CustomAuthMechType();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getDescriptions()
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 */
-	EReference getAuthenticationMechanism_Descriptions();
-
-} //JcaPackage
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ActivationSpecImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ActivationSpecImpl.java
deleted file mode 100644
index 7ae8f2c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ActivationSpecImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.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.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Activation Spec</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ActivationSpecImpl#getActivationSpecClass <em>Activation Spec Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ActivationSpecImpl#getRequiredConfigProperties <em>Required Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ActivationSpecImpl extends EObjectImpl implements ActivationSpec {
-	/**
-	 * The default value of the '{@link #getActivationSpecClass() <em>Activation Spec Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationSpecClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACTIVATION_SPEC_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getActivationSpecClass() <em>Activation Spec Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationSpecClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String activationSpecClass = ACTIVATION_SPEC_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRequiredConfigProperties() <em>Required Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRequiredConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList requiredConfigProperties = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ActivationSpecImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getActivationSpec();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getActivationSpecClass() {
-		return activationSpecClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationSpecClass(String newActivationSpecClass) {
-		String oldActivationSpecClass = activationSpecClass;
-		activationSpecClass = newActivationSpecClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS, oldActivationSpecClass, activationSpecClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getRequiredConfigProperties() {
-		if (requiredConfigProperties == null) {
-			requiredConfigProperties = new EObjectContainmentEList(RequiredConfigPropertyType.class, this, JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES);
-		}
-		return requiredConfigProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-					return ((InternalEList)getRequiredConfigProperties()).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 JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				return getActivationSpecClass();
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				return getRequiredConfigProperties();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				setActivationSpecClass((String)newValue);
-				return;
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				getRequiredConfigProperties().clear();
-				getRequiredConfigProperties().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				setActivationSpecClass(ACTIVATION_SPEC_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				getRequiredConfigProperties().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS:
-				return ACTIVATION_SPEC_CLASS_EDEFAULT == null ? activationSpecClass != null : !ACTIVATION_SPEC_CLASS_EDEFAULT.equals(activationSpecClass);
-			case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES:
-				return requiredConfigProperties != null && !requiredConfigProperties.isEmpty();
-		}
-		return 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(" (activationSpecClass: ");//$NON-NLS-1$
-		result.append(activationSpecClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ActivationSpecImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AdminObjectImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AdminObjectImpl.java
deleted file mode 100644
index ba23c8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AdminObjectImpl.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.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.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Admin Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.AdminObjectImpl#getAdminObjectInterface <em>Admin Object Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.AdminObjectImpl#getAdminObjectClass <em>Admin Object Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.AdminObjectImpl#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AdminObjectImpl extends EObjectImpl implements AdminObject {
-	/**
-	 * The default value of the '{@link #getAdminObjectInterface() <em>Admin Object Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADMIN_OBJECT_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAdminObjectInterface() <em>Admin Object Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String adminObjectInterface = ADMIN_OBJECT_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAdminObjectClass() <em>Admin Object Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ADMIN_OBJECT_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAdminObjectClass() <em>Admin Object Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjectClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String adminObjectClass = ADMIN_OBJECT_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConfigProperties() <em>Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList configProperties = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AdminObjectImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getAdminObject();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAdminObjectInterface() {
-		return adminObjectInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAdminObjectInterface(String newAdminObjectInterface) {
-		String oldAdminObjectInterface = adminObjectInterface;
-		adminObjectInterface = newAdminObjectInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE, oldAdminObjectInterface, adminObjectInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAdminObjectClass() {
-		return adminObjectClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAdminObjectClass(String newAdminObjectClass) {
-		String oldAdminObjectClass = adminObjectClass;
-		adminObjectClass = newAdminObjectClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS, oldAdminObjectClass, adminObjectClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ConfigProperty.class, this, JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-					return ((InternalEList)getConfigProperties()).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 JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				return getAdminObjectInterface();
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				return getAdminObjectClass();
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				return getConfigProperties();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				setAdminObjectInterface((String)newValue);
-				return;
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				setAdminObjectClass((String)newValue);
-				return;
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				setAdminObjectInterface(ADMIN_OBJECT_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				setAdminObjectClass(ADMIN_OBJECT_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE:
-				return ADMIN_OBJECT_INTERFACE_EDEFAULT == null ? adminObjectInterface != null : !ADMIN_OBJECT_INTERFACE_EDEFAULT.equals(adminObjectInterface);
-			case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS:
-				return ADMIN_OBJECT_CLASS_EDEFAULT == null ? adminObjectClass != null : !ADMIN_OBJECT_CLASS_EDEFAULT.equals(adminObjectClass);
-			case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-		}
-		return 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(" (adminObjectInterface: ");//$NON-NLS-1$
-		result.append(adminObjectInterface);
-		result.append(", adminObjectClass: ");//$NON-NLS-1$
-		result.append(adminObjectClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AdminObjectImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AuthenticationMechanismImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AuthenticationMechanismImpl.java
deleted file mode 100644
index 7f8f010..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/AuthenticationMechanismImpl.java
+++ /dev/null
@@ -1,866 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanismType;
-
-
-/**
- * The element authentication-mechanism specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism.
- * 
- * Note that BasicPassword mechanism type should support the
- * javax.resource.spi.security.PasswordCredential interface.
- * The Kerbv5 mechanism type should support the
- * javax.resource.spi.security.GenericCredential interface.
-
- */
-public class AuthenticationMechanismImpl extends EObjectImpl implements AuthenticationMechanism, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAuthenticationMechanism() <em>Authentication Mechanism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHENTICATION_MECHANISM_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthenticationMechanism() <em>Authentication Mechanism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authenticationMechanism = AUTHENTICATION_MECHANISM_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAuthenticationMechanismType() <em>Authentication Mechanism Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanismType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final AuthenticationMechanismType AUTHENTICATION_MECHANISM_TYPE_EDEFAULT = AuthenticationMechanismType.BASIC_PASSWORD_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AuthenticationMechanismType authenticationMechanismType = AUTHENTICATION_MECHANISM_TYPE_EDEFAULT;
-	/**
-	 * This is true if the Authentication Mechanism Type attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean authenticationMechanismTypeESet = false;
-
-	/**
-	 * The default value of the '{@link #getCredentialInterface() <em>Credential Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCredentialInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CREDENTIAL_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String credentialInterface = CREDENTIAL_INTERFACE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getCustomAuthMechType() <em>Custom Auth Mech Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomAuthMechType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_AUTH_MECH_TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String customAuthMechType = CUSTOM_AUTH_MECH_TYPE_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected AuthenticationMechanismImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getAuthenticationMechanism();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthenticationMechanism() {
-		return authenticationMechanism;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthenticationMechanism(String newAuthenticationMechanism) {
-		String oldAuthenticationMechanism = authenticationMechanism;
-		authenticationMechanism = newAuthenticationMechanism;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM, oldAuthenticationMechanism, authenticationMechanism));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The authentication-mechanism-type specifies type of an authentication mechanism.
-	 * 
-	 * The example values are:
-	 *   - BasicPassword
-	 *   - Kerbv5
-	 * 
-	 * Any additional security mechanisms are outside the scope of the
-	 * Connector architecture specification.
-
-	 */
-	public AuthenticationMechanismType getAuthenticationMechanismType() {
-		return authenticationMechanismType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthenticationMechanismType(AuthenticationMechanismType newAuthenticationMechanismType) {
-		AuthenticationMechanismType oldAuthenticationMechanismType = authenticationMechanismType;
-		authenticationMechanismType = newAuthenticationMechanismType == null ? AUTHENTICATION_MECHANISM_TYPE_EDEFAULT : newAuthenticationMechanismType;
-		boolean oldAuthenticationMechanismTypeESet = authenticationMechanismTypeESet;
-		authenticationMechanismTypeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE, oldAuthenticationMechanismType, authenticationMechanismType, !oldAuthenticationMechanismTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAuthenticationMechanismType() {
-		AuthenticationMechanismType oldAuthenticationMechanismType = authenticationMechanismType;
-		boolean oldAuthenticationMechanismTypeESet = authenticationMechanismTypeESet;
-		authenticationMechanismType = AUTHENTICATION_MECHANISM_TYPE_EDEFAULT;
-		authenticationMechanismTypeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE, oldAuthenticationMechanismType, AUTHENTICATION_MECHANISM_TYPE_EDEFAULT, oldAuthenticationMechanismTypeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAuthenticationMechanismType() {
-		return authenticationMechanismTypeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the interface that the resource adapter implementation supports for
-	 * the representation of the credentials. This element should be used by
-	 * application server to find out the Credential interface it should use as part
-	 * of the security contract.
-	 * 
-	 * The possible values are:
-	 *    javax.resource.spi.security.PasswordCredential
-	 *    javax.resource.spi.security.GenericCredential
-
-	 */
-	public String getCredentialInterface() {
-		return credentialInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCredentialInterface(String newCredentialInterface) {
-		String oldCredentialInterface = credentialInterface;
-		credentialInterface = newCredentialInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE, oldCredentialInterface, credentialInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				return AUTHENTICATION_MECHANISM_EDEFAULT == null ? authenticationMechanism != null : !AUTHENTICATION_MECHANISM_EDEFAULT.equals(authenticationMechanism);
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				return isSetAuthenticationMechanismType();
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				return CREDENTIAL_INTERFACE_EDEFAULT == null ? credentialInterface != null : !CREDENTIAL_INTERFACE_EDEFAULT.equals(credentialInterface);
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				return CUSTOM_AUTH_MECH_TYPE_EDEFAULT == null ? customAuthMechType != null : !CUSTOM_AUTH_MECH_TYPE_EDEFAULT.equals(customAuthMechType);
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				setAuthenticationMechanism((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				setAuthenticationMechanismType((AuthenticationMechanismType)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				setCredentialInterface((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				setCustomAuthMechType((String)newValue);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				setAuthenticationMechanism(AUTHENTICATION_MECHANISM_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				unsetAuthenticationMechanismType();
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				setCredentialInterface(CREDENTIAL_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				setCustomAuthMechType(CUSTOM_AUTH_MECH_TYPE_EDEFAULT);
-				return;
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", authenticationMechanism: ");//$NON-NLS-1$
-		result.append(authenticationMechanism);
-		result.append(", authenticationMechanismType: ");//$NON-NLS-1$
-		if (authenticationMechanismTypeESet) result.append(authenticationMechanismType); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", credentialInterface: ");//$NON-NLS-1$
-		result.append(credentialInterface);
-		result.append(", customAuthMechType: ");//$NON-NLS-1$
-		result.append(customAuthMechType);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * This is an internal variable used to store the AthenticationMechanismType when
-	 * it is something other than BasicPassword or Kerbv5.  AuthenticationMecanismType 
-	 * is set to 'Custom' in those cases.  This attribute should not be used by
-	 * runtime.  It is only used by the writer to write back out the custom
-	 * AuthenticationMechanismType string in the case of custom
-	 * AuthenticationMechanismType's.  
-	 * This variable is internal, used only by the reader//writer classes, and can
-	 * change or disappear without notice.  
-	 */
-	public String getCustomAuthMechType() {
-		return customAuthMechType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setCustomAuthMechType(String newCustomAuthMechType) {
-		String oldCustomAuthMechType = customAuthMechType;
-		customAuthMechType = newCustomAuthMechType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE, oldCustomAuthMechType, customAuthMechType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM:
-				return getAuthenticationMechanism();
-			case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE:
-				return getAuthenticationMechanismType();
-			case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE:
-				return getCredentialInterface();
-			case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE:
-				return getCustomAuthMechType();
-			case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConfigPropertyImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConfigPropertyImpl.java
deleted file mode 100644
index 5b311d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConfigPropertyImpl.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-
-
-/**
- * The config property contains a declaration of a single
- * configuration property for a ManagedConnectionFactory instance.
- * 
- * Each ManagedConnectionFactory instance creates connections to a specific EIS instance based on the properties configured on the ManagedConnectionFactory instance. The configurable properties are specified only once in the deployment descriptor, even though a resource adapter can be used to configure multiple ManagedConnnection-Factory instances (that create connections to different instances of the same EIS).
- * 
- * The declaration consists of an optional description, name, type
- * and an optional value of the configuration property. If the resource
- * adapter provider does not specify a value than the deployer is
- * responsible for providing a valid value for a configuration property.
- * 
- * Any bounds or well-defined values of properties should be described in the description.
-
- */
-public class ConfigPropertyImpl extends EObjectImpl implements ConfigProperty, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String type = TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String value = VALUE_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected ConfigPropertyImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getConfigProperty();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the name of a configuration property.
-	 * 
-	 * The connector architecture defines a set of well-defined properties all of type java.lang.String. These are as follows:
-	 * 
-	 *      ServerName
-	 *      PortNumber
-	 *      UserName
-	 *      Password
-	 *      ConnectionURL
-	 * 
-	 * A resource adapter provider can extend this property set to include properties specific to the resource adapter and its underlying EIS.
-
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the fully qualified Java type of a configuration property as required by ManagedConnection-Factory instance.
-	 * 
-	 * The following are the legal values of config-property-type:
-	 *    java.lang.Boolean, java.lang.String, java.lang.Integer,
-	 *    java.lang.Double, java.lang.Byte, java.lang.Short,
-	 *    java.lang.Long, java.lang.Float, java.lang.Character
-	 */
-	public String getType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(String newType) {
-		String oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__TYPE, oldType, type));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains the value of a configuration entry.
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONFIG_PROPERTY__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				return getName();
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				return getType();
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				return getValue();
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				setName((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				setType((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				setValue((String)newValue);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(", type: ");//$NON-NLS-1$
-		result.append(type);
-		result.append(", value: ");//$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectionDefinitionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectionDefinitionImpl.java
deleted file mode 100644
index 8d520ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectionDefinitionImpl.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.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.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Connection Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl#getConnectionFactoryInterface <em>Connection Factory Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl#getConnectionInterface <em>Connection Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl#getConnectionImplClass <em>Connection Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.ConnectionDefinitionImpl#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConnectionDefinitionImpl extends EObjectImpl implements ConnectionDefinition {
-	/**
-	 * The default value of the '{@link #getManagedConnectionFactoryClass() <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getManagedConnectionFactoryClass() <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String managedConnectionFactoryClass = MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionFactoryInterface() <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionFactoryInterface() <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionFactoryInterface = CONNECTION_FACTORY_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionFactoryImplClass() <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionFactoryImplClass() <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionFactoryImplClass = CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionInterface() <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionInterface() <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionInterface = CONNECTION_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConnectionImplClass() <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConnectionImplClass() <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String connectionImplClass = CONNECTION_IMPL_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getConfigProperties() <em>Config Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConfigProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList configProperties = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConnectionDefinitionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getConnectionDefinition();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getManagedConnectionFactoryClass() {
-		return managedConnectionFactoryClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setManagedConnectionFactoryClass(String newManagedConnectionFactoryClass) {
-		String oldManagedConnectionFactoryClass = managedConnectionFactoryClass;
-		managedConnectionFactoryClass = newManagedConnectionFactoryClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS, oldManagedConnectionFactoryClass, managedConnectionFactoryClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionFactoryInterface() {
-		return connectionFactoryInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionFactoryInterface(String newConnectionFactoryInterface) {
-		String oldConnectionFactoryInterface = connectionFactoryInterface;
-		connectionFactoryInterface = newConnectionFactoryInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE, oldConnectionFactoryInterface, connectionFactoryInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionFactoryImplClass() {
-		return connectionFactoryImplClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionFactoryImplClass(String newConnectionFactoryImplClass) {
-		String oldConnectionFactoryImplClass = connectionFactoryImplClass;
-		connectionFactoryImplClass = newConnectionFactoryImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS, oldConnectionFactoryImplClass, connectionFactoryImplClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionInterface() {
-		return connectionInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionInterface(String newConnectionInterface) {
-		String oldConnectionInterface = connectionInterface;
-		connectionInterface = newConnectionInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE, oldConnectionInterface, connectionInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getConnectionImplClass() {
-		return connectionImplClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setConnectionImplClass(String newConnectionImplClass) {
-		String oldConnectionImplClass = connectionImplClass;
-		connectionImplClass = newConnectionImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS, oldConnectionImplClass, connectionImplClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ConfigProperty.class, this, JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-					return ((InternalEList)getConfigProperties()).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 JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				return getManagedConnectionFactoryClass();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				return getConnectionFactoryInterface();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				return getConnectionFactoryImplClass();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				return getConnectionInterface();
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				return getConnectionImplClass();
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				return getConfigProperties();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				setConnectionInterface((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass((String)newValue);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass(MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface(CONNECTION_FACTORY_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass(CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				setConnectionInterface(CONNECTION_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass(CONNECTION_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS:
-				return MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT == null ? managedConnectionFactoryClass != null : !MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT.equals(managedConnectionFactoryClass);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE:
-				return CONNECTION_FACTORY_INTERFACE_EDEFAULT == null ? connectionFactoryInterface != null : !CONNECTION_FACTORY_INTERFACE_EDEFAULT.equals(connectionFactoryInterface);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS:
-				return CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT == null ? connectionFactoryImplClass != null : !CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT.equals(connectionFactoryImplClass);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE:
-				return CONNECTION_INTERFACE_EDEFAULT == null ? connectionInterface != null : !CONNECTION_INTERFACE_EDEFAULT.equals(connectionInterface);
-			case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS:
-				return CONNECTION_IMPL_CLASS_EDEFAULT == null ? connectionImplClass != null : !CONNECTION_IMPL_CLASS_EDEFAULT.equals(connectionImplClass);
-			case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-		}
-		return 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(" (managedConnectionFactoryClass: ");//$NON-NLS-1$
-		result.append(managedConnectionFactoryClass);
-		result.append(", connectionFactoryInterface: ");//$NON-NLS-1$
-		result.append(connectionFactoryInterface);
-		result.append(", connectionFactoryImplClass: ");//$NON-NLS-1$
-		result.append(connectionFactoryImplClass);
-		result.append(", connectionInterface: ");//$NON-NLS-1$
-		result.append(connectionInterface);
-		result.append(", connectionImplClass: ");//$NON-NLS-1$
-		result.append(connectionImplClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ConnectionDefinitionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorImpl.java
deleted file mode 100644
index c1db229..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorImpl.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-
-
-/**
- * The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, version, specification version supported, icon -  about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter.
-
- */
-public class ConnectorImpl extends CompatibilityDescriptionGroupImpl implements Connector{
-
-	/**
-	 * The default value of the '{@link #getVendorName() <em>Vendor Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVendorName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VENDOR_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String vendorName = VENDOR_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getSpecVersion() <em>Spec Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpecVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SPEC_VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String specVersion = SPEC_VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getEisType() <em>Eis Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEisType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EIS_TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String eisType = EIS_TYPE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String version = VERSION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected License license = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected ResourceAdapter resourceAdapter = null;
-	protected ConnectorImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getConnector();
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	* This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getModuleVersionID();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the name of resource adapter provider vendor.
-	 * Example: Wombat Corp.
-	 */
-	public String getVendorName() {
-		return vendorName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVendorName(String newVendorName) {
-		String oldVendorName = vendorName;
-		vendorName = newVendorName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__VENDOR_NAME, oldVendorName, vendorName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the version of the connector architecture specification that is supported by this resource adapter. This information enables deployer to configure the resource adapter to support deployment and runtime requirements of the corresponding connector architecture specification.
-
-	 */
-	public String getSpecVersion() {
-		return specVersion;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSpecVersion(String newSpecVersion) {
-		String oldSpecVersion = specVersion;
-		specVersion = newSpecVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__SPEC_VERSION, oldSpecVersion, specVersion));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Contains information about the type of the EIS. For example, the type of an EIS can be product name of EIS independent of any version info.
-	 * 
-	 * This helps in identifying EIS instances that can be used with
-	 * this resource adapter.
-
-	 */
-	public String getEisType() {
-		return eisType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setEisType(String newEisType) {
-		String oldEisType = eisType;
-		eisType = newEisType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__EIS_TYPE, oldEisType, eisType));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies a string-based version of the resource adapter from the resource adapter provider.
-	 * 
-	 * Example: 1.0
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies licensing requirements for the resource adapter module. This element specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of
-	 * connection restrictions).
-	 */
-	public License getLicense() {
-		return license;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLicense(License newLicense, NotificationChain msgs) {
-		License oldLicense = license;
-		license = newLicense;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__LICENSE, oldLicense, newLicense);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLicense(License newLicense) {
-		if (newLicense != license) {
-			NotificationChain msgs = null;
-			if (license != null)
-				msgs = ((InternalEObject)license).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__LICENSE, null, msgs);
-			if (newLicense != null)
-				msgs = ((InternalEObject)newLicense).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__LICENSE, null, msgs);
-			msgs = basicSetLicense(newLicense, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__LICENSE, newLicense, newLicense));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public ResourceAdapter getResourceAdapter() {
-		return resourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetResourceAdapter(ResourceAdapter newResourceAdapter, NotificationChain msgs) {
-		ResourceAdapter oldResourceAdapter = resourceAdapter;
-		resourceAdapter = newResourceAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__RESOURCE_ADAPTER, oldResourceAdapter, newResourceAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setResourceAdapter(ResourceAdapter newResourceAdapter) {
-		if (newResourceAdapter != resourceAdapter) {
-			NotificationChain msgs = null;
-			if (resourceAdapter != null)
-				msgs = ((InternalEObject)resourceAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__RESOURCE_ADAPTER, null, msgs);
-			if (newResourceAdapter != null)
-				msgs = ((InternalEObject)newResourceAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.CONNECTOR__RESOURCE_ADAPTER, null, msgs);
-			msgs = basicSetResourceAdapter(newResourceAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.CONNECTOR__RESOURCE_ADAPTER, newResourceAdapter, newResourceAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.CONNECTOR__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case JcaPackage.CONNECTOR__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case JcaPackage.CONNECTOR__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case JcaPackage.CONNECTOR__LICENSE:
-					return basicSetLicense(null, msgs);
-				case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-					return basicSetResourceAdapter(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 JcaPackage.CONNECTOR__ICONS:
-				return getIcons();
-			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
-				return getDisplayNames();
-			case JcaPackage.CONNECTOR__DESCRIPTIONS:
-				return getDescriptions();
-			case JcaPackage.CONNECTOR__SMALL_ICON:
-				return getSmallIcon();
-			case JcaPackage.CONNECTOR__LARGE_ICON:
-				return getLargeIcon();
-			case JcaPackage.CONNECTOR__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.CONNECTOR__DISPLAY_NAME:
-				return getDisplayName();
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				return getVendorName();
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				return getSpecVersion();
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				return getEisType();
-			case JcaPackage.CONNECTOR__VERSION:
-				return getVersion();
-			case JcaPackage.CONNECTOR__LICENSE:
-				return getLicense();
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				return getResourceAdapter();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONNECTOR__ICONS:
-				return icons != null && !icons.isEmpty();
-			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case JcaPackage.CONNECTOR__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JcaPackage.CONNECTOR__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case JcaPackage.CONNECTOR__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case JcaPackage.CONNECTOR__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.CONNECTOR__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				return VENDOR_NAME_EDEFAULT == null ? vendorName != null : !VENDOR_NAME_EDEFAULT.equals(vendorName);
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				return SPEC_VERSION_EDEFAULT == null ? specVersion != null : !SPEC_VERSION_EDEFAULT.equals(specVersion);
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				return EIS_TYPE_EDEFAULT == null ? eisType != null : !EIS_TYPE_EDEFAULT.equals(eisType);
-			case JcaPackage.CONNECTOR__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case JcaPackage.CONNECTOR__LICENSE:
-				return license != null;
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				return resourceAdapter != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONNECTOR__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case JcaPackage.CONNECTOR__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JcaPackage.CONNECTOR__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				setVendorName((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				setSpecVersion((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				setEisType((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__VERSION:
-				setVersion((String)newValue);
-				return;
-			case JcaPackage.CONNECTOR__LICENSE:
-				setLicense((License)newValue);
-				return;
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				setResourceAdapter((ResourceAdapter)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.CONNECTOR__ICONS:
-				getIcons().clear();
-				return;
-			case JcaPackage.CONNECTOR__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case JcaPackage.CONNECTOR__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JcaPackage.CONNECTOR__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__VENDOR_NAME:
-				setVendorName(VENDOR_NAME_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__SPEC_VERSION:
-				setSpecVersion(SPEC_VERSION_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__EIS_TYPE:
-				setEisType(EIS_TYPE_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case JcaPackage.CONNECTOR__LICENSE:
-				setLicense((License)null);
-				return;
-			case JcaPackage.CONNECTOR__RESOURCE_ADAPTER:
-				setResourceAdapter((ResourceAdapter)null);
-				return;
-		}
-		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(" (vendorName: ");//$NON-NLS-1$
-		result.append(vendorName);
-		result.append(", specVersion: ");//$NON-NLS-1$
-		result.append(specVersion);
-		result.append(", eisType: ");//$NON-NLS-1$
-		result.append(eisType);
-		result.append(", version: ");//$NON-NLS-1$
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceFactory.java
deleted file mode 100644
index b3de505..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class ConnectorResourceFactory extends TranslatorResourceFactory {
-	
-	/**
-	 * Method registerDtds.
-	 */
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.CONNECTOR_SYSTEMID_1_0, "connector_1_0.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.CONNECTOR_SCHEMA_LOC_1_5, "connector_1_5.xsd"); //$NON-NLS-1$
-	} 
- 
-	/**
-	 * Constructor for ConnectorResourceFactory.
-	 * @param aRendererFactory
-	 */
-	public ConnectorResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-     */
-    protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new ConnectorResourceImpl(uri, aRenderer);
-    }
-    
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(aRendererFactory));
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(J2EEConstants.RAR_SHORT_NAME, new ConnectorResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-	
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.RAR_DD_URI_OBJ);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceImpl.java
deleted file mode 100644
index 71cecaf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ConnectorResourceImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.model.translator.connector.ConnectorTranslator;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-public class ConnectorResourceImpl extends XMLResourceImpl implements ConnectorResource{
-
-	/**
-	 * Constructor for ApplicationClientResourceImpl.
-	 * @param uri
-	 * @param aRenderer
-	 */
-	public ConnectorResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-	/**
-	 * Constructor for ApplicationClientResourceImpl.
-	 * @param aRenderer
-	 */
-	public ConnectorResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public Connector getConnector() {
-		return (Connector) getRootObject();
-	}
-
-	
-	public int getType() {
-		return RAR_TYPE;
-	}
-
-
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.CONNECTOR_SYSTEMID_1_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.CONNECTOR_SYSTEMID_1_0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.CONNECTOR_PUBLICID_1_0;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.CONNECTOR_PUBLICID_1_0;
-	}
-
-
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.CONNECTOR_DOCTYPE;
-			default :
-				return null;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setDoctypeValues(java.lang.String, java.lang.String)
-	 * This is setting the module version on the resource.
-	 */
-	public void setDoctypeValues(String publicId, String systemId) {
-		int version = JCA_1_5_ID;
-		if (systemId == null) 
-			version = JCA_1_5_ID;
-		else if (systemId.equals(getJ2EE_1_3_SystemID()))
-			version = JCA_1_0_ID;
-		super.setDoctypeValues(publicId, systemId);
-		super.setVersionID(version);
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (JCA_1_5_ID) :
-					super.setDoctypeValues(null, null);
-					break;
-				case (JCA_1_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-			}
-		syncVersionOfRootObject();
-	}
-		/*
-		 * Based on the J2EE version, this will set the module version
-		 */
-		public void setJ2EEVersionID(int id) {
-		switch (id) {
-			case (J2EE_1_4_ID) :
-						primSetDoctypeValues(null, null);
-						primSetVersionID(JCA_1_5_ID);
-						break;
-			case (J2EE_1_3_ID) :
-						primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-						primSetVersionID(JCA_1_0_ID);
-						break;
-			case (J2EE_1_2_ID) :
-						primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-						primSetVersionID(JCA_1_0_ID);
-				}
-			syncVersionOfRootObject();
-		}
-	/**
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return ConnectorTranslator.INSTANCE;
-	}
-	/* Return J2EE version based on module version
-	 */
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.JCA_1_0_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.JCA_1_5_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return JCA_1_5_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		Connector conn = getConnector();
-		if (conn == null)
-			return;
-	
-		String version = conn.getSpecVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			conn.setSpecVersion(newVersion);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/InboundResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/InboundResourceAdapterImpl.java
deleted file mode 100644
index 8e5a719..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/InboundResourceAdapterImpl.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Inbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.InboundResourceAdapterImpl#getMessageAdapter <em>Message Adapter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InboundResourceAdapterImpl extends EObjectImpl implements InboundResourceAdapter {
-	/**
-	 * The cached value of the '{@link #getMessageAdapter() <em>Message Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected MessageAdapter messageAdapter = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InboundResourceAdapterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getInboundResourceAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageAdapter getMessageAdapter() {
-		return messageAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMessageAdapter(MessageAdapter newMessageAdapter, NotificationChain msgs) {
-		MessageAdapter oldMessageAdapter = messageAdapter;
-		messageAdapter = newMessageAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, oldMessageAdapter, newMessageAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageAdapter(MessageAdapter newMessageAdapter) {
-		if (newMessageAdapter != messageAdapter) {
-			NotificationChain msgs = null;
-			if (messageAdapter != null)
-				msgs = ((InternalEObject)messageAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, null, msgs);
-			if (newMessageAdapter != null)
-				msgs = ((InternalEObject)newMessageAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, null, msgs);
-			msgs = basicSetMessageAdapter(newMessageAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER, newMessageAdapter, newMessageAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-					return basicSetMessageAdapter(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 JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				return getMessageAdapter();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				setMessageAdapter((MessageAdapter)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				setMessageAdapter((MessageAdapter)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER:
-				return messageAdapter != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //InboundResourceAdapterImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaFactoryImpl.java
deleted file mode 100644
index c78f8d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaFactoryImpl.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanismType;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-
-/**
- * @generated
- */
-public class JcaFactoryImpl extends EFactoryImpl implements JcaFactory{
-
-	public JcaFactoryImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JcaPackage.CONNECTOR: return createConnector();
-			case JcaPackage.RESOURCE_ADAPTER: return createResourceAdapter();
-			case JcaPackage.AUTHENTICATION_MECHANISM: return createAuthenticationMechanism();
-			case JcaPackage.CONFIG_PROPERTY: return createConfigProperty();
-			case JcaPackage.SECURITY_PERMISSION: return createSecurityPermission();
-			case JcaPackage.LICENSE: return createLicense();
-			case JcaPackage.INBOUND_RESOURCE_ADAPTER: return createInboundResourceAdapter();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER: return createOutboundResourceAdapter();
-			case JcaPackage.MESSAGE_ADAPTER: return createMessageAdapter();
-			case JcaPackage.CONNECTION_DEFINITION: return createConnectionDefinition();
-			case JcaPackage.ADMIN_OBJECT: return createAdminObject();
-			case JcaPackage.MESSAGE_LISTENER: return createMessageListener();
-			case JcaPackage.ACTIVATION_SPEC: return createActivationSpec();
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE: return createRequiredConfigPropertyType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case JcaPackage.AUTHENTICATION_MECHANISM_TYPE:
-				return AuthenticationMechanismType.get(initialValue);
-			case JcaPackage.TRANSACTION_SUPPORT_KIND:
-				return TransactionSupportKind.get(initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");//$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case JcaPackage.AUTHENTICATION_MECHANISM_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case JcaPackage.TRANSACTION_SUPPORT_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");  //$NON-NLS-1$//$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Connector createConnector() {
-		ConnectorImpl connector = new ConnectorImpl();
-		return connector;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public License createLicense() {
-		LicenseImpl license = new LicenseImpl();
-		return license;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InboundResourceAdapter createInboundResourceAdapter() {
-		InboundResourceAdapterImpl inboundResourceAdapter = new InboundResourceAdapterImpl();
-		return inboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutboundResourceAdapter createOutboundResourceAdapter() {
-		OutboundResourceAdapterImpl outboundResourceAdapter = new OutboundResourceAdapterImpl();
-		return outboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageAdapter createMessageAdapter() {
-		MessageAdapterImpl messageAdapter = new MessageAdapterImpl();
-		return messageAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConnectionDefinition createConnectionDefinition() {
-		ConnectionDefinitionImpl connectionDefinition = new ConnectionDefinitionImpl();
-		return connectionDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AdminObject createAdminObject() {
-		AdminObjectImpl adminObject = new AdminObjectImpl();
-		return adminObject;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MessageListener createMessageListener() {
-		MessageListenerImpl messageListener = new MessageListenerImpl();
-		return messageListener;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationSpec createActivationSpec() {
-		ActivationSpecImpl activationSpec = new ActivationSpecImpl();
-		return activationSpec;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequiredConfigPropertyType createRequiredConfigPropertyType() {
-		RequiredConfigPropertyTypeImpl requiredConfigPropertyType = new RequiredConfigPropertyTypeImpl();
-		return requiredConfigPropertyType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ResourceAdapter createResourceAdapter() {
-		ResourceAdapterImpl resourceAdapter = new ResourceAdapterImpl();
-		return resourceAdapter;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public SecurityPermission createSecurityPermission() {
-		SecurityPermissionImpl securityPermission = new SecurityPermissionImpl();
-		return securityPermission;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public AuthenticationMechanism createAuthenticationMechanism() {
-		AuthenticationMechanismImpl authenticationMechanism = new AuthenticationMechanismImpl();
-		return authenticationMechanism;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ConfigProperty createConfigProperty() {
-		ConfigPropertyImpl configProperty = new ConfigPropertyImpl();
-		return configProperty;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JcaPackage getJcaPackage() {
-		return (JcaPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static JcaPackage getPackage() {
-		return JcaPackage.eINSTANCE;
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaPackageImpl.java
deleted file mode 100644
index 338b474..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/JcaPackageImpl.java
+++ /dev/null
@@ -1,2107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanismType;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-
-
-public class JcaPackageImpl extends EPackageImpl implements JcaPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass resourceAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass authenticationMechanismEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass configPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityPermissionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass licenseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass inboundResourceAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass outboundResourceAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageAdapterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectionDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass adminObjectEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass messageListenerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass activationSpecEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass requiredConfigPropertyTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum authenticationMechanismTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transactionSupportKindEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private JcaPackageImpl() {
-		super(eNS_URI, JcaFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static JcaPackage init() {
-		if (isInited) return (JcaPackage)EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JcaPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theJcaPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theJcaPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-
-		return theJcaPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getConnector() {
-		return connectorEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_VendorName() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_SpecVersion() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_EisType() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConnector_Version() {
-		return (EAttribute)connectorEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getConnector_License() {
-		return (EReference)connectorEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getConnector_ResourceAdapter() {
-		return (EReference)connectorEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLicense() {
-		return licenseEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLicense_Description() {
-		return (EAttribute)licenseEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLicense_Required() {
-		return (EAttribute)licenseEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLicense_Descriptions() {
-		return (EReference)licenseEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInboundResourceAdapter() {
-		return inboundResourceAdapterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getInboundResourceAdapter_MessageAdapter() {
-		return (EReference)inboundResourceAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOutboundResourceAdapter() {
-		return outboundResourceAdapterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutboundResourceAdapter_ReauthenticationSupport() {
-		return (EAttribute)outboundResourceAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getOutboundResourceAdapter_TransactionSupport() {
-		return (EAttribute)outboundResourceAdapterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOutboundResourceAdapter_ConnectionDefinitions() {
-		return (EReference)outboundResourceAdapterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOutboundResourceAdapter_AuthenticationMechanisms() {
-		return (EReference)outboundResourceAdapterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageAdapter() {
-		return messageAdapterEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageAdapter_MessageListeners() {
-		return (EReference)messageAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConnectionDefinition() {
-		return connectionDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ManagedConnectionFactoryClass() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionFactoryInterface() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionFactoryImplClass() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionInterface() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConnectionDefinition_ConnectionImplClass() {
-		return (EAttribute)connectionDefinitionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConnectionDefinition_ConfigProperties() {
-		return (EReference)connectionDefinitionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAdminObject() {
-		return adminObjectEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAdminObject_AdminObjectInterface() {
-		return (EAttribute)adminObjectEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAdminObject_AdminObjectClass() {
-		return (EAttribute)adminObjectEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAdminObject_ConfigProperties() {
-		return (EReference)adminObjectEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMessageListener() {
-		return messageListenerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMessageListener_MessageListenerType() {
-		return (EAttribute)messageListenerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMessageListener_ActivationSpec() {
-		return (EReference)messageListenerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getActivationSpec() {
-		return activationSpecEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getActivationSpec_ActivationSpecClass() {
-		return (EAttribute)activationSpecEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getActivationSpec_RequiredConfigProperties() {
-		return (EReference)activationSpecEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRequiredConfigPropertyType() {
-		return requiredConfigPropertyTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRequiredConfigPropertyType_Name() {
-		return (EAttribute)requiredConfigPropertyTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRequiredConfigPropertyType_Descriptions() {
-		return (EReference)requiredConfigPropertyTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getResourceAdapter() {
-		return resourceAdapterEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ManagedConnectionFactoryClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionFactoryInterface() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionFactoryImplClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionInterface() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ConnectionImplClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_TransactionSupport() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getResourceAdapter_ReauthenticationSupport() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getResourceAdapter_ResourceAdapterClass() {
-		return (EAttribute)resourceAdapterEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceAdapter_SecurityPermissions() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceAdapter_AuthenticationMechanisms() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getResourceAdapter_ConfigProperties() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceAdapter_OutboundResourceAdapter() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceAdapter_InboundResourceAdapter() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getResourceAdapter_AdminObjects() {
-		return (EReference)resourceAdapterEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityPermission() {
-		return securityPermissionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityPermission_Description() {
-		return (EAttribute)securityPermissionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSecurityPermission_Specification() {
-		return (EAttribute)securityPermissionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityPermission_Descriptions() {
-		return (EReference)securityPermissionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getAuthenticationMechanism() {
-		return authenticationMechanismEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_Description() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuthenticationMechanism_AuthenticationMechanism() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_AuthenticationMechanismType() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_CredentialInterface() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getConfigProperty() {
-		return configPropertyEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Description() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Name() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Type() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getConfigProperty_Value() {
-		return (EAttribute)configPropertyEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getConfigProperty_Descriptions() {
-		return (EReference)configPropertyEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransactionSupportKind() {
-		return transactionSupportKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getAuthenticationMechanismType() {
-		return authenticationMechanismTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JcaFactory getJcaFactory() {
-		return (JcaFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		connectorEClass = createEClass(CONNECTOR);
-		createEAttribute(connectorEClass, CONNECTOR__VENDOR_NAME);
-		createEAttribute(connectorEClass, CONNECTOR__SPEC_VERSION);
-		createEAttribute(connectorEClass, CONNECTOR__EIS_TYPE);
-		createEAttribute(connectorEClass, CONNECTOR__VERSION);
-		createEReference(connectorEClass, CONNECTOR__LICENSE);
-		createEReference(connectorEClass, CONNECTOR__RESOURCE_ADAPTER);
-
-		resourceAdapterEClass = createEClass(RESOURCE_ADAPTER);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_INTERFACE);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__TRANSACTION_SUPPORT);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT);
-		createEAttribute(resourceAdapterEClass, RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__SECURITY_PERMISSIONS);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__CONFIG_PROPERTIES);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER);
-		createEReference(resourceAdapterEClass, RESOURCE_ADAPTER__ADMIN_OBJECTS);
-
-		authenticationMechanismEClass = createEClass(AUTHENTICATION_MECHANISM);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__DESCRIPTION);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE);
-		createEAttribute(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE);
-		createEReference(authenticationMechanismEClass, AUTHENTICATION_MECHANISM__DESCRIPTIONS);
-
-		configPropertyEClass = createEClass(CONFIG_PROPERTY);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__DESCRIPTION);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__NAME);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__TYPE);
-		createEAttribute(configPropertyEClass, CONFIG_PROPERTY__VALUE);
-		createEReference(configPropertyEClass, CONFIG_PROPERTY__DESCRIPTIONS);
-
-		securityPermissionEClass = createEClass(SECURITY_PERMISSION);
-		createEAttribute(securityPermissionEClass, SECURITY_PERMISSION__DESCRIPTION);
-		createEAttribute(securityPermissionEClass, SECURITY_PERMISSION__SPECIFICATION);
-		createEReference(securityPermissionEClass, SECURITY_PERMISSION__DESCRIPTIONS);
-
-		licenseEClass = createEClass(LICENSE);
-		createEAttribute(licenseEClass, LICENSE__DESCRIPTION);
-		createEAttribute(licenseEClass, LICENSE__REQUIRED);
-		createEReference(licenseEClass, LICENSE__DESCRIPTIONS);
-
-		inboundResourceAdapterEClass = createEClass(INBOUND_RESOURCE_ADAPTER);
-		createEReference(inboundResourceAdapterEClass, INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER);
-
-		outboundResourceAdapterEClass = createEClass(OUTBOUND_RESOURCE_ADAPTER);
-		createEAttribute(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT);
-		createEAttribute(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT);
-		createEReference(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS);
-		createEReference(outboundResourceAdapterEClass, OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-
-		messageAdapterEClass = createEClass(MESSAGE_ADAPTER);
-		createEReference(messageAdapterEClass, MESSAGE_ADAPTER__MESSAGE_LISTENERS);
-
-		connectionDefinitionEClass = createEClass(CONNECTION_DEFINITION);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_INTERFACE);
-		createEAttribute(connectionDefinitionEClass, CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS);
-		createEReference(connectionDefinitionEClass, CONNECTION_DEFINITION__CONFIG_PROPERTIES);
-
-		adminObjectEClass = createEClass(ADMIN_OBJECT);
-		createEAttribute(adminObjectEClass, ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE);
-		createEAttribute(adminObjectEClass, ADMIN_OBJECT__ADMIN_OBJECT_CLASS);
-		createEReference(adminObjectEClass, ADMIN_OBJECT__CONFIG_PROPERTIES);
-
-		messageListenerEClass = createEClass(MESSAGE_LISTENER);
-		createEAttribute(messageListenerEClass, MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE);
-		createEReference(messageListenerEClass, MESSAGE_LISTENER__ACTIVATION_SPEC);
-
-		activationSpecEClass = createEClass(ACTIVATION_SPEC);
-		createEAttribute(activationSpecEClass, ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS);
-		createEReference(activationSpecEClass, ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES);
-
-		requiredConfigPropertyTypeEClass = createEClass(REQUIRED_CONFIG_PROPERTY_TYPE);
-		createEAttribute(requiredConfigPropertyTypeEClass, REQUIRED_CONFIG_PROPERTY_TYPE__NAME);
-		createEReference(requiredConfigPropertyTypeEClass, REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS);
-
-		// Create enums
-		authenticationMechanismTypeEEnum = createEEnum(AUTHENTICATION_MECHANISM_TYPE);
-		transactionSupportKindEEnum = createEEnum(TRANSACTION_SUPPORT_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		connectorEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(connectorEClass, Connector.class, "Connector", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getConnector_VendorName(), ecorePackage.getEString(), "vendorName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConnector_SpecVersion(), ecorePackage.getEString(), "specVersion", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConnector_EisType(), ecorePackage.getEString(), "eisType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConnector_Version(), ecorePackage.getEString(), "version", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getConnector_License(), this.getLicense(), null, "license", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getConnector_ResourceAdapter(), this.getResourceAdapter(), null, "resourceAdapter", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(resourceAdapterEClass, ResourceAdapter.class, "ResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_ManagedConnectionFactoryClass(), ecorePackage.getEString(), "managedConnectionFactoryClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_ConnectionFactoryInterface(), ecorePackage.getEString(), "connectionFactoryInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_ConnectionFactoryImplClass(), ecorePackage.getEString(), "connectionFactoryImplClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_ConnectionInterface(), ecorePackage.getEString(), "connectionInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_ConnectionImplClass(), ecorePackage.getEString(), "connectionImplClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_TransactionSupport(), this.getTransactionSupportKind(), "transactionSupport", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_ReauthenticationSupport(), ecorePackage.getEBoolean(), "reauthenticationSupport", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getResourceAdapter_ResourceAdapterClass(), ecorePackage.getEString(), "resourceAdapterClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getResourceAdapter_SecurityPermissions(), this.getSecurityPermission(), null, "securityPermissions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getResourceAdapter_AuthenticationMechanisms(), this.getAuthenticationMechanism(), null, "authenticationMechanisms", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getResourceAdapter_ConfigProperties(), this.getConfigProperty(), null, "configProperties", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getResourceAdapter_OutboundResourceAdapter(), this.getOutboundResourceAdapter(), null, "outboundResourceAdapter", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getResourceAdapter_InboundResourceAdapter(), this.getInboundResourceAdapter(), null, "inboundResourceAdapter", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getResourceAdapter_AdminObjects(), this.getAdminObject(), null, "adminObjects", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(authenticationMechanismEClass, AuthenticationMechanism.class, "AuthenticationMechanism", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getAuthenticationMechanism_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getAuthenticationMechanism_AuthenticationMechanism(), ecorePackage.getEString(), "authenticationMechanism", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getAuthenticationMechanism_AuthenticationMechanismType(), this.getAuthenticationMechanismType(), "authenticationMechanismType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getAuthenticationMechanism_CredentialInterface(), ecorePackage.getEString(), "credentialInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getAuthenticationMechanism_CustomAuthMechType(), ecorePackage.getEString(), "customAuthMechType", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getAuthenticationMechanism_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(configPropertyEClass, ConfigProperty.class, "ConfigProperty", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getConfigProperty_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConfigProperty_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConfigProperty_Type(), ecorePackage.getEString(), "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConfigProperty_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getConfigProperty_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(securityPermissionEClass, SecurityPermission.class, "SecurityPermission", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getSecurityPermission_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getSecurityPermission_Specification(), ecorePackage.getEString(), "specification", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getSecurityPermission_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(licenseEClass, License.class, "License", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getLicense_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getLicense_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getLicense_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(inboundResourceAdapterEClass, InboundResourceAdapter.class, "InboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getInboundResourceAdapter_MessageAdapter(), this.getMessageAdapter(), null, "messageAdapter", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(outboundResourceAdapterEClass, OutboundResourceAdapter.class, "OutboundResourceAdapter", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getOutboundResourceAdapter_ReauthenticationSupport(), ecorePackage.getEBoolean(), "reauthenticationSupport", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getOutboundResourceAdapter_TransactionSupport(), this.getTransactionSupportKind(), "transactionSupport", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getOutboundResourceAdapter_ConnectionDefinitions(), this.getConnectionDefinition(), null, "connectionDefinitions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getOutboundResourceAdapter_AuthenticationMechanisms(), this.getAuthenticationMechanism(), null, "authenticationMechanisms", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(messageAdapterEClass, MessageAdapter.class, "MessageAdapter", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getMessageAdapter_MessageListeners(), this.getMessageListener(), null, "messageListeners", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(connectionDefinitionEClass, ConnectionDefinition.class, "ConnectionDefinition", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getConnectionDefinition_ManagedConnectionFactoryClass(), ecorePackage.getEString(), "managedConnectionFactoryClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConnectionDefinition_ConnectionFactoryInterface(), ecorePackage.getEString(), "connectionFactoryInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConnectionDefinition_ConnectionFactoryImplClass(), ecorePackage.getEString(), "connectionFactoryImplClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConnectionDefinition_ConnectionInterface(), ecorePackage.getEString(), "connectionInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getConnectionDefinition_ConnectionImplClass(), ecorePackage.getEString(), "connectionImplClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getConnectionDefinition_ConfigProperties(), this.getConfigProperty(), null, "configProperties", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(adminObjectEClass, AdminObject.class, "AdminObject", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getAdminObject_AdminObjectInterface(), ecorePackage.getEString(), "adminObjectInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getAdminObject_AdminObjectClass(), ecorePackage.getEString(), "adminObjectClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getAdminObject_ConfigProperties(), this.getConfigProperty(), null, "configProperties", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(messageListenerEClass, MessageListener.class, "MessageListener", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getMessageListener_MessageListenerType(), ecorePackage.getEString(), "messageListenerType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getMessageListener_ActivationSpec(), this.getActivationSpec(), null, "activationSpec", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(activationSpecEClass, ActivationSpec.class, "ActivationSpec", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getActivationSpec_ActivationSpecClass(), ecorePackage.getEString(), "activationSpecClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getActivationSpec_RequiredConfigProperties(), this.getRequiredConfigPropertyType(), null, "requiredConfigProperties", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(requiredConfigPropertyTypeEClass, RequiredConfigPropertyType.class, "RequiredConfigPropertyType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getRequiredConfigPropertyType_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getRequiredConfigPropertyType_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(authenticationMechanismTypeEEnum, AuthenticationMechanismType.class, "AuthenticationMechanismType");//$NON-NLS-1$
-		addEEnumLiteral(authenticationMechanismTypeEEnum, AuthenticationMechanismType.BASIC_PASSWORD_LITERAL);//$NON-NLS-1$
-		addEEnumLiteral(authenticationMechanismTypeEEnum, AuthenticationMechanismType.KERBV5_LITERAL);//$NON-NLS-1$
-
-		initEEnum(transactionSupportKindEEnum, TransactionSupportKind.class, "TransactionSupportKind");//$NON-NLS-1$
-		addEEnumLiteral(transactionSupportKindEEnum, TransactionSupportKind.NO_TRANSACTION_LITERAL);
-		addEEnumLiteral(transactionSupportKindEEnum, TransactionSupportKind.LOCAL_TRANSACTION_LITERAL);
-		addEEnumLiteral(transactionSupportKindEEnum, TransactionSupportKind.XA_TRANSACTION_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthenticationMechanism_CustomAuthMechType() {
-		return (EAttribute)authenticationMechanismEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuthenticationMechanism_Descriptions() {
-		return (EReference)authenticationMechanismEClass.getEStructuralFeatures().get(5);
-	}
-
-} //JcaPackageImpl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/LicenseImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/LicenseImpl.java
deleted file mode 100644
index d355761..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/LicenseImpl.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-
-
-/**
- * Specifies licensing requirements for the resource adapter module. Specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of connection restrictions).
- */
-public class LicenseImpl extends EObjectImpl implements License, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRequired()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REQUIRED_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean required = REQUIRED_EDEFAULT;
-	/**
-	 * This is true if the Required attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean requiredESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected LicenseImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getLicense();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.LICENSE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public boolean isRequired() {
-		return required;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRequired(boolean newRequired) {
-		boolean oldRequired = required;
-		required = newRequired;
-		boolean oldRequiredESet = requiredESet;
-		requiredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.LICENSE__REQUIRED, oldRequired, required, !oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRequired() {
-		boolean oldRequired = required;
-		boolean oldRequiredESet = requiredESet;
-		required = REQUIRED_EDEFAULT;
-		requiredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.LICENSE__REQUIRED, oldRequired, REQUIRED_EDEFAULT, oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRequired() {
-		return requiredESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.LICENSE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.LICENSE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 JcaPackage.LICENSE__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.LICENSE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.LICENSE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.LICENSE__REQUIRED:
-				return isSetRequired();
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.LICENSE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.LICENSE__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.LICENSE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.LICENSE__REQUIRED:
-				unsetRequired();
-				return;
-			case JcaPackage.LICENSE__DESCRIPTIONS:
-				getDescriptions().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(" (description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", required: ");//$NON-NLS-1$
-		if (requiredESet) result.append(required); else result.append("<unset>");//$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageAdapterImpl.java
deleted file mode 100644
index 1fc4d16..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageAdapterImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Adapter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.MessageAdapterImpl#getMessageListeners <em>Message Listeners</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageAdapterImpl extends EObjectImpl implements MessageAdapter {
-	/**
-	 * The cached value of the '{@link #getMessageListeners() <em>Message Listeners</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageListeners()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageListeners = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageAdapterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getMessageAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageListeners() {
-		if (messageListeners == null) {
-			messageListeners = new EObjectContainmentEList(MessageListener.class, this, JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS);
-		}
-		return messageListeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-					return ((InternalEList)getMessageListeners()).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 JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				return getMessageListeners();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				getMessageListeners().clear();
-				getMessageListeners().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				getMessageListeners().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS:
-				return messageListeners != null && !messageListeners.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //MessageAdapterImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageListenerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageListenerImpl.java
deleted file mode 100644
index 04cbfbb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/MessageListenerImpl.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Message Listener</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.MessageListenerImpl#getMessageListenerType <em>Message Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.MessageListenerImpl#getActivationSpec <em>Activation Spec</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageListenerImpl extends EObjectImpl implements MessageListener {
-	/**
-	 * The default value of the '{@link #getMessageListenerType() <em>Message Listener Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageListenerType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_LISTENER_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageListenerType() <em>Message Listener Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageListenerType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String messageListenerType = MESSAGE_LISTENER_TYPE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getActivationSpec() <em>Activation Spec</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActivationSpec()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActivationSpec activationSpec = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MessageListenerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getMessageListener();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessageListenerType() {
-		return messageListenerType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessageListenerType(String newMessageListenerType) {
-		String oldMessageListenerType = messageListenerType;
-		messageListenerType = newMessageListenerType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE, oldMessageListenerType, messageListenerType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActivationSpec getActivationSpec() {
-		return activationSpec;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetActivationSpec(ActivationSpec newActivationSpec, NotificationChain msgs) {
-		ActivationSpec oldActivationSpec = activationSpec;
-		activationSpec = newActivationSpec;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, oldActivationSpec, newActivationSpec);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActivationSpec(ActivationSpec newActivationSpec) {
-		if (newActivationSpec != activationSpec) {
-			NotificationChain msgs = null;
-			if (activationSpec != null)
-				msgs = ((InternalEObject)activationSpec).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, null, msgs);
-			if (newActivationSpec != null)
-				msgs = ((InternalEObject)newActivationSpec).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, null, msgs);
-			msgs = basicSetActivationSpec(newActivationSpec, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC, newActivationSpec, newActivationSpec));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-					return basicSetActivationSpec(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 JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				return getMessageListenerType();
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				return getActivationSpec();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				setMessageListenerType((String)newValue);
-				return;
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				setActivationSpec((ActivationSpec)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				setMessageListenerType(MESSAGE_LISTENER_TYPE_EDEFAULT);
-				return;
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				setActivationSpec((ActivationSpec)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE:
-				return MESSAGE_LISTENER_TYPE_EDEFAULT == null ? messageListenerType != null : !MESSAGE_LISTENER_TYPE_EDEFAULT.equals(messageListenerType);
-			case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC:
-				return activationSpec != null;
-		}
-		return 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(" (messageListenerType: ");//$NON-NLS-1$
-		result.append(messageListenerType);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MessageListenerImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/OutboundResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/OutboundResourceAdapterImpl.java
deleted file mode 100644
index 23d107b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/OutboundResourceAdapterImpl.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.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.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Outbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.OutboundResourceAdapterImpl#isReauthenticationSupport <em>Reauthentication Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.OutboundResourceAdapterImpl#getTransactionSupport <em>Transaction Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.OutboundResourceAdapterImpl#getConnectionDefinitions <em>Connection Definitions</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.OutboundResourceAdapterImpl#getAuthenticationMechanisms <em>Authentication Mechanisms</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OutboundResourceAdapterImpl extends EObjectImpl implements OutboundResourceAdapter {
-	/**
-	 * The default value of the '{@link #isReauthenticationSupport() <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REAUTHENTICATION_SUPPORT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isReauthenticationSupport() <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-
-	/**
-	 * This is true if the Reauthentication Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reauthenticationSupportESet = false;
-
-	/**
-	 * The default value of the '{@link #getTransactionSupport() <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionSupportKind TRANSACTION_SUPPORT_EDEFAULT = TransactionSupportKind.NO_TRANSACTION_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getTransactionSupport() <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected TransactionSupportKind transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-
-	/**
-	 * This is true if the Transaction Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionSupportESet = false;
-
-	/**
-	 * The cached value of the '{@link #getConnectionDefinitions() <em>Connection Definitions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionDefinitions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList connectionDefinitions = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthenticationMechanisms() <em>Authentication Mechanisms</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthenticationMechanisms()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList authenticationMechanisms = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OutboundResourceAdapterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getOutboundResourceAdapter();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isReauthenticationSupport() {
-		return reauthenticationSupport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReauthenticationSupport(boolean newReauthenticationSupport) {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		reauthenticationSupport = newReauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, reauthenticationSupport, !oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReauthenticationSupport() {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-		reauthenticationSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, REAUTHENTICATION_SUPPORT_EDEFAULT, oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReauthenticationSupport() {
-		return reauthenticationSupportESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TransactionSupportKind getTransactionSupport() {
-		return transactionSupport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionSupport(TransactionSupportKind newTransactionSupport) {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		transactionSupport = newTransactionSupport == null ? TRANSACTION_SUPPORT_EDEFAULT : newTransactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, transactionSupport, !oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionSupport() {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-		transactionSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, TRANSACTION_SUPPORT_EDEFAULT, oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionSupport() {
-		return transactionSupportESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getConnectionDefinitions() {
-		if (connectionDefinitions == null) {
-			connectionDefinitions = new EObjectContainmentEList(ConnectionDefinition.class, this, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS);
-		}
-		return connectionDefinitions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAuthenticationMechanisms() {
-		if (authenticationMechanisms == null) {
-			authenticationMechanisms = new EObjectContainmentEList(AuthenticationMechanism.class, this, JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-		}
-		return authenticationMechanisms;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-					return ((InternalEList)getConnectionDefinitions()).basicRemove(otherEnd, msgs);
-				case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-					return ((InternalEList)getAuthenticationMechanisms()).basicRemove(otherEnd, msgs);
-				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 JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isReauthenticationSupport() ? Boolean.TRUE : Boolean.FALSE;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return getTransactionSupport();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				return getConnectionDefinitions();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return getAuthenticationMechanisms();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				setReauthenticationSupport(((Boolean)newValue).booleanValue());
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				setTransactionSupport((TransactionSupportKind)newValue);
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				getConnectionDefinitions().clear();
-				getConnectionDefinitions().addAll((Collection)newValue);
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				getAuthenticationMechanisms().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				unsetReauthenticationSupport();
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				unsetTransactionSupport();
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				getConnectionDefinitions().clear();
-				return;
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isSetReauthenticationSupport();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return isSetTransactionSupport();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS:
-				return connectionDefinitions != null && !connectionDefinitions.isEmpty();
-			case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return authenticationMechanisms != null && !authenticationMechanisms.isEmpty();
-		}
-		return 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(" (reauthenticationSupport: ");//$NON-NLS-1$
-		if (reauthenticationSupportESet) result.append(reauthenticationSupport); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", transactionSupport: ");//$NON-NLS-1$
-		if (transactionSupportESet) result.append(transactionSupport); else result.append("<unset>");//$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-} //OutboundResourceAdapterImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/RequiredConfigPropertyTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/RequiredConfigPropertyTypeImpl.java
deleted file mode 100644
index f1b1269..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/RequiredConfigPropertyTypeImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.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.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Required Config Property Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.RequiredConfigPropertyTypeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.impl.RequiredConfigPropertyTypeImpl#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RequiredConfigPropertyTypeImpl extends EObjectImpl implements RequiredConfigPropertyType {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RequiredConfigPropertyTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getRequiredConfigPropertyType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				return getName();
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				setName((String)newValue);
-				return;
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return 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(" (name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RequiredConfigPropertyTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ResourceAdapterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ResourceAdapterImpl.java
deleted file mode 100644
index 015706c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/ResourceAdapterImpl.java
+++ /dev/null
@@ -1,817 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.TransactionSupportKind;
-
-
-/**
- * Specifies information about the resource adapter. The information includes fully-qualified names of class//interfaces required as part of the connector architecture specified contracts, level of transaction support provided, configurable properties for ManagedConnectionFactory instances, one or more authentication mechanisms supported and additional
- * required security permissions.
- * 
- * If there is no authentication-mechanism specified as part of
- * resource adapter element then the resource adapter does not
- * support any standard security authentication mechanisms as part
- * of security contract. The application server ignores the security
- * part of the system contracts in this case.
-
- */
-public class ResourceAdapterImpl extends EObjectImpl implements ResourceAdapter, EObject{
-
-	/**
-	 * The default value of the '{@link #getManagedConnectionFactoryClass() <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String managedConnectionFactoryClass = MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionFactoryInterface() <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionFactoryInterface = CONNECTION_FACTORY_INTERFACE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionFactoryImplClass() <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionFactoryImplClass = CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionInterface() <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionInterface = CONNECTION_INTERFACE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getConnectionImplClass() <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONNECTION_IMPL_CLASS_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String connectionImplClass = CONNECTION_IMPL_CLASS_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getTransactionSupport() <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransactionSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransactionSupportKind TRANSACTION_SUPPORT_EDEFAULT = TransactionSupportKind.NO_TRANSACTION_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransactionSupportKind transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-	/**
-	 * This is true if the Transaction Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transactionSupportESet = false;
-
-	/**
-	 * The default value of the '{@link #isReauthenticationSupport() <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REAUTHENTICATION_SUPPORT_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-	/**
-	 * This is true if the Reauthentication Support attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean reauthenticationSupportESet = false;
-
-	/**
-	 * The default value of the '{@link #getResourceAdapterClass() <em>Resource Adapter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceAdapterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String RESOURCE_ADAPTER_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getResourceAdapterClass() <em>Resource Adapter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResourceAdapterClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String resourceAdapterClass = RESOURCE_ADAPTER_CLASS_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityPermissions = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList authenticationMechanisms = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList configProperties = null;
-	/**
-	 * The cached value of the '{@link #getOutboundResourceAdapter() <em>Outbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected OutboundResourceAdapter outboundResourceAdapter = null;
-
-	/**
-	 * The cached value of the '{@link #getInboundResourceAdapter() <em>Inbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInboundResourceAdapter()
-	 * @generated
-	 * @ordered
-	 */
-	protected InboundResourceAdapter inboundResourceAdapter = null;
-
-	/**
-	 * The cached value of the '{@link #getAdminObjects() <em>Admin Objects</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAdminObjects()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList adminObjects = null;
-
-	protected ResourceAdapterImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getResourceAdapter();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully qualified name of the Java class that implements the javax.resource.spi.Managed-ConnectionFactory interface. This Java class is provided as part of resource adapter's implementation of connector architecture specified contracts.
-
-	 */
-	public String getManagedConnectionFactoryClass() {
-		return managedConnectionFactoryClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setManagedConnectionFactoryClass(String newManagedConnectionFactoryClass) {
-		String oldManagedConnectionFactoryClass = managedConnectionFactoryClass;
-		managedConnectionFactoryClass = newManagedConnectionFactoryClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS, oldManagedConnectionFactoryClass, managedConnectionFactoryClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully-qualified name of the ConnectionFactory interface supported by the resource adapter.
-
-	 */
-	public String getConnectionFactoryInterface() {
-		return connectionFactoryInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionFactoryInterface(String newConnectionFactoryInterface) {
-		String oldConnectionFactoryInterface = connectionFactoryInterface;
-		connectionFactoryInterface = newConnectionFactoryInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE, oldConnectionFactoryInterface, connectionFactoryInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully-qualified name of the ConnectionFactory class that implements resource adapter specific ConnectionFactory interface.
-	 */
-	public String getConnectionFactoryImplClass() {
-		return connectionFactoryImplClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionFactoryImplClass(String newConnectionFactoryImplClass) {
-		String oldConnectionFactoryImplClass = connectionFactoryImplClass;
-		connectionFactoryImplClass = newConnectionFactoryImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS, oldConnectionFactoryImplClass, connectionFactoryImplClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getConnectionInterface() {
-		return connectionInterface;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionInterface(String newConnectionInterface) {
-		String oldConnectionInterface = connectionInterface;
-		connectionInterface = newConnectionInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE, oldConnectionInterface, connectionInterface));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies the fully-qualified name of the Connection interface supported by the resource adapter.
-	 */
-	public String getConnectionImplClass() {
-		return connectionImplClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setConnectionImplClass(String newConnectionImplClass) {
-		String oldConnectionImplClass = connectionImplClass;
-		connectionImplClass = newConnectionImplClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS, oldConnectionImplClass, connectionImplClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transaction-support element specifies the level of transaction
-	 * support provided by the resource adapter.
-	 * The value of transaction-support must be one of the following:
-	 *   NoTransaction
-	 *   LocalTransaction
-	 *   XATransaction
-	 */
-	public TransactionSupportKind getTransactionSupport() {
-		return transactionSupport;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransactionSupport(TransactionSupportKind newTransactionSupport) {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		transactionSupport = newTransactionSupport == null ? TRANSACTION_SUPPORT_EDEFAULT : newTransactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, transactionSupport, !oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransactionSupport() {
-		TransactionSupportKind oldTransactionSupport = transactionSupport;
-		boolean oldTransactionSupportESet = transactionSupportESet;
-		transactionSupport = TRANSACTION_SUPPORT_EDEFAULT;
-		transactionSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT, oldTransactionSupport, TRANSACTION_SUPPORT_EDEFAULT, oldTransactionSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransactionSupport() {
-		return transactionSupportESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Specifies whether the resource adapter implementation supports re-authentication of existing Managed-Connection instance. Note that this information is for the resource adapter implementation and not for the underlying EIS instance.
-	 */
-	public boolean isReauthenticationSupport() {
-		return reauthenticationSupport;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setReauthenticationSupport(boolean newReauthenticationSupport) {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		reauthenticationSupport = newReauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupportESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, reauthenticationSupport, !oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetReauthenticationSupport() {
-		boolean oldReauthenticationSupport = reauthenticationSupport;
-		boolean oldReauthenticationSupportESet = reauthenticationSupportESet;
-		reauthenticationSupport = REAUTHENTICATION_SUPPORT_EDEFAULT;
-		reauthenticationSupportESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT, oldReauthenticationSupport, REAUTHENTICATION_SUPPORT_EDEFAULT, oldReauthenticationSupportESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetReauthenticationSupport() {
-		return reauthenticationSupportESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getResourceAdapterClass() {
-		return resourceAdapterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResourceAdapterClass(String newResourceAdapterClass) {
-		String oldResourceAdapterClass = resourceAdapterClass;
-		resourceAdapterClass = newResourceAdapterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS, oldResourceAdapterClass, resourceAdapterClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityPermissions() {
-		if (securityPermissions == null) {
-			securityPermissions = new EObjectContainmentEList(SecurityPermission.class, this, JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS);
-		}
-		return securityPermissions;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getAuthenticationMechanisms() {
-		if (authenticationMechanisms == null) {
-			authenticationMechanisms = new EObjectContainmentEList(AuthenticationMechanism.class, this, JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS);
-		}
-		return authenticationMechanisms;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getConfigProperties() {
-		if (configProperties == null) {
-			configProperties = new EObjectContainmentEList(ConfigProperty.class, this, JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES);
-		}
-		return configProperties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OutboundResourceAdapter getOutboundResourceAdapter() {
-		return outboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOutboundResourceAdapter(OutboundResourceAdapter newOutboundResourceAdapter, NotificationChain msgs) {
-		OutboundResourceAdapter oldOutboundResourceAdapter = outboundResourceAdapter;
-		outboundResourceAdapter = newOutboundResourceAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, oldOutboundResourceAdapter, newOutboundResourceAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOutboundResourceAdapter(OutboundResourceAdapter newOutboundResourceAdapter) {
-		if (newOutboundResourceAdapter != outboundResourceAdapter) {
-			NotificationChain msgs = null;
-			if (outboundResourceAdapter != null)
-				msgs = ((InternalEObject)outboundResourceAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, null, msgs);
-			if (newOutboundResourceAdapter != null)
-				msgs = ((InternalEObject)newOutboundResourceAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, null, msgs);
-			msgs = basicSetOutboundResourceAdapter(newOutboundResourceAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER, newOutboundResourceAdapter, newOutboundResourceAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InboundResourceAdapter getInboundResourceAdapter() {
-		return inboundResourceAdapter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInboundResourceAdapter(InboundResourceAdapter newInboundResourceAdapter, NotificationChain msgs) {
-		InboundResourceAdapter oldInboundResourceAdapter = inboundResourceAdapter;
-		inboundResourceAdapter = newInboundResourceAdapter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, oldInboundResourceAdapter, newInboundResourceAdapter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInboundResourceAdapter(InboundResourceAdapter newInboundResourceAdapter) {
-		if (newInboundResourceAdapter != inboundResourceAdapter) {
-			NotificationChain msgs = null;
-			if (inboundResourceAdapter != null)
-				msgs = ((InternalEObject)inboundResourceAdapter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, null, msgs);
-			if (newInboundResourceAdapter != null)
-				msgs = ((InternalEObject)newInboundResourceAdapter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, null, msgs);
-			msgs = basicSetInboundResourceAdapter(newInboundResourceAdapter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER, newInboundResourceAdapter, newInboundResourceAdapter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getAdminObjects() {
-		if (adminObjects == null) {
-			adminObjects = new EObjectContainmentEList(AdminObject.class, this, JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS);
-		}
-		return adminObjects;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-					return ((InternalEList)getSecurityPermissions()).basicRemove(otherEnd, msgs);
-				case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-					return ((InternalEList)getAuthenticationMechanisms()).basicRemove(otherEnd, msgs);
-				case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-					return ((InternalEList)getConfigProperties()).basicRemove(otherEnd, msgs);
-				case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-					return basicSetOutboundResourceAdapter(null, msgs);
-				case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-					return basicSetInboundResourceAdapter(null, msgs);
-				case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-					return ((InternalEList)getAdminObjects()).basicRemove(otherEnd, msgs);
-				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 JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				return getManagedConnectionFactoryClass();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				return getConnectionFactoryInterface();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				return getConnectionFactoryImplClass();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				return getConnectionInterface();
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				return getConnectionImplClass();
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return getTransactionSupport();
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isReauthenticationSupport() ? Boolean.TRUE : Boolean.FALSE;
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				return getResourceAdapterClass();
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				return getSecurityPermissions();
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return getAuthenticationMechanisms();
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				return getConfigProperties();
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				return getOutboundResourceAdapter();
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				return getInboundResourceAdapter();
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				return getAdminObjects();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				return MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT == null ? managedConnectionFactoryClass != null : !MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT.equals(managedConnectionFactoryClass);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				return CONNECTION_FACTORY_INTERFACE_EDEFAULT == null ? connectionFactoryInterface != null : !CONNECTION_FACTORY_INTERFACE_EDEFAULT.equals(connectionFactoryInterface);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				return CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT == null ? connectionFactoryImplClass != null : !CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT.equals(connectionFactoryImplClass);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				return CONNECTION_INTERFACE_EDEFAULT == null ? connectionInterface != null : !CONNECTION_INTERFACE_EDEFAULT.equals(connectionInterface);
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				return CONNECTION_IMPL_CLASS_EDEFAULT == null ? connectionImplClass != null : !CONNECTION_IMPL_CLASS_EDEFAULT.equals(connectionImplClass);
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				return isSetTransactionSupport();
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				return isSetReauthenticationSupport();
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				return RESOURCE_ADAPTER_CLASS_EDEFAULT == null ? resourceAdapterClass != null : !RESOURCE_ADAPTER_CLASS_EDEFAULT.equals(resourceAdapterClass);
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				return securityPermissions != null && !securityPermissions.isEmpty();
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				return authenticationMechanisms != null && !authenticationMechanisms.isEmpty();
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				return configProperties != null && !configProperties.isEmpty();
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				return outboundResourceAdapter != null;
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				return inboundResourceAdapter != null;
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				return adminObjects != null && !adminObjects.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				setConnectionInterface((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				setTransactionSupport((TransactionSupportKind)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				setReauthenticationSupport(((Boolean)newValue).booleanValue());
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				setResourceAdapterClass((String)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				getSecurityPermissions().clear();
-				getSecurityPermissions().addAll((Collection)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				getAuthenticationMechanisms().addAll((Collection)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				getConfigProperties().addAll((Collection)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				setOutboundResourceAdapter((OutboundResourceAdapter)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				setInboundResourceAdapter((InboundResourceAdapter)newValue);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				getAdminObjects().clear();
-				getAdminObjects().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS:
-				setManagedConnectionFactoryClass(MANAGED_CONNECTION_FACTORY_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE:
-				setConnectionFactoryInterface(CONNECTION_FACTORY_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS:
-				setConnectionFactoryImplClass(CONNECTION_FACTORY_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE:
-				setConnectionInterface(CONNECTION_INTERFACE_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS:
-				setConnectionImplClass(CONNECTION_IMPL_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT:
-				unsetTransactionSupport();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT:
-				unsetReauthenticationSupport();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS:
-				setResourceAdapterClass(RESOURCE_ADAPTER_CLASS_EDEFAULT);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS:
-				getSecurityPermissions().clear();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS:
-				getAuthenticationMechanisms().clear();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES:
-				getConfigProperties().clear();
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER:
-				setOutboundResourceAdapter((OutboundResourceAdapter)null);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER:
-				setInboundResourceAdapter((InboundResourceAdapter)null);
-				return;
-			case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS:
-				getAdminObjects().clear();
-				return;
-		}
-		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(" (managedConnectionFactoryClass: ");//$NON-NLS-1$
-		result.append(managedConnectionFactoryClass);
-		result.append(", connectionFactoryInterface: ");//$NON-NLS-1$
-		result.append(connectionFactoryInterface);
-		result.append(", connectionFactoryImplClass: ");//$NON-NLS-1$
-		result.append(connectionFactoryImplClass);
-		result.append(", connectionInterface: ");//$NON-NLS-1$
-		result.append(connectionInterface);
-		result.append(", connectionImplClass: ");//$NON-NLS-1$
-		result.append(connectionImplClass);
-		result.append(", transactionSupport: ");//$NON-NLS-1$
-		if (transactionSupportESet) result.append(transactionSupport); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", reauthenticationSupport: ");//$NON-NLS-1$
-		if (reauthenticationSupportESet) result.append(reauthenticationSupport); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", resourceAdapterClass: ");//$NON-NLS-1$
-		result.append(resourceAdapterClass);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/SecurityPermissionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/SecurityPermissionImpl.java
deleted file mode 100644
index 5c90dbb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/impl/SecurityPermissionImpl.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-/**
- * Specifies a security permission that is required by the resource adapter code.
- * 
- * The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission.
-
- */
-public class SecurityPermissionImpl extends EObjectImpl implements SecurityPermission, EObject{
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getSpecification() <em>Specification</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpecification()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SPECIFICATION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String specification = SPECIFICATION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected SecurityPermissionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JcaPackage.eINSTANCE.getSecurityPermission();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.SECURITY_PERMISSION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The element permission-spec specifies a security permission based on the Security policy file syntax. 
-
-	 */
-	public String getSpecification() {
-		return specification;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSpecification(String newSpecification) {
-		String oldSpecification = specification;
-		specification = newSpecification;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JcaPackage.SECURITY_PERMISSION__SPECIFICATION, oldSpecification, specification));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				return getDescription();
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				return getSpecification();
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				return SPECIFICATION_EDEFAULT == null ? specification != null : !SPECIFICATION_EDEFAULT.equals(specification);
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				setSpecification((String)newValue);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__SPECIFICATION:
-				setSpecification(SPECIFICATION_EDEFAULT);
-				return;
-			case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", specification: ");//$NON-NLS-1$
-		result.append(specification);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JCADescriptionHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JCADescriptionHelper.java
deleted file mode 100644
index 1f5eee6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JCADescriptionHelper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.util;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-/**
- * @deprecated
- */
-public class JCADescriptionHelper {
-	public static void setDescription(ConfigProperty property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	public static String getDescription(ConfigProperty property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(SecurityPermission property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	
-	public static String getDescription(SecurityPermission property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(License property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	
-	public static String getDescription(License property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(AuthenticationMechanism property, String description, int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	property.setDescription(description);
-		    	break;
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-		        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-				descriptionObj.setValue(description);
-				property.getDescriptions().add(descriptionObj);
-		    }
-		}
-	}
-	
-	public static String getDescription(AuthenticationMechanism property,int jcaVersionID) {
-		switch(jcaVersionID) {
-		    case J2EEVersionConstants.JCA_1_0_ID: 
-		    	return property.getDescription();
-		    case J2EEVersionConstants.JCA_1_5_ID: {
-				 EList localizedDescriptions = property.getDescriptions();
-				 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-				 	return null;
-			     Description localizedDescription = (Description)localizedDescriptions.get(0);
-			     if(localizedDescription != null)
-			     	return localizedDescription.getValue();
-		    }
-		}
-		return null;
-	}
-	public static void setDescription(RequiredConfigPropertyType property, String description, int jcaVersionID) {
-		if(jcaVersionID == J2EEVersionConstants.JCA_1_5_ID) {
-	        Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
-			descriptionObj.setValue(description);
-			property.getDescriptions().add(descriptionObj);
-	    }
-	}
-	public static String getDescription(RequiredConfigPropertyType property,int jcaVersionID) {
-		if(jcaVersionID == J2EEVersionConstants.JCA_1_5_ID) {
-			 EList localizedDescriptions = property.getDescriptions();
-			 if(localizedDescriptions == null || localizedDescriptions.size() == 0)
-			 	return null;
-		     Description localizedDescription = (Description)localizedDescriptions.get(0);
-		     if(localizedDescription != null)
-		     	return localizedDescription.getValue();
-	    }
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaAdapterFactory.java
deleted file mode 100644
index c82df13..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaAdapterFactory.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-
-public class JcaAdapterFactory extends AdapterFactoryImpl {
-	protected static JcaPackage modelPackage;
-
-	public JcaAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (JcaPackage)EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected JcaSwitch sw = new JcaSwitch() {
-		public Object caseConnector(Connector object) {
-			return createConnectorAdapter();
-		}
-		public Object caseLicense(License object) {
-			return createLicenseAdapter();
-		}
-		public Object caseResourceAdapter(ResourceAdapter object) {
-			return createResourceAdapterAdapter();
-		}
-		public Object caseSecurityPermission(SecurityPermission object) {
-			return createSecurityPermissionAdapter();
-		}
-		public Object caseAuthenticationMechanism(AuthenticationMechanism object) {
-			return createAuthenticationMechanismAdapter();
-		}
-		public Object caseConfigProperty(ConfigProperty object) {
-			return createConfigPropertyAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target); // sw
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createConnectorAdapter() {
-		return null;
-	}
-
-	public Adapter createLicenseAdapter() {
-		return null;
-	}
-
-	public Adapter createResourceAdapterAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityPermissionAdapter() {
-		return null;
-	}
-
-	public Adapter createAuthenticationMechanismAdapter() {
-		return null;
-	}
-
-	public Adapter createConfigPropertyAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JcaSwitch modelSwitch =
-		new JcaSwitch() {
-			public Object caseConnector(Connector object) {
-				return createConnectorAdapter();
-			}
-			public Object caseResourceAdapter(ResourceAdapter object) {
-				return createResourceAdapterAdapter();
-			}
-			public Object caseAuthenticationMechanism(AuthenticationMechanism object) {
-				return createAuthenticationMechanismAdapter();
-			}
-			public Object caseConfigProperty(ConfigProperty object) {
-				return createConfigPropertyAdapter();
-			}
-			public Object caseSecurityPermission(SecurityPermission object) {
-				return createSecurityPermissionAdapter();
-			}
-			public Object caseLicense(License object) {
-				return createLicenseAdapter();
-			}
-			public Object caseInboundResourceAdapter(InboundResourceAdapter object) {
-				return createInboundResourceAdapterAdapter();
-			}
-			public Object caseOutboundResourceAdapter(OutboundResourceAdapter object) {
-				return createOutboundResourceAdapterAdapter();
-			}
-			public Object caseMessageAdapter(MessageAdapter object) {
-				return createMessageAdapterAdapter();
-			}
-			public Object caseConnectionDefinition(ConnectionDefinition object) {
-				return createConnectionDefinitionAdapter();
-			}
-			public Object caseAdminObject(AdminObject object) {
-				return createAdminObjectAdapter();
-			}
-			public Object caseMessageListener(MessageListener object) {
-				return createMessageListenerAdapter();
-			}
-			public Object caseActivationSpec(ActivationSpec object) {
-				return createActivationSpecAdapter();
-			}
-			public Object caseRequiredConfigPropertyType(RequiredConfigPropertyType object) {
-				return createRequiredConfigPropertyTypeAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createConnectorAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLicenseAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter <em>Inbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter
-	 * @generated
-	 */
-	public Adapter createInboundResourceAdapterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter <em>Outbound Resource Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter
-	 * @generated
-	 */
-	public Adapter createOutboundResourceAdapterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.MessageAdapter <em>Message Adapter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.MessageAdapter
-	 * @generated
-	 */
-	public Adapter createMessageAdapterAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition <em>Connection Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition
-	 * @generated
-	 */
-	public Adapter createConnectionDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.AdminObject <em>Admin Object</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AdminObject
-	 * @generated
-	 */
-	public Adapter createAdminObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.MessageListener <em>Message Listener</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.MessageListener
-	 * @generated
-	 */
-	public Adapter createMessageListenerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.ActivationSpec <em>Activation Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.ActivationSpec
-	 * @generated
-	 */
-	public Adapter createActivationSpecAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType <em>Required Config Property Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType
-	 * @generated
-	 */
-	public Adapter createRequiredConfigPropertyTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createResourceAdapterAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityPermissionAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAuthenticationMechanismAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createConfigPropertyAdapterGen() {
-		return null;
-	}
-
-} //JcaAdapterFactory
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaSwitch.java
deleted file mode 100644
index 7249928..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jca/util/JcaSwitch.java
+++ /dev/null
@@ -1,427 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage
- * @generated
- */
-public class JcaSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JcaPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JcaSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JcaPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case JcaPackage.CONNECTOR: {
-					Connector connector = (Connector)theEObject;
-					Object result = caseConnector(connector);
-					if (result == null) result = caseCompatibilityDescriptionGroup(connector);
-					if (result == null) result = caseDescriptionGroup(connector);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.RESOURCE_ADAPTER: {
-					ResourceAdapter resourceAdapter = (ResourceAdapter)theEObject;
-					Object result = caseResourceAdapter(resourceAdapter);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.AUTHENTICATION_MECHANISM: {
-					AuthenticationMechanism authenticationMechanism = (AuthenticationMechanism)theEObject;
-					Object result = caseAuthenticationMechanism(authenticationMechanism);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.CONFIG_PROPERTY: {
-					ConfigProperty configProperty = (ConfigProperty)theEObject;
-					Object result = caseConfigProperty(configProperty);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.SECURITY_PERMISSION: {
-					SecurityPermission securityPermission = (SecurityPermission)theEObject;
-					Object result = caseSecurityPermission(securityPermission);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.LICENSE: {
-					License license = (License)theEObject;
-					Object result = caseLicense(license);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.INBOUND_RESOURCE_ADAPTER: {
-					InboundResourceAdapter inboundResourceAdapter = (InboundResourceAdapter)theEObject;
-					Object result = caseInboundResourceAdapter(inboundResourceAdapter);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.OUTBOUND_RESOURCE_ADAPTER: {
-					OutboundResourceAdapter outboundResourceAdapter = (OutboundResourceAdapter)theEObject;
-					Object result = caseOutboundResourceAdapter(outboundResourceAdapter);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.MESSAGE_ADAPTER: {
-					MessageAdapter messageAdapter = (MessageAdapter)theEObject;
-					Object result = caseMessageAdapter(messageAdapter);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.CONNECTION_DEFINITION: {
-					ConnectionDefinition connectionDefinition = (ConnectionDefinition)theEObject;
-					Object result = caseConnectionDefinition(connectionDefinition);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.ADMIN_OBJECT: {
-					AdminObject adminObject = (AdminObject)theEObject;
-					Object result = caseAdminObject(adminObject);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.MESSAGE_LISTENER: {
-					MessageListener messageListener = (MessageListener)theEObject;
-					Object result = caseMessageListener(messageListener);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.ACTIVATION_SPEC: {
-					ActivationSpec activationSpec = (ActivationSpec)theEObject;
-					Object result = caseActivationSpec(activationSpec);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE: {
-					RequiredConfigPropertyType requiredConfigPropertyType = (RequiredConfigPropertyType)theEObject;
-					Object result = caseRequiredConfigPropertyType(requiredConfigPropertyType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Connector</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Connector</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConnector(Connector object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Resource Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseResourceAdapter(ResourceAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Authentication Mechanism</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Authentication Mechanism</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAuthenticationMechanism(AuthenticationMechanism object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Config Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Config Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConfigProperty(ConfigProperty object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Permission</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Permission</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityPermission(SecurityPermission object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>License</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>License</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLicense(License object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Inbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Inbound Resource Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInboundResourceAdapter(InboundResourceAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Outbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Outbound Resource Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseOutboundResourceAdapter(OutboundResourceAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Adapter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageAdapter(MessageAdapter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Connection Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Connection Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseConnectionDefinition(ConnectionDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Admin Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Admin Object</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAdminObject(AdminObject object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Message Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Message Listener</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMessageListener(MessageListener object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Activation Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Activation Spec</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseActivationSpec(ActivationSpec object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Required Config Property Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Required Config Property Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRequiredConfigPropertyType(RequiredConfigPropertyType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JcaSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/JspPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/JspPackage.java
deleted file mode 100644
index a77765f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/JspPackage.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-
-
-/**
- * <!-- 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.internal.jsp.JspFactory
- * @generated
- */
-public interface JspPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "jsp";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "jsp.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.jsp";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JspPackage eINSTANCE = org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPConfigImpl <em>JSP Config</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jsp.impl.JSPConfigImpl
-	 * @see org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl#getJSPConfig()
-	 * @generated
-	 */
-	int JSP_CONFIG = 0;
-
-	/**
-	 * The feature id for the '<em><b>Tag Libs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG__TAG_LIBS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Property Groups</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG__PROPERTY_GROUPS = 1;
-
-	/**
-	 * The number of structural features of the the '<em>JSP Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_CONFIG_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl <em>JSP Property Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl
-	 * @see org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl#getJSPPropertyGroup()
-	 * @generated
-	 */
-	int JSP_PROPERTY_GROUP = 1;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Url Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__URL_PATTERN = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>El Ignored</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__EL_IGNORED = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Page Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__PAGE_ENCODING = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Scripting Invalid</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__SCRIPTING_INVALID = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Is XML</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__IS_XML = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Include Preludes</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__INCLUDE_PRELUDES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Include Codas</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP__INCLUDE_CODAS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the the '<em>JSP Property Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_PROPERTY_GROUP_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.jsp.impl.TagLibRefTypeImpl <em>Tag Lib Ref Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.jsp.impl.TagLibRefTypeImpl
-	 * @see org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl#getTagLibRefType()
-	 * @generated
-	 */
-	int TAG_LIB_REF_TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Taglib URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_TYPE__TAGLIB_URI = 0;
-
-	/**
-	 * The feature id for the '<em><b>Taglib Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_TYPE__TAGLIB_LOCATION = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Tag Lib Ref Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_TYPE_FEATURE_COUNT = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jsp.JSPConfig <em>JSP Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JSP Config</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPConfig
-	 * @generated
-	 */
-	EClass getJSPConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jsp.JSPConfig#getTagLibs <em>Tag Libs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tag Libs</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPConfig#getTagLibs()
-	 * @see #getJSPConfig()
-	 * @generated
-	 */
-	EReference getJSPConfig_TagLibs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.jsp.JSPConfig#getPropertyGroups <em>Property Groups</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Property Groups</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPConfig#getPropertyGroups()
-	 * @see #getJSPConfig()
-	 * @generated
-	 */
-	EReference getJSPConfig_PropertyGroups();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup <em>JSP Property Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>JSP Property Group</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup
-	 * @generated
-	 */
-	EClass getJSPPropertyGroup();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getUrlPattern <em>Url Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Url Pattern</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getUrlPattern()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>El Ignored</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isElIgnored()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_ElIgnored();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getPageEncoding <em>Page Encoding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Page Encoding</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getPageEncoding()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_PageEncoding();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Scripting Invalid</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isScriptingInvalid()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_ScriptingInvalid();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Is XML</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isIsXML()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_IsXML();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getIncludePreludes <em>Include Preludes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Include Preludes</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getIncludePreludes()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_IncludePreludes();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getIncludeCodas <em>Include Codas</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Include Codas</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getIncludeCodas()
-	 * @see #getJSPPropertyGroup()
-	 * @generated
-	 */
-	EAttribute getJSPPropertyGroup_IncludeCodas();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType <em>Tag Lib Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tag Lib Ref Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.TagLibRefType
-	 * @generated
-	 */
-	EClass getTagLibRefType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibURI <em>Taglib URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Taglib URI</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibURI()
-	 * @see #getTagLibRefType()
-	 * @generated
-	 */
-	EAttribute getTagLibRefType_TaglibURI();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibLocation <em>Taglib Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Taglib Location</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibLocation()
-	 * @see #getTagLibRefType()
-	 * @generated
-	 */
-	EAttribute getTagLibRefType_TaglibLocation();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	JspFactory getJspFactory();
-
-} //JspPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPConfigImpl.java
deleted file mode 100644
index c8b9505..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPConfigImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JSP Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPConfigImpl#getTagLibs <em>Tag Libs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPConfigImpl#getPropertyGroups <em>Property Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JSPConfigImpl extends EObjectImpl implements JSPConfig {
-	/**
-	 * The cached value of the '{@link #getTagLibs() <em>Tag Libs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTagLibs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList tagLibs = null;
-
-	/**
-	 * The cached value of the '{@link #getPropertyGroups() <em>Property Groups</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPropertyGroups()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList propertyGroups = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JSPConfigImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.eINSTANCE.getJSPConfig();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTagLibs() {
-		if (tagLibs == null) {
-			tagLibs = new EObjectContainmentEList(TagLibRefType.class, this, JspPackage.JSP_CONFIG__TAG_LIBS);
-		}
-		return tagLibs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPropertyGroups() {
-		if (propertyGroups == null) {
-			propertyGroups = new EObjectContainmentEList(JSPPropertyGroup.class, this, JspPackage.JSP_CONFIG__PROPERTY_GROUPS);
-		}
-		return propertyGroups;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JspPackage.JSP_CONFIG__TAG_LIBS:
-					return ((InternalEList)getTagLibs()).basicRemove(otherEnd, msgs);
-				case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-					return ((InternalEList)getPropertyGroups()).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 JspPackage.JSP_CONFIG__TAG_LIBS:
-				return getTagLibs();
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				return getPropertyGroups();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				getTagLibs().clear();
-				getTagLibs().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				getPropertyGroups().clear();
-				getPropertyGroups().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				getTagLibs().clear();
-				return;
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				getPropertyGroups().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.JSP_CONFIG__TAG_LIBS:
-				return tagLibs != null && !tagLibs.isEmpty();
-			case JspPackage.JSP_CONFIG__PROPERTY_GROUPS:
-				return propertyGroups != null && !propertyGroups.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //JSPConfigImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPPropertyGroupImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPPropertyGroupImpl.java
deleted file mode 100644
index ca68b9f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JSPPropertyGroupImpl.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>JSP Property Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl#getUrlPattern <em>Url Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl#isElIgnored <em>El Ignored</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl#getPageEncoding <em>Page Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl#isScriptingInvalid <em>Scripting Invalid</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl#isIsXML <em>Is XML</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl#getIncludePreludes <em>Include Preludes</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.JSPPropertyGroupImpl#getIncludeCodas <em>Include Codas</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JSPPropertyGroupImpl extends CompatibilityDescriptionGroupImpl implements JSPPropertyGroup {
-	/**
-	 * The cached value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList urlPattern = null;
-
-	/**
-	 * The default value of the '{@link #isElIgnored() <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElIgnored()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EL_IGNORED_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isElIgnored() <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElIgnored()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean elIgnored = EL_IGNORED_EDEFAULT;
-
-	/**
-	 * This is true if the El Ignored attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean elIgnoredESet = false;
-
-	/**
-	 * The default value of the '{@link #getPageEncoding() <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPageEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PAGE_ENCODING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPageEncoding() <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPageEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String pageEncoding = PAGE_ENCODING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isScriptingInvalid() <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean SCRIPTING_INVALID_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isScriptingInvalid() <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scriptingInvalid = SCRIPTING_INVALID_EDEFAULT;
-
-	/**
-	 * This is true if the Scripting Invalid attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean scriptingInvalidESet = false;
-
-	/**
-	 * The default value of the '{@link #isIsXML() <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsXML()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_XML_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsXML() <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsXML()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isXML = IS_XML_EDEFAULT;
-
-	/**
-	 * This is true if the Is XML attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isXMLESet = false;
-
-	/**
-	 * The cached value of the '{@link #getIncludePreludes() <em>Include Preludes</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludePreludes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includePreludes = null;
-
-	/**
-	 * The cached value of the '{@link #getIncludeCodas() <em>Include Codas</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIncludeCodas()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList includeCodas = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JSPPropertyGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.eINSTANCE.getJSPPropertyGroup();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getUrlPattern() {
-		if (urlPattern == null) {
-			urlPattern = new EDataTypeUniqueEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN);
-		}
-		return urlPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isElIgnored() {
-		return elIgnored;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElIgnored(boolean newElIgnored) {
-		boolean oldElIgnored = elIgnored;
-		elIgnored = newElIgnored;
-		boolean oldElIgnoredESet = elIgnoredESet;
-		elIgnoredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED, oldElIgnored, elIgnored, !oldElIgnoredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetElIgnored() {
-		boolean oldElIgnored = elIgnored;
-		boolean oldElIgnoredESet = elIgnoredESet;
-		elIgnored = EL_IGNORED_EDEFAULT;
-		elIgnoredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED, oldElIgnored, EL_IGNORED_EDEFAULT, oldElIgnoredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetElIgnored() {
-		return elIgnoredESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPageEncoding() {
-		return pageEncoding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPageEncoding(String newPageEncoding) {
-		String oldPageEncoding = pageEncoding;
-		pageEncoding = newPageEncoding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING, oldPageEncoding, pageEncoding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isScriptingInvalid() {
-		return scriptingInvalid;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScriptingInvalid(boolean newScriptingInvalid) {
-		boolean oldScriptingInvalid = scriptingInvalid;
-		scriptingInvalid = newScriptingInvalid;
-		boolean oldScriptingInvalidESet = scriptingInvalidESet;
-		scriptingInvalidESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID, oldScriptingInvalid, scriptingInvalid, !oldScriptingInvalidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetScriptingInvalid() {
-		boolean oldScriptingInvalid = scriptingInvalid;
-		boolean oldScriptingInvalidESet = scriptingInvalidESet;
-		scriptingInvalid = SCRIPTING_INVALID_EDEFAULT;
-		scriptingInvalidESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID, oldScriptingInvalid, SCRIPTING_INVALID_EDEFAULT, oldScriptingInvalidESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetScriptingInvalid() {
-		return scriptingInvalidESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsXML() {
-		return isXML;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsXML(boolean newIsXML) {
-		boolean oldIsXML = isXML;
-		isXML = newIsXML;
-		boolean oldIsXMLESet = isXMLESet;
-		isXMLESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.JSP_PROPERTY_GROUP__IS_XML, oldIsXML, isXML, !oldIsXMLESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetIsXML() {
-		boolean oldIsXML = isXML;
-		boolean oldIsXMLESet = isXMLESet;
-		isXML = IS_XML_EDEFAULT;
-		isXMLESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, JspPackage.JSP_PROPERTY_GROUP__IS_XML, oldIsXML, IS_XML_EDEFAULT, oldIsXMLESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetIsXML() {
-		return isXMLESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getIncludePreludes() {
-		if (includePreludes == null) {
-			includePreludes = new EDataTypeUniqueEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
-		}
-		return includePreludes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getIncludeCodas() {
-		if (includeCodas == null) {
-			includeCodas = new EDataTypeUniqueEList(String.class, this, JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS);
-		}
-		return includeCodas;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				return getIcons();
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				return getDescriptions();
-			case JspPackage.JSP_PROPERTY_GROUP__SMALL_ICON:
-				return getSmallIcon();
-			case JspPackage.JSP_PROPERTY_GROUP__LARGE_ICON:
-				return getLargeIcon();
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTION:
-				return getDescription();
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAME:
-				return getDisplayName();
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				return getUrlPattern();
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				return isElIgnored() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				return getPageEncoding();
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				return isScriptingInvalid() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				return isIsXML() ? Boolean.TRUE : Boolean.FALSE;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				return getIncludePreludes();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				return getIncludeCodas();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				getUrlPattern().clear();
-				getUrlPattern().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				setElIgnored(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				setPageEncoding((String)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				setScriptingInvalid(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				setIsXML(((Boolean)newValue).booleanValue());
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				getIncludePreludes().clear();
-				getIncludePreludes().addAll((Collection)newValue);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				getIncludeCodas().clear();
-				getIncludeCodas().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				getIcons().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				getUrlPattern().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				unsetElIgnored();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				setPageEncoding(PAGE_ENCODING_EDEFAULT);
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				unsetScriptingInvalid();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				unsetIsXML();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				getIncludePreludes().clear();
-				return;
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				getIncludeCodas().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.JSP_PROPERTY_GROUP__ICONS:
-				return icons != null && !icons.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case JspPackage.JSP_PROPERTY_GROUP__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case JspPackage.JSP_PROPERTY_GROUP__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case JspPackage.JSP_PROPERTY_GROUP__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN:
-				return urlPattern != null && !urlPattern.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED:
-				return isSetElIgnored();
-			case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING:
-				return PAGE_ENCODING_EDEFAULT == null ? pageEncoding != null : !PAGE_ENCODING_EDEFAULT.equals(pageEncoding);
-			case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID:
-				return isSetScriptingInvalid();
-			case JspPackage.JSP_PROPERTY_GROUP__IS_XML:
-				return isSetIsXML();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES:
-				return includePreludes != null && !includePreludes.isEmpty();
-			case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS:
-				return includeCodas != null && !includeCodas.isEmpty();
-		}
-		return 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(" (urlPattern: ");//$NON-NLS-1$
-		result.append(urlPattern);
-		result.append(", elIgnored: ");//$NON-NLS-1$
-		if (elIgnoredESet) result.append(elIgnored); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", pageEncoding: ");//$NON-NLS-1$
-		result.append(pageEncoding);
-		result.append(", scriptingInvalid: ");//$NON-NLS-1$
-		if (scriptingInvalidESet) result.append(scriptingInvalid); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", isXML: ");//$NON-NLS-1$
-		if (isXMLESet) result.append(isXML); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", includePreludes: ");//$NON-NLS-1$
-		result.append(includePreludes);
-		result.append(", includeCodas: ");//$NON-NLS-1$
-		result.append(includeCodas);
-		result.append(')');
-		return result.toString();
-	}
-
-} //JSPPropertyGroupImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspFactoryImpl.java
deleted file mode 100644
index ebd3d57..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspFactoryImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JspFactoryImpl extends EFactoryImpl implements JspFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case JspPackage.JSP_CONFIG: return createJSPConfig();
-			case JspPackage.JSP_PROPERTY_GROUP: return createJSPPropertyGroup();
-			case JspPackage.TAG_LIB_REF_TYPE: return createTagLibRefType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JSPConfig createJSPConfig() {
-		JSPConfigImpl jspConfig = new JSPConfigImpl();
-		return jspConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JSPPropertyGroup createJSPPropertyGroup() {
-		JSPPropertyGroupImpl jspPropertyGroup = new JSPPropertyGroupImpl();
-		return jspPropertyGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TagLibRefType createTagLibRefType() {
-		TagLibRefTypeImpl tagLibRefType = new TagLibRefTypeImpl();
-		return tagLibRefType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspPackage getJspPackage() {
-		return (JspPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static JspPackage getPackage() {
-		return JspPackage.eINSTANCE;
-	}
-} //JspFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspPackageImpl.java
deleted file mode 100644
index f01516f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/JspPackageImpl.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JspPackageImpl extends EPackageImpl implements JspPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspPropertyGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagLibRefTypeEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private JspPackageImpl() {
-		super(eNS_URI, JspFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static JspPackage init() {
-		if (isInited) return (JspPackage)EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JspPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theJspPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theJspPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-
-		return theJspPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJSPConfig() {
-		return jspConfigEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPConfig_TagLibs() {
-		return (EReference)jspConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPConfig_PropertyGroups() {
-		return (EReference)jspConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getJSPPropertyGroup() {
-		return jspPropertyGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_UrlPattern() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_ElIgnored() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_PageEncoding() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_ScriptingInvalid() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_IsXML() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_IncludePreludes() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPPropertyGroup_IncludeCodas() {
-		return (EAttribute)jspPropertyGroupEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTagLibRefType() {
-		return tagLibRefTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagLibRefType_TaglibURI() {
-		return (EAttribute)tagLibRefTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagLibRefType_TaglibLocation() {
-		return (EAttribute)tagLibRefTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspFactory getJspFactory() {
-		return (JspFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		jspConfigEClass = createEClass(JSP_CONFIG);
-		createEReference(jspConfigEClass, JSP_CONFIG__TAG_LIBS);
-		createEReference(jspConfigEClass, JSP_CONFIG__PROPERTY_GROUPS);
-
-		jspPropertyGroupEClass = createEClass(JSP_PROPERTY_GROUP);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__URL_PATTERN);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__EL_IGNORED);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__PAGE_ENCODING);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__SCRIPTING_INVALID);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__IS_XML);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__INCLUDE_PRELUDES);
-		createEAttribute(jspPropertyGroupEClass, JSP_PROPERTY_GROUP__INCLUDE_CODAS);
-
-		tagLibRefTypeEClass = createEClass(TAG_LIB_REF_TYPE);
-		createEAttribute(tagLibRefTypeEClass, TAG_LIB_REF_TYPE__TAGLIB_URI);
-		createEAttribute(tagLibRefTypeEClass, TAG_LIB_REF_TYPE__TAGLIB_LOCATION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		jspPropertyGroupEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(jspConfigEClass, JSPConfig.class, "JSPConfig", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getJSPConfig_TagLibs(), this.getTagLibRefType(), null, "tagLibs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPConfig_PropertyGroups(), this.getJSPPropertyGroup(), null, "propertyGroups", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(jspPropertyGroupEClass, JSPPropertyGroup.class, "JSPPropertyGroup", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getJSPPropertyGroup_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPPropertyGroup_ElIgnored(), ecorePackage.getEBoolean(), "elIgnored", "true", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getJSPPropertyGroup_PageEncoding(), ecorePackage.getEString(), "pageEncoding", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPPropertyGroup_ScriptingInvalid(), ecorePackage.getEBoolean(), "scriptingInvalid", "true", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getJSPPropertyGroup_IsXML(), ecorePackage.getEBoolean(), "isXML", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getJSPPropertyGroup_IncludePreludes(), ecorePackage.getEString(), "includePreludes", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPPropertyGroup_IncludeCodas(), ecorePackage.getEString(), "includeCodas", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(tagLibRefTypeEClass, TagLibRefType.class, "TagLibRefType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getTagLibRefType_TaglibURI(), ecorePackage.getEString(), "taglibURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getTagLibRefType_TaglibLocation(), ecorePackage.getEString(), "taglibLocation", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //JspPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/TagLibRefTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/TagLibRefTypeImpl.java
deleted file mode 100644
index fa47cd5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/impl/TagLibRefTypeImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tag Lib Ref Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.TagLibRefTypeImpl#getTaglibURI <em>Taglib URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.impl.TagLibRefTypeImpl#getTaglibLocation <em>Taglib Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TagLibRefTypeImpl extends EObjectImpl implements TagLibRefType {
-	/**
-	 * The default value of the '{@link #getTaglibURI() <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibURI() <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String taglibURI = TAGLIB_URI_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_LOCATION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected String taglibLocation = TAGLIB_LOCATION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TagLibRefTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return JspPackage.eINSTANCE.getTagLibRefType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTaglibURI() {
-		return taglibURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaglibURI(String newTaglibURI) {
-		String oldTaglibURI = taglibURI;
-		taglibURI = newTaglibURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI, oldTaglibURI, taglibURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTaglibLocation() {
-		return taglibLocation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTaglibLocation(String newTaglibLocation) {
-		String oldTaglibLocation = taglibLocation;
-		taglibLocation = newTaglibLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION, oldTaglibLocation, taglibLocation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				return getTaglibURI();
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				return getTaglibLocation();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				setTaglibURI((String)newValue);
-				return;
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				setTaglibLocation((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				setTaglibURI(TAGLIB_URI_EDEFAULT);
-				return;
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				setTaglibLocation(TAGLIB_LOCATION_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI:
-				return TAGLIB_URI_EDEFAULT == null ? taglibURI != null : !TAGLIB_URI_EDEFAULT.equals(taglibURI);
-			case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION:
-				return TAGLIB_LOCATION_EDEFAULT == null ? taglibLocation != null : !TAGLIB_LOCATION_EDEFAULT.equals(taglibLocation);
-		}
-		return 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(" (taglibURI: ");//$NON-NLS-1$
-		result.append(taglibURI);
-		result.append(", taglibLocation: ");//$NON-NLS-1$
-		result.append(taglibLocation);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TagLibRefTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspAdapterFactory.java
deleted file mode 100644
index b703872..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspAdapterFactory.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage
- * @generated
- */
-public class JspAdapterFactory extends AdapterFactoryImpl
-{
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JspPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = JspPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected JspSwitch modelSwitch =
-		new JspSwitch() {
-			public Object caseJSPConfig(JSPConfig object) {
-				return createJSPConfigAdapter();
-			}
-			public Object caseJSPPropertyGroup(JSPPropertyGroup object) {
-				return createJSPPropertyGroupAdapter();
-			}
-			public Object caseTagLibRefType(TagLibRefType object) {
-				return createTagLibRefTypeAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jsp.JSPConfig <em>JSP Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPConfig
-	 * @generated
-	 */
-	public Adapter createJSPConfigAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup <em>JSP Property Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup
-	 * @generated
-	 */
-	public Adapter createJSPPropertyGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType <em>Tag Lib Ref Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.TagLibRefType
-	 * @generated
-	 */
-	public Adapter createTagLibRefTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //JspAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspSwitch.java
deleted file mode 100644
index 06ad9d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/jsp/util/JspSwitch.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jsp.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage
- * @generated
- */
-public class JspSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static JspPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JspSwitch() {
-		if (modelPackage == null) {
-			modelPackage = JspPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case JspPackage.JSP_CONFIG: {
-					JSPConfig jspConfig = (JSPConfig)theEObject;
-					Object result = caseJSPConfig(jspConfig);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JspPackage.JSP_PROPERTY_GROUP: {
-					JSPPropertyGroup jspPropertyGroup = (JSPPropertyGroup)theEObject;
-					Object result = caseJSPPropertyGroup(jspPropertyGroup);
-					if (result == null) result = caseCompatibilityDescriptionGroup(jspPropertyGroup);
-					if (result == null) result = caseDescriptionGroup(jspPropertyGroup);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case JspPackage.TAG_LIB_REF_TYPE: {
-					TagLibRefType tagLibRefType = (TagLibRefType)theEObject;
-					Object result = caseTagLibRefType(tagLibRefType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JSP Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JSP Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJSPConfig(JSPConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JSP Property Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JSP Property Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJSPPropertyGroup(JSPPropertyGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tag Lib Ref Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tag Lib Ref Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTagLibRefType(TagLibRefType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //JspSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/Connector14SpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/Connector14SpecificationMigrator.java
deleted file mode 100644
index ec4cea2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/Connector14SpecificationMigrator.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
- *******************************************************************************/
-/*
- * Created on Mar 31, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.migration;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanismType;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-
-/** 
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class Connector14SpecificationMigrator {
-	/**
-	 * @param connector
-	 */
-	public J2EEMigrationStatus migrateConnectorTo14(Connector connector) {
-		 migrateResourceAdaptor(connector);
-		 return new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK,(
-		 	new J2EEMigrationStatus()).format(J2EESpecificationMigrationConstants.DEFAULT_COMPLETED_STATUS_MSG,connector.getDisplayName()));
-	}
-	
-	/**
-	 * @param connector
-	 */
-	private void migrateResourceAdaptor(Connector connector) {
-		ResourceAdapter resAdaptor = connector.getResourceAdapter();
-		if(resAdaptor != null) {
-			OutboundResourceAdapter  outboundAdaptor = JcaFactory.eINSTANCE.createOutboundResourceAdapter();
-			outboundAdaptor.setReauthenticationSupport(resAdaptor.isReauthenticationSupport());
-			outboundAdaptor.setTransactionSupport(resAdaptor.getTransactionSupport());
-			
-			ConnectionDefinition connDefinition = JcaFactory.eINSTANCE.createConnectionDefinition();
-			connDefinition.setManagedConnectionFactoryClass(resAdaptor.getManagedConnectionFactoryClass());
-			connDefinition.setConnectionFactoryInterface(resAdaptor.getConnectionFactoryInterface());
-			connDefinition.setConnectionFactoryImplClass(resAdaptor.getConnectionFactoryImplClass());
-			connDefinition.setConnectionInterface(resAdaptor.getConnectionInterface());
-			connDefinition.setConnectionImplClass(resAdaptor.getConnectionImplClass());
-			
-			outboundAdaptor.getConnectionDefinitions().add(connDefinition);
-
-			resAdaptor.setOutboundResourceAdapter(outboundAdaptor);
-			
-			migrateAuthenticationMechanism(resAdaptor);
-			
-			migrateDescriptions(resAdaptor);
-			
-		}
-	}
-	/**
-	 * @param resAdaptor
-	 */
-	private void migrateDescriptions(ResourceAdapter resAdaptor) {
-		List secPermissions = resAdaptor.getSecurityPermissions();
-		if(!secPermissions.isEmpty()) {
-			for(int i = 0; i < secPermissions.size(); i++) {
-				SecurityPermission secPerm = (SecurityPermission)secPermissions.get(i);
-				String secDescription = secPerm.getDescription();
-				if(secDescription != null && secDescription.length() > 0) {
-					Description description = CommonFactory.eINSTANCE.createDescription();
-					description.setValue(secDescription);
-					secPerm.getDescriptions().add(description);
-				}
-				
-			}
-		}
-		List authMechanisms = resAdaptor.getAuthenticationMechanisms();
-		if(!authMechanisms.isEmpty()) {
-			for(int i = 0 ; i < authMechanisms.size(); i++) {
-				AuthenticationMechanism authMech = (AuthenticationMechanism)authMechanisms.get(i);
-				String authDescrition = authMech.getDescription();
-				if(authDescrition != null && authDescrition.length() > 0) {
-					Description description = CommonFactory.eINSTANCE.createDescription();
-					description.setValue(authDescrition);
-					authMech.getDescriptions().add(description);
-				}
-			}
-		}
-		List configProps = resAdaptor.getConfigProperties();
-		if(!configProps.isEmpty()) {
-			for(int i = 0; i < configProps.size(); i++) {
-				ConfigProperty configProp = (ConfigProperty)configProps.get(i);
-				String configDescription = configProp.getDescription();
-				if(configDescription != null && configDescription.length() > 0) {
-					Description description = CommonFactory.eINSTANCE.createDescription();
-					description.setValue(configDescription);
-					configProp.getDescriptions().add(description);
-				}
-			}
-		}
-	}
-	/**
-	 * @param resAdaptor
-	 */
-	private void migrateAuthenticationMechanism(ResourceAdapter resAdaptor) {
-		List authMechanisms = resAdaptor.getAuthenticationMechanisms();
-		for (int i = 0; i < authMechanisms.size(); i++) {
-			AuthenticationMechanism authMech = (AuthenticationMechanism)authMechanisms.get(i);
-			AuthenticationMechanismType authType = authMech.getAuthenticationMechanismType();
-			if(authType != null) {
-				authMech.setAuthenticationMechanism(authType.getName());
-			} else {
-				String customAuth = authMech.getCustomAuthMechType();
-				if(customAuth != null && customAuth.length() > 0) {
-					authMech.setAuthenticationMechanism(customAuth);
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationMultiStatus.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationMultiStatus.java
deleted file mode 100644
index fef91fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationMultiStatus.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.internal.migration;
-
-/**
- * @author DABERG
- */
-public class J2EEMigrationMultiStatus extends J2EEMigrationStatus {
-	private J2EEMigrationStatus[] children = new J2EEMigrationStatus[0];
-
-	public void add(J2EEMigrationStatus status) {
-		J2EEMigrationStatus[] result =
-			new J2EEMigrationStatus[children.length + 1];
-		System.arraycopy(children, 0, result, 0, children.length);
-		result[result.length - 1] = status;
-		children = result;
-		int newSev = status.getSeverity();
-		int currentSev = getSeverity();
-		/* If all the statuses are NOT_NEEDED OR NOT_POSSIBLE, you want the combined status to be the highest severity
-		 * however, if all but one status are NOT_NEEDED or NOT_POSSIBLE, and one status completed, then the combined status
-		 * should be OK.  If there is a warning or error, then they take precedence
-		 */
-		if (children.length == 1)
-			setSeverity(newSev);
-		else if (currentSev > COMPLETED_OK && currentSev < WARNING && newSev == COMPLETED_OK)
-			setSeverity(newSev);
-		else if (newSev > currentSev && (currentSev != COMPLETED_OK || newSev >= WARNING) )
-			setSeverity(newSev);
-
-	}
-	/**
-	 * Adds all of the children of the given status to this multi-status.
-	 * Does nothing if the given status has no children (which includes
-	 * the case where it is not a multi-status).
-	 *
-	 * @param status the status whose children are to be added to this one
-	 */
-	public void addAll(J2EEMigrationStatus status) {
-		if (status == null)
-			return;
-		J2EEMigrationStatus[] statuses = status.getChildren();
-		for (int i = 0; i < statuses.length; i++) {
-			add(statuses[i]);
-		}
-	}
-
-	public J2EEMigrationStatus[] getChildren() {
-		return children;
-	}
-
-	public boolean isMultiStatus() {
-		return true;
-	}
-	/**
-	 * Merges the given status into this multi-status.
-	 * Equivalent to <code>add(status)</code> if the
-	 * given status is not a multi-status. 
-	 * Equivalent to <code>addAll(status)</code> if the
-	 * given status is a multi-status. 
-	 *
-	 * @param status the status to merge into this one
-	 * @see #add
-	 * @see #addAll
-	 */
-	public void merge(J2EEMigrationStatus status) {
-		if (status == null)
-			return;
-		if (!status.isMultiStatus()) {
-			add(status);
-		} else {
-			addAll(status);
-		}
-	}
-	/**
-	 * Returns a string representation of the status, suitable 
-	 * for debugging purposes only.
-	 */
-	public String toString() {
-		StringBuffer buf = new StringBuffer(super.toString());
-		buf.append(" children={"); //$NON-NLS-1$
-		for (int i = 0; i < children.length; i++) {
-			if (i != 0) {
-				buf.append("\n"); //$NON-NLS-1$
-			}
-			buf.append(children[i].toString());
-		}
-		buf.append("}"); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	/**
-	 * @see com.ibm.ejs.models.base.extensions.helper.J2EEMigrationStatus#append(J2EEMigrationStatus)
-	 */
-	public J2EEMigrationStatus append(J2EEMigrationStatus aStatus) {
-		if (aStatus != null)
-			merge(aStatus);
-		return this;
-	}
-	
-	public boolean isEmpty() {
-		return children.length == 0;
-	}
-
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationStatus.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationStatus.java
deleted file mode 100644
index ca904f1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EEMigrationStatus.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.migration;
-
-import java.text.MessageFormat;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-
-/**
- * @author DABERG
- *
- */
-public class J2EEMigrationStatus implements J2EESpecificationMigrationConstants { 
-    
-	public static final int COMPLETED_OK = 0;
-	public static final int NOT_NEEDED = 1;
-	public static final int NOT_POSSIBLE = 2;
-	public static final int WARNING = 3;
-	public static final int ERROR = 4; 
-
-    public static final J2EEMigrationStatus OK_STATUS = new J2EEMigrationStatus(COMPLETED_OK, ""); //$NON-NLS-1$
-
-	private static final J2EEMigrationStatus[] EmptyStatusArray = new J2EEMigrationStatus[0];
-
-	private int severity;
-	private String message;
-	private XMLResource resource;
-	private EObject targetObject;
-	
-	J2EEMigrationStatus() {
-		//Default
-	}
-
-	public J2EEMigrationStatus(int aSeverity, String aMessage) {
-		this(aSeverity, (EObject)null, aMessage);
-	}
-	public J2EEMigrationStatus(int aSeverity, XMLResource xmlResource) {
-		this(aSeverity, xmlResource, null);
-	}
-	
-	public J2EEMigrationStatus(int aSeverity, EObject anObject) {
-		this(aSeverity, anObject, null);
-	}
-
-	public J2EEMigrationStatus(int aSeverity, XMLResource xmlResource, String aMessage) {
-		severity = aSeverity;
-		resource = xmlResource;
-		message = aMessage;
-	}
-	
-	public J2EEMigrationStatus(int aSeverity, EObject anObject, String aMessage) {
-		severity = aSeverity;
-		targetObject = anObject;
-		message = aMessage;
-	}
-	
-	protected String format(String aPattern, String arg1) {
-		return MessageFormat.format(aPattern, new String[]{arg1});
-	}
-	
-	/**
-	 * Returns the message.
-	 * @return String
-	 */
-	public String getMessage() {
-		if (message == null)
-			message = createDefaultMessage();
-		return message;
-	}
-	
-	public String getMessageForDisplay() {
-		return getSeverityText()+" "+getMessage(); //$NON-NLS-1$
-	}
-	
-	protected String getSeverityText() {
-		switch (severity) {
-			case ERROR:
-				return ERROR_TEXT;
-			case WARNING:
-				return WARNING_TEXT;
-			case NOT_NEEDED:
-			case NOT_POSSIBLE:
-				return INFO_TEXT;
-			default:
-				return ""; //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Method createDefaultMessage.
-	 * @return String
-	 */
-	private String createDefaultMessage() {
-		String objDesc;
-		if (getResource() != null)
-			objDesc = getResource().getURI().toString();
-		else if (getTargetObject() != null && getTargetObject() instanceof ENamedElement)
-			objDesc = ((ENamedElement) getTargetObject()).getName();
-		else
-			return null;
-		switch (getSeverity()) {
-			case COMPLETED_OK :
-				return format(DEFAULT_COMPLETED_STATUS_MSG, objDesc);
-			case NOT_NEEDED :
-				return format(DEFAULT_NOT_NEEDED_STATUS_MSG, objDesc);
-			case NOT_POSSIBLE :
-				return format(DEFAULT_NOT_POSSIBLE_STATUS_MSG, objDesc);
-			case ERROR :
-				return format(DEFAULT_ERROR_STATUS_MSG, objDesc);
-		}
-		return null;
-	}
-
-
-	/**
-	 * Sets the message.
-	 * @param message The message to set
-	 */
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	/**
-	 * The migration was completed fine or was not needed.
-	 */
-	public boolean isOK() {
-		return severity == COMPLETED_OK || severity == NOT_NEEDED;
-	}
-
-	/**
-	 * An error ocurred during migration.
-	 */
-	public boolean isError() {
-		return severity == ERROR;
-	}
-	
-	/**
-	 * A warning ocurred during migration.
-	 */
-	public boolean isWarning() {
-		return severity == WARNING;
-	}
-
-	/**
-	 * The migration was not required.
-	 */
-	public boolean isNotNeeded() {
-		return severity == NOT_NEEDED;
-	}
-	/**
-	 * The migration was not possible.
-	 */
-	public boolean isNotPossible() {
-		return severity == NOT_POSSIBLE;
-	}
-	/**
-	 * Returns the severity.
-	 * @return int
-	 */
-	public int getSeverity() {
-		return severity;
-	}
-
-	/**
-	 * Sets the severity.
-	 * @param severity The severity to set
-	 */
-	public void setSeverity(int severity) {
-		this.severity = severity;
-	}
-
-	public J2EEMigrationStatus[] getChildren() {
-		return EmptyStatusArray;
-	}
-
-	public boolean isMultiStatus() {
-		return false;
-	}
-	public XMLResource getResource() {
-		return resource;
-	}
-	public EObject getTargetObject() {
-		return targetObject;
-	}
-
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		buf.append("MigrationStatus "); //$NON-NLS-1$
-		if (severity == COMPLETED_OK) {
-			buf.append("Completed OK"); //$NON-NLS-1$
-		} else if (severity == ERROR) {
-			buf.append("ERROR"); //$NON-NLS-1$
-		} else if (severity == WARNING) {
-			buf.append("WARNING"); //$NON-NLS-1$
-		} else if (severity == NOT_NEEDED) {
-			buf.append("Not Needed"); //$NON-NLS-1$
-		} else if (severity == NOT_POSSIBLE) {
-			buf.append("Not Possible"); //$NON-NLS-1$
-		} else {
-			buf.append("severity="); //$NON-NLS-1$
-			buf.append(severity);
-		}
-		buf.append(' ');
-		buf.append(message);
-		return buf.toString();
-	}
-	
-	/**
-	 * Append the paramater to this status, and return the resultant status;
-	 * clients must be careful to set their cached status to the return value, 
-	 * as it may be a new instance.
-	 */
-	public J2EEMigrationStatus append(J2EEMigrationStatus aStatus) {
-		if (aStatus == null)
-			return this;
-		J2EEMigrationMultiStatus multi = new J2EEMigrationMultiStatus();
-		multi.merge(this);
-		multi.merge(aStatus);
-		return multi;
-	}
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrationConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrationConstants.java
deleted file mode 100644
index e351b55..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrationConstants.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.internal.migration;
-
-import org.eclipse.jst.j2ee.internal.MOFJ2EEResourceHandler;
-
-
-public interface J2EESpecificationMigrationConstants {
-	String J2EE_VERSION_1_2 = "J2EE_1.2";  //$NON-NLS-1$
-	String J2EE_VERSION_1_3 = "J2EE_1.3";  //$NON-NLS-1$
-	String J2EE_VERSION_1_4 = "J2EE_1.4";  //$NON-NLS-1$
-
-	String DEFAULT_COMPLETED_STATUS_MSG = MOFJ2EEResourceHandler.getString("DEFAULT_COMPLETED_STATUS_MSG"); //$NON-NLS-1$
-	String DEFAULT_NOT_NEEDED_STATUS_MSG = MOFJ2EEResourceHandler.getString("DEFAULT_NOT_NEEDED_STATUS_MSG"); //$NON-NLS-1$
-	String DEFAULT_NOT_POSSIBLE_STATUS_MSG = MOFJ2EEResourceHandler.getString("DEFAULT_NOT_POSSIBLE_STATUS_MSG"); //$NON-NLS-1$
-	String DEFAULT_ERROR_STATUS_MSG = MOFJ2EEResourceHandler.getString("DEFAULT_ERROR_STATUS_MSG"); //$NON-NLS-1$
-	
-	String REMOVED_LOCAL_CLIENT_MSG = MOFJ2EEResourceHandler.getString("REMOVED_LOCAL_CLIENT_MSG"); //$NON-NLS-1$
-	String REMOVED_ACCESS_INTENTS_MSG = MOFJ2EEResourceHandler.getString("REMOVED_ACCESS_INTENTS_MSG"); //$NON-NLS-1$
-	String REMOVED_ISOLATION_LEVELS_MSG = MOFJ2EEResourceHandler.getString("REMOVED_ISOLATION_LEVELS_MSG"); //$NON-NLS-1$
-	String CONVERTED_FINDER_MSG = MOFJ2EEResourceHandler.getString("CONVERTED_FINDER_MSG"); //$NON-NLS-1$
-	String UNNAMED_EJB = MOFJ2EEResourceHandler.getString("UNNAMED_EJB"); //$NON-NLS-1$
-	String CONVERTED_QUERY_DESCRIPTION = MOFJ2EEResourceHandler.getString("CONVERTED_QUERY_DESCRIPTION"); //$NON-NLS-1$
-	String MIGRATED_DEFAULT_DATASOURCE_JAR_MSG = MOFJ2EEResourceHandler.getString("MIGRATED_DEFAULT_DATASOURCE_JAR_MSG"); //$NON-NLS-1$
-	String MIGRATED_DEFAULT_DATASOURCE_MSG 	   = MOFJ2EEResourceHandler.getString("MIGRATED_DEFAULT_DATASOURCE_MSG"); //$NON-NLS-1$
-	String ERROR_TEXT = MOFJ2EEResourceHandler.getString("ERROR"); //$NON-NLS-1$
-	String WARNING_TEXT = MOFJ2EEResourceHandler.getString("WARNING"); //$NON-NLS-1$
-	String INFO_TEXT = MOFJ2EEResourceHandler.getString("INFO"); //$NON-NLS-1$
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrator.java
deleted file mode 100644
index 7ede1fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/J2EESpecificationMigrator.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.migration;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.DestinationType;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.SubscriptionDurabilityKind;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-
-/**
- * @author DABERG
- *
- * This class is used to migrate J2EE specific objects from one
- * J2EE version to another.
- */
-public class J2EESpecificationMigrator extends SpecificationMigrator implements J2EEConstants, J2EESpecificationMigrationConstants {
- 
-	
-	/**
-	 * Public constructor for migrating a single ejb
-	 */
-	public J2EESpecificationMigrator(String aVersion, boolean complex) {
-	    super(aVersion, complex);
-	}
-	
-	/**
-	 * Public constructor for migrating the entire deployment descriptor
-	 */
-	public J2EESpecificationMigrator(XMLResource anXmlResource, String aVersion, boolean complex) {
-	    super(anXmlResource, aVersion, complex);
-	} 
-
-	protected QueryMethod convertMethodElementToQueryMethod(MethodElement me) {
-		QueryMethod queryMethod = ((EjbPackage)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI)).getEjbFactory().createQueryMethod();
-		queryMethod.setParms(me.getParms());
-		queryMethod.setName(me.getName());
-		return queryMethod;
-	}
-	protected void ensureBeanVersionsSet(EJBJar jar) {
-		if (jar != null) {
-			List beans = jar.getEnterpriseBeans();
-			int size = beans.size();
-			EnterpriseBean bean;
-			for (int i = 0; i < size; i++) {
-				bean = (EnterpriseBean) beans.get(i);
-				if (bean.isContainerManagedEntity() && ((ContainerManagedEntity)bean).isVersion1_X())
-					((ContainerManagedEntity)bean).setVersion(ContainerManagedEntity.VERSION_1_X);
-			}
-		}
-	}
-	protected String format(String aPattern, String arg1) {
-		return MessageFormat.format(aPattern, new String[]{arg1});
-	}
-	protected String format(String aPattern, String arg1, String arg2) {
-		return MessageFormat.format(aPattern, new String[]{arg1, arg2});
-	}
-	protected J2EEMigrationStatus getMigrateToLowerLevelStatus(EJBJar ejbJar) {
-		J2EEMigrationStatus status = null, beanStatus;
-		if (ejbJar != null) {
-			List beans = ejbJar.getEnterpriseBeans();
-			int size = beans.size();
-			EnterpriseBean bean;
-			for (int i = 0; i < size; i++) {
-				bean = (EnterpriseBean) beans.get(i);
-				beanStatus = getMigrateToLowerLevelStatus(bean);
-				if (status == null)
-					status = beanStatus;
-				else
-					status = status.append(beanStatus);
-			}
-		}
-		return status;
-	}
-	protected J2EEMigrationStatus getMigrateToLowerLevelStatus(EnterpriseBean bean) {
-		if (bean.isMessageDriven() && isVersion1_2())
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_POSSIBLE, bean);
-		if (bean.isContainerManagedEntity() && ((ContainerManagedEntity)bean).isVersion2_X() && isVersion1_2())
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_POSSIBLE, bean);
-		return null;
-	} 
-	
-	protected J2EEMigrationStatus migrate(ContainerManagedEntity aCMP) {
-		boolean is1_x = aCMP.getVersion().equals(ContainerManagedEntity.VERSION_1_X);
-		if (isVersion1_2() && !is1_x)
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_POSSIBLE, aCMP);
-		else if ((isVersion1_4() || isVersion1_3()) && is1_x) {
-			return migrate1_xCMPFor2_0Target(aCMP);
-		}
-		return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, aCMP);
-	}
-	
-	protected void migrateDescriptionsTo14(XMLResource resource) {
-	    ((EJBResource)resource).getEJBJar().getDescription();
-	    
-	}
-	
-
-	protected J2EEMigrationStatus migrateTo13(EnterpriseBean anEJB) {
-		if (anEJB != null && getVersion() != null) {
-			if (anEJB.isContainerManagedEntity())
-				return migrate((ContainerManagedEntity) anEJB);
-			return migrateBeanInterfaces(anEJB);
-		}
-		return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, anEJB);
-	}
-
-	/**
-	 * Migrate a 1.1 CMP to a 1.1 CMP in a 2.0 EJB project.
-	 * Set the cmp-version to 1.x.
-	 * @param aCMP
-	 * @return J2EEMigrationStatus
-	 */
-	protected J2EEMigrationStatus migrate1_xCMPFor2_0Target(ContainerManagedEntity aCMP) {
-		//This is necessary to force a change in the version so the event is
-		//not a TOUCH which will do nothing.
-		aCMP.setVersion(ContainerManagedEntity.VERSION_2_X);
-		if (!isComplex()) 
-			//reset it if we are not doing full migration
-			aCMP.setVersion(ContainerManagedEntity.VERSION_1_X);
-		else
-			aCMP.setAbstractSchemaName(aCMP.getName());
-		
-		return  new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, aCMP);
-	}
-	protected J2EEMigrationStatus migrateBeanInterfaces(EnterpriseBean anEJB) {
-		if (isVersion1_2() && anEJB.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID && anEJB.hasLocalClient()) {
-			anEJB.setLocalInterface(null);
-			anEJB.setLocalHomeInterface(null);
-			return new J2EEMigrationStatus(J2EEMigrationStatus.WARNING, anEJB, format(REMOVED_LOCAL_CLIENT_MSG, anEJB.getName()));
-		}
-		return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, anEJB);
-	}
-
-	private J2EEMigrationMultiStatus migrateBeans13(EJBJar jar) {
-		J2EEMigrationMultiStatus status = new J2EEMigrationMultiStatus();
-		if (jar != null) {
-			List beans = jar.getEnterpriseBeans();
-			int size = beans.size();
-			EnterpriseBean bean;
-			for (int i = 0; i < size; i++) {
-				bean = (EnterpriseBean) beans.get(i);
-				status.merge(migrateTo13(bean));
-			}
-		}
-		return status;
-	}
-	
-	private J2EEMigrationMultiStatus migrateBeans14(EJBJar jar,HashMap beanMap) {
-		J2EEMigrationMultiStatus status = new J2EEMigrationMultiStatus();
-		if (jar != null) {
-			List beans = jar.getEnterpriseBeans();
-			int size = beans.size();
-			EnterpriseBean bean;
-			for (int i = 0; i < size; i++) {
-				bean = (EnterpriseBean) beans.get(i);
-				status.merge(migrateTo14Bean(bean,beanMap));
-			}
-		}
-		return status;
-	}
-	/**
-	 * 
-	 */
-	private J2EEMigrationStatus migrateMessageDrivenTo14(MessageDriven anEJB) {
-		
-		ActivationConfig config = EjbFactoryImpl.getActiveFactory().createActivationConfig();
-		ActivationConfigProperty property = null;
-		AcknowledgeMode ackMode = anEJB.getAcknowledgeMode();
-		String ackModeName = ackMode.getName();
-		
-		if(ackModeName != null && ackModeName.length() > 0) {
-			property = EjbFactoryImpl.getActiveFactory().createActivationConfigProperty();
-			property.setName("acknowledgeMode"); property.setValue(ackModeName); //$NON-NLS-1$
-			config.getConfigProperties().add(property);
-			anEJB.setAcknowledgeMode(null);
-		}
-		
-		MessageDrivenDestination destination = anEJB.getDestination();
-		if(destination != null) 
-			create14Destination(anEJB,destination,config);
-			
-		String messageSelector = anEJB.getMessageSelector();
-		
-		if(messageSelector != null && messageSelector.length() > 0) {
-			property = EjbFactoryImpl.getActiveFactory().createActivationConfigProperty();
-			property.setName("messageSelector"); property.setValue(messageSelector); //$NON-NLS-1$
-			config.getConfigProperties().add(property);
-			anEJB.setMessageSelector(null);
-			
-		}
-		anEJB.setActivationConfig(config);
-		
-		return  new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, anEJB);
-	}
-	
-	/**
-	 * 
-	 */
-	private void create14Destination(MessageDriven bean,MessageDrivenDestination destination,ActivationConfig config ) {
-		DestinationType type = destination.getType();
-		String typeString = null;
-		if (type != null) {
-			switch (type.getValue()) {
-				case DestinationType.QUEUE :
-					typeString =  "javax.jms.Queue"; //$NON-NLS-1$
-				    break;
-				case DestinationType.TOPIC :
-					typeString =  "javax.jms.Topic"; //$NON-NLS-1$
-					break;
-			}
-		}
-		JavaHelpers helper = JavaRefFactory.eINSTANCE.reflectType(typeString,bean.eContainer());
-		if(helper != null)
-		  bean.setMessageDestination(helper.getWrapper());
-		
-		ActivationConfigProperty property = EjbFactoryImpl.getActiveFactory().createActivationConfigProperty();
-		property.setName("destinationType"); property.setValue(typeString); //$NON-NLS-1$
-		config.getConfigProperties().add(property);
-		
-		SubscriptionDurabilityKind durability = destination.getSubscriptionDurability();
-		String durabilityName = durability.getName();
-		if(durabilityName != null && durabilityName.length() > 0) {
-			property = EjbFactoryImpl.getActiveFactory().createActivationConfigProperty();
-			property.setName("subscriptionDurability"); property.setValue(durabilityName); //$NON-NLS-1$
-			config.getConfigProperties().add(property);
-			bean.getDestination().setSubscriptionDurability(null);
-		}
-	}
-	 
-
-	protected J2EEMigrationStatus migrateTo13(ApplicationClientResource appClientResource) {
-		if (!basicNeedsToMigrate()) 
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, appClientResource);
-		String pubId, sysId;
-		boolean isVersion1_3 = isVersion1_3();
-		pubId = isVersion1_3 ? APP_CLIENT_PUBLICID_1_3 : APP_CLIENT_PUBLICID_1_2;
-		sysId = isVersion1_3 ? APP_CLIENT_SYSTEMID_1_3 : APP_CLIENT_SYSTEMID_1_2;
-		appClientResource.setDoctypeValues(pubId, sysId);
-		return new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, appClientResource);
-	}
-	
-	protected J2EEMigrationStatus migrateTo13(ApplicationResource appResource) {
-		if (!basicNeedsToMigrate()) 
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, appResource);
-		String pubId, sysId;
-		boolean isVersion1_3 = isVersion1_3();
-		pubId = isVersion1_3 ? APPLICATION_PUBLICID_1_3 : APPLICATION_PUBLICID_1_2;
-		sysId = isVersion1_3 ? APPLICATION_SYSTEMID_1_3 : APPLICATION_SYSTEMID_1_2;
-		appResource.setDoctypeValues(pubId, sysId);
-		return new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, appResource);
-	}
-	
-	protected J2EEMigrationStatus migrateTo13(EJBResource ejbResource) {
-		J2EEMigrationStatus status = null;
-		boolean b = basicNeedsToMigrate();
-		String pubId, sysId;
-		boolean isVersion1_3 = isVersion1_3();
-		EJBJar jar = ejbResource.getEJBJar();
-		if (b) {
-			if (!isVersion1_3) {
-				status = getMigrateToLowerLevelStatus(jar);
-				if (status != null)
-					return status;
-			}
-			ensureBeanVersionsSet(jar);
-			pubId = isVersion1_3 ? EJBJAR_PUBLICID_2_0 : EJBJAR_PUBLICID_1_1;
-			sysId = isVersion1_3 ? EJBJAR_SYSTEMID_2_0 : EJBJAR_SYSTEMID_1_1;
-			ejbResource.setDoctypeValues(pubId, sysId);
-		} else {
-			status = new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, ejbResource);
-		}
-		boolean notNeeded = status != null;
-		status = mergeStatuses(status, migrateBeans13(jar));
-		if (!notNeeded)
-			status = mergeStatuses(status, new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, ejbResource));
-		return status;
-	}
-	
-	protected J2EEMigrationStatus migrateTo13(WebAppResource webResource) {
-		if (!basicNeedsToMigrate()) 
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, webResource);
-		String pubId, sysId;
-		boolean isVersion1_3 = isVersion1_3();
-		pubId = isVersion1_3 ? WEBAPP_PUBLICID_2_3 : WEBAPP_PUBLICID_2_2;
-		sysId = isVersion1_3 ? WEBAPP_SYSTEMID_2_3 : WEBAPP_SYSTEMID_2_2;
-		webResource.setDoctypeValues(pubId, sysId);
-		return new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, webResource);
-	} 
-	
-	protected J2EEMigrationStatus migrateTo14(ApplicationClientResource appClientResource) {
-		if (!basicNeedsMigrationTo14()) 
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, appClientResource);
-		appClientResource.setModuleVersionID(J2EEVersionConstants.J2EE_1_4_ID);
-		migrateCompatibilityDescriptionGroup(appClientResource);
-		EObject rootObject = appClientResource.getRootObject();
-		appClientResource.removePreservingIds(rootObject);
-		appClientResource.getContents().remove(rootObject);
-		appClientResource.getContents().add(rootObject);
-		return new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, appClientResource);
-	}
-	
-	protected J2EEMigrationStatus migrateTo14(ApplicationResource appResource) {
-		if (!basicNeedsMigrationTo14()) 
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, appResource);
-		appResource.setJ2EEVersionID(J2EEVersionConstants.J2EE_1_4_ID);
-		migrateCompatibilityDescriptionGroup(appResource);
-		EObject rootObject = appResource.getRootObject();
-		appResource.removePreservingIds(rootObject);
-		appResource.getContents().add(rootObject);
-		return new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, appResource);
-	}
-	
-	protected J2EEMigrationStatus migrateTo14(ConnectorResource connectorResource) {
-		if (!basicNeedsMigrationTo14()) 
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED,connectorResource);
-		connectorResource.setModuleVersionID(J2EEVersionConstants.JCA_1_5_ID);
-		EObject rootObject = connectorResource.getRootObject();
-		connectorResource.getContents().remove(rootObject);
-		connectorResource.getContents().add(rootObject);
-		Connector14SpecificationMigrator migrator = new Connector14SpecificationMigrator();
-		J2EEMigrationStatus status = migrator.migrateConnectorTo14(connectorResource.getConnector());
-		status = mergeStatuses(status,new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK,connectorResource));
-		return status;
-	}
-	
-	protected J2EEMigrationStatus migrateTo14(EJBResource ejbResource) {
-		J2EEMigrationStatus status = null;
-		boolean b = basicNeedsMigrationTo14();
-		boolean isVersion1_4 = isVersion1_4();
-		EJBJar jar = ejbResource.getEJBJar();
-		HashMap beanCache = new HashMap();
-		if(jar.getVersionID() == EJB_1_1_ID)
-			createBeanCache(jar,beanCache);
-		if (b) {
-			if (!isVersion1_4) {
-				status = getMigrateToLowerLevelStatus(jar);
-				if (status != null)
-					return status;
-			}
-			ejbResource.setModuleVersionID(J2EEVersionConstants.EJB_2_1_ID);
-			migrateCompatibilityDescriptionGroup(ejbResource);
-			EObject rootObject = ejbResource.getRootObject();
-			ejbResource.removePreservingIds(rootObject);
-			ejbResource.getContents().add(rootObject);
-		
-		} else {
-			status = new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, ejbResource);
-		}
-		boolean notNeeded = status != null;
-		status = mergeStatuses(status, migrateBeans14(jar,beanCache));
-		if (!notNeeded)
-			status = mergeStatuses(status, new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, ejbResource));
-		return status;
-	}
-	
-	protected void migrateCompatibilityDescriptionGroup(XMLResource resource) {
-	    TreeIterator contents = resource.getAllContents();
-	    EObject object = null;
-	    while(contents.hasNext()) {
-	        object = (EObject) contents.next();
-	        migrateCompatibilityDescriptionGroup(object);	        
-	  }
-	}
-	
-	private static final EClass COMPATIBILITY_DESCRIPTION_GROUP_ECLASS = CommonPackage.eINSTANCE.getCompatibilityDescriptionGroup();
-	 
-	protected void migrateCompatibilityDescriptionGroup(EObject eObj) {
-	    if(COMPATIBILITY_DESCRIPTION_GROUP_ECLASS.isInstance(eObj)) { 
-	        CompatibilityDescriptionGroupImpl cg = (CompatibilityDescriptionGroupImpl)eObj;
-	        if(cg.getDisplayNameGen() != null) cg.setDisplayName(cg.getDisplayNameGen());
-	        if(cg.getDescriptionGen() != null) cg.setDescription(cg.getDescriptionGen());
-	        if(cg.getLargeIconGen() != null) cg.setLargeIcon(cg.getLargeIconGen());
-	        if(cg.getSmallIconGen() != null) cg.setSmallIcon(cg.getSmallIconGen());
-	    } 
-	}
-
-    /**
-	 * @param jar
-	 * @param beanCache
-	 */
-	private void createBeanCache(EJBJar jar, HashMap beanCache) {
-			List beans = jar.getEnterpriseBeans();
-			EnterpriseBean bean;
-			for (int i = 0; i < beans.size(); i++) {
-				bean = (EnterpriseBean) beans.get(i);
-				if (bean.isContainerManagedEntity() && ((ContainerManagedEntity)bean).isVersion1_X())
-					beanCache.put(bean,ContainerManagedEntity.VERSION_1_X);
-			}
-	}
-
-	protected J2EEMigrationStatus migrateTo14(WebAppResource webResource) {
-		J2EEMigrationStatus status = null;
-		try {
-			if (!basicNeedsMigrationTo14()) 
-				return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, webResource);
-			webResource.setModuleVersionID(J2EEVersionConstants.WEB_2_4_ID);
-			migrateCompatibilityDescriptionGroup(webResource);
-			EObject rootObject = webResource.getRootObject();
-			webResource.removePreservingIds(rootObject);
-			webResource.getContents().add(rootObject);
-			webResource.saveIfNecessary();
-			War14SpecificationMigrator migrator = new War14SpecificationMigrator();
-			status = migrator.migrateWebAppTo14(webResource.getWebApp());
-			status = mergeStatuses(status,new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK, webResource));
-			return status;
-		} catch (Exception e) {
-			Logger.getLogger().logError(e);
-		}
-		return status;
-	}
-	private  J2EEMigrationStatus migrateTo14Bean(EnterpriseBean anEJB,HashMap beanMap) {
-		if(!anEJB.isMessageDriven()) {
-			if (anEJB != null && getVersion() != null) {
-				if (anEJB.isContainerManagedEntity())
-					return migrate((ContainerManagedEntity)anEJB,beanMap);
-				return migrateBeanInterfaces(anEJB);
-			}
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, anEJB);
-		} 
-		if(anEJB.isMessageDriven()) {
-			return migrateMessageDrivenTo14((MessageDriven)anEJB);
-		}
-		return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED,anEJB);
-	}
-
-	/**
-	 * @param entity
-	 * @param beanMap
-	 * @return
-	 */
-	protected J2EEMigrationStatus migrate(ContainerManagedEntity aCMP, HashMap beanMap) {
-		String versionString = (String)beanMap.get(aCMP);
-		boolean is1_x = versionString != null && versionString.equals(ContainerManagedEntity.VERSION_1_X);
-		if (isVersion1_2() && !is1_x)
-			return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_POSSIBLE, aCMP);
-		else if ((isVersion1_4() || isVersion1_3()) && is1_x) {
-			return migrate1_xCMPFor2_0Target(aCMP);
-		}
-		return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, aCMP);
-	}
- 
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/SpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/SpecificationMigrator.java
deleted file mode 100644
index 0c9216a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/SpecificationMigrator.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.migration;
-
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class SpecificationMigrator implements J2EEConstants, J2EESpecificationMigrationConstants {
-	private boolean isComplex;
-	private String version;
-	private XMLResource xmlResource;
-	
-	/**
-	 * Public constructor for migrating a single ejb
-	 */
-	public SpecificationMigrator(String aVersion, boolean complex) {
-		version = aVersion;
-		isComplex = complex;
-	}
-	
-	/**
-	 * Public constructor for migrating the entire deployment descriptor
-	 */
-	public SpecificationMigrator(XMLResource anXmlResource, String aVersion, boolean complex) {
-		xmlResource	= anXmlResource;
-		version = aVersion;
-		isComplex = complex;
-	}
-	
-
-	public J2EEMigrationStatus migrateTo13() {
-		if (xmlResource != null && version != null) {
-			switch (xmlResource.getType()) {
-				case XMLResource.APP_CLIENT_TYPE :
-					return migrateTo13((ApplicationClientResource)xmlResource);
-				case XMLResource.APPLICATION_TYPE :
-					return migrateTo13((ApplicationResource)xmlResource);
-				case XMLResource.EJB_TYPE :
-					return migrateTo13((EJBResource)xmlResource);
-				case XMLResource.WEB_APP_TYPE :
-					return migrateTo13((WebAppResource)xmlResource);
-			}
-		}	
-		return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, xmlResource);
-	}
-	
-
-	/**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo13(WebAppResource resource) {
-        return null;
-    }
-
-    /**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo13(EJBResource resource) {
-        return null;
-    }
-
-    /**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo13(ApplicationResource resource) {
-        return null;
-    }
-
-    /**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo13(ApplicationClientResource resource) {
-        return null;
-    }
-
-    public J2EEMigrationStatus migrateTo14() {
-		if (xmlResource != null && version != null) {
-			switch (xmlResource.getType()) {
-				case XMLResource.APP_CLIENT_TYPE :
-					return migrateTo14((ApplicationClientResource)xmlResource);
-				case XMLResource.APPLICATION_TYPE :
-					return migrateTo14((ApplicationResource)xmlResource);
-				case XMLResource.EJB_TYPE :
-					return migrateTo14((EJBResource)xmlResource);
-				case XMLResource.WEB_APP_TYPE :
-					return migrateTo14((WebAppResource)xmlResource);
-				case XMLResource.RAR_TYPE :
-					return migrateTo14 ((ConnectorResource)xmlResource);
-			}
-		}	
-		return new J2EEMigrationStatus(J2EEMigrationStatus.NOT_NEEDED, xmlResource);
-	}
-	
-	/**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo14(ApplicationClientResource resource) {
-        return null;
-    }
-
-    /**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo14(ApplicationResource resource) {
-        return null;
-    }
-
-    /**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo14(EJBResource resource) {
-        return null;
-    }
-
-    /**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo14(WebAppResource resource) {
-        return null;
-    }
-
-    /**
-     * @param resource
-     * @return
-     */
-    protected J2EEMigrationStatus migrateTo14(ConnectorResource resource) {
-        return null;
-    }
-
-    protected boolean basicNeedsMigrationTo14() {
-		boolean isResource1_4, isTarget1_4;
-		isResource1_4 = xmlResource.getVersionID() == J2EEVersionConstants.J2EE_1_4_ID;
-		isTarget1_4 = isVersion1_4();
-		return (isResource1_4 && !isTarget1_4) || (!isResource1_4 && isTarget1_4);
-	}
-	
-	protected boolean basicNeedsToMigrate() {
-		boolean isResource1_3, isTarget1_3;
-		isResource1_3 = xmlResource.getVersionID() == J2EEVersionConstants.J2EE_1_3_ID;
-		isTarget1_3 = isVersion1_3();
-		return (isResource1_3 && !isTarget1_3) || (!isResource1_3 && isTarget1_3);
-	}
-	
-	protected J2EEMigrationStatus mergeStatuses(J2EEMigrationStatus status1, J2EEMigrationStatus status2) {
-		if (status1 != null)
-			return status1.append(status2);
-		return status2;
-	}
-	
-	
-	protected boolean isVersion1_2() {
-		return version == J2EE_VERSION_1_2;
-	}
-
-	protected boolean isVersion1_3() {
-		return version == J2EE_VERSION_1_3;
-	}
-	
-	protected boolean isVersion1_4() {
-		return version == J2EE_VERSION_1_4;
-	}
-
-    /**
-     * @return Returns the isComplex.
-     */
-    protected boolean isComplex() { 
-        return isComplex;
-    }
-    /**
-     * @return Returns the version.
-     */
-    public String getVersion() { 
-        return version;
-    }
-    /**
-     * @return Returns the xmlResource.
-     */
-    public XMLResource getXmlResource() { 
-        return xmlResource;
-    }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/War14SpecificationMigrator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/War14SpecificationMigrator.java
deleted file mode 100644
index dba75a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/migration/War14SpecificationMigrator.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.migration;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class War14SpecificationMigrator {
-
-	/**
-	 * @param app
-	 */
-	public J2EEMigrationStatus migrateWebAppTo14(WebApp app) {
-		migrateTabLibs(app);
-		migrateContextParam(app);
-		migrateInitParams(app);
-		return new J2EEMigrationStatus(J2EEMigrationStatus.COMPLETED_OK,(new J2EEMigrationStatus()).format(J2EESpecificationMigrationConstants.DEFAULT_COMPLETED_STATUS_MSG,app.getDisplayName()));
-	}
-	/**
-	 * @param app
-	 */
-	private void migrateInitParams(WebApp app) {
-	    migrateServletInitParams(app);
-		migrateFilterInitParams(app);
-	}
-	/**
-     * @param app
-     */
-    private void migrateFilterInitParams(WebApp app) {
-        List filters = app.getFilters();
-		if(filters != null &&  !filters.isEmpty()) {
-			for(int i = 0; i < filters.size(); i++) {
-				Filter filter = (Filter)filters.get(i);
-				List initParam = filter.getInitParams();
-				for(int j = 0; j < initParam.size(); j++) {
-					InitParam param = (InitParam)initParam.get(j);
-					if(param != null) {
-					    ParamValue cParam = createParamValue(param);
-					    List contextParams = filter.getInitParamValues();
-					    if(!paramValueExist(contextParams,cParam))
-					        filter.getInitParamValues().add(cParam);
-					}
-				}
-			}
-		}
-    }
-    /**
-     * @param app
-     */
-    private void migrateServletInitParams(WebApp app) {
-        List servlets = app.getServlets();
-	    if(servlets != null &&  !servlets.isEmpty()) {
-			for(int i = 0; i < servlets.size(); i++) {
-			    Servlet servlet = (Servlet)servlets.get(i);
-				List initParam = servlet.getParams();
-				for(int j = 0; j < initParam.size(); j++) {
-					InitParam param = (InitParam)initParam.get(j);
-					if(param != null) {
-					    ParamValue cParam = createParamValue(param);
-					    List contextParams = servlet.getInitParams();
-					    if(!paramValueExist(contextParams,cParam)) 
-					        servlet.getInitParams().add(cParam);
-				}
-			}
-		  }
-		}
-    }
-    /**
-     * @param param
-     * @return
-     */
-    private ParamValue createParamValue(InitParam param) {
-        ParamValue cParam = CommonFactory.eINSTANCE.createParamValue();
-        cParam.setName(param.getParamName());
-        cParam.setValue(param.getParamValue());
-        String desc = param.getDescription();
-        if(desc != null && desc.length() > 0)
-            cParam.getDescriptions().add(createDescription(desc));
-        return cParam;
-    }
-    /**
-     * @param desc
-     * @return
-     */
-    private Object createDescription(String desc) {
-       Description description = CommonFactory.eINSTANCE.createDescription();
-       description.setValue(desc);
-       return description;
-    }
-    /**
-     * @param contextParam
-     * @param param
-     * @return
-     */
-    private boolean paramValueExist(List contextParams, ParamValue param) {
-        boolean exists = false;
-        for(int i = 0; i < contextParams.size(); i++) {
-            ParamValue paramValue = (ParamValue)contextParams.get(i);
-            if(paramValue.getName().equals(param.getName()) && paramValue.getValue().equals(param.getValue())) {
-                exists = true;
-                break;
-            }
-        }
-        return exists;
-    }
-    
-    /**
-     * @param contextParams
-     * @param param
-     * @return
-     */
-    private boolean tagLibURITypeExists(List tagLibsURITypes, TagLibRefType tlut) {
-        boolean exists = false;
-        for(int i = 0; i < tagLibsURITypes.size(); i++) {
-            TagLibRefType tempTlut = (TagLibRefType)tagLibsURITypes.get(i);
-            if(tempTlut.getTaglibLocation().equals(tlut.getTaglibLocation()) && tempTlut.getTaglibURI().equals(tempTlut.getTaglibURI())) {
-                exists = true;
-                break;
-            }
-        }
-        return exists;
-    }
-    /**
-	 * @param app
-	 */
-	private void migrateContextParam(WebApp app) {
-		List contexts = app.getContexts();
-		if(contexts != null && !contexts.isEmpty()) {
-				for(int j = 0; j < contexts.size(); j++) {
-					ContextParam param = (ContextParam)contexts.get(j);
-					if(param != null) {
-					    ParamValue cParam = CommonFactory.eINSTANCE.createParamValue();
-					    cParam.setName(param.getParamName());
-					    cParam.setValue(param.getParamValue());
-					    cParam.setDescription(param.getDescription());
-					    List contextParams = app.getContextParams();
-					    if(!paramValueExist(contextParams,cParam))
-					        app.getContextParams().add(cParam);
-					}
-				}
-			}
-	}
-		
-	
-	/**
-	 * @param app
-	 */
-	private void migrateTabLibs(WebApp app) {
-		List tagLibs = app.getTagLibs();
-		JSPConfig config = app.getJspConfig();
-		if(tagLibs != null && !tagLibs.isEmpty()) {
-		    if(config == null) {
-		        config = JspFactory.eINSTANCE.createJSPConfig();
-		        app.setJspConfig(config);
-		        config = app.getJspConfig();
-		    }
-		    for(int i = 0; i < tagLibs.size(); i++) {
-		        TagLibRef tlr = (TagLibRef)tagLibs.get(i);
-		        TagLibRefType tlrt = JspFactory.eINSTANCE.createTagLibRefType();
-		        tlrt.setTaglibLocation(tlr.getTaglibLocation());
-		        tlrt.setTaglibURI(tlr.getTaglibURI());
-		        List tagLibRefTypes = config.getTagLibs();
-		        if(!tagLibURITypeExists(tagLibRefTypes,tlrt))
-		            config.getTagLibs().add(tlrt);
-			}
-		
-	  }
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ApplicationTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ApplicationTranslator.java
deleted file mode 100644
index cb56846..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ApplicationTranslator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.application;
-
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.EarDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author dfholttp
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ApplicationTranslator extends RootTranslator implements EarDeploymentDescriptorXmlMapperI, J2EEConstants {
-	public static ApplicationTranslator INSTANCE = new ApplicationTranslator();
-	private static Translator[] children13;
-	private static Translator[] children14;
-	private static ApplicationPackage APPLICATION_PKG = ApplicationPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-    public ApplicationTranslator() {
-		super(APPLICATION, ApplicationPackage.eINSTANCE.getApplication());
-    }
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected Translator[] create13Children() {
-		return  new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(ICON+"/"+SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), //$NON-NLS-1$
-			new Translator(ICON+"/"+LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), //$NON-NLS-1$
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new ModuleTranslator(),
-			CommonTranslators.createSecurityRoleTranslator13(APPLICATION_PKG.getApplication_SecurityRoles()),
-		};
-	}
-
-	protected Translator[] create14Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, APPLICATION_PKG.getApplication_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+APPLICATION_SCHEMA_LOC_1_4),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new ModuleTranslator(),
-			CommonTranslators.createSecurityRoleTranslator14(APPLICATION_PKG.getApplication_SecurityRoles()),
-		};
-
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ModuleTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ModuleTranslator.java
deleted file mode 100644
index c5c90ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/application/ModuleTranslator.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.application;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.EarDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ModuleTranslator extends Translator implements EarDeploymentDescriptorXmlMapperI {
-	private static final ApplicationPackage APPLICATION_PKG = ApplicationPackage.eINSTANCE;
-
-	private static final Translator ALT_DD_TRANSLATOR = createAltDDTranslator();
-	private static final Translator[] WEB_TRANSLATORS = createWebModuleTranslators();
-	private static final Translator[] EJB_TRANSLATORS = createEJBModuleTranslators();
-	private static final Translator[] JAVA_TRANSLATORS = createJavaModuleTranslators();
-	private static final Translator[] CONNECTOR_TRANSLATORS = createConnectorModuleTranslators();
-	//private static final  
-
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public ModuleTranslator() {
-		super(MODULE, APPLICATION_PKG.getApplication_Modules());
-		addReadAheadHelper(new ReadAheadHelper(MODULE, new String[] { EJB, JAVA, WEB, CONNECTOR }, null));
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createConnectorModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(CONNECTOR, APPLICATION_PKG.getModule_Uri()),
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createJavaModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA, APPLICATION_PKG.getModule_Uri()),
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createEJBModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(EJB, APPLICATION_PKG.getModule_Uri()),
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-	}
-
-	/**
-	 * @return
-	 */
-	private static Translator[] createWebModuleTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(WEB + "/" + WEB_URI, APPLICATION_PKG.getModule_Uri()), //$NON-NLS-1$
-			new Translator(WEB + "/" + CONTEXT_ROOT, APPLICATION_PKG.getWebModule_ContextRoot()), //$NON-NLS-1$
-			ALT_DD_TRANSLATOR,
-		//	CommonTranslators.createDeploymentExtensionTranslator(APPLICATION_PKG.getModule_Extensions())
-		};
-
-	}
-
-	private static Translator createAltDDTranslator() {
-		return new Translator(ALT_DD, ApplicationPackage.eINSTANCE.getModule_AltDD());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null) 
-			return CommonTranslators.EMPTY_CHILDREN;
-		else if (((Module) o).isEjbModule())
-			return EJB_TRANSLATORS;
-		else if (((Module) o).isConnectorModule())
-			return CONNECTOR_TRANSLATORS;
-		else if (((Module) o).isWebModule())
-			return WEB_TRANSLATORS;
-		else if (((Module) o).isJavaModule())
-			return JAVA_TRANSLATORS;
-		else
-			throw new IllegalStateException("Internal error: Module Type excepted"); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		ApplicationFactory fact = ApplicationFactory.eINSTANCE;
-		if (EJB.equals(readAheadName))
-			return fact.createEjbModule();
-		else if (WEB.equals(readAheadName))
-			return fact.createWebModule();
-		else if (JAVA.equals(readAheadName))
-			return fact.createJavaClientModule();
-		else if (CONNECTOR.equals(readAheadName))
-			return fact.createConnectorModule();
-		else
-			return fact.createModule();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#isManagedByParent()
-	 */
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/client/ApplicationClientTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/client/ApplicationClientTranslator.java
deleted file mode 100644
index a6e2eea..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/client/ApplicationClientTranslator.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.client;
-
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.EnvEntryTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ApplicationClientTranslator extends RootTranslator implements DeploymentDescriptorXmlMapperI, J2EEConstants {
-	public static ApplicationClientTranslator INSTANCE = new ApplicationClientTranslator();
-	public static final String CALLBACK_HANDLER = "callback-handler"; //$NON-NLS-1$
-	public static final String APPLICATION_CLIENT = "application-client"; //$NON-NLS-1$
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	protected ApplicationClientTranslator() {
-		super(APPLICATION_CLIENT, ClientPackage.eINSTANCE.getApplicationClient());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected Translator[] create13Children() {
-		ClientPackage ePackageClient=ClientPackage.eINSTANCE;
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new EnvEntryTranslator(ePackageClient.getApplicationClient_EnvironmentProps(), true, false),
-			CommonTranslators.createEJBRefTranslator13(ePackageClient.getApplicationClient_EjbReferences()),
-			CommonTranslators.createResourceRefTranslator13(ePackageClient.getApplicationClient_ResourceRefs()),
-			//J2EE 1.3
-			CommonTranslators.createResourceEnvRefTranslator13(ePackageClient.getApplicationClient_ResourceEnvRefs()),
-			new JavaClassTranslator(CALLBACK_HANDLER, ePackageClient.getApplicationClient_CallbackHandler()),
-		};
-	}
-
-	protected Translator[] create14Children() {
-		ClientPackage ePackageClient=ClientPackage.eINSTANCE;
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, ePackageClient.getApplicationClient_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+APP_CLIENT_SCHEMA_LOC_1_4),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new EnvEntryTranslator(ePackageClient.getApplicationClient_EnvironmentProps(), true, true),
-			CommonTranslators.createEJBRefTranslator14(ePackageClient.getApplicationClient_EjbReferences()),
-			CommonTranslators.createServiceRefGroupTranslator(ePackageClient.getApplicationClient_ServiceRefs()),
-			CommonTranslators.createResourceRefTranslator14(ePackageClient.getApplicationClient_ResourceRefs()),
-			CommonTranslators.createResourceEnvRefTranslator14(ePackageClient.getApplicationClient_ResourceEnvRefs()),
-			CommonTranslators.createMessageDestinationRefTranslator(ePackageClient.getApplicationClient_MessageDestinationRefs()),
-			new JavaClassTranslator(CALLBACK_HANDLER, ePackageClient.getApplicationClient_CallbackHandler()),
-			CommonTranslators.createMessageDestinationTranslator(ePackageClient.getApplicationClient_MessageDestinations()),
-		//	CommonTranslators.createDeploymentExtensionTranslator(ePackageClient.getApplicationClient_DeploymentExtensions())
-		};
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/BooleanTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/BooleanTranslator.java
deleted file mode 100644
index c3e6800..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/BooleanTranslator.java
+++ /dev/null
@@ -1,60 +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 Apr 21, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class BooleanTranslator extends Translator {
-
-	
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public BooleanTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature, BOOLEAN_LOWERCASE);
-	}
-
-		
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		String correct = strValue;
-		if (strValue == null)
-			return null;
-		if (strValue.toUpperCase().equals("YES"))//$NON-NLS-1$
-			correct = "true";//$NON-NLS-1$
-		else if (strValue.toUpperCase().equals("NO"))//$NON-NLS-1$
-			correct = "false";//$NON-NLS-1$
-		else if (strValue.toUpperCase().equals("1"))//$NON-NLS-1$
-			correct = "true";//$NON-NLS-1$
-		else if (strValue.toUpperCase().equals("0"))//$NON-NLS-1$
-			correct = "false";//$NON-NLS-1$
-		return super.convertStringToValue(correct, owner);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/CommonTranslators.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/CommonTranslators.java
deleted file mode 100644
index 8c18662..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/CommonTranslators.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 20, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emf.resource.DependencyTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * A static helper for creating Generic common J2EE translators
- */
-public class CommonTranslators implements DeploymentDescriptorXmlMapperI {
-
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static Webservice_clientPackage WEBSERVICE_PKG = Webservice_clientPackage.eINSTANCE;
-	public static final Translator[] EMPTY_CHILDREN = new Translator[] {};
-	private static final Translator EJB_REF_NAME_TRANSLATOR = new Translator(EJB_REF_NAME, COMMON_PKG.getEjbRef_Name());
-	private static final Translator EJB_REF_TYPE_TRANSLATOR = new Translator(EJB_REF_TYPE, COMMON_PKG.getEjbRef_Type());		//Enumeration
-	private static final Translator EJB_LINK_TRANSLATOR = new Translator(EJB_LINK, COMMON_PKG.getEjbRef_Link());
-	
-	private static final Translator RES_REF_NAME_TRANSLATOR = new Translator(RES_REF_NAME, COMMON_PKG.getResourceRef_Name());
-	private static final Translator RES_TYPE_TRANSLATOR = new Translator(RES_TYPE, COMMON_PKG.getResourceRef_Type());
-	private static final Translator RES_AUTH_TRANSLATOR = new ResAuthTranslator();
-	private static final Translator RES_SHARING_SCOPE_TRANSLATOR = new Translator(RES_SHARING_SCOPE, COMMON_PKG.getResourceRef_ResSharingScope());
-	
-	private static final Translator RES_ENV_REF_NAME_TRANSLATOR = new Translator(RESOURCE_ENV_REF_NAME, COMMON_PKG.getResourceEnvRef_Name());
-	private static final Translator RES_ENV_REF_TYPE_TRANSLATOR = new JavaClassTranslator(RESOURCE_ENV_REF_TYPE, COMMON_PKG.getResourceEnvRef_Type());
-	
-	private static final Translator SEC_REF_ROLE_NAME_TRANSALTOR = new Translator(ROLE_NAME, COMMON_PKG.getSecurityRoleRef_Name());
-	private static final Translator SEC_REF_ROLE_LINK_TRANSLATOR = new Translator(ROLE_LINK, COMMON_PKG.getSecurityRoleRef_Link());
-	
-	private static final Translator RUNAS_ROLE_NAME_TRANSLATOR = new DependencyTranslator(ROLE_NAME, COMMON_PKG.getIdentity_RoleName(), COMMON_PKG.getRunAsSpecifiedIdentity_Identity());
-	
-	private static final Translator SECURITY_ROLE_NAME_TRANSLATOR = new Translator(ROLE_NAME, COMMON_PKG.getSecurityRole_RoleName());
-	
-	public static final Translator DESCRIPTIONS_TRANSLATOR = createDescriptionTranslator(COMMON_PKG.getDescriptionGroup_Descriptions());
-	public static final Translator DISPLAYNAMES_TRANSLATOR = createDisplayNameTranslator(COMMON_PKG.getDescriptionGroup_DisplayNames());
-	public static final Translator ICONS_TRANSLATOR = createIconTranslator();
-	
-	//The Official Concept of JNDIEnvRefGroup FOR J2EE 1.4
-	public static final Translator JNDI_REF_GROUP_ENV_ENTRY_1_4 = new EnvEntryTranslator(COMMON_PKG.getJNDIEnvRefsGroup_EnvironmentProperties(), true, true);
-	public static final Translator JNDI_REF_GROUP_EJB_REF_1_4 = CommonTranslators.createEJBRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_EjbRefs());
-	public static final Translator JNDI_REF_GROUP_EJB_LOCAL_REF_1_4 = CommonTranslators.createEJBLocalRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_EjbLocalRefs());
-	public static final Translator JNDI_REF_GROUP_SERVICE_REF_1_4 = CommonTranslators.createServiceRefGroupTranslator(COMMON_PKG.getJNDIEnvRefsGroup_ServiceRefs());	
-	public static final Translator JNDI_REF_GROUP_RESOURCE_REF_1_4 = CommonTranslators.createResourceRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_ResourceRefs());
-	public static final Translator JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4 = CommonTranslators.createResourceEnvRefTranslator14(COMMON_PKG.getJNDIEnvRefsGroup_ResourceEnvRefs());
-	public static final Translator JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4 = CommonTranslators.createMessageDestinationRefTranslator(COMMON_PKG.getJNDIEnvRefsGroup_MessageDestinationRefs());
-	
-	//The unofficial concept of JNDIEnvRefGroup FOR J2EE 1.3
-	public static final Translator JNDI_REF_GROUP_ENV_ENTRY_1_3 = new EnvEntryTranslator(COMMON_PKG.getJNDIEnvRefsGroup_EnvironmentProperties(), true, false);
-	public static final Translator JNDI_REF_GROUP_EJB_REF_1_3 = CommonTranslators.createEJBRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_EjbRefs());
-	public static final Translator JNDI_REF_GROUP_EJB_LOCAL_REF_1_3 = CommonTranslators.createEJBLocalRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_EjbLocalRefs());
-	public static final Translator JNDI_REF_GROUP_RESOURCE_REF_1_3 =  CommonTranslators.createResourceRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_ResourceRefs());
-	public static final Translator JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3 = CommonTranslators.createResourceEnvRefTranslator13(COMMON_PKG.getJNDIEnvRefsGroup_ResourceEnvRefs());
-	
-	public static final Translator LISTENER_CLASS_TRANSLATOR = new JavaClassTranslator(LISTENER_CLASS, COMMON_PKG.getListener_ListenerClass());
-	
-	private CommonTranslators() {
-		super();
-	}
-	
-	public static Translator createSecurityRoleRefTranslator13(EStructuralFeature feature) {
-		
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE_REF, feature);
-		result.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityRoleRef_Description()), 
-			SEC_REF_ROLE_NAME_TRANSALTOR, 
-			SEC_REF_ROLE_LINK_TRANSLATOR 
-		});
-		return result;
-	}
-	
-	public static Translator createSecurityRoleRefTranslator14(EStructuralFeature feature) {
-		
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getSecurityRoleRef_Descriptions()), 
-			SEC_REF_ROLE_NAME_TRANSALTOR,
-			SEC_REF_ROLE_LINK_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createResourceEnvRefTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RESOURCE_ENV_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE, 
-			new Translator(DESCRIPTION, COMMON_PKG.getResourceEnvRef_Description()), 
-			RES_ENV_REF_NAME_TRANSLATOR, 
-			RES_ENV_REF_TYPE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createResourceEnvRefTranslator14(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RESOURCE_ENV_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE, 
-			createDescriptionTranslator(COMMON_PKG.getResourceEnvRef_Descriptions()), 
-			RES_ENV_REF_NAME_TRANSLATOR, 
-			RES_ENV_REF_TYPE_TRANSLATOR,
-			//J2EE1.4 Added
-		//	createDeploymentExtensionTranslator(COMMON_PKG.getResourceEnvRef_Extensions())
-		});
-		return result;
-	}
-	
-	public static Translator createResourceRefTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RESOURCE_REF, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,		
-			new Translator(DESCRIPTION, COMMON_PKG.getResourceRef_Description()),
-			RES_REF_NAME_TRANSLATOR,
-			RES_TYPE_TRANSLATOR,
-			RES_AUTH_TRANSLATOR,
-			//EJB 2.0 Added
-			RES_SHARING_SCOPE_TRANSLATOR,
-		});
-		return result;
-	}
-	
-	public static Translator createResourceRefTranslator14(EStructuralFeature feature) {
-			GenericTranslator result = new GenericTranslator(RESOURCE_REF, feature);
-			result.setChildren(new Translator[] {
-				IDTranslator.INSTANCE,		
-				createDescriptionTranslator(COMMON_PKG.getResourceRef_Descriptions()),
-				RES_REF_NAME_TRANSLATOR,
-				RES_TYPE_TRANSLATOR,
-				RES_AUTH_TRANSLATOR,
-				//EJB 2.0 Added
-				RES_SHARING_SCOPE_TRANSLATOR,
-			
-				//J2EE1.4 Added
-			//	createDeploymentExtensionTranslator(COMMON_PKG.getResourceRef_Extensions())
-			});
-			return result;
-		}
-	
-	public static Translator createSecurityRoleTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityRole_Description()), 
-			SECURITY_ROLE_NAME_TRANSLATOR 
-		});
-		return result;
-	}
-	
-	public static Translator createSecurityRoleTranslator14(EStructuralFeature feature) {
-			GenericTranslator result = new GenericTranslator(SECURITY_ROLE, feature);
-			result.setChildren(new Translator[] {
-				IDTranslator.INSTANCE,
-				createDescriptionTranslator(COMMON_PKG.getSecurityRole_Descriptions()), 
-				SECURITY_ROLE_NAME_TRANSLATOR 
-			});
-			return result;
-		}
-	
-	public static Translator createEJBRefTranslator13(EStructuralFeature feature) {
-		return createEJBRefTranslator13(feature, false);
-	}
-	
-	public static Translator createEJBLocalRefTranslator13(EStructuralFeature feature) {
-		return createEJBRefTranslator13(feature, true);
-	}
-	private static Translator createEJBRefTranslator13(EStructuralFeature feature, boolean local) {
-		String nodeName = local ? EJB_LOCAL_REF : EJB_REF;
-		String homeTag = local ? LOCAL_HOME : HOME;
-		String remoteTag = local ? LOCAL : REMOTE;
-		EStructuralFeature homeFeature = local ? COMMON_PKG.getEJBLocalRef_LocalHome() : COMMON_PKG.getEjbRef_Home();
-		EStructuralFeature remoteFeature = local ? COMMON_PKG.getEJBLocalRef_Local() : COMMON_PKG.getEjbRef_Remote();
-		
-		GenericTranslator result = new GenericTranslator(nodeName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,				
-			new Translator(DESCRIPTION, COMMON_PKG.getEjbRef_Description()),
-			EJB_REF_NAME_TRANSLATOR,
-			EJB_REF_TYPE_TRANSLATOR,
-			new Translator(homeTag, homeFeature),
-			new Translator(remoteTag, remoteFeature),
-			EJB_LINK_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createEJBRefTranslator14(EStructuralFeature feature) {
-		return createEJBRefTranslator14(feature, false);
-	}
-	
-	public static Translator createEJBLocalRefTranslator14(EStructuralFeature feature) {
-		return createEJBRefTranslator14(feature, true);
-	}
-	private static Translator createEJBRefTranslator14(EStructuralFeature feature, boolean local) {
-		String nodeName = local ? EJB_LOCAL_REF : EJB_REF;
-		String homeTag = local ? LOCAL_HOME : HOME;
-		String remoteTag = local ? LOCAL : REMOTE;
-		EStructuralFeature homeFeature = local ? COMMON_PKG.getEJBLocalRef_LocalHome() : COMMON_PKG.getEjbRef_Home();
-		EStructuralFeature remoteFeature = local ? COMMON_PKG.getEJBLocalRef_Local() : COMMON_PKG.getEjbRef_Remote();
-		
-		GenericTranslator result = new GenericTranslator(nodeName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,				
-			createDescriptionTranslator(COMMON_PKG.getEjbRef_Descriptions()),
-			EJB_REF_NAME_TRANSLATOR,
-			EJB_REF_TYPE_TRANSLATOR,
-			new Translator(homeTag, homeFeature),
-			new Translator(remoteTag, remoteFeature),
-			EJB_LINK_TRANSLATOR,
-		//	createDeploymentExtensionTranslator(COMMON_PKG.getEjbRef_Extensions())
-		});
-		return result;
-	}
-	
-	
-	public static Translator createRunAsTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RUN_AS, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityIdentity_Description()),
-			//new DependencyTranslator(DES,)
-			RUNAS_ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-
-
-	public static Translator createRunAsTranslator14(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(RUN_AS, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getSecurityIdentity_Descriptions()),
-			RUNAS_ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-	
-	
-	
-	public static  Translator createMessageDestinationRefTranslator(EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(MESSAGE_DEST_REF,feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getMessageDestinationRef_Descriptions()),
-			new Translator(MESSAGE_DEST_REF_NAME,COMMON_PKG.getMessageDestinationRef_Name()),
-			new Translator(MESSAGE_DEST_TYPE,COMMON_PKG.getMessageDestinationRef_Type()),
-			new Translator(MESSAGE_DEST_USAGE,COMMON_PKG.getMessageDestinationRef_Usage()),
-			new Translator(MESSAGE_DEST_LINK,COMMON_PKG.getMessageDestinationRef_Link()),
-			//createDeploymentExtensionTranslator(COMMON_PKG.getMessageDestinationRef_Extensions())	
-		});
-
-		return result;
-	}
-	
-	public static  Translator createMessageDestinationTranslator(EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(MESSAGE_DEST,feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			DESCRIPTIONS_TRANSLATOR,
-			DISPLAYNAMES_TRANSLATOR,
-			ICONS_TRANSLATOR,
-			new Translator(MESSAGE_DEST_NAME,COMMON_PKG.getMessageDestination_Name()),
-			//createDeploymentExtensionTranslator(COMMON_PKG.getMessageDestination_Extensions())
-		});
-
-		return result;
-	}
-
-	/**
-	 * This model was model from Websphere Webservices
-	 * @param reference
-	 * @return
-	 */
-	public static Translator createServiceRefGroupTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(SERVICE_REF, feature);
-		result.setChildren( new Translator[] {
-			IDTranslator.INSTANCE,
-			DESCRIPTIONS_TRANSLATOR,
-			DISPLAYNAMES_TRANSLATOR,
-			ICONS_TRANSLATOR,
-			new Translator(SERVICE_REF_NAME, WEBSERVICE_PKG.getServiceRef_ServiceRefName()),
-			new JavaClassTranslator(SERVICE_INTERFACE, WEBSERVICE_PKG.getServiceRef_ServiceInterface()),
-			new Translator(WSDL_FILE, WEBSERVICE_PKG.getServiceRef_WsdlFile()),
-			new Translator(JAXRPC_MAPPING_FILE, WEBSERVICE_PKG.getServiceRef_JaxrpcMappingFile()),
-			createQNameTranslator(SERVICE_QNAME, WEBSERVICE_PKG.getServiceRef_ServiceQname()),
-			createPortComponentRefTranslator(),
-			createServiceRefHandlerTranslator(),
-		});
-		
-		
-		return result;
-	}
-	
-	public static Translator createQNameTranslator(String domName, EStructuralFeature feature) {		
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, CommonPackage.eINSTANCE.getQName_CombinedQName())			
-		});
-		return result;	
-	}
-
-	/**
-	 * This model was model from Websphere Webservices
-	 * @return
-	 */
-	public static Translator createServiceRefHandlerTranslator() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WEBSERVICE_PKG.getServiceRef_Handlers());
-		result.setChildren(new Translator[]{
-			IDTranslator.INSTANCE,
-			DESCRIPTIONS_TRANSLATOR,
-			DISPLAYNAMES_TRANSLATOR,
-			ICONS_TRANSLATOR,
-			new Translator(HANDLER_NAME, WEBSERVICE_PKG.getHandler_HandlerName()),
-			new JavaClassTranslator(HANDLER_CLASS, WEBSERVICE_PKG.getHandler_HandlerClass()),
-			createParamValueType(HANDLER_INIT_PARAM, WEBSERVICE_PKG.getHandler_InitParams()),
-			createQNameTranslator(SOAP_HEADER, WEBSERVICE_PKG.getHandler_SoapHeaders()),
-			new Translator(SOAP_ROLE, WEBSERVICE_PKG.getHandler_SoapRoles()),
-			new Translator(PORT_NAME, WEBSERVICE_PKG.getHandler_PortNames())
-		});
-		
-		return result;
-	}
-
-	/**
-	 * @return
-	 */
-	public static Translator createPortComponentRefTranslator() {
-		GenericTranslator result = new GenericTranslator(PORT_COMPONENT_REF, WEBSERVICE_PKG.getServiceRef_PortComponentRefs());
-		result.setChildren( new Translator[]{
-			IDTranslator.INSTANCE,
-			new JavaClassTranslator(SERVICE_ENPOINT_INTERFACE, WEBSERVICE_PKG.getPortComponentRef_ServiceEndpointInterface()),
-			new Translator(PORT_COMPONENT_LINK , WEBSERVICE_PKG.getPortComponentRef_PortComponentLink())
-		});
-		return result;
-	}
-
-	/**
-	 * @return
-	 */
-	public static Translator createDescriptionTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(DESCRIPTION, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDescription_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDescription_Value()) //$NON-NLS-1$
-		});
-		return result;
-	}
-	
-	/**
-	 * @return
-	 */
-	public static Translator createDisplayNameTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(DISPLAY_NAME, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDisplayName_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDisplayName_Value()) //$NON-NLS-1$
-		});
-		return result;
-	}
-
-	
-	/**
-	 * @return
-	 */
-	public static Translator createIconTranslator() {
-		GenericTranslator result = new GenericTranslator(ICON, COMMON_PKG.getDescriptionGroup_Icons());
-		result.setChildren(new Translator[] {
-			new Translator(LANG, COMMON_PKG.getIconType_Lang(), Translator.DOM_ATTRIBUTE),
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON, COMMON_PKG.getIconType_SmallIcon()), //$NON-NLS-1$
-			new Translator(LARGE_ICON, COMMON_PKG.getIconType_LargeIcon()) //$NON-NLS-1$
-		});
-		return result;
-	}
-
-//	public static Translator createDeploymentExtensionTranslator(EStructuralFeature feature) {
-//		return createDeploymentExtensionTranslator(DEPLOY_EXT, feature);
-//	}
-//
-//	public static Translator createDeploymentExtensionTranslator(String domName, EStructuralFeature feature) {
-//		GenericTranslator result = new GenericTranslator(domName, feature);
-//		result.setChildren(new Translator[] {
-//			new Translator(NAMESPACE, COMMON_PKG.getDeploymentExtension_Namespace(), Translator.DOM_ATTRIBUTE),
-//			new Translator(MUSTUNDERSTAND, COMMON_PKG.getDeploymentExtension_MustUnderstand(), Translator.DOM_ATTRIBUTE),
-//			IDTranslator.INSTANCE,
-//			Translator.createParentAndTextAttributeTranslator(EXT_ELEMENT, COMMON_PKG.getDeploymentExtension_ExtensionElements(), COMMON_PKG.getExtensibleType_Value())
-//		});
-//		return result;
-//	}
-	
-	public static Translator createParamValueType(String domName, EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createDescriptionTranslator(COMMON_PKG.getParamValue_Descriptions()),
-			new Translator(PARAM_NAME, COMMON_PKG.getParamValue_Name()),
-			new Translator(PARAM_VALUE, COMMON_PKG.getParamValue_Value()),
-		});
-		return result;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTranslator.java
deleted file mode 100644
index 9ecf0f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTranslator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EnvEntryTranslator extends Translator implements DeploymentDescriptorXmlMapperI {
-	private boolean isJ2EE14;
-	private static Translator[] children;
-	private static Translator[] reorderedChildren;
-	//Hacks because of inconsistencies in the servlet spec
-	boolean typeBeforeValue = true;
-	/**
-	 * Constructor for EnvEntryTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public EnvEntryTranslator(EStructuralFeature aFeature, boolean writeTypeBeforeValue, boolean isJ2EE14) {
-		super(ENV_ENTRY, aFeature);
-		typeBeforeValue = writeTypeBeforeValue;
-		this.isJ2EE14 = isJ2EE14;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren()
-	 */
-	public Translator[] getChildren(Object obj, int versionID) {
-		//Hava to you create a different one each time
-		children = createChildren();
-		setReorderedChildren();
-		
-		if (typeBeforeValue)
-			return children;
-		
-		return reorderedChildren;
-	}
-
-	protected Translator[] createChildren() {
-		CommonPackage ePackageCommon = CommonPackage.eINSTANCE;
-		Translator descriptionTranslator;
-		if (isJ2EE14)
-			descriptionTranslator = CommonTranslators.createDescriptionTranslator(ePackageCommon.getEnvEntry_Descriptions()); 
-		else 
-			descriptionTranslator = new Translator(DESCRIPTION, ePackageCommon.getEnvEntry_Description());
-			
-		return new Translator[] {
-			IDTranslator.INSTANCE,				
-			descriptionTranslator,
-			new Translator(ENV_ENTRY_NAME, ePackageCommon.getEnvEntry_Name()),
-			new EnvEntryTypeTranslator(), 
-			new Translator(ENV_ENTRY_VALUE, ePackageCommon.getEnvEntry_Value())
-		};
-	}
-	
-	protected void setReorderedChildren() {
-		reorderedChildren = new Translator[children.length];
-		System.arraycopy(children, 0, reorderedChildren, 0, children.length);
-		Translator temp = reorderedChildren[3];
-		reorderedChildren[3] = reorderedChildren[4];
-		reorderedChildren[4] = temp;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTypeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTypeTranslator.java
deleted file mode 100644
index 78e6558..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/EnvEntryTypeTranslator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class EnvEntryTypeTranslator extends Translator implements DeploymentDescriptorXmlMapperI {
-	private static final String JAVA_LANG= "java.lang."; //$NON-NLS-1$
-	private static final int SUBSTRING_LENGTH = JAVA_LANG.length();
-	public EnvEntryTypeTranslator() {
-		super(ENV_ENTRY_TYPE, CommonPackage.eINSTANCE.getEnvEntry_Type());
-	}
-	
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(String)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {		
-		if (strValue != null && strValue.startsWith(JAVA_LANG)) 
-			return super.convertStringToValue(strValue.substring(SUBSTRING_LENGTH), owner);
-		
-		return null;
-	}
-	
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(Object)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (value != null) 
-			return JAVA_LANG + ((Enumerator)value).getName(); //$NON-NLS-1$
-		return null;
-	}
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/JavaClassTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/JavaClassTranslator.java
deleted file mode 100644
index 375d9fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/JavaClassTranslator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-public class JavaClassTranslator extends Translator {
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature) {
-		super(domNameAndPath, aFeature);
-	}
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param path
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath path) {
-		super(domNameAndPath, aFeature, path);
-	}
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param paths
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature, TranslatorPath[] paths) {
-		super(domNameAndPath, aFeature, paths);
-	}
-
-	/**
-	 * Constructor for JavaClassTranslator.
-	 * @param domNameAndPath
-	 * @param aFeature
-	 * @param style
-	 */
-	public JavaClassTranslator(String domNameAndPath, EStructuralFeature aFeature, int style) {
-		super(domNameAndPath, aFeature, style);
-	}
-
-	public Object convertStringToValue(String nodeName, String readAheadName, String value, Notifier owner) {
-		Object result = null;
-		if (value != null) {
-			result = convertStringToValue(value, (EObject) owner);
-		}
-		
-		return result;
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(String)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (strValue != null) {
-			String qualifiedName = removePreceedingAndTrailingPeriods(strValue.trim());		
-			if (owner != null) {
-				Resource ownerRes = owner.eResource();
-				if (ownerRes != null) {
-					ResourceSet rs = ownerRes.getResourceSet();
-					if (rs != null) {
-						//Try to reflect the type directly.  If nothing is returned
-						//or an error occurs, return a proxy.
-						Object javaClass = null;
-						try {
-							javaClass = JavaRefFactory.eINSTANCE.reflectType(qualifiedName, rs);
-						} catch (Exception e) {
-							//Ignore
-						}
-						if (javaClass != null)
-							return javaClass;
-					}
-				}
-			}
-			return JavaRefFactory.eINSTANCE.createClassRef(qualifiedName);
-		}
-		return null;
-	}
-	private String removePreceedingAndTrailingPeriods(String qualifiedName) {
-		char[] characters = qualifiedName.toCharArray();
-		int startIndex = 0;
-		for (; startIndex < characters.length && characters[startIndex] == '.'; startIndex++);
-		int qualifiedNameEnd = qualifiedName.length() - 1;
-		int endIndex = qualifiedNameEnd;
-		for (; endIndex > -1 && characters[endIndex] == '.'; endIndex--)
-		if (startIndex == 0 && endIndex == qualifiedNameEnd)
-			return qualifiedName;
-		return qualifiedName.substring(startIndex, endIndex + 1);
-	}	
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(Object)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (value != null)
-			return ((JavaClass) value).getQualifiedName();
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/ResAuthTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/ResAuthTranslator.java
deleted file mode 100644
index 5286650..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/common/ResAuthTranslator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 30, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.common;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-/**
- * @author schacher
- */
-public class ResAuthTranslator extends Translator implements DeploymentDescriptorXmlMapperI {
-
-	private static final String CONTAINER_AUTH = "CONTAINER"; //$NON-NLS-1$
-	private static final String SERVLET_AUTH = "SERVLET"; //$NON-NLS-1$
-	public ResAuthTranslator() {
-		super(RES_AUTH, CommonPackage.eINSTANCE.getResourceRef_Auth());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (isWeb((ResourceRef)owner))
-			return convertWebStringToValue(strValue, owner);
-		
-		return super.convertStringToValue(strValue, owner);
-	}
-	
-	/**
-	 * @param strValue
-	 * @param owner
-	 * @return
-	 */
-	private Object convertWebStringToValue(String strValue, EObject owner) {
-		if (SERVLET_AUTH.equals(strValue)) 
-			return ResAuthTypeBase.APPLICATION_LITERAL;
-		else if (CONTAINER_AUTH.equals(strValue)) 
-			return ResAuthTypeBase.CONTAINER_LITERAL;
-		else 
-			return super.convertStringToValue(strValue, owner);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(java.lang.Object, org.eclipse.emf.ecore.EObject)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (isWeb22(((ResourceRef)owner)))
-			return convertWebValueToString(value, owner);
-		 
-		return super.convertValueToString(value, owner);
-	}
-	
-	/**
-	 * @param value
-	 * @param owner
-	 */
-	private String convertWebValueToString(Object value, EObject owner) {
-		if (ResAuthTypeBase.APPLICATION_LITERAL == value)
-			return SERVLET_AUTH;
-		else if (ResAuthTypeBase.CONTAINER_LITERAL == value)
-			return CONTAINER_AUTH;
-		else 
-			return super.convertValueToString(value, owner);
-	}
-
-	protected boolean isWeb(ResourceRef ref) {
-		EObject owner = ref.eContainer();
-		return (owner instanceof WebApp);
-	}
-	protected boolean isWeb22(ResourceRef ref) { 
-		return isWeb(ref) && ((WebApp)ref.eContainer()).getVersionID() <= J2EEVersionConstants.WEB_2_2_ID;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/connector/ConnectorTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/connector/ConnectorTranslator.java
deleted file mode 100644
index a78ced9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/connector/ConnectorTranslator.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.connector;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.BooleanTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.RarDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-public class ConnectorTranslator extends RootTranslator implements RarDeploymentDescriptorXmlMapperI, J2EEConstants {
-	public static ConnectorTranslator INSTANCE = new ConnectorTranslator();
-	public static final String CONNECTOR = "connector"; //$NON-NLS-1$
-	private static JcaPackage CONNECTOR_PKG = JcaPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	private static final Translator VENDOR_NAME_TRANSLATOR = new Translator(VENDOR_NAME, CONNECTOR_PKG.getConnector_VendorName());
-	private static final Translator EIS_TYPE_TRANSLATOR = new Translator(EIS_TYPE, CONNECTOR_PKG.getConnector_EisType());
-	
-	private static final Translator CONFIG_PROPERTY_NAME_TRANSLATOR= new Translator(CONFIG_PROPERTY_NAME, CONNECTOR_PKG.getConfigProperty_Name());
-	private static final Translator CONFIG_PROPERTY_TYPE_TRANSLATOR= new Translator(CONFIG_PROPERTY_TYPE, CONNECTOR_PKG.getConfigProperty_Type());
-	private static final Translator CONFIG_PROPERTY_VALUE_TRANSLATOR= new Translator(CONFIG_PROPERTY_VALUE, CONNECTOR_PKG.getConfigProperty_Value());
-	
-	private static final Translator SECURITY_PERMISSION_SPEC_TRANSLATOR = new Translator(SECURITY_PERMISSION_SPEC, CONNECTOR_PKG.getSecurityPermission_Specification());
-	
-	private static final Translator AUTH_MECH_TYPE_TRANSLATOR = new Translator(AUTH_MECH_TYPE, CONNECTOR_PKG.getAuthenticationMechanism_AuthenticationMechanismType());
-	private static final Translator CREDENTIAL_INTERFACE_TRANSLATOR = new Translator(CREDENTIAL_INTERFACE, CONNECTOR_PKG.getAuthenticationMechanism_CredentialInterface());
-	
-	private static final BooleanTranslator LICENSE_REQUIRED_TRANSLATOR = new BooleanTranslator(LICENSE_REQUIRED, CONNECTOR_PKG.getLicense_Required());
-	
-	public ConnectorTranslator() {
-		super(CONNECTOR, JcaPackage.eINSTANCE.getConnector());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-	
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName() ),
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(ICON+"/"+SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon() ), //$NON-NLS-1$
-			new Translator(ICON+"/"+LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon() ), //$NON-NLS-1$
-			VENDOR_NAME_TRANSLATOR,
-			new Translator(SPEC_VERSION, CONNECTOR_PKG.getConnector_SpecVersion() ),
-			EIS_TYPE_TRANSLATOR,
-			new Translator(VERSION, CONNECTOR_PKG.getConnector_Version() ),
-			createLicenseTranslator13(),
-			createResourceAdapterTranslator13()
-		};
-	}
-	
-	protected Translator[] create14Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, CONNECTOR_PKG.getConnector_SpecVersion(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+CONNECTOR_SCHEMA_LOC_1_5),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			VENDOR_NAME_TRANSLATOR,
-			EIS_TYPE_TRANSLATOR,
-			new Translator(RESOURCEADAPTER_VERSION, CONNECTOR_PKG.getConnector_Version()),
-			createLicenseTranslator14(),
-			createResourceAdapterTranslator14(),
-		};
-	}
-
-	private Translator createResourceAdapterTranslator14() {
-		GenericTranslator result = new GenericTranslator(RESOURCEADAPTER, CONNECTOR_PKG.getConnector_ResourceAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(RESOURCEADAPTER_CLASS,CONNECTOR_PKG.getResourceAdapter_ResourceAdapterClass()),
-			createConfigurationPropertyTranslator14(CONNECTOR_PKG.getResourceAdapter_ConfigProperties()),
-			createOutboundTranslator(),
-			createInboundTranslator(),
-			createAdminObjectTranslator(),
-			createSecurityPermissionsTranslator()
-		});
-		return result;
-	}
-
-	private Translator createOutboundTranslator() {
-		GenericTranslator result = new GenericTranslator(OUTBOUND_RESOURCEADAPTER, CONNECTOR_PKG.getResourceAdapter_OutboundResourceAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createConnectionDefinationTranslator(),
-			new Translator(TRANSACTION_SUPPORT, CONNECTOR_PKG.getOutboundResourceAdapter_TransactionSupport()),
-			createAuthMechanismTranslator14(CONNECTOR_PKG.getOutboundResourceAdapter_AuthenticationMechanisms()),
-			new BooleanTranslator(REAUTHENTICATION_SUPPORT, CONNECTOR_PKG.getOutboundResourceAdapter_ReauthenticationSupport()),
-		});
-		return result;
-	}
-
-	private Translator createInboundTranslator() {
-		GenericTranslator result = new GenericTranslator(INBOUND_RESOURCEADAPTER, CONNECTOR_PKG.getResourceAdapter_InboundResourceAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createMessageAdapterTranslator()
-		});
-
-		return result;
-	}
-	
-	private Translator createMessageAdapterTranslator() {
-		GenericTranslator result = new GenericTranslator(MESSAGEADAPTER, CONNECTOR_PKG.getInboundResourceAdapter_MessageAdapter());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createMessageListenerTranslator(),
-		});
-
-		return result;
-	}
-		
-	private Translator createMessageListenerTranslator() {
-		GenericTranslator result = new GenericTranslator(MESSAGELISTENER, CONNECTOR_PKG.getMessageAdapter_MessageListeners());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(MESSAGELISTENER_TYPE, CONNECTOR_PKG.getMessageListener_MessageListenerType()),
-			createActivationSpecTranslator()
-		});
-		return result;
-	}
-
-	private Translator createActivationSpecTranslator() {
-		GenericTranslator result = new GenericTranslator(ACTIVATIONSPEC, CONNECTOR_PKG.getMessageListener_ActivationSpec());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(ACTIVATIONSPEC_CLASS, CONNECTOR_PKG.getActivationSpec_ActivationSpecClass()),
-			createRequiredConfigPropertyTranslator()
-		});
-		return result;
-	}
-
-	private Translator createRequiredConfigPropertyTranslator() {
-		GenericTranslator result = new GenericTranslator(REQUIRED_CONFIG_PROPERTY, CONNECTOR_PKG.getActivationSpec_RequiredConfigProperties());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getRequiredConfigPropertyType_Descriptions()),
-			new Translator(CONFIG_PROPERTY_NAME, CONNECTOR_PKG.getRequiredConfigPropertyType_Name())
-		});
-		return result;
-	}
-	
-	private Translator createAdminObjectTranslator() {
-		GenericTranslator result = new GenericTranslator(ADMINOBJECT, CONNECTOR_PKG.getResourceAdapter_AdminObjects());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(ADMINOBJECT_INTERFACE, CONNECTOR_PKG.getAdminObject_AdminObjectInterface()),
-			new Translator(ADMINOBJECT_CLASS, CONNECTOR_PKG.getAdminObject_AdminObjectClass()),
-			createConfigurationPropertyTranslator14(CONNECTOR_PKG.getAdminObject_ConfigProperties())
-			
-		});
-		return result;
-	}
-
-	private Translator createConnectionDefinationTranslator() {
-		GenericTranslator result = new GenericTranslator(CONNECTION_DEFINITION, CONNECTOR_PKG.getOutboundResourceAdapter_ConnectionDefinitions());
-		result.setChildren(new Translator[] {
-			new Translator(MANAGEDCONNECTIONFACTORY_CLASS, CONNECTOR_PKG.getConnectionDefinition_ManagedConnectionFactoryClass()),
-			createConfigurationPropertyTranslator14(CONNECTOR_PKG.getConnectionDefinition_ConfigProperties()),
-			new Translator(CONNECTIONFACTORY_INTERFACE, CONNECTOR_PKG.getConnectionDefinition_ConnectionFactoryInterface()),
-			new Translator(CONNECTIONFACTORY_IMPL_CLASS, CONNECTOR_PKG.getConnectionDefinition_ConnectionFactoryImplClass()),
-			new Translator(CONNECTION_INTERFACE, CONNECTOR_PKG.getConnectionDefinition_ConnectionInterface()),
-			new Translator(CONNECTION_IMPL_CLASS, CONNECTOR_PKG.getConnectionDefinition_ConnectionImplClass()),
-		});
-		return result;
-	}
-
-	public Translator createResourceAdapterTranslator13() {
-		GenericTranslator result = new GenericTranslator(RESOURCEADAPTER, CONNECTOR_PKG.getConnector_ResourceAdapter());
-		result.setChildren(new Translator[] {
-			new Translator(MANAGEDCONNECTIONFACTORY_CLASS, CONNECTOR_PKG.getResourceAdapter_ManagedConnectionFactoryClass() ),
-			new Translator(CONNECTIONFACTORY_INTERFACE, CONNECTOR_PKG.getResourceAdapter_ConnectionFactoryInterface() ),
-			new Translator(CONNECTIONFACTORY_IMPL_CLASS, CONNECTOR_PKG.getResourceAdapter_ConnectionFactoryImplClass() ),
-			new Translator(CONNECTION_INTERFACE, CONNECTOR_PKG.getResourceAdapter_ConnectionInterface()),
-			new Translator(CONNECTION_IMPL_CLASS, CONNECTOR_PKG.getResourceAdapter_ConnectionImplClass()),
-			new Translator(TRANSACTION_SUPPORT, CONNECTOR_PKG.getResourceAdapter_TransactionSupport() ),
-			createConfigurationPropertyTranslator13(CONNECTOR_PKG.getResourceAdapter_ConfigProperties()),
-			createAuthMechanismTranslator13(CONNECTOR_PKG.getResourceAdapter_AuthenticationMechanisms()),
-			new BooleanTranslator(REAUTHENTICATION_SUPPORT, CONNECTOR_PKG.getResourceAdapter_ReauthenticationSupport()),
-			createSecurityPermissionsTranslator()
-			
-			
-		});
-		return result;
-	}
-	
-	public Translator createSecurityPermissionsTranslator() {
-		GenericTranslator result = new GenericTranslator(SECURITY_PERMISSION, CONNECTOR_PKG.getResourceAdapter_SecurityPermissions());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getSecurityPermission_Description()),
-			SECURITY_PERMISSION_SPEC_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createAuthMechanismTranslator13(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(AUTH_MECHANISM, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getAuthenticationMechanism_Description()), 
-			AUTH_MECH_TYPE_TRANSLATOR,
-			CREDENTIAL_INTERFACE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createAuthMechanismTranslator14(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(AUTH_MECHANISM, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getAuthenticationMechanism_Descriptions()), 
-			AUTH_MECH_TYPE_TRANSLATOR,
-			CREDENTIAL_INTERFACE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	
-	public Translator createConfigurationPropertyTranslator13(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(CONFIG_PROPERTY, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getConfigProperty_Description()),
-			CONFIG_PROPERTY_NAME_TRANSLATOR,
-			CONFIG_PROPERTY_TYPE_TRANSLATOR,
-			CONFIG_PROPERTY_VALUE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createConfigurationPropertyTranslator14(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(CONFIG_PROPERTY, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getConfigProperty_Descriptions()),
-			CONFIG_PROPERTY_NAME_TRANSLATOR,
-			CONFIG_PROPERTY_TYPE_TRANSLATOR,
-			CONFIG_PROPERTY_VALUE_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createLicenseTranslator13() {
-		GenericTranslator result = new GenericTranslator(LICENSE, CONNECTOR_PKG.getConnector_License());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, CONNECTOR_PKG.getLicense_Description()), 
-			LICENSE_REQUIRED_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public Translator createLicenseTranslator14() {
-		GenericTranslator result = new GenericTranslator(LICENSE, CONNECTOR_PKG.getConnector_License());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.createDescriptionTranslator(CONNECTOR_PKG.getLicense_Descriptions()), 
-			LICENSE_REQUIRED_TRANSLATOR
-		});
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AbstractEJBTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AbstractEJBTranslator.java
deleted file mode 100644
index 22df309..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AbstractEJBTranslator.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public abstract class AbstractEJBTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI, J2EEVersionConstants {
-	protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	protected static final CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-	
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AbstractEJBTranslator(String domNameAndPath) {
-		super(domNameAndPath, EJB_PKG.getEJBJar_EnterpriseBeans());
-	}
-
-	
-	protected Translator[] create13Children() {
-		Translator[] start = getCommonBeginMaps13();
-		Translator[] middle = getSpecificMaps(J2EE_1_3_ID);
-		Translator[] end = getEndMaps13();
-		return (Translator[]) concat(start, concat(middle, end));
-	}
-	
-	protected Translator[] create14Children() {
-			Translator[] start = getCommonBeginMaps14();
-			Translator[] middle = getSpecificMaps(J2EE_1_4_ID);
-			Translator[] end = getEndMaps14();
-			//Translator[] deploymentExt = getDeploymentExtensionMaps();
-			return (Translator[]) concat(start, concat(middle, end));
-	}
-	
-	protected Translator[] getCommonBeginMaps13() {
-		
-		Translator[] beginMaps =  new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new Translator(EJB_NAME, EJB_PKG.getEnterpriseBean_Name())
-		};
-		
-		if (usesHomeRemoteAttributes())
-			return (Translator[])concat(concat(beginMaps, getHomeRemoteMaps()), getEJBClassMap());
-		return (Translator[])concat(beginMaps, getEJBClassMap());
-	}
-	
-
-	protected Translator[] getCommonBeginMaps14() {
-		
-		Translator[] beginMaps =  new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(EJB_NAME, EJB_PKG.getEnterpriseBean_Name())
-		};
-		if (usesHomeRemoteAttributes())
-			return (Translator[])concat(concat(beginMaps, getHomeRemoteMaps()), getEJBClassMap());
-		return (Translator[])concat(beginMaps, getEJBClassMap());
-	}
-	
-	protected Translator[] getHomeRemoteMaps() {
-		return new Translator[] {
-			new JavaClassTranslator(HOME, EJB_PKG.getEnterpriseBean_HomeInterface()),
-			new JavaClassTranslator(REMOTE, EJB_PKG.getEnterpriseBean_RemoteInterface()),
-			//Begin EJB 2.0
-			new JavaClassTranslator(LOCAL_HOME, EJB_PKG.getEnterpriseBean_LocalHomeInterface()),
-			new JavaClassTranslator(LOCAL, EJB_PKG.getEnterpriseBean_LocalInterface())
-			//End EJB 2.0
-		};
-	}
-
-	protected Translator[] getEJBClassMap() {
-		return new Translator[] {
-			new JavaClassTranslator(EJB_CLASS, EJB_PKG.getEnterpriseBean_EjbClass())
-		};
-	}
-
-	protected boolean usesHomeRemoteAttributes() {
-		return true;
-	}
-
-
-	protected Translator[] getEndMaps13() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_3,
-			CommonTranslators.createSecurityRoleRefTranslator13(EJB_PKG.getEnterpriseBean_SecurityRoleRefs()),
-			new SecurityIdentityTranslator(),
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3
-		};
-
-	}
-		
-	protected Translator[] getEndMaps14() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_SERVICE_REF_1_4,	
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4,
-			CommonTranslators.createSecurityRoleRefTranslator14(EJB_PKG.getEnterpriseBean_SecurityRoleRefs()),
-			new SecurityIdentityTranslator(),
-		};
-		
-	}
-	
-	protected abstract Translator[] getSpecificMaps(int versionID);
-
-//	protected Translator[] getDeploymentExtensionMaps(){
-//		return new Translator[] {
-//			CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEnterpriseBean_Extensions())
-//		};
-//	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AcknowledgeModeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AcknowledgeModeTranslator.java
deleted file mode 100644
index 8a3f970..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/AcknowledgeModeTranslator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.AcknowledgeMode;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class AcknowledgeModeTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-
-	public static final String AUTO_ACKNOWLEDGE = "Auto-acknowledge"; //$NON-NLS-1$
-	public static final String DUPS_OK_ACKNOWLEDGE = "Dups-ok-acknowledge"; //$NON-NLS-1$
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public AcknowledgeModeTranslator() {
-		super(ACKNOWLEDGE_MODE, EjbPackage.eINSTANCE.getMessageDriven_AcknowledgeMode());
-	}
-	
-	
-	public Object convertStringToValue(String strValue, EObject owner) {
-		if (AUTO_ACKNOWLEDGE.equalsIgnoreCase(strValue))
-			return AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL;
-		else if (DUPS_OK_ACKNOWLEDGE.equalsIgnoreCase(strValue))
-			return AcknowledgeMode.DUPS_OK_ACKNOWLEDGE_LITERAL;
-		else 
-			return super.convertStringToValue(strValue, owner);
-	}
-
-	public String convertValueToString(Object value, EObject owner) {
-		if (AcknowledgeMode.AUTO_ACKNOWLEDGE_LITERAL.equals(value)) 
-			return AUTO_ACKNOWLEDGE;
-		else if (AcknowledgeMode.DUPS_OK_ACKNOWLEDGE_LITERAL.equals(value))
-			return DUPS_OK_ACKNOWLEDGE;
-		else
-			return super.convertValueToString(value, owner);
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPFieldTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPFieldTranslator.java
deleted file mode 100644
index 112d890..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPFieldTranslator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CMPFieldTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	public static EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	public static Translator[] children;
-	public CMPFieldTranslator(){
-		super(CMP_FIELD, EJB_PKG.getContainerManagedEntity_PersistentAttributes());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren()
-	 */
-	protected Translator[] getChildren() {
-		if (children == null)
-			children = createChildren();
-		return children;
-	}
-
-	protected Translator[] createChildren(){
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION,EJB_PKG.getCMPAttribute_Description()),
-			new Translator(FIELD_NAME, EcorePackage.eINSTANCE.getENamedElement_Name())	
-		};
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-	 */
-	public List getMOFChildren(EObject mofObject) {
-		switch(((ContainerManagedEntity)mofObject).getVersionID()) {  
-			
-			case J2EEVersionConstants.EJB_1_0_ID:
-			case J2EEVersionConstants.EJB_1_1_ID:
-	
-				return super.getMOFChildren(mofObject);
-				
-			case J2EEVersionConstants.EJB_2_0_ID:
-			case J2EEVersionConstants.EJB_2_1_ID: default:
-	
-				return get20CMPAttributes((ContainerManagedEntity)mofObject);
-		}  
-	}
-	
-	public List get20CMPAttributes(ContainerManagedEntity cmp) {
-		List allAttributes, removed, result;
-		removed = null;
-		allAttributes = cmp.getPersistentAttributes();
-		int size = allAttributes.size();
-		CMPAttribute att = null;
-		for (int i = 0; i < size; i++) {
-			att = (CMPAttribute) allAttributes.get(i);
-			if (att.isDerived()) {
-				if (removed == null)
-					removed = new ArrayList();
-				removed.add(att);
-			}
-		}
-		if (removed != null) {
-			result = new ArrayList(size);
-			result.addAll(allAttributes);
-			result.removeAll(removed);
-		} else
-			result = allAttributes;
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPVersionTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPVersionTranslator.java
deleted file mode 100644
index 2e20ad6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/CMPVersionTranslator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 3, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class CMPVersionTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public CMPVersionTranslator() {
-		super(CMP_VERSION, EjbPackage.eINSTANCE.getContainerManagedEntity_Version());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
-	 */
-	public Object getMOFValue(EObject mofObject) {
-		EJBJar parent = ((ContainerManagedEntity)mofObject).getEjbJar();
-		if (parent.getVersionID() >= J2EEVersionConstants.EJB_2_0_ID)
-			return super.getMOFValue(mofObject);
-		return null;
-	}
-	
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/ContainerManagedEntityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/ContainerManagedEntityTranslator.java
deleted file mode 100644
index ce47a35..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/ContainerManagedEntityTranslator.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class ContainerManagedEntityTranslator extends EntityTranslator {
-
-	private static Translator[] children13;
-	private static Translator[] children14;
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public ContainerManagedEntityTranslator() {
-		super();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createContainerManagedEntity();
-	}
-	//TODO Uncomment all commented code and fix
-	/*
-	protected String extractStringValue(MapInfo map, EObject mofObject) {
-		if (map.getDOMName().equals(PRIMKEY_FIELD)) {	
-			CMPAttribute attr = getContainerManagedEntity().getPrimaryKeyAttribute();
-			return attr == null ? getSpecifiedPrimKeyFieldName() : attr.getName();
-		} else
-			return super.extractStringValue(map, mofObject);
-	
-	} 
-
-	protected String getSpecifiedPrimKeyFieldName() {
-		return CMPSpecAdapter.getSpecifiedPrimKeyFieldName(getContainerManagedEntity());
-	}
-	*/
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected String getPersistenceType() {
-		return CONTAINER;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.EntityTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		Translator[] cmpTranslators = new Translator[] {
-			//Begin EJB 2.0 added
-			new CMPVersionTranslator(),
-			new Translator(ABSTRACT_SCHEMA_NAME, EJB_PKG.getContainerManagedEntity_AbstractSchemaName()),
-			//End EJB 2.0 added
-		
-			new CMPFieldTranslator(),
-			new PrimKeyFieldTranslator(),
-		};
-		return (Translator[]) concat(super.getSpecificMaps(versionID), cmpTranslators);
-	}
-	
-	
-	protected Translator[] getEndMaps13() {
-		//Added for EJB 2.0
-		Translator[] queryT = new Translator[] {
-			createQueryTranslators()
-		};
-		return (Translator[]) concat(super.getEndMaps13(), queryT);
-	}
-	
-	protected Translator[] getEndMaps14() {
-			//Added for EJB 2.0
-			Translator[] queryT = new Translator[] {
-				createQueryTranslators()
-			};
-			return (Translator[]) concat(super.getEndMaps14(), queryT);
-	}
-		
-	public static Translator createQueryTranslators() {
-		GenericTranslator result = new GenericTranslator(QUERY, EJB_PKG.getContainerManagedEntity_Queries());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, EJB_PKG.getQuery_Description()),
-			createQueryMethodTranslators(),
-			new Translator(RESULT_TYPE_MAPPING, EJB_PKG.getQuery_ReturnTypeMapping()),
-			new Translator(EJB_QL, EJB_PKG.getQuery_EjbQL())
-		});
-		return result;
-	}
-	
-	public static Translator createQueryMethodTranslators() {
-		GenericTranslator result = new GenericTranslator(QUERY_METHOD, EJB_PKG.getQuery_QueryMethod());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(METHOD_NAME, EJB_PKG.getMethodElement_Name()),
-			new MethodParamsTranslator(EJB_PKG.getMethodElement_Parms())
-			});
-		return result;
-	}
-	
-	/*
-	protected void primUpdateDOMFeature(MapInfo map, Node node, EObject mofObject) {
-		if (map == noFeaturePrimKeyMapInfo)
-			return;
-		if (map.getDOMName().equals(CMP_VERSION)) {
-			updateDOMCmpVersionIfNecessary(map, node, mofObject);
-			return;
-		}
-		super.primUpdateDOMFeature(map, node, mofObject);
-		//If the primary key class has changed, this will impact the primary key field
-		if (map.getDOMName().equals(PRIM_KEY_CLASS)) {
-			String specifiedPrimKeyField = CMPSpecAdapter.getSpecifiedPrimKeyFieldName(getContainerManagedEntity());
-			try {
-				super.primUpdateDOMFeature(noFeaturePrimKeyMapInfo, node, mofObject);
-			} finally {
-				CMPSpecAdapter.setPrimKeyFieldFromXml(specifiedPrimKeyField, getContainerManagedEntity());
-			}
-		}
-	}
-	
-
-	protected void updateDOMCmpVersionIfNecessary(MapInfo map, Node node, EObject mofObject) {
-		if (!(mofObject instanceof ContainerManagedEntity)) 
-			return;
-		
-		EJBJar parent = ((ContainerManagedEntity)mofObject).getEjbJar();
-		if (parent.isVersion2_0Descriptor())
-			super.primUpdateDOMFeature(map, node, mofObject);
-	}
-	protected void primUpdateDOMMultiFeature(MapInfo map, Node node, EObject mofObject) {
-		if (map == featurePrimKeyMapInfo) 
-			super.primUpdateDOMFeature(noFeaturePrimKeyMapInfo, node, mofObject);
-		else 
-			super.primUpdateDOMMultiFeature(map, node, mofObject);
-	}
-	protected boolean primUpdateMOFFeature(MapInfo map, Node node, EObject mofObject) {
-		boolean hasChanged = super.primUpdateMOFFeature(map, node, mofObject);
-		//If the key class has changed, from the xml side, then we need to make sure we stamp the primkey field
-		//as being specified from xml, since we will not automatically remove that node
-		if (map.getDOMName().equals(PRIM_KEY_CLASS)) {
-			updateXmlKeyField(noFeaturePrimKeyMapInfo, node);
-			if (hasChanged)
-				updateMOFPrimKeyFieldFeature(featurePrimKeyMapInfo, getNode(), true);
-		}
-		return hasChanged;
-	}
-	protected void primUpdateMOFMultiFeature(MapInfo map, Node node, EObject mofObject) {
-		if (map == noFeaturePrimKeyMapInfo)
-			return;
-		if (map.getDOMName().equals(PRIMKEY_FIELD)) {
-			updateMOFPrimKeyFieldFeature(map, node, false);
-		} else if (map.getDOMName().equals(CMP_FIELD)) {
-			//cache the old list of cmp attributes before update
-			List cmpAttributesListCOPY = new ArrayList();
-			cmpAttributesListCOPY.addAll(getContainerManagedEntity().getPersistentAttributes());
-		
-			//do the update
-			super.primUpdateMOFMultiFeature(map, node, mofObject);
-
-			List newCmpAttributeList = getContainerManagedEntity().getPersistentAttributes();
-			//key the cmp attribute list and the key attribute list.
-			performKeySynchronization(cmpAttributesListCOPY, newCmpAttributeList);
-		} else 
-			super.primUpdateMOFMultiFeature(map, node, mofObject);
-	}
-	/**
-	 * Method that synchronizies the list of cmp attributes that are keys with the key attribute list.
-	 * When keys are added and deleted from the cmp attribute list.
-	 * 
-	 * @param List cmpAttributesListCOPY - Copy of the cmp attribute list before any attributes where added
-	 * 										or removed.
-	 * @param List newCmpAttributeList - List of cmp attributes after a modification has occured.
-	 */
-	 /*
-	protected void performKeySynchronization( List cmpAttributesListCOPY, List newCmpAttributeList ) {	
-		if( cmpAttributesListCOPY != null && newCmpAttributeList != null ) {	
-
-			//add and removes keys based on what the adapters give back
-		
-			List addedCmpAttributeList = getCmpAttributesDeltaList( cmpAttributesListCOPY, newCmpAttributeList );
-			if( addedCmpAttributeList != null && !addedCmpAttributeList.isEmpty() ) {					
-				//determine if any of the added attributes are keys, if so get a list of them.
-				List addedKeyAttributeList = getKeyAttributesFromList( addedCmpAttributeList, getContainerManagedEntity().getPrimaryKey() );
-				//now, add the keys to the list.
-				addKeysToKeyAttributeList( addedKeyAttributeList, getContainerManagedEntity() );
-			}// if
-		
-			List subtractedCmpAttributeList = getCmpAttributesDeltaList( newCmpAttributeList, cmpAttributesListCOPY );
-			if( subtractedCmpAttributeList != null && !subtractedCmpAttributeList.isEmpty() ) {
-				//determine if any of the subtracted attributes are keys, if so get a list of them.
-				List subtractedKeyAttributeList = getKeyAttributesFromList( subtractedCmpAttributeList, getContainerManagedEntity().getPrimaryKey() );
-				//now, subtract the keys from the list.
-				removeKeysFromKeyAttributeList( subtractedKeyAttributeList, getContainerManagedEntity() );
-			}// if		
-		
-		}// if	
-	}// performKeySynchronization
-
-	/**
-	 * Remove a bunch of keys from the current key attribute list.
-	 * 
-	 * @param List subtractedKeyAttributeList - The list of keys to subtract from the key attributes list.
-	 * @param ContainerManagedEntity cmp - The current container managed entity.
-	 */
-	 
-	 /*
-	public static void removeKeysFromKeyAttributeList( List subtractedKeyAttributeList, ContainerManagedEntity cmp ) {
-		if( subtractedKeyAttributeList != null && !subtractedKeyAttributeList.isEmpty() ) {
-			//Subtract the key attributes from the container managed entity
-			Iterator kli = subtractedKeyAttributeList.iterator();
-		
-			while( kli.hasNext() ) {
-				CMPAttribute cmpAttribute = (CMPAttribute)kli.next();
-				String cmpAttributeName = cmpAttribute.getName();
-				if( cmpAttributeName != null ) {
-					if( cmp != null && cmp.getKeyAttributes() != null ) {
-						List keyAttributeList = cmp.getKeyAttributes();
-						keyAttributeList.remove( cmpAttribute );
-					}// if
-				}// if
-			}// while
-		}// if
-	}// performKeySynchronization
-
-	/**
-	 * Adds a bunch of keys to the current key attribute list.
-	 * 
-	 * @param List addedCmpAttributeList - The list of keys to add to the key attributes list.
-	 * @param ContainerManagedEntity cmp - The current container managed entity.
-	 */
-	 
-	 /*
-	public static void addKeysToKeyAttributeList( List addedKeyAttributeList, ContainerManagedEntity cmp ) {
-		if( addedKeyAttributeList != null && !addedKeyAttributeList.isEmpty() ) {
-			//Add the key attributes to the container managed entity
-			Iterator kli = addedKeyAttributeList.iterator();
-		
-			while( kli.hasNext() ) {
-				CMPAttribute cmpAttribute = (CMPAttribute)kli.next();
-				String cmpAttributeName = cmpAttribute.getName();
-				if( cmpAttributeName != null ) {
-					if( cmp != null && cmp.getKeyAttributes() != null )
-						cmp.addKeyAttributeName( cmpAttributeName );
-				}// if
-			}// while
-		}// if
-	}// addKeysToKeyAttributeList
-
-	/**
-	 * Gets the key attributes contained in the list.
-	 * 
-	 * @param List attributeList - List of attributes.
-	 * @param JavaClass primaryKey - The primary key of the cmp.
-	 * @return List
-	 */
-	 
-	 /*
-	public static List getKeyAttributesFromList(  List attributeList, JavaClass primaryKey ) {
-		if (primaryKey == null || attributeList == null || attributeList.isEmpty()) 
-			return Collections.EMPTY_LIST;
-		
-		List foundKeyAttributeList = new ArrayList();
-		Iterator it = attributeList.iterator();		
-		while( it.hasNext() ) {	
-			CMPAttribute cmpAttr = (CMPAttribute)it.next();			
-			if( cmpAttr != null ) {
-				String cmpAttributeName = cmpAttr.getName();
-				if (cmpAttributeName != null) {			
-					Field keyField = primaryKey.getField(cmpAttributeName);	
-					if (keyField != null) 				
-						foundKeyAttributeList.add(cmpAttr);
-				}// if
-			} //if
-		}// while	
-		return foundKeyAttributeList;
-	}// getKeyAttributesFromList
-
-	/**
-	 * Gets the delta elements of two lists
-	 * 
-	 * @param List firstList - The list that is being compared too.
-	 * @param List secondList - The list to check the difference of.
-	 * @return List
-	 */
-	 
-	 /*
-	protected List getCmpAttributesDeltaList( List firstList, List secondList ) {
-		List diffAttributeList = new ArrayList();
-	
-		if( firstList != null && secondList != null ) {
-			Iterator it = secondList.iterator();
-			while( it.hasNext() ) {
-				CMPAttribute cmpAttribute = (CMPAttribute)it.next();
-				if( cmpAttribute != null && !firstList.contains( cmpAttribute ) ) {
-					diffAttributeList.add( cmpAttribute );
-				}// if
-			}// while
-			return diffAttributeList;
-		}// if	
-		return java.util.Collections.EMPTY_LIST;
-	}// getCmpAttributesDeltaList
-
-	protected void updateMOFPrimKeyFieldFeature(MapInfo map, Node node, boolean force) {
-		Resource res = getEObject().eResource();
-		boolean modFlag = res == null ? false : res.isModified();
-		String keyField = getDOMText(map, node);
-		//Determine if the prim-key field has changed.  If so, then recompute the keys; otherwise leave 
-		//it alone
-		if (keyField != null)
-			keyField = keyField.trim();
-		CMPAttribute existingKeyAtt = getContainerManagedEntity().getPrimaryKeyAttribute();
-		String existingKeyField = existingKeyAtt == null ? null : existingKeyAtt.getName();
-		if (!force 
-			&& ((keyField == null && existingKeyField == null) 
-				|| (keyField != null && keyField.equals(existingKeyField))
-				|| (existingKeyField != null && existingKeyField.equals(keyField))))
-			return;
-		
-		try {
-			getContainerManagedEntity().clearKeyAttributes(); //necessary to clear reflected flag
-			CMPAttribute keyAtt = null;
-			CMPSpecAdapter.setPrimKeyFieldFromXml(keyField, getContainerManagedEntity());
-			if (keyField != null) {
-				keyAtt = getContainerManagedEntity().addKeyAttributeName(keyField, false);
-				if (keyAtt != null) {
-					//This is an invalid state.
-					String className = getContainerManagedEntity().getPrimaryKeyName();
-					JavaClass ref = null;
-					if (className != null)
-						ref = JavaClassImpl.createClassRef(className);
-					keyAtt.setEType(ref);
-				}
-			} else {
-				//Hack to force the UI to refresh
-				EList keys = getContainerManagedEntity().getKeyAttributes();
-				if (!keys.isEmpty())
-					keys.set(0, keys.get(0));
-			}
-		} finally {
-			if (res != null && res.isTrackingModification())
-				res.setModified(modFlag);
-		}
-	}
-	protected void updateXmlKeyField(MapInfo map, Node node) {
-		String keyField = getDOMText(map, node);
-		CMPSpecAdapter.setPrimKeyFieldFromXml(keyField, getContainerManagedEntity());
-	}
-	
-		/**
-		 * @see AbstractDOMNodeAdapter#getMOFChildren(EObject, MapInfo)
-		 */
-		 /*
-		protected List getMOFChildren(EObject mofObject, MapInfo map) {
-			if (getContainerManagedEntity().isVersion2_X() && CMP_FIELD.equals(map.getDOMName()))
-				return get20CMPAttributes((ContainerManagedEntity)mofObject);
-			else
-				return super.getMOFChildren(mofObject, map);
-		}
-
-		/**
-		 * Method get20CMPAttributes.
-		 * @param containerManagedEntity
-		 * @return List
-		 */
-		 
-		 /*
-		private List get20CMPAttributes(ContainerManagedEntity cmp) {
-			List allAttributes, removed, result;
-			removed = null;
-			allAttributes = cmp.getPersistentAttributes();
-			int size = allAttributes.size();
-			CMPAttribute att = null;
-			for (int i = 0; i < size; i++) {
-				att = (CMPAttribute) allAttributes.get(i);
-				if (att.isDerived()) {
-					if (removed == null)
-						removed = new ArrayList();
-					removed.add(att);
-				}
-			}
-			if (removed != null) {
-				result = new ArrayList(size);
-				result.addAll(allAttributes);
-				result.removeAll(removed);
-			} else
-				result = allAttributes;
-			return result;
-		}
-	
-		/**
-		 * @see com.ibm.etools.mof2dom.AbstractDOMNodeAdapter#notifyChanged(new ENotificationImpl((InternalEObject)Notifier, int,(EStructuralFeature) EObject, Object, Object, int))
-		 */
-		 
-		 /*
-		public void notifyChanged(Notification notification) {
-			if (notification.getEventType() == ContainerManagedEntity.DERIVED_FLAG_CHANGE)
-				updateDOMFeature(getMap(CMP_FIELD), getNode(), getEObject());
-			else
-				super.notifyChanged(notification);
-		}
-
-		private MapInfo getMap(String aNodeName) {
-			for (int i = 0; i < fMaps.length; i++) {
-				if (aNodeName.equals(fMaps[i].getDOMName()))
-					return fMaps[i];
-			}
-			return null;
-		}
-		*/
-	}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EJBJarTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EJBJarTranslator.java
deleted file mode 100644
index a6d7b12..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EJBJarTranslator.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.SourceLinkTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-/**
- * @author schacher
- */
-public class EJBJarTranslator extends RootTranslator implements EjbDeploymentDescriptorXmlMapperI, J2EEConstants {
-	private static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	public static EJBJarTranslator INSTANCE = new EJBJarTranslator();
-	private static Translator[] children13;
-	private static Translator[] children14;
-
-	public static TranslatorPath ENTERPRISE_BEAN_NAME_TRANSLATOR_PATH =
-			new TranslatorPath(
-				new Translator[] {
-					new Translator(EJB_JAR, ROOT_FEATURE),
-					new Translator(EnterpriseBeansTranslator.ENTERPRISE_BEANS_PATH, EJB_PKG.getEJBJar_EnterpriseBeans()),
-					new Translator(EJB_NAME, EJB_PKG.getEnterpriseBean_Name())});
-
-
-	private static final Translator CMR_FIELD_NAME_TRANSLATOR = new Translator(CMR_FIELD_NAME, EcorePackage.eINSTANCE.getENamedElement_Name());
-	private static final Translator CMR_FIELD_TYPE_TRANSLATOR = new JavaClassTranslator(CMR_FIELD_TYPE, EJB_PKG.getCMRField_CollectionType());
-	private static final Translator ROLE_SOURCE_EJB_NAME_SOURCELINK_TRANSLATOR = new SourceLinkTranslator(EJB_NAME, EJB_PKG.getRoleSource_EntityBean(), ENTERPRISE_BEAN_NAME_TRANSLATOR_PATH);
-	private static final Translator EJB_RELATIONSHIP_ROLE_NAME_TRANSLATOR = new Translator(EJB_RELATIONSHIP_ROLE_NAME, EJB_PKG.getEJBRelationshipRole_RoleName());
-	private static final Translator MULTIPLICITY_TRANSLATOR = new MultiplicityTranslator();
-	private static final Translator CASCADE_DELETE_TRANSLATOR = new Translator(CASCADE_DELETE, EJB_PKG.getEJBRelationshipRole_CascadeDelete(), Translator.EMPTY_TAG);
-	private static final Translator EJB_RELATION_NAME_TRANSLATOR = new Translator(EJB_RELATION_NAME, EJB_PKG.getEJBRelation_Name());
-	private static final Translator UNCHECKED_TRANSLATOR = new Translator(UNCHECKED, EJB_PKG.getMethodPermission_Unchecked(), Translator.EMPTY_TAG);
-	private static final Translator METHOD_PERMISSION_ROLE_NAME_SOURCELINK_TRANSLATOR = new SourceLinkTranslator(ROLE_NAME,EJB_PKG.getMethodPermission_Roles(),new TranslatorPath(
-		new Translator[] {
-			new Translator(ASSEMBLY_DESCRIPTOR, CONTAINER_FEATURE),
-			new Translator(SECURITY_ROLE, EJB_PKG.getAssemblyDescriptor_SecurityRoles()),
-			new Translator(ROLE_NAME, CommonPackage.eINSTANCE.getSecurityRole_RoleName())
-		}));
-	private static final Translator SEC_ROLE_NAME_TRANSLATOR = new Translator(ROLE_NAME, CommonPackage.eINSTANCE.getSecurityRole_RoleName(),	new TranslatorPath(
-		new Translator[] {
-			new Translator(ASSEMBLY_DESCRIPTOR, CONTAINER_FEATURE),
-			new Translator(METHOD_PERMISSION, EJB_PKG.getAssemblyDescriptor_MethodPermissions()),
-			new Translator(SECURITY_ROLE, EJB_PKG.getMethodPermission_Roles()),
-			new Translator(ROLE_NAME, CommonPackage.eINSTANCE.getSecurityRole_RoleName())
-		}));
-	
-	private static final Translator TRANS_ATTRIBUTE_TRANSLATOR = new Translator(TRANS_ATTRIBUTE, EJB_PKG.getMethodTransaction_TransactionAttribute());
-	private static final Translator METHOD_ELEMENT_EJB_NAME_SOURCELINK_TRANSLATOR = new SourceLinkTranslator(EJB_NAME, EJB_PKG.getMethodElement_EnterpriseBean(), EJBJarTranslator.ENTERPRISE_BEAN_NAME_TRANSLATOR_PATH);
-	private static final Translator METHOD_NAME_TRANSLATOR = new Translator(METHOD_NAME, EJB_PKG.getMethodElement_Name());
-	private static final Translator METHOD_PARAM_TRANSLATOR = new MethodParamsTranslator(EJB_PKG.getMethodElement_Parms());
-	private static final Translator METHOD_ELEMENT_KIND_TRANSLATOR = new MethodElementKindTranslator();
-	
-	public EJBJarTranslator() {
-		super(EJB_JAR, EJB_PKG.getEJBJar());
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new EnterpriseBeansTranslator(),
-			createRelationshipsTranslator13(),
-			createAssemblyDescriptorTranslator13(),
-			new Translator(EJB_CLIENT_JAR, EJB_PKG.getEJBJar_EjbClientJar()),
-		};
-	}
-
-	protected Translator[] create14Children() {
-		return	new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, EJB_PKG.getEJBJar_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+EJB_JAR_SCHEMA_LOC_2_1),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new EnterpriseBeansTranslator(),
-			createRelationshipsTranslator14(),
-			createAssemblyDescriptorTranslator14(),
-			new Translator(EJB_CLIENT_JAR, EJB_PKG.getEJBJar_EjbClientJar()),
-		//	CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEJBJar_Extensions())
-		};
-	}
-
-	public static Translator createRelationshipsTranslator13() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIPS, EJB_PKG.getEJBJar_RelationshipList());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getRelationships_Description()),
-				createEJBRelationsTranslator13(),
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationsTranslator13() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATION, EJB_PKG.getRelationships_EjbRelations());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getEJBRelation_Description()),
-				EJB_RELATION_NAME_TRANSLATOR,
-				createEJBRelationshipRoleTranslator13(),
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationshipRoleTranslator13() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATIONSHIP_ROLE, EJB_PKG.getEJBRelation_RelationshipRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getEJBRelationshipRole_Description()),
-				EJB_RELATIONSHIP_ROLE_NAME_TRANSLATOR,
-				MULTIPLICITY_TRANSLATOR,
-				CASCADE_DELETE_TRANSLATOR,
-				createRelationshipRoleSourceTranslator13(),
-				createCMRFieldTranslator13(),
-		});
-		return result;
-	}
-
-	private static Translator createRelationshipRoleSourceTranslator13() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIP_ROLE_SOURCE, EJB_PKG.getEJBRelationshipRole_Source());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getRoleSource_Description()),
-				ROLE_SOURCE_EJB_NAME_SOURCELINK_TRANSLATOR,
-		});
-		return result;
-	}
-
-	private static Translator createCMRFieldTranslator13() {
-		GenericTranslator result = new GenericTranslator(CMR_FIELD, EJB_PKG.getEJBRelationshipRole_CmrField());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getCMPAttribute_Description()),
-				CMR_FIELD_NAME_TRANSLATOR,
-				CMR_FIELD_TYPE_TRANSLATOR
-		});
-		return result;
-	}
-
-
-	/**
-	 * J2EE 1.4 Relationship
-	 * 
-	 */
-	public static Translator createRelationshipsTranslator14() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIPS, EJB_PKG.getEJBJar_RelationshipList());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getRelationships_Descriptions()),
-				createEJBRelationsTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getRelationships_Extensions())
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationsTranslator14() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATION, EJB_PKG.getRelationships_EjbRelations());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getEJBRelation_Descriptions()),
-				EJB_RELATION_NAME_TRANSLATOR,
-				createEJBRelationshipRoleTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEJBRelation_Extensions())
-		});
-		return result;
-	}
-
-	private static Translator createEJBRelationshipRoleTranslator14() {
-		GenericTranslator result = new GenericTranslator(EJB_RELATIONSHIP_ROLE, EJB_PKG.getEJBRelation_RelationshipRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getEJBRelationshipRole_Descriptions()),
-				EJB_RELATIONSHIP_ROLE_NAME_TRANSLATOR,
-				MULTIPLICITY_TRANSLATOR,
-				CASCADE_DELETE_TRANSLATOR,
-				createRelationshipRoleSourceTranslator14(),
-				createCMRFieldTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getEJBRelationshipRole_Extensions())
-		});
-		return result;
-	}
-
-	private static Translator createRelationshipRoleSourceTranslator14() {
-		GenericTranslator result = new GenericTranslator(RELATIONSHIP_ROLE_SOURCE, EJB_PKG.getEJBRelationshipRole_Source());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getRoleSource_Descriptions()),
-				ROLE_SOURCE_EJB_NAME_SOURCELINK_TRANSLATOR
-		});
-		return result;
-	}
-
-	private static Translator createCMRFieldTranslator14() {
-		GenericTranslator result = new GenericTranslator(CMR_FIELD, EJB_PKG.getEJBRelationshipRole_CmrField());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getCMPAttribute_Descriptions()),
-				CMR_FIELD_NAME_TRANSLATOR,
-				CMR_FIELD_TYPE_TRANSLATOR,
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getCMPAttribute_Extensions())
-		});
-		return result;
-	}
-
-	/*
-	 * <= J2EE 1.3 Assembly Descriptor 
-	 */
-	public static Translator createAssemblyDescriptorTranslator13() {
-		GenericTranslator result = new GenericTranslator(ASSEMBLY_DESCRIPTOR, EJB_PKG.getEJBJar_AssemblyDescriptor());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				createSecurityRoleTranslator13(),
-				createMethodPermissionTranslator13(),
-				createMethodTransactionTranslator13(),
-				createExcludesListTranslator13(),
-		});
-		return result;
-	}
-
-	public static Translator createMethodPermissionTranslator13() {
-		GenericTranslator result = new GenericTranslator(METHOD_PERMISSION, EJB_PKG.getAssemblyDescriptor_MethodPermissions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getMethodPermission_Description()),
-				UNCHECKED_TRANSLATOR,
-				METHOD_PERMISSION_ROLE_NAME_SOURCELINK_TRANSLATOR,
-				createMethodElementTranslators13(EJB_PKG.getMethodPermission_MethodElements())
-		});
-
-		return result;
-	}
-
-	//TODO: NEED TO FIGURE OUT SECURITY PATH		
-	public static Translator createSecurityRoleTranslator13() {
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE, EJB_PKG.getAssemblyDescriptor_SecurityRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, CommonPackage.eINSTANCE.getSecurityRole_Description()),
-				SEC_ROLE_NAME_TRANSLATOR
-			});
-
-		return result;
-	}
-
-	public static Translator createMethodTransactionTranslator13() {
-		GenericTranslator result = new GenericTranslator(CONTAINER_TRANSACTION, EJB_PKG.getAssemblyDescriptor_MethodTransactions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getMethodTransaction_Description()),
-				createMethodElementTranslators13(EJB_PKG.getMethodTransaction_MethodElements()),
-				TRANS_ATTRIBUTE_TRANSLATOR
-		});
-
-		return result;
-	}
-
-	public static Translator createExcludesListTranslator13() {
-		GenericTranslator result = new GenericTranslator(EXCLUDE_LIST, EJB_PKG.getAssemblyDescriptor_ExcludeList());
-		result.setChildren(	new Translator[] { 
-			IDTranslator.INSTANCE, 
-			new Translator(DESCRIPTION, EJB_PKG.getExcludeList_Description()), 
-			createMethodElementTranslators13(EJB_PKG.getExcludeList_MethodElements())
-		});
-		return result;
-	}
-
-	public static Translator createMethodElementTranslators13(EStructuralFeature eFeature) {
-		GenericTranslator result = new GenericTranslator(METHOD, eFeature);
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				new Translator(DESCRIPTION, EJB_PKG.getMethodElement_Description()),
-				METHOD_ELEMENT_EJB_NAME_SOURCELINK_TRANSLATOR,
-				METHOD_ELEMENT_KIND_TRANSLATOR,
-				METHOD_NAME_TRANSLATOR,
-				METHOD_PARAM_TRANSLATOR
-			});
-		return result;
-	}
-	
-	
-	/*
-	 * J2EE 1.4 Assembly Descriptor 
-	 */
-	public static Translator createAssemblyDescriptorTranslator14() {
-		GenericTranslator result = new GenericTranslator(ASSEMBLY_DESCRIPTOR, EJB_PKG.getEJBJar_AssemblyDescriptor());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				createSecurityRoleTranslator14(),
-				createMethodPermissionTranslator14(),
-				createMethodTransactionTranslator14(),
-				CommonTranslators.createMessageDestinationTranslator(EJB_PKG.getAssemblyDescriptor_MessageDestinations()),
-				createExcludesListTranslator14(),
-		//		CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getAssemblyDescriptor_Extensions())
-		});
-		return result;
-	}
-
-	public static Translator createMethodPermissionTranslator14() {
-		GenericTranslator result = new GenericTranslator(METHOD_PERMISSION, EJB_PKG.getAssemblyDescriptor_MethodPermissions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getMethodPermission_Descriptions()),
-				UNCHECKED_TRANSLATOR,
-				METHOD_PERMISSION_ROLE_NAME_SOURCELINK_TRANSLATOR,
-				createMethodElementTranslators14(EJB_PKG.getMethodPermission_MethodElements())
-		});
-
-		return result;
-	}
-
-	//TODO: NEED TO FIGURE OUT SECURITY PATH		
-	public static Translator createSecurityRoleTranslator14() {
-		GenericTranslator result = new GenericTranslator(SECURITY_ROLE, EJB_PKG.getAssemblyDescriptor_SecurityRoles());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(CommonPackage.eINSTANCE.getSecurityRole_Descriptions()),
-				SEC_ROLE_NAME_TRANSLATOR
-		});
-
-		return result;
-	}
-
-	public static Translator createMethodTransactionTranslator14() {
-		GenericTranslator result = new GenericTranslator(CONTAINER_TRANSACTION, EJB_PKG.getAssemblyDescriptor_MethodTransactions());
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getMethodTransaction_Descriptions()),
-				createMethodElementTranslators14(EJB_PKG.getMethodTransaction_MethodElements()),
-				TRANS_ATTRIBUTE_TRANSLATOR
-		});
-
-		return result;
-	}
-
-	public static Translator createExcludesListTranslator14() {
-		GenericTranslator result = new GenericTranslator(EXCLUDE_LIST, EJB_PKG.getAssemblyDescriptor_ExcludeList());
-		result.setChildren(	new Translator[] { 
-			IDTranslator.INSTANCE, 
-			CommonTranslators.createDescriptionTranslator(EJB_PKG.getExcludeList_Descriptions()), 
-			createMethodElementTranslators14(EJB_PKG.getExcludeList_MethodElements())
-		});
-		return result;
-	}
-
-	public static Translator createMethodElementTranslators14(EStructuralFeature eFeature) {
-		GenericTranslator result = new GenericTranslator(METHOD, eFeature);
-		result.setChildren(
-			new Translator[] {
-				IDTranslator.INSTANCE,
-				CommonTranslators.createDescriptionTranslator(EJB_PKG.getMethodElement_Descriptions()),
-				METHOD_ELEMENT_EJB_NAME_SOURCELINK_TRANSLATOR,
-				METHOD_ELEMENT_KIND_TRANSLATOR,
-				METHOD_NAME_TRANSLATOR,
-				METHOD_PARAM_TRANSLATOR
-			});
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EnterpriseBeansTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EnterpriseBeansTranslator.java
deleted file mode 100644
index 2ee9767..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EnterpriseBeansTranslator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.MultiObjectTranslator;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class EnterpriseBeansTranslator extends MultiObjectTranslator implements EjbDeploymentDescriptorXmlMapperI {
-	public static final String ENTERPRISE_BEANS_PATH = ENTERPRISE_BEANS+'/'+ENTITY+','+SESSION+','+MESSAGE_DRIVEN;
-    private static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	private static final SessionTranslator SESSION_TRANSLATOR = new SessionTranslator();
-	private static final EntityTranslator BMP_TRANSLATOR = new EntityTranslator();
-	private static final ContainerManagedEntityTranslator CMP_TRANSLATOR= new ContainerManagedEntityTranslator();
-	private static final MessageDrivenTranslator MESSAGE_DRIVEN_TRANSLATOR = new MessageDrivenTranslator();
-	private static Map delegates;
-	static {
-		delegates = new HashMap(7);
-		delegates.put(SESSION, SESSION_TRANSLATOR);
-		delegates.put(BEAN, BMP_TRANSLATOR);
-		delegates.put(CONTAINER, CMP_TRANSLATOR);
-		delegates.put(MESSAGE_DRIVEN, MESSAGE_DRIVEN_TRANSLATOR);
-	}
-	
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 */
-	public EnterpriseBeansTranslator() {
-		super(ENTERPRISE_BEANS_PATH, EJB_PKG.getEJBJar_EnterpriseBeans());
-		addReadAheadHelper(new ReadAheadHelper(ENTITY, new String[] {BEAN, CONTAINER}, PERSISTENCE_TYPE ));
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.MultiObjectTranslator#getDelegateFor(org.eclipse.emf.ecore.EObject)
-	 */
-	public Translator getDelegateFor(EObject o) {
-		switch (o.eClass().getClassifierID()) {
-			case EjbPackage.SESSION :
-				return SESSION_TRANSLATOR;
-			case EjbPackage.ENTITY:
-				return BMP_TRANSLATOR;
-			case EjbPackage.CONTAINER_MANAGED_ENTITY:
-				return CMP_TRANSLATOR;
-			case EjbPackage.MESSAGE_DRIVEN:
-				return MESSAGE_DRIVEN_TRANSLATOR;
-		}
-		throw new IllegalStateException("Bean type delegate expected"); //$NON-NLS-1$
-	}
-
-	public Translator getDelegateFor(String domName, String readAheadName) {
-		Translator result = null;
-		if (readAheadName != null)
-			result = (Translator) delegates.get(readAheadName);
-		else 
-			result = (Translator) delegates.get(domName);
-		
-		if (result == null) 
-			throw new IllegalStateException("Bean type delegate expected"); //$NON-NLS-1$
-		
-		return result;
-	}
-	
-
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EntityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EntityTranslator.java
deleted file mode 100644
index ef05ac4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/EntityTranslator.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.model.translator.common.BooleanTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class EntityTranslator extends AbstractEJBTranslator {
-
-	private static Translator[] children13;
-	private static Translator[] children14;
-
-	private class PersistenceTypeTranslator extends Translator {
-
-		public PersistenceTypeTranslator() {
-			super(PERSISTENCE_TYPE, (EStructuralFeature) null);
-		}
-
-		/* (non-Javadoc)
-		 * @see com.ibm.etools.emf2xml.impl.Translator#extractStringValue(org.eclipse.emf.ecore.EObject)
-		 */
-		public String extractStringValue(EObject emfObject) {
-			return getPersistenceType();
-		}
-
-		/* (non-Javadoc)
-			   * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(java.lang.Object, org.eclipse.emf.ecore.EObject)
-			   */
-		public String convertValueToString(Object value, EObject owner) {
-			return getPersistenceType();
-		}
-		
-		/* (non-Javadoc)
-		 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-		 */
-		public List getMOFChildren(EObject mofObject) {
-			return Collections.singletonList(getPersistenceType());
-		}
-
-
-	}
-
-	protected String getPersistenceType() {
-		return BEAN;
-	}
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public EntityTranslator() {
-		super(ENTERPRISE_BEANS + '/' + ENTITY);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		Translator reentrantTranslator = null;
-		switch (versionID) {
-			case J2EE_1_2_ID :
-			case J2EE_1_3_ID :
-				reentrantTranslator = new Translator(REENTRANT, EJB_PKG.getEntity_Reentrant(), UNSET_IF_NULL);
-				break;
-			case J2EE_1_4_ID :
-				reentrantTranslator = new BooleanTranslator(REENTRANT, EJB_PKG.getEntity_Reentrant());
-			default :
-				break;
-		}
-		return new Translator[] { new PersistenceTypeTranslator(), new JavaClassTranslator(PRIM_KEY_CLASS, EJB_PKG.getEntity_PrimaryKey()), reentrantTranslator };
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createEntity();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14;
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenDestinationTypeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenDestinationTypeTranslator.java
deleted file mode 100644
index 2544067..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenDestinationTypeTranslator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MessageDrivenDestinationTypeTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-	public static final String JAVAX_JMS = "javax.jms."; //$NON-NLS-1$
-
-
-	public MessageDrivenDestinationTypeTranslator() {
-		super(DESTINATION_TYPE, EJB_PKG.getMessageDrivenDestination_Type());
-	}
-	
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertValueToString(java.lang.Object, org.eclipse.emf.ecore.EObject)
-	 */
-	public String convertValueToString(Object value, EObject owner) {
-		if (value != null){
-			Enumerator enumerator = (Enumerator) value;
-			if (enumerator != null)
-				return JAVAX_JMS + enumerator.toString();
-		}
-		return super.convertValueToString(value, owner);
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		String correct = strValue;
-		if (strValue != null)
-			correct = strValue.substring(JAVAX_JMS.length());
-		return super.convertStringToValue(correct, owner);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenTranslator.java
deleted file mode 100644
index 8d9c762..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MessageDrivenTranslator.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class MessageDrivenTranslator extends AbstractEJBTranslator {
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	private static Translator TRANSACTION_TYPE_XLATOR = new Translator(TRANSACTION_TYPE, EJB_PKG.getMessageDriven_TransactionType());
-	
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public MessageDrivenTranslator() {
-		super(ENTERPRISE_BEANS+'/'+MESSAGE_DRIVEN);
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		switch (versionID) {
-			case J2EE_1_4_ID:
-				return getSpecificMaps14();
-			default:
-				return getSpecificMaps13();
-		}
-	}
-	
-	protected Translator[] getSpecificMaps13() {
-	
-		return new Translator[] {
-			TRANSACTION_TYPE_XLATOR,
-			
-			//EJB 2.0 PATH
-			new Translator(MESSAGE_SELECTOR, EJB_PKG.getMessageDriven_MessageSelector()),
-			new AcknowledgeModeTranslator(),
-			createMessageDrivenDestinationTranslator(),
-			
-		}; 
-	}
-
-	protected Translator[] getSpecificMaps14() {
-
-		return new Translator[] {
-			//EJB 2.1 Only
-			new JavaClassTranslator(MESSAGING_TYPE, EJB_PKG.getMessageDriven_MessagingType()),
-			//Both
-			TRANSACTION_TYPE_XLATOR,
-			//EJB 2.1 PATH
-			new JavaClassTranslator(MESSAGE_DEST_TYPE, EJB_PKG.getMessageDriven_MessageDestination()),
-			new Translator(MESSAGE_DEST_LINK, EJB_PKG.getMessageDriven_Link()),
-			createActivationConfigurationMaps(),
-		}; 
-	}
-	
-	
-	/**
-	 * @return
-	 */
-	private Translator createActivationConfigurationMaps() {
-		GenericTranslator result = new GenericTranslator(ACTIVATION_CONF, EJB_PKG.getMessageDriven_ActivationConfig());
-		result.setChildren(new Translator[]{
-			CommonTranslators.createDescriptionTranslator(EJB_PKG.getActivationConfig_Descriptions()),
-			createActivationConfigPropertiesMap(),
-		//	CommonTranslators.createDeploymentExtensionTranslator(EJB_PKG.getActivationConfig_Extensions())
-		});
-		
-		return result;
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createActivationConfigPropertiesMap() {
-		GenericTranslator result = new GenericTranslator(ACTIVATION_CONF_PROPERTY, EJB_PKG.getActivationConfig_ConfigProperties());
-		result.setChildren(new Translator[] {
-			new Translator(ACTIVATION_CONF_PROPERTY_NAME, EJB_PKG.getActivationConfigProperty_Name()),
-			new Translator(ACTIVATION_CONF_PROPERTY_VALUE, EJB_PKG.getActivationConfigProperty_Value())
-		});		
-		return result;
-	}
-
-
-	/**
-	 * @return
-	 */
-	protected Translator createMessageDrivenDestinationTranslator() {
-		GenericTranslator result = new GenericTranslator(MESSAGE_DRIVEN_DESTINATION,EJB_PKG.getMessageDriven_Destination());
-		result.setChildren( new Translator[]{
-			new MessageDrivenDestinationTypeTranslator(),
-			new Translator(SUBSCRIPTION_DURABILITY, EJB_PKG.getMessageDrivenDestination_SubscriptionDurability())
-		});
-		return result;
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-	
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createMessageDriven();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getEndMaps13()
-	 */
-	protected Translator[] getEndMaps13() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_3,
-			new SecurityIdentityTranslator(),
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_3,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3
-		};
-	}
-	
-	protected Translator[] getEndMaps14() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_SERVICE_REF_1_4,	
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4,
-			new SecurityIdentityTranslator(),
-		};
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#usesHomeRemoteAttributes()
-	 */
-	protected boolean usesHomeRemoteAttributes() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodElementKindTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodElementKindTranslator.java
deleted file mode 100644
index 34cd4b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodElementKindTranslator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class MethodElementKindTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	private static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-    /**
-     * @param domNameAndPath
-     * @param eClass
-     */
-    public MethodElementKindTranslator(){
-		super(METHOD_INTF, EJB_PKG.getMethodElement_Type());
-    }
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		Object obj = super.convertStringToValue(strValue, owner);
-		if(obj != null)
-			return obj;
-		String correct = strValue;
-		if (strValue.equalsIgnoreCase("HOME")) //$NON-NLS-1$
-			correct = "Home"; //$NON-NLS-1$
-		else if (strValue.equalsIgnoreCase("REMOTE")) //$NON-NLS-1$
-			correct = "Remote"; //$NON-NLS-1$
-		else if (strValue.equalsIgnoreCase("LOCALHOME")) //$NON-NLS-1$
-			correct = "LocalHome"; //$NON-NLS-1$
-		else if (strValue.equalsIgnoreCase("LOCAL")) //$NON-NLS-1$
-			correct = "Local"; //$NON-NLS-1$
-		return super.convertStringToValue(correct, owner);
-	}
-	
-	/* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
-     */
-    public boolean isSetMOFValue(EObject emfObject) {
-        if (((MethodElement)emfObject).getType() == MethodElementKind.UNSPECIFIED_LITERAL)
-        	return false;
-        return super.isSetMOFValue(emfObject);
-    }
-    
-    /* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-	 */
-	public List getMOFChildren(EObject mofObject) {
-		List result = super.getMOFChildren(mofObject);
-		if(result != null && result.size() > 0) {
-			MethodElementKind methodIntf = (MethodElementKind) result.get(0);
-			if(methodIntf.getValue() == MethodElementKind.UNSPECIFIED) 
-				result = Collections.EMPTY_LIST;
-		}
-		return result;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodParamsTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodParamsTranslator.java
deleted file mode 100644
index 0b02ac8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MethodParamsTranslator.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 2, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author dfholttp
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MethodParamsTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI{
-	protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-
-	//private EStructuralFeature eFeature;
-
-    public MethodParamsTranslator(EStructuralFeature eFeature) {
-        super(METHOD_PARAMS+'/'+METHOD_PARAM , eFeature);
-        //this.eFeature = eFeature;
-        this.fStyle |= Translator.EMPTY_CONTENT_IS_SIGNIFICANT;
-    }
-
-
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#isMultiValued()
-     */
-    public boolean isMultiValued() {
-		return true;
-    }
-    
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#getMOFChildren(org.eclipse.emf.ecore.EObject)
-     */
-    public List getMOFChildren(EObject mofObject) {
- 		return ((MethodElement)mofObject).getMethodParams();
-    }
-    
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.ecore.EObject, java.lang.Object)
-     */
-    public void setMOFValue(EObject mofObject, Object value) {
-		List methodParams = ((MethodElement)mofObject).getMethodParams();
-		
-    	if(value == null || value.toString().length() == 0) {  
-    		if(methodParams == null || methodParams.size() == 0 ) {
-    			setMOFValueFromEmptyDOMPath(mofObject);
-			}
-    	} else {
-			((MethodElement)mofObject).addMethodParams((String)value);
-    	}
-    }
-    /* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValue(org.eclipse.emf.common.notify.Notifier, java.lang.Object, int)
-	 */
-	public void setMOFValue(Notifier owner, Object value, int newIndex) {
-		((MethodElement)owner).addMethodParams((String)value);
-	}
-
-    /* (non-Javadoc)
-     * @see com.ibm.etools.emf2xml.impl.Translator#clearList(org.eclipse.emf.ecore.EObject)
-     */
-    public void clearList(EObject mofObject) {
-		((MethodElement)mofObject).eUnset(feature);
-    }
-    
-    /* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#shouldRenderEmptyDOMPath(org.eclipse.emf.ecore.EObject)
-	 */
-	public boolean shouldRenderEmptyDOMPath(EObject eObject) {
-		MethodElement me = ((MethodElement)eObject);
-		return me.hasMethodParams() && me.getMethodParams().isEmpty();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#setMOFValueFromEmptyDOMPath(org.eclipse.emf.ecore.EObject)
-	 */
-	public void setMOFValueFromEmptyDOMPath(EObject eObject) {
-		((MethodElement)eObject).applyZeroParams();
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MultiplicityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MultiplicityTranslator.java
deleted file mode 100644
index 614d580..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/MultiplicityTranslator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 2, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MultiplicityTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI{
-	
-	public MultiplicityTranslator(){
-		super(MULTIPLICITY,EjbPackage.eINSTANCE.getEJBRelationshipRole_Multiplicity());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		String correct = strValue;
-		if (strValue.toUpperCase().equals("ONE")) //$NON-NLS-1$
-			correct = "One"; //$NON-NLS-1$
-		else if (strValue.toUpperCase().equals("MANY")) //$NON-NLS-1$
-			correct = "Many"; //$NON-NLS-1$
-			
-		return super.convertStringToValue(correct, owner);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/PrimKeyFieldTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/PrimKeyFieldTranslator.java
deleted file mode 100644
index df5956f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/PrimKeyFieldTranslator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 3, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.SourceLinkTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-/**
- * @author jlanuti
- */
-public class PrimKeyFieldTranslator extends SourceLinkTranslator implements EjbDeploymentDescriptorXmlMapperI {
-	
-	/**
-	 * @param domNameAndPath
-	 * @param eClass
-	 * @param TranslatorPath
-	 */
-	public PrimKeyFieldTranslator() {
-		super(PRIMKEY_FIELD, EjbPackage.eINSTANCE.getContainerManagedEntity_PrimKeyField(),new TranslatorPath(
-			new Translator[] {
-				new Translator(CMP_FIELD, EjbPackage.eINSTANCE.getContainerManagedEntity_PersistentAttributes()),
-				new Translator(FIELD_NAME, EcorePackage.eINSTANCE.getENamedElement_Name())
-			}));
-	}
-	
-	protected String getSpecifiedPrimKeyFieldName(ContainerManagedEntity cmp) {
-		return cmp.getPrimKeyField().getName();
-	}
-
-	/**
-	 * @see com.ibm.etools.emf2xml.impl.Translator#convertStringToValue(java.lang.String, org.eclipse.emf.ecore.EObject)
-	 */
-	public Object convertStringToValue(String strValue, EObject owner) {
-		// try and convert the string to a cmp attribute, otherwise create a proxy
-		Object result = super.convertStringToValue(strValue, owner);
-		if (result == null || result == strValue /*reference check is valid here*/) {
-			result = EjbFactory.eINSTANCE.createCMPAttribute();
-			if (strValue == null) strValue = "";//$NON-NLS-1$
-			((InternalEObject)result).eSetProxyURI(URI.createURI(strValue));
-		}
-		return result;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SecurityIdentityTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SecurityIdentityTranslator.java
deleted file mode 100644
index 0732ea4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SecurityIdentityTranslator.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 1, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.xml.EjbDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class SecurityIdentityTranslator extends Translator implements EjbDeploymentDescriptorXmlMapperI {
-	private static final CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-	private static final Translator[] RUN_AS_TRANSLATORS = createRunAsTranslators();
-	
-	private static final Translator[] USE_CALLER_TRANSLATORS = createUseCallerTranslators();
-	
-	
-	private static Translator[] createRunAsTranslators() {
-		GenericTranslator runAsTranslator = new GenericTranslator(RUN_AS, COMMON_PKG.getRunAsSpecifiedIdentity_Identity());
-		runAsTranslator.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, COMMON_PKG.getIdentity_Description()),
-			new Translator(ROLE_NAME, COMMON_PKG.getIdentity_RoleName())
-		});
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityIdentity_Description()),
-			runAsTranslator
-		};
-	}
-	
-	private static Translator[] createUseCallerTranslators() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getSecurityIdentity_Description()),
-			new Translator(USE_CALLER_IDENTITY, null, EMPTY_TAG)
-		};
-	}
-
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public SecurityIdentityTranslator() {
-		super(SECURITY_IDENTITY, EjbPackage.eINSTANCE.getEnterpriseBean_SecurityIdentity());
-		addReadAheadHelper(new ReadAheadHelper(SECURITY_IDENTITY, new String[] {RUN_AS, USE_CALLER_IDENTITY}, null));
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (((SecurityIdentity)o).isRunAsSpecifiedIdentity())
-			return RUN_AS_TRANSLATORS;
-		else if (((SecurityIdentity)o).isUseCallerIdentity())
-			return USE_CALLER_TRANSLATORS;
-		else
-			throw new IllegalStateException("Internal error: Security Identity Type expected"); //$NON-NLS-1$
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		CommonFactory fact = CommonFactory.eINSTANCE; 
-		if (RUN_AS.equals(readAheadName)) {
-			RunAsSpecifiedIdentity result = fact.createRunAsSpecifiedIdentity();
-			result.setIdentity(fact.createIdentity());
-			return result;
-		} else if (USE_CALLER_IDENTITY.equals(readAheadName))
-			return fact.createUseCallerIdentity();
-		else 
-			return null;
-	}
-
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SessionTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SessionTranslator.java
deleted file mode 100644
index 853d4c3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/ejb/SessionTranslator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.ejb;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class SessionTranslator extends AbstractEJBTranslator {
-
-	private static Translator[] children13;
-	private static Translator[] children14;
-	/**
-	 * @param domNameAndPath
-	 * @param aFeature
-	 */
-	public SessionTranslator() {
-		super(ENTERPRISE_BEANS+'/'+SESSION);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getSpecificMaps()
-	 */
-	protected Translator[] getSpecificMaps(int versionID) {
-		return new Translator[] {
-			new Translator(SESSION_TYPE, EJB_PKG.getSession_SessionType(), UNSET_IF_NULL), 		//Enumeration
-			new Translator(TRANSACTION_TYPE, EJB_PKG.getSession_TransactionType(), UNSET_IF_NULL) 		//Enumeration
-		};
-	}
-		
-		
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.internal.model.translator.ejb.AbstractEJBTranslator#getEJBClassMap()
-	 * 
-	 * Support 1.4 and 1.3
-	 */
-	protected Translator[] getEJBClassMap() {
-		return new Translator[] {			
-			//J2EE 1.4
-			new JavaClassTranslator(SERVICE_ENDPOINT,EJB_PKG.getSession_ServiceEndpoint()),
-			//J2EE 1.3
-			new JavaClassTranslator(EJB_CLASS, EJB_PKG.getEnterpriseBean_EjbClass())
-		};
-		
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		return EjbFactory.eINSTANCE.createSession();
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-	
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/ErrorPageTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/ErrorPageTranslator.java
deleted file mode 100644
index a05e2b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/ErrorPageTranslator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 21, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.xml.WarDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.common.internal.emf.resource.ReadAheadHelper;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class ErrorPageTranslator extends Translator implements WarDeploymentDescriptorXmlMapperI {
-	private static Translator[] ERROR_CODE_XLATORS = new Translator[] {
-		new Translator(ERROR_CODE, WebapplicationPackage.eINSTANCE.getErrorCodeErrorPage_ErrorCode()),
-		new Translator(LOCATION, WebapplicationPackage.eINSTANCE.getErrorPage_Location())
-	};
-	private static Translator[] EXCEPTION_TYPE_XLATORS = new Translator[] {
-		new JavaClassTranslator(EXCEPTION_TYPE, WebapplicationPackage.eINSTANCE.getExceptionTypeErrorPage_ExceptionType()),
-		new Translator(LOCATION, WebapplicationPackage.eINSTANCE.getErrorPage_Location())
-	};
-	
-	public ErrorPageTranslator() {
-		super(ERROR_PAGE, WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages());
-		addReadAheadHelper(new ReadAheadHelper(ERROR_PAGE, new String[] {ERROR_CODE, EXCEPTION_TYPE}, null));
-	
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WebapplicationFactory fact = WebapplicationPackage.eINSTANCE.getWebapplicationFactory();
-		if (ERROR_CODE.equals(readAheadName))
-			return fact.createErrorCodeErrorPage();
-		else if (EXCEPTION_TYPE.equals(readAheadName))
-			return fact.createExceptionTypeErrorPage();
-		else
-			return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (((ErrorPage)o).isErrorCode())
-			return ERROR_CODE_XLATORS;
-		else if (((ErrorPage)o).isExceptionType())
-			return EXCEPTION_TYPE_XLATORS;
-		else
-			throw new IllegalStateException("Internal error: ErrorCode expected"); //$NON-NLS-1$
-	}
-		
-	public boolean isManagedByParent() {
-		return false;
-	}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebAppTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebAppTranslator.java
deleted file mode 100644
index 73a460e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebAppTranslator.java
+++ /dev/null
@@ -1,548 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- */
-package org.eclipse.jst.j2ee.internal.model.translator.webapplication;
-
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.BooleanTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.EnvEntryTranslator;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.xml.WarDeploymentDescriptorXmlMapperI;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.SourceLinkTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorPath;
-
-
-/**
- * @author schacher
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WebAppTranslator extends RootTranslator implements WarDeploymentDescriptorXmlMapperI, J2EEConstants {
-	private static WebapplicationPackage WEBAPP_PKG = WebapplicationPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	private static JspPackage JSP_PKG = JspPackage.eINSTANCE;
-	public static WebAppTranslator INSTANCE = new WebAppTranslator();
-	private static Translator[] children13;
-	private static Translator[] children14;
-	
-	private static final Translator SERVLET_MAPPING_TRANSLATOR = createServletMappingTranslator();
-	private static final Translator SESSION_CONFIG_TRANSLATOR = createSessionConfigTranslator();
-	private static final Translator WELCOMEFILE_TRANSLATOR = createFileListTranslator();
-	private static final Translator MIME_MAPPING_TRANSLATOR = createMimeMappingTranslator();
-	private static final Translator ERROR_PAGE_TRANSLATOR = new ErrorPageTranslator();
-	private static final Translator LOGIN_CONFIG_TRANSLATOR = createLoginConfigTranslator();
-	private static final Translator DISTRIBUTABLE_TRANSLATOR = new Translator(DISTRIBUTABLE, WEBAPP_PKG.getWebApp_Distributable(), EMPTY_TAG);
-	
-	private static final Translator WEB_RESOURCE_NAME_TRANSLATOR = new Translator(WEB_RESOURCE_NAME, WEBAPP_PKG.getWebResourceCollection_WebResourceName()); 
-	private static final Translator URL_PATTERN_TRANSLATOR = new Translator(URL_PATTERN, WEBAPP_PKG.getWebResourceCollection_UrlPattern());
-	private static final Translator HTTP_METHOD_TRANSLATOR = new Translator(HTTP_METHOD, WEBAPP_PKG.getWebResourceCollection_HttpMethod());
-	
-	private static final Translator ROLE_NAME_TRANSLATOR = new Translator(ROLE_NAME, WEBAPP_PKG.getAuthConstraint_Roles());
-	private static final Translator TRANSPORT_GUARANTEE_TRANSLATOR = new Translator(TRANSPORT_GUARANTEE, WEBAPP_PKG.getUserDataConstraint_TransportGuarantee());
-
-	
-	protected WebAppTranslator() {
-		super(WEB_APP, WEBAPP_PKG.getWebApp());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children13 == null)
-					children13 = create13Children();
-				return children13;	
-			default :
-				if (children14 == null)
-					children14 = create14Children();
-				return children14; 
-		}
-	}
-
-
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()), 
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()), 
-			DISTRIBUTABLE_TRANSLATOR,
-			createContextParam13Translator(),	 
-			createFilter13Translator(),	 
-			createFilterMapping13Translator(),	 
-			createListener13Translator(), 
-			createServlet13Translator(), 
-			SERVLET_MAPPING_TRANSLATOR,	 
-			SESSION_CONFIG_TRANSLATOR,	 
-			MIME_MAPPING_TRANSLATOR,	 
-			WELCOMEFILE_TRANSLATOR, 
-			ERROR_PAGE_TRANSLATOR, 
-			createTagLibTranslator13(WEBAPP_PKG.getWebApp_TagLibs()), 
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_3, 
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_3,
-			createSecurityConstraintTranslator13(),
-			LOGIN_CONFIG_TRANSLATOR, 
-			CommonTranslators.createSecurityRoleTranslator13(WEBAPP_PKG.getWebApp_SecurityRoles()), 
-			new EnvEntryTranslator(COMMON_PKG.getJNDIEnvRefsGroup_EnvironmentProperties(), false, false), 
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_3, 
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_3 
-		};
-	}
-	
-
-	protected Translator[] create14Children() {
-		Translator[] begin =  new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(VERSION, WEBAPP_PKG.getWebApp_Version(), DOM_ATTRIBUTE),
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+WEB_APP_SCHEMA_LOC_2_4),
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			DISTRIBUTABLE_TRANSLATOR,
-			CommonTranslators.createParamValueType(CONTEXT_PARAM, WEBAPP_PKG.getWebApp_ContextParams()),
-			createFilter14Translator(),
-			createFilterMapping14Translator(),
-			createListener14Translator(),
-			createServlet14Translator(),
-			SERVLET_MAPPING_TRANSLATOR,	 
-			SESSION_CONFIG_TRANSLATOR,	 
-			MIME_MAPPING_TRANSLATOR,	 
-			WELCOMEFILE_TRANSLATOR, 
-			ERROR_PAGE_TRANSLATOR,
-			createJSPConfigTranslators(),
-			createSecurityConstraintTranslators14(),
-			LOGIN_CONFIG_TRANSLATOR,
-			CommonTranslators.createSecurityRoleTranslator14(WEBAPP_PKG.getWebApp_SecurityRoles())
-		};
-		Translator[] end = new Translator[] {
-			CommonTranslators.createMessageDestinationTranslator(WEBAPP_PKG.getWebApp_MessageDestinations()),
-			createLocaleEncodingMappingListTranslator(),
-		//	CommonTranslators.createDeploymentExtensionTranslator(WEBAPP_PKG.getWebApp_Extensions())
-		};
-		
-		
-		return (Translator[])concat(begin,concat(createJNDIEnvironmentRefsGroupTranslator(), end));
-	}
-	
-	public static Translator createSecurityConstraintTranslators14() {
-		GenericTranslator result = new GenericTranslator(SECURITY_CONSTRAINT, WEBAPP_PKG.getWebApp_Constraints());
-		result.setChildren(new Translator[] {
-			CommonTranslators.createDisplayNameTranslator(WEBAPP_PKG.getSecurityConstraint_DisplayNames()),
-			createWebResourceCollectionTranslator14(),
-			createAuthConstraintTranslator14(),
-			createUserDataConstraintTranslator14(),
-		});
-		return result;
-	}
-	
-	private static Translator createWebResourceCollectionTranslator14() {
-		GenericTranslator result = new GenericTranslator(WEB_RESOURCE_COLLECTION, WEBAPP_PKG.getSecurityConstraint_WebResourceCollections());
-		result.setChildren(new Translator[] {
-			WEB_RESOURCE_NAME_TRANSLATOR, 
-			CommonTranslators.createDescriptionTranslator(WEBAPP_PKG.getWebResourceCollection_Descriptions()), 
-			URL_PATTERN_TRANSLATOR,
-			HTTP_METHOD_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createAuthConstraintTranslator14() { 
-		GenericTranslator result = new GenericTranslator(AUTH_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_AuthConstraint());
-		result.setChildren(new Translator[] {
-			CommonTranslators.createDescriptionTranslator(WEBAPP_PKG.getAuthConstraint_Descriptions()), 
-			ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createUserDataConstraintTranslator14() {
-		GenericTranslator result = new GenericTranslator(USER_DATA_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_UserDataConstraint());
-		result.setChildren(new Translator[] {
-			CommonTranslators.createDescriptionTranslator(WEBAPP_PKG.getUserDataConstraint_Descriptions()), 
-			TRANSPORT_GUARANTEE_TRANSLATOR 
-		});
-		return result;
-	}
-
-
-	private Translator createJSPConfigTranslators() {
-		GenericTranslator result = new GenericTranslator(JSP_CONFIG, WEBAPP_PKG.getWebApp_JspConfig());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createTagLibTranslator14(JSP_PKG.getJSPConfig_TagLibs()),
-			createJSPPropertyGroupTranslator()
-		});
-		
-		return result;
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createJSPPropertyGroupTranslator() {
-		GenericTranslator result = new GenericTranslator(JSP_PROPERTY_GROUP, JSP_PKG.getJSPConfig_PropertyGroups());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(URL_PATTERN, JSP_PKG.getJSPPropertyGroup_UrlPattern()),
-			new BooleanTranslator(EL_IGNORED, JSP_PKG.getJSPPropertyGroup_ElIgnored()),
-			new Translator(PAGE_ENCODING, JSP_PKG.getJSPPropertyGroup_PageEncoding()),
-			new BooleanTranslator(SCRIPTING_INVALID, JSP_PKG.getJSPPropertyGroup_ScriptingInvalid()),
-			new BooleanTranslator(IS_XML,JSP_PKG.getJSPPropertyGroup_IsXML()),
-			new Translator(INCLUDE_PRELUDE, JSP_PKG.getJSPPropertyGroup_IncludePreludes()),
-			new Translator(INCLUDE_CODA, JSP_PKG.getJSPPropertyGroup_IncludeCodas())
-		});		
-		return result;
-	}
-
-
-	private Translator createLocaleEncodingMappingListTranslator() {
-		GenericTranslator result = new GenericTranslator(LOCALE_ENCODING_MAPPING_LIST, WEBAPP_PKG.getWebApp_LocalEncodingMappingList());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			createLocaleEncodingMapping()
-		});
-		return result;
-	
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createLocaleEncodingMapping() {
-		GenericTranslator result = new GenericTranslator(LOCALE_ENCODING_MAPPING, WEBAPP_PKG.getLocalEncodingMappingList_LocalEncodingMappings());
-		result.setChildren(new Translator[] {
-			new Translator(LOCALE, WEBAPP_PKG.getLocalEncodingMapping_Locale()), //$NON-NLS-1$
-			new Translator(ENCODING, WEBAPP_PKG.getLocalEncodingMapping_Encoding()) //$NON-NLS-1$
-		});
-		return result;
-
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator[] createJNDIEnvironmentRefsGroupTranslator() {
-		return new Translator[] {
-			CommonTranslators.JNDI_REF_GROUP_ENV_ENTRY_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_EJB_LOCAL_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_SERVICE_REF_1_4,	
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_RESOURCE_ENV_REF_1_4,
-			CommonTranslators.JNDI_REF_GROUP_MESSAGE_DEST_REF_1_4
-		};
-	}
-
-
-	/**
-	 * @return
-	 */
-	private Translator createFilterMapping14Translator() {
-		Translator dispatcher = new Translator(DISPATCHER, WEBAPP_PKG.getFilterMapping_DispatcherType());
-		return GenericTranslator.appendChild((GenericTranslator)createFilterMapping13Translator(),dispatcher);
-	}
-	
-	public static Translator createContextParam13Translator() {
-		GenericTranslator result = new GenericTranslator(CONTEXT_PARAM, WEBAPP_PKG.getWebApp_Contexts());
-		result.setChildren(new Translator[] {
-			new Translator(PARAM_NAME, WEBAPP_PKG.getContextParam_ParamName()), 
-			new Translator(PARAM_VALUE, WEBAPP_PKG.getContextParam_ParamValue()), 
-			new Translator(DESCRIPTION, WEBAPP_PKG.getContextParam_Description()), 
-		});
-		return result;
-	}
-	
-	public static Translator createFilter13Translator() {
-		GenericTranslator result = new GenericTranslator(FILTER, WEBAPP_PKG.getWebApp_Filters());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(FILTER_NAME, WEBAPP_PKG.getFilter_Name(), 
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-						})),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()), 
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()), 
-			new JavaClassTranslator(FILTER_CLASS, WEBAPP_PKG.getFilter_FilterClass()), 
-			createInitParamTranslator(WEBAPP_PKG.getFilter_InitParams())
-		});
-		return result;
-	}
-	
-	
-	public static Translator createFilter14Translator() {
-		GenericTranslator result = new GenericTranslator(FILTER, WEBAPP_PKG.getWebApp_Filters());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(FILTER_NAME, WEBAPP_PKG.getFilter_Name(), 
-						//TODO: Make sure the path is still valid
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-						})),
-			new JavaClassTranslator(FILTER_CLASS, WEBAPP_PKG.getFilter_FilterClass()), 
-			CommonTranslators.createParamValueType(INIT_PARAM,WEBAPP_PKG.getFilter_InitParamValues())
-		});
-		return result;
-	}
-	
-	public static Translator createFilterMapping13Translator() {
-		GenericTranslator result = new GenericTranslator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings());
-		result.setChildren(new Translator[] {
-			new SourceLinkTranslator(FILTER_NAME, WEBAPP_PKG.getFilterMapping_Filter(), 
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(FILTER, WEBAPP_PKG.getWebApp_Filters()), 
-							new Translator(FILTER_MAPPING, WEBAPP_PKG.getFilter_Name())
-						})),
-			new Translator(URL_PATTERN, WEBAPP_PKG.getFilterMapping_UrlPattern()), 
-			new SourceLinkTranslator(SERVLET_NAME, WEBAPP_PKG.getFilterMapping_Servlet(), 
-						new TranslatorPath(new Translator[] {
-							new Translator(WEB_APP, Translator.CONTAINER_FEATURE), 
-							new Translator(SERVLET, WEBAPP_PKG.getWebApp_Servlets()), 
-							new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName()) 
-						}), Translator.STRING_RESULT_OK),
-		});
-		return result;
-	}
-	
-	public static Translator createInitParamTranslator(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(INIT_PARAM, feature);
-		result.setChildren(new Translator[] {
-			new Translator(PARAM_NAME, WEBAPP_PKG.getInitParam_ParamName()), 
-			new Translator(PARAM_VALUE, WEBAPP_PKG.getInitParam_ParamValue()), 
-			new Translator(DESCRIPTION, WEBAPP_PKG.getInitParam_Description()), 
-		});
-		return result;
-	}
-	
-	public static Translator createListener13Translator() {
-		GenericTranslator result = new GenericTranslator(LISTENER, WEBAPP_PKG.getWebApp_Listeners());
-		result.setChildren(new Translator[] {
-			CommonTranslators.LISTENER_CLASS_TRANSLATOR
-		});
-		return result;
-	}
-	
-	public static Translator createListener14Translator() {
-			GenericTranslator result = new GenericTranslator(LISTENER, WEBAPP_PKG.getWebApp_Listeners());
-			result.setChildren(new Translator[] {
-				CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-				CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-				CommonTranslators.ICONS_TRANSLATOR,
-				CommonTranslators.LISTENER_CLASS_TRANSLATOR
-			});
-			return result;
-	}
-	
-	public static Translator createServlet13Translator() {
-		GenericTranslator result = new GenericTranslator(SERVLET, WEBAPP_PKG.getWebApp_Servlets());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()), 
-			new Translator(LARGE_ICON_PATH, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()), 
-			new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName(), 
-				new TranslatorPath[] {
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(SERVLET_MAPPING, WEBAPP_PKG.getWebApp_ServletMappings()), 
-					}), 
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-					}), 
-				}),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()), 
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()), 
-			new WebTypeTranslator(), //servlet-class or jsp-file  
-			createInitParamTranslator(WEBAPP_PKG.getServlet_Params()), 
-			new Translator(LOAD_ON_STARTUP, WEBAPP_PKG.getServlet_LoadOnStartup()),
-			CommonTranslators.createRunAsTranslator13(WEBAPP_PKG.getServlet_RunAs()),
-			CommonTranslators.createSecurityRoleRefTranslator13(WEBAPP_PKG.getServlet_SecurityRoleRefs()) 
-		});
-		return result;	
-	}
-	
-	public static Translator createServlet14Translator() {
-		GenericTranslator result = new GenericTranslator(SERVLET, WEBAPP_PKG.getWebApp_Servlets());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName(), 
-				new TranslatorPath[] {
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(SERVLET_MAPPING, WEBAPP_PKG.getWebApp_ServletMappings()), 
-					}), 
-					new TranslatorPath(new Translator[] {
-						new Translator(WEB_APP, WEBAPP_PKG.getServlet_WebApp()), 
-						new Translator(FILTER_MAPPING, WEBAPP_PKG.getWebApp_FilterMappings()), 
-					}), 
-				}),
-			new WebTypeTranslator(), //servlet-class or jsp-file  
-			CommonTranslators.createParamValueType(INIT_PARAM,WEBAPP_PKG.getServlet_InitParams()), 
-			new Translator(LOAD_ON_STARTUP, WEBAPP_PKG.getServlet_LoadOnStartup()),
-			CommonTranslators.createRunAsTranslator14(WEBAPP_PKG.getServlet_RunAs()),
-			CommonTranslators.createSecurityRoleRefTranslator14(WEBAPP_PKG.getServlet_SecurityRoleRefs()),
-		//	CommonTranslators.createDeploymentExtensionTranslator(WEBAPP_PKG.getServlet_Extensions())
-		});
-		return result;	
-	}
-
-	public static Translator createServletMappingTranslator() {
-		GenericTranslator result = new GenericTranslator(SERVLET_MAPPING, WEBAPP_PKG.getWebApp_ServletMappings());
-		result.setChildren(new Translator[] {
-			new SourceLinkTranslator(SERVLET_NAME, WEBAPP_PKG.getServletMapping_Servlet(), 
-				new TranslatorPath(new Translator[] {
-					new Translator(WEB_APP, CONTAINER_FEATURE), 
-					new Translator(SERVLET, WEBAPP_PKG.getWebApp_Servlets()), 
-					new Translator(SERVLET_NAME, WEBAPP_PKG.getServlet_ServletName()) 
-				})),
-			new Translator(URL_PATTERN, WEBAPP_PKG.getServletMapping_UrlPattern()) 
-		});
-		return result;
-	}
-	
-	public static Translator createSessionConfigTranslator() {
-		GenericTranslator result = new GenericTranslator(SESSION_CONFIG, WEBAPP_PKG.getWebApp_SessionConfig());
-		result.setChildren(new Translator[] {
-			new Translator(SESSION_TIMEOUT, WebapplicationPackage.eINSTANCE.getSessionConfig_SessionTimeout()), 
-		});
-		return result;
-	}
-	
-	public static Translator createMimeMappingTranslator() {
-		GenericTranslator result = new GenericTranslator(MIME_MAPPING, WEBAPP_PKG.getWebApp_MimeMappings());
-		result.setChildren(new Translator[] {
-			new Translator(EXTENSION, WEBAPP_PKG.getMimeMapping_Extension()), 
-			new Translator(MIME_TYPE, WEBAPP_PKG.getMimeMapping_MimeType()), 
-			
-		});
-		return result;
-	}
-	
-	public static Translator createFileListTranslator() {
-		GenericTranslator result = new GenericTranslator(WELCOME_FILE_LIST, WEBAPP_PKG.getWebApp_FileList());
-		result.setChildren(new Translator[] {
-			createParentAndTextAttributeTranslator(WELCOME_FILE, WEBAPP_PKG.getWelcomeFileList_File(), WEBAPP_PKG.getWelcomeFile_WelcomeFile())
-		});
-		return result;
-	}
-	
-	public static Translator createTagLibTranslator14(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(TAGLIB, feature);
-		result.setChildren(new Translator[] {
-			new Translator(TAGLIB_URI, JSP_PKG.getTagLibRefType_TaglibURI()), 
-			new Translator(TAGLIB_LOCATION, JSP_PKG.getTagLibRefType_TaglibLocation()) 
-		});
-		return result;
-	}
-	public static Translator createTagLibTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(TAGLIB, feature);
-		result.setChildren(new Translator[] {
-			new Translator(TAGLIB_URI, WEBAPP_PKG.getTagLibRef_TaglibURI()), 
-			new Translator(TAGLIB_LOCATION, WEBAPP_PKG.getTagLibRef_TaglibLocation()) 
-		});
-		return result;
-	}
-	public static Translator createSecurityConstraintTranslator13() {
-		GenericTranslator result = new GenericTranslator(SECURITY_CONSTRAINT, WEBAPP_PKG.getWebApp_Constraints());
-		result.setChildren(new Translator[] {
-			new Translator(DISPLAY_NAME, WEBAPP_PKG.getSecurityConstraint_DisplayName()),
-			createWebResourceCollectionTranslator13(),
-			createAuthConstraintTranslator13(),
-			createUserDataConstraintTranslator13(),
-		});
-		return result;
-	}
-	
-	private static Translator createWebResourceCollectionTranslator13() {
-		GenericTranslator result = new GenericTranslator(WEB_RESOURCE_COLLECTION, WEBAPP_PKG.getSecurityConstraint_WebResourceCollections());
-		result.setChildren(new Translator[] {
-			WEB_RESOURCE_NAME_TRANSLATOR, 
-			new Translator(DESCRIPTION,WEBAPP_PKG.getWebResourceCollection_Description()), 
-			URL_PATTERN_TRANSLATOR,
-			HTTP_METHOD_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createAuthConstraintTranslator13() { 
-		GenericTranslator result = new GenericTranslator(AUTH_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_AuthConstraint());
-		result.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, WEBAPP_PKG.getAuthConstraint_Description()), 
-			ROLE_NAME_TRANSLATOR
-		});
-		return result;
-	}
-	
-	private static Translator createUserDataConstraintTranslator13() {
-		GenericTranslator result = new GenericTranslator(USER_DATA_CONSTRAINT, WEBAPP_PKG.getSecurityConstraint_UserDataConstraint());
-		result.setChildren(new Translator[] {
-			new Translator(DESCRIPTION, WEBAPP_PKG.getUserDataConstraint_Description()), 
-			TRANSPORT_GUARANTEE_TRANSLATOR 
-		});
-		return result;
-	}
-	
-	public static Translator createLoginConfigTranslator() {
-		GenericTranslator result = new GenericTranslator(LOGIN_CONFIG, WEBAPP_PKG.getWebApp_LoginConfig());
-		result.setChildren(new Translator[] {
-			new Translator(AUTH_METHOD, WEBAPP_PKG.getLoginConfig_AuthMethod(), Translator.ENUM_FEATURE_WITH_HYPHENS), 
-			new Translator(REALM_NAME, WEBAPP_PKG.getLoginConfig_RealmName()), 
-			createFormLoginConfigTranslator()
-		});
-		return result;
-	}
-	
-	public static Translator createFormLoginConfigTranslator() {
-		GenericTranslator result = new GenericTranslator(FORM_LOGIN_CONFIG,  WEBAPP_PKG.getLoginConfig_FormLoginConfig());
-		result.setChildren(new Translator[] {
-			new Translator(FORM_LOGIN_PAGE, WEBAPP_PKG.getFormLoginConfig_FormLoginPage()), 
-			new Translator(FORM_ERROR_PAGE, WEBAPP_PKG.getFormLoginConfig_FormErrorPage()), 
-		});
-		return result;
-	}
-		
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebTypeTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebTypeTranslator.java
deleted file mode 100644
index 4c988bf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webapplication/WebTypeTranslator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 20, 2003
- *
- */
-package org.eclipse.jst.j2ee.internal.model.translator.webapplication;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.xml.WarDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- */
-public class WebTypeTranslator extends Translator implements WarDeploymentDescriptorXmlMapperI {
-	
-	private static Translator[] SERVLET_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WebapplicationPackage.eINSTANCE.getServletType_ClassName())
-	};
-	private static Translator[] JSP_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WebapplicationPackage.eINSTANCE.getJSPType_JspFile())
-	};
-	
-	public WebTypeTranslator() {
-		super(SERVLET_CLASS+','+JSP_FILE, WebapplicationPackage.eINSTANCE.getServlet_WebType());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (((WebType)o).isJspType())
-			return JSP_XLATORS;
-		else if (((WebType)o).isServletType())
-			return SERVLET_XLATORS;
-		else
-			throw new IllegalStateException("Internal error: Web Type expected"); //$NON-NLS-1$
-	}
-	
-	
-	public String getDOMName(Object value) {
-		if (((WebType)value).isJspType())
-			return JSP_FILE;
-		else if (((WebType)value).isServletType())
-			return SERVLET_CLASS;
-		else 
-			throw new IllegalStateException("Internal error: Web Type expected"); //$NON-NLS-1$
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WebapplicationFactory fact = WebapplicationPackage.eINSTANCE.getWebapplicationFactory();
-		if (SERVLET_CLASS.equals(nodeName))
-			return fact.createServletType();
-		else if (JSP_FILE.equals(nodeName))
-			return fact.createJSPType();
-		else
-			return null;
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/EJBLinkTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/EJBLinkTranslator.java
deleted file mode 100644
index 4a0991e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/EJBLinkTranslator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-public class EJBLinkTranslator extends Translator implements WsddXmlMapperI {
-	
-	private static Translator[] EJB_LINK_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WsddPackage.eINSTANCE.getEJBLink_EjbLink())
-	};
-	
-	public EJBLinkTranslator() {
-		super(EJB_LINK, WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return EJB_LINK_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return EJB_LINK;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WsddFactory fact = WsddPackage.eINSTANCE.getWsddFactory();
-		return fact.createEJBLink();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ElementNameTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ElementNameTranslator.java
deleted file mode 100644
index adac887..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ElementNameTranslator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class ElementNameTranslator extends Translator implements JaxrpcmapXmlMapperI {
-	
-	private static Translator[]   ELEMENT_NAME_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, JaxrpcmapPackage.eINSTANCE.getElementName_Text())
-	};
-	
-	public ElementNameTranslator() {
-		super(ELEMENT_NAME, JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return ELEMENT_NAME_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return ELEMENT_NAME;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		JaxrpcmapFactory fact = JaxrpcmapPackage.eINSTANCE.getJaxrpcmapFactory();
-		return fact.createElementName();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/InterfaceMappingTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/InterfaceMappingTranslator.java
deleted file mode 100644
index 640fd92..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/InterfaceMappingTranslator.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class InterfaceMappingTranslator extends Translator implements JaxrpcmapXmlMapperI {
-
-	
-	private static Translator[] SERVICE_INTERFACE_10XLATORS = new Translator[] {
-     new Translator(SERVICE_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_ServiceInterface()),
-     create10WSDLServiceNameTranslator(),
-     createPortMappingTranslator()
-	};
-
-	private static Translator[] SERVICE_INTERFACE_11XLATORS = new Translator[] {
-     new Translator(SERVICE_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_ServiceInterface()),
-     CommonTranslators.createQNameTranslator(WSDL_SERVICE_NAME, JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName()),
-     createPortMappingTranslator()
-	};
-
-	private static Translator[] SEI_10XLATORS = new Translator[] {
-     new Translator(SERVICE_ENDPOINT_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface()),
-      create10WSDLPortTypeTranslator(),
-      create10WSDLBindingTranslator(),
-      create10SEMethodMappingTranslator()
-	};
-
-	private static Translator[] SEI_11XLATORS = new Translator[] {
-     new Translator(SERVICE_ENDPOINT_INTERFACE, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface()),
-     CommonTranslators.createQNameTranslator(WSDL_PORT_TYPE, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType()),
-     CommonTranslators.createQNameTranslator(WSDL_BINDING, JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding()),
-     create11SEMethodMappingTranslator()
-	};
-	
-	public InterfaceMappingTranslator() {
-		super(SERVICE_INTERFACE_MAPPING+','+SERVICE_ENDPOINT_INTERFACE_MAPPING, JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-		if (o instanceof ServiceInterfaceMapping)
-			return getServiceInterfaceTranslator(versionID);
-		else if (o instanceof ServiceEndpointInterfaceMapping)
-			return getSEITranslator(versionID);
-		else
-			throw new IllegalStateException("Internal error: InterfaceMapping expected"); //$NON-NLS-1$
-	}
-	
-	
-	public String getDOMName(Object value) {
-		if (value instanceof ServiceInterfaceMapping)
-			return SERVICE_INTERFACE_MAPPING;
-		else if (value instanceof ServiceEndpointInterfaceMapping)
-			return SERVICE_ENDPOINT_INTERFACE_MAPPING;
-		else 
-			throw new IllegalStateException("Internal error: InterfaceMapping expected"); //$NON-NLS-1$
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		JaxrpcmapFactory fact = JaxrpcmapPackage.eINSTANCE.getJaxrpcmapFactory();
-		if (SERVICE_INTERFACE_MAPPING.equals(nodeName))
-			return fact.createServiceInterfaceMapping();
-		else if (SERVICE_ENDPOINT_INTERFACE_MAPPING.equals(nodeName))
-			return fact.createServiceEndpointInterfaceMapping();
-		else
-			return null;
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-   private Translator[] getServiceInterfaceTranslator(int versionID)
-   {
-		switch (versionID) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return SERVICE_INTERFACE_10XLATORS;	
-			default :
-				return SERVICE_INTERFACE_11XLATORS; 
-		}
-    
-   }
-
-   private Translator[] getSEITranslator(int versionID)
-   {
-		switch (versionID) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return SEI_10XLATORS;	
-			default :
-				return SEI_11XLATORS; 
-		}
-    
-   }
-	private static Translator create10WSDLServiceNameTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_SERVICE_NAME, jaxrpcmapPackage.getServiceInterfaceMapping_WsdlServiceName());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator createPortMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(PORT_MAPPING, jaxrpcmapPackage.getServiceInterfaceMapping_PortMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PORT_NAME, jaxrpcmapPackage.getPortMapping_PortName()),
-			new Translator(JAVA_PORT_NAME, jaxrpcmapPackage.getPortMapping_JavaPortName())
-		});
-		return result;	
-	}
-	/*
-	private static Translator create10PortMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(PORT_MAPPING, jaxrpcmapPackage.getServiceInterfaceMapping_PortMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PORT_NAME, jaxrpcmapPackage.getPortMapping_PortName()),
-			new Translator(JAVA_PORT_NAME, jaxrpcmapPackage.getPortMapping_JavaPortName())
-		});
-		return result;	
-	}
-	*/
-
-	private static Translator create10WSDLPortTypeTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;	    
-		GenericTranslator result = new GenericTranslator(WSDL_PORT_TYPE, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_WsdlPortType());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLBindingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;	    	    
-		GenericTranslator result = new GenericTranslator(WSDL_BINDING, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_WsdlBinding());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator create10SEMethodMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(SERVICE_ENDPOINT_METHOD_MAPPING, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_METHOD_NAME, jaxrpcmapPackage.getServiceEndpointMethodMapping_JavaMethodName()),
-			new Translator(WSDL_OPERATION, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlOperation()),
-			new Translator(WRAPPED_ELEMENT, jaxrpcmapPackage.getServiceEndpointMethodMapping_WrappedElement(), Translator.EMPTY_TAG),
-			create10MethodParamPartsMappingTranslator(),
-			create10WSDLReturnValueMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create11SEMethodMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(SERVICE_ENDPOINT_METHOD_MAPPING, jaxrpcmapPackage.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_METHOD_NAME, jaxrpcmapPackage.getServiceEndpointMethodMapping_JavaMethodName()),
-			new Translator(WSDL_OPERATION, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlOperation()),
-			new Translator(WRAPPED_ELEMENT, jaxrpcmapPackage.getServiceEndpointMethodMapping_WrappedElement(), Translator.EMPTY_TAG),
-			create11MethodParamPartsMappingTranslator(),
-			create11WSDLReturnValueMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create10MethodParamPartsMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(METHOD_PARAM_PARTS_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_MethodParamPartsMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_POSITION, jaxrpcmapPackage.getMethodParamPartsMapping_ParamPosition()),
-			new Translator(PARAM_TYPE, jaxrpcmapPackage.getMethodParamPartsMapping_ParamType()),
-			create10WSDLMessageMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create11MethodParamPartsMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(METHOD_PARAM_PARTS_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_MethodParamPartsMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_POSITION, jaxrpcmapPackage.getMethodParamPartsMapping_ParamPosition()),
-			new Translator(PARAM_TYPE, jaxrpcmapPackage.getMethodParamPartsMapping_ParamType()),
-			create11WSDLMessageMappingTranslator()
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLMessageMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE_MAPPING, jaxrpcmapPackage.getMethodParamPartsMapping_WsdlMessageMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-          create10WSDLMessageTranslator(jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessagePartName()),
-			new Translator(PARAMETER_MODE, jaxrpcmapPackage.getWSDLMessageMapping_ParameterMode()),
-			new Translator(SOAP_HEADER, jaxrpcmapPackage.getWSDLMessageMapping_SoapHeader(), Translator.EMPTY_TAG),
-		});
-		return result;	
-	}
-
-	private static Translator create11WSDLMessageMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE_MAPPING, jaxrpcmapPackage.getMethodParamPartsMapping_WsdlMessageMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-          CommonTranslators.createQNameTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLMessageMapping_WsdlMessagePartName()),
-			new Translator(PARAMETER_MODE, jaxrpcmapPackage.getWSDLMessageMapping_ParameterMode()),
-			new Translator(SOAP_HEADER, jaxrpcmapPackage.getWSDLMessageMapping_SoapHeader(), Translator.EMPTY_TAG),
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLMessageTranslator(EStructuralFeature feature) {
-	    //JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-	    CommonPackage commonPackage = CommonPackage.eINSTANCE;	    	    	    
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())
-		});
-		return result;	
-	}
-
-	private static Translator create10WSDLReturnValueMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_RETURN_VALUE_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlReturnValueMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(METHOD_RETURN_VALUE, jaxrpcmapPackage.getWSDLReturnValueMapping_MethodReturnValue()),
-			create10WSDLMessageTranslator(jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessagePartName())
-		});
-		return result;	
-	}
-
-	private static Translator create11WSDLReturnValueMappingTranslator() {
-	    JaxrpcmapPackage jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		GenericTranslator result = new GenericTranslator(WSDL_RETURN_VALUE_MAPPING, jaxrpcmapPackage.getServiceEndpointMethodMapping_WsdlReturnValueMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(METHOD_RETURN_VALUE, jaxrpcmapPackage.getWSDLReturnValueMapping_MethodReturnValue()),
-          CommonTranslators.createQNameTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getWSDLReturnValueMapping_WsdlMessagePartName())
-		});
-		return result;	
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapTranslator.java
deleted file mode 100644
index 9766c37..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapTranslator.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-
-public class JaxrpcmapTranslator extends RootTranslator implements JaxrpcmapXmlMapperI, J2EEConstants{
-	public static JaxrpcmapTranslator INSTANCE = new JaxrpcmapTranslator();
-	private static Translator[] children10;
-	private static Translator[] children11;
-	private JaxrpcmapPackage jaxrpcmapPackage;
-	private CommonPackage commonPackage;
-	
-	
-	protected JaxrpcmapTranslator() {
-		super(JAVA_WSDL_MAPPING, JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-	    jaxrpcmapPackage = JaxrpcmapPackage.eINSTANCE;
-		commonPackage = CommonPackage.eINSTANCE;
-
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children10 == null)
-				{
-					children10 = create10Children();
-				}
-				return children10;	
-			default :
-				if (children11 == null)
-				{
-					children11 = create11Children();
-				}
-				return children11; 
-		}
-	}
-
-
-	protected Translator[] create10Children() {
-		
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			createPackageMappingTranslator(),
-			create10JavaXMLTypeMappingTranslator(),
-			create10ExceptionMappingTranslator(),
-			new InterfaceMappingTranslator()
-		};
-	}
-
-	protected Translator[] create11Children() {
-		
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+WebServiceConstants.JAXRPCMAP_SCHEMA_LOC),
-			new ConstantAttributeTranslator(VERSION, WebServiceConstants.WEBSERVICE_SCHEMA_VERSION),			  			  
-			createPackageMappingTranslator(),
-			create11JavaXMLTypeMappingTranslator(),
-			create11ExceptionMappingTranslator(),
-			new InterfaceMappingTranslator()
-		};
-	}
-
-	public Translator createPackageMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(PACKAGE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_PackageMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PACKAGE_TYPE, jaxrpcmapPackage.getPackageMapping_PackageType()),
-			new Translator(NAMESPACEURI, jaxrpcmapPackage.getPackageMapping_NamespaceURI())
-		});
-		return result;	
-	}
-
-	public Translator create10JavaXMLTypeMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(JAVA_XML_TYPE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_JavaXMLTypeMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(CLASS_TYPE, jaxrpcmapPackage.getJavaXMLTypeMapping_ClassType()),
-			create10RootTypeQnameTranslator(),
-			new Translator(QNAME_SCOPE, jaxrpcmapPackage.getJavaXMLTypeMapping_QnameScope()),
-			create10VariableMappingTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create11JavaXMLTypeMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(JAVA_XML_TYPE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_JavaXMLTypeMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_TYPE, jaxrpcmapPackage.getJavaXMLTypeMapping_ClassType()),
-			new Translator(ANONYMOUS_TYPE_QNAME, jaxrpcmapPackage.getJavaXMLTypeMapping_AnonymousTypeQname()),
-			CommonTranslators.createQNameTranslator(ROOT_TYPE_QNAME, jaxrpcmapPackage.getJavaXMLTypeMapping_RootTypeQname()),
-			//create10RootTypeQnameTranslator(),  //RootTypeQName is still going to work the old (1.3) way because of anonymous types.
-			new Translator(QNAME_SCOPE, jaxrpcmapPackage.getJavaXMLTypeMapping_QnameScope()),
-			create11VariableMappingTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create10ExceptionMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(EXCEPTION_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_ExceptionMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(EXCEPTION_TYPE, jaxrpcmapPackage.getExceptionMapping_ExceptionType()),
-			create10WSDLMessageTranslator(),
-			createConstructorParamOrderTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create11ExceptionMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(EXCEPTION_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping_ExceptionMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(EXCEPTION_TYPE, jaxrpcmapPackage.getExceptionMapping_ExceptionType()),
-			CommonTranslators.createQNameTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getExceptionMapping_WsdlMessage()),
-			new Translator(WSDL_MESSAGE_PART_NAME, jaxrpcmapPackage.getExceptionMapping_WsdlMessagePartName()),
-			createConstructorParamOrderTranslator()
-		});
-		return result;	
-	}
-
-	public Translator createInterfaceMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(SERVICE_INTERFACE_MAPPING, jaxrpcmapPackage.getJavaWSDLMapping());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PACKAGE_TYPE, jaxrpcmapPackage.getPackageMapping_PackageType()),
-			new Translator(NAMESPACEURI, jaxrpcmapPackage.getPackageMapping_NamespaceURI())
-		});
-		return result;	
-	}
-
-
-	public Translator create10RootTypeQnameTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(ROOT_TYPE_QNAME, jaxrpcmapPackage.getJavaXMLTypeMapping_RootTypeQname());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-	public Translator create10VariableMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(VARIABLE_MAPPING, jaxrpcmapPackage.getJavaXMLTypeMapping_VariableMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_VARIABLE_NAME, jaxrpcmapPackage.getVariableMapping_JavaVariableName()),
-			new Translator(DATA_MEMBER, jaxrpcmapPackage.getVariableMapping_DataMember(), Translator.EMPTY_TAG),
-			new Translator(XML_ELEMENT_NAME, jaxrpcmapPackage.getVariableMapping_XmlElementName())
-		});
-		return result;	
-	}
-
-	public Translator create11VariableMappingTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(VARIABLE_MAPPING, jaxrpcmapPackage.getJavaXMLTypeMapping_VariableMappings());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(JAVA_VARIABLE_NAME, jaxrpcmapPackage.getVariableMapping_JavaVariableName()),
-			new Translator(DATA_MEMBER, jaxrpcmapPackage.getVariableMapping_DataMember(), Translator.EMPTY_TAG),
-			new Translator(XML_ATTRIBUTE_NAME, jaxrpcmapPackage.getVariableMapping_XmlAttributeName()),
-			new Translator(XML_ELEMENT_NAME, jaxrpcmapPackage.getVariableMapping_XmlElementName()),
-			new Translator(XML_WILDCARD, jaxrpcmapPackage.getVariableMapping_XmlWildcard(), Translator.EMPTY_TAG)
-		});
-		return result;	
-	}
-
-	public Translator create10WSDLMessageTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(WSDL_MESSAGE, jaxrpcmapPackage.getExceptionMapping_WsdlMessage());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, commonPackage.getQName_NamespaceURI()),
-			new Translator(LOCALPART, commonPackage.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-	public Translator createConstructorParamOrderTranslator() {
-		GenericTranslator result = new GenericTranslator(CONSTRUCTOR_PARAMETER_ORDER, jaxrpcmapPackage.getExceptionMapping_ConstructorParameterOrder());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new ElementNameTranslator()
-		});
-		return result;	
-	}
-	
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapXmlMapperI.java
deleted file mode 100644
index 4bfc870..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/JaxrpcmapXmlMapperI.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-//imports for J2EE core classes
-//import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an web service deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface JaxrpcmapXmlMapperI extends WebServiceCommonXmlMapperI
-{
-  public String JAVA_WSDL_MAPPING                       ="java-wsdl-mapping"; //$NON-NLS-1$
-  public String CLASS_TYPE                              ="class-type";//$NON-NLS-1$
-  public String JAVA_TYPE                                ="java-type";  //$NON-NLS-1$
-  public String CONSTRUCTOR_PARAMETER_ORDER             ="constructor-parameter-order";//$NON-NLS-1$
-  public String DATA_MEMBER                             ="data-member";//$NON-NLS-1$
-  public String ELEMENT_NAME                            ="element-name";//$NON-NLS-1$
-  public String EXCEPTION_MAPPING                       ="exception-mapping";//$NON-NLS-1$
-  public String EXCEPTION_TYPE                          ="exception-type";//$NON-NLS-1$
-  public String JAVA_METHOD_NAME                        ="java-method-name";//$NON-NLS-1$
-  public String JAVA_PORT_NAME                          ="java-port-name";//$NON-NLS-1$
-  public String JAVA_VARIABLE_NAME                      ="java-variable-name";//$NON-NLS-1$
-  public String JAVA_XML_TYPE_MAPPING                   ="java-xml-type-mapping";//$NON-NLS-1$
-  public String METHOD_PARAM_PARTS_MAPPING              ="method-param-parts-mapping";//$NON-NLS-1$
-  public String METHOD_RETURN_VALUE                     ="method-return-value";//$NON-NLS-1$
-  public String PACKAGE_MAPPING                         ="package-mapping";//$NON-NLS-1$
-  public String PACKAGE_TYPE                            ="package-type";//$NON-NLS-1$
-  public String PARAMETER_MODE                          ="parameter-mode";//$NON-NLS-1$
-  public String PARAM_POSITION                          ="param-position";//$NON-NLS-1$
-  public String PARAM_TYPE                              ="param-type";//$NON-NLS-1$
-  public String PORT_MAPPING                            ="port-mapping";//$NON-NLS-1$
-  public String QNAME_SCOPE                             ="qname-scope";//$NON-NLS-1$
-  public String ANONYMOUS_TYPE_QNAME             = "anonymous-type-qname";//$NON-NLS-1$
-  public String ROOT_TYPE_QNAME                         ="root-type-qname";//$NON-NLS-1$
-  //public String SERVICE_ENDPOINT_INTERFACE              ="service-endpoint-interface";
-  public String SERVICE_ENDPOINT_INTERFACE_MAPPING      ="service-endpoint-interface-mapping";//$NON-NLS-1$
-  public String SERVICE_ENDPOINT_METHOD_MAPPING         ="service-endpoint-method-mapping";//$NON-NLS-1$
-  //public String SERVICE_INTERFACE                       ="service-interface";
-  public String SERVICE_INTERFACE_MAPPING               ="service-interface-mapping";//$NON-NLS-1$
-  //public String SOAP_HEADER                             ="soap_header";
-  public String VARIABLE_MAPPING                        ="variable-mapping";//$NON-NLS-1$
-  public String WRAPPED_ELEMENT                         ="wrapped-element";//$NON-NLS-1$
-  public String WSDL_BINDING                            ="wsdl-binding";//$NON-NLS-1$
-  public String WSDL_MESSAGE                            ="wsdl-message";//$NON-NLS-1$
-  public String WSDL_MESSAGE_MAPPING                    ="wsdl-message-mapping";//$NON-NLS-1$
-  public String WSDL_MESSAGE_PART_NAME                  ="wsdl-message-part-name";//$NON-NLS-1$
-  public String WSDL_OPERATION                          ="wsdl-operation";//$NON-NLS-1$
-  public String WSDL_PORT_TYPE                          ="wsdl-port-type";//$NON-NLS-1$
-  public String WSDL_RETURN_VALUE_MAPPING               ="wsdl-return-value-mapping";//$NON-NLS-1$
-  public String WSDL_SERVICE_NAME                       ="wsdl-service-name";//$NON-NLS-1$
-  public String XML_ATTRIBUTE_NAME                        ="xml-attribute-name";//$NON-NLS-1$
-  public String XML_ELEMENT_NAME                        ="xml-element-name";//$NON-NLS-1$
-  public String XML_WILDCARD                                ="xml-wildcard";//$NON-NLS-1$
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/SOAPRoleTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/SOAPRoleTranslator.java
deleted file mode 100644
index 3b2e26c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/SOAPRoleTranslator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-public class SOAPRoleTranslator extends Translator implements WsddXmlMapperI {
-	
-	private static Translator[] SOAP_ROLE_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WscommonPackage.eINSTANCE.getSOAPRole_SoapRole())
-	};
-	
-	public SOAPRoleTranslator() {
-		super(SOAP_ROLE, WsddPackage.eINSTANCE.getHandler_SoapRoles());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return SOAP_ROLE_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return SOAP_ROLE;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WscommonFactory fact = WscommonPackage.eINSTANCE.getWscommonFactory();
-		return fact.createSOAPRole();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ServletLinkTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ServletLinkTranslator.java
deleted file mode 100644
index 9a9f661..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/ServletLinkTranslator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-public class ServletLinkTranslator extends Translator implements WsddXmlMapperI {
-	
-	private static Translator[] SERVLET_LINK_XLATORS = new Translator[] {
-		new Translator(TEXT_ATTRIBUTE_VALUE, WsddPackage.eINSTANCE.getServletLink_ServletLink())
-	};
-	
-	public ServletLinkTranslator() {
-		super(SERVLET_LINK, WsddPackage.eINSTANCE.getServiceImplBean_EServletLink());
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (o == null)
-			return CommonTranslators.EMPTY_CHILDREN;
-
-		return SERVLET_LINK_XLATORS;
-	}
-	
-	
-	public String getDOMName(Object value) {
-	  return SERVLET_LINK;
-	}
-
-		
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#createEMFObject(java.lang.String, java.lang.String)
-	 */
-	public EObject createEMFObject(String nodeName, String readAheadName) {
-		WsddFactory fact = WsddPackage.eINSTANCE.getWsddFactory();
-		return fact.createServletLink();
-
-	}
-	
-	public boolean isManagedByParent() {
-		return false;
-	}
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServiceCommonXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServiceCommonXmlMapperI.java
deleted file mode 100644
index 9bf68c7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServiceCommonXmlMapperI.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-//imports for J2EE core classes
-import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an web service deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface WebServiceCommonXmlMapperI extends DeploymentDescriptorXmlMapperI
-{
-//  public String WSDL_FILE                       = "wsdl-file";
-//  public String JAXRPC_MAPPING_FILE             = "jaxrpc-mapping-file";
-  public String NAMESPACEURI                    = "namespaceURI";//$NON-NLS-1$
-  public String LOCALPART                       = "localpart";//$NON-NLS-1$
-//  public String SERVICE_INTERFACE               = "service-interface";
-  public String SERVICE_ENDPOINT_INTERFACE      = "service-endpoint-interface";//$NON-NLS-1$
-//  public String HANDLER                         = "handler";
-//  public String HANDLER_NAME                    = "handler-name";
-//  public String HANDLER_CLASS                   = "handler-class";
-  public String INIT_PARAM                      = "init-param";//$NON-NLS-1$
-//  public String PARAM_NAME                      = "param-name";
-//  public String PARAM_VALUE                     = "param-value";
-//  public String SOAP_HEADER                     = "soap-header";
-//  public String SOAP_ROLE                       = "soap-role";
-//  public String PORT_NAME                       = "port-name";
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServicesTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServicesTranslator.java
deleted file mode 100644
index 1b98b24..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WebServicesTranslator.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.internal.model.translator.common.JavaClassTranslator;
-import org.eclipse.jst.j2ee.internal.xml.WebServicesDeploymentDescriptorXmlMapperI;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class WebServicesTranslator extends RootTranslator implements WebServicesDeploymentDescriptorXmlMapperI{
-	public static WebServicesTranslator INSTANCE = new WebServicesTranslator();
-	public static final String WEBSERVICESCLIENT = WEB_SERVICES_CLIENT; 
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-
-	private static  Webservice_clientPackage WEBSERVICECLIENT_PKG = Webservice_clientPackage.eINSTANCE;
-	
-	private static Translator[] children13;
-    
-	public WebServicesTranslator() {
-		super(WEBSERVICESCLIENT, Webservice_clientPackage.eINSTANCE.getWebServicesClient());
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-		if (children13 == null)
-			children13 = create13Children();
-		return children13;
-	}
-	
-	protected Translator[] create13Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			createServiceRefGroupTranslator13(),
-			createComponentScopedRefs13()
-		};
-	}
-	/**
-	 * This model was model from Websphere Webservices
-	 * @param reference
-	 * @return
-	 */
-	public static Translator createServiceRefGroupTranslator13() {
-		GenericTranslator result = new GenericTranslator(SERVICE_REF, WEBSERVICECLIENT_PKG.getWebServicesClient_ServiceRefs());
-		result.setChildren( new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new Translator(SERVICE_REF_NAME, WEBSERVICECLIENT_PKG.getServiceRef_ServiceRefName()),
-			new JavaClassTranslator(SERVICE_INTERFACE, WEBSERVICECLIENT_PKG.getServiceRef_ServiceInterface()),
-			new Translator(WSDL_FILE, WEBSERVICECLIENT_PKG.getServiceRef_WsdlFile()),
-			new Translator(JAXRPC_MAPPING_FILE, WEBSERVICECLIENT_PKG.getServiceRef_JaxrpcMappingFile()),
-			createQNameTranslator10(SERVICE_QNAME, WEBSERVICECLIENT_PKG.getServiceRef_ServiceQname()),
-			CommonTranslators.createPortComponentRefTranslator(),
-			createServiceRefHandlerTranslator13(),
-		});
-		
-		
-		return result;
-	}
-	/**
-	 * This model was model from Websphere Webservices
-	 * @return
-	 */
-	public static Translator createServiceRefHandlerTranslator13() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WEBSERVICECLIENT_PKG.getServiceRef_Handlers());
-		result.setChildren(new Translator[]{
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),
-			new Translator(HANDLER_NAME, WEBSERVICECLIENT_PKG.getHandler_HandlerName()),
-			new JavaClassTranslator(HANDLER_CLASS, WEBSERVICECLIENT_PKG.getHandler_HandlerClass()),
-			createParamValueType13(HANDLER_INIT_PARAM, WEBSERVICECLIENT_PKG.getHandler_InitParams()),
-			createQNameTranslator10(SOAP_HEADER, WEBSERVICECLIENT_PKG.getHandler_SoapHeaders()),
-			new Translator(SOAP_ROLE, WEBSERVICECLIENT_PKG.getHandler_SoapRoles()),
-			new Translator(PORT_NAME, WEBSERVICECLIENT_PKG.getHandler_PortNames())
-		});
-		
-		return result;
-	}
-    /**
-     * @return
-     */
-    private Translator createComponentScopedRefs13() {
-		GenericTranslator result = new GenericTranslator(COMP_SCOPED_REFS, WEBSERVICECLIENT_PKG.getWebServicesClient_ComponentScopedRefs());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(COMP_COMPONENT_NAME, WEBSERVICECLIENT_PKG.getComponentScopedRefs_ComponentName()), 
-			createServiceRefGroupTranslator13(WEBSERVICECLIENT_PKG.getComponentScopedRefs_ServiceRefs())
-		});
-		return result;
-    }
-    
-	/**
-	 * This model was model from Websphere Webservices
-	 * @param reference
-	 * @return
-	 */
-	public static Translator createServiceRefGroupTranslator13(EStructuralFeature feature) {
-		GenericTranslator result = new GenericTranslator(SERVICE_REF, feature);
-		result.setChildren( new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,
-			new Translator(SERVICE_REF_NAME, WEBSERVICECLIENT_PKG.getServiceRef_ServiceRefName()),
-			new JavaClassTranslator(SERVICE_INTERFACE, WEBSERVICECLIENT_PKG.getServiceRef_ServiceInterface()),
-			new Translator(WSDL_FILE, WEBSERVICECLIENT_PKG.getServiceRef_WsdlFile()),
-			new Translator(JAXRPC_MAPPING_FILE, WEBSERVICECLIENT_PKG.getServiceRef_JaxrpcMappingFile()),
-			createQNameTranslator10(SERVICE_QNAME, WEBSERVICECLIENT_PKG.getServiceRef_ServiceQname()),
-			CommonTranslators.createPortComponentRefTranslator(),
-			CommonTranslators.createServiceRefHandlerTranslator(),
-		});
-		
-		
-		return result;
-	}    
-    
-	public static Translator createQNameTranslator10(String domName, EStructuralFeature feature) {		
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, COMMON_PKG.getQName_NamespaceURI()),
-			new Translator(LOCALPART, COMMON_PKG.getQName_LocalPart())
-		});
-		return result;	
-	}
-	
-	public static Translator createParamValueType13(String domName, EStructuralFeature feature){
-		GenericTranslator result = new GenericTranslator(domName, feature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_NAME, COMMON_PKG.getParamValue_Name()),
-			new Translator(PARAM_VALUE, COMMON_PKG.getParamValue_Value()),
-			new Translator(DESCRIPTION, COMMON_PKG.getParamValue_Description())
-		});
-		return result;
-	}
-	
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java
deleted file mode 100644
index 5604ed1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddTranslator.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.model.translator.common.CommonTranslators;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emf.resource.ConstantAttributeTranslator;
-import org.eclipse.wst.common.internal.emf.resource.GenericTranslator;
-import org.eclipse.wst.common.internal.emf.resource.IDTranslator;
-import org.eclipse.wst.common.internal.emf.resource.RootTranslator;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-
-public class WsddTranslator extends RootTranslator implements WsddXmlMapperI, J2EEConstants{
-	public static WsddTranslator INSTANCE = new WsddTranslator();
-	private static Translator[] children10;
-	private static Translator[] children11;
-
-	private static WsddPackage WSDD_PKG = WsddPackage.eINSTANCE;
-	private static WscommonPackage WSCOMMON_PKG = WscommonPackage.eINSTANCE;
-	private static CommonPackage COMMON_PKG = CommonPackage.eINSTANCE;
-	
-	protected WsddTranslator() {
-		super(WEBSERVICES, WsddPackage.eINSTANCE.getWebServices());
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.Translator#getChildren(java.lang.Object, int)
-	 */
-	public Translator[] getChildren(Object o, int versionID) {
-	    
-		
-
-		switch (versionID) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :
-				if (children10 == null)
-				{
-					children10 = create10Children();
-				}
-				return children10;	
-			default :
-				if (children11 == null)
-				{
-					children11 = create11Children();
-				}
-				return children11; 
-		}
-	}
-
-
-	protected Translator[] create10Children() {
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),			
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),			
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),			
-			create10WebServiceDescTranslator()
-		};
-	}
-
-	protected Translator[] create11Children() {
-		
-		return new Translator[] {
-			IDTranslator.INSTANCE,
-			new ConstantAttributeTranslator(XML_NS, J2EE_NS_URL),
-			new ConstantAttributeTranslator(XML_NS_XSI, XSI_NS_URL),
-			new ConstantAttributeTranslator(XSI_SCHEMA_LOCATION, J2EE_NS_URL+' '+WebServiceConstants.WEBSERVICE_SCHEMA_LOC),
-			new ConstantAttributeTranslator(VERSION, WebServiceConstants.WEBSERVICE_SCHEMA_VERSION),			  
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,			
-			create11WebServiceDescTranslator()
-		};
-	}
-
-	public Translator create10WebServiceDescTranslator() {
-		GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, WSDD_PKG.getWebServiceDescription_Description()),			
-			new Translator(DISPLAY_NAME, WSDD_PKG.getWebServiceDescription_DisplayName()),			
-			new Translator(SMALL_ICON, WSDD_PKG.getWebServiceDescription_SmallIcon()),			
-			new Translator(LARGE_ICON, WSDD_PKG.getWebServiceDescription_LargeIcon()),						
-			new Translator(WEBSERVICE_DESCRIPTION_NAME, WSDD_PKG.getWebServiceDescription_WebServiceDescriptionName()),
-			new Translator(WSDL_FILE, WSDD_PKG.getWebServiceDescription_WsdlFile()),			
-			new Translator(JAXRPC_MAPPING_FILE, WSDD_PKG.getWebServiceDescription_JaxrpcMappingFile()),			
-			create10PortComponentTranslator()			  
-		});
-		return result;	
-	}
-
-	public Translator create11WebServiceDescTranslator() {
-	    
-		GenericTranslator result = new GenericTranslator(WEBSERVICE_DESCRIPTION, WSDD_PKG.getWebServices_WebServiceDescriptions());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			create11DescriptionTranslator(WSDD_PKG.getWebServiceDescription_DescriptionType()),
-			create11DisplayNameTranslator(WSDD_PKG.getWebServiceDescription_DisplayNameType()),			
-			create11IconTranslator(WSDD_PKG.getWebServiceDescription_IconType()),			
-			new Translator(WEBSERVICE_DESCRIPTION_NAME, WSDD_PKG.getWebServiceDescription_WebServiceDescriptionName()),
-			new Translator(WSDL_FILE, WSDD_PKG.getWebServiceDescription_WsdlFile()),			
-			new Translator(JAXRPC_MAPPING_FILE, WSDD_PKG.getWebServiceDescription_JaxrpcMappingFile()),			
-			create11PortComponentTranslator()			  
-		});
-		return result;	
-	}
-
-
-
-	public Translator create10PortComponentTranslator() {
-		GenericTranslator result = new GenericTranslator(PORT_COMPONENT, WSDD_PKG.getWebServiceDescription_PortComponents());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, WSDD_PKG.getPortComponent_Description()),			
-			new Translator(DISPLAY_NAME, WSDD_PKG.getPortComponent_DisplayName()),			
-			new Translator(SMALL_ICON, WSDD_PKG.getPortComponent_SmallIcon()),			
-			new Translator(LARGE_ICON, WSDD_PKG.getPortComponent_LargeIcon()),						
-			new Translator(PORT_COMPONENT_NAME, WSDD_PKG.getPortComponent_PortComponentName()),
-			create10WsdlPortTranslator(),
-			new Translator(SERVICE_ENPOINT_INTERFACE, WSDD_PKG.getPortComponent_ServiceEndpointInterface()),
-			createServiceImplBeanTranslator(),
-			createHandler10Translator()
-		});
-		return result;	
-	}
-
-	public Translator create11PortComponentTranslator() {
-		GenericTranslator result = new GenericTranslator(PORT_COMPONENT, WSDD_PKG.getWebServiceDescription_PortComponents());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, WSDD_PKG.getPortComponent_Description()),			
-			new Translator(DISPLAY_NAME, WSDD_PKG.getPortComponent_DisplayName()),			
-			new Translator(SMALL_ICON, WSDD_PKG.getPortComponent_SmallIcon()),			
-			new Translator(LARGE_ICON, WSDD_PKG.getPortComponent_LargeIcon()),				
-			new Translator(PORT_COMPONENT_NAME, WSDD_PKG.getPortComponent_PortComponentName()),
-			CommonTranslators.createQNameTranslator(WSDL_PORT, WSDD_PKG.getPortComponent_WsdlPort()),
-			new Translator(SERVICE_ENPOINT_INTERFACE, WSDD_PKG.getPortComponent_ServiceEndpointInterface()),
-			createServiceImplBeanTranslator(),
-			createHandler11Translator()
-		});
-		return result;	
-	}
-
-	public Translator create10WsdlPortTranslator() {
-		GenericTranslator result = new GenericTranslator(WSDL_PORT, WSDD_PKG.getPortComponent_WsdlPort());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, COMMON_PKG.getQName_NamespaceURI()),
-			new Translator(LOCALPART, COMMON_PKG.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-
-	public Translator createServiceImplBeanTranslator() {
-		GenericTranslator result = new GenericTranslator(SERVICE_IMPL_BEAN, WSDD_PKG.getPortComponent_ServiceImplBean());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new ServletLinkTranslator(),
-			new EJBLinkTranslator()
-		});
-		return result;	
-	}
-
-
-	public Translator createHandler10Translator() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WSDD_PKG.getPortComponent_Handlers());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(DESCRIPTION, COMMON_PKG.getCompatibilityDescriptionGroup_Description()),
-			new Translator(DISPLAY_NAME, COMMON_PKG.getCompatibilityDescriptionGroup_DisplayName()),			
-			new Translator(SMALL_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_SmallIcon()),			
-			new Translator(LARGE_ICON, COMMON_PKG.getCompatibilityDescriptionGroup_LargeIcon()),			
-			new Translator(HANDLER_NAME, WSDD_PKG.getHandler_HandlerName()),
-			new Translator(HANDLER_CLASS, WSDD_PKG.getHandler_HandlerClass()),			
-			create10InitParamTranslator(),
-			create10SOAPHeaderTranslator(),
-			new SOAPRoleTranslator()
-		});
-		return result;	
-	}
-
-	public Translator createHandler11Translator() {
-		GenericTranslator result = new GenericTranslator(HANDLER, WSDD_PKG.getPortComponent_Handlers());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			CommonTranslators.DESCRIPTIONS_TRANSLATOR,
-			CommonTranslators.DISPLAYNAMES_TRANSLATOR,
-			CommonTranslators.ICONS_TRANSLATOR,			
-			new Translator(HANDLER_NAME, WSDD_PKG.getHandler_HandlerName()),
-			new Translator(HANDLER_CLASS, WSDD_PKG.getHandler_HandlerClass()),			
-			create11InitParamTranslator(),
-			CommonTranslators.createQNameTranslator(SOAP_HEADER, WSDD_PKG.getHandler_SoapHeaders()),
-			new SOAPRoleTranslator()
-		});
-		return result;	
-	}
-
-	public Translator create10InitParamTranslator() {
-		GenericTranslator result = new GenericTranslator(INIT_PARAM, WSDD_PKG.getHandler_InitParams());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(PARAM_NAME, WSCOMMON_PKG.getInitParam_ParamName()),
-			new Translator(PARAM_VALUE, WSCOMMON_PKG.getInitParam_ParamValue()),			
-			new Translator(DESCRIPTION, WSCOMMON_PKG.getInitParam_Description())			
-		});
-		return result;	
-	}
-
-	public Translator create11InitParamTranslator() {
-		GenericTranslator result = new GenericTranslator(INIT_PARAM, WSDD_PKG.getHandler_InitParams());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			create11DescriptionTranslator(WSCOMMON_PKG.getInitParam_DescriptionTypes()),						  
-			new Translator(PARAM_NAME, WSCOMMON_PKG.getInitParam_ParamName()),
-			new Translator(PARAM_VALUE, WSCOMMON_PKG.getInitParam_ParamValue())
-		});
-		return result;	
-	}
-
-
-	public Translator create10SOAPHeaderTranslator() {
-		GenericTranslator result = new GenericTranslator(SOAP_HEADER, WSDD_PKG.getHandler_SoapHeaders());
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(NAMESPACEURI, COMMON_PKG.getQName_NamespaceURI()),
-			new Translator(LOCALPART, COMMON_PKG.getQName_LocalPart())			
-		});
-		return result;	
-	}
-
-	public Translator create11DescriptionTranslator(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(DESCRIPTION, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDescription_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDescription_Value())
-		});
-		return result;
-	}
-	public  Translator create11DisplayNameTranslator(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(DISPLAY_NAME, afeature);
-		result.setChildren(new Translator[] {
-			IDTranslator.INSTANCE,
-			new Translator(LANG, COMMON_PKG.getDisplayName_Lang(), Translator.DOM_ATTRIBUTE),
-			new Translator(Translator.TEXT_ATTRIBUTE_VALUE, COMMON_PKG.getDisplayName_Value())
-		});
-		return result;
-	}
-
-	private Translator create11IconTranslator(EStructuralFeature afeature) {
-		GenericTranslator result = new GenericTranslator(ICON, afeature);
-		result.setChildren(new Translator[] {
-			new Translator(LANG, COMMON_PKG.getIconType_Lang(), Translator.DOM_ATTRIBUTE),		  
-			IDTranslator.INSTANCE,
-			new Translator(SMALL_ICON, COMMON_PKG.getIconType_SmallIcon()),
-			new Translator(LARGE_ICON, COMMON_PKG.getIconType_LargeIcon())
-		});
-		return result;
-	}
-	
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddXmlMapperI.java
deleted file mode 100644
index a435cb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/model/translator/webservices/WsddXmlMapperI.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.model.translator.webservices;
-
-//imports for J2EE core classes
-//import org.eclipse.jst.j2ee.internal.xml.DeploymentDescriptorXmlMapperI;
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an web service deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface WsddXmlMapperI extends WebServiceCommonXmlMapperI
-{
-  public String WEBSERVICES                     = "webservices";//$NON-NLS-1$
-  public String WEBSERVICE_DESCRIPTION          = "webservice-description";//$NON-NLS-1$
-  public String WEBSERVICE_DESCRIPTION_NAME     = "webservice-description-name";//$NON-NLS-1$
-  public String PORT_COMPONENT                  = "port-component";//$NON-NLS-1$
-  public String PORT_COMPONENT_NAME             = "port-component-name";//$NON-NLS-1$
-  public String WSDL_PORT                       = "wsdl-port";//$NON-NLS-1$
-  public String SERVICE_IMPL_BEAN               = "service-impl-bean";//$NON-NLS-1$
-  public String SERVLET_LINK                    = "servlet-link";//$NON-NLS-1$
-  //EJB_LINK is defined in DeploymentDescriptorXmlMapperI
-  //public String EJB_LINK                        = "ejb-link";
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/TaglibPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/TaglibPackage.java
deleted file mode 100644
index e2adb3c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/TaglibPackage.java
+++ /dev/null
@@ -1,1054 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib;
-
-
-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.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.taglib.TaglibFactory;
-
-
-
-public interface TaglibPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "taglib";//$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__TAG_LIB_VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__JSP_VERSION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__SHORT_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__URI = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__TAGS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__VALIDATOR = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB__LISTENERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Functions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__FUNCTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Taglib Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB__TAGLIB_EXTENSIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 8;
-
-	/**
-	 * The number of structural features of the the '<em>Tag Lib</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 9;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int VALIDATOR = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG = 1;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__ICONS = CommonPackage.DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__DISPLAY_NAMES = CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__DESCRIPTIONS = CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG__BODY_CONTENT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG__EXAMPLE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__NAME = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Dynamic Attributes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG__DYNAMIC_ATTRIBUTES = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG__ATTRIBUTES = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG__VARIABLES = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG__TAG_CLASS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG__TEI_CLASS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the the '<em>JSP Tag</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_FEATURE_COUNT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG_ATTRIBUTE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG_ATTRIBUTE__NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG_ATTRIBUTE__REQUIRED = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE = 2;
-	/**
-	 * The feature id for the '<em><b>Fragment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__FRAGMENT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TAG_ATTRIBUTE__TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE__DESCRIPTIONS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>JSP Tag Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TAG_ATTRIBUTE_FEATURE_COUNT = 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int VALIDATOR__VALIDATOR_CLASS = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int VALIDATOR__INIT_PARAMS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATOR__DESCRIPTIONS = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Validator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALIDATOR_FEATURE_COUNT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_VARIABLE = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_VARIABLE__NAME_GIVEN = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_VARIABLE__NAME_FROM_ATTRIBUTE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_VARIABLE__DECLARE = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_VARIABLE__SCOPE = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_VARIABLE__VARIABLE_CLASS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE__DESCRIPTIONS = 5;
-
-	/**
-	 * The number of structural features of the the '<em>JSP Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_VARIABLE_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.taglib.impl.FunctionImpl <em>Function</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.FunctionImpl
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl#getFunction()
-	 * @generated
-	 */
-	int FUNCTION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__ICONS = CommonPackage.DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__DISPLAY_NAMES = CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__DESCRIPTIONS = CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__NAME = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Signature</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__SIGNATURE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__EXAMPLE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Function Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__FUNCTION_CLASS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Function Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION__FUNCTION_EXTENSIONS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the the '<em>Function</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTION_FEATURE_COUNT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.taglib.impl.TagFileImpl <em>Tag File</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.TagFileImpl
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl#getTagFile()
-	 * @generated
-	 */
-	int TAG_FILE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__ICONS = CommonPackage.DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__DISPLAY_NAMES = CommonPackage.DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__DESCRIPTIONS = CommonPackage.DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__NAME = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__PATH = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__EXAMPLE = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Tag Extensions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE__TAG_EXTENSIONS = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Tag File</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_FILE_FEATURE_COUNT = CommonPackage.DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.taglib.impl.TldExtensionImpl <em>Tld Extension</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.TldExtensionImpl
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl#getTldExtension()
-	 * @generated
-	 */
-	int TLD_EXTENSION = 7;
-
-	/**
-	 * The feature id for the '<em><b>Namespace</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TLD_EXTENSION__NAMESPACE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Extension Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TLD_EXTENSION__EXTENSION_ELEMENTS = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Tld Extension</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TLD_EXTENSION_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.taglib.impl.ExtensibleTypeImpl <em>Extensible Type</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.ExtensibleTypeImpl
-	 * @see org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl#getExtensibleType()
-	 * @generated
-	 */
-	int EXTENSIBLE_TYPE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSIBLE_TYPE__VALUE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Extensible Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSIBLE_TYPE_FEATURE_COUNT = 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int BODY_CONTENT_TYPE = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_SCRIPTING_VARIABLE_SCOPE = 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "taglib.xmi";//$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.taglib";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TaglibPackage eINSTANCE = org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TagLib object
-	 */
-	EClass getTagLib();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLib_TagLibVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLib_JspVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLib_ShortName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLib_Uri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getTagLib_Tags();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getTagLib_Validator();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getTagLib_Listeners();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.TagLib#getFunctions <em>Functions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Functions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagLib#getFunctions()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EReference getTagLib_Functions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.TagLib#getTaglibExtensions <em>Taglib Extensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Taglib Extensions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagLib#getTaglibExtensions()
-	 * @see #getTagLib()
-	 * @generated
-	 */
-	EReference getTagLib_TaglibExtensions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Validator object
-	 */
-	EClass getValidator();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getValidator_ValidatorClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getValidator_InitParams();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.Validator#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Validator#getDescriptions()
-	 * @see #getValidator()
-	 * @generated
-	 */
-	EReference getValidator_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPTag object
-	 */
-	EClass getJSPTag();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPTag_BodyContent();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPTag_Example();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTag#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.JSPTag#getName()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EAttribute getJSPTag_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTag#isDynamicAttributes <em>Dynamic Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Dynamic Attributes</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.JSPTag#isDynamicAttributes()
-	 * @see #getJSPTag()
-	 * @generated
-	 */
-	EAttribute getJSPTag_DynamicAttributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJSPTag_Attributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJSPTag_Variables();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJSPTag_TagClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJSPTag_TeiClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPTagAttribute object
-	 */
-	EClass getJSPTagAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPTagAttribute_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPTagAttribute_Required();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPTagAttribute_RtExprValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#isFragment <em>Fragment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fragment</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#isFragment()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EAttribute getJSPTagAttribute_Fragment();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJSPTagAttribute_Type();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#getDescriptions()
-	 * @see #getJSPTagAttribute()
-	 * @generated
-	 */
-	EReference getJSPTagAttribute_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPVariable object
-	 */
-	EClass getJSPVariable();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPVariable_NameGiven();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPVariable_NameFromAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPVariable_Declare();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPVariable_Scope();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getJSPVariable_VariableClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.JSPVariable#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.JSPVariable#getDescriptions()
-	 * @see #getJSPVariable()
-	 * @generated
-	 */
-	EReference getJSPVariable_Descriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.taglib.Function <em>Function</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Function</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Function
-	 * @generated
-	 */
-	EClass getFunction();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Function#getName()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EAttribute getFunction_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getSignature <em>Signature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Signature</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Function#getSignature()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EAttribute getFunction_Signature();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getExample <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Example</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Function#getExample()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EAttribute getFunction_Example();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getFunctionClass <em>Function Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Function Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Function#getFunctionClass()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EReference getFunction_FunctionClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getFunctionExtensions <em>Function Extensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Function Extensions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Function#getFunctionExtensions()
-	 * @see #getFunction()
-	 * @generated
-	 */
-	EReference getFunction_FunctionExtensions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile <em>Tag File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tag File</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagFile
-	 * @generated
-	 */
-	EClass getTagFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagFile#getName()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EAttribute getTagFile_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getPath <em>Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Path</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagFile#getPath()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EAttribute getTagFile_Path();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getExample <em>Example</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Example</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagFile#getExample()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EAttribute getTagFile_Example();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getTagExtensions <em>Tag Extensions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tag Extensions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagFile#getTagExtensions()
-	 * @see #getTagFile()
-	 * @generated
-	 */
-	EReference getTagFile_TagExtensions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.taglib.TldExtension <em>Tld Extension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tld Extension</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TldExtension
-	 * @generated
-	 */
-	EClass getTldExtension();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.TldExtension#getNamespace <em>Namespace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Namespace</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TldExtension#getNamespace()
-	 * @see #getTldExtension()
-	 * @generated
-	 */
-	EAttribute getTldExtension_Namespace();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.taglib.TldExtension#getExtensionElements <em>Extension Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Extension Elements</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TldExtension#getExtensionElements()
-	 * @see #getTldExtension()
-	 * @generated
-	 */
-	EReference getTldExtension_ExtensionElements();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.taglib.ExtensibleType <em>Extensible Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extensible Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.ExtensibleType
-	 * @generated
-	 */
-	EClass getExtensibleType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.taglib.ExtensibleType#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.ExtensibleType#getValue()
-	 * @see #getExtensibleType()
-	 * @generated
-	 */
-	EAttribute getExtensibleType_Value();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return BodyContentType object
-	 */
-	EEnum getBodyContentType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPScriptingVariableScope object
-	 */
-	EEnum getJSPScriptingVariableScope();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	TaglibFactory getTaglibFactory();
-
-} //TaglibPackage
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ExtensibleTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ExtensibleTypeImpl.java
deleted file mode 100644
index 0782279..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ExtensibleTypeImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.ExtensibleType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extensible Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.ExtensibleTypeImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ExtensibleTypeImpl extends EObjectImpl implements ExtensibleType {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtensibleTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getExtensibleType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.EXTENSIBLE_TYPE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.EXTENSIBLE_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		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(" (value: ");//$NON-NLS-1$
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ExtensibleTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/FunctionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/FunctionImpl.java
deleted file mode 100644
index 6343aae..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/FunctionImpl.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.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.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.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.Function;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Function</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.FunctionImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.FunctionImpl#getSignature <em>Signature</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.FunctionImpl#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.FunctionImpl#getFunctionClass <em>Function Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.FunctionImpl#getFunctionExtensions <em>Function Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FunctionImpl extends DescriptionGroupImpl implements Function {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSignature()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SIGNATURE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSignature()
-	 * @generated
-	 * @ordered
-	 */
-	protected String signature = SIGNATURE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXAMPLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected String example = EXAMPLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFunctionClass() <em>Function Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctionClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass functionClass = null;
-
-	/**
-	 * The cached value of the '{@link #getFunctionExtensions() <em>Function Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctionExtensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList functionExtensions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FunctionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getFunction();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSignature() {
-		return signature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSignature(String newSignature) {
-		String oldSignature = signature;
-		signature = newSignature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__SIGNATURE, oldSignature, signature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExample() {
-		return example;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExample(String newExample) {
-		String oldExample = example;
-		example = newExample;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__EXAMPLE, oldExample, example));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getFunctionClass() {
-		if (functionClass != null && functionClass.eIsProxy()) {
-			JavaClass oldFunctionClass = functionClass;
-			functionClass = (JavaClass)eResolveProxy((InternalEObject)functionClass);
-			if (functionClass != oldFunctionClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.FUNCTION__FUNCTION_CLASS, oldFunctionClass, functionClass));
-			}
-		}
-		return functionClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetFunctionClass() {
-		return functionClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFunctionClass(JavaClass newFunctionClass) {
-		JavaClass oldFunctionClass = functionClass;
-		functionClass = newFunctionClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.FUNCTION__FUNCTION_CLASS, oldFunctionClass, functionClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getFunctionExtensions() {
-		if (functionExtensions == null) {
-			functionExtensions = new EObjectContainmentEList(TldExtension.class, this, TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS);
-		}
-		return functionExtensions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.FUNCTION__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.FUNCTION__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.FUNCTION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-					return ((InternalEList)getFunctionExtensions()).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 TaglibPackage.FUNCTION__ICONS:
-				return getIcons();
-			case TaglibPackage.FUNCTION__DISPLAY_NAMES:
-				return getDisplayNames();
-			case TaglibPackage.FUNCTION__DESCRIPTIONS:
-				return getDescriptions();
-			case TaglibPackage.FUNCTION__NAME:
-				return getName();
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				return getSignature();
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				return getExample();
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				if (resolve) return getFunctionClass();
-				return basicGetFunctionClass();
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				return getFunctionExtensions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.FUNCTION__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.FUNCTION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.FUNCTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.FUNCTION__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				setSignature((String)newValue);
-				return;
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				setExample((String)newValue);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				setFunctionClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				getFunctionExtensions().clear();
-				getFunctionExtensions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.FUNCTION__ICONS:
-				getIcons().clear();
-				return;
-			case TaglibPackage.FUNCTION__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case TaglibPackage.FUNCTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case TaglibPackage.FUNCTION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				setSignature(SIGNATURE_EDEFAULT);
-				return;
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				setExample(EXAMPLE_EDEFAULT);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				setFunctionClass((JavaClass)null);
-				return;
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				getFunctionExtensions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.FUNCTION__ICONS:
-				return icons != null && !icons.isEmpty();
-			case TaglibPackage.FUNCTION__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case TaglibPackage.FUNCTION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case TaglibPackage.FUNCTION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.FUNCTION__SIGNATURE:
-				return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature);
-			case TaglibPackage.FUNCTION__EXAMPLE:
-				return EXAMPLE_EDEFAULT == null ? example != null : !EXAMPLE_EDEFAULT.equals(example);
-			case TaglibPackage.FUNCTION__FUNCTION_CLASS:
-				return functionClass != null;
-			case TaglibPackage.FUNCTION__FUNCTION_EXTENSIONS:
-				return functionExtensions != null && !functionExtensions.isEmpty();
-		}
-		return 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(" (name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(", signature: ");//$NON-NLS-1$
-		result.append(signature);
-		result.append(", example: ");//$NON-NLS-1$
-		result.append(example);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FunctionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagAttributeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagAttributeImpl.java
deleted file mode 100644
index 8efb6db..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagAttributeImpl.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.JavaClass;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.JSPTagAttribute;
-
-
-/**
- * The attribute tag defines an attribute for the nesting tag
- */
-public class JSPTagAttributeImpl extends EObjectImpl implements JSPTagAttribute, EObject{
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRequired()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean REQUIRED_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean required = REQUIRED_EDEFAULT;
-	/**
-	 * This is true if the Required attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean requiredESet = false;
-
-	/**
-	 * The default value of the '{@link #isRtExprValue() <em>Rt Expr Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isRtExprValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean RT_EXPR_VALUE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean rtExprValue = RT_EXPR_VALUE_EDEFAULT;
-	/**
-	 * This is true if the Rt Expr Value attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean rtExprValueESet = false;
-
-	/**
-	 * The default value of the '{@link #isFragment() <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFragment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FRAGMENT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isFragment() <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFragment()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fragment = FRAGMENT_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass type = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public JSPTagAttributeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getJSPTagAttribute();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines the canonical name of a tag or attribute being defined (required).
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines if the nesting attribute is required or optional.
-	 */
-	public boolean isRequired() {
-		return required;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRequired(boolean newRequired) {
-		boolean oldRequired = required;
-		required = newRequired;
-		boolean oldRequiredESet = requiredESet;
-		requiredESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED, oldRequired, required, !oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRequired() {
-		boolean oldRequired = required;
-		boolean oldRequiredESet = requiredESet;
-		required = REQUIRED_EDEFAULT;
-		requiredESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED, oldRequired, REQUIRED_EDEFAULT, oldRequiredESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRequired() {
-		return requiredESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Defines if the nesting attribute can have scriptlet expressions asa value, i.e
-	 * the value of the attribute may be dynamically calculatedat request time, as
-	 * opposed to a static value determined at translationtime. (optional)
-	 * Default = false
-	 */
-	public boolean isRtExprValue() {
-		return rtExprValue;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRtExprValue(boolean newRtExprValue) {
-		boolean oldRtExprValue = rtExprValue;
-		rtExprValue = newRtExprValue;
-		boolean oldRtExprValueESet = rtExprValueESet;
-		rtExprValueESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE, oldRtExprValue, rtExprValue, !oldRtExprValueESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetRtExprValue() {
-		boolean oldRtExprValue = rtExprValue;
-		boolean oldRtExprValueESet = rtExprValueESet;
-		rtExprValue = RT_EXPR_VALUE_EDEFAULT;
-		rtExprValueESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE, oldRtExprValue, RT_EXPR_VALUE_EDEFAULT, oldRtExprValueESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetRtExprValue() {
-		return rtExprValueESet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFragment() {
-		return fragment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFragment(boolean newFragment) {
-		boolean oldFragment = fragment;
-		fragment = newFragment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT, oldFragment, fragment));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the type element describes the Java type of the attributes value.
-	 * For static values (those determined at translation time) the type is always
-	 * java.lang.String.
-	 */
-	public JavaClass getType() {
-		if (type != null && type.eIsProxy()) {
-			JavaClass oldType = type;
-			type = (JavaClass)eResolveProxy((InternalEObject)type);
-			if (type != oldType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE, oldType, type));
-			}
-		}
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetType() {
-		return type;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setType(JavaClass newType) {
-		JavaClass oldType = type;
-		type = newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				return getName();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				return isRtExprValue() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				return isFragment() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				return isSetRequired();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				return isSetRtExprValue();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				return fragment != FRAGMENT_EDEFAULT;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				return type != null;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				setRequired(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				setRtExprValue(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				setFragment(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				setType((JavaClass)newValue);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__REQUIRED:
-				unsetRequired();
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE:
-				unsetRtExprValue();
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__FRAGMENT:
-				setFragment(FRAGMENT_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__TYPE:
-				setType((JavaClass)null);
-				return;
-			case TaglibPackage.JSP_TAG_ATTRIBUTE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(", required: ");//$NON-NLS-1$
-		if (requiredESet) result.append(required); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", rtExprValue: ");//$NON-NLS-1$
-		if (rtExprValueESet) result.append(rtExprValue); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", fragment: ");//$NON-NLS-1$
-		result.append(fragment);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagImpl.java
deleted file mode 100644
index aae4c07..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPTagImpl.java
+++ /dev/null
@@ -1,599 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.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.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.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.common.impl.DescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.BodyContentType;
-import org.eclipse.jst.j2ee.taglib.JSPTag;
-import org.eclipse.jst.j2ee.taglib.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.JSPVariable;
-
-
-/**
- * The tag element defines an action in this tag library. The tag element has one attribute, id.
- * The tag element may have several subelements defining:
- * name -- The unique action name
- * tag-class -- The tag handler class implementing javax.servlet.jsp.tagext.Tag
- * tei-class -- An optional subclass of javax.servlet.jsp.tagext.TagExtraInfo
- * body-content -- The body content type
- * display-name -- A short name that is intended to be displayed by tools
- * small-icon -- Optional small-icon that can be used by tools
- * large-icon -- Optional large-icon that can be used by tools
- * description -- Optional tag-specific information
- * variable -- Optional scripting variable information
- * attribute -- All attributes of this action
- * example -- Optional informal description of an example of a use of this action.
-
- */
-public class JSPTagImpl extends DescriptionGroupImpl implements JSPTag{
-
-	/**
-	 * The default value of the '{@link #getBodyContent() <em>Body Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBodyContent()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final BodyContentType BODY_CONTENT_EDEFAULT = BodyContentType.TAGDEPENDENT_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected BodyContentType bodyContent = BODY_CONTENT_EDEFAULT;
-	/**
-	 * This is true if the Body Content attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean bodyContentESet = false;
-
-	/**
-	 * The default value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXAMPLE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String example = EXAMPLE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDynamicAttributes() <em>Dynamic Attributes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDynamicAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DYNAMIC_ATTRIBUTES_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDynamicAttributes() <em>Dynamic Attributes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDynamicAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean dynamicAttributes = DYNAMIC_ATTRIBUTES_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList attributes = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList variables = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass tagClass = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass teiClass = null;
-	public JSPTagImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getJSPTag();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Provides a hint as to the content of the body of this tag. Primarily intended
-	 * for use by page composition tools.There are currently three values specified:
-	 * 
-	 * tagdependent - The body of the tag is interpreted by the tag implementation
-	 * itself, and is most likely in a		different "langage", e.g embedded SQL
-	 * statements.
-	 * 
-	 * JSP - The body of the tag contains nested JSP syntax
-	 * 
-	 * empty - The body must be emptyThe default (if not defined) is JSP#PCDATA ::= 
-	 * tagdependent | JSP | empty
-	 */
-	public BodyContentType getBodyContent() {
-		return bodyContent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBodyContent(BodyContentType newBodyContent) {
-		BodyContentType oldBodyContent = bodyContent;
-		bodyContent = newBodyContent == null ? BODY_CONTENT_EDEFAULT : newBodyContent;
-		boolean oldBodyContentESet = bodyContentESet;
-		bodyContentESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__BODY_CONTENT, oldBodyContent, bodyContent, !oldBodyContentESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetBodyContent() {
-		BodyContentType oldBodyContent = bodyContent;
-		boolean oldBodyContentESet = bodyContentESet;
-		bodyContent = BODY_CONTENT_EDEFAULT;
-		bodyContentESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, TaglibPackage.JSP_TAG__BODY_CONTENT, oldBodyContent, BODY_CONTENT_EDEFAULT, oldBodyContentESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetBodyContent() {
-		return bodyContentESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The example element provides an informal description of an example of the use
-	 * of a tag.
-	 */
-	public String getExample() {
-		return example;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExample(String newExample) {
-		String oldExample = example;
-		example = newExample;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__EXAMPLE, oldExample, example));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDynamicAttributes() {
-		return dynamicAttributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDynamicAttributes(boolean newDynamicAttributes) {
-		boolean oldDynamicAttributes = dynamicAttributes;
-		dynamicAttributes = newDynamicAttributes;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES, oldDynamicAttributes, dynamicAttributes));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getAttributes() {
-		if (attributes == null) {
-			attributes = new EObjectContainmentEList(JSPTagAttribute.class, this, TaglibPackage.JSP_TAG__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The variable element provides information on the scripting variables defined by 
-	 * this tag.
-	 * It is a (translation time) error for an action that has one or more variable
-	 * subelements to have a TagExtraInfo class that returns a non-null object.
-	 * The subelements of variable are of the form:
-	 * name-given -- The variable name as a constant
-	 * name-from-attribute -- The name of an attribute whose (translation time) value
-	 * will give the name of the variable. One of name-given or namefrom-attribute is
-	 * required.
-	 * variable-class -- Name of the class of the variable. java.lang.String is
-	 * default.
-	 * declare -- Whether the variable is declared or not. True is the default.
-	 * scope -- The scope of the scripting variable defined. NESTED is default.
-
-	 */
-	public EList getVariables() {
-		if (variables == null) {
-			variables = new EObjectContainmentEList(JSPVariable.class, this, TaglibPackage.JSP_TAG__VARIABLES);
-		}
-		return variables;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The tag-class element indicates the subclass of javax.serlvet.jsp.tagext.Tag
-	 * that implements the request time semantics for this tag. This element is
-	 * required.
-	 * @regexp fully qualified Java class name
-
-	 */
-	public JavaClass getTagClass() {
-		if (tagClass != null && tagClass.eIsProxy()) {
-			JavaClass oldTagClass = tagClass;
-			tagClass = (JavaClass)eResolveProxy((InternalEObject)tagClass);
-			if (tagClass != oldTagClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_TAG__TAG_CLASS, oldTagClass, tagClass));
-			}
-		}
-		return tagClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetTagClass() {
-		return tagClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTagClass(JavaClass newTagClass) {
-		JavaClass oldTagClass = tagClass;
-		tagClass = newTagClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__TAG_CLASS, oldTagClass, tagClass));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The tei-class element indicates the subclass of
-	 * javax.servlet.jsp.tagext.TagExtraInfo for this tag. The class is instantiated
-	 * at translation time. This element is optional.
-	 * @regexp fully qualified Java class name
-	 */
-	public JavaClass getTeiClass() {
-		if (teiClass != null && teiClass.eIsProxy()) {
-			JavaClass oldTeiClass = teiClass;
-			teiClass = (JavaClass)eResolveProxy((InternalEObject)teiClass);
-			if (teiClass != oldTeiClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_TAG__TEI_CLASS, oldTeiClass, teiClass));
-			}
-		}
-		return teiClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetTeiClass() {
-		return teiClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTeiClass(JavaClass newTeiClass) {
-		JavaClass oldTeiClass = teiClass;
-		teiClass = newTeiClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_TAG__TEI_CLASS, oldTeiClass, teiClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.JSP_TAG__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.JSP_TAG__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.JSP_TAG__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.JSP_TAG__ATTRIBUTES:
-					return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.JSP_TAG__VARIABLES:
-					return ((InternalEList)getVariables()).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 TaglibPackage.JSP_TAG__ICONS:
-				return getIcons();
-			case TaglibPackage.JSP_TAG__DISPLAY_NAMES:
-				return getDisplayNames();
-			case TaglibPackage.JSP_TAG__DESCRIPTIONS:
-				return getDescriptions();
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				return getBodyContent();
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				return getExample();
-			case TaglibPackage.JSP_TAG__NAME:
-				return getName();
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				return isDynamicAttributes() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				return getAttributes();
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				return getVariables();
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				if (resolve) return getTagClass();
-				return basicGetTagClass();
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				if (resolve) return getTeiClass();
-				return basicGetTeiClass();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_TAG__ICONS:
-				return icons != null && !icons.isEmpty();
-			case TaglibPackage.JSP_TAG__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case TaglibPackage.JSP_TAG__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				return isSetBodyContent();
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				return EXAMPLE_EDEFAULT == null ? example != null : !EXAMPLE_EDEFAULT.equals(example);
-			case TaglibPackage.JSP_TAG__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				return dynamicAttributes != DYNAMIC_ATTRIBUTES_EDEFAULT;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				return variables != null && !variables.isEmpty();
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				return tagClass != null;
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				return teiClass != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_TAG__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				setBodyContent((BodyContentType)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				setExample((String)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				setDynamicAttributes(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				getVariables().clear();
-				getVariables().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				setTagClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				setTeiClass((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_TAG__ICONS:
-				getIcons().clear();
-				return;
-			case TaglibPackage.JSP_TAG__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case TaglibPackage.JSP_TAG__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case TaglibPackage.JSP_TAG__BODY_CONTENT:
-				unsetBodyContent();
-				return;
-			case TaglibPackage.JSP_TAG__EXAMPLE:
-				setExample(EXAMPLE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG__DYNAMIC_ATTRIBUTES:
-				setDynamicAttributes(DYNAMIC_ATTRIBUTES_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_TAG__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case TaglibPackage.JSP_TAG__VARIABLES:
-				getVariables().clear();
-				return;
-			case TaglibPackage.JSP_TAG__TAG_CLASS:
-				setTagClass((JavaClass)null);
-				return;
-			case TaglibPackage.JSP_TAG__TEI_CLASS:
-				setTeiClass((JavaClass)null);
-				return;
-		}
-		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(" (bodyContent: ");//$NON-NLS-1$
-		if (bodyContentESet) result.append(bodyContent); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", example: ");//$NON-NLS-1$
-		result.append(example);
-		result.append(", name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(", dynamicAttributes: ");//$NON-NLS-1$
-		result.append(dynamicAttributes);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPVariableImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPVariableImpl.java
deleted file mode 100644
index e91607d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/JSPVariableImpl.java
+++ /dev/null
@@ -1,397 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.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.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.JavaClass;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.JSPScriptingVariableScope;
-import org.eclipse.jst.j2ee.taglib.JSPVariable;
-
-
-/**
- * @generated
- */
-public class JSPVariableImpl extends EObjectImpl implements JSPVariable{
-
-	/**
-	 * The default value of the '{@link #getNameGiven() <em>Name Given</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNameGiven()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_GIVEN_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String nameGiven = NAME_GIVEN_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getNameFromAttribute() <em>Name From Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNameFromAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_FROM_ATTRIBUTE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String nameFromAttribute = NAME_FROM_ATTRIBUTE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #isDeclare() <em>Declare</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDeclare()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DECLARE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean declare = DECLARE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getScope()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final JSPScriptingVariableScope SCOPE_EDEFAULT = JSPScriptingVariableScope.NESTED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JSPScriptingVariableScope scope = SCOPE_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass variableClass = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public JSPVariableImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getJSPVariable();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The name-given element provides the name for the scripting variable.
-	 * 
-	 * One of name-given or name-from-attribute is required.
-	 */
-	public String getNameGiven() {
-		return nameGiven;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setNameGiven(String newNameGiven) {
-		String oldNameGiven = nameGiven;
-		nameGiven = newNameGiven;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__NAME_GIVEN, oldNameGiven, nameGiven));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The name of an attribute whose (translation-time) value will give the name of
-	 * the variable.
-	 */
-	public String getNameFromAttribute() {
-		return nameFromAttribute;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setNameFromAttribute(String newNameFromAttribute) {
-		String oldNameFromAttribute = nameFromAttribute;
-		nameFromAttribute = newNameFromAttribute;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE, oldNameFromAttribute, nameFromAttribute));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the declare element indicates whether the scripting variable is to 
-	 * be defined or not. See TagExtraInfo for details.
-	 * This element is optional and is the default is true.
-
-	 */
-	public boolean isDeclare() {
-		return declare;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDeclare(boolean newDeclare) {
-		boolean oldDeclare = declare;
-		declare = newDeclare;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__DECLARE, oldDeclare, declare));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JSPScriptingVariableScope getScope() {
-		return scope;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setScope(JSPScriptingVariableScope newScope) {
-		JSPScriptingVariableScope oldScope = scope;
-		scope = newScope == null ? SCOPE_EDEFAULT : newScope;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__SCOPE, oldScope, scope));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public JavaClass getVariableClass() {
-		if (variableClass != null && variableClass.eIsProxy()) {
-			JavaClass oldVariableClass = variableClass;
-			variableClass = (JavaClass)eResolveProxy((InternalEObject)variableClass);
-			if (variableClass != oldVariableClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS, oldVariableClass, variableClass));
-			}
-		}
-		return variableClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetVariableClass() {
-		return variableClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setVariableClass(JavaClass newVariableClass) {
-		JavaClass oldVariableClass = variableClass;
-		variableClass = newVariableClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS, oldVariableClass, variableClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, TaglibPackage.JSP_VARIABLE__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				return getNameGiven();
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				return getNameFromAttribute();
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				return isDeclare() ? Boolean.TRUE : Boolean.FALSE;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				return getScope();
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				if (resolve) return getVariableClass();
-				return basicGetVariableClass();
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				return NAME_GIVEN_EDEFAULT == null ? nameGiven != null : !NAME_GIVEN_EDEFAULT.equals(nameGiven);
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				return NAME_FROM_ATTRIBUTE_EDEFAULT == null ? nameFromAttribute != null : !NAME_FROM_ATTRIBUTE_EDEFAULT.equals(nameFromAttribute);
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				return declare != DECLARE_EDEFAULT;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				return scope != SCOPE_EDEFAULT;
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				return variableClass != null;
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				setNameGiven((String)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				setNameFromAttribute((String)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				setDeclare(((Boolean)newValue).booleanValue());
-				return;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				setScope((JSPScriptingVariableScope)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				setVariableClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.JSP_VARIABLE__NAME_GIVEN:
-				setNameGiven(NAME_GIVEN_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__NAME_FROM_ATTRIBUTE:
-				setNameFromAttribute(NAME_FROM_ATTRIBUTE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DECLARE:
-				setDeclare(DECLARE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__SCOPE:
-				setScope(SCOPE_EDEFAULT);
-				return;
-			case TaglibPackage.JSP_VARIABLE__VARIABLE_CLASS:
-				setVariableClass((JavaClass)null);
-				return;
-			case TaglibPackage.JSP_VARIABLE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (nameGiven: ");//$NON-NLS-1$
-		result.append(nameGiven);
-		result.append(", nameFromAttribute: ");//$NON-NLS-1$
-		result.append(nameFromAttribute);
-		result.append(", declare: ");//$NON-NLS-1$
-		result.append(declare);
-		result.append(", scope: ");//$NON-NLS-1$
-		result.append(scope);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagFileImpl.java
deleted file mode 100644
index 7bb8e16..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagFileImpl.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.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.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.jst.j2ee.internal.common.impl.DescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.TagFile;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tag File</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.TagFileImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.TagFileImpl#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.TagFileImpl#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.TagFileImpl#getTagExtensions <em>Tag Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TagFileImpl extends DescriptionGroupImpl implements TagFile {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getPath() <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PATH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected String path = PATH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXAMPLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getExample() <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExample()
-	 * @generated
-	 * @ordered
-	 */
-	protected String example = EXAMPLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTagExtensions() <em>Tag Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTagExtensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList tagExtensions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TagFileImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getTagFile();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_FILE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPath(String newPath) {
-		String oldPath = path;
-		path = newPath;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_FILE__PATH, oldPath, path));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getExample() {
-		return example;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setExample(String newExample) {
-		String oldExample = example;
-		example = newExample;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_FILE__EXAMPLE, oldExample, example));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTagExtensions() {
-		if (tagExtensions == null) {
-			tagExtensions = new EObjectContainmentEList(TldExtension.class, this, TaglibPackage.TAG_FILE__TAG_EXTENSIONS);
-		}
-		return tagExtensions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.TAG_FILE__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_FILE__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_FILE__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-					return ((InternalEList)getTagExtensions()).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 TaglibPackage.TAG_FILE__ICONS:
-				return getIcons();
-			case TaglibPackage.TAG_FILE__DISPLAY_NAMES:
-				return getDisplayNames();
-			case TaglibPackage.TAG_FILE__DESCRIPTIONS:
-				return getDescriptions();
-			case TaglibPackage.TAG_FILE__NAME:
-				return getName();
-			case TaglibPackage.TAG_FILE__PATH:
-				return getPath();
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				return getExample();
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				return getTagExtensions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TAG_FILE__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__NAME:
-				setName((String)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__PATH:
-				setPath((String)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				setExample((String)newValue);
-				return;
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				getTagExtensions().clear();
-				getTagExtensions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TAG_FILE__ICONS:
-				getIcons().clear();
-				return;
-			case TaglibPackage.TAG_FILE__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case TaglibPackage.TAG_FILE__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case TaglibPackage.TAG_FILE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_FILE__PATH:
-				setPath(PATH_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				setExample(EXAMPLE_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				getTagExtensions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TAG_FILE__ICONS:
-				return icons != null && !icons.isEmpty();
-			case TaglibPackage.TAG_FILE__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case TaglibPackage.TAG_FILE__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case TaglibPackage.TAG_FILE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case TaglibPackage.TAG_FILE__PATH:
-				return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
-			case TaglibPackage.TAG_FILE__EXAMPLE:
-				return EXAMPLE_EDEFAULT == null ? example != null : !EXAMPLE_EDEFAULT.equals(example);
-			case TaglibPackage.TAG_FILE__TAG_EXTENSIONS:
-				return tagExtensions != null && !tagExtensions.isEmpty();
-		}
-		return 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(" (name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(", path: ");//$NON-NLS-1$
-		result.append(path);
-		result.append(", example: ");//$NON-NLS-1$
-		result.append(example);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TagFileImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagLibImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagLibImpl.java
deleted file mode 100644
index 085e2fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TagLibImpl.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.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.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.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.Function;
-import org.eclipse.jst.j2ee.taglib.JSPTag;
-import org.eclipse.jst.j2ee.taglib.TagLib;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-import org.eclipse.jst.j2ee.taglib.Validator;
-
-
-/**
- * The taglib tag is the document root.
-
- */
-public class TagLibImpl extends CompatibilityDescriptionGroupImpl implements TagLib{
-
-	/**
-	 * The default value of the '{@link #getTagLibVersion() <em>Tag Lib Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTagLibVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAG_LIB_VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String tagLibVersion = TAG_LIB_VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getJspVersion() <em>Jsp Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JSP_VERSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String jspVersion = JSP_VERSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getShortName() <em>Short Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShortName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SHORT_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String shortName = SHORT_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String uri = URI_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList tags = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Validator validator = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList listeners = null;
-	/**
-	 * The cached value of the '{@link #getFunctions() <em>Functions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList functions = null;
-
-	/**
-	 * The cached value of the '{@link #getTaglibExtensions() <em>Taglib Extensions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibExtensions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList taglibExtensions = null;
-
-	public TagLibImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getTagLib();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Describes this version number of the tag library (dewey decimal).
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	public String getTagLibVersion() {
-		return tagLibVersion;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTagLibVersion(String newTagLibVersion) {
-		String oldTagLibVersion = tagLibVersion;
-		tagLibVersion = newTagLibVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__TAG_LIB_VERSION, oldTagLibVersion, tagLibVersion));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Describes the JSP version (number) this tag library requires in order to
-	 * function (dewey decimal).  Default is 1.2
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	public String getJspVersion() {
-		return jspVersion;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setJspVersion(String newJspVersion) {
-		String oldJspVersion = jspVersion;
-		jspVersion = newJspVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__JSP_VERSION, oldJspVersion, jspVersion));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the short-name element is a name that could be used by a JSP
-	 * authoring tool to create names with a mnemonic value; for example, it may be
-	 * used as the prefered prefix value in taglib directives. Do not use white space, 
-	 * and do not start with digits or underscore.
-	 */
-	public String getShortName() {
-		return shortName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setShortName(String newShortName) {
-		String oldShortName = shortName;
-		shortName = newShortName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__SHORT_NAME, oldShortName, shortName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The value of the uri element is a public URI that uniquely identifies the exact 
-	 * semantics of this taglibrary.
-	 */
-	public String getUri() {
-		return uri;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUri(String newUri) {
-		String oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__URI, oldUri, uri));
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(displayName);
-	}
-	
-	/**
-	This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	 */
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getModuleVersionID();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getTags() {
-		if (tags == null) {
-			tags = new EObjectContainmentEList(JSPTag.class, this, TaglibPackage.TAG_LIB__TAGS);
-		}
-		return tags;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The validator element provides information on an optional validator that can be 
-	 * used to validate the conformance of a JSP page to using this tag library.
-
-	 */
-	public Validator getValidator() {
-		return validator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValidator(Validator newValidator, NotificationChain msgs) {
-		Validator oldValidator = validator;
-		validator = newValidator;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__VALIDATOR, oldValidator, newValidator);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setValidator(Validator newValidator) {
-		if (newValidator != validator) {
-			NotificationChain msgs = null;
-			if (validator != null)
-				msgs = ((InternalEObject)validator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - TaglibPackage.TAG_LIB__VALIDATOR, null, msgs);
-			if (newValidator != null)
-				msgs = ((InternalEObject)newValidator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - TaglibPackage.TAG_LIB__VALIDATOR, null, msgs);
-			msgs = basicSetValidator(newValidator, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TAG_LIB__VALIDATOR, newValidator, newValidator));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getListeners() {
-		if (listeners == null) {
-			listeners = new EObjectContainmentEList(Listener.class, this, TaglibPackage.TAG_LIB__LISTENERS);
-		}
-		return listeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getFunctions() {
-		if (functions == null) {
-			functions = new EObjectContainmentEList(Function.class, this, TaglibPackage.TAG_LIB__FUNCTIONS);
-		}
-		return functions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getTaglibExtensions() {
-		if (taglibExtensions == null) {
-			taglibExtensions = new EObjectContainmentEList(TldExtension.class, this, TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS);
-		}
-		return taglibExtensions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.TAG_LIB__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_LIB__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_LIB__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_LIB__TAGS:
-					return ((InternalEList)getTags()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_LIB__VALIDATOR:
-					return basicSetValidator(null, msgs);
-				case TaglibPackage.TAG_LIB__LISTENERS:
-					return ((InternalEList)getListeners()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_LIB__FUNCTIONS:
-					return ((InternalEList)getFunctions()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-					return ((InternalEList)getTaglibExtensions()).basicRemove(otherEnd, msgs);
-				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 TaglibPackage.TAG_LIB__ICONS:
-				return getIcons();
-			case TaglibPackage.TAG_LIB__DISPLAY_NAMES:
-				return getDisplayNames();
-			case TaglibPackage.TAG_LIB__DESCRIPTIONS:
-				return getDescriptions();
-			case TaglibPackage.TAG_LIB__SMALL_ICON:
-				return getSmallIcon();
-			case TaglibPackage.TAG_LIB__LARGE_ICON:
-				return getLargeIcon();
-			case TaglibPackage.TAG_LIB__DESCRIPTION:
-				return getDescription();
-			case TaglibPackage.TAG_LIB__DISPLAY_NAME:
-				return getDisplayName();
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				return getTagLibVersion();
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				return getJspVersion();
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				return getShortName();
-			case TaglibPackage.TAG_LIB__URI:
-				return getUri();
-			case TaglibPackage.TAG_LIB__TAGS:
-				return getTags();
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				return getValidator();
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				return getListeners();
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				return getFunctions();
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				return getTaglibExtensions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TAG_LIB__ICONS:
-				return icons != null && !icons.isEmpty();
-			case TaglibPackage.TAG_LIB__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case TaglibPackage.TAG_LIB__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case TaglibPackage.TAG_LIB__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case TaglibPackage.TAG_LIB__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case TaglibPackage.TAG_LIB__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case TaglibPackage.TAG_LIB__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				return TAG_LIB_VERSION_EDEFAULT == null ? tagLibVersion != null : !TAG_LIB_VERSION_EDEFAULT.equals(tagLibVersion);
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				return JSP_VERSION_EDEFAULT == null ? jspVersion != null : !JSP_VERSION_EDEFAULT.equals(jspVersion);
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				return SHORT_NAME_EDEFAULT == null ? shortName != null : !SHORT_NAME_EDEFAULT.equals(shortName);
-			case TaglibPackage.TAG_LIB__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-			case TaglibPackage.TAG_LIB__TAGS:
-				return tags != null && !tags.isEmpty();
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				return validator != null;
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				return listeners != null && !listeners.isEmpty();
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				return functions != null && !functions.isEmpty();
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				return taglibExtensions != null && !taglibExtensions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TAG_LIB__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				setTagLibVersion((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				setJspVersion((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				setShortName((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__URI:
-				setUri((String)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__TAGS:
-				getTags().clear();
-				getTags().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				setValidator((Validator)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				getListeners().clear();
-				getListeners().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				getFunctions().clear();
-				getFunctions().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				getTaglibExtensions().clear();
-				getTaglibExtensions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TAG_LIB__ICONS:
-				getIcons().clear();
-				return;
-			case TaglibPackage.TAG_LIB__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case TaglibPackage.TAG_LIB__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case TaglibPackage.TAG_LIB__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__TAG_LIB_VERSION:
-				setTagLibVersion(TAG_LIB_VERSION_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__JSP_VERSION:
-				setJspVersion(JSP_VERSION_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__SHORT_NAME:
-				setShortName(SHORT_NAME_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__URI:
-				setUri(URI_EDEFAULT);
-				return;
-			case TaglibPackage.TAG_LIB__TAGS:
-				getTags().clear();
-				return;
-			case TaglibPackage.TAG_LIB__VALIDATOR:
-				setValidator((Validator)null);
-				return;
-			case TaglibPackage.TAG_LIB__LISTENERS:
-				getListeners().clear();
-				return;
-			case TaglibPackage.TAG_LIB__FUNCTIONS:
-				getFunctions().clear();
-				return;
-			case TaglibPackage.TAG_LIB__TAGLIB_EXTENSIONS:
-				getTaglibExtensions().clear();
-				return;
-		}
-		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(" (tagLibVersion: ");//$NON-NLS-1$
-		result.append(tagLibVersion);
-		result.append(", jspVersion: ");//$NON-NLS-1$
-		result.append(jspVersion);
-		result.append(", shortName: ");//$NON-NLS-1$
-		result.append(shortName);
-		result.append(", uri: ");//$NON-NLS-1$
-		result.append(uri);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibFactoryImpl.java
deleted file mode 100644
index 19d875a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibFactoryImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.BodyContentType;
-import org.eclipse.jst.j2ee.taglib.Function;
-import org.eclipse.jst.j2ee.taglib.JSPScriptingVariableScope;
-import org.eclipse.jst.j2ee.taglib.JSPTag;
-import org.eclipse.jst.j2ee.taglib.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.TagFile;
-import org.eclipse.jst.j2ee.taglib.TagLib;
-import org.eclipse.jst.j2ee.taglib.TaglibFactory;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-import org.eclipse.jst.j2ee.taglib.Validator;
-
-/**
- * @generated
- */
-public class TaglibFactoryImpl extends EFactoryImpl implements TaglibFactory{
- 
-	public TaglibFactoryImpl() {
-		super(); 		
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TaglibPackage.TAG_LIB: return createTagLib();
-			case TaglibPackage.JSP_TAG: return createJSPTag();
-			case TaglibPackage.JSP_TAG_ATTRIBUTE: return createJSPTagAttribute();
-			case TaglibPackage.VALIDATOR: return createValidator();
-			case TaglibPackage.JSP_VARIABLE: return createJSPVariable();
-			case TaglibPackage.FUNCTION: return createFunction();
-			case TaglibPackage.TAG_FILE: return createTagFile();
-			case TaglibPackage.TLD_EXTENSION: return createTldExtension();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case TaglibPackage.BODY_CONTENT_TYPE:
-				return BodyContentType.get(initialValue);
-			case TaglibPackage.JSP_SCRIPTING_VARIABLE_SCOPE:
-				return JSPScriptingVariableScope.get(initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");  //$NON-NLS-1$//$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case TaglibPackage.BODY_CONTENT_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case TaglibPackage.JSP_SCRIPTING_VARIABLE_SCOPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-public static TaglibFactory getActiveFactory() {
-	return (TaglibFactory) getPackage().getEFactoryInstance();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public TagLib createTagLib() {
-		TagLibImpl tagLib = new TagLibImpl();
-		return tagLib;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Validator createValidator() {
-		ValidatorImpl validator = new ValidatorImpl();
-		return validator;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPTag createJSPTag() {
-		JSPTagImpl jspTag = new JSPTagImpl();
-		return jspTag;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPTagAttribute createJSPTagAttribute() {
-		JSPTagAttributeImpl jspTagAttribute = new JSPTagAttributeImpl();
-		return jspTagAttribute;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPVariable createJSPVariable() {
-		JSPVariableImpl jspVariable = new JSPVariableImpl();
-		return jspVariable;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Function createFunction() {
-		FunctionImpl function = new FunctionImpl();
-		return function;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TagFile createTagFile() {
-		TagFileImpl tagFile = new TagFileImpl();
-		return tagFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TldExtension createTldExtension() {
-		TldExtensionImpl tldExtension = new TldExtensionImpl();
-		return tldExtension;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public TaglibPackage getTaglibPackage() {
-		return (TaglibPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static TaglibPackage getPackage() {
-		return TaglibPackage.eINSTANCE;
-	}
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibPackageImpl.java
deleted file mode 100644
index bca5195..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TaglibPackageImpl.java
+++ /dev/null
@@ -1,851 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.taglib.BodyContentType;
-import org.eclipse.jst.j2ee.taglib.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.Function;
-import org.eclipse.jst.j2ee.taglib.JSPScriptingVariableScope;
-import org.eclipse.jst.j2ee.taglib.JSPTag;
-import org.eclipse.jst.j2ee.taglib.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.TagFile;
-import org.eclipse.jst.j2ee.taglib.TagLib;
-import org.eclipse.jst.j2ee.taglib.TaglibFactory;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-import org.eclipse.jst.j2ee.taglib.Validator;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-
-
-public class TaglibPackageImpl extends EPackageImpl implements TaglibPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagLibEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspTagEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspTagAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass validatorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspVariableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass functionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tldExtensionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass extensibleTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum bodyContentTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum jspScriptingVariableScopeEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private TaglibPackageImpl() {
-		super(eNS_URI, TaglibFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static TaglibPackage init() {
-		if (isInited) return (TaglibPackage)EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TaglibPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theTaglibPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theTaglibPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-
-		return theTaglibPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getTagLib() {
-		return tagLibEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_TagLibVersion() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_JspVersion() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_ShortName() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLib_Uri() {
-		return (EAttribute)tagLibEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getTagLib_Tags() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getTagLib_Validator() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getTagLib_Listeners() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagLib_Functions() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagLib_TaglibExtensions() {
-		return (EReference)tagLibEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getValidator() {
-		return validatorEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getValidator_ValidatorClass() {
-		return (EReference)validatorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getValidator_InitParams() {
-		return (EReference)validatorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getValidator_Descriptions() {
-		return (EReference)validatorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPTag() {
-		return jspTagEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTag_BodyContent() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTag_Example() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPTag_Name() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPTag_DynamicAttributes() {
-		return (EAttribute)jspTagEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_Attributes() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_Variables() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_TagClass() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTag_TeiClass() {
-		return (EReference)jspTagEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPTagAttribute() {
-		return jspTagAttributeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTagAttribute_Name() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTagAttribute_Required() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPTagAttribute_RtExprValue() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getJSPTagAttribute_Fragment() {
-		return (EAttribute)jspTagAttributeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPTagAttribute_Type() {
-		return (EReference)jspTagAttributeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPTagAttribute_Descriptions() {
-		return (EReference)jspTagAttributeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPVariable() {
-		return jspVariableEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_NameGiven() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_NameFromAttribute() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_Declare() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPVariable_Scope() {
-		return (EAttribute)jspVariableEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getJSPVariable_VariableClass() {
-		return (EReference)jspVariableEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getJSPVariable_Descriptions() {
-		return (EReference)jspVariableEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFunction() {
-		return functionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFunction_Name() {
-		return (EAttribute)functionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFunction_Signature() {
-		return (EAttribute)functionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFunction_Example() {
-		return (EAttribute)functionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFunction_FunctionClass() {
-		return (EReference)functionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFunction_FunctionExtensions() {
-		return (EReference)functionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTagFile() {
-		return tagFileEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagFile_Name() {
-		return (EAttribute)tagFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagFile_Path() {
-		return (EAttribute)tagFileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTagFile_Example() {
-		return (EAttribute)tagFileEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagFile_TagExtensions() {
-		return (EReference)tagFileEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTldExtension() {
-		return tldExtensionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTldExtension_Namespace() {
-		return (EAttribute)tldExtensionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTldExtension_ExtensionElements() {
-		return (EReference)tldExtensionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExtensibleType() {
-		return extensibleTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getExtensibleType_Value() {
-		return (EAttribute)extensibleTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getBodyContentType() {
-		return bodyContentTypeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getJSPScriptingVariableScope() {
-		return jspScriptingVariableScopeEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public TaglibFactory getTaglibFactory() {
-		return (TaglibFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		tagLibEClass = createEClass(TAG_LIB);
-		createEAttribute(tagLibEClass, TAG_LIB__TAG_LIB_VERSION);
-		createEAttribute(tagLibEClass, TAG_LIB__JSP_VERSION);
-		createEAttribute(tagLibEClass, TAG_LIB__SHORT_NAME);
-		createEAttribute(tagLibEClass, TAG_LIB__URI);
-		createEReference(tagLibEClass, TAG_LIB__TAGS);
-		createEReference(tagLibEClass, TAG_LIB__VALIDATOR);
-		createEReference(tagLibEClass, TAG_LIB__LISTENERS);
-		createEReference(tagLibEClass, TAG_LIB__FUNCTIONS);
-		createEReference(tagLibEClass, TAG_LIB__TAGLIB_EXTENSIONS);
-
-		jspTagEClass = createEClass(JSP_TAG);
-		createEAttribute(jspTagEClass, JSP_TAG__BODY_CONTENT);
-		createEAttribute(jspTagEClass, JSP_TAG__EXAMPLE);
-		createEAttribute(jspTagEClass, JSP_TAG__NAME);
-		createEAttribute(jspTagEClass, JSP_TAG__DYNAMIC_ATTRIBUTES);
-		createEReference(jspTagEClass, JSP_TAG__ATTRIBUTES);
-		createEReference(jspTagEClass, JSP_TAG__VARIABLES);
-		createEReference(jspTagEClass, JSP_TAG__TAG_CLASS);
-		createEReference(jspTagEClass, JSP_TAG__TEI_CLASS);
-
-		jspTagAttributeEClass = createEClass(JSP_TAG_ATTRIBUTE);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__NAME);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__REQUIRED);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__RT_EXPR_VALUE);
-		createEAttribute(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__FRAGMENT);
-		createEReference(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__TYPE);
-		createEReference(jspTagAttributeEClass, JSP_TAG_ATTRIBUTE__DESCRIPTIONS);
-
-		validatorEClass = createEClass(VALIDATOR);
-		createEReference(validatorEClass, VALIDATOR__VALIDATOR_CLASS);
-		createEReference(validatorEClass, VALIDATOR__INIT_PARAMS);
-		createEReference(validatorEClass, VALIDATOR__DESCRIPTIONS);
-
-		jspVariableEClass = createEClass(JSP_VARIABLE);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__NAME_GIVEN);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__NAME_FROM_ATTRIBUTE);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__DECLARE);
-		createEAttribute(jspVariableEClass, JSP_VARIABLE__SCOPE);
-		createEReference(jspVariableEClass, JSP_VARIABLE__VARIABLE_CLASS);
-		createEReference(jspVariableEClass, JSP_VARIABLE__DESCRIPTIONS);
-
-		functionEClass = createEClass(FUNCTION);
-		createEAttribute(functionEClass, FUNCTION__NAME);
-		createEAttribute(functionEClass, FUNCTION__SIGNATURE);
-		createEAttribute(functionEClass, FUNCTION__EXAMPLE);
-		createEReference(functionEClass, FUNCTION__FUNCTION_CLASS);
-		createEReference(functionEClass, FUNCTION__FUNCTION_EXTENSIONS);
-
-		tagFileEClass = createEClass(TAG_FILE);
-		createEAttribute(tagFileEClass, TAG_FILE__NAME);
-		createEAttribute(tagFileEClass, TAG_FILE__PATH);
-		createEAttribute(tagFileEClass, TAG_FILE__EXAMPLE);
-		createEReference(tagFileEClass, TAG_FILE__TAG_EXTENSIONS);
-
-		tldExtensionEClass = createEClass(TLD_EXTENSION);
-		createEAttribute(tldExtensionEClass, TLD_EXTENSION__NAMESPACE);
-		createEReference(tldExtensionEClass, TLD_EXTENSION__EXTENSION_ELEMENTS);
-
-		extensibleTypeEClass = createEClass(EXTENSIBLE_TYPE);
-		createEAttribute(extensibleTypeEClass, EXTENSIBLE_TYPE__VALUE);
-
-		// Create enums
-		bodyContentTypeEEnum = createEEnum(BODY_CONTENT_TYPE);
-		jspScriptingVariableScopeEEnum = createEEnum(JSP_SCRIPTING_VARIABLE_SCOPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-
-		// Add supertypes to classes
-		tagLibEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		jspTagEClass.getESuperTypes().add(theCommonPackage.getDescriptionGroup());
-		functionEClass.getESuperTypes().add(theCommonPackage.getDescriptionGroup());
-		tagFileEClass.getESuperTypes().add(theCommonPackage.getDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(tagLibEClass, TagLib.class, "TagLib", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getTagLib_TagLibVersion(), ecorePackage.getEString(), "tagLibVersion", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getTagLib_JspVersion(), ecorePackage.getEString(), "jspVersion", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getTagLib_ShortName(), ecorePackage.getEString(), "shortName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getTagLib_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTagLib_Tags(), this.getJSPTag(), null, "tags", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTagLib_Validator(), this.getValidator(), null, "validator", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTagLib_Listeners(), theCommonPackage.getListener(), null, "listeners", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTagLib_Functions(), this.getFunction(), null, "functions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTagLib_TaglibExtensions(), this.getTldExtension(), null, "taglibExtensions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(jspTagEClass, JSPTag.class, "JSPTag", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getJSPTag_BodyContent(), this.getBodyContentType(), "bodyContent", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPTag_Example(), ecorePackage.getEString(), "example", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPTag_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPTag_DynamicAttributes(), ecorePackage.getEBoolean(), "dynamicAttributes", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPTag_Attributes(), this.getJSPTagAttribute(), null, "attributes", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPTag_Variables(), this.getJSPVariable(), null, "variables", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPTag_TagClass(), theJavaRefPackage.getJavaClass(), null, "tagClass", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPTag_TeiClass(), theJavaRefPackage.getJavaClass(), null, "teiClass", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(jspTagAttributeEClass, JSPTagAttribute.class, "JSPTagAttribute", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getJSPTagAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPTagAttribute_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPTagAttribute_RtExprValue(), ecorePackage.getEBoolean(), "rtExprValue", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getJSPTagAttribute_Fragment(), ecorePackage.getEBoolean(), "fragment", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPTagAttribute_Type(), theJavaRefPackage.getJavaClass(), null, "type", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPTagAttribute_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(validatorEClass, Validator.class, "Validator", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getValidator_ValidatorClass(), theJavaRefPackage.getJavaClass(), null, "validatorClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getValidator_InitParams(), theWebapplicationPackage.getInitParam(), null, "initParams", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getValidator_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(jspVariableEClass, JSPVariable.class, "JSPVariable", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getJSPVariable_NameGiven(), ecorePackage.getEString(), "nameGiven", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPVariable_NameFromAttribute(), ecorePackage.getEString(), "nameFromAttribute", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPVariable_Declare(), ecorePackage.getEBoolean(), "declare", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getJSPVariable_Scope(), this.getJSPScriptingVariableScope(), "scope", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPVariable_VariableClass(), theJavaRefPackage.getJavaClass(), null, "variableClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getJSPVariable_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getFunction_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getFunction_Signature(), ecorePackage.getEString(), "signature", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEAttribute(getFunction_Example(), ecorePackage.getEString(), "example", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED); //$NON-NLS-1$
-		initEReference(getFunction_FunctionClass(), theJavaRefPackage.getJavaClass(), null, "functionClass", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getFunction_FunctionExtensions(), this.getTldExtension(), null, "functionExtensions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(tagFileEClass, TagFile.class, "TagFile", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getTagFile_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getTagFile_Path(), ecorePackage.getEString(), "path", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getTagFile_Example(), ecorePackage.getEString(), "example", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTagFile_TagExtensions(), this.getTldExtension(), null, "tagExtensions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(tldExtensionEClass, TldExtension.class, "TldExtension", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getTldExtension_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTldExtension_ExtensionElements(), this.getExtensibleType(), null, "extensionElements", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(extensibleTypeEClass, ExtensibleType.class, "ExtensibleType", IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getExtensibleType_Value(), ecorePackage.getEString(), "value", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(bodyContentTypeEEnum, BodyContentType.class, "BodyContentType");//$NON-NLS-1$
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.TAGDEPENDENT_LITERAL);//$NON-NLS-1$
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.JSP_LITERAL);//$NON-NLS-1$
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.EMPTY_LITERAL);//$NON-NLS-1$
-		addEEnumLiteral(bodyContentTypeEEnum, BodyContentType.SCRIPTLESS_LITERAL);//$NON-NLS-1$
-
-		initEEnum(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.class, "JSPScriptingVariableScope");//$NON-NLS-1$
-		addEEnumLiteral(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.NESTED_LITERAL);
-		addEEnumLiteral(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.AT_BEGIN_LITERAL);
-		addEEnumLiteral(jspScriptingVariableScopeEEnum, JSPScriptingVariableScope.AT_END_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //TaglibPackageImpl
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TldExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TldExtensionImpl.java
deleted file mode 100644
index 09eedd1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/TldExtensionImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.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.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.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tld Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.TldExtensionImpl#getNamespace <em>Namespace</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.impl.TldExtensionImpl#getExtensionElements <em>Extension Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TldExtensionImpl extends EObjectImpl implements TldExtension {
-	/**
-	 * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespace()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAMESPACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespace()
-	 * @generated
-	 * @ordered
-	 */
-	protected String namespace = NAMESPACE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getExtensionElements() <em>Extension Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtensionElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList extensionElements = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TldExtensionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getTldExtension();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNamespace(String newNamespace) {
-		String oldNamespace = namespace;
-		namespace = newNamespace;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.TLD_EXTENSION__NAMESPACE, oldNamespace, namespace));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getExtensionElements() {
-		if (extensionElements == null) {
-			extensionElements = new EObjectContainmentEList(ExtensibleType.class, this, TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS);
-		}
-		return extensionElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-					return ((InternalEList)getExtensionElements()).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 TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				return getNamespace();
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				return getExtensionElements();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				setNamespace((String)newValue);
-				return;
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				getExtensionElements().clear();
-				getExtensionElements().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				setNamespace(NAMESPACE_EDEFAULT);
-				return;
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				getExtensionElements().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.TLD_EXTENSION__NAMESPACE:
-				return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
-			case TaglibPackage.TLD_EXTENSION__EXTENSION_ELEMENTS:
-				return extensionElements != null && !extensionElements.isEmpty();
-		}
-		return 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(" (namespace: ");//$NON-NLS-1$
-		result.append(namespace);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TldExtensionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ValidatorImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ValidatorImpl.java
deleted file mode 100644
index 60d4c06..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/impl/ValidatorImpl.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.JavaClass;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.Validator;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-
-
-/**
- * The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.
-
- */
-public class ValidatorImpl extends EObjectImpl implements Validator, EObject{
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass validatorClass = null;
-	public ValidatorImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return TaglibPackage.eINSTANCE.getValidator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getValidatorClass() {
-		if (validatorClass != null && validatorClass.eIsProxy()) {
-			JavaClass oldValidatorClass = validatorClass;
-			validatorClass = (JavaClass)eResolveProxy((InternalEObject)validatorClass);
-			if (validatorClass != oldValidatorClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TaglibPackage.VALIDATOR__VALIDATOR_CLASS, oldValidatorClass, validatorClass));
-			}
-		}
-		return validatorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetValidatorClass() {
-		return validatorClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValidatorClass(JavaClass newValidatorClass) {
-		JavaClass oldValidatorClass = validatorClass;
-		validatorClass = newValidatorClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TaglibPackage.VALIDATOR__VALIDATOR_CLASS, oldValidatorClass, validatorClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(InitParam.class, this, TaglibPackage.VALIDATOR__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, TaglibPackage.VALIDATOR__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case TaglibPackage.VALIDATOR__INIT_PARAMS:
-					return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-				case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				if (resolve) return getValidatorClass();
-				return basicGetValidatorClass();
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				return getInitParams();
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				setValidatorClass((JavaClass)newValue);
-				return;
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				setValidatorClass((JavaClass)null);
-				return;
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case TaglibPackage.VALIDATOR__VALIDATOR_CLASS:
-				return validatorClass != null;
-			case TaglibPackage.VALIDATOR__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case TaglibPackage.VALIDATOR__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	protected EList initParams=null;
-
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	protected boolean setValidatorClass=false;
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibAdapterFactory.java
deleted file mode 100644
index 6b7469e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibAdapterFactory.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.taglib.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.Function;
-import org.eclipse.jst.j2ee.taglib.JSPTag;
-import org.eclipse.jst.j2ee.taglib.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.TagFile;
-import org.eclipse.jst.j2ee.taglib.TagLib;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-import org.eclipse.jst.j2ee.taglib.Validator;
-
-
-
-public class TaglibAdapterFactory extends AdapterFactoryImpl {
-	protected static TaglibPackage modelPackage;
-
-	public TaglibAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (TaglibPackage)EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected TaglibSwitch sw = new TaglibSwitch() {
-		public Object caseTagLib(TagLib object) {
-			return createTagLibAdapter();
-		}
-		public Object caseValidator(Validator object) {
-			return createValidatorAdapter();
-		}
-		public Object caseJSPTag(JSPTag object) {
-			return createJSPTagAdapter();
-		}
-		public Object caseJSPTagAttribute(JSPTagAttribute object) {
-			return createJSPTagAttributeAdapter();
-		}
-		public Object caseJSPVariable(JSPVariable object) {
-			return createJSPVariableAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)sw.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createTagLibAdapter() {
-		return null;
-	}
-
-	public Adapter createValidatorAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPTagAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPTagAttributeAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPVariableAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TaglibSwitch modelSwitch =
-		new TaglibSwitch() {
-			public Object caseTagLib(TagLib object) {
-				return createTagLibAdapter();
-			}
-			public Object caseJSPTag(JSPTag object) {
-				return createJSPTagAdapter();
-			}
-			public Object caseJSPTagAttribute(JSPTagAttribute object) {
-				return createJSPTagAttributeAdapter();
-			}
-			public Object caseValidator(Validator object) {
-				return createValidatorAdapter();
-			}
-			public Object caseJSPVariable(JSPVariable object) {
-				return createJSPVariableAdapter();
-			}
-			public Object caseFunction(Function object) {
-				return createFunctionAdapter();
-			}
-			public Object caseTagFile(TagFile object) {
-				return createTagFileAdapter();
-			}
-			public Object caseTldExtension(TldExtension object) {
-				return createTldExtensionAdapter();
-			}
-			public Object caseExtensibleType(ExtensibleType object) {
-				return createExtensibleTypeAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createTagLibAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createValidatorAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPTagAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPTagAttributeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPVariableAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.taglib.Function <em>Function</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.Function
-	 * @generated
-	 */
-	public Adapter createFunctionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile <em>Tag File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TagFile
-	 * @generated
-	 */
-	public Adapter createTagFileAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.taglib.TldExtension <em>Tld Extension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TldExtension
-	 * @generated
-	 */
-	public Adapter createTldExtensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.taglib.ExtensibleType <em>Extensible Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.ExtensibleType
-	 * @generated
-	 */
-	public Adapter createExtensibleTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //TaglibAdapterFactory
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibSwitch.java
deleted file mode 100644
index cc8310b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/taglib/util/TaglibSwitch.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.taglib.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibFactoryImpl;
-import org.eclipse.jst.j2ee.taglib.ExtensibleType;
-import org.eclipse.jst.j2ee.taglib.Function;
-import org.eclipse.jst.j2ee.taglib.JSPTag;
-import org.eclipse.jst.j2ee.taglib.JSPTagAttribute;
-import org.eclipse.jst.j2ee.taglib.JSPVariable;
-import org.eclipse.jst.j2ee.taglib.TagFile;
-import org.eclipse.jst.j2ee.taglib.TagLib;
-import org.eclipse.jst.j2ee.taglib.TaglibFactory;
-import org.eclipse.jst.j2ee.taglib.TldExtension;
-import org.eclipse.jst.j2ee.taglib.Validator;
-
-public class TaglibSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TaglibPackage modelPackage;
-
-	protected static TaglibFactory factory;
-
-	public TaglibSwitch() {
-		factory = (TaglibFactory)TaglibFactoryImpl.getPackage().getEFactoryInstance();
-		modelPackage = TaglibFactoryImpl.getPackage();
-	}
-	public Object doSwitch(EObject theEObject) {
-		     EClass theEClass = theEObject.eClass();
-      if (theEClass.eContainer() != modelPackage) return defaultCase(theEObject);
-     
-		switch (theEClass.getClassifierID()) {
-			case TaglibPackage.TAG_LIB:
-			    {
-				TagLib castedObject = (TagLib)theEObject;
-				Object result = caseTagLib(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.VALIDATOR:
-			    {
-				Validator castedObject = (Validator)theEObject;
-				Object result = caseValidator(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.JSP_TAG:
-			    {
-				JSPTag castedObject = (JSPTag)theEObject;
-				Object result = caseJSPTag(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.JSP_TAG_ATTRIBUTE:
-			    {
-				JSPTagAttribute castedObject = (JSPTagAttribute)theEObject;
-				Object result = caseJSPTagAttribute(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			case TaglibPackage.JSP_VARIABLE:
-			    {
-				JSPVariable castedObject = (JSPVariable)theEObject;
-				Object result = caseJSPVariable(castedObject);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			    }
-			default: return defaultCase(theEObject);
-		}
-	} // doSwitch
-
-	public Object caseTagLib(TagLib object) {
-		return null;
-	}
-
-	public Object caseValidator(Validator object) {
-		return null;
-	}
-
-	public Object caseJSPTag(JSPTag object) {
-		return null;
-	}
-
-	public Object caseJSPTagAttribute(JSPTagAttribute object) {
-		return null;
-	}
-
-	public Object caseJSPVariable(JSPVariable object) {
-		return null;
-	}
-
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object doSwitchGen(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case TaglibPackage.TAG_LIB: {
-					TagLib tagLib = (TagLib)theEObject;
-					Object result = caseTagLib(tagLib);
-					if (result == null) result = caseCompatibilityDescriptionGroup(tagLib);
-					if (result == null) result = caseDescriptionGroup(tagLib);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case TaglibPackage.JSP_TAG: {
-					JSPTag jspTag = (JSPTag)theEObject;
-					Object result = caseJSPTag(jspTag);
-					if (result == null) result = caseDescriptionGroup(jspTag);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case TaglibPackage.JSP_TAG_ATTRIBUTE: {
-					JSPTagAttribute jspTagAttribute = (JSPTagAttribute)theEObject;
-					Object result = caseJSPTagAttribute(jspTagAttribute);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case TaglibPackage.VALIDATOR: {
-					Validator validator = (Validator)theEObject;
-					Object result = caseValidator(validator);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case TaglibPackage.JSP_VARIABLE: {
-					JSPVariable jspVariable = (JSPVariable)theEObject;
-					Object result = caseJSPVariable(jspVariable);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case TaglibPackage.FUNCTION: {
-					Function function = (Function)theEObject;
-					Object result = caseFunction(function);
-					if (result == null) result = caseDescriptionGroup(function);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case TaglibPackage.TAG_FILE: {
-					TagFile tagFile = (TagFile)theEObject;
-					Object result = caseTagFile(tagFile);
-					if (result == null) result = caseDescriptionGroup(tagFile);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case TaglibPackage.TLD_EXTENSION: {
-					TldExtension tldExtension = (TldExtension)theEObject;
-					Object result = caseTldExtension(tldExtension);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseTagLibGen(TagLib object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseValidatorGen(Validator object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseJSPTagGen(JSPTag object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseJSPTagAttributeGen(JSPTagAttribute object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object caseJSPVariableGen(JSPVariable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Function</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Function</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFunction(Function object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tag File</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tag File</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTagFile(TagFile object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tld Extension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tld Extension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTldExtension(TldExtension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Extensible Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Extensible Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExtensibleType(ExtensibleType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Object defaultCaseGen(EObject object) {
-		return null;
-	}
-
-} //TaglibSwitch
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/WebapplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/WebapplicationPackage.java
deleted file mode 100644
index 5bb2f9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/WebapplicationPackage.java
+++ /dev/null
@@ -1,2129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-
-
-
-public interface WebapplicationPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "webapplication";//$NON-NLS-1$
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP = 0;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ICONS = CommonPackage.JNDI_ENV_REFS_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__DISPLAY_NAMES = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__DESCRIPTIONS = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SMALL_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__LARGE_ICON = CommonPackage.JNDI_ENV_REFS_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__DESCRIPTION = CommonPackage.JNDI_ENV_REFS_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__DISPLAY_NAME = CommonPackage.JNDI_ENV_REFS_GROUP__DISPLAY_NAME;
-	/**
-	 * The feature id for the '<em><b>Environment Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__ENVIRONMENT_PROPERTIES = CommonPackage.JNDI_ENV_REFS_GROUP__ENVIRONMENT_PROPERTIES;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__RESOURCE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__EJB_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_REFS;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__RESOURCE_ENV_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__RESOURCE_ENV_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__EJB_LOCAL_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__EJB_LOCAL_REFS;
-	/**
-	 * The feature id for the '<em><b>Message Destination Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__MESSAGE_DESTINATION_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__MESSAGE_DESTINATION_REFS;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__SERVICE_REFS = CommonPackage.JNDI_ENV_REFS_GROUP__SERVICE_REFS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__DISTRIBUTABLE = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__VERSION = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__CONTEXTS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__ERROR_PAGES = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__FILE_LIST = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__TAG_LIBS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__CONSTRAINTS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__LOGIN_CONFIG = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__MIME_MAPPINGS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SESSION_CONFIG = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SERVLET_MAPPINGS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SERVLETS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__SECURITY_ROLES = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__FILTERS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__FILTER_MAPPINGS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_APP__LISTENERS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 15;
-	/**
-	 * The feature id for the '<em><b>Context Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__CONTEXT_PARAMS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 16;
-
-	/**
-	 * The feature id for the '<em><b>Jsp Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__JSP_CONFIG = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 17;
-
-	/**
-	 * The feature id for the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__MESSAGE_DESTINATIONS = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 18;
-
-	/**
-	 * The feature id for the '<em><b>Local Encoding Mapping List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP__LOCAL_ENCODING_MAPPING_LIST = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 19;
-
-	/**
-	 * The number of structural features of the the '<em>Web App</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_APP_FEATURE_COUNT = CommonPackage.JNDI_ENV_REFS_GROUP_FEATURE_COUNT + 20;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__PARAM_NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__PARAM_VALUE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__DESCRIPTION = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int CONTEXT_PARAM__WEB_APP = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Context Param</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTEXT_PARAM_FEATURE_COUNT = 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_PAGE = 7;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE = 22;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE = 23;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE_LIST = 6;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE = 21;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB_REF = 8;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT = 9;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION = 10;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int URL_PATTERN_TYPE = 19;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int HTTP_METHOD_TYPE = 28;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT = 11;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT = 12;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG = 13;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG = 14;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING = 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_CONFIG = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET = 2;
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__SERVLET_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__LOAD_ON_STARTUP = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__WEB_APP = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__WEB_TYPE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__SECURITY_ROLE_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET__RUN_AS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the the '<em>Servlet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING__URL_PATTERN = 0;
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING__NAME = 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING__WEB_APP = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_MAPPING__SERVLET = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Servlet Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_MAPPING_FEATURE_COUNT = 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_CONFIG__SESSION_TIMEOUT = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SESSION_CONFIG__WEB_APP = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Session Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SESSION_CONFIG_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING__EXTENSION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING__MIME_TYPE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int MIME_MAPPING__WEB_APP = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Mime Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MIME_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE_LIST__WEB_APP = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE_LIST__FILE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Welcome File List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WELCOME_FILE_LIST_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_PAGE__LOCATION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_PAGE__WEB_APP = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Error Page</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_PAGE_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB_REF__TAGLIB_URI = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TAG_LIB_REF__TAGLIB_LOCATION = 1;
-	/**
-	 * The feature id for the '<em><b>Web App</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF__WEB_APP = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Tag Lib Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TAG_LIB_REF_FEATURE_COUNT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__DISPLAY_NAME = 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__WEB_APP = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__AUTH_CONSTRAINT = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT__DISPLAY_NAMES = 5;
-
-	/**
-	 * The number of structural features of the the '<em>Security Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SECURITY_CONSTRAINT_FEATURE_COUNT = 6;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__DESCRIPTION = 1;
-	/**
-	 * The feature id for the '<em><b>Url Pattern</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__URL_PATTERN = 2;
-
-	/**
-	 * The feature id for the '<em><b>Http Method</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__HTTP_METHOD = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT = 4;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_RESOURCE_COLLECTION__UR_LS = 5;
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__DESCRIPTIONS = 6;
-
-	/**
-	 * The feature id for the '<em><b>HTT Ps</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION__HTT_PS = 7;
-
-	/**
-	 * The number of structural features of the the '<em>Web Resource Collection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_RESOURCE_COLLECTION_FEATURE_COUNT = 8;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT__ROLES = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int AUTH_CONSTRAINT__SEC_CONSTRAINT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT__DESCRIPTIONS = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Auth Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUTH_CONSTRAINT_FEATURE_COUNT = 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT__DESCRIPTION = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int USER_DATA_CONSTRAINT__SEC_CONSTRAINT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT__DESCRIPTIONS = 3;
-
-	/**
-	 * The number of structural features of the the '<em>User Data Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USER_DATA_CONSTRAINT_FEATURE_COUNT = 4;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__AUTH_METHOD = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__REALM_NAME = 1;
-	/**
-	 * The feature id for the '<em><b>Authorization Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG__AUTHORIZATION_METHOD = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__WEB_APP = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int LOGIN_CONFIG__FORM_LOGIN_CONFIG = 4;
-
-	/**
-	 * The number of structural features of the the '<em>Login Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOGIN_CONFIG_FEATURE_COUNT = 5;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG__FORM_ERROR_PAGE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FORM_LOGIN_CONFIG__LOGIN_CONFIG = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Form Login Config</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORM_LOGIN_CONFIG_FEATURE_COUNT = 3;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WEB_TYPE = 16;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_TYPE = 17;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TYPE = 18;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM = 15;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM__PARAM_NAME = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM__PARAM_VALUE = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int INIT_PARAM__DESCRIPTION = 2;
-	/**
-	 * The number of structural features of the the '<em>Init Param</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INIT_PARAM_FEATURE_COUNT = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Web Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WEB_TYPE_FEATURE_COUNT = 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int SERVLET_TYPE__CLASS_NAME = WEB_TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Servlet Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVLET_TYPE_FEATURE_COUNT = WEB_TYPE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int JSP_TYPE__JSP_FILE = WEB_TYPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>JSP Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JSP_TYPE_FEATURE_COUNT = WEB_TYPE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int URL_PATTERN_TYPE__URL_PATTERN = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int URL_PATTERN_TYPE__RES_COLLECTION = 1;
-
-	/**
-	 * The number of structural features of the the '<em>URL Pattern Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int URL_PATTERN_TYPE_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER = 25;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING = 24;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_NAME_TYPE = 20;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ROLE_NAME_TYPE__ROLE_NAME = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Role Name Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROLE_NAME_TYPE_FEATURE_COUNT = 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE__WELCOME_FILE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int WELCOME_FILE__FILE_LIST = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Welcome File</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int WELCOME_FILE_FEATURE_COUNT = 2;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE__LOCATION = ERROR_PAGE__LOCATION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE__WEB_APP = ERROR_PAGE__WEB_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE = ERROR_PAGE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Exception Type Error Page</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_TYPE_ERROR_PAGE_FEATURE_COUNT = ERROR_PAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE__LOCATION = ERROR_PAGE__LOCATION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE__WEB_APP = ERROR_PAGE__WEB_APP;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int ERROR_CODE_ERROR_PAGE__ERROR_CODE = ERROR_PAGE_FEATURE_COUNT + 0;
-	/**
-	 * The number of structural features of the the '<em>Error Code Error Page</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ERROR_CODE_ERROR_PAGE_FEATURE_COUNT = ERROR_PAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING__URL_PATTERN = 0;
-	/**
-	 * The feature id for the '<em><b>Dispatcher Type</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING__DISPATCHER_TYPE = 1;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING__FILTER = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER_MAPPING__SERVLET = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Filter Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_MAPPING_FEATURE_COUNT = 4;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int FILTER__FILTER_CLASS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Init Param Values</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER__INIT_PARAM_VALUES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Filter</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FILTER_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webapplication.impl.LocalEncodingMappingListImpl <em>Local Encoding Mapping List</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.LocalEncodingMappingListImpl
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl#getLocalEncodingMappingList()
-	 * @generated
-	 */
-	int LOCAL_ENCODING_MAPPING_LIST = 26;
-
-	/**
-	 * The feature id for the '<em><b>Local Encoding Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Local Encoding Mapping List</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING_LIST_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webapplication.impl.LocalEncodingMappingImpl <em>Local Encoding Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.LocalEncodingMappingImpl
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl#getLocalEncodingMapping()
-	 * @generated
-	 */
-	int LOCAL_ENCODING_MAPPING = 27;
-
-	/**
-	 * The feature id for the '<em><b>Locale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING__LOCALE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING__ENCODING = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Local Encoding Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOCAL_ENCODING_MAPPING_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Http Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_METHOD_TYPE__HTTP_METHOD = 0;
-
-	/**
-	 * The number of structural features of the the '<em>HTTP Method Type</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HTTP_METHOD_TYPE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webapplication.ResAuthServletType <em>Res Auth Servlet Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.ResAuthServletType
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl#getResAuthServletType()
-	 * @generated
-	 */
-	int RES_AUTH_SERVLET_TYPE = 29;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum <em>HTTP Method Type Enum</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl#getHTTPMethodTypeEnum()
-	 * @generated
-	 */
-	int HTTP_METHOD_TYPE_ENUM = 30;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	int TRANSPORT_GUARANTEE_TYPE = 31;
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webapplication.DispatcherType <em>Dispatcher Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.DispatcherType
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl#getDispatcherType()
-	 * @generated
-	 */
-	int DISPATCHER_TYPE = 32;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webapplication.AuthMethodKind <em>Auth Method Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.AuthMethodKind
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl#getAuthMethodKind()
-	 * @generated
-	 */
-	int AUTH_METHOD_KIND = 33;
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	String eNS_URI = "webapplication.xmi";//$NON-NLS-1$
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.webapplication";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	WebapplicationPackage eINSTANCE = org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl.init();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebApp object
-	 */
-	EClass getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWebApp_Distributable();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp#getVersion()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EAttribute getWebApp_Version();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_Contexts();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_ErrorPages();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_FileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_TagLibs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_Constraints();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_LoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_MimeMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_SessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_ServletMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_Servlets();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_SecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_Filters();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_FilterMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebApp_Listeners();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getContextParams <em>Context Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Context Params</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp#getContextParams()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_ContextParams();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getJspConfig <em>Jsp Config</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Jsp Config</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp#getJspConfig()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_JspConfig();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getMessageDestinations <em>Message Destinations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Message Destinations</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp#getMessageDestinations()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_MessageDestinations();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getLocalEncodingMappingList <em>Local Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Local Encoding Mapping List</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp#getLocalEncodingMappingList()
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	EReference getWebApp_LocalEncodingMappingList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContextParam object
-	 */
-	EClass getContextParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getContextParam_ParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getContextParam_ParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getContextParam_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getContextParam_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorPage object
-	 */
-	EClass getErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getErrorPage_Location();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getErrorPage_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExceptionTypeErrorPage object
-	 */
-	EClass getExceptionTypeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getExceptionTypeErrorPage_ExceptionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorCodeErrorPage object
-	 */
-	EClass getErrorCodeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getErrorCodeErrorPage_ErrorCode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFileList object
-	 */
-	EClass getWelcomeFileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWelcomeFileList_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWelcomeFileList_File();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFile object
-	 */
-	EClass getWelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWelcomeFile_WelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWelcomeFile_FileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TagLibRef object
-	 */
-	EClass getTagLibRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLibRef_TaglibURI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getTagLibRef_TaglibLocation();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.jst.j2ee.internal.webapplication.TagLibRef#getWebApp <em>Web App</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Web App</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.TagLibRef#getWebApp()
-	 * @see #getTagLibRef()
-	 * @generated
-	 */
-	EReference getTagLibRef_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityConstraint object
-	 */
-	EClass getSecurityConstraint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webapplication.SecurityConstraint#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.SecurityConstraint#getDisplayName()
-	 * @see #getSecurityConstraint()
-	 * @generated
-	 */
-	EAttribute getSecurityConstraint_DisplayName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_WebResourceCollections();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_AuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSecurityConstraint_UserDataConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.SecurityConstraint#getDisplayNames <em>Display Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Display Names</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.SecurityConstraint#getDisplayNames()
-	 * @see #getSecurityConstraint()
-	 * @generated
-	 */
-	EReference getSecurityConstraint_DisplayNames();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebResourceCollection object
-	 */
-	EClass getWebResourceCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWebResourceCollection_WebResourceName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getWebResourceCollection_Description();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getUrlPattern <em>Url Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Url Pattern</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getUrlPattern()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EAttribute getWebResourceCollection_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getHttpMethod <em>Http Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Http Method</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getHttpMethod()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EAttribute getWebResourceCollection_HttpMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getWebResourceCollection_SecConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getURLs <em>UR Ls</em>}'.
-	 * <!-- begin-user-doc -->
-	 * @deprecated since 4/25/2003 use {@link #getWebResourceCollection_UrlPattern()}
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>UR Ls</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getURLs()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EReference getWebResourceCollection_URLs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getDescriptions()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EReference getWebResourceCollection_Descriptions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getHTTPs <em>HTT Ps</em>}'.
-	 * <!-- begin-user-doc -->
-	 * @deprecated since 4/25/2003 use {@link #getWebResourceCollection_HttpMethod()}
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>HTT Ps</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection#getHTTPs()
-	 * @see #getWebResourceCollection()
-	 * @generated
-	 */
-	EReference getWebResourceCollection_HTTPs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return URLPatternType object
-	 */
-	EClass getURLPatternType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getURLPatternType_UrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getURLPatternType_ResCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return HTTPMethodType object
-	 */
-	EClass getHTTPMethodType();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodType#getHttpMethod <em>Http Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Http Method</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodType#getHttpMethod()
-	 * @see #getHTTPMethodType()
-	 * @generated
-	 */
-	EAttribute getHTTPMethodType_HttpMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthConstraint object
-	 */
-	EClass getAuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthConstraint_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getAuthConstraint_Roles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getAuthConstraint_SecConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.AuthConstraint#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.AuthConstraint#getDescriptions()
-	 * @see #getAuthConstraint()
-	 * @generated
-	 */
-	EReference getAuthConstraint_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return UserDataConstraint object
-	 */
-	EClass getUserDataConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getUserDataConstraint_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getUserDataConstraint_TransportGuarantee();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getUserDataConstraint_SecConstraint();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.UserDataConstraint#getDescriptions <em>Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.UserDataConstraint#getDescriptions()
-	 * @see #getUserDataConstraint()
-	 * @generated
-	 */
-	EReference getUserDataConstraint_Descriptions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return LoginConfig object
-	 */
-	EClass getLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLoginConfig_AuthMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getLoginConfig_RealmName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webapplication.LoginConfig#getAuthorizationMethod <em>Authorization Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authorization Method</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LoginConfig#getAuthorizationMethod()
-	 * @see #getLoginConfig()
-	 * @generated
-	 */
-	EAttribute getLoginConfig_AuthorizationMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLoginConfig_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getLoginConfig_FormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FormLoginConfig object
-	 */
-	EClass getFormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFormLoginConfig_FormLoginPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFormLoginConfig_FormErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFormLoginConfig_LoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MimeMapping object
-	 */
-	EClass getMimeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMimeMapping_Extension();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getMimeMapping_MimeType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getMimeMapping_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SessionConfig object
-	 */
-	EClass getSessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getSessionConfig_SessionTimeout();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getSessionConfig_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletMapping object
-	 */
-	EClass getServletMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServletMapping_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webapplication.ServletMapping#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.ServletMapping#getName()
-	 * @see #getServletMapping()
-	 * @generated
-	 */
-	EAttribute getServletMapping_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServletMapping_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServletMapping_Servlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Servlet object
-	 */
-	EClass getServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServlet_ServletName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServlet_LoadOnStartup();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_WebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_WebType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_Params();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_SecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getServlet_RunAs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.Servlet#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.Servlet#getInitParams()
-	 * @see #getServlet()
-	 * @generated
-	 */
-	EReference getServlet_InitParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebType object
-	 */
-	EClass getWebType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletType object
-	 */
-	EClass getServletType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getServletType_ClassName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPType object
-	 */
-	EClass getJSPType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getJSPType_JspFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return InitParam object
-	 */
-	EClass getInitParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getInitParam_ParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getInitParam_ParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getInitParam_Description();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Filter object
-	 */
-	EClass getFilter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFilter_Name();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilter_InitParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilter_FilterClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.Filter#getInitParamValues <em>Init Param Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Param Values</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.Filter#getInitParamValues()
-	 * @see #getFilter()
-	 * @generated
-	 */
-	EReference getFilter_InitParamValues();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FilterMapping object
-	 */
-	EClass getFilterMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getFilterMapping_UrlPattern();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.webapplication.FilterMapping#getDispatcherType <em>Dispatcher Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Dispatcher Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.FilterMapping#getDispatcherType()
-	 * @see #getFilterMapping()
-	 * @generated
-	 */
-	EAttribute getFilterMapping_DispatcherType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilterMapping_Filter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EReference getFilterMapping_Servlet();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMappingList <em>Local Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Local Encoding Mapping List</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMappingList
-	 * @generated
-	 */
-	EClass getLocalEncodingMappingList();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMappingList#getLocalEncodingMappings <em>Local Encoding Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Local Encoding Mappings</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMappingList#getLocalEncodingMappings()
-	 * @see #getLocalEncodingMappingList()
-	 * @generated
-	 */
-	EReference getLocalEncodingMappingList_LocalEncodingMappings();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping <em>Local Encoding Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Local Encoding Mapping</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping
-	 * @generated
-	 */
-	EClass getLocalEncodingMapping();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getLocale <em>Locale</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Locale</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getLocale()
-	 * @see #getLocalEncodingMapping()
-	 * @generated
-	 */
-	EAttribute getLocalEncodingMapping_Locale();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getEncoding <em>Encoding</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Encoding</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getEncoding()
-	 * @see #getLocalEncodingMapping()
-	 * @generated
-	 */
-	EAttribute getLocalEncodingMapping_Encoding();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.internal.webapplication.ResAuthServletType <em>Res Auth Servlet Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Res Auth Servlet Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.ResAuthServletType
-	 * @generated
-	 */
-	EEnum getResAuthServletType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum <em>HTTP Method Type Enum</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>HTTP Method Type Enum</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum
-	 * @generated
-	 */
-	EEnum getHTTPMethodTypeEnum();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleNameType object
-	 */
-	EClass getRoleNameType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	EAttribute getRoleNameType_RoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TransportGuaranteeType object
-	 */
-	EEnum getTransportGuaranteeType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.internal.webapplication.DispatcherType <em>Dispatcher Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Dispatcher Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.DispatcherType
-	 * @generated
-	 */
-	EEnum getDispatcherType();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jst.j2ee.internal.webapplication.AuthMethodKind <em>Auth Method Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Auth Method Kind</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.AuthMethodKind
-	 * @generated
-	 */
-	EEnum getAuthMethodKind();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	WebapplicationFactory getWebapplicationFactory();
-
-} //WebapplicationPackage
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/AuthConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/AuthConstraintImpl.java
deleted file mode 100644
index 6b1627e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/AuthConstraintImpl.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-
-
-/**
- * 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.
- */
-public class AuthConstraintImpl extends EObjectImpl implements AuthConstraint, EObject {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList roles = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public AuthConstraintImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getAuthConstraint();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A description of the auth constraint.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A list of role names for the auth constraint.  Each element specifies the name
-	 * of a security role (a String).
-
-	 */
-	public EList getRoles() {
-		if (roles == null) {
-			roles = new EDataTypeUniqueEList(String.class, this, WebapplicationPackage.AUTH_CONSTRAINT__ROLES);
-		}
-		return roles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SecurityConstraint getSecConstraint() {
-		if (eContainerFeatureID != WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT) return null;
-		return (SecurityConstraint)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecConstraint(SecurityConstraint newSecConstraint) {
-		if (newSecConstraint != eContainer || (eContainerFeatureID != WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT && newSecConstraint != null)) {
-			if (EcoreUtil.isAncestor(this, newSecConstraint))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSecConstraint != null)
-				msgs = ((InternalEObject)newSecConstraint).eInverseAdd(this, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, SecurityConstraint.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newSecConstraint, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, newSecConstraint, newSecConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, 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 WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-					return eBasicSetContainer(null, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, msgs);
-				case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, SecurityConstraint.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 WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				return getRoles();
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint();
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				return roles != null && !roles.isEmpty();
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint() != null;
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				getRoles().clear();
-				getRoles().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)newValue);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__ROLES:
-				getRoles().clear();
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)null);
-				return;
-			case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", roles: ");//$NON-NLS-1$
-		result.append(roles);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ContextParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ContextParamImpl.java
deleted file mode 100644
index f813aaf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ContextParamImpl.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * The context-param element contains the declaration of a web application's servlet context initialization parameters.
- */
-public class ContextParamImpl extends EObjectImpl implements ContextParam, EObject {
-
-	/**
-	 * The default value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramName = PARAM_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramValue = PARAM_VALUE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	public ContextParamImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getContextParam();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The param-name element contains the name of a parameter.
-	 */
-	public String getParamName() {
-		return paramName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamName(String newParamName) {
-		String oldParamName = paramName;
-		paramName = newParamName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME, oldParamName, paramName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The param-value element contains the value of a parameter.
-	 */
-	public String getParamValue() {
-		return paramValue;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamValue(String newParamValue) {
-		String oldParamValue = paramValue;
-		paramValue = newParamValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE, oldParamValue, paramValue));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.CONTEXT_PARAM__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.CONTEXT_PARAM__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__CONTEXTS, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.CONTEXT_PARAM__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.CONTEXT_PARAM__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.CONTEXT_PARAM__WEB_APP, 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 WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.CONTEXT_PARAM__WEB_APP, 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 WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__CONTEXTS, WebApp.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 WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				return getParamName();
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				return getParamValue();
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				return getWebApp();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				return PARAM_NAME_EDEFAULT == null ? paramName != null : !PARAM_NAME_EDEFAULT.equals(paramName);
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				return PARAM_VALUE_EDEFAULT == null ? paramValue != null : !PARAM_VALUE_EDEFAULT.equals(paramValue);
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				return getWebApp() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				setParamName((String)newValue);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				setParamValue((String)newValue);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME:
-				setParamName(PARAM_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE:
-				setParamValue(PARAM_VALUE_EDEFAULT);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.CONTEXT_PARAM__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		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(" (paramName: "); //$NON-NLS-1$
-		result.append(paramName);
-		result.append(", paramValue: "); //$NON-NLS-1$
-		result.append(paramValue);
-		result.append(", description: "); //$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorCodeErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorCodeErrorPageImpl.java
deleted file mode 100644
index 0c27d83..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorCodeErrorPageImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @generated
- */
-public class ErrorCodeErrorPageImpl extends ErrorPageImpl implements ErrorCodeErrorPage {
-
-	/**
-	 * The default value of the '{@link #getErrorCode() <em>Error Code</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getErrorCode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ERROR_CODE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String errorCode = ERROR_CODE_EDEFAULT;
-	public ErrorCodeErrorPageImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getErrorCodeErrorPage();
-	}
-
-/**
- * isErrorCode method comment.
- */
-public boolean isErrorCode() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The error-code contains an HTTP error code, ex: 404
-
-	 */
-	public String getErrorCode() {
-		return errorCode;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setErrorCode(String newErrorCode) {
-		String oldErrorCode = errorCode;
-		errorCode = newErrorCode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE, oldErrorCode, errorCode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP, 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 WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP, 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 WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebApp.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 WebapplicationPackage.ERROR_CODE_ERROR_PAGE__LOCATION:
-				return getLocation();
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				return getErrorCode();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				return ERROR_CODE_EDEFAULT == null ? errorCode != null : !ERROR_CODE_EDEFAULT.equals(errorCode);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				setErrorCode((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE:
-				setErrorCode(ERROR_CODE_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(" (errorCode: ");//$NON-NLS-1$
-		result.append(errorCode);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorPageImpl.java
deleted file mode 100644
index 7feeff3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ErrorPageImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * The error-page element contains a mapping between an error code or exception type to the path of a resource in the web application
- */
-public class ErrorPageImpl extends EObjectImpl implements ErrorPage, EObject {
-
-	/**
-	 * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCATION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String location = LOCATION_EDEFAULT;
-	public ErrorPageImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getErrorPage();
-	}
-
-/**
- * isErrorCode method comment.
- */
-public boolean isErrorCode() {
-	return false;
-}
-/**
- * isExceptionType method comment.
- */
-public boolean isExceptionType() {
-	return false;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The location element contains the location of the resource in the web
-	 * application
-	 */
-	public String getLocation() {
-		return location;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLocation(String newLocation) {
-		String oldLocation = location;
-		location = newLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ERROR_PAGE__LOCATION, oldLocation, location));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.ERROR_PAGE__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.ERROR_PAGE__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.ERROR_PAGE__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ERROR_PAGE__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.ERROR_PAGE__WEB_APP, 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 WebapplicationPackage.ERROR_PAGE__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.ERROR_PAGE__WEB_APP, 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 WebapplicationPackage.ERROR_PAGE__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebApp.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 WebapplicationPackage.ERROR_PAGE__LOCATION:
-				return getLocation();
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				return getWebApp();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				return getWebApp() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ERROR_PAGE__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case WebapplicationPackage.ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)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(" (location: ");//$NON-NLS-1$
-		result.append(location);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ExceptionTypeErrorPageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ExceptionTypeErrorPageImpl.java
deleted file mode 100644
index 711124b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ExceptionTypeErrorPageImpl.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @generated
- */
-public class ExceptionTypeErrorPageImpl extends ErrorPageImpl implements ExceptionTypeErrorPage {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass exceptionType = null;
-	public ExceptionTypeErrorPageImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getExceptionTypeErrorPage();
-	}
-
-/**
- * Helper method to set the ExceptionType to a JavaClass having a fully qualified
- * name specified by the parameter
- */
-public String getExceptionTypeName() {
-	getExceptionType();
-	return exceptionType == null ? null : exceptionType.getQualifiedName();
-}/**
- * Helper method to set the ExceptionType to a JavaClass having a fully qualified
- * name specified by the parameter
- */ 
-public boolean isExceptionType() {
-	return true;
-}
-public void setExceptionTypeName(String exceptionTypeName) {
-	setExceptionType(JavaRefFactory.eINSTANCE.createClassRef(exceptionTypeName));
-}
-/**
- * @deprecated Use @link{#setExceptionTypeName(String)}
- */
-public void setExceptionTypeName(String exceptionTypeName, ResourceSet context) {
-	setExceptionTypeName(exceptionTypeName);
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The exception type contains a fully qualified class name of a Java exception type.
-	 */
-	public JavaClass getExceptionType() {
-		if (exceptionType != null && exceptionType.eIsProxy()) {
-			JavaClass oldExceptionType = exceptionType;
-			exceptionType = (JavaClass)eResolveProxy((InternalEObject)exceptionType);
-			if (exceptionType != oldExceptionType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE, oldExceptionType, exceptionType));
-			}
-		}
-		return exceptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetExceptionType() {
-		return exceptionType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExceptionType(JavaClass newExceptionType) {
-		JavaClass oldExceptionType = exceptionType;
-		exceptionType = newExceptionType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE, oldExceptionType, exceptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP, 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 WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP, 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 WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebApp.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 WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__LOCATION:
-				return getLocation();
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				if (resolve) return getExceptionType();
-				return basicGetExceptionType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				return exceptionType != 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 WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				setExceptionType((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE:
-				setExceptionType((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterImpl.java
deleted file mode 100644
index e3327cf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.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.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-
-/**
- * Declares a filter in the web application application. The filter is mapped to either a servlet or a URL pattern in the filter-mapping element, using the filter-name value to reference. Filters can access the initialization parameters declared in the deployment descriptor at runtime via the FilterConfig interface.
-
- */
-public class FilterImpl extends CompatibilityDescriptionGroupImpl implements Filter {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String name = NAME_EDEFAULT;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList initParams = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected JavaClass filterClass = null;
-	/**
-	 * The cached value of the '{@link #getInitParamValues() <em>Init Param Values</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParamValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParamValues = null;
-
-		/**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	protected FilterImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getFilter();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The logical name of the filter. This name is used to map the filter.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER__NAME, oldName, name));
-	}
-
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * getInitParams() is used for J2EE1.3
-	 * <!-- end-user-doc -->
-	 * @generated This field/method will be replaced during code generation 
-	 * The init-params contain a name//value pairs as initialization params for the
-	 * filter
-
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(InitParam.class, this, WebapplicationPackage.FILTER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The fully qualified classname of the filter.
-	 */
-	public JavaClass getFilterClass() {
-		if (filterClass != null && filterClass.eIsProxy()) {
-			JavaClass oldFilterClass = filterClass;
-			filterClass = (JavaClass)eResolveProxy((InternalEObject)filterClass);
-			if (filterClass != oldFilterClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.FILTER__FILTER_CLASS, oldFilterClass, filterClass));
-			}
-		}
-		return filterClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetFilterClass() {
-		return filterClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFilterClass(JavaClass newFilterClass) {
-		JavaClass oldFilterClass = filterClass;
-		filterClass = newFilterClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER__FILTER_CLASS, oldFilterClass, filterClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * getInitParamValues() is used for J2EE1.4
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParamValues() {
-		if (initParamValues == null) {
-			initParamValues = new EObjectContainmentEList(ParamValue.class, this, WebapplicationPackage.FILTER__INIT_PARAM_VALUES);
-		}
-		return initParamValues;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.FILTER__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.FILTER__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.FILTER__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.FILTER__INIT_PARAMS:
-					return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-					return ((InternalEList)getInitParamValues()).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 WebapplicationPackage.FILTER__ICONS:
-				return getIcons();
-			case WebapplicationPackage.FILTER__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WebapplicationPackage.FILTER__DESCRIPTIONS:
-				return getDescriptions();
-			case WebapplicationPackage.FILTER__SMALL_ICON:
-				return getSmallIcon();
-			case WebapplicationPackage.FILTER__LARGE_ICON:
-				return getLargeIcon();
-			case WebapplicationPackage.FILTER__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.FILTER__DISPLAY_NAME:
-				return getDisplayName();
-			case WebapplicationPackage.FILTER__NAME:
-				return getName();
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				return getInitParams();
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				if (resolve) return getFilterClass();
-				return basicGetFilterClass();
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				return getInitParamValues();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER__ICONS:
-				return icons != null && !icons.isEmpty();
-			case WebapplicationPackage.FILTER__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WebapplicationPackage.FILTER__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebapplicationPackage.FILTER__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WebapplicationPackage.FILTER__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WebapplicationPackage.FILTER__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.FILTER__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WebapplicationPackage.FILTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				return filterClass != null;
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				return initParamValues != null && !initParamValues.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER__NAME:
-				setName((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				setFilterClass((JavaClass)newValue);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				getInitParamValues().clear();
-				getInitParamValues().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER__ICONS:
-				getIcons().clear();
-				return;
-			case WebapplicationPackage.FILTER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WebapplicationPackage.FILTER__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebapplicationPackage.FILTER__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case WebapplicationPackage.FILTER__FILTER_CLASS:
-				setFilterClass((JavaClass)null);
-				return;
-			case WebapplicationPackage.FILTER__INIT_PARAM_VALUES:
-				getInitParamValues().clear();
-				return;
-		}
-		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(" (name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-public JavaClass createClassRef(String targetName) {
-	return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-
-
-public String getFilterClassName() {
-	getFilterClass();
-	return (filterClass == null) ? null : filterClass.getQualifiedName();
-}
-public void setFilterClassName(String filterClassName) {
-	eSet(WebapplicationPackage.eINSTANCE.getFilter_FilterClass(), createClassRef(filterClassName));
-}
-} //FilterImpl
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterMappingImpl.java
deleted file mode 100644
index 51b62cb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FilterMappingImpl.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * Declaration of the filter mappings in this web application. The container uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. The container matches the request URI to a Servlet in the normal way. To determine which filters to apply it matches filter-mapping declarations either on servlet-name, or on url-pattern for each filter-mapping element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping elements.The filter-name value must be the value of the <filtername> sub-elements of one of the <filter> declarations in the deployment descriptor.
- * 
- * @invariant The filter-name value must be the value of the Filter::name of one of the Filter declarations in the deployment descriptor.
-
- */
-public class FilterMappingImpl extends EObjectImpl implements FilterMapping, EObject{
-
-	/**
-	 * The default value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URL_PATTERN_EDEFAULT = null;
-
-	protected transient String servletName;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String urlPattern = URL_PATTERN_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getDispatcherType() <em>Dispatcher Type</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDispatcherType()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList dispatcherType = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Filter filter = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Servlet servlet = null;
-	public FilterMappingImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getFilterMapping();
-	}
-
-/**
- * Returns the name of the servlet that this mapping applies to.
- */
-	public Servlet getServlet(){
-	Servlet lservlet = this.getServletGen();
-	if (lservlet == null && servletName != null){
-		WebApp webapp = (WebApp)eContainer();
-		if (webapp != null){
-			lservlet=webapp.getServletNamed(servletName);
-			if (lservlet != null) 
-				setServlet(lservlet);
-		}
-	}
-	return lservlet;
-}
-/**
- * Returns the name of the servlet that this mapping applies to.
- */
-public String getServletName(){
-	String ret = null;
-	if (servletName != null)
-		ret =  servletName;
-
-	Servlet lservlet = getServlet();
-	if (lservlet != null)
-		ret = lservlet.getServletName();
-	return ret;
-}
-/**
- * Sets the name of the servlet that this mapping applies to.
- */
-public void setServletName(String servletName){
-	this.servletName = servletName;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	public String getUrlPattern() {
-		return urlPattern;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUrlPattern(String newUrlPattern) {
-		String oldUrlPattern = urlPattern;
-		urlPattern = newUrlPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER_MAPPING__URL_PATTERN, oldUrlPattern, urlPattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDispatcherType() {
-		if (dispatcherType == null) {
-			dispatcherType = new EDataTypeUniqueEList(DispatcherType.class, this, WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE);
-		}
-		return dispatcherType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The filter being mapped
-	 */
-	public Filter getFilter() {
-		if (filter != null && filter.eIsProxy()) {
-			Filter oldFilter = filter;
-			filter = (Filter)eResolveProxy((InternalEObject)filter);
-			if (filter != oldFilter) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.FILTER_MAPPING__FILTER, oldFilter, filter));
-			}
-		}
-		return filter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Filter basicGetFilter() {
-		return filter;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFilter(Filter newFilter) {
-		Filter oldFilter = filter;
-		filter = newFilter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER_MAPPING__FILTER, oldFilter, filter));
-	}
-
-	public void setServlet(Servlet l) {
-		servletName = null;
-		setServletGen(l);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setServletGen(Servlet newServlet) {
-		Servlet oldServlet = servlet;
-		servlet = newServlet;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FILTER_MAPPING__SERVLET, oldServlet, servlet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				return getDispatcherType();
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				if (resolve) return getFilter();
-				return basicGetFilter();
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				if (resolve) return getServlet();
-				return basicGetServlet();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				return URL_PATTERN_EDEFAULT == null ? urlPattern != null : !URL_PATTERN_EDEFAULT.equals(urlPattern);
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				return dispatcherType != null && !dispatcherType.isEmpty();
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				return filter != null;
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				return servlet != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				setUrlPattern((String)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				getDispatcherType().clear();
-				getDispatcherType().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				setFilter((Filter)newValue);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				if(newValue instanceof String)
-	                setServletName((String)newValue);
-	            else
-	                setServlet((Servlet)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN:
-				setUrlPattern(URL_PATTERN_EDEFAULT);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE:
-				getDispatcherType().clear();
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__FILTER:
-				setFilter((Filter)null);
-				return;
-			case WebapplicationPackage.FILTER_MAPPING__SERVLET:
-				setServlet((Servlet)null);
-				return;
-		}
-		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(" (urlPattern: ");//$NON-NLS-1$
-		result.append(urlPattern);
-		result.append(", dispatcherType: ");//$NON-NLS-1$
-		result.append(dispatcherType);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * An optional servlet that is mapped by a filter mapping.  servletName is used to resolve the servlet reference.
-	 */
-	public Servlet getServletGen() {
-		if (servlet != null && servlet.eIsProxy()) {
-			Servlet oldServlet = servlet;
-			servlet = (Servlet)eResolveProxy((InternalEObject)servlet);
-			if (servlet != oldServlet) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.FILTER_MAPPING__SERVLET, oldServlet, servlet));
-			}
-		}
-		return servlet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Servlet basicGetServlet() {
-		return servlet;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FormLoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FormLoginConfigImpl.java
deleted file mode 100644
index 0b6e0f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/FormLoginConfigImpl.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-
-/**
- * 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.
- */
-public class FormLoginConfigImpl extends EObjectImpl implements FormLoginConfig, EObject {
-
-	/**
-	 * The default value of the '{@link #getFormLoginPage() <em>Form Login Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormLoginPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FORM_LOGIN_PAGE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String formLoginPage = FORM_LOGIN_PAGE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getFormErrorPage() <em>Form Error Page</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFormErrorPage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FORM_ERROR_PAGE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String formErrorPage = FORM_ERROR_PAGE_EDEFAULT;
-	public FormLoginConfigImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getFormLoginConfig();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The form-login-page element defines the location in the web app where the page
-	 * that can be used for login can be found
-	 */
-	public String getFormLoginPage() {
-		return formLoginPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFormLoginPage(String newFormLoginPage) {
-		String oldFormLoginPage = formLoginPage;
-		formLoginPage = newFormLoginPage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE, oldFormLoginPage, formLoginPage));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The form-error-page element defines the location in the web app where the error 
-	 * page that is displayed when login is not successful can be found
-	 */
-	public String getFormErrorPage() {
-		return formErrorPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFormErrorPage(String newFormErrorPage) {
-		String oldFormErrorPage = formErrorPage;
-		formErrorPage = newFormErrorPage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE, oldFormErrorPage, formErrorPage));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public LoginConfig getLoginConfig() {
-		if (eContainerFeatureID != WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG) return null;
-		return (LoginConfig)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLoginConfig(LoginConfig newLoginConfig) {
-		if (newLoginConfig != eContainer || (eContainerFeatureID != WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG && newLoginConfig != null)) {
-			if (EcoreUtil.isAncestor(this, newLoginConfig))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newLoginConfig != null)
-				msgs = ((InternalEObject)newLoginConfig).eInverseAdd(this, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, LoginConfig.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newLoginConfig, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, newLoginConfig, newLoginConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, 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 WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-					return eBasicSetContainer(null, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, 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 WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, LoginConfig.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 WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				return getFormLoginPage();
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				return getFormErrorPage();
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				return getLoginConfig();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				return FORM_LOGIN_PAGE_EDEFAULT == null ? formLoginPage != null : !FORM_LOGIN_PAGE_EDEFAULT.equals(formLoginPage);
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				return FORM_ERROR_PAGE_EDEFAULT == null ? formErrorPage != null : !FORM_ERROR_PAGE_EDEFAULT.equals(formErrorPage);
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				return getLoginConfig() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				setFormLoginPage((String)newValue);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				setFormErrorPage((String)newValue);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE:
-				setFormLoginPage(FORM_LOGIN_PAGE_EDEFAULT);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE:
-				setFormErrorPage(FORM_ERROR_PAGE_EDEFAULT);
-				return;
-			case WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)null);
-				return;
-		}
-		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(" (formLoginPage: ");//$NON-NLS-1$
-		result.append(formLoginPage);
-		result.append(", formErrorPage: ");//$NON-NLS-1$
-		result.append(formErrorPage);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/HTTPMethodTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/HTTPMethodTypeImpl.java
deleted file mode 100644
index 9c8410b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/HTTPMethodTypeImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>HTTP Method Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.impl.HTTPMethodTypeImpl#getHttpMethod <em>Http Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HTTPMethodTypeImpl extends EObjectImpl implements HTTPMethodType {
-	/**
-	 * The default value of the '{@link #getHttpMethod() <em>Http Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHttpMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HTTP_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHttpMethod() <em>Http Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHttpMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String httpMethod = HTTP_METHOD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HTTPMethodTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getHTTPMethodType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHttpMethod() {
-		return httpMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHttpMethod(String newHttpMethod) {
-		String oldHttpMethod = httpMethod;
-		httpMethod = newHttpMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD, oldHttpMethod, httpMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				return getHttpMethod();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				setHttpMethod((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				setHttpMethod(HTTP_METHOD_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD:
-				return HTTP_METHOD_EDEFAULT == null ? httpMethod != null : !HTTP_METHOD_EDEFAULT.equals(httpMethod);
-		}
-		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(" (httpMethod: ");//$NON-NLS-1$
-		result.append(httpMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-} //HTTPMethodTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/InitParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/InitParamImpl.java
deleted file mode 100644
index 1ee299e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/InitParamImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-
-/**
- * The init-param element contains a name//value pair as an initialization param of the servlet
- */
-public class InitParamImpl extends EObjectImpl implements InitParam, EObject {
-
-	/**
-	 * The default value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramName = PARAM_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PARAM_VALUE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String paramValue = PARAM_VALUE_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	public InitParamImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getInitParam();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * 
-	 * 
-
-	 */
-	public String getParamName() {
-		return paramName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamName(String newParamName) {
-		String oldParamName = paramName;
-		paramName = newParamName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.INIT_PARAM__PARAM_NAME, oldParamName, paramName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getParamValue() {
-		return paramValue;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setParamValue(String newParamValue) {
-		String oldParamValue = paramValue;
-		paramValue = newParamValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.INIT_PARAM__PARAM_VALUE, oldParamValue, paramValue));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.INIT_PARAM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				return getParamName();
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				return getParamValue();
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				return getDescription();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				return PARAM_NAME_EDEFAULT == null ? paramName != null : !PARAM_NAME_EDEFAULT.equals(paramName);
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				return PARAM_VALUE_EDEFAULT == null ? paramValue != null : !PARAM_VALUE_EDEFAULT.equals(paramValue);
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				setParamName((String)newValue);
-				return;
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue((String)newValue);
-				return;
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.INIT_PARAM__PARAM_NAME:
-				setParamName(PARAM_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue(PARAM_VALUE_EDEFAULT);
-				return;
-			case WebapplicationPackage.INIT_PARAM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		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(" (paramName: ");//$NON-NLS-1$
-		result.append(paramName);
-		result.append(", paramValue: ");//$NON-NLS-1$
-		result.append(paramValue);
-		result.append(", description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/JSPTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/JSPTypeImpl.java
deleted file mode 100644
index 77f8d62..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/JSPTypeImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-
-
-/**
- * @generated
- */
-public class JSPTypeImpl extends WebTypeImpl implements JSPType {
-
-	/**
-	 * The default value of the '{@link #getJspFile() <em>Jsp File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JSP_FILE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String jspFile = JSP_FILE_EDEFAULT;
-	public JSPTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getJSPType();
-	}
-
-public boolean isJspType() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The jsp-file element contains the full path to a JSP file within the web
-	 * application.
-
-	 */
-	public String getJspFile() {
-		return jspFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setJspFile(String newJspFile) {
-		String oldJspFile = jspFile;
-		jspFile = newJspFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.JSP_TYPE__JSP_FILE, oldJspFile, jspFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				return getJspFile();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				return JSP_FILE_EDEFAULT == null ? jspFile != null : !JSP_FILE_EDEFAULT.equals(jspFile);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				setJspFile((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.JSP_TYPE__JSP_FILE:
-				setJspFile(JSP_FILE_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(" (jspFile: ");//$NON-NLS-1$
-		result.append(jspFile);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingImpl.java
deleted file mode 100644
index 4d6285c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Local Encoding Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.impl.LocalEncodingMappingImpl#getLocale <em>Locale</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.impl.LocalEncodingMappingImpl#getEncoding <em>Encoding</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocalEncodingMappingImpl extends EObjectImpl implements LocalEncodingMapping {
-	/**
-	 * The default value of the '{@link #getLocale() <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocale()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LOCALE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLocale() <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocale()
-	 * @generated
-	 * @ordered
-	 */
-	protected String locale = LOCALE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ENCODING_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEncoding() <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEncoding()
-	 * @generated
-	 * @ordered
-	 */
-	protected String encoding = ENCODING_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocalEncodingMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getLocalEncodingMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLocale() {
-		return locale;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocale(String newLocale) {
-		String oldLocale = locale;
-		locale = newLocale;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE, oldLocale, locale));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEncoding() {
-		return encoding;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEncoding(String newEncoding) {
-		String oldEncoding = encoding;
-		encoding = newEncoding;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING, oldEncoding, encoding));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				return getLocale();
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				return getEncoding();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				setLocale((String)newValue);
-				return;
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				setEncoding((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				setLocale(LOCALE_EDEFAULT);
-				return;
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				setEncoding(ENCODING_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE:
-				return LOCALE_EDEFAULT == null ? locale != null : !LOCALE_EDEFAULT.equals(locale);
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING:
-				return ENCODING_EDEFAULT == null ? encoding != null : !ENCODING_EDEFAULT.equals(encoding);
-		}
-		return 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(" (locale: ");//$NON-NLS-1$
-		result.append(locale);
-		result.append(", encoding: ");//$NON-NLS-1$
-		result.append(encoding);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LocalEncodingMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingListImpl.java
deleted file mode 100644
index 3d4778b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LocalEncodingMappingListImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Local Encoding Mapping List</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.impl.LocalEncodingMappingListImpl#getLocalEncodingMappings <em>Local Encoding Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LocalEncodingMappingListImpl extends EObjectImpl implements LocalEncodingMappingList {
-	/**
-	 * The cached value of the '{@link #getLocalEncodingMappings() <em>Local Encoding Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalEncodingMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList localEncodingMappings = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LocalEncodingMappingListImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getLocalEncodingMappingList();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getLocalEncodingMappings() {
-		if (localEncodingMappings == null) {
-			localEncodingMappings = new EObjectContainmentEList(LocalEncodingMapping.class, this, WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
-		}
-		return localEncodingMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-					return ((InternalEList)getLocalEncodingMappings()).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 WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				return getLocalEncodingMappings();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				getLocalEncodingMappings().clear();
-				getLocalEncodingMappings().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				getLocalEncodingMappings().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS:
-				return localEncodingMappings != null && !localEncodingMappings.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //LocalEncodingMappingListImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LoginConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LoginConfigImpl.java
deleted file mode 100644
index f3de1cc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/LoginConfigImpl.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.AuthMethodKind;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * The login-config element is used to configure the authentication method that should be used, the realm name that should be used for this application, and the attributes that are needed by the form login
- * mechanism.
- */
-public class LoginConfigImpl extends EObjectImpl implements LoginConfig, EObject {
-
-	/**
-	 * The default value of the '{@link #getAuthMethod() <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final AuthMethodKind AUTH_METHOD_EDEFAULT = AuthMethodKind.UNSPECIFIED_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AuthMethodKind authMethod = AUTH_METHOD_EDEFAULT;
-	/**
-	 * This is true if the Auth Method attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean authMethodESet = false;
-
-	/**
-	 * The default value of the '{@link #getRealmName() <em>Realm Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRealmName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String REALM_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String realmName = REALM_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAuthorizationMethod() <em>Authorization Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthorizationMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHORIZATION_METHOD_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthorizationMethod() <em>Authorization Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthorizationMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authorizationMethod = AUTHORIZATION_METHOD_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected FormLoginConfig formLoginConfig = null;
-	public LoginConfigImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getLoginConfig();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The auth-method element is used to configure the authentication mechanism for
-	 * the web application. As a prerequisite to gaining access to any web resources
-	 * which are protected by an authorization constraint, a user must have
-	 * authenticated using the configured mechanism. Legal values for this element are 
-	 * "BASIC", "DIGEST", "FORM", or "CLIENT-CERT".
-	 */
-	public AuthMethodKind getAuthMethod() {
-		return authMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthMethod(AuthMethodKind newAuthMethod) {
-		AuthMethodKind oldAuthMethod = authMethod;
-		authMethod = newAuthMethod == null ? AUTH_METHOD_EDEFAULT : newAuthMethod;
-		boolean oldAuthMethodESet = authMethodESet;
-		authMethodESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD, oldAuthMethod, authMethod, !oldAuthMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetAuthMethod() {
-		AuthMethodKind oldAuthMethod = authMethod;
-		boolean oldAuthMethodESet = authMethodESet;
-		authMethod = AUTH_METHOD_EDEFAULT;
-		authMethodESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD, oldAuthMethod, AUTH_METHOD_EDEFAULT, oldAuthMethodESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetAuthMethod() {
-		return authMethodESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The realm name element specifies the realm name to use in HTTP Basic
-	 * authorization
-	 */
-	public String getRealmName() {
-		return realmName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRealmName(String newRealmName) {
-		String oldRealmName = realmName;
-		realmName = newRealmName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__REALM_NAME, oldRealmName, realmName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthorizationMethod() {
-		return authorizationMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthorizationMethod(String newAuthorizationMethod) {
-		String oldAuthorizationMethod = authorizationMethod;
-		authorizationMethod = newAuthorizationMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD, oldAuthorizationMethod, authorizationMethod));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.LOGIN_CONFIG__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.LOGIN_CONFIG__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public FormLoginConfig getFormLoginConfig() {
-		return formLoginConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFormLoginConfig(FormLoginConfig newFormLoginConfig, NotificationChain msgs) {
-		FormLoginConfig oldFormLoginConfig = formLoginConfig;
-		formLoginConfig = newFormLoginConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, oldFormLoginConfig, newFormLoginConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFormLoginConfig(FormLoginConfig newFormLoginConfig) {
-		if (newFormLoginConfig != formLoginConfig) {
-			NotificationChain msgs = null;
-			if (formLoginConfig != null)
-				msgs = ((InternalEObject)formLoginConfig).eInverseRemove(this, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, FormLoginConfig.class, msgs);
-			if (newFormLoginConfig != null)
-				msgs = ((InternalEObject)newFormLoginConfig).eInverseAdd(this, WebapplicationPackage.FORM_LOGIN_CONFIG__LOGIN_CONFIG, FormLoginConfig.class, msgs);
-			msgs = basicSetFormLoginConfig(newFormLoginConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, newFormLoginConfig, newFormLoginConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, msgs);
-				case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-					if (formLoginConfig != null)
-						msgs = ((InternalEObject)formLoginConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG, null, msgs);
-					return basicSetFormLoginConfig((FormLoginConfig)otherEnd, msgs);
-				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 WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, msgs);
-				case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-					return basicSetFormLoginConfig(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 WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, WebApp.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 WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				return getAuthMethod();
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				return getRealmName();
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				return getAuthorizationMethod();
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return getFormLoginConfig();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				return isSetAuthMethod();
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				return REALM_NAME_EDEFAULT == null ? realmName != null : !REALM_NAME_EDEFAULT.equals(realmName);
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				return AUTHORIZATION_METHOD_EDEFAULT == null ? authorizationMethod != null : !AUTHORIZATION_METHOD_EDEFAULT.equals(authorizationMethod);
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				return formLoginConfig != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				setAuthMethod((AuthMethodKind)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				setRealmName((String)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				setAuthorizationMethod((String)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				setFormLoginConfig((FormLoginConfig)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD:
-				unsetAuthMethod();
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME:
-				setRealmName(REALM_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD:
-				setAuthorizationMethod(AUTHORIZATION_METHOD_EDEFAULT);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG:
-				setFormLoginConfig((FormLoginConfig)null);
-				return;
-		}
-		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(" (authMethod: ");//$NON-NLS-1$
-		if (authMethodESet) result.append(authMethod); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", realmName: ");//$NON-NLS-1$
-		result.append(realmName);
-		result.append(", authorizationMethod: ");//$NON-NLS-1$
-		result.append(authorizationMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/MimeMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/MimeMappingImpl.java
deleted file mode 100644
index 4c895f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/MimeMappingImpl.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * The mime-mapping element defines a mapping between an extension and a mime type.
-
- */
-public class MimeMappingImpl extends EObjectImpl implements MimeMapping, EObject {
-
-	/**
-	 * The default value of the '{@link #getExtension() <em>Extension</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getExtension()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EXTENSION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String extension = EXTENSION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getMimeType() <em>Mime Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMimeType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MIME_TYPE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String mimeType = MIME_TYPE_EDEFAULT;
-	public MimeMappingImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getMimeMapping();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The extension element contains a string describing an extension. example: "txt"
-	 */
-	public String getExtension() {
-		return extension;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setExtension(String newExtension) {
-		String oldExtension = extension;
-		extension = newExtension;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.MIME_MAPPING__EXTENSION, oldExtension, extension));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The mime-type element contains a defined mime type. example: "text//plain"
-	 */
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setMimeType(String newMimeType) {
-		String oldMimeType = mimeType;
-		mimeType = newMimeType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.MIME_MAPPING__MIME_TYPE, oldMimeType, mimeType));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.MIME_MAPPING__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.MIME_MAPPING__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__MIME_MAPPINGS, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.MIME_MAPPING__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.MIME_MAPPING__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.MIME_MAPPING__WEB_APP, 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 WebapplicationPackage.MIME_MAPPING__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.MIME_MAPPING__WEB_APP, 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 WebapplicationPackage.MIME_MAPPING__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__MIME_MAPPINGS, WebApp.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 WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				return getExtension();
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				return getMimeType();
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				return getWebApp();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				return EXTENSION_EDEFAULT == null ? extension != null : !EXTENSION_EDEFAULT.equals(extension);
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				return MIME_TYPE_EDEFAULT == null ? mimeType != null : !MIME_TYPE_EDEFAULT.equals(mimeType);
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				return getWebApp() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				setExtension((String)newValue);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				setMimeType((String)newValue);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.MIME_MAPPING__EXTENSION:
-				setExtension(EXTENSION_EDEFAULT);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__MIME_TYPE:
-				setMimeType(MIME_TYPE_EDEFAULT);
-				return;
-			case WebapplicationPackage.MIME_MAPPING__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		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(" (extension: ");//$NON-NLS-1$
-		result.append(extension);
-		result.append(", mimeType: ");//$NON-NLS-1$
-		result.append(mimeType);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/RoleNameTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/RoleNameTypeImpl.java
deleted file mode 100644
index ed546f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/RoleNameTypeImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-
-/**
- * @generated
- */
-public class RoleNameTypeImpl extends EObjectImpl implements RoleNameType {
-
-	/**
-	 * The default value of the '{@link #getRoleName() <em>Role Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRoleName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ROLE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String roleName = ROLE_NAME_EDEFAULT;
-	public RoleNameTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getRoleNameType();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getRoleName() {
-		return roleName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRoleName(String newRoleName) {
-		String oldRoleName = roleName;
-		roleName = newRoleName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME, oldRoleName, roleName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				return getRoleName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				return ROLE_NAME_EDEFAULT == null ? roleName != null : !ROLE_NAME_EDEFAULT.equals(roleName);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				setRoleName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME:
-				setRoleName(ROLE_NAME_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(" (roleName: ");//$NON-NLS-1$
-		result.append(roleName);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SecurityConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SecurityConstraintImpl.java
deleted file mode 100644
index e0a62ad..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SecurityConstraintImpl.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-
-
-/**
- * The security-constraint element is used to associate security constraints with one or more web resource collections
- */
-public class SecurityConstraintImpl extends EObjectImpl implements SecurityConstraint, EObject {
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList webResourceCollections = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected AuthConstraint authConstraint = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected UserDataConstraint userDataConstraint = null;
-	/**
-	 * The cached value of the '{@link #getDisplayNames() <em>Display Names</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDisplayNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList displayNames = null;
-
-	public SecurityConstraintImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getSecurityConstraint();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__CONSTRAINTS, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getWebResourceCollections() {
-		if (webResourceCollections == null) {
-			webResourceCollections = new EObjectContainmentWithInverseEList(WebResourceCollection.class, this, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT);
-		}
-		return webResourceCollections;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public AuthConstraint getAuthConstraint() {
-		return authConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAuthConstraint(AuthConstraint newAuthConstraint, NotificationChain msgs) {
-		AuthConstraint oldAuthConstraint = authConstraint;
-		authConstraint = newAuthConstraint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, oldAuthConstraint, newAuthConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setAuthConstraint(AuthConstraint newAuthConstraint) {
-		if (newAuthConstraint != authConstraint) {
-			NotificationChain msgs = null;
-			if (authConstraint != null)
-				msgs = ((InternalEObject)authConstraint).eInverseRemove(this, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, AuthConstraint.class, msgs);
-			if (newAuthConstraint != null)
-				msgs = ((InternalEObject)newAuthConstraint).eInverseAdd(this, WebapplicationPackage.AUTH_CONSTRAINT__SEC_CONSTRAINT, AuthConstraint.class, msgs);
-			msgs = basicSetAuthConstraint(newAuthConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, newAuthConstraint, newAuthConstraint));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public UserDataConstraint getUserDataConstraint() {
-		return userDataConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetUserDataConstraint(UserDataConstraint newUserDataConstraint, NotificationChain msgs) {
-		UserDataConstraint oldUserDataConstraint = userDataConstraint;
-		userDataConstraint = newUserDataConstraint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, oldUserDataConstraint, newUserDataConstraint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUserDataConstraint(UserDataConstraint newUserDataConstraint) {
-		if (newUserDataConstraint != userDataConstraint) {
-			NotificationChain msgs = null;
-			if (userDataConstraint != null)
-				msgs = ((InternalEObject)userDataConstraint).eInverseRemove(this, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, UserDataConstraint.class, msgs);
-			if (newUserDataConstraint != null)
-				msgs = ((InternalEObject)newUserDataConstraint).eInverseAdd(this, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, UserDataConstraint.class, msgs);
-			msgs = basicSetUserDataConstraint(newUserDataConstraint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, newUserDataConstraint, newUserDataConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDisplayNames() {
-		if (displayNames == null) {
-			displayNames = new EObjectContainmentEList(DisplayName.class, this, WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES);
-		}
-		return displayNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP, msgs);
-				case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-					return ((InternalEList)getWebResourceCollections()).basicAdd(otherEnd, msgs);
-				case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-					if (authConstraint != null)
-						msgs = ((InternalEObject)authConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT, null, msgs);
-					return basicSetAuthConstraint((AuthConstraint)otherEnd, msgs);
-				case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-					if (userDataConstraint != null)
-						msgs = ((InternalEObject)userDataConstraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, null, msgs);
-					return basicSetUserDataConstraint((UserDataConstraint)otherEnd, msgs);
-				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 WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP, msgs);
-				case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-					return ((InternalEList)getWebResourceCollections()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-					return basicSetAuthConstraint(null, msgs);
-				case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-					return basicSetUserDataConstraint(null, msgs);
-				case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				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 WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__CONSTRAINTS, WebApp.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 WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				return getDisplayName();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return getWebResourceCollections();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return getAuthConstraint();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return getUserDataConstraint();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return getDisplayNames();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				return webResourceCollections != null && !webResourceCollections.isEmpty();
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				return authConstraint != null;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				return userDataConstraint != null;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-		}
-		return 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(" (displayName: ");//$NON-NLS-1$
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				getWebResourceCollections().clear();
-				getWebResourceCollections().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				setAuthConstraint((AuthConstraint)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				setUserDataConstraint((UserDataConstraint)newValue);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS:
-				getWebResourceCollections().clear();
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT:
-				setAuthConstraint((AuthConstraint)null);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT:
-				setUserDataConstraint((UserDataConstraint)null);
-				return;
-			case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletImpl.java
deleted file mode 100644
index b52a1b3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletImpl.java
+++ /dev/null
@@ -1,699 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Vector;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-
-
-/**
- * The servlet element contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup element is present, then the JSP should be precompiled and loaded.
- */
-public class ServletImpl extends CompatibilityDescriptionGroupImpl implements Servlet {
-
-	/**
-	 * The default value of the '{@link #getServletName() <em>Servlet Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServletName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVLET_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String servletName = SERVLET_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getLoadOnStartup() <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLoadOnStartup()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Integer LOAD_ON_STARTUP_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Integer loadOnStartup = LOAD_ON_STARTUP_EDEFAULT;
-	/**
-	 * This is true if the Load On Startup attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean loadOnStartupESet = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected WebType webType = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList params = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoleRefs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected RunAsSpecifiedIdentity runAs = null;
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParams = null;
-
-	public ServletImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getServlet();
-	}
-
-/**
- * Returns an unmodifiable list of the mappings that this
- * servlet participates in.  Since servletMappings is not
- * a bi-directional attribute, if you want to add or delete a
- * mapping, this must be done in the web-app.
- * @return java.util.List
- */
-public List getMappings() {
-	WebApp webApp = (WebApp) eContainer();
-	if (webApp == null) return new BasicEList(0);
-	
-	EList allMappings = webApp.getServletMappings();
-	Iterator i = allMappings.iterator();
-	List mappings = new Vector();
-	while (i.hasNext()) {
-		ServletMapping mapping = (ServletMapping) i.next();
-		if (mapping.getServlet() == this)
-			mappings.add(mapping);
-	}
-	return mappings;
-}
-/**
- * getParamsAsProperties method comment.
- */
-public Properties getParamsAsProperties() {
-	Properties props = new Properties();
-	List lparams = getParams();
-	InitParam param;
-	for (int i = 0; i < lparams.size(); i++) {
-		param = (InitParam) lparams.get(i);
-		props.setProperty(param.getParamName(), param.getParamValue());
-	}
-	return props;
-}
-/**
- * @see Servlet
- */
-public void reSyncSecurityRoleRef(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	List roleRefs = getSecurityRoleRefs();
-	for (int i = 0; i < roleRefs.size(); i++) {
-		SecurityRoleRef roleRef = (SecurityRoleRef) roleRefs.get(i);
-		if (roleRef.getLink() != null && roleRef.getLink().equals(existingRoleName))
-			roleRef.setLink(newRoleName);
-	}
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The servlet-name element contains the canonical name of the servlet.
-	 */
-	public String getServletName() {
-		return servletName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setServletName(String newServletName) {
-		String oldServletName = servletName;
-		servletName = newServletName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__SERVLET_NAME, oldServletName, servletName));
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The load-on-startup element indicates that this servlet should be loaded on the startup of the web application. The optional contents of these element must be a positive integer indicating the order in which the servlet should be loaded. Lower integers are loaded before higher integers. If no value is specified, or if the value specified is not a positive integer, the container is free to load it at any time in the startup sequence.
-
-	 */
-	public Integer getLoadOnStartup() {
-		return loadOnStartup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLoadOnStartup(Integer newLoadOnStartup) {
-		Integer oldLoadOnStartup = loadOnStartup;
-		loadOnStartup = newLoadOnStartup;
-		boolean oldLoadOnStartupESet = loadOnStartupESet;
-		loadOnStartupESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__LOAD_ON_STARTUP, oldLoadOnStartup, loadOnStartup, !oldLoadOnStartupESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetLoadOnStartup() {
-		Integer oldLoadOnStartup = loadOnStartup;
-		boolean oldLoadOnStartupESet = loadOnStartupESet;
-		loadOnStartup = LOAD_ON_STARTUP_EDEFAULT;
-		loadOnStartupESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.SERVLET__LOAD_ON_STARTUP, oldLoadOnStartup, LOAD_ON_STARTUP_EDEFAULT, oldLoadOnStartupESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetLoadOnStartup() {
-		return loadOnStartupESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SERVLET__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.SERVLET__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__SERVLETS, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SERVLET__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebType getWebType() {
-		return webType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetWebType(WebType newWebType, NotificationChain msgs) {
-		WebType oldWebType = webType;
-		webType = newWebType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__WEB_TYPE, oldWebType, newWebType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebType(WebType newWebType) {
-		if (newWebType != webType) {
-			NotificationChain msgs = null;
-			if (webType != null)
-				msgs = ((InternalEObject)webType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__WEB_TYPE, null, msgs);
-			if (newWebType != null)
-				msgs = ((InternalEObject)newWebType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__WEB_TYPE, null, msgs);
-			msgs = basicSetWebType(newWebType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__WEB_TYPE, newWebType, newWebType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * getParams() is used for J2EE1.4
-	 * <!-- end-user-doc -->
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getParams() {
-		if (params == null) {
-			params = new EObjectContainmentEList(InitParam.class, this, WebapplicationPackage.SERVLET__PARAMS);
-		}
-		return params;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoleRefs() {
-		if (securityRoleRefs == null) {
-			securityRoleRefs = new EObjectContainmentEList(SecurityRoleRef.class, this, WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS);
-		}
-		return securityRoleRefs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * If defined for a servlet, overrides the security identity used to call an EJB by that servlet in this web application. The role-name is one of the security roles already defined for this web application.
-	 */
-	public RunAsSpecifiedIdentity getRunAs() {
-		return runAs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRunAs(RunAsSpecifiedIdentity newRunAs, NotificationChain msgs) {
-		RunAsSpecifiedIdentity oldRunAs = runAs;
-		runAs = newRunAs;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__RUN_AS, oldRunAs, newRunAs);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setRunAs(RunAsSpecifiedIdentity newRunAs) {
-		if (newRunAs != runAs) {
-			NotificationChain msgs = null;
-			if (runAs != null)
-				msgs = ((InternalEObject)runAs).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__RUN_AS, null, msgs);
-			if (newRunAs != null)
-				msgs = ((InternalEObject)newRunAs).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.SERVLET__RUN_AS, null, msgs);
-			msgs = basicSetRunAs(newRunAs, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET__RUN_AS, newRunAs, newRunAs));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * getInitParams() is used for J2EE1.3
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(ParamValue.class, this, WebapplicationPackage.SERVLET__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.SERVLET__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.SERVLET__WEB_APP, 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 WebapplicationPackage.SERVLET__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.SERVLET__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.SERVLET__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.SERVLET__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.SERVLET__WEB_APP, msgs);
-				case WebapplicationPackage.SERVLET__WEB_TYPE:
-					return basicSetWebType(null, msgs);
-				case WebapplicationPackage.SERVLET__PARAMS:
-					return ((InternalEList)getParams()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-					return ((InternalEList)getSecurityRoleRefs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.SERVLET__RUN_AS:
-					return basicSetRunAs(null, msgs);
-				case WebapplicationPackage.SERVLET__INIT_PARAMS:
-					return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-				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 WebapplicationPackage.SERVLET__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__SERVLETS, WebApp.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 WebapplicationPackage.SERVLET__ICONS:
-				return getIcons();
-			case WebapplicationPackage.SERVLET__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WebapplicationPackage.SERVLET__DESCRIPTIONS:
-				return getDescriptions();
-			case WebapplicationPackage.SERVLET__SMALL_ICON:
-				return getSmallIcon();
-			case WebapplicationPackage.SERVLET__LARGE_ICON:
-				return getLargeIcon();
-			case WebapplicationPackage.SERVLET__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.SERVLET__DISPLAY_NAME:
-				return getDisplayName();
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				return getServletName();
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				return getLoadOnStartup();
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				return getWebType();
-			case WebapplicationPackage.SERVLET__PARAMS:
-				return getParams();
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				return getSecurityRoleRefs();
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				return getRunAs();
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				return getInitParams();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET__ICONS:
-				return icons != null && !icons.isEmpty();
-			case WebapplicationPackage.SERVLET__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WebapplicationPackage.SERVLET__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebapplicationPackage.SERVLET__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WebapplicationPackage.SERVLET__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WebapplicationPackage.SERVLET__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.SERVLET__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				return SERVLET_NAME_EDEFAULT == null ? servletName != null : !SERVLET_NAME_EDEFAULT.equals(servletName);
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				return isSetLoadOnStartup();
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				return webType != null;
-			case WebapplicationPackage.SERVLET__PARAMS:
-				return params != null && !params.isEmpty();
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				return securityRoleRefs != null && !securityRoleRefs.isEmpty();
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				return runAs != null;
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				setServletName((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				setLoadOnStartup((Integer)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				setWebType((WebType)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__PARAMS:
-				getParams().clear();
-				getParams().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				getSecurityRoleRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				setRunAs((RunAsSpecifiedIdentity)newValue);
-				return;
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET__ICONS:
-				getIcons().clear();
-				return;
-			case WebapplicationPackage.SERVLET__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WebapplicationPackage.SERVLET__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebapplicationPackage.SERVLET__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET__SERVLET_NAME:
-				setServletName(SERVLET_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP:
-				unsetLoadOnStartup();
-				return;
-			case WebapplicationPackage.SERVLET__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.SERVLET__WEB_TYPE:
-				setWebType((WebType)null);
-				return;
-			case WebapplicationPackage.SERVLET__PARAMS:
-				getParams().clear();
-				return;
-			case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS:
-				getSecurityRoleRefs().clear();
-				return;
-			case WebapplicationPackage.SERVLET__RUN_AS:
-				setRunAs((RunAsSpecifiedIdentity)null);
-				return;
-			case WebapplicationPackage.SERVLET__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-		}
-		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(" (servletName: ");//$NON-NLS-1$
-		result.append(servletName);
-		result.append(", loadOnStartup: ");//$NON-NLS-1$
-		if (loadOnStartupESet) result.append(loadOnStartup); else result.append("<unset>");//$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-	/** 
-	 * return the java servlet class for this servlet
-	 */
-	public JavaClass getServletClass() {
-		JavaClass javaClass = null;
-		String javaClassName = null;
-		// Handle servlet case
-		if (getWebType().isServletType())
-			javaClassName = ((ServletType)getWebType()).getClassName();
-		//Handle the JSP case
-		else {
-			String relPath = ((JSPType)getWebType()).getJspFile();
-			URI webAppURI = getWebApp().eResource().getURI();
-			javaClassName = webAppURI.segment(1)+"/"+webAppURI.segment(2)+relPath;//$NON-NLS-1$
-		}
-		javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(javaClassName,this);
-		return javaClass;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletMappingImpl.java
deleted file mode 100644
index 19257b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletMappingImpl.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * The servlet-mapping element defines a mapping between a servlet and a url pattern
- */
-public class ServletMappingImpl extends EObjectImpl implements ServletMapping, EObject {
-
-	/**
-	 * The default value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URL_PATTERN_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String urlPattern = URL_PATTERN_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected Servlet servlet = null;
-	public ServletMappingImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getServletMapping();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	public String getUrlPattern() {
-		return urlPattern;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUrlPattern(String newUrlPattern) {
-		String oldUrlPattern = urlPattern;
-		urlPattern = newUrlPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN, oldUrlPattern, urlPattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__NAME, oldName, name));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SERVLET_MAPPING__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.SERVLET_MAPPING__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SERVLET_MAPPING__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public Servlet getServlet() {
-		if (servlet != null && servlet.eIsProxy()) {
-			Servlet oldServlet = servlet;
-			servlet = (Servlet)eResolveProxy((InternalEObject)servlet);
-			if (servlet != oldServlet) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, WebapplicationPackage.SERVLET_MAPPING__SERVLET, oldServlet, servlet));
-			}
-		}
-		return servlet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Servlet basicGetServlet() {
-		return servlet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setServlet(Servlet newServlet) {
-		Servlet oldServlet = servlet;
-		servlet = newServlet;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_MAPPING__SERVLET, oldServlet, servlet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.SERVLET_MAPPING__WEB_APP, 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 WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.SERVLET_MAPPING__WEB_APP, 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 WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS, WebApp.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 WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				return getName();
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				if (resolve) return getServlet();
-				return basicGetServlet();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				return URL_PATTERN_EDEFAULT == null ? urlPattern != null : !URL_PATTERN_EDEFAULT.equals(urlPattern);
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				return servlet != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				setUrlPattern((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				setName((String)newValue);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				setServlet((Servlet)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN:
-				setUrlPattern(URL_PATTERN_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.SERVLET_MAPPING__SERVLET:
-				setServlet((Servlet)null);
-				return;
-		}
-		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(" (urlPattern: ");//$NON-NLS-1$
-		result.append(urlPattern);
-		result.append(", name: ");//$NON-NLS-1$
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletTypeImpl.java
deleted file mode 100644
index abe0f65..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/ServletTypeImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-
-
-/**
- * @generated
- */
-public class ServletTypeImpl extends WebTypeImpl implements ServletType {
-
-	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-	public ServletTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getServletType();
-	}
-
-public boolean isServletType() {
-	return true;
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setClassName(String newClassName) {
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SERVLET_TYPE__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				return getClassName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME:
-				setClassName(CLASS_NAME_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(" (className: ");//$NON-NLS-1$
-		result.append(className);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SessionConfigImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SessionConfigImpl.java
deleted file mode 100644
index bb53d98..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/SessionConfigImpl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * The session-config element defines the session parameters for this web application.
- */
-public class SessionConfigImpl extends EObjectImpl implements SessionConfig, EObject {
-
-	/**
-	 * The default value of the '{@link #getSessionTimeout() <em>Session Timeout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSessionTimeout()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int SESSION_TIMEOUT_EDEFAULT = 0;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected int sessionTimeout = SESSION_TIMEOUT_EDEFAULT;
-	/**
-	 * This is true if the Session Timeout attribute has been set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  protected boolean sessionTimeoutESet = false;
-
-	public SessionConfigImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getSessionConfig();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The session-timeout element defines the default session timeout interval for
-	 * all sessions created in this web application. The specified timeout must be
-	 * expressed in a whole number of minutes.
-	 */
-	public int getSessionTimeout() {
-		return sessionTimeout;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSessionTimeout(int newSessionTimeout) {
-		int oldSessionTimeout = sessionTimeout;
-		sessionTimeout = newSessionTimeout;
-		boolean oldSessionTimeoutESet = sessionTimeoutESet;
-		sessionTimeoutESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT, oldSessionTimeout, sessionTimeout, !oldSessionTimeoutESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void unsetSessionTimeout() {
-		int oldSessionTimeout = sessionTimeout;
-		boolean oldSessionTimeoutESet = sessionTimeoutESet;
-		sessionTimeout = SESSION_TIMEOUT_EDEFAULT;
-		sessionTimeoutESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT, oldSessionTimeout, SESSION_TIMEOUT_EDEFAULT, oldSessionTimeoutESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean isSetSessionTimeout() {
-		return sessionTimeoutESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.SESSION_CONFIG__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.SESSION_CONFIG__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__SESSION_CONFIG, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.SESSION_CONFIG__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.SESSION_CONFIG__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.SESSION_CONFIG__WEB_APP, 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 WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.SESSION_CONFIG__WEB_APP, 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 WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__SESSION_CONFIG, WebApp.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 WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				return new Integer(getSessionTimeout());
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				return getWebApp();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				return isSetSessionTimeout();
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				return getWebApp() != 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 WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				setSessionTimeout(((Integer)newValue).intValue());
-				return;
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT:
-				unsetSessionTimeout();
-				return;
-			case WebapplicationPackage.SESSION_CONFIG__WEB_APP:
-				setWebApp((WebApp)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(" (sessionTimeout: ");//$NON-NLS-1$
-		if (sessionTimeoutESet) result.append(sessionTimeout); else result.append("<unset>");//$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/TagLibRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/TagLibRefImpl.java
deleted file mode 100644
index c347b46..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/TagLibRefImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * The taglib element is used to describe a JSP tag library.
- */
-public class TagLibRefImpl extends EObjectImpl implements TagLibRef, EObject{
-
-	/**
-	 * The default value of the '{@link #getTaglibURI() <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_URI_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String taglibURI = TAGLIB_URI_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getTaglibLocation() <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTaglibLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TAGLIB_LOCATION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String taglibLocation = TAGLIB_LOCATION_EDEFAULT;
-	public TagLibRefImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getTagLibRef();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The taglib-uri element describes a URI, relative to the location of the web.xml 
-	 * document, identifying a Tag Library used in the Web Application.
-	 */
-	public String getTaglibURI() {
-		return taglibURI;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTaglibURI(String newTaglibURI) {
-		String oldTaglibURI = taglibURI;
-		taglibURI = newTaglibURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI, oldTaglibURI, taglibURI));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The taglib-location element contains the location (as a resource relative to
-	 * the root of the web application) where to find the Tag Libary Description file
-	 * for the tag library.
-	 */
-	public String getTaglibLocation() {
-		return taglibLocation;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setTaglibLocation(String newTaglibLocation) {
-		String oldTaglibLocation = taglibLocation;
-		taglibLocation = newTaglibLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION, oldTaglibLocation, taglibLocation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.TAG_LIB_REF__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.TAG_LIB_REF__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__TAG_LIBS, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.TAG_LIB_REF__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.TAG_LIB_REF__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.TAG_LIB_REF__WEB_APP, 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 WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.TAG_LIB_REF__WEB_APP, 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 WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__TAG_LIBS, WebApp.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 WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				return getTaglibURI();
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				return getTaglibLocation();
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				return getWebApp();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				return TAGLIB_URI_EDEFAULT == null ? taglibURI != null : !TAGLIB_URI_EDEFAULT.equals(taglibURI);
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				return TAGLIB_LOCATION_EDEFAULT == null ? taglibLocation != null : !TAGLIB_LOCATION_EDEFAULT.equals(taglibLocation);
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				return getWebApp() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				setTaglibURI((String)newValue);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				setTaglibLocation((String)newValue);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI:
-				setTaglibURI(TAGLIB_URI_EDEFAULT);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION:
-				setTaglibLocation(TAGLIB_LOCATION_EDEFAULT);
-				return;
-			case WebapplicationPackage.TAG_LIB_REF__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-		}
-		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(" (taglibURI: ");//$NON-NLS-1$
-		result.append(taglibURI);
-		result.append(", taglibLocation: ");//$NON-NLS-1$
-		result.append(taglibLocation);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/URLPatternTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/URLPatternTypeImpl.java
deleted file mode 100644
index 3c10c7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/URLPatternTypeImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.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.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-
-/**
- * @generated
- */
-public class URLPatternTypeImpl extends EObjectImpl implements URLPatternType {
-
-	/**
-	 * The default value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URL_PATTERN_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String urlPattern = URL_PATTERN_EDEFAULT;
-	public URLPatternTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getURLPatternType();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getUrlPattern() {
-		return urlPattern;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setUrlPattern(String newUrlPattern) {
-		String oldUrlPattern = urlPattern;
-		urlPattern = newUrlPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN, oldUrlPattern, urlPattern));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebResourceCollection getResCollection() {
-		if (eContainerFeatureID != WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION) return null;
-		return (WebResourceCollection)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setResCollection(WebResourceCollection newResCollection) {
-		if (newResCollection != eContainer || (eContainerFeatureID != WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION && newResCollection != null)) {
-			if (EcoreUtil.isAncestor(this, newResCollection))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newResCollection != null)
-				msgs = ((InternalEObject)newResCollection).eInverseAdd(this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS, WebResourceCollection.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newResCollection, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION, newResCollection, newResCollection));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION, 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 WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-					return eBasicSetContainer(null, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION, 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 WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS, WebResourceCollection.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 WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				return getResCollection();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				return URL_PATTERN_EDEFAULT == null ? urlPattern != null : !URL_PATTERN_EDEFAULT.equals(urlPattern);
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				return getResCollection() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				setUrlPattern((String)newValue);
-				return;
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				setResCollection((WebResourceCollection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN:
-				setUrlPattern(URL_PATTERN_EDEFAULT);
-				return;
-			case WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION:
-				setResCollection((WebResourceCollection)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(" (urlPattern: ");//$NON-NLS-1$
-		result.append(urlPattern);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/UserDataConstraintImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/UserDataConstraintImpl.java
deleted file mode 100644
index f1cc24a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/UserDataConstraintImpl.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.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.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-
-
-/**
- * The user-data-constraint element is used to indicate how data communicated between the client and container should be protected
- */
-public class UserDataConstraintImpl extends EObjectImpl implements UserDataConstraint, EObject {
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getTransportGuarantee() <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTransportGuarantee()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TransportGuaranteeType TRANSPORT_GUARANTEE_EDEFAULT = TransportGuaranteeType.NONE_LITERAL;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected TransportGuaranteeType transportGuarantee = TRANSPORT_GUARANTEE_EDEFAULT;
-	/**
-	 * This is true if the Transport Guarantee attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean transportGuaranteeESet = false;
-
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	public UserDataConstraintImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getUserDataConstraint();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * A description for the user data constraint.
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The transport-guarantee element specifies that the communication between client 
-	 * and server should be NONE, INTEGRAL, or CONFIDENTIAL. NONE means that the
-	 * application does not require any
-	 * transport guarantees. A value of INTEGRAL means that the application requires
-	 * that the data sent between the client and server be sent in such a way that it
-	 * can't be changed in transit. CONFIDENTIAL means that the application requires
-	 * that the data be transmitted in a fashion that prevents other entities from
-	 * observing the contents of the transmission. In most cases, the presence of the
-	 * INTEGRAL or CONFIDENTIAL flag will indicate that the use of SSL is required.
-	 */
-	public TransportGuaranteeType getTransportGuarantee() {
-		return transportGuarantee;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTransportGuarantee(TransportGuaranteeType newTransportGuarantee) {
-		TransportGuaranteeType oldTransportGuarantee = transportGuarantee;
-		transportGuarantee = newTransportGuarantee == null ? TRANSPORT_GUARANTEE_EDEFAULT : newTransportGuarantee;
-		boolean oldTransportGuaranteeESet = transportGuaranteeESet;
-		transportGuaranteeESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE, oldTransportGuarantee, transportGuarantee, !oldTransportGuaranteeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetTransportGuarantee() {
-		TransportGuaranteeType oldTransportGuarantee = transportGuarantee;
-		boolean oldTransportGuaranteeESet = transportGuaranteeESet;
-		transportGuarantee = TRANSPORT_GUARANTEE_EDEFAULT;
-		transportGuaranteeESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE, oldTransportGuarantee, TRANSPORT_GUARANTEE_EDEFAULT, oldTransportGuaranteeESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetTransportGuarantee() {
-		return transportGuaranteeESet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SecurityConstraint getSecConstraint() {
-		if (eContainerFeatureID != WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT) return null;
-		return (SecurityConstraint)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecConstraint(SecurityConstraint newSecConstraint) {
-		if (newSecConstraint != eContainer || (eContainerFeatureID != WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT && newSecConstraint != null)) {
-			if (EcoreUtil.isAncestor(this, newSecConstraint))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSecConstraint != null)
-				msgs = ((InternalEObject)newSecConstraint).eInverseAdd(this, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, SecurityConstraint.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newSecConstraint, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, newSecConstraint, newSecConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, 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 WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-					return eBasicSetContainer(null, WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT, msgs);
-				case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).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 WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT, SecurityConstraint.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 WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				return getTransportGuarantee();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return getDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				return isSetTransportGuarantee();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				return getSecConstraint() != null;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				setTransportGuarantee((TransportGuaranteeType)newValue);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)newValue);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE:
-				unsetTransportGuarantee();
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)null);
-				return;
-			case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-		}
-		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(" (description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", transportGuarantee: ");//$NON-NLS-1$
-		if (transportGuaranteeESet) result.append(transportGuarantee); else result.append("<unset>");//$NON-NLS-1$
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppImpl.java
deleted file mode 100644
index 03917e6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppImpl.java
+++ /dev/null
@@ -1,1399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.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.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.common.impl.JNDIEnvRefsGroupImpl;
-import org.eclipse.jst.j2ee.internal.common.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-/**
- * The web-app element is the root of the deployment descriptor for
- * a web application.
- */
-public class WebAppImpl extends JNDIEnvRefsGroupImpl implements WebApp {
-
-	/**
-	 * The default value of the '{@link #isDistributable() <em>Distributable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDistributable()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DISTRIBUTABLE_EDEFAULT = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected boolean distributable = DISTRIBUTABLE_EDEFAULT;
-	/**
-	 * This is true if the Distributable attribute has been set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean distributableESet = false;
-
-	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VERSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
-	protected String version = VERSION_EDEFAULT;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList contexts = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList errorPages = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected WelcomeFileList fileList = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList tagLibs = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList constraints = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected LoginConfig loginConfig = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList mimeMappings = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected SessionConfig sessionConfig = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList servletMappings = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList servlets = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList securityRoles = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList filters = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList filterMappings = null;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList listeners = null;
-	/**
-	 * The cached value of the '{@link #getContextParams() <em>Context Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList contextParams = null;
-
-	/**
-	 * The cached value of the '{@link #getJspConfig() <em>Jsp Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJspConfig()
-	 * @generated
-	 * @ordered
-	 */
-	protected JSPConfig jspConfig = null;
-
-	/**
-	 * The cached value of the '{@link #getMessageDestinations() <em>Message Destinations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessageDestinations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList messageDestinations = null;
-
-	/**
-	 * The cached value of the '{@link #getLocalEncodingMappingList() <em>Local Encoding Mapping List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocalEncodingMappingList()
-	 * @generated
-	 * @ordered
-	 */
-	protected LocalEncodingMappingList localEncodingMappingList = null;
-
-	public WebAppImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getWebApp();
-	}
-
-/**
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp
- */
-public boolean containsSecurityRole(java.lang.String name) {
-	return getSecurityRoleNamed(name) != null;
-}
-public ErrorPage getErrorPageByCode(Integer code) {
-	List lerrorPages = getErrorPages();
-	String codeString = code.toString();
-	Iterator ie = lerrorPages.iterator();
-	while (ie.hasNext()) {
-		ErrorPage ep = (ErrorPage) ie.next();
-		if (ep.isErrorCode()) {
-			ErrorCodeErrorPage ecep = (ErrorCodeErrorPage) ep;
-			if (codeString.equals(ecep.getErrorCode()))
-				return ecep;
-		}
-	}
-	return null;
-}
-public ErrorPage getErrorPageByExceptionType(String exceptionType) {
-	if (exceptionType != null) {
-		List lerrorPages = getErrorPages();
-		Iterator ie = lerrorPages.iterator();
-		while (ie.hasNext()) {
-			ErrorPage ep = (ErrorPage) ie.next();
-			if (ep.isExceptionType()) {
-				ExceptionTypeErrorPage etep = (ExceptionTypeErrorPage) ep;
-				if (exceptionType.equals(etep.getExceptionTypeName()))
-					return etep;
-			}
-		}
-	}
-	return null;
-}
-/**
- * Finds a filter mapping for a specified filter.
- * @param filter The filter to find the mapping for.
- * @return The first filter mapping found for the specified filter, or null if no
- * mapping exists for the filter.
- */
-public FilterMapping getFilterMapping(
-	Filter aFilter) {
-	if (aFilter != null) {
-		List mappings = getFilterMappings();
-		FilterMapping mapping;
-		for (int i = 0; i < mappings.size(); i++) {
-			mapping = (FilterMapping) mappings.get(i);
-			if (aFilter.equals(mapping.getFilter())) 
-				return mapping;
-		}
-	}
-	return null;
-}
-/**
- * getFilterNamed method comment.
- */
-public Filter getFilterNamed(java.lang.String name) {
-	List lfilters = getFilters();
-	if (lfilters == null || lfilters.size() == 0) {
-		return null;
-	}
-	Filter next;
-	for (int i = 0; i < lfilters.size(); i++) {
-		next = (Filter) lfilters.get(i);
-		if (next.getName().equals(name)) {
-			return next;
-		}
-	}
-	return null;
-}
-public List getFilterNames() {
-	List names, lfilters = getFilters();
-	names = new ArrayList(lfilters.size());
-	Filter next;
-	for (int i = 0; i < lfilters.size(); i++) {
-		next = (Filter) lfilters.get(i);
-		names.add(next.getName());
-	}
-	return names;
-}
-/**
- * Returns the mime type for the specified extension
- * @param An extension to find the mime type for.
- */
-public java.lang.String getMimeType(java.lang.String extension) {
-	if (extension != null) {
-		List mappings = getMimeMappings();
-		MimeMapping mapping;
-		for (int i = 0; i < mappings.size(); i++) {
-			mapping = (MimeMapping) mappings.get(i);
-			if (extension.equals(mapping.getExtension()))
-				return mapping.getMimeType();
-		}
-	}
-	return null;
-}
-public SecurityRole getSecurityRoleNamed(String roleName) {
-	java.util.List tempRoles = getSecurityRoles();
-	SecurityRole role;
-	for (int i = 0; i < tempRoles.size(); i++) {
-		role = (SecurityRole) tempRoles.get(i);
-		if (role.getRoleName().equals(roleName))
-			return role;
-	}
-	return null;
-}
-/**
- * Finds a servlet mapping for a specified servlet.
- * @param servlet The servlet to find the mappings for.
- * @return The servlet mapping for the specified servlet, or null if no
- * mapping exists for the servlet.
- */
-public ServletMapping getServletMapping(
-	Servlet aServlet) {
-	if (aServlet != null) {
-		List mappings = getServletMappings();
-		ServletMapping mapping;
-		for (int i = 0; i < mappings.size(); i++) {
-			mapping = (ServletMapping) mappings.get(i);
-			if (aServlet.equals(mapping.getServlet())) 
-				return mapping;
-		}
-	}
-	return null;
-}
-/**
- * getServletNamed method comment.
- */
-public Servlet getServletNamed(java.lang.String name) {
-	List lservlets = getServlets();
-	if (lservlets == null || lservlets.size() == 0) {
-		return null;
-	}
-	Servlet next;
-	String nextName;
-	for (int i = 0; i < lservlets.size(); i++) {
-		next = (Servlet) lservlets.get(i);
-		nextName = next.getServletName();
-		if (nextName != null && nextName.equals(name)) {
-			return next;
-		}
-	}
-	return null;
-}
-public List getServletNames() {
-	List names, lservlets = getServlets();
-	names = new ArrayList(lservlets.size());
-	Servlet next;
-	for (int i = 0; i < lservlets.size(); i++) {
-		next = (Servlet) lservlets.get(i);
-		names.add(next.getServletName());
-	}
-	return names;
-}
-/**
- * Return boolean indicating if this Web App was populated from an Servlet2.2 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_2Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.WEBAPP_SYSTEMID_2_2);
-}
-/**
- * Return boolean indicating if this Web App was populated from an Servlet2.3 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_3Descriptor() {
-	CommonUtil.checkDDObjectForVersion(this);
-	String systemId = ((XMLResource)eResource()).getSystemId();
-	return systemId == null ? false : systemId.equals(J2EEConstants.WEBAPP_SYSTEMID_2_3);
-}
-/**
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp
- */
-public void renameSecurityRole(java.lang.String existingRoleName, java.lang.String newRoleName) {
-	SecurityRole role = getSecurityRoleNamed(existingRoleName);
-	if (role != null)
-		role.setRoleName(newRoleName);
-	List theServlets = getServlets();
-	for (int i = 0; i < theServlets.size(); i++){
-		Servlet servlet = (Servlet)theServlets.get(i);
-		servlet.reSyncSecurityRoleRef(existingRoleName, newRoleName);
-	}
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The distributable element, by its presence in a web application deployment
-	 * descriptor, indicates that this web application is programmed appropriately to
-	 * be deployed into a distributed servlet container
-	 */
-	public boolean isDistributable() {
-		return distributable;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDistributable(boolean newDistributable) {
-		boolean oldDistributable = distributable;
-		distributable = newDistributable;
-		boolean oldDistributableESet = distributableESet;
-		distributableESet = true;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__DISTRIBUTABLE, oldDistributable, distributable, !oldDistributableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void unsetDistributable() {
-		boolean oldDistributable = distributable;
-		boolean oldDistributableESet = distributableESet;
-		distributable = DISTRIBUTABLE_EDEFAULT;
-		distributableESet = false;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET, WebapplicationPackage.WEB_APP__DISTRIBUTABLE, oldDistributable, DISTRIBUTABLE_EDEFAULT, oldDistributableESet));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isSetDistributable() {
-		return distributableESet;
-	}
-
-	/**
-	 *
-	 */
-	public void setDisplayName(String newDisplayName) {
-		super.setDisplayName(newDisplayName);
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__VERSION, oldVersion, version));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getContexts() {
-		if (contexts == null) {
-			contexts = new EObjectContainmentWithInverseEList(ContextParam.class, this, WebapplicationPackage.WEB_APP__CONTEXTS, WebapplicationPackage.CONTEXT_PARAM__WEB_APP);
-		}
-		return contexts;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getErrorPages() {
-		if (errorPages == null) {
-			errorPages = new EObjectContainmentWithInverseEList(ErrorPage.class, this, WebapplicationPackage.WEB_APP__ERROR_PAGES, WebapplicationPackage.ERROR_PAGE__WEB_APP);
-		}
-		return errorPages;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WelcomeFileList getFileList() {
-		return fileList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFileList(WelcomeFileList newFileList, NotificationChain msgs) {
-		WelcomeFileList oldFileList = fileList;
-		fileList = newFileList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__FILE_LIST, oldFileList, newFileList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFileList(WelcomeFileList newFileList) {
-		if (newFileList != fileList) {
-			NotificationChain msgs = null;
-			if (fileList != null)
-				msgs = ((InternalEObject)fileList).eInverseRemove(this, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, WelcomeFileList.class, msgs);
-			if (newFileList != null)
-				msgs = ((InternalEObject)newFileList).eInverseAdd(this, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, WelcomeFileList.class, msgs);
-			msgs = basicSetFileList(newFileList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__FILE_LIST, newFileList, newFileList));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getTagLibs() {
-		if (tagLibs == null) {
-			tagLibs = new EObjectContainmentWithInverseEList(TagLibRef.class, this, WebapplicationPackage.WEB_APP__TAG_LIBS, WebapplicationPackage.TAG_LIB_REF__WEB_APP);
-		}
-		return tagLibs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getConstraints() {
-		if (constraints == null) {
-			constraints = new EObjectContainmentWithInverseEList(SecurityConstraint.class, this, WebapplicationPackage.WEB_APP__CONSTRAINTS, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_APP);
-		}
-		return constraints;
-	}
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	*/
-	
-	public int getVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) {
-			// fix defect 3276, when resource is unloaded
-			if (version == null) 
-				throw new IllegalStateException();
-			
-				if (version.equals("2.4"))//$NON-NLS-1$
-					return J2EEVersionConstants.WEB_2_4_ID;
-				if (version.equals("2.3"))//$NON-NLS-1$
-					return J2EEVersionConstants.WEB_2_3_ID;
-				if (version.equals("2.2"))//$NON-NLS-1$
-					return J2EEVersionConstants.WEB_2_2_ID;
-			
-		}
-		return res.getModuleVersionID();
-	}
-
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException {
-		J2EEVersionResource res = (J2EEVersionResource) eResource();
-		if (res == null) throw new IllegalStateException();
-		return res.getJ2EEVersionID();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public LoginConfig getLoginConfig() {
-		return loginConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLoginConfig(LoginConfig newLoginConfig, NotificationChain msgs) {
-		LoginConfig oldLoginConfig = loginConfig;
-		loginConfig = newLoginConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, oldLoginConfig, newLoginConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setLoginConfig(LoginConfig newLoginConfig) {
-		if (newLoginConfig != loginConfig) {
-			NotificationChain msgs = null;
-			if (loginConfig != null)
-				msgs = ((InternalEObject)loginConfig).eInverseRemove(this, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, LoginConfig.class, msgs);
-			if (newLoginConfig != null)
-				msgs = ((InternalEObject)newLoginConfig).eInverseAdd(this, WebapplicationPackage.LOGIN_CONFIG__WEB_APP, LoginConfig.class, msgs);
-			msgs = basicSetLoginConfig(newLoginConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOGIN_CONFIG, newLoginConfig, newLoginConfig));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getMimeMappings() {
-		if (mimeMappings == null) {
-			mimeMappings = new EObjectContainmentWithInverseEList(MimeMapping.class, this, WebapplicationPackage.WEB_APP__MIME_MAPPINGS, WebapplicationPackage.MIME_MAPPING__WEB_APP);
-		}
-		return mimeMappings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SessionConfig getSessionConfig() {
-		return sessionConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSessionConfig(SessionConfig newSessionConfig, NotificationChain msgs) {
-		SessionConfig oldSessionConfig = sessionConfig;
-		sessionConfig = newSessionConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__SESSION_CONFIG, oldSessionConfig, newSessionConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSessionConfig(SessionConfig newSessionConfig) {
-		if (newSessionConfig != sessionConfig) {
-			NotificationChain msgs = null;
-			if (sessionConfig != null)
-				msgs = ((InternalEObject)sessionConfig).eInverseRemove(this, WebapplicationPackage.SESSION_CONFIG__WEB_APP, SessionConfig.class, msgs);
-			if (newSessionConfig != null)
-				msgs = ((InternalEObject)newSessionConfig).eInverseAdd(this, WebapplicationPackage.SESSION_CONFIG__WEB_APP, SessionConfig.class, msgs);
-			msgs = basicSetSessionConfig(newSessionConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__SESSION_CONFIG, newSessionConfig, newSessionConfig));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getServletMappings() {
-		if (servletMappings == null) {
-			servletMappings = new EObjectContainmentWithInverseEList(ServletMapping.class, this, WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS, WebapplicationPackage.SERVLET_MAPPING__WEB_APP);
-		}
-		return servletMappings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getServlets() {
-		if (servlets == null) {
-			servlets = new EObjectContainmentWithInverseEList(Servlet.class, this, WebapplicationPackage.WEB_APP__SERVLETS, WebapplicationPackage.SERVLET__WEB_APP);
-		}
-		return servlets;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getSecurityRoles() {
-		if (securityRoles == null) {
-			securityRoles = new EObjectContainmentEList(SecurityRole.class, this, WebapplicationPackage.WEB_APP__SECURITY_ROLES);
-		}
-		return securityRoles;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getFilters() {
-		if (filters == null) {
-			filters = new EObjectContainmentEList(Filter.class, this, WebapplicationPackage.WEB_APP__FILTERS);
-		}
-		return filters;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * Filter mappings defined for the web app
-	 */
-	public EList getFilterMappings() {
-		if (filterMappings == null) {
-			filterMappings = new EObjectContainmentEList(FilterMapping.class, this, WebapplicationPackage.WEB_APP__FILTER_MAPPINGS);
-		}
-		return filterMappings;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The listeners collection contains deployment properties for a web application
-	 * listener beans in the web app.
-	 */
-	public EList getListeners() {
-		if (listeners == null) {
-			listeners = new EObjectContainmentEList(Listener.class, this, WebapplicationPackage.WEB_APP__LISTENERS);
-		}
-		return listeners;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getContextParams() {
-		if (contextParams == null) {
-			contextParams = new EObjectContainmentEList(ParamValue.class, this, WebapplicationPackage.WEB_APP__CONTEXT_PARAMS);
-		}
-		return contextParams;
-	}
-
-	/**
-	 * @deprecated: Use getEnvironmentProperties()
-	 */
-	public EList getEnvEntries() {
-		
-		return getEnvironmentProperties();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JSPConfig getJspConfig() {
-		return jspConfig;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetJspConfig(JSPConfig newJspConfig, NotificationChain msgs) {
-		JSPConfig oldJspConfig = jspConfig;
-		jspConfig = newJspConfig;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__JSP_CONFIG, oldJspConfig, newJspConfig);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJspConfig(JSPConfig newJspConfig) {
-		if (newJspConfig != jspConfig) {
-			NotificationChain msgs = null;
-			if (jspConfig != null)
-				msgs = ((InternalEObject)jspConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__JSP_CONFIG, null, msgs);
-			if (newJspConfig != null)
-				msgs = ((InternalEObject)newJspConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__JSP_CONFIG, null, msgs);
-			msgs = basicSetJspConfig(newJspConfig, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__JSP_CONFIG, newJspConfig, newJspConfig));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getMessageDestinations() {
-		if (messageDestinations == null) {
-			messageDestinations = new EObjectContainmentEList(MessageDestination.class, this, WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS);
-		}
-		return messageDestinations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocalEncodingMappingList getLocalEncodingMappingList() {
-		return localEncodingMappingList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLocalEncodingMappingList(LocalEncodingMappingList newLocalEncodingMappingList, NotificationChain msgs) {
-		LocalEncodingMappingList oldLocalEncodingMappingList = localEncodingMappingList;
-		localEncodingMappingList = newLocalEncodingMappingList;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, oldLocalEncodingMappingList, newLocalEncodingMappingList);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocalEncodingMappingList(LocalEncodingMappingList newLocalEncodingMappingList) {
-		if (newLocalEncodingMappingList != localEncodingMappingList) {
-			NotificationChain msgs = null;
-			if (localEncodingMappingList != null)
-				msgs = ((InternalEObject)localEncodingMappingList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, null, msgs);
-			if (newLocalEncodingMappingList != null)
-				msgs = ((InternalEObject)newLocalEncodingMappingList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, null, msgs);
-			msgs = basicSetLocalEncodingMappingList(newLocalEncodingMappingList, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST, newLocalEncodingMappingList, newLocalEncodingMappingList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.WEB_APP__CONTEXTS:
-					return ((InternalEList)getContexts()).basicAdd(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-					return ((InternalEList)getErrorPages()).basicAdd(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__FILE_LIST:
-					if (fileList != null)
-						msgs = ((InternalEObject)fileList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__FILE_LIST, null, msgs);
-					return basicSetFileList((WelcomeFileList)otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__TAG_LIBS:
-					return ((InternalEList)getTagLibs()).basicAdd(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-					return ((InternalEList)getConstraints()).basicAdd(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-					if (loginConfig != null)
-						msgs = ((InternalEObject)loginConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__LOGIN_CONFIG, null, msgs);
-					return basicSetLoginConfig((LoginConfig)otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-					return ((InternalEList)getMimeMappings()).basicAdd(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-					if (sessionConfig != null)
-						msgs = ((InternalEObject)sessionConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WebapplicationPackage.WEB_APP__SESSION_CONFIG, null, msgs);
-					return basicSetSessionConfig((SessionConfig)otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-					return ((InternalEList)getServletMappings()).basicAdd(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__SERVLETS:
-					return ((InternalEList)getServlets()).basicAdd(otherEnd, msgs);
-				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 WebapplicationPackage.WEB_APP__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__ENVIRONMENT_PROPERTIES:
-					return ((InternalEList)getEnvironmentProperties()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__RESOURCE_REFS:
-					return ((InternalEList)getResourceRefs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__EJB_REFS:
-					return ((InternalEList)getEjbRefs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS:
-					return ((InternalEList)getResourceEnvRefs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS:
-					return ((InternalEList)getEjbLocalRefs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-					return ((InternalEList)getMessageDestinationRefs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__CONTEXTS:
-					return ((InternalEList)getContexts()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-					return ((InternalEList)getErrorPages()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__FILE_LIST:
-					return basicSetFileList(null, msgs);
-				case WebapplicationPackage.WEB_APP__TAG_LIBS:
-					return ((InternalEList)getTagLibs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-					return ((InternalEList)getConstraints()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-					return basicSetLoginConfig(null, msgs);
-				case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-					return ((InternalEList)getMimeMappings()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-					return basicSetSessionConfig(null, msgs);
-				case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-					return ((InternalEList)getServletMappings()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__SERVLETS:
-					return ((InternalEList)getServlets()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-					return ((InternalEList)getSecurityRoles()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__FILTERS:
-					return ((InternalEList)getFilters()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-					return ((InternalEList)getFilterMappings()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__LISTENERS:
-					return ((InternalEList)getListeners()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-					return ((InternalEList)getContextParams()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-					return basicSetJspConfig(null, msgs);
-				case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-					return ((InternalEList)getMessageDestinations()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-					return basicSetLocalEncodingMappingList(null, msgs);
-				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 WebapplicationPackage.WEB_APP__ICONS:
-				return getIcons();
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WebapplicationPackage.WEB_APP__DESCRIPTIONS:
-				return getDescriptions();
-			case WebapplicationPackage.WEB_APP__SMALL_ICON:
-				return getSmallIcon();
-			case WebapplicationPackage.WEB_APP__LARGE_ICON:
-				return getLargeIcon();
-			case WebapplicationPackage.WEB_APP__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAME:
-				return getDisplayName();
-			case WebapplicationPackage.WEB_APP__ENVIRONMENT_PROPERTIES:
-				return getEnvironmentProperties();
-			case WebapplicationPackage.WEB_APP__RESOURCE_REFS:
-				return getResourceRefs();
-			case WebapplicationPackage.WEB_APP__EJB_REFS:
-				return getEjbRefs();
-			case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS:
-				return getResourceEnvRefs();
-			case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS:
-				return getEjbLocalRefs();
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				return getMessageDestinationRefs();
-			case WebapplicationPackage.WEB_APP__SERVICE_REFS:
-				return getServiceRefs();
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				return isDistributable() ? Boolean.TRUE : Boolean.FALSE;
-			case WebapplicationPackage.WEB_APP__VERSION:
-				return getVersion();
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				return getContexts();
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				return getErrorPages();
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				return getFileList();
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				return getTagLibs();
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				return getConstraints();
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				return getLoginConfig();
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				return getMimeMappings();
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				return getSessionConfig();
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				return getServletMappings();
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				return getServlets();
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				return getSecurityRoles();
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				return getFilters();
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				return getFilterMappings();
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				return getListeners();
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				return getContextParams();
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				return getJspConfig();
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				return getMessageDestinations();
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				return getLocalEncodingMappingList();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WEB_APP__ICONS:
-				return icons != null && !icons.isEmpty();
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WebapplicationPackage.WEB_APP__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebapplicationPackage.WEB_APP__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WebapplicationPackage.WEB_APP__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WebapplicationPackage.WEB_APP__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WebapplicationPackage.WEB_APP__ENVIRONMENT_PROPERTIES:
-				return environmentProperties != null && !environmentProperties.isEmpty();
-			case WebapplicationPackage.WEB_APP__RESOURCE_REFS:
-				return resourceRefs != null && !resourceRefs.isEmpty();
-			case WebapplicationPackage.WEB_APP__EJB_REFS:
-				return ejbRefs != null && !ejbRefs.isEmpty();
-			case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS:
-				return resourceEnvRefs != null && !resourceEnvRefs.isEmpty();
-			case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS:
-				return ejbLocalRefs != null && !ejbLocalRefs.isEmpty();
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				return messageDestinationRefs != null && !messageDestinationRefs.isEmpty();
-			case WebapplicationPackage.WEB_APP__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				return isSetDistributable();
-			case WebapplicationPackage.WEB_APP__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				return contexts != null && !contexts.isEmpty();
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				return errorPages != null && !errorPages.isEmpty();
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				return fileList != null;
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				return tagLibs != null && !tagLibs.isEmpty();
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				return constraints != null && !constraints.isEmpty();
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				return loginConfig != null;
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				return mimeMappings != null && !mimeMappings.isEmpty();
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				return sessionConfig != null;
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				return servletMappings != null && !servletMappings.isEmpty();
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				return servlets != null && !servlets.isEmpty();
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				return securityRoles != null && !securityRoles.isEmpty();
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				return filters != null && !filters.isEmpty();
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				return filterMappings != null && !filterMappings.isEmpty();
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				return listeners != null && !listeners.isEmpty();
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				return contextParams != null && !contextParams.isEmpty();
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				return jspConfig != null;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				return messageDestinations != null && !messageDestinations.isEmpty();
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				return localEncodingMappingList != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WEB_APP__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				getEnvironmentProperties().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				getResourceRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__EJB_REFS:
-				getEjbRefs().clear();
-				getEjbRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				getResourceEnvRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				getEjbLocalRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				getMessageDestinationRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				setDistributable(((Boolean)newValue).booleanValue());
-				return;
-			case WebapplicationPackage.WEB_APP__VERSION:
-				setVersion((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				getContexts().clear();
-				getContexts().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				getErrorPages().clear();
-				getErrorPages().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				setFileList((WelcomeFileList)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				getTagLibs().clear();
-				getTagLibs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				getConstraints().clear();
-				getConstraints().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				getMimeMappings().clear();
-				getMimeMappings().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				setSessionConfig((SessionConfig)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				getServletMappings().clear();
-				getServletMappings().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				getServlets().clear();
-				getServlets().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				getSecurityRoles().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				getFilters().clear();
-				getFilters().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				getFilterMappings().clear();
-				getFilterMappings().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				getListeners().clear();
-				getListeners().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				getContextParams().clear();
-				getContextParams().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				setJspConfig((JSPConfig)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				getMessageDestinations().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				setLocalEncodingMappingList((LocalEncodingMappingList)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WEB_APP__ICONS:
-				getIcons().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_APP__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_APP__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_APP__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_APP__ENVIRONMENT_PROPERTIES:
-				getEnvironmentProperties().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__RESOURCE_REFS:
-				getResourceRefs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__EJB_REFS:
-				getEjbRefs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS:
-				getResourceEnvRefs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS:
-				getEjbLocalRefs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS:
-				getMessageDestinationRefs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__DISTRIBUTABLE:
-				unsetDistributable();
-				return;
-			case WebapplicationPackage.WEB_APP__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXTS:
-				getContexts().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__ERROR_PAGES:
-				getErrorPages().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__FILE_LIST:
-				setFileList((WelcomeFileList)null);
-				return;
-			case WebapplicationPackage.WEB_APP__TAG_LIBS:
-				getTagLibs().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__CONSTRAINTS:
-				getConstraints().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__LOGIN_CONFIG:
-				setLoginConfig((LoginConfig)null);
-				return;
-			case WebapplicationPackage.WEB_APP__MIME_MAPPINGS:
-				getMimeMappings().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SESSION_CONFIG:
-				setSessionConfig((SessionConfig)null);
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS:
-				getServletMappings().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SERVLETS:
-				getServlets().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__SECURITY_ROLES:
-				getSecurityRoles().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__FILTERS:
-				getFilters().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS:
-				getFilterMappings().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__LISTENERS:
-				getListeners().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS:
-				getContextParams().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__JSP_CONFIG:
-				setJspConfig((JSPConfig)null);
-				return;
-			case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS:
-				getMessageDestinations().clear();
-				return;
-			case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST:
-				setLocalEncodingMappingList((LocalEncodingMappingList)null);
-				return;
-		}
-		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(" (distributable: ");//$NON-NLS-1$
-		if (distributableESet) result.append(distributable); else result.append("<unset>");//$NON-NLS-1$
-		result.append(", version: ");//$NON-NLS-1$
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceFactory.java
deleted file mode 100644
index 7a82d1b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceFactory.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
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-/**
- * @author schacher
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WebAppResourceFactory extends TranslatorResourceFactory {
-
-	/**
-	 * Method registerDtds.
-	 */
-	public static void registerDtds() {
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEBAPP_SYSTEMID_2_2, "web-app_2_2.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEBAPP_ALT_SYSTEMID_2_2, "web-app_2.2.dtd");		//$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEBAPP_SYSTEMID_2_3, "web-app_2_3.dtd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEB_APP_SCHEMA_LOC_2_4, "web-app_2_4.xsd"); //$NON-NLS-1$
-		J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.JSP_SCHEMA_LOC_2_0, "jsp_2_0.xsd"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @param aRendererFactory
-	 */
-	public WebAppResourceFactory(RendererFactory aRendererFactory) {
-		super(aRendererFactory);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new WebAppResourceImpl(uri, aRenderer);
-	}
-	
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(aRendererFactory));
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(J2EEConstants.WEBAPP_DD_SHORT_NAME, new WebAppResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	}
-	
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.WEBAPP_DD_URI_OBJ);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceImpl.java
deleted file mode 100644
index 2801970..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebAppResourceImpl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.model.translator.webapplication.WebAppTranslator;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-/**
- * @author schacher
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WebAppResourceImpl extends XMLResourceImpl implements WebAppResource {
-
-	
-	public WebAppResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	public WebAppResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	
-	public WebApp getWebApp() {
-		return (WebApp) getRootObject();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.WEBAPP_PUBLICID_2_2;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.WEBAPP_SYSTEMID_2_2;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.WEBAPP_PUBLICID_2_3;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.WEBAPP_SYSTEMID_2_3;
-	}
-
-	/*
-	 * @see WebAppResource#isWeb2_2()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isWeb2_2() {
-		return getModuleVersionID() == WEB_2_2_ID;
-	}
-	/*
-	 * @see WebAppResource#isWeb2_3()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isWeb2_3() {
-		return getModuleVersionID() == WEB_2_3_ID;
-	}
-	/*
-	 * @see WebAppResource#isWeb2_4()
-	 * @deprecated - use getModuleVersionID() and J2EEVersionConstants
-	 */
-	public boolean isWeb2_4() {
-		return getModuleVersionID() == WEB_2_4_ID;
-	}
-	
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.WEBAPP_DOCTYPE;
-			default :
-				return null;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResource#getType()
-	 */
-	public int getType() {
-		return WEB_APP_TYPE;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return WebAppTranslator.INSTANCE;
-	}
-	/* Return J2EE version based on module version
-	*/
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.WEB_2_2_ID :
-				return J2EEVersionConstants.J2EE_1_2_ID;
-			case J2EEVersionConstants.WEB_2_3_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case J2EEVersionConstants.WEB_2_4_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-	super.setVersionID(id);
-	switch (id) {
-			case (WEB_2_4_ID) :
-				super.setDoctypeValues(null, null);
-				break;
-			case (WEB_2_3_ID) :
-				super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-				break;
-			case (WEB_2_2_ID) :
-				super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-			
-		}
-		syncVersionOfRootObject();
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) {
-	switch (id) {
-		case (J2EE_1_4_ID) :
-					primSetDoctypeValues(null, null);
-					primSetVersionID(WEB_2_4_ID);
-					break;
-		case (J2EE_1_3_ID) :
-					primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					primSetVersionID(WEB_2_3_ID);
-					break;
-		case (J2EE_1_2_ID) :
-					primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					primSetVersionID(WEB_2_2_ID);
-			}
-		syncVersionOfRootObject();
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WEB_2_4_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		WebApp app = getWebApp();
-		if (app == null)
-			return;
-	
-		String version = app.getVersion();
-		String newVersion = getModuleVersionString();
-		if (!newVersion.equals(version))
-			app.setVersion(newVersion);
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebResourceCollectionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebResourceCollectionImpl.java
deleted file mode 100644
index eefcdee..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebResourceCollectionImpl.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.internal.webapplication.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.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.EDataTypeEList;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-
-
-/**
- * The web-resource-collection element is used to identify a subset of the resources and HTTP methods on those resources within a web application to which a security constraint applies. If no HTTP methods are specified, then the security constraint applies to all HTTP methods.
-
- */
-public class WebResourceCollectionImpl extends EObjectImpl implements WebResourceCollection, EObject {
-
-	/**
-	 * The default value of the '{@link #getWebResourceName() <em>Web Resource Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWebResourceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WEB_RESOURCE_NAME_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String webResourceName = WEB_RESOURCE_NAME_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-	/**
-	 * The cached value of the '{@link #getUrlPattern() <em>Url Pattern</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUrlPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList urlPattern = null;
-
-	/**
-	 * The cached value of the '{@link #getHttpMethod() <em>Http Method</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHttpMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList httpMethod = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList urLs = null;
-	/**
-	 * The cached value of the '{@link #getDescriptions() <em>Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList descriptions = null;
-
-	/**
-	 * The cached value of the '{@link #getHTTPs() <em>HTT Ps</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHTTPs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList httPs = null;
-
-	public WebResourceCollectionImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getWebResourceCollection();
-	}
-
-/**
- * addHTTP method comment.
- */
-public void addHTTP(java.lang.String ahttpMethod) {
-	HTTPMethodType http = getFactory().createHTTPMethodType();
-	http.setHttpMethod(ahttpMethod);
-	getHTTPs().add(http);
-}
-/**
- * addURL method comment.
- */
-public void addURL(java.lang.String aurlPattern) {
-	URLPatternType url = getFactory().createURLPatternType();
-	url.setUrlPattern(aurlPattern);
-	getURLs().add(url);
-}
-public WebapplicationFactory getFactory() {
-	return ((WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI)).getWebapplicationFactory();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * The web-resource-name contains the name of this web resource collection
-	 */
-	public String getWebResourceName() {
-		return webResourceName;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebResourceName(String newWebResourceName) {
-		String oldWebResourceName = webResourceName;
-		webResourceName = newWebResourceName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME, oldWebResourceName, webResourceName));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * Added for 1.4
-	 * @generated
-	 */
-	public EList getUrlPattern() {
-		if (urlPattern == null) {
-			urlPattern = new EDataTypeEList(String.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN);
-		}
-		return urlPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * Added for 1.4
-	 * @generated
-	 */
-	public EList getHttpMethod() {
-		if (httpMethod == null) {
-			httpMethod = new EDataTypeUniqueEList(HTTPMethodTypeEnum.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD);
-		}
-		return httpMethod;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public SecurityConstraint getSecConstraint() {
-		if (eContainerFeatureID != WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT) return null;
-		return (SecurityConstraint)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setSecConstraint(SecurityConstraint newSecConstraint) {
-		if (newSecConstraint != eContainer || (eContainerFeatureID != WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT && newSecConstraint != null)) {
-			if (EcoreUtil.isAncestor(this, newSecConstraint))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newSecConstraint != null)
-				msgs = ((InternalEObject)newSecConstraint).eInverseAdd(this, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS, SecurityConstraint.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newSecConstraint, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT, newSecConstraint, newSecConstraint));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 *  <!-- begin-user-doc -->
-	 * @since J2EE1.4 deprecated, use getUrlPattern()
-	 * <!-- end-user-doc -->
-	 * 
-	 */
-	public EList getURLs() {
-		if (urLs == null) {
-			urLs = new EObjectContainmentWithInverseEList(URLPatternType.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS, WebapplicationPackage.URL_PATTERN_TYPE__RES_COLLECTION);
-		}
-		return urLs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getDescriptions() {
-		if (descriptions == null) {
-			descriptions = new EObjectContainmentEList(Description.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
-		}
-		return descriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * @since J2EE1.4 deprecated, use getHttpMethods()
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getHTTPs() {
-		if (httPs == null) {
-			httPs = new EObjectContainmentEList(HTTPMethodType.class, this, WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS);
-		}
-		return httPs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT, msgs);
-				case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-					return ((InternalEList)getURLs()).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 WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-					return eBasicSetContainer(null, WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT, msgs);
-				case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-					return ((InternalEList)getURLs()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-					return ((InternalEList)getHTTPs()).basicRemove(otherEnd, msgs);
-				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 WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS, SecurityConstraint.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 WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				return getWebResourceName();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				return getDescription();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				return getUrlPattern();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				return getHttpMethod();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				return getSecConstraint();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				return getURLs();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return getDescriptions();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				return getHTTPs();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				return WEB_RESOURCE_NAME_EDEFAULT == null ? webResourceName != null : !WEB_RESOURCE_NAME_EDEFAULT.equals(webResourceName);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				return urlPattern != null && !urlPattern.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				return httpMethod != null && !httpMethod.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				return getSecConstraint() != null;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				return urLs != null && !urLs.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				return httPs != null && !httPs.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				setWebResourceName((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				getUrlPattern().clear();
-				getUrlPattern().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				getHttpMethod().clear();
-				getHttpMethod().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				getURLs().clear();
-				getURLs().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				getHTTPs().clear();
-				getHTTPs().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME:
-				setWebResourceName(WEB_RESOURCE_NAME_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN:
-				getUrlPattern().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD:
-				getHttpMethod().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT:
-				setSecConstraint((SecurityConstraint)null);
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS:
-				getURLs().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS:
-				getHTTPs().clear();
-				return;
-		}
-		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(" (webResourceName: ");//$NON-NLS-1$
-		result.append(webResourceName);
-		result.append(", description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", urlPattern: ");//$NON-NLS-1$
-		result.append(urlPattern);
-		result.append(", httpMethod: ");//$NON-NLS-1$
-		result.append(httpMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebTypeImpl.java
deleted file mode 100644
index c6964af..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebTypeImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-
-/**
- * @generated
- */
-public abstract class WebTypeImpl extends EObjectImpl implements WebType {
-
-	public WebTypeImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getWebType();
-	}
-
-/**
- * isJspType method comment.
- */
-public boolean isJspType() {
-	return false;
-}
-/**
- * isServletType method comment.
- */
-public boolean isServletType() {
-	return false;
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationFactoryImpl.java
deleted file mode 100644
index 455f94e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationFactoryImpl.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.AuthMethodKind;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.ResAuthServletType;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-/**
- * @generated
- */
-public class WebapplicationFactoryImpl extends EFactoryImpl implements WebapplicationFactory{
- 
-	public static final String MM_VERSION = "1.1";//$NON-NLS-1$
-	
-	public WebapplicationFactoryImpl() {
-		super(); 	
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WebapplicationPackage.WEB_APP: return createWebApp();
-			case WebapplicationPackage.CONTEXT_PARAM: return createContextParam();
-			case WebapplicationPackage.SERVLET: return createServlet();
-			case WebapplicationPackage.SERVLET_MAPPING: return createServletMapping();
-			case WebapplicationPackage.SESSION_CONFIG: return createSessionConfig();
-			case WebapplicationPackage.MIME_MAPPING: return createMimeMapping();
-			case WebapplicationPackage.WELCOME_FILE_LIST: return createWelcomeFileList();
-			case WebapplicationPackage.ERROR_PAGE: return createErrorPage();
-			case WebapplicationPackage.TAG_LIB_REF: return createTagLibRef();
-			case WebapplicationPackage.SECURITY_CONSTRAINT: return createSecurityConstraint();
-			case WebapplicationPackage.WEB_RESOURCE_COLLECTION: return createWebResourceCollection();
-			case WebapplicationPackage.AUTH_CONSTRAINT: return createAuthConstraint();
-			case WebapplicationPackage.USER_DATA_CONSTRAINT: return createUserDataConstraint();
-			case WebapplicationPackage.LOGIN_CONFIG: return createLoginConfig();
-			case WebapplicationPackage.FORM_LOGIN_CONFIG: return createFormLoginConfig();
-			case WebapplicationPackage.INIT_PARAM: return createInitParam();
-			case WebapplicationPackage.SERVLET_TYPE: return createServletType();
-			case WebapplicationPackage.JSP_TYPE: return createJSPType();
-			case WebapplicationPackage.URL_PATTERN_TYPE: return createURLPatternType();
-			case WebapplicationPackage.ROLE_NAME_TYPE: return createRoleNameType();
-			case WebapplicationPackage.WELCOME_FILE: return createWelcomeFile();
-			case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE: return createExceptionTypeErrorPage();
-			case WebapplicationPackage.ERROR_CODE_ERROR_PAGE: return createErrorCodeErrorPage();
-			case WebapplicationPackage.FILTER_MAPPING: return createFilterMapping();
-			case WebapplicationPackage.FILTER: return createFilter();
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST: return createLocalEncodingMappingList();
-			case WebapplicationPackage.LOCAL_ENCODING_MAPPING: return createLocalEncodingMapping();
-			case WebapplicationPackage.HTTP_METHOD_TYPE: return createHTTPMethodType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");  //$NON-NLS-1$//$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case WebapplicationPackage.RES_AUTH_SERVLET_TYPE:
-				return ResAuthServletType.get(initialValue);
-			case WebapplicationPackage.HTTP_METHOD_TYPE_ENUM:
-				return HTTPMethodTypeEnum.get(initialValue);
-			case WebapplicationPackage.TRANSPORT_GUARANTEE_TYPE:
-				return TransportGuaranteeType.get(initialValue);
-			case WebapplicationPackage.DISPATCHER_TYPE:
-				return DispatcherType.get(initialValue);
-			case WebapplicationPackage.AUTH_METHOD_KIND:
-				return AuthMethodKind.get(initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case WebapplicationPackage.RES_AUTH_SERVLET_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case WebapplicationPackage.HTTP_METHOD_TYPE_ENUM:
-				return instanceValue == null ? null : instanceValue.toString();
-			case WebapplicationPackage.TRANSPORT_GUARANTEE_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case WebapplicationPackage.DISPATCHER_TYPE:
-				return instanceValue == null ? null : instanceValue.toString();
-			case WebapplicationPackage.AUTH_METHOD_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-public static WebapplicationFactory getActiveFactory() {
-	return (WebapplicationFactory) getPackage().getEFactoryInstance();
-}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebApp createWebApp() {
-		WebAppImpl webApp = new WebAppImpl();
-		return webApp;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ContextParam createContextParam() {
-		ContextParamImpl contextParam = new ContextParamImpl();
-		return contextParam;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ErrorPage createErrorPage() {
-		ErrorPageImpl errorPage = new ErrorPageImpl();
-		return errorPage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TagLibRef createTagLibRef() {
-		TagLibRefImpl tagLibRef = new TagLibRefImpl();
-		return tagLibRef;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ExceptionTypeErrorPage createExceptionTypeErrorPage() {
-		ExceptionTypeErrorPageImpl exceptionTypeErrorPage = new ExceptionTypeErrorPageImpl();
-		return exceptionTypeErrorPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ErrorCodeErrorPage createErrorCodeErrorPage() {
-		ErrorCodeErrorPageImpl errorCodeErrorPage = new ErrorCodeErrorPageImpl();
-		return errorCodeErrorPage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WelcomeFileList createWelcomeFileList() {
-		WelcomeFileListImpl welcomeFileList = new WelcomeFileListImpl();
-		return welcomeFileList;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WelcomeFile createWelcomeFile() {
-		WelcomeFileImpl welcomeFile = new WelcomeFileImpl();
-		return welcomeFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public SecurityConstraint createSecurityConstraint() {
-		SecurityConstraintImpl securityConstraint = new SecurityConstraintImpl();
-		return securityConstraint;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebResourceCollection createWebResourceCollection() {
-		WebResourceCollectionImpl webResourceCollection = new WebResourceCollectionImpl();
-		return webResourceCollection;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public URLPatternType createURLPatternType() {
-		URLPatternTypeImpl urlPatternType = new URLPatternTypeImpl();
-		return urlPatternType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public AuthConstraint createAuthConstraint() {
-		AuthConstraintImpl authConstraint = new AuthConstraintImpl();
-		return authConstraint;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public UserDataConstraint createUserDataConstraint() {
-		UserDataConstraintImpl userDataConstraint = new UserDataConstraintImpl();
-		return userDataConstraint;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public LoginConfig createLoginConfig() {
-		LoginConfigImpl loginConfig = new LoginConfigImpl();
-		return loginConfig;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public FormLoginConfig createFormLoginConfig() {
-		FormLoginConfigImpl formLoginConfig = new FormLoginConfigImpl();
-		return formLoginConfig;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public MimeMapping createMimeMapping() {
-		MimeMappingImpl mimeMapping = new MimeMappingImpl();
-		return mimeMapping;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public SessionConfig createSessionConfig() {
-		SessionConfigImpl sessionConfig = new SessionConfigImpl();
-		return sessionConfig;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ServletMapping createServletMapping() {
-		ServletMappingImpl servletMapping = new ServletMappingImpl();
-		return servletMapping;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Servlet createServlet() {
-		ServletImpl servlet = new ServletImpl();
-		return servlet;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public ServletType createServletType() {
-		ServletTypeImpl servletType = new ServletTypeImpl();
-		return servletType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public JSPType createJSPType() {
-		JSPTypeImpl jspType = new JSPTypeImpl();
-		return jspType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public InitParam createInitParam() {
-		InitParamImpl initParam = new InitParamImpl();
-		return initParam;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Filter createFilter() {
-		FilterImpl filter = new FilterImpl();
-		return filter;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public FilterMapping createFilterMapping() {
-		FilterMappingImpl filterMapping = new FilterMappingImpl();
-		return filterMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocalEncodingMappingList createLocalEncodingMappingList() {
-		LocalEncodingMappingListImpl localEncodingMappingList = new LocalEncodingMappingListImpl();
-		return localEncodingMappingList;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LocalEncodingMapping createLocalEncodingMapping() {
-		LocalEncodingMappingImpl localEncodingMapping = new LocalEncodingMappingImpl();
-		return localEncodingMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public HTTPMethodType createHTTPMethodType() {
-		HTTPMethodTypeImpl httpMethodType = new HTTPMethodTypeImpl();
-		return httpMethodType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public RoleNameType createRoleNameType() {
-		RoleNameTypeImpl roleNameType = new RoleNameTypeImpl();
-		return roleNameType;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebapplicationPackage getWebapplicationPackage() {
-		return (WebapplicationPackage)getEPackage();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static WebapplicationPackage getPackage() {
-		return WebapplicationPackage.eINSTANCE;
-	}
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationPackageImpl.java
deleted file mode 100644
index 8451522..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WebapplicationPackageImpl.java
+++ /dev/null
@@ -1,1833 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.AuthMethodKind;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodTypeEnum;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.ResAuthServletType;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.TransportGuaranteeType;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-
-
-public class WebapplicationPackageImpl extends EPackageImpl implements WebapplicationPackage, EPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webAppEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contextParamEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass sessionConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mimeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass welcomeFileListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass errorPageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass tagLibRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass securityConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webResourceCollectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass authConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass userDataConstraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass loginConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass formLoginConfigEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass initParamEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass webTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass servletTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass jspTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass urlPatternTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roleNameTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass welcomeFileEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass exceptionTypeErrorPageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass errorCodeErrorPageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass filterMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass filterEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass localEncodingMappingListEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass localEncodingMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass httpMethodTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum resAuthServletTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum httpMethodTypeEnumEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum transportGuaranteeTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum dispatcherTypeEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum authMethodKindEEnum = null;
-
-		   /**
-		 * @generated This field/method will be replaced during code generation.
-		 */
-	private WebapplicationPackageImpl() {
-		super(eNS_URI, WebapplicationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static WebapplicationPackage init() {
-		if (isInited) return (WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WebapplicationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theWebapplicationPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theWebapplicationPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-
-		return theWebapplicationPackage;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebApp() {
-		return webAppEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWebApp_Distributable() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebApp_Version() {
-		return (EAttribute)webAppEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Contexts() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_ErrorPages() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_FileList() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_TagLibs() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Constraints() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_LoginConfig() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_MimeMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_SessionConfig() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_ServletMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Servlets() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_SecurityRoles() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(12);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Filters() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(13);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_FilterMappings() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(14);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebApp_Listeners() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(15);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_ContextParams() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(16);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_JspConfig() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(17);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_MessageDestinations() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(18);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebApp_LocalEncodingMappingList() {
-		return (EReference)webAppEClass.getEStructuralFeatures().get(19);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getContextParam() {
-		return contextParamEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContextParam_ParamName() {
-		return (EAttribute)contextParamEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContextParam_ParamValue() {
-		return (EAttribute)contextParamEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getContextParam_Description() {
-		return (EAttribute)contextParamEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getContextParam_WebApp() {
-		return (EReference)contextParamEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getErrorPage() {
-		return errorPageEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getErrorPage_Location() {
-		return (EAttribute)errorPageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getErrorPage_WebApp() {
-		return (EReference)errorPageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getExceptionTypeErrorPage() {
-		return exceptionTypeErrorPageEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getExceptionTypeErrorPage_ExceptionType() {
-		return (EReference)exceptionTypeErrorPageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getErrorCodeErrorPage() {
-		return errorCodeErrorPageEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getErrorCodeErrorPage_ErrorCode() {
-		return (EAttribute)errorCodeErrorPageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWelcomeFileList() {
-		return welcomeFileListEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWelcomeFileList_WebApp() {
-		return (EReference)welcomeFileListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWelcomeFileList_File() {
-		return (EReference)welcomeFileListEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWelcomeFile() {
-		return welcomeFileEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWelcomeFile_WelcomeFile() {
-		return (EAttribute)welcomeFileEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWelcomeFile_FileList() {
-		return (EReference)welcomeFileEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getTagLibRef() {
-		return tagLibRefEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLibRef_TaglibURI() {
-		return (EAttribute)tagLibRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getTagLibRef_TaglibLocation() {
-		return (EAttribute)tagLibRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTagLibRef_WebApp() {
-		return (EReference)tagLibRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSecurityConstraint() {
-		return securityConstraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSecurityConstraint_DisplayName() {
-		return (EAttribute)securityConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_WebApp() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_WebResourceCollections() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_AuthConstraint() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSecurityConstraint_UserDataConstraint() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSecurityConstraint_DisplayNames() {
-		return (EReference)securityConstraintEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebResourceCollection() {
-		return webResourceCollectionEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWebResourceCollection_WebResourceName() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getWebResourceCollection_Description() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebResourceCollection_UrlPattern() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getWebResourceCollection_HttpMethod() {
-		return (EAttribute)webResourceCollectionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebResourceCollection_SecConstraint() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getWebResourceCollection_URLs() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebResourceCollection_Descriptions() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getWebResourceCollection_HTTPs() {
-		return (EReference)webResourceCollectionEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getURLPatternType() {
-		return urlPatternTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getURLPatternType_UrlPattern() {
-		return (EAttribute)urlPatternTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getURLPatternType_ResCollection() {
-		return (EReference)urlPatternTypeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getHTTPMethodType() {
-		return httpMethodTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHTTPMethodType_HttpMethod() {
-		return (EAttribute)httpMethodTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getAuthConstraint() {
-		return authConstraintEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthConstraint_Description() {
-		return (EAttribute)authConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getAuthConstraint_Roles() {
-		return (EAttribute)authConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getAuthConstraint_SecConstraint() {
-		return (EReference)authConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuthConstraint_Descriptions() {
-		return (EReference)authConstraintEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getUserDataConstraint() {
-		return userDataConstraintEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getUserDataConstraint_Description() {
-		return (EAttribute)userDataConstraintEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getUserDataConstraint_TransportGuarantee() {
-		return (EAttribute)userDataConstraintEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getUserDataConstraint_SecConstraint() {
-		return (EReference)userDataConstraintEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getUserDataConstraint_Descriptions() {
-		return (EReference)userDataConstraintEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getLoginConfig() {
-		return loginConfigEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLoginConfig_AuthMethod() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getLoginConfig_RealmName() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLoginConfig_AuthorizationMethod() {
-		return (EAttribute)loginConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLoginConfig_WebApp() {
-		return (EReference)loginConfigEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getLoginConfig_FormLoginConfig() {
-		return (EReference)loginConfigEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getFormLoginConfig() {
-		return formLoginConfigEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFormLoginConfig_FormLoginPage() {
-		return (EAttribute)formLoginConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFormLoginConfig_FormErrorPage() {
-		return (EAttribute)formLoginConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFormLoginConfig_LoginConfig() {
-		return (EReference)formLoginConfigEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getMimeMapping() {
-		return mimeMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMimeMapping_Extension() {
-		return (EAttribute)mimeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getMimeMapping_MimeType() {
-		return (EAttribute)mimeMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getMimeMapping_WebApp() {
-		return (EReference)mimeMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getSessionConfig() {
-		return sessionConfigEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getSessionConfig_SessionTimeout() {
-		return (EAttribute)sessionConfigEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getSessionConfig_WebApp() {
-		return (EReference)sessionConfigEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getServletMapping() {
-		return servletMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServletMapping_UrlPattern() {
-		return (EAttribute)servletMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServletMapping_Name() {
-		return (EAttribute)servletMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServletMapping_WebApp() {
-		return (EReference)servletMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServletMapping_Servlet() {
-		return (EReference)servletMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getServlet() {
-		return servletEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServlet_ServletName() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServlet_LoadOnStartup() {
-		return (EAttribute)servletEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_WebApp() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_WebType() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_Params() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_SecurityRoleRefs() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getServlet_RunAs() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServlet_InitParams() {
-		return (EReference)servletEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getWebType() {
-		return webTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getServletType() {
-		return servletTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getServletType_ClassName() {
-		return (EAttribute)servletTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getJSPType() {
-		return jspTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getJSPType_JspFile() {
-		return (EAttribute)jspTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getInitParam() {
-		return initParamEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getInitParam_ParamName() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getInitParam_ParamValue() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getInitParam_Description() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getFilter() {
-		return filterEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFilter_Name() {
-		return (EAttribute)filterEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilter_InitParams() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilter_FilterClass() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFilter_InitParamValues() {
-		return (EReference)filterEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getFilterMapping() {
-		return filterMappingEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getFilterMapping_UrlPattern() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFilterMapping_DispatcherType() {
-		return (EAttribute)filterMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilterMapping_Filter() {
-		return (EReference)filterMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EReference getFilterMapping_Servlet() {
-		return (EReference)filterMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocalEncodingMappingList() {
-		return localEncodingMappingListEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLocalEncodingMappingList_LocalEncodingMappings() {
-		return (EReference)localEncodingMappingListEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLocalEncodingMapping() {
-		return localEncodingMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocalEncodingMapping_Locale() {
-		return (EAttribute)localEncodingMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLocalEncodingMapping_Encoding() {
-		return (EAttribute)localEncodingMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getResAuthServletType() {
-		return resAuthServletTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getHTTPMethodTypeEnum() {
-		return httpMethodTypeEnumEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EClass getRoleNameType() {
-		return roleNameTypeEClass;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EAttribute getRoleNameType_RoleName() {
-		return (EAttribute)roleNameTypeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public EEnum getTransportGuaranteeType() {
-		return transportGuaranteeTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getDispatcherType() {
-		return dispatcherTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getAuthMethodKind() {
-		return authMethodKindEEnum;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public WebapplicationFactory getWebapplicationFactory() {
-		return (WebapplicationFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		webAppEClass = createEClass(WEB_APP);
-		createEAttribute(webAppEClass, WEB_APP__DISTRIBUTABLE);
-		createEAttribute(webAppEClass, WEB_APP__VERSION);
-		createEReference(webAppEClass, WEB_APP__CONTEXTS);
-		createEReference(webAppEClass, WEB_APP__ERROR_PAGES);
-		createEReference(webAppEClass, WEB_APP__FILE_LIST);
-		createEReference(webAppEClass, WEB_APP__TAG_LIBS);
-		createEReference(webAppEClass, WEB_APP__CONSTRAINTS);
-		createEReference(webAppEClass, WEB_APP__LOGIN_CONFIG);
-		createEReference(webAppEClass, WEB_APP__MIME_MAPPINGS);
-		createEReference(webAppEClass, WEB_APP__SESSION_CONFIG);
-		createEReference(webAppEClass, WEB_APP__SERVLET_MAPPINGS);
-		createEReference(webAppEClass, WEB_APP__SERVLETS);
-		createEReference(webAppEClass, WEB_APP__SECURITY_ROLES);
-		createEReference(webAppEClass, WEB_APP__FILTERS);
-		createEReference(webAppEClass, WEB_APP__FILTER_MAPPINGS);
-		createEReference(webAppEClass, WEB_APP__LISTENERS);
-		createEReference(webAppEClass, WEB_APP__CONTEXT_PARAMS);
-		createEReference(webAppEClass, WEB_APP__JSP_CONFIG);
-		createEReference(webAppEClass, WEB_APP__MESSAGE_DESTINATIONS);
-		createEReference(webAppEClass, WEB_APP__LOCAL_ENCODING_MAPPING_LIST);
-
-		contextParamEClass = createEClass(CONTEXT_PARAM);
-		createEAttribute(contextParamEClass, CONTEXT_PARAM__PARAM_NAME);
-		createEAttribute(contextParamEClass, CONTEXT_PARAM__PARAM_VALUE);
-		createEAttribute(contextParamEClass, CONTEXT_PARAM__DESCRIPTION);
-		createEReference(contextParamEClass, CONTEXT_PARAM__WEB_APP);
-
-		servletEClass = createEClass(SERVLET);
-		createEAttribute(servletEClass, SERVLET__SERVLET_NAME);
-		createEAttribute(servletEClass, SERVLET__LOAD_ON_STARTUP);
-		createEReference(servletEClass, SERVLET__WEB_APP);
-		createEReference(servletEClass, SERVLET__WEB_TYPE);
-		createEReference(servletEClass, SERVLET__PARAMS);
-		createEReference(servletEClass, SERVLET__SECURITY_ROLE_REFS);
-		createEReference(servletEClass, SERVLET__RUN_AS);
-		createEReference(servletEClass, SERVLET__INIT_PARAMS);
-
-		servletMappingEClass = createEClass(SERVLET_MAPPING);
-		createEAttribute(servletMappingEClass, SERVLET_MAPPING__URL_PATTERN);
-		createEAttribute(servletMappingEClass, SERVLET_MAPPING__NAME);
-		createEReference(servletMappingEClass, SERVLET_MAPPING__WEB_APP);
-		createEReference(servletMappingEClass, SERVLET_MAPPING__SERVLET);
-
-		sessionConfigEClass = createEClass(SESSION_CONFIG);
-		createEAttribute(sessionConfigEClass, SESSION_CONFIG__SESSION_TIMEOUT);
-		createEReference(sessionConfigEClass, SESSION_CONFIG__WEB_APP);
-
-		mimeMappingEClass = createEClass(MIME_MAPPING);
-		createEAttribute(mimeMappingEClass, MIME_MAPPING__EXTENSION);
-		createEAttribute(mimeMappingEClass, MIME_MAPPING__MIME_TYPE);
-		createEReference(mimeMappingEClass, MIME_MAPPING__WEB_APP);
-
-		welcomeFileListEClass = createEClass(WELCOME_FILE_LIST);
-		createEReference(welcomeFileListEClass, WELCOME_FILE_LIST__WEB_APP);
-		createEReference(welcomeFileListEClass, WELCOME_FILE_LIST__FILE);
-
-		errorPageEClass = createEClass(ERROR_PAGE);
-		createEAttribute(errorPageEClass, ERROR_PAGE__LOCATION);
-		createEReference(errorPageEClass, ERROR_PAGE__WEB_APP);
-
-		tagLibRefEClass = createEClass(TAG_LIB_REF);
-		createEAttribute(tagLibRefEClass, TAG_LIB_REF__TAGLIB_URI);
-		createEAttribute(tagLibRefEClass, TAG_LIB_REF__TAGLIB_LOCATION);
-		createEReference(tagLibRefEClass, TAG_LIB_REF__WEB_APP);
-
-		securityConstraintEClass = createEClass(SECURITY_CONSTRAINT);
-		createEAttribute(securityConstraintEClass, SECURITY_CONSTRAINT__DISPLAY_NAME);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__WEB_APP);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__AUTH_CONSTRAINT);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT);
-		createEReference(securityConstraintEClass, SECURITY_CONSTRAINT__DISPLAY_NAMES);
-
-		webResourceCollectionEClass = createEClass(WEB_RESOURCE_COLLECTION);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__DESCRIPTION);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__URL_PATTERN);
-		createEAttribute(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__HTTP_METHOD);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__SEC_CONSTRAINT);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__UR_LS);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__DESCRIPTIONS);
-		createEReference(webResourceCollectionEClass, WEB_RESOURCE_COLLECTION__HTT_PS);
-
-		authConstraintEClass = createEClass(AUTH_CONSTRAINT);
-		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__DESCRIPTION);
-		createEAttribute(authConstraintEClass, AUTH_CONSTRAINT__ROLES);
-		createEReference(authConstraintEClass, AUTH_CONSTRAINT__SEC_CONSTRAINT);
-		createEReference(authConstraintEClass, AUTH_CONSTRAINT__DESCRIPTIONS);
-
-		userDataConstraintEClass = createEClass(USER_DATA_CONSTRAINT);
-		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__DESCRIPTION);
-		createEAttribute(userDataConstraintEClass, USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE);
-		createEReference(userDataConstraintEClass, USER_DATA_CONSTRAINT__SEC_CONSTRAINT);
-		createEReference(userDataConstraintEClass, USER_DATA_CONSTRAINT__DESCRIPTIONS);
-
-		loginConfigEClass = createEClass(LOGIN_CONFIG);
-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__AUTH_METHOD);
-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__REALM_NAME);
-		createEAttribute(loginConfigEClass, LOGIN_CONFIG__AUTHORIZATION_METHOD);
-		createEReference(loginConfigEClass, LOGIN_CONFIG__WEB_APP);
-		createEReference(loginConfigEClass, LOGIN_CONFIG__FORM_LOGIN_CONFIG);
-
-		formLoginConfigEClass = createEClass(FORM_LOGIN_CONFIG);
-		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE);
-		createEAttribute(formLoginConfigEClass, FORM_LOGIN_CONFIG__FORM_ERROR_PAGE);
-		createEReference(formLoginConfigEClass, FORM_LOGIN_CONFIG__LOGIN_CONFIG);
-
-		initParamEClass = createEClass(INIT_PARAM);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_NAME);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_VALUE);
-		createEAttribute(initParamEClass, INIT_PARAM__DESCRIPTION);
-
-		webTypeEClass = createEClass(WEB_TYPE);
-
-		servletTypeEClass = createEClass(SERVLET_TYPE);
-		createEAttribute(servletTypeEClass, SERVLET_TYPE__CLASS_NAME);
-
-		jspTypeEClass = createEClass(JSP_TYPE);
-		createEAttribute(jspTypeEClass, JSP_TYPE__JSP_FILE);
-
-		urlPatternTypeEClass = createEClass(URL_PATTERN_TYPE);
-		createEAttribute(urlPatternTypeEClass, URL_PATTERN_TYPE__URL_PATTERN);
-		createEReference(urlPatternTypeEClass, URL_PATTERN_TYPE__RES_COLLECTION);
-
-		roleNameTypeEClass = createEClass(ROLE_NAME_TYPE);
-		createEAttribute(roleNameTypeEClass, ROLE_NAME_TYPE__ROLE_NAME);
-
-		welcomeFileEClass = createEClass(WELCOME_FILE);
-		createEAttribute(welcomeFileEClass, WELCOME_FILE__WELCOME_FILE);
-		createEReference(welcomeFileEClass, WELCOME_FILE__FILE_LIST);
-
-		exceptionTypeErrorPageEClass = createEClass(EXCEPTION_TYPE_ERROR_PAGE);
-		createEReference(exceptionTypeErrorPageEClass, EXCEPTION_TYPE_ERROR_PAGE__EXCEPTION_TYPE);
-
-		errorCodeErrorPageEClass = createEClass(ERROR_CODE_ERROR_PAGE);
-		createEAttribute(errorCodeErrorPageEClass, ERROR_CODE_ERROR_PAGE__ERROR_CODE);
-
-		filterMappingEClass = createEClass(FILTER_MAPPING);
-		createEAttribute(filterMappingEClass, FILTER_MAPPING__URL_PATTERN);
-		createEAttribute(filterMappingEClass, FILTER_MAPPING__DISPATCHER_TYPE);
-		createEReference(filterMappingEClass, FILTER_MAPPING__FILTER);
-		createEReference(filterMappingEClass, FILTER_MAPPING__SERVLET);
-
-		filterEClass = createEClass(FILTER);
-		createEAttribute(filterEClass, FILTER__NAME);
-		createEReference(filterEClass, FILTER__INIT_PARAMS);
-		createEReference(filterEClass, FILTER__FILTER_CLASS);
-		createEReference(filterEClass, FILTER__INIT_PARAM_VALUES);
-
-		localEncodingMappingListEClass = createEClass(LOCAL_ENCODING_MAPPING_LIST);
-		createEReference(localEncodingMappingListEClass, LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS);
-
-		localEncodingMappingEClass = createEClass(LOCAL_ENCODING_MAPPING);
-		createEAttribute(localEncodingMappingEClass, LOCAL_ENCODING_MAPPING__LOCALE);
-		createEAttribute(localEncodingMappingEClass, LOCAL_ENCODING_MAPPING__ENCODING);
-
-		httpMethodTypeEClass = createEClass(HTTP_METHOD_TYPE);
-		createEAttribute(httpMethodTypeEClass, HTTP_METHOD_TYPE__HTTP_METHOD);
-
-		// Create enums
-		resAuthServletTypeEEnum = createEEnum(RES_AUTH_SERVLET_TYPE);
-		httpMethodTypeEnumEEnum = createEEnum(HTTP_METHOD_TYPE_ENUM);
-		transportGuaranteeTypeEEnum = createEEnum(TRANSPORT_GUARANTEE_TYPE);
-		dispatcherTypeEEnum = createEEnum(DISPATCHER_TYPE);
-		authMethodKindEEnum = createEEnum(AUTH_METHOD_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JspPackageImpl theJspPackage = (JspPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI);
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		webAppEClass.getESuperTypes().add(theCommonPackage.getJNDIEnvRefsGroup());
-		servletEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		servletTypeEClass.getESuperTypes().add(this.getWebType());
-		jspTypeEClass.getESuperTypes().add(this.getWebType());
-		exceptionTypeErrorPageEClass.getESuperTypes().add(this.getErrorPage());
-		errorCodeErrorPageEClass.getESuperTypes().add(this.getErrorPage());
-		filterEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(webAppEClass, WebApp.class, "WebApp", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getWebApp_Distributable(), ecorePackage.getEBoolean(), "distributable", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebApp_Version(), ecorePackage.getEString(), "version", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_Contexts(), this.getContextParam(), this.getContextParam_WebApp(), "contexts", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_ErrorPages(), this.getErrorPage(), this.getErrorPage_WebApp(), "errorPages", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_FileList(), this.getWelcomeFileList(), this.getWelcomeFileList_WebApp(), "fileList", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_TagLibs(), this.getTagLibRef(), this.getTagLibRef_WebApp(), "tagLibs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_Constraints(), this.getSecurityConstraint(), this.getSecurityConstraint_WebApp(), "constraints", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_LoginConfig(), this.getLoginConfig(), this.getLoginConfig_WebApp(), "loginConfig", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_MimeMappings(), this.getMimeMapping(), this.getMimeMapping_WebApp(), "mimeMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_SessionConfig(), this.getSessionConfig(), this.getSessionConfig_WebApp(), "sessionConfig", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_ServletMappings(), this.getServletMapping(), this.getServletMapping_WebApp(), "servletMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_Servlets(), this.getServlet(), this.getServlet_WebApp(), "servlets", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_SecurityRoles(), theCommonPackage.getSecurityRole(), null, "securityRoles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_Filters(), this.getFilter(), null, "filters", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_FilterMappings(), this.getFilterMapping(), null, "filterMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_Listeners(), theCommonPackage.getListener(), null, "listeners", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_ContextParams(), theCommonPackage.getParamValue(), null, "contextParams", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_JspConfig(), theJspPackage.getJSPConfig(), null, "jspConfig", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_MessageDestinations(), theCommonPackage.getMessageDestination(), null, "messageDestinations", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebApp_LocalEncodingMappingList(), this.getLocalEncodingMappingList(), null, "localEncodingMappingList", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(contextParamEClass, ContextParam.class, "ContextParam", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getContextParam_ParamName(), ecorePackage.getEString(), "paramName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getContextParam_ParamValue(), ecorePackage.getEString(), "paramValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getContextParam_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getContextParam_WebApp(), this.getWebApp(), this.getWebApp_Contexts(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(servletEClass, Servlet.class, "Servlet", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getServlet_ServletName(), ecorePackage.getEString(), "servletName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getServlet_LoadOnStartup(), ecorePackage.getEIntegerObject(), "loadOnStartup", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServlet_WebApp(), this.getWebApp(), this.getWebApp_Servlets(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServlet_WebType(), this.getWebType(), null, "webType", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServlet_Params(), this.getInitParam(), null, "params", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServlet_SecurityRoleRefs(), theCommonPackage.getSecurityRoleRef(), null, "securityRoleRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServlet_RunAs(), theCommonPackage.getRunAsSpecifiedIdentity(), null, "runAs", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServlet_InitParams(), theCommonPackage.getParamValue(), null, "initParams", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(servletMappingEClass, ServletMapping.class, "ServletMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getServletMapping_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getServletMapping_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServletMapping_WebApp(), this.getWebApp(), this.getWebApp_ServletMappings(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServletMapping_Servlet(), this.getServlet(), null, "servlet", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(sessionConfigEClass, SessionConfig.class, "SessionConfig", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getSessionConfig_SessionTimeout(), ecorePackage.getEInt(), "sessionTimeout", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getSessionConfig_WebApp(), this.getWebApp(), this.getWebApp_SessionConfig(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(mimeMappingEClass, MimeMapping.class, "MimeMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getMimeMapping_Extension(), ecorePackage.getEString(), "extension", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getMimeMapping_MimeType(), ecorePackage.getEString(), "mimeType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getMimeMapping_WebApp(), this.getWebApp(), this.getWebApp_MimeMappings(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(welcomeFileListEClass, WelcomeFileList.class, "WelcomeFileList", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getWelcomeFileList_WebApp(), this.getWebApp(), this.getWebApp_FileList(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWelcomeFileList_File(), this.getWelcomeFile(), this.getWelcomeFile_FileList(), "file", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(errorPageEClass, ErrorPage.class, "ErrorPage", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getErrorPage_Location(), ecorePackage.getEString(), "location", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getErrorPage_WebApp(), this.getWebApp(), this.getWebApp_ErrorPages(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(tagLibRefEClass, TagLibRef.class, "TagLibRef", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getTagLibRef_TaglibURI(), ecorePackage.getEString(), "taglibURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getTagLibRef_TaglibLocation(), ecorePackage.getEString(), "taglibLocation", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getTagLibRef_WebApp(), this.getWebApp(), this.getWebApp_TagLibs(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(securityConstraintEClass, SecurityConstraint.class, "SecurityConstraint", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getSecurityConstraint_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getSecurityConstraint_WebApp(), this.getWebApp(), this.getWebApp_Constraints(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getSecurityConstraint_WebResourceCollections(), this.getWebResourceCollection(), this.getWebResourceCollection_SecConstraint(), "webResourceCollections", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getSecurityConstraint_AuthConstraint(), this.getAuthConstraint(), this.getAuthConstraint_SecConstraint(), "authConstraint", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getSecurityConstraint_UserDataConstraint(), this.getUserDataConstraint(), this.getUserDataConstraint_SecConstraint(), "userDataConstraint", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getSecurityConstraint_DisplayNames(), theCommonPackage.getDisplayName(), null, "displayNames", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(webResourceCollectionEClass, WebResourceCollection.class, "WebResourceCollection", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getWebResourceCollection_WebResourceName(), ecorePackage.getEString(), "webResourceName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebResourceCollection_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebResourceCollection_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebResourceCollection_HttpMethod(), this.getHTTPMethodTypeEnum(), "httpMethod", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebResourceCollection_SecConstraint(), this.getSecurityConstraint(), this.getSecurityConstraint_WebResourceCollections(), "secConstraint", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebResourceCollection_URLs(), this.getURLPatternType(), this.getURLPatternType_ResCollection(), "URLs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebResourceCollection_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebResourceCollection_HTTPs(), this.getHTTPMethodType(), null, "HTTPs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(authConstraintEClass, AuthConstraint.class, "AuthConstraint", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getAuthConstraint_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getAuthConstraint_Roles(), ecorePackage.getEString(), "roles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getAuthConstraint_SecConstraint(), this.getSecurityConstraint(), this.getSecurityConstraint_AuthConstraint(), "secConstraint", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getAuthConstraint_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(userDataConstraintEClass, UserDataConstraint.class, "UserDataConstraint", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getUserDataConstraint_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getUserDataConstraint_TransportGuarantee(), this.getTransportGuaranteeType(), "transportGuarantee", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getUserDataConstraint_SecConstraint(), this.getSecurityConstraint(), this.getSecurityConstraint_UserDataConstraint(), "secConstraint", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getUserDataConstraint_Descriptions(), theCommonPackage.getDescription(), null, "descriptions", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(loginConfigEClass, LoginConfig.class, "LoginConfig", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getLoginConfig_AuthMethod(), this.getAuthMethodKind(), "authMethod", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getLoginConfig_RealmName(), ecorePackage.getEString(), "realmName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getLoginConfig_AuthorizationMethod(), ecorePackage.getEString(), "authorizationMethod", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getLoginConfig_WebApp(), this.getWebApp(), this.getWebApp_LoginConfig(), "webApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getLoginConfig_FormLoginConfig(), this.getFormLoginConfig(), this.getFormLoginConfig_LoginConfig(), "formLoginConfig", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(formLoginConfigEClass, FormLoginConfig.class, "FormLoginConfig", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getFormLoginConfig_FormLoginPage(), ecorePackage.getEString(), "formLoginPage", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getFormLoginConfig_FormErrorPage(), ecorePackage.getEString(), "formErrorPage", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getFormLoginConfig_LoginConfig(), this.getLoginConfig(), this.getLoginConfig_FormLoginConfig(), "loginConfig", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(initParamEClass, InitParam.class, "InitParam", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getInitParam_ParamName(), ecorePackage.getEString(), "paramName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getInitParam_ParamValue(), ecorePackage.getEString(), "paramValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getInitParam_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(webTypeEClass, WebType.class, "WebType", IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-		initEClass(servletTypeEClass, ServletType.class, "ServletType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getServletType_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(jspTypeEClass, JSPType.class, "JSPType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getJSPType_JspFile(), ecorePackage.getEString(), "jspFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(urlPatternTypeEClass, URLPatternType.class, "URLPatternType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getURLPatternType_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getURLPatternType_ResCollection(), this.getWebResourceCollection(), this.getWebResourceCollection_URLs(), "resCollection", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(roleNameTypeEClass, RoleNameType.class, "RoleNameType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getRoleNameType_RoleName(), ecorePackage.getEString(), "roleName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(welcomeFileEClass, WelcomeFile.class, "WelcomeFile", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getWelcomeFile_WelcomeFile(), ecorePackage.getEString(), "welcomeFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWelcomeFile_FileList(), this.getWelcomeFileList(), this.getWelcomeFileList_File(), "fileList", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(exceptionTypeErrorPageEClass, ExceptionTypeErrorPage.class, "ExceptionTypeErrorPage", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getExceptionTypeErrorPage_ExceptionType(), theJavaRefPackage.getJavaClass(), null, "exceptionType", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(errorCodeErrorPageEClass, ErrorCodeErrorPage.class, "ErrorCodeErrorPage", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getErrorCodeErrorPage_ErrorCode(), ecorePackage.getEString(), "errorCode", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(filterMappingEClass, FilterMapping.class, "FilterMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getFilterMapping_UrlPattern(), ecorePackage.getEString(), "urlPattern", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getFilterMapping_DispatcherType(), this.getDispatcherType(), "dispatcherType", null, 0, 4, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getFilterMapping_Filter(), this.getFilter(), null, "filter", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getFilterMapping_Servlet(), this.getServlet(), null, "servlet", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(filterEClass, Filter.class, "Filter", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getFilter_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getFilter_InitParams(), this.getInitParam(), null, "initParams", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getFilter_FilterClass(), theJavaRefPackage.getJavaClass(), null, "filterClass", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getFilter_InitParamValues(), theCommonPackage.getParamValue(), null, "initParamValues", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(localEncodingMappingListEClass, LocalEncodingMappingList.class, "LocalEncodingMappingList", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getLocalEncodingMappingList_LocalEncodingMappings(), this.getLocalEncodingMapping(), null, "localEncodingMappings", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(localEncodingMappingEClass, LocalEncodingMapping.class, "LocalEncodingMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getLocalEncodingMapping_Locale(), ecorePackage.getEString(), "locale", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getLocalEncodingMapping_Encoding(), ecorePackage.getEString(), "encoding", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(httpMethodTypeEClass, HTTPMethodType.class, "HTTPMethodType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getHTTPMethodType_HttpMethod(), ecorePackage.getEString(), "httpMethod", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		// Initialize enums and add enum literals
-		initEEnum(resAuthServletTypeEEnum, ResAuthServletType.class, "ResAuthServletType");//$NON-NLS-1$
-		addEEnumLiteral(resAuthServletTypeEEnum, ResAuthServletType.CONTAINER_LITERAL);
-		addEEnumLiteral(resAuthServletTypeEEnum, ResAuthServletType.SERVLET_LITERAL);
-
-		initEEnum(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.class, "HTTPMethodTypeEnum");//$NON-NLS-1$
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.GET_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.POST_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.PUT_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.DELETE_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.HEAD_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.OPTIONS_LITERAL);
-		addEEnumLiteral(httpMethodTypeEnumEEnum, HTTPMethodTypeEnum.TRACE_LITERAL);
-
-		initEEnum(transportGuaranteeTypeEEnum, TransportGuaranteeType.class, "TransportGuaranteeType");//$NON-NLS-1$
-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.NONE_LITERAL);
-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.INTEGRAL_LITERAL);
-		addEEnumLiteral(transportGuaranteeTypeEEnum, TransportGuaranteeType.CONFIDENTIAL_LITERAL);
-
-		initEEnum(dispatcherTypeEEnum, DispatcherType.class, "DispatcherType");//$NON-NLS-1$
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.FORWARD_LITERAL);
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.INCLUDE_LITERAL);
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.REQUEST_LITERAL);
-		addEEnumLiteral(dispatcherTypeEEnum, DispatcherType.ERROR_LITERAL);
-
-		initEEnum(authMethodKindEEnum, AuthMethodKind.class, "AuthMethodKind");//$NON-NLS-1$
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.UNSPECIFIED_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.BASIC_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.DIGEST_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.FORM_LITERAL);
-		addEEnumLiteral(authMethodKindEEnum, AuthMethodKind.CLIENT_CERT_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //WebapplicationPackageImpl
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileImpl.java
deleted file mode 100644
index a723e2a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileImpl.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.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.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-/**
- * The welcome-file element contains file name to use as a default welcome file, such as index.html
-
- */
-public class WelcomeFileImpl extends EObjectImpl implements WelcomeFile, EObject {
-
-	/**
-	 * The default value of the '{@link #getWelcomeFile() <em>Welcome File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWelcomeFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WELCOME_FILE_EDEFAULT = null;
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected String welcomeFile = WELCOME_FILE_EDEFAULT;
-	public WelcomeFileImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getWelcomeFile();
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public String getWelcomeFile() {
-		return welcomeFile;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWelcomeFile(String newWelcomeFile) {
-		String oldWelcomeFile = welcomeFile;
-		welcomeFile = newWelcomeFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WELCOME_FILE__WELCOME_FILE, oldWelcomeFile, welcomeFile));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WelcomeFileList getFileList() {
-		if (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE__FILE_LIST) return null;
-		return (WelcomeFileList)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setFileList(WelcomeFileList newFileList) {
-		if (newFileList != eContainer || (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE__FILE_LIST && newFileList != null)) {
-			if (EcoreUtil.isAncestor(this, newFileList))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newFileList != null)
-				msgs = ((InternalEObject)newFileList).eInverseAdd(this, WebapplicationPackage.WELCOME_FILE_LIST__FILE, WelcomeFileList.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newFileList, WebapplicationPackage.WELCOME_FILE__FILE_LIST, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WELCOME_FILE__FILE_LIST, newFileList, newFileList));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.WELCOME_FILE__FILE_LIST, 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 WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-					return eBasicSetContainer(null, WebapplicationPackage.WELCOME_FILE__FILE_LIST, 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 WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WELCOME_FILE_LIST__FILE, WelcomeFileList.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 WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				return getWelcomeFile();
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				return getFileList();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				return WELCOME_FILE_EDEFAULT == null ? welcomeFile != null : !WELCOME_FILE_EDEFAULT.equals(welcomeFile);
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				return getFileList() != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				setWelcomeFile((String)newValue);
-				return;
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				setFileList((WelcomeFileList)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE:
-				setWelcomeFile(WELCOME_FILE_EDEFAULT);
-				return;
-			case WebapplicationPackage.WELCOME_FILE__FILE_LIST:
-				setFileList((WelcomeFileList)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(" (welcomeFile: ");//$NON-NLS-1$
-		result.append(welcomeFile);
-		result.append(')');
-		return result.toString();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileListImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileListImpl.java
deleted file mode 100644
index a572348..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/impl/WelcomeFileListImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.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.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-/**
- * The welcome-file-list contains an ordered list of welcome files elements.
- */
-public class WelcomeFileListImpl extends EObjectImpl implements WelcomeFileList, EObject {
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	protected EList file = null;
-	public WelcomeFileListImpl() {
-		super();
-	}
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return WebapplicationPackage.eINSTANCE.getWelcomeFileList();
-	}
-
-/**
- * addFileNamed method comment.
- */
-public void addFileNamed(java.lang.String name) {
-	WelcomeFile lfile = ((WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI)).getWebapplicationFactory().createWelcomeFile();
-	lfile.setWelcomeFile(name);
-	getFile().add(lfile);
-}
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public WebApp getWebApp() {
-		if (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP) return null;
-		return (WebApp)eContainer;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public void setWebApp(WebApp newWebApp) {
-		if (newWebApp != eContainer || (eContainerFeatureID != WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP && newWebApp != null)) {
-			if (EcoreUtil.isAncestor(this, newWebApp))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());//$NON-NLS-1$
-			NotificationChain msgs = null;
-			if (eContainer != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newWebApp != null)
-				msgs = ((InternalEObject)newWebApp).eInverseAdd(this, WebapplicationPackage.WEB_APP__FILE_LIST, WebApp.class, msgs);
-			msgs = eBasicSetContainer((InternalEObject)newWebApp, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, newWebApp, newWebApp));
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 */
-	public EList getFile() {
-		if (file == null) {
-			file = new EObjectContainmentWithInverseEList(WelcomeFile.class, this, WebapplicationPackage.WELCOME_FILE_LIST__FILE, WebapplicationPackage.WELCOME_FILE__FILE_LIST);
-		}
-		return file;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-					if (eContainer != null)
-						msgs = eBasicRemoveFromContainer(msgs);
-					return eBasicSetContainer(otherEnd, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, msgs);
-				case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-					return ((InternalEList)getFile()).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 WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-					return eBasicSetContainer(null, WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP, msgs);
-				case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-					return ((InternalEList)getFile()).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 WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-					return eContainer.eInverseRemove(this, WebapplicationPackage.WEB_APP__FILE_LIST, WebApp.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 WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				return getWebApp();
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				return getFile();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				return getWebApp() != null;
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				return file != null && !file.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 WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				setWebApp((WebApp)newValue);
-				return;
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				getFile().clear();
-				getFile().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 WebapplicationPackage.WELCOME_FILE_LIST__WEB_APP:
-				setWebApp((WebApp)null);
-				return;
-			case WebapplicationPackage.WELCOME_FILE_LIST__FILE:
-				getFile().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationAdapterFactory.java
deleted file mode 100644
index fff5eb9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationAdapterFactory.java
+++ /dev/null
@@ -1,700 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-
-public class WebapplicationAdapterFactory extends AdapterFactoryImpl {
-	protected static WebapplicationPackage modelPackage;
-
-	public WebapplicationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = (WebapplicationPackage)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI);
-		}
-	}
-	public boolean isFactoryForType(Object type) {
-		if (type == modelPackage) {
-			return true;
-		}
-		if (type instanceof EObject) {
-			return ((EObject)type).eClass().eContainer() == modelPackage;
-		}
-		return false;
-	}
-
-	protected WebapplicationSwitch sw = new WebapplicationSwitch() {
-		public Object caseWebApp(WebApp object) {
-			return createWebAppAdapter();
-		}
-		public Object caseContextParam(ContextParam object) {
-			return createContextParamAdapter();
-		}
-		public Object caseErrorPage(ErrorPage object) {
-			return createErrorPageAdapter();
-		}
-		public Object caseExceptionTypeErrorPage(ExceptionTypeErrorPage object) {
-			return createExceptionTypeErrorPageAdapter();
-		}
-		public Object caseErrorCodeErrorPage(ErrorCodeErrorPage object) {
-			return createErrorCodeErrorPageAdapter();
-		}
-		public Object caseWelcomeFileList(WelcomeFileList object) {
-			return createWelcomeFileListAdapter();
-		}
-		public Object caseWelcomeFile(WelcomeFile object) {
-			return createWelcomeFileAdapter();
-		}
-		public Object caseTagLibRef(TagLibRef object) {
-			return createTagLibRefAdapter();
-		}
-		public Object caseSecurityConstraint(SecurityConstraint object) {
-			return createSecurityConstraintAdapter();
-		}
-		public Object caseWebResourceCollection(WebResourceCollection object) {
-			return createWebResourceCollectionAdapter();
-		}
-		public Object caseURLPatternType(URLPatternType object) {
-			return createURLPatternTypeAdapter();
-		}
-		public Object caseHTTPMethodType(HTTPMethodType object) {
-			return createHTTPMethodTypeAdapter();
-		}
-		public Object caseAuthConstraint(AuthConstraint object) {
-			return createAuthConstraintAdapter();
-		}
-		public Object caseUserDataConstraint(UserDataConstraint object) {
-			return createUserDataConstraintAdapter();
-		}
-		public Object caseLoginConfig(LoginConfig object) {
-			return createLoginConfigAdapter();
-		}
-		public Object caseFormLoginConfig(FormLoginConfig object) {
-			return createFormLoginConfigAdapter();
-		}
-		public Object caseMimeMapping(MimeMapping object) {
-			return createMimeMappingAdapter();
-		}
-		public Object caseSessionConfig(SessionConfig object) {
-			return createSessionConfigAdapter();
-		}
-		public Object caseServletMapping(ServletMapping object) {
-			return createServletMappingAdapter();
-		}
-		public Object caseServlet(Servlet object) {
-			return createServletAdapter();
-		}
-		public Object caseWebType(WebType object) {
-			return createWebTypeAdapter();
-		}
-		public Object caseServletType(ServletType object) {
-			return createServletTypeAdapter();
-		}
-		public Object caseJSPType(JSPType object) {
-			return createJSPTypeAdapter();
-		}
-		public Object caseInitParam(InitParam object) {
-			return createInitParamAdapter();
-		}
-		public Object caseFilter(Filter object) {
-			return createFilterAdapter();
-		}
-		public Object caseFilterMapping(FilterMapping object) {
-			return createFilterMappingAdapter();
-		}
-		public Object caseListener(Listener object) {
-			return createListenerAdapter();
-		}
-		public Object caseRoleNameType(RoleNameType object) {
-			return createRoleNameTypeAdapter();
-		}
-		public Object caseLocalEncodingMappingList(LocalEncodingMappingList object) {
-			return createLocalEncodingMappingListAdapter();
-		}
-		public Object caseLocalEncodingMapping(LocalEncodingMapping object) {
-			return createLocalEncodingMappingAdapter();
-		}
-	};
-
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)sw.doSwitch((EObject)target);
-	}
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	public Adapter createWebAppAdapter() {
-		return null;
-	}
-
-	public Adapter createContextParamAdapter() {
-		return null;
-	}
-
-	public Adapter createErrorPageAdapter() {
-		return null;
-	}
-
-	public Adapter createExceptionTypeErrorPageAdapter() {
-		return null;
-	}
-
-	public Adapter createErrorCodeErrorPageAdapter() {
-		return null;
-	}
-
-	public Adapter createWelcomeFileListAdapter() {
-		return null;
-	}
-
-	public Adapter createWelcomeFileAdapter() {
-		return null;
-	}
-
-	public Adapter createTagLibRefAdapter() {
-		return null;
-	}
-
-	public Adapter createTagLibRefTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createSecurityConstraintAdapter() {
-		return null;
-	}
-
-	public Adapter createWebResourceCollectionAdapter() {
-		return null;
-	}
-
-	public Adapter createURLPatternTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createHTTPMethodTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createAuthConstraintAdapter() {
-		return null;
-	}
-
-	public Adapter createUserDataConstraintAdapter() {
-		return null;
-	}
-
-	public Adapter createLoginConfigAdapter() {
-		return null;
-	}
-
-	public Adapter createFormLoginConfigAdapter() {
-		return null;
-	}
-
-	public Adapter createMimeMappingAdapter() {
-		return null;
-	}
-
-	public Adapter createSessionConfigAdapter() {
-		return null;
-	}
-
-	public Adapter createServletMappingAdapter() {
-		return null;
-	}
-
-	public Adapter createServletAdapter() {
-		return null;
-	}
-
-	public Adapter createWebTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createServletTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createJSPTypeAdapter() {
-		return null;
-	}
-
-	public Adapter createInitParamAdapter() {
-		return null;
-	}
-
-	public Adapter createFilterAdapter() {
-		return null;
-	}
-
-	public Adapter createFilterMappingAdapter() {
-		return null;
-	}
-
-	public Adapter createListenerAdapter() {
-		return null;
-	}
-
-	public Adapter createRoleNameTypeAdapter() {
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public boolean isFactoryForTypeGen(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected WebapplicationSwitch modelSwitch =
-		new WebapplicationSwitch() {
-			public Object caseWebApp(WebApp object) {
-				return createWebAppAdapter();
-			}
-			public Object caseContextParam(ContextParam object) {
-				return createContextParamAdapter();
-			}
-			public Object caseServlet(Servlet object) {
-				return createServletAdapter();
-			}
-			public Object caseServletMapping(ServletMapping object) {
-				return createServletMappingAdapter();
-			}
-			public Object caseSessionConfig(SessionConfig object) {
-				return createSessionConfigAdapter();
-			}
-			public Object caseMimeMapping(MimeMapping object) {
-				return createMimeMappingAdapter();
-			}
-			public Object caseWelcomeFileList(WelcomeFileList object) {
-				return createWelcomeFileListAdapter();
-			}
-			public Object caseErrorPage(ErrorPage object) {
-				return createErrorPageAdapter();
-			}
-			public Object caseTagLibRef(TagLibRef object) {
-				return createTagLibRefAdapter();
-			}
-			public Object caseTagLibRefType(TagLibRefType object) {
-				return createTagLibRefTypeAdapter();
-			}
-			public Object caseSecurityConstraint(SecurityConstraint object) {
-				return createSecurityConstraintAdapter();
-			}
-			public Object caseWebResourceCollection(WebResourceCollection object) {
-				return createWebResourceCollectionAdapter();
-			}
-			public Object caseAuthConstraint(AuthConstraint object) {
-				return createAuthConstraintAdapter();
-			}
-			public Object caseUserDataConstraint(UserDataConstraint object) {
-				return createUserDataConstraintAdapter();
-			}
-			public Object caseLoginConfig(LoginConfig object) {
-				return createLoginConfigAdapter();
-			}
-			public Object caseFormLoginConfig(FormLoginConfig object) {
-				return createFormLoginConfigAdapter();
-			}
-			public Object caseInitParam(InitParam object) {
-				return createInitParamAdapter();
-			}
-			public Object caseWebType(WebType object) {
-				return createWebTypeAdapter();
-			}
-			public Object caseServletType(ServletType object) {
-				return createServletTypeAdapter();
-			}
-			public Object caseJSPType(JSPType object) {
-				return createJSPTypeAdapter();
-			}
-			public Object caseURLPatternType(URLPatternType object) {
-				return createURLPatternTypeAdapter();
-			}
-			public Object caseRoleNameType(RoleNameType object) {
-				return createRoleNameTypeAdapter();
-			}
-			public Object caseWelcomeFile(WelcomeFile object) {
-				return createWelcomeFileAdapter();
-			}
-			public Object caseExceptionTypeErrorPage(ExceptionTypeErrorPage object) {
-				return createExceptionTypeErrorPageAdapter();
-			}
-			public Object caseErrorCodeErrorPage(ErrorCodeErrorPage object) {
-				return createErrorCodeErrorPageAdapter();
-			}
-			public Object caseFilterMapping(FilterMapping object) {
-				return createFilterMappingAdapter();
-			}
-			public Object caseFilter(Filter object) {
-				return createFilterAdapter();
-			}
-			public Object caseLocalEncodingMappingList(LocalEncodingMappingList object) {
-				return createLocalEncodingMappingListAdapter();
-			}
-			public Object caseLocalEncodingMapping(LocalEncodingMapping object) {
-				return createLocalEncodingMappingAdapter();
-			}
-			public Object caseHTTPMethodType(HTTPMethodType object) {
-				return createHTTPMethodTypeAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-				return createJNDIEnvRefsGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAdapterGen(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * By default create methods return null so that we can easily ignore cases.
-	 * It's useful to ignore a case when inheritance will catch all the cases anyway.
-	 */
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebAppAdapterGen() {
-
-		return null;
-	}
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createContextParamAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createErrorPageAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createExceptionTypeErrorPageAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createErrorCodeErrorPageAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWelcomeFileListAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWelcomeFileAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createTagLibRefAdapterGen() {
-		return null;
-	}
-
-	public Adapter createTagLibRefTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSecurityConstraintAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebResourceCollectionAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createURLPatternTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createAuthConstraintAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createUserDataConstraintAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createLoginConfigAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createFormLoginConfigAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createMimeMappingAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createSessionConfigAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createServletMappingAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createServletAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createWebTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createServletTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createJSPTypeAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createInitParamAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createFilterAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createFilterMappingAdapterGen() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMappingList <em>Local Encoding Mapping List</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMappingList
-	 * @generated
-	 */
-	public Adapter createLocalEncodingMappingListAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping <em>Local Encoding Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping
-	 * @generated
-	 */
-	public Adapter createLocalEncodingMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup <em>JNDI Env Refs Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.JNDIEnvRefsGroup
-	 * @generated
-	 */
-	public Adapter createJNDIEnvRefsGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public Adapter createRoleNameTypeAdapterGen() {
-		return null;
-	}
-
-} //WebapplicationAdapterFactory
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationSwitch.java
deleted file mode 100644
index 0847eff..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webapplication/util/WebapplicationSwitch.java
+++ /dev/null
@@ -1,776 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webapplication.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage
- * @generated
- */
-public class WebapplicationSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static WebapplicationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WebapplicationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WebapplicationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case WebapplicationPackage.WEB_APP: {
-					WebApp webApp = (WebApp)theEObject;
-					Object result = caseWebApp(webApp);
-					if (result == null) result = caseJNDIEnvRefsGroup(webApp);
-					if (result == null) result = caseCompatibilityDescriptionGroup(webApp);
-					if (result == null) result = caseDescriptionGroup(webApp);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.CONTEXT_PARAM: {
-					ContextParam contextParam = (ContextParam)theEObject;
-					Object result = caseContextParam(contextParam);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.SERVLET: {
-					Servlet servlet = (Servlet)theEObject;
-					Object result = caseServlet(servlet);
-					if (result == null) result = caseCompatibilityDescriptionGroup(servlet);
-					if (result == null) result = caseDescriptionGroup(servlet);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.SERVLET_MAPPING: {
-					ServletMapping servletMapping = (ServletMapping)theEObject;
-					Object result = caseServletMapping(servletMapping);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.SESSION_CONFIG: {
-					SessionConfig sessionConfig = (SessionConfig)theEObject;
-					Object result = caseSessionConfig(sessionConfig);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.MIME_MAPPING: {
-					MimeMapping mimeMapping = (MimeMapping)theEObject;
-					Object result = caseMimeMapping(mimeMapping);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.WELCOME_FILE_LIST: {
-					WelcomeFileList welcomeFileList = (WelcomeFileList)theEObject;
-					Object result = caseWelcomeFileList(welcomeFileList);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.ERROR_PAGE: {
-					ErrorPage errorPage = (ErrorPage)theEObject;
-					Object result = caseErrorPage(errorPage);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.TAG_LIB_REF: {
-					TagLibRef tagLibRef = (TagLibRef)theEObject;
-					Object result = caseTagLibRef(tagLibRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.SECURITY_CONSTRAINT: {
-					SecurityConstraint securityConstraint = (SecurityConstraint)theEObject;
-					Object result = caseSecurityConstraint(securityConstraint);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.WEB_RESOURCE_COLLECTION: {
-					WebResourceCollection webResourceCollection = (WebResourceCollection)theEObject;
-					Object result = caseWebResourceCollection(webResourceCollection);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.AUTH_CONSTRAINT: {
-					AuthConstraint authConstraint = (AuthConstraint)theEObject;
-					Object result = caseAuthConstraint(authConstraint);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.USER_DATA_CONSTRAINT: {
-					UserDataConstraint userDataConstraint = (UserDataConstraint)theEObject;
-					Object result = caseUserDataConstraint(userDataConstraint);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.LOGIN_CONFIG: {
-					LoginConfig loginConfig = (LoginConfig)theEObject;
-					Object result = caseLoginConfig(loginConfig);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.FORM_LOGIN_CONFIG: {
-					FormLoginConfig formLoginConfig = (FormLoginConfig)theEObject;
-					Object result = caseFormLoginConfig(formLoginConfig);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.INIT_PARAM: {
-					InitParam initParam = (InitParam)theEObject;
-					Object result = caseInitParam(initParam);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.SERVLET_TYPE: {
-					ServletType servletType = (ServletType)theEObject;
-					Object result = caseServletType(servletType);
-					if (result == null) result = caseWebType(servletType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.JSP_TYPE: {
-					JSPType jspType = (JSPType)theEObject;
-					Object result = caseJSPType(jspType);
-					if (result == null) result = caseWebType(jspType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.URL_PATTERN_TYPE: {
-					URLPatternType urlPatternType = (URLPatternType)theEObject;
-					Object result = caseURLPatternType(urlPatternType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.ROLE_NAME_TYPE: {
-					RoleNameType roleNameType = (RoleNameType)theEObject;
-					Object result = caseRoleNameType(roleNameType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.WELCOME_FILE: {
-					WelcomeFile welcomeFile = (WelcomeFile)theEObject;
-					Object result = caseWelcomeFile(welcomeFile);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.EXCEPTION_TYPE_ERROR_PAGE: {
-					ExceptionTypeErrorPage exceptionTypeErrorPage = (ExceptionTypeErrorPage)theEObject;
-					Object result = caseExceptionTypeErrorPage(exceptionTypeErrorPage);
-					if (result == null) result = caseErrorPage(exceptionTypeErrorPage);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.ERROR_CODE_ERROR_PAGE: {
-					ErrorCodeErrorPage errorCodeErrorPage = (ErrorCodeErrorPage)theEObject;
-					Object result = caseErrorCodeErrorPage(errorCodeErrorPage);
-					if (result == null) result = caseErrorPage(errorCodeErrorPage);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.FILTER_MAPPING: {
-					FilterMapping filterMapping = (FilterMapping)theEObject;
-					Object result = caseFilterMapping(filterMapping);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.FILTER: {
-					Filter filter = (Filter)theEObject;
-					Object result = caseFilter(filter);
-					if (result == null) result = caseCompatibilityDescriptionGroup(filter);
-					if (result == null) result = caseDescriptionGroup(filter);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST: {
-					LocalEncodingMappingList localEncodingMappingList = (LocalEncodingMappingList)theEObject;
-					Object result = caseLocalEncodingMappingList(localEncodingMappingList);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.LOCAL_ENCODING_MAPPING: {
-					LocalEncodingMapping localEncodingMapping = (LocalEncodingMapping)theEObject;
-					Object result = caseLocalEncodingMapping(localEncodingMapping);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WebapplicationPackage.HTTP_METHOD_TYPE: {
-					HTTPMethodType httpMethodType = (HTTPMethodType)theEObject;
-					Object result = caseHTTPMethodType(httpMethodType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web App</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web App</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebApp(WebApp object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Context Param</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Context Param</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseContextParam(ContextParam object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServlet(Servlet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServletMapping(ServletMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Session Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Session Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSessionConfig(SessionConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Mime Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Mime Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseMimeMapping(MimeMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Welcome File List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Welcome File List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWelcomeFileList(WelcomeFileList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Error Page</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseErrorPage(ErrorPage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tag Lib Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tag Lib Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseTagLibRef(TagLibRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Security Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Security Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseSecurityConstraint(SecurityConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Resource Collection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Resource Collection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebResourceCollection(WebResourceCollection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Auth Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Auth Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseAuthConstraint(AuthConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>User Data Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>User Data Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseUserDataConstraint(UserDataConstraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Login Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLoginConfig(LoginConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Form Login Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Form Login Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFormLoginConfig(FormLoginConfig object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseInitParam(InitParam object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWebType(WebType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServletType(ServletType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JSP Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JSP Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJSPType(JSPType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>URL Pattern Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>URL Pattern Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseURLPatternType(URLPatternType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Role Name Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Role Name Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseRoleNameType(RoleNameType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Welcome File</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Welcome File</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseWelcomeFile(WelcomeFile object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Exception Type Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Exception Type Error Page</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseExceptionTypeErrorPage(ExceptionTypeErrorPage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Error Code Error Page</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Error Code Error Page</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseErrorCodeErrorPage(ErrorCodeErrorPage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Filter Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Filter Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFilterMapping(FilterMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Filter</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Filter</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseFilter(Filter object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Local Encoding Mapping List</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Local Encoding Mapping List</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLocalEncodingMappingList(LocalEncodingMappingList object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Local Encoding Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Local Encoding Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseLocalEncodingMapping(LocalEncodingMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>HTTP Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>HTTP Method Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHTTPMethodType(HTTPMethodType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>JNDI Env Refs Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseJNDIEnvRefsGroup(JNDIEnvRefsGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //WebapplicationSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupHelper.java
deleted file mode 100644
index e3fa493..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupHelper.java
+++ /dev/null
@@ -1,1577 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.util;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-
-public class DescriptionGroupHelper
-{
-
-  public static String[] getValues(WebServices webServices, DescriptionGroupItem item)
-  {
-    return getValues(webServices, item, false);
-  }
-  
-  public static String[] getValues(WebServices webServices, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServices.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescriptions(webServices, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayNames(webServices, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcons(webServices, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcons(webServices, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-
-  private static String[] getDescriptions(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] descriptions = webServices.getDescriptions().toArray();
-      values = new String[descriptions.length];
-      if (lang)
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-    	values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getDescription();
-      }
-    }
-    return values;
-  }
-
-  private static String[] getDisplayNames(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] displayNames = webServices.getDisplayNames().toArray();
-      values = new String[displayNames.length];      
-      if (lang)
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getValue();
-        }
-      }
-
-     
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getDisplayName();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getSmallIcons(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] icons = webServices.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getSmallIcon();
-        }
-      }
-
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getSmallIcon();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getLargeIcons(WebServices webServices, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] icons = webServices.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLargeIcon();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = webServices.getLargeIcon();
-      }
-      
-    }
-    return values;
-  }
-
-
-  //WebServicesDescription methods
-  public static String getValue(WebServiceDescription webServicesDescription, DescriptionGroupItem item)
-  {
-    return getValue(webServicesDescription, item, false);
-  }
-  
-  public static String getValue(WebServiceDescription webServicesDescription, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServicesDescription.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescription(webServicesDescription, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayName(webServicesDescription, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcon(webServicesDescription, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcon(webServicesDescription, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-  private static String getDescription(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DescriptionType descType = webServicesDescription.getDescriptionType();
-      if (descType!=null)
-      {
-        if (lang)
-        {
-        	ret =  descType.getLang();
-        }
-        else
-        {
-        	ret =  descType.getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {	
-  
-		if( !lang )
-		{
-			ret = webServicesDescription.getDescription();
-		}
-    }
-    return ret;
-    
-  }
-
-  private static String getDisplayName(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DisplayNameType dnType = webServicesDescription.getDisplayNameType();
-      if (dnType!=null)
-      {
-        if (lang)
-        {
-        	ret =  dnType.getLang();
-        }
-        else
-        {
-        	ret =  dnType.getValue();
-        }
-      }
-
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-        ret = webServicesDescription.getDisplayName();
-      }
-    }
-    return ret;
-  }
-
-  private static String getSmallIcon(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = webServicesDescription.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret =  iconType.getLang();
-        }
-        else
-        {
-        	ret =  iconType.getSmallIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang)
-      {
-      	ret =  webServicesDescription.getSmallIcon();
-      }
-    }
-    return ret;
-  }
-
-  private static String getLargeIcon(WebServiceDescription webServicesDescription, boolean isJ2EE14, boolean lang)
-  {
-    String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = webServicesDescription.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret =  iconType.getLang();
-        }
-        else
-        {
-        	ret =  iconType.getLargeIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret =  webServicesDescription.getLargeIcon();
-      }
-    }
-    return ret;
-  }
-
-  //PortComponent methods
-  public static String getValue(PortComponent portComponent, DescriptionGroupItem item)
-  {
-    return getValue(portComponent, item, false);
-  }
-  
-  public static String getValue(PortComponent portComponent, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)portComponent.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescription(portComponent, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayName(portComponent, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcon(portComponent, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcon(portComponent, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-  private static String getDescription(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DescriptionType descType = portComponent.getDescriptionType();
-      if (descType!=null)
-      {
-        if (lang)
-        {
-        	ret =  descType.getLang();
-        }
-        else
-        {
-        	ret =  descType.getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret =  portComponent.getDescription();
-      }
-    }
-    return ret;
-  }
-
-  private static String getDisplayName(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      DisplayNameType dnType = portComponent.getDisplayNameType();
-      if (dnType!=null)
-      {
-        if (lang)
-        {
-        	ret =  dnType.getLang();
-        }
-        else
-        {
-        	ret =  dnType.getValue();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret =  portComponent.getDisplayName();
-      }
-    }
-    return ret;
-  }
-
-  private static String getSmallIcon(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-  	String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = portComponent.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret = iconType.getLang();
-        }
-        else
-        {
-        	ret = iconType.getSmallIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if( !lang )
-      {
-      	ret = portComponent.getSmallIcon();
-      }
-    }
-    return ret;
-  }
-
-  private static String getLargeIcon(PortComponent portComponent, boolean isJ2EE14, boolean lang)
-  {
-    String ret = null;
-    if (isJ2EE14)
-    {
-      IconType iconType = portComponent.getIconType();
-      if (iconType!=null)
-      {
-        if (lang)
-        {
-        	ret = iconType.getLang();
-        }
-        else
-        {
-        	ret = iconType.getLargeIcon();
-        }
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if ( !lang )
-      {
-      	ret = portComponent.getLargeIcon();
-      }
-    }
-    return ret;
-  }
-
-  public static String[] getValues(Handler handler, DescriptionGroupItem item)
-  {
-    return getValues(handler, item, false);
-  }
-  
-  public static String[] getValues(Handler handler, DescriptionGroupItem item, boolean getLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)handler.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        return getDescriptions(handler, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        return getDisplayNames(handler, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        return getSmallIcons(handler, isJ2EE14, getLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        return getLargeIcons(handler, isJ2EE14, getLang);        
-        //break;
-      default:
-        return null;      
-    }
-  }
-
-  private static String[] getDescriptions(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] descriptions = handler.getDescriptions().toArray();
-      values = new String[descriptions.length];      
-      if (lang)
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<descriptions.length; i++)
-        {
-          values[i] = ((Description)descriptions[i]).getValue();
-        }
-      }
-
-
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getDescription();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getDisplayNames(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] displayNames = handler.getDisplayNames().toArray();
-      values = new String[displayNames.length];      
-      if (lang)
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<displayNames.length; i++)
-        {
-          values[i] = ((DisplayName)displayNames[i]).getValue();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getDisplayName();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getSmallIcons(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values = null;
-    if (isJ2EE14)
-    {
-      Object[] icons = handler.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getSmallIcon();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getSmallIcon();
-      }
-
-    }
-    return values;
-  }
-
-  private static String[] getLargeIcons(Handler handler, boolean isJ2EE14, boolean lang)
-  {
-  	String[] values =  null;
-    if (isJ2EE14)
-    {
-      Object[] icons = handler.getIcons().toArray();
-      values = new String[icons.length];      
-      if (lang)
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLang();
-        }
-      }
-      else
-      {
-        for(int i =0; i<icons.length; i++)
-        {
-          values[i] = ((IconType)icons[i]).getLargeIcon();
-        }
-      }
-      
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      values = new String[1];
-      if (lang)
-      {
-        //return null since language cannot be specified in J2EE 1.3.
-        values[0] = null;
-      }
-      else
-      {
-        values[0] = handler.getLargeIcon();
-      }
-
-    }
-    return values;
-  }
-
-  //Setter for WebServices
-  public static void setValue(WebServices webServices, DescriptionGroupItem item, String value)
-  {
-    setValue(webServices, item, value, false);
-  }
-  
-  public static void setValue(WebServices webServices, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServices.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(webServices, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(webServices, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(webServices, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(webServices, isJ2EE14, value, setLang);        
-        //break;        
-      default://do nothing ;
-    }
-  }
-
-  private static void setDescription(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      Object[] descriptions = webServices.getDescriptions().toArray();
-      Description firstDescription = null;
-      if (descriptions.length < 1)
-      {
-        //create a Description
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        Description newDescription = factory.createDescription();
-        if (setLang)
-        {
-          newDescription.setLang(value);
-        }
-        else
-        {
-          newDescription.setValue(value);
-        }
-        webServices.getDescriptions().add(newDescription);
-      }
-      else
-      {
-        firstDescription = (Description)descriptions[0];
-        if (setLang)
-        {
-          firstDescription.setLang(value);
-        }
-        else
-        {
-          firstDescription.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      Object[] displayNames = webServices.getDisplayNames().toArray();
-      DisplayName firstDisplayName = null;
-      if (displayNames.length < 1)
-      {
-        //create a DisplayName
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        DisplayName newDisplayName = factory.createDisplayName();
-        if (setLang)
-        {
-          newDisplayName.setLang(value);
-        }
-        else
-        {
-          newDisplayName.setValue(value);
-        }
-
-        webServices.getDisplayNames().add(newDisplayName);
-      }
-      else
-      {
-        firstDisplayName = (DisplayName)displayNames[0];
-        if (setLang)
-        {
-          firstDisplayName.setLang(value);
-        }
-        else
-        {
-          firstDisplayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = webServices.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setSmallIcon(value);
-        }
-        webServices.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setSmallIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(WebServices webServices, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = webServices.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setLargeIcon(value);
-        }
-        webServices.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setLargeIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServices.setLargeIcon(value);
-    }
-    
-  }
-
-
-//Setters for WebServiceDescriptions
-  public static void setValue(WebServiceDescription webServiceDescription, DescriptionGroupItem item, String value)
-  {
-    setValue(webServiceDescription, item, value, false);
-  }
-  
-  public static void setValue(WebServiceDescription webServiceDescription, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)webServiceDescription.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(webServiceDescription, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(webServiceDescription, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(webServiceDescription, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(webServiceDescription, isJ2EE14, value, setLang);        
-        //break;        
-      default:
-    }
-  }
-
-  private static void setDescription(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      
-      DescriptionType description = webServiceDescription.getDescriptionType();
-      if (description == null)
-      {
-        //create a DescriptionType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DescriptionType descriptionNew = factory.createDescriptionType();
-
-        if (setLang)
-        {
-          descriptionNew.setLang(value);
-        }
-        else
-        {
-
-          descriptionNew.setValue(value);
-        }
-        
-        webServiceDescription.setDescriptionType(descriptionNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          description.setLang(value);
-        }
-        else
-        {
-
-          description.setValue(value);
-        }
-        
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      
-      DisplayNameType displayName = webServiceDescription.getDisplayNameType();
-      if (displayName == null)
-      {
-        //create a DisplayNameType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DisplayNameType displayNameNew = factory.createDisplayNameType();
-        if (setLang)
-        {
-          displayNameNew.setLang(value);
-        }
-        else
-        {
-          displayNameNew.setValue(value);
-        }
-        webServiceDescription.setDisplayNameType(displayNameNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          displayName.setLang(value);
-        }
-        else
-        {
-          displayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = webServiceDescription.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setSmallIcon(value);
-        }
-
-        webServiceDescription.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setSmallIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(WebServiceDescription webServiceDescription, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = webServiceDescription.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setLargeIcon(value);
-        }
-
-        webServiceDescription.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setLargeIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        webServiceDescription.setLargeIcon(value);
-    }
-    
-  }
-
-
-//Setters for PortComponents
-  public static void setValue(PortComponent portComponent, DescriptionGroupItem item, String value)
-  {
-
-    setValue(portComponent, item, value, false);
-  }
-  
-  public static void setValue(PortComponent portComponent, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)portComponent.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(portComponent, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(portComponent, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(portComponent, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(portComponent, isJ2EE14, value, setLang);        
-        //break;        
-      default: 
-    }
-  }
-
-  private static void setDescription(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      
-      DescriptionType description = portComponent.getDescriptionType();
-      if (description == null)
-      {
-        //create a DescriptionType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DescriptionType descriptionNew = factory.createDescriptionType();
-        if (setLang)
-        {
-          descriptionNew.setLang(value);
-        }
-        else
-        {
-          descriptionNew.setValue(value);
-        }
-        
-        portComponent.setDescriptionType(descriptionNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          description.setLang(value);
-        }
-        else
-        {
-          description.setValue(value);
-        }
-        
-      }
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      
-      DisplayNameType displayName = portComponent.getDisplayNameType();
-      if (displayName == null)
-      {
-        //create a DisplayNameType
-        WscommonFactory factory = WscommonPackage.eINSTANCE.getWscommonFactory();
-        DisplayNameType displayNameNew = factory.createDisplayNameType();
-        if (setLang)
-        {
-          displayNameNew.setLang(value);
-        }
-        else
-        {
-          displayNameNew.setValue(value);
-        }
-        portComponent.setDisplayNameType(displayNameNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          displayName.setLang(value);
-        }
-        else
-        {
-          displayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = portComponent.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setSmallIcon(value);
-        }
-
-        portComponent.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setSmallIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(PortComponent portComponent, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      IconType icon = portComponent.getIconType();
-      if (icon == null)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType iconNew = factory.createIconType();
-        if (setLang)
-        {
-          iconNew.setLang(value);
-        }
-        else
-        {
-          iconNew.setLargeIcon(value);
-        }
-
-        portComponent.setIconType(iconNew);
-      }
-      else
-      {
-        if (setLang)
-        {
-          icon.setLang(value);
-        }
-        else
-        {
-          icon.setLargeIcon(value);
-        }
-      }
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        portComponent.setLargeIcon(value);
-    }
-    
-  }
-
-  //Setter for Handlers
-  public static void setValue(Handler handler, DescriptionGroupItem item, String value)
-  {
-    setValue(handler, item, value, false);
-  }
-  
-  public static void setValue(Handler handler, DescriptionGroupItem item, String value, boolean setLang)
-  {
-  	J2EEVersionResource res = (J2EEVersionResource)handler.eResource();
-    boolean isJ2EE14=false;
-    if (res.getJ2EEVersionID()==J2EEVersionConstants.J2EE_1_4_ID)
-    {
-      isJ2EE14 = true;
-    }
-    
-    switch (item.getValue())
-    {
-      case DescriptionGroupItem.DESCRIPTION:
-        setDescription(handler, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.DISPLAY_NAME:
-        setDisplayName(handler, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.SMALL_ICON:
-        setSmallIcon(handler, isJ2EE14, value, setLang);
-        //break;
-      case DescriptionGroupItem.LARGE_ICON:
-        setLargeIcon(handler, isJ2EE14, value, setLang);        
-        //break;        
-      default://do nothing ;
-    }
-  }
-
-  private static void setDescription(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Description object
-      Object[] descriptions = handler.getDescriptions().toArray();
-      Description firstDescription = null;
-      if (descriptions.length < 1)
-      {
-        //create a Description
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        Description newDescription = factory.createDescription();
-        if (setLang)
-        {
-          newDescription.setLang(value);
-        }
-        else
-        {
-          newDescription.setValue(value);
-        }
-        handler.getDescriptions().add(newDescription);
-      }
-      else
-      {
-        firstDescription = (Description)descriptions[0];
-        if (setLang)
-        {
-          firstDescription.setLang(value);
-        }
-        else
-        {
-          firstDescription.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setDescription(value);
-    }
-  }
-
-  private static void setDisplayName(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the DisplayName object
-      Object[] displayNames = handler.getDisplayNames().toArray();
-      DisplayName firstDisplayName = null;
-      if (displayNames.length < 1)
-      {
-        //create a DisplayName
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        DisplayName newDisplayName = factory.createDisplayName();
-        if (setLang)
-        {
-          newDisplayName.setLang(value);
-        }
-        else
-        {
-          newDisplayName.setValue(value);
-        }
-
-        handler.getDisplayNames().add(newDisplayName);
-      }
-      else
-      {
-        firstDisplayName = (DisplayName)displayNames[0];
-        if (setLang)
-        {
-          firstDisplayName.setLang(value);
-        }
-        else
-        {
-          firstDisplayName.setValue(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setDisplayName(value);
-    }
-    
-  }
-
-  private static void setSmallIcon(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = handler.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setSmallIcon(value);
-        }
-        handler.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setSmallIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setSmallIcon(value);
-    }
-    
-  }
-
-  private static void setLargeIcon(Handler handler, boolean isJ2EE14, String value, boolean setLang)
-  {
-    if (isJ2EE14)
-    {
-      //Get or create the Icon object
-      Object[] icons = handler.getIcons().toArray();
-      IconType firstIcon = null;
-      if (icons.length < 1)
-      {
-        //create an Icon
-        CommonFactory factory = CommonPackage.eINSTANCE.getCommonFactory();
-        IconType newIcon = factory.createIconType();
-        if (setLang)
-        {
-          newIcon.setLang(value);
-        }
-        else
-        {
-          newIcon.setLargeIcon(value);
-        }
-        handler.getIcons().add(newIcon);
-      }
-      else
-      {
-        firstIcon = (IconType)icons[0];
-        if (setLang)
-        {
-          firstIcon.setLang(value);
-        }
-        else
-        {
-          firstIcon.setLargeIcon(value);
-        }
-        
-      }
-
-        
-    }
-    else //must be J2EE 1.3 (JSR-109 1.0)
-    {
-      if (!setLang)
-        handler.setLargeIcon(value);
-    }
-    
-  }
-  
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupItem.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupItem.java
deleted file mode 100644
index 99e6646..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/DescriptionGroupItem.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.util;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-public final class DescriptionGroupItem extends AbstractEnumerator
-{
-  public static final int DESCRIPTION = 0;
-
-  public static final int DISPLAY_NAME = 1;
-
-  public static final int SMALL_ICON = 2;
-
-  public static final int LARGE_ICON = 3;
-
-  public static final DescriptionGroupItem DESCRIPTION_LITERAL = new DescriptionGroupItem(DESCRIPTION, "description");//$NON-NLS-1$
-  public static final DescriptionGroupItem DISPLAY_NAME_LITERAL = new DescriptionGroupItem(DISPLAY_NAME, "display-name");//$NON-NLS-1$
-  public static final DescriptionGroupItem SMALL_ICON_LITERAL = new DescriptionGroupItem(SMALL_ICON, "small-icon");//$NON-NLS-1$
-  public static final DescriptionGroupItem LARGE_ICON_LITERAL = new DescriptionGroupItem(LARGE_ICON, "large-icon");//$NON-NLS-1$
-
-  private static final DescriptionGroupItem[] VALUES_ARRAY =
-    new DescriptionGroupItem[]
-    {
-      DESCRIPTION_LITERAL,
-      DISPLAY_NAME_LITERAL,
-      SMALL_ICON_LITERAL,
-      LARGE_ICON_LITERAL
-    };
-
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  public static DescriptionGroupItem get(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      DescriptionGroupItem result = VALUES_ARRAY[i];
-      if (result.toString().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  public static DescriptionGroupItem get(int value)
-  {
-    switch (value)
-    {
-      case DESCRIPTION: return DESCRIPTION_LITERAL;
-      case DISPLAY_NAME: return DISPLAY_NAME_LITERAL;
-      case SMALL_ICON: return SMALL_ICON_LITERAL;
-      case LARGE_ICON: return LARGE_ICON_LITERAL;      
-    }
-    return null;	
-  }
-
-  private DescriptionGroupItem(int value, String name)
-  {
-    super(value, name);
-  }
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/QNameHelper.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/QNameHelper.java
deleted file mode 100644
index bc0726e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/webservice/util/QNameHelper.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.util;
-
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-
-
-
-/**
-* JSR-109 v1.1 changed the way qualified names are represented. As a result the EMF model changed as well. 
-* The new model is capable of reading/writing both v1.0 and v1.1 descriptors but the QName APIs work differently
-* depending on the version of the descriptor. This class provides static methods to set values on QName's in order
-* to hide and isolate the version checking logic.
-*/
-public class QNameHelper
-{
-
-  private static String DEFAULT_PREFIX="pfx";//$NON-NLS-1$
-
-  /*
-  * Sets the namespaceURI and the localpart on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set. If the QName does not belong to a Resource,
-  *                                    the version is assumed to be J2EE 1.4.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameNamespaceURI(QName qnameEObject, String namespaceURI)
-  {
-    String localpart = qnameEObject.getLocalPart();
-    setQNameValue(qnameEObject, namespaceURI, localpart);    
-  }
-  
-  /*
-  * Sets the namespaceURI and the localpart on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set. If the QName does not belong to a Resource,
-  *                                    the version is assumed to be J2EE 1.4.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameValue(QName qnameEObject, String namespaceURI, String localPart)
-  {
-    setQNameValue(qnameEObject, namespaceURI, localPart, ""); //$NON-NLS-1$   
-  }
-
-  /**
-  * Sets the namespaceURI, localpart, and prefix on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set. If the QName does not belong to a Resource,
-  *                                    the version is assumed to be J2EE 1.4.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @param prefix The prefix. Used in JSR-109 v1.1 only. This is the prefix that will be used for the namespace declaration
-                           If the supplied prefix is null or of length 0, the existing prefix is used. If no prefix exists, and this
-  *                       is a JSR-109 v1.1 descriptor the default prefix defined in DEFAULT_PREFIX is used.
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameValue(QName qnameEObject, String namespaceURI, String localPart, String prefix)
-  {
-    int versionID;
-    
-    //Get the versionID from the QName's Resource if available
-    J2EEVersionResource res = (J2EEVersionResource)qnameEObject.eResource();
-    if (res == null)
-    {
-      //use a J2EE 1.4 version ID as the default
-      versionID = J2EEVersionConstants.J2EE_1_4_ID;
-    }
-    else
-    {
-      versionID = res.getJ2EEVersionID();
-    }
-
-    setQNameValue(qnameEObject, namespaceURI, localPart, prefix, versionID);
-    
-    
-  }
-
-  /**
-  * Sets the namespaceURI, localpart, and prefix on the supplied QName to the supplied values respectively.
-  * @param qnameEObject The properties on this QName will be set.
-  * @param namespaceURI The namespaceURI
-  * @param localPart The localPart
-  * @param prefix The prefix. Used in JSR-109 v1.1 only. This is the prefix that will be used for the namespace declaration
-                           If the supplied prefix is null or of length 0, the existing prefix is used. If no prefix exists, and this
-  *                       is a JSR-109 v1.1 descriptor the default prefix defined DEFAULT_PREFIX is used.
-  *@param versionID The J2EE version. Should be set to one of the version IDs defined in J2EEVersionConstants.
-  * @return boolean Returns true if values were set successfully. False otherwise.
-  */
-  public static void setQNameValue(QName qnameEObject, String namespaceURI, String localPart, String prefix, int versionID)
-  {      
-
-    if (versionID==J2EEVersionConstants.J2EE_1_3_ID)
-    {
-      //ignore the prefix and set things the old way
-      qnameEObject.setNamespaceURI(namespaceURI);
-      qnameEObject.setLocalPart(localPart);    
-    }
-    else
-    {
-      //resource is J2EE 1.4
-      if (prefix==null || prefix.length()==0)
-      {
-        //use the existing prefix
-        prefix = qnameEObject.getInternalPrefixOrNsURI();
-        if (prefix==null || prefix.length()==0)
-        {
-          //use the default prefix
-          prefix = new String(DEFAULT_PREFIX);
-        }
-      }
-      qnameEObject.setValues(prefix, namespaceURI, localPart);
-    
-    }
-    
-  }
-  
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/CollectingErrorHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/CollectingErrorHandler.java
deleted file mode 100644
index 31337e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/CollectingErrorHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-/**
- * Insert the type's description here.
- * Creation date: (03/19/01 11:10:38 AM)
- * @author: Administrator
- */
-public class CollectingErrorHandler implements ErrorHandler {
-	protected List caughtExceptions;
-/**
- * CollectingErrorHandler constructor comment.
- */
-public CollectingErrorHandler() {
-	super();
-}
-/**
- * @see org.xml.sax.ErrorHandler
- */
-public void error(SAXParseException exception) throws SAXException {
-	getCaughtExceptions().add(exception);
-}
-/**
- * @see org.xml.sax.ErrorHandler
- */
-public void fatalError(SAXParseException exception) throws SAXException {
-	getCaughtExceptions().add(exception);
-}
-public List getCaughtExceptions() {
-	if (caughtExceptions == null) {
-		caughtExceptions = new ArrayList();
-	}
-	return caughtExceptions;
-}
-
-/**
- * @see org.xml.sax.ErrorHandler
- */
-public void warning(SAXParseException exception) throws SAXException {
-	getCaughtExceptions().add(exception);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/DeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/DeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 63218d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/DeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-
-/**
- * This interface represents a catalog of all the tag names which may be shared in 
- * a deployment descriptor for EJBJars, ears, and wars. Interface shared by readers and 
- * writers to have access to common constants
- */
-
-public interface DeploymentDescriptorXmlMapperI {
-	String DESCRIPTION = "description";//$NON-NLS-1$
-	String DISPLAY_NAME = "display-name";//$NON-NLS-1$
-	String EJB_LINK = "ejb-link";//$NON-NLS-1$
-	String ENV_ENTRY = "env-entry";//$NON-NLS-1$
-	String ENV_ENTRY_NAME = "env-entry-name";//$NON-NLS-1$
-	String ENV_ENTRY_TYPE = "env-entry-type";//$NON-NLS-1$
-	String ENV_ENTRY_VALUE = "env-entry-value";//$NON-NLS-1$
-	String EJB_LOCAL_REF = "ejb-local-ref";	//$NON-NLS-1$				// J2EE1.3
-	String EJB_REF = "ejb-ref";//$NON-NLS-1$
-	String EJB_REF_NAME = "ejb-ref-name";//$NON-NLS-1$
-	String EJB_REF_TYPE = "ejb-ref-type";//$NON-NLS-1$
-	String HOME = "home";//$NON-NLS-1$
-	String ICON = "icon";//$NON-NLS-1$
-	String ID = "id";//$NON-NLS-1$
-	String LARGE_ICON = "large-icon";//$NON-NLS-1$
-	String LARGE_ICON_PATH = "icon/large-icon";//$NON-NLS-1$
-	String LOCAL = "local";//$NON-NLS-1$									// J2EE1.3
-	String LOCAL_HOME = "local-home";//$NON-NLS-1$						// J2EE1.3
-	String REMOTE = "remote";//$NON-NLS-1$
-	String RES_AUTH = "res-auth";//$NON-NLS-1$
-	String RES_REF_NAME = "res-ref-name";//$NON-NLS-1$
-	String RES_SHARING_SCOPE = "res-sharing-scope";//$NON-NLS-1$ 		// J2EE1.3 
-	String RES_TYPE = "res-type";//$NON-NLS-1$
-	String RESOURCE_ENV_REF = "resource-env-ref"; //$NON-NLS-1$			// J2EE1.3
-	String RESOURCE_ENV_REF_NAME = "resource-env-ref-name";//$NON-NLS-1$ // J2EE1.3
-	String RESOURCE_ENV_REF_TYPE = "resource-env-ref-type";//$NON-NLS-1$ // J2EE1.3
-	String RESOURCE_REF = "resource-ref";//$NON-NLS-1$
-	String ROLE_LINK = "role-link";//$NON-NLS-1$
-	String ROLE_NAME = "role-name";//$NON-NLS-1$
-	String RUN_AS = "run-as";	//$NON-NLS-1$							// J2EE1.3
-	String SECURITY_IDENTITY = "security-identity";	//$NON-NLS-1$		// J2EE1.3
-	String SECURITY_ROLE = "security-role";//$NON-NLS-1$
-	String SECURITY_ROLE_REF = "security-role-ref";//$NON-NLS-1$
-	String SMALL_ICON = "small-icon";//$NON-NLS-1$
-	String SMALL_ICON_PATH = "icon/small-icon";//$NON-NLS-1$
-	String USE_CALLER_IDENTITY = "use-caller-identity";//$NON-NLS-1$		// J2EE1.3
-	
-	
-	//	J2EE 1.4
-	String LANG = "xml:lang";//$NON-NLS-1$
-	String DEPLOY_EXT = "deployment-extension";		//$NON-NLS-1$		// J2EE1.4
-	String EXT_ELEMENT = "extension-element";	//$NON-NLS-1$			// J2EE1.4
-	String MESSAGE_DEST_REF = "message-destination-ref";//$NON-NLS-1$	// J2EE1.4
-	String MESSAGE_DEST_REF_NAME = "message-destination-ref-name";//$NON-NLS-1$	// J2EE1.4
-	String MESSAGE_DEST_TYPE = "message-destination-type";//$NON-NLS-1$			// J2EE1.4
-	String MESSAGE_DEST_LINK = "message-destination-link";	//$NON-NLS-1$		// J2EE1.4
-	String MESSAGE_DEST_USAGE = "message-destination-usage";//$NON-NLS-1$		// J2EE1.4
-	String MESSAGE_DEST = "message-destination";	//$NON-NLS-1$			// J2EE1.4
-	String MESSAGE_DEST_NAME = "message-destination-name";	//$NON-NLS-1$			// J2EE1.4
-	String SERVICE_REF = "service-ref";//$NON-NLS-1$
-	String SERVICE_REF_NAME = "service-ref-name";//$NON-NLS-1$
-	String SERVICE_INTERFACE = "service-interface";//$NON-NLS-1$
-	String WSDL_FILE = "wsdl-file";//$NON-NLS-1$
-	String JAXRPC_MAPPING_FILE = "jaxrpc-mapping-file";//$NON-NLS-1$
-	String SERVICE_QNAME = "service-qname";//$NON-NLS-1$
-	String PORT_COMPONENT_REF = "port-component-ref";//$NON-NLS-1$
-	String HANDLER = "handler";//$NON-NLS-1$
-	String SERVICE_ENPOINT_INTERFACE = "service-endpoint-interface";//$NON-NLS-1$
-	String PORT_COMPONENT_LINK = "port-component-link";//$NON-NLS-1$
-	String HANDLER_NAME = "handler-name";//$NON-NLS-1$
-	String HANDLER_CLASS = "handler-class";//$NON-NLS-1$
-	String HANDLER_INIT_PARAM = "init-param";//$NON-NLS-1$
-	String SOAP_HEADER = "soap-header";//$NON-NLS-1$
-	String SOAP_ROLE = "soap-role";//$NON-NLS-1$
-	String PORT_NAME = "port-name";//$NON-NLS-1$
-	String VERSION = "version";//$NON-NLS-1$
-	String XML_NS = "xmlns";//$NON-NLS-1$
-	String XML_NS_XSI = "xmlns:xsi";//$NON-NLS-1$
-	String XSI_SCHEMA_LOCATION = "xsi:schemaLocation";//$NON-NLS-1$
-	String NAMESPACE = "namespace";//$NON-NLS-1$
-	String MUSTUNDERSTAND = "mustUnderstand";//$NON-NLS-1$
-	String PARAM_NAME = "param-name";//$NON-NLS-1$
-	String PARAM_VALUE = "param-value";//$NON-NLS-1$
-	String LISTENER_CLASS = "listener-class";//$NON-NLS-1$	// Servlet2.3
-	
-	
-	
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EarDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EarDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 45c82e2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EarDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an EAR deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface EarDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	String ALT_DD = "alt-dd";//$NON-NLS-1$
-	String APPLICATION = "application";//$NON-NLS-1$
-	String CONTEXT_ROOT = "context-root";//$NON-NLS-1$
-	String EJB = "ejb";//$NON-NLS-1$
-	String JAVA = "java";//$NON-NLS-1$
-	String MODULE = "module";//$NON-NLS-1$
-	String WEB = "web";//$NON-NLS-1$
-	String WEB_URI = "web-uri";//$NON-NLS-1$
-	String CONNECTOR = "connector";//$NON-NLS-1$
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EjbDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EjbDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index b57ecb1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/EjbDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an EJB Jar deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-
-public interface EjbDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	String ABSTRACT_SCHEMA_NAME = "abstract-schema-name"; //$NON-NLS-1$	// EJB2.0
-	String ACKNOWLEDGE_MODE = "acknowledge-mode";//$NON-NLS-1$ 			// EJB2.0
-	String ASSEMBLY_DESCRIPTOR = "assembly-descriptor";//$NON-NLS-1$
-	String BEAN = "Bean";//$NON-NLS-1$
-	String CASCADE_DELETE = "cascade-delete";//$NON-NLS-1$ 				// EJB2.0
-	String CMP_FIELD = "cmp-field";//$NON-NLS-1$
-	String CMP_VERSION = "cmp-version";		//$NON-NLS-1$				// EJB2.0
-	String CMR_FIELD = "cmr-field";		//$NON-NLS-1$					// EJB2.0
-	String CMR_FIELD_NAME = "cmr-field-name";//$NON-NLS-1$				// EJB2.0
-	String CMR_FIELD_TYPE = "cmr-field-type";//$NON-NLS-1$				// EJB2.0
-	String CONTAINER = "Container";//$NON-NLS-1$
-	String CONTAINER_TRANSACTION = "container-transaction";//$NON-NLS-1$
-	String DESTINATION_TYPE = "destination-type";	//$NON-NLS-1$		// EJB2.0
-	String EJB_CLASS = "ejb-class";//$NON-NLS-1$
-	String EJB_CLIENT_JAR = "ejb-client-jar";//$NON-NLS-1$
-	String EJB_JAR = "ejb-jar";//$NON-NLS-1$
-	String EJB_NAME = "ejb-name";//$NON-NLS-1$
-	String EJB_QL = "ejb-ql";		//$NON-NLS-1$						// EJB2.0
-	String EJB_RELATION = "ejb-relation";//$NON-NLS-1$					// EJB2.0
-	String EJB_RELATION_NAME = "ejb-relation-name";	//$NON-NLS-1$		// EJB2.0
-	String EJB_RELATIONSHIP_ROLE = "ejb-relationship-role";//$NON-NLS-1$	// EJB2.0
-	String EJB_RELATIONSHIP_ROLE_NAME = "ejb-relationship-role-name";//$NON-NLS-1$ // EJB2.0
-	String ENTERPRISE_BEANS = "enterprise-beans";//$NON-NLS-1$
-	String ENTITY = "entity";//$NON-NLS-1$
-	String EXCLUDE_LIST = "exclude-list";	//$NON-NLS-1$// EJB2.0 - MODELED???
-	String FIELD_NAME = "field-name";//$NON-NLS-1$
-	String MESSAGE_DRIVEN = "message-driven";	//$NON-NLS-1$			// EJB2.0
-	String MESSAGE_DRIVEN_DESTINATION = "message-driven-destination"; //$NON-NLS-1$// EJB2.0
-	String MESSAGE_SELECTOR = "message-selector";	//$NON-NLS-1$		// EJB2.0
-	String METHOD = "method";//$NON-NLS-1$
-	String METHOD_INTF = "method-intf";//$NON-NLS-1$
-	String METHOD_NAME = "method-name";//$NON-NLS-1$
-	String METHOD_PARAM = "method-param";//$NON-NLS-1$
-	String METHOD_PARAMS = "method-params";//$NON-NLS-1$
-	String METHOD_PERMISSION = "method-permission";//$NON-NLS-1$
-	String MULTIPLICITY = "multiplicity";//$NON-NLS-1$					// EJB2.0
-	String PERSISTENCE_TYPE = "persistence-type";//$NON-NLS-1$
-	String PRIM_KEY_CLASS = "prim-key-class";//$NON-NLS-1$
-	String PRIMKEY_FIELD = "primkey-field";//$NON-NLS-1$
-	String REENTRANT = "reentrant";//$NON-NLS-1$
-	String RELATIONSHIP_ROLE_SOURCE = "relationship-role-source";//$NON-NLS-1$ // EJB2.0
-	String RELATIONSHIPS = "relationships"; 	//$NON-NLS-1$			// EJB2.0
-	String RESULT_TYPE_MAPPING = "result-type-mapping";	//$NON-NLS-1$	// EJB2.0
-	String QUERY = "query";			//$NON-NLS-1$						// EJB2.0
-	String QUERY_METHOD = "query-method";	//$NON-NLS-1$				// EJB2.0
-	String SESSION = "session";//$NON-NLS-1$
-	String SESSION_TYPE = "session-type";//$NON-NLS-1$
-	String SUBSCRIPTION_DURABILITY = "subscription-durability";//$NON-NLS-1$ // EJB2.0
-	String TRANS_ATTRIBUTE = "trans-attribute";//$NON-NLS-1$
-	String TRANSACTION_TYPE = "transaction-type";//$NON-NLS-1$
-	String UNCHECKED = "unchecked";			//$NON-NLS-1$				// EJB2.0
-
-	//EJB 2.1	
-	String SERVICE_ENDPOINT = "service-endpoint";//$NON-NLS-1$
-	String MESSAGING_TYPE = "messaging-type";//$NON-NLS-1$
-	String MESSAGE_DEST_TYPE = "message-destination-type";//$NON-NLS-1$
-	String MESSAGE_DEST_LINK = "message-destination-link";//$NON-NLS-1$
-	String ACTIVATION_CONF = "activation-config";//$NON-NLS-1$
-	String ACTIVATION_CONF_PROPERTY = "activation-config-property";//$NON-NLS-1$
-	String ACTIVATION_CONF_PROPERTY_NAME = "activation-config-property-name";//$NON-NLS-1$
-	String ACTIVATION_CONF_PROPERTY_VALUE = "activation-config-property-value";//$NON-NLS-1$
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java
deleted file mode 100644
index fdd61f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-/**
- * Insert the type's description here.
- * Creation date: (4/11/2001 11:58:50 AM)
- * @author: Administrator
- */
-public class GeneralXmlDocumentReader
-{
-    protected InputSource inputSource;
-    protected EntityResolver entityResolver;
-    protected ErrorHandler errorHandler;
-    protected boolean doValidate = false;
-    protected boolean doAllowJavaEncodings = false;
-
-/**
- * GeneralXmlDocumentReader constructor comment.
- */
-    public GeneralXmlDocumentReader() 
-    {
-        super();
-    }
-/**
- * GeneralXmlDocumentReader constructor comment.
- */
-    public GeneralXmlDocumentReader(InputSource source) 
-    {
-        super();
-        setInputSource(source);
-    }
-/**
- * GeneralXmlDocumentReader constructor comment.
- */
-    public GeneralXmlDocumentReader(InputSource source, EntityResolver resolver, ErrorHandler handler) 
-    {
-        super();
-        setInputSource(source);
-        setEntityResolver(resolver);
-        setErrorHandler(handler);
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.EntityResolver
- */
-    protected org.xml.sax.EntityResolver createDefaultEntityResolver() 
-    {
-        return null;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.ErrorHandler
- */
-    protected org.xml.sax.ErrorHandler createDefaultErrorHandler() 
-    {
-        return new ErrorHandler() {
-        	/* (non-Javadoc)
-			 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
-			 */
-			public void error(SAXParseException exception) throws SAXException {
-				throw exception;
-			}
-			/* (non-Javadoc)
-			 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
-			 */
-			public void fatalError(SAXParseException exception) throws SAXException {
-				throw exception;
-			}
-			/* (non-Javadoc)
-			 * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
-			 */
-			public void warning(SAXParseException exception) throws SAXException {
-				Logger.getLogger().logWarning(exception);
-			}
-        };
-    }
-    protected javax.xml.parsers.DocumentBuilder createNewDOMParser() 
-    {
-        try
-        {
-            javax.xml.parsers.DocumentBuilderFactory dbf = javax.xml.parsers.DocumentBuilderFactory.newInstance();
-            setFeatures(dbf);
-            return dbf.newDocumentBuilder();
-
-        }
-        catch (Exception ie)
-        {
-            handleException(J2EEXMLResourceHandler.getString("failed_instantiating_EXC_", (new Object[] {"Failed to instantiate parser"})), ie); //$NON-NLS-1$ //$NON-NLS-2$ = "Failed instantiating: "
-        }
-        return null;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @return boolean
- */
-    public boolean doAllowJavaEncodings() 
-    {
-        return doAllowJavaEncodings;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @return boolean
- */
-    public boolean doValidate() 
-    {
-        return doValidate;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 1:34:14 PM)
- * @return java.lang.ClassLoader
- */
-    public java.lang.ClassLoader getClassLoader() 
-    {
-        ClassLoader cl = getClass().getClassLoader();
-        if (cl == null)
-            cl = Thread.currentThread().getContextClassLoader();
-        if (cl == null)
-            cl = ClassLoader.getSystemClassLoader();
-
-        return cl;
-    }
-    public Document getDocument() 
-    {
-        return parseDocument();
-    }
-    
-    protected Document getDocument(javax.xml.parsers.DocumentBuilder domParser) 
-    {
-        return domParser.newDocument();
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.EntityResolver
- */
-    public org.xml.sax.EntityResolver getEntityResolver() 
-    {
-        if (entityResolver == null)
-            entityResolver = createDefaultEntityResolver();
-        return entityResolver;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.ErrorHandler
- */
-    public org.xml.sax.ErrorHandler getErrorHandler() 
-    {
-        if (errorHandler == null)
-        {
-            errorHandler = createDefaultErrorHandler();
-        }
-        return errorHandler;
-    }
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @return org.xml.sax.InputSource
- */
-    public org.xml.sax.InputSource getInputSource() 
-    {
-        return inputSource;
-    }
-    
-    protected void handleException(String aMessage, Throwable anException) 
-    {
-        if (anException instanceof InvocationTargetException)
-        {
-            InvocationTargetException invocationEx =
-            (InvocationTargetException) anException;
-            if (invocationEx.getTargetException() != null)
-                handleException(aMessage, invocationEx.getTargetException());
-        }
-        else
-            primHandleException(aMessage, anException);
-    }
-    
-    protected Document parse(javax.xml.parsers.DocumentBuilder domParser, InputSource is) 
-    {
-        try
-        {
-            return domParser.parse(is);
-        }
-        catch (org.xml.sax.SAXException ex)
-        {
-            handleException(J2EEXMLResourceHandler.getString("failed_instantiating_EXC_", (new Object[] {"SAX Parser error"})), ex); //$NON-NLS-1$ //$NON-NLS-2$ = "Failed instantiating: "
-
-        }
-        catch (java.io.IOException ex)
-        {
-            handleException(J2EEXMLResourceHandler.getString("failed_instantiating_EXC_", (new Object[] {"IO Exception on input stream"})), ex); //$NON-NLS-1$ //$NON-NLS-2$ = "Failed instantiating: "
-        }
-        return null;
-    }
-
-
-    public Document parseDocument() 
-    {
-    	ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-    	try {
-    		Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-			javax.xml.parsers.DocumentBuilder parser = createNewDOMParser();
-        	setEntityResolver(parser);
-        	setErrorHandler(parser);
-        	return parse(parser, getInputSource());
-	} finally {
-      Thread.currentThread().setContextClassLoader(prevClassLoader);
-	}
-    	
-    	
-    	
-    	
-        
-    }
-    
-    protected void primHandleException(String aMessage, Throwable anException) 
-    {
-        org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(anException);
-        throw new RuntimeException(aMessage);
-
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @param newAllowJavaEncodings boolean
- */
-    public void setAllowJavaEncodings(boolean newAllowJavaEncodings) 
-    {
-        doAllowJavaEncodings = newAllowJavaEncodings;
-    }
-    
-    protected void setEntityResolver(javax.xml.parsers.DocumentBuilder domParser) 
-    {
-        if (getEntityResolver() != null)
-        {
-            domParser.setEntityResolver(getEntityResolver());
-        }
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @param newEntityResolver org.xml.sax.EntityResolver
- */
-    public void setEntityResolver(org.xml.sax.EntityResolver newEntityResolver) 
-    {
-        entityResolver = newEntityResolver;
-    }
-    
-
-    protected void setErrorHandler(javax.xml.parsers.DocumentBuilder domParser) 
-    {
-        if (getErrorHandler() != null)
-        {
-            domParser.setErrorHandler(getErrorHandler());
-        }
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @param newErrorHandler org.xml.sax.ErrorHandler
- */
-    public void setErrorHandler(org.xml.sax.ErrorHandler newErrorHandler) 
-    {
-        errorHandler = newErrorHandler;
-    }
-
-    protected void setFeatures(javax.xml.parsers.DocumentBuilderFactory domParser) 
-    {
-        try {
-			domParser.setValidating(doValidate());
-	        domParser.setAttribute("http://apache.org/xml/features/allow-java-encodings", new Boolean(doAllowJavaEncodings())); //$NON-NLS-1$
-	        domParser.setExpandEntityReferences(true);
-		} catch(IllegalArgumentException e) {
-			//Ignore
-		}
-    }
-
-
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:04:18 PM)
- * @param newInputSource org.xml.sax.InputSource
- */
-    public void setInputSource(org.xml.sax.InputSource newInputSource) 
-    {
-        inputSource = newInputSource;
-    }
-/**
- * Insert the method's description here.
- * Creation date: (4/11/2001 12:01:34 PM)
- * @param newValidate boolean
- */
-    public void setValidate(boolean newValidate) 
-    {
-        doValidate = newValidate;
-    }
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXMLResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXMLResourceHandler.java
deleted file mode 100644
index 8419f9f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXMLResourceHandler.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.internal.xml;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class J2EEXMLResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("j2eexml");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String, String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle= getResourceBundle();
-		}
-		
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		} 
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-		
-	}
-public static String getString(String key, Object[] args) {
-
-	try {return MessageFormat.format(getString(key), args);}
-	catch (IllegalArgumentException e) {return getString(key);}
-
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXmlDtDEntityResolver.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXmlDtDEntityResolver.java
deleted file mode 100644
index d9d1c7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/J2EEXmlDtDEntityResolver.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-import java.io.FileNotFoundException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-public class J2EEXmlDtDEntityResolver implements org.xml.sax.EntityResolver {
-
-	/** All the dtds that this resolver knows about; import strategies register these
-	 * at startup */ 
-	protected static Map supportedDtDs;
-//	static {
-//		registerDtD("http://www.w3.org/2001/xml.xsd", "xml.xsd");  //$NON-NLS-1$ //$NON-NLS-2$
-//		registerDtD("XMLSchema.dtd", "XMLSchema.dtd"); //$NON-NLS-1$ //$NON-NLS-2$
-//		registerDtD("datatypes.dtd", "datatypes.dtd"); //$NON-NLS-1$ //$NON-NLS-2$
-//	}
-	public static J2EEXmlDtDEntityResolver INSTANCE = new J2EEXmlDtDEntityResolver();
-/**
- * EjbXmlEntityResolver constructor comment.
- */
-public J2EEXmlDtDEntityResolver() {
-	super();
-}
-public static Map getSupportedDtDs() {
-	if (supportedDtDs == null)
-		supportedDtDs = new HashMap();
-	return supportedDtDs;
-}
-/**
- * Maps the system id for the dtd to a local id to be retrieved loaded from the class path
- */
-public static void registerDtD(String systemID, String localID) { 
-    //TODO Removing Registration mechanism until final location is found
-	/*getSupportedDtDs().put(systemID, localID);
-	getSupportedDtDs().put(getShortName(systemID), localID);*/
-}
-/**
- * for a system id with a URL that begins with "http://java.sun.com/", check to see if that is a recognized dtd;
- * if so, load the dtd from the class path using the value of the registered dtd.
- *
- * @return an Input source on a locally resolved dtd, or null of the systemid does not start with "http://java.sun.com/"
- * 
- * @throws SAXException with a nested NotSupportedException if the dtd is not recognized
- * @throws FileNotFoundException if the resolved dtd cannot be loaded from the classpath
- */
-public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) throws java.io.IOException, org.xml.sax.SAXException {
-	String localResourceName = null;
-	boolean isJavaSytemId = false;
-	if (shouldBeRegistered(systemId)) {
-		localResourceName = (String)getSupportedDtDs().get(systemId);
-		isJavaSytemId = true;	
-	} else {
-		String shortName = getShortName(systemId);
-		localResourceName = (String)getSupportedDtDs().get(shortName);
-		if (localResourceName != null)
-			systemId = localResourceName;
-	}
-		
-	if (localResourceName == null) {
-		if (isJavaSytemId) {
-			String message = J2EEXMLResourceHandler.getString("unsupported_type_EXC_", (new Object[] {publicId, systemId })); //$NON-NLS-1$ = "Type is unrecognized or not yet supported: PUBLIC_ID= {0};SYSTEM_ID={1}"
-			throw new org.xml.sax.SAXException(new NotSupportedException(message));
-		}
-		return null;
-	} 
-	ClassLoader loader = getClass().getClassLoader();
-	URL url = null;
-	if (loader == null) {	    
-		url = ClassLoader.getSystemResource(localResourceName);
-	} else {	    
-		url = loader.getResource(localResourceName);
-	}
-	
-	
-	if (url == null) {
-		String message = J2EEXMLResourceHandler.getString("dtd_not_found_EXC_", (new Object[] {localResourceName}));//$NON-NLS-1$ = "Could not parse xml because the resolved resource "{0}" could not be found in classpath"
-		throw new java.io.FileNotFoundException(message);
-	}
-	
-	InputSource result = new InputSource(url.toString());
-	result.setPublicId(publicId);	
-	// force the encoding to be UTF8
-	result.setEncoding("UTF-8"); //$NON-NLS-1$
-	
-	return result;
-}
-protected boolean shouldBeRegistered(String systemId) {
-	//TODO  Removed Resolver function until file location is known...
-	return false;
-	/*return systemId.startsWith(J2EEConstants.JAVA_SUN_COM_URL) 
-		|| systemId.startsWith(J2EEConstants.WWW_W3_ORG_URL)
-		|| systemId.startsWith(J2EEConstants.WWW_IBM_COM_URL);*/
-}
-
-/**
- * Returns the filename from the uri, or the segment after the last occurrence of a separator
- */
-private static String getShortName(String uri) {
-	String tempURI = uri.replace('\\', '/');
-	while (tempURI.endsWith("/")) //$NON-NLS-1$
-		tempURI = tempURI.substring(0, tempURI.length()-1);
-	int lastIndex = tempURI.lastIndexOf('/');
-	if (lastIndex == -1)
-		return uri;
-	return uri.substring(lastIndex+1, tempURI.length());
-}
-}
-
-
-
- 
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/MissingRequiredDataException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/MissingRequiredDataException.java
deleted file mode 100644
index 4d1f229..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/MissingRequiredDataException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-public class MissingRequiredDataException extends RuntimeException {
-
-private static final long serialVersionUID = -301039854542561304L;
-/**
- * MissingRequiredDataException constructor comment.
- */
-public MissingRequiredDataException() {
-	super();
-}
-/**
- * MissingRequiredDataException constructor comment.
- * @param s java.lang.String
- */
-public MissingRequiredDataException(String s) {
-	super(s);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/NotSupportedException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/NotSupportedException.java
deleted file mode 100644
index dbb5d1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/NotSupportedException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-import org.eclipse.jst.j2ee.internal.WrappedRuntimeException;
-
-
-
-
-public class NotSupportedException extends WrappedRuntimeException {
-private static final long serialVersionUID = -3535594720987598196L;
-/**
- * NotSupportedException constructor comment.
- */
-public NotSupportedException() {
-	super();
-}
-/**
- * NotSupportedException constructor comment.
- * @param e java.lang.Exception
- */
-public NotSupportedException(Exception e) {
-	super(e);
-}
-/**
- * NotSupportedException constructor comment.
- * @param s java.lang.String
- */
-public NotSupportedException(String s) {
-	super(s);
-}
-/**
- * NotSupportedException constructor comment.
- * @param s java.lang.String
- * @param e java.lang.Exception
- */
-public NotSupportedException(String s, Exception e) {
-	super(s, e);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/RarDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/RarDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 78993ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/RarDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an RAR deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface RarDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	public String AUTH_MECHANISM = "authentication-mechanism";//$NON-NLS-1$
-	public String AUTH_MECH_TYPE = "authentication-mechanism-type";//$NON-NLS-1$
-	public String CONFIG_PROPERTY = "config-property";//$NON-NLS-1$
-	public String CONFIG_PROPERTY_NAME = "config-property-name";//$NON-NLS-1$
-	public String CONFIG_PROPERTY_VALUE = "config-property-value";//$NON-NLS-1$
-	public String CONFIG_PROPERTY_TYPE = "config-property-type";//$NON-NLS-1$
-	public String CONNECTOR = "connector";//$NON-NLS-1$
-	public String CONNECTIONFACTORY_INTERFACE = "connectionfactory-interface";//$NON-NLS-1$
-	public String CONNECTIONFACTORY_IMPL_CLASS = "connectionfactory-impl-class";//$NON-NLS-1$
-	public String CONNECTION_INTERFACE = "connection-interface";//$NON-NLS-1$
-	public String CONNECTION_IMPL_CLASS = "connection-impl-class";//$NON-NLS-1$
-	public String CREDENTIAL_INTERFACE = "credential-interface";//$NON-NLS-1$
-	public String EIS_TYPE = "eis-type";//$NON-NLS-1$
-	public String LICENSE = "license";//$NON-NLS-1$
-	public String LICENSE_REQUIRED = "license-required";//$NON-NLS-1$
-	public String MANAGEDCONNECTIONFACTORY_CLASS = "managedconnectionfactory-class";//$NON-NLS-1$
-	public String REAUTHENTICATION_SUPPORT = "reauthentication-support";//$NON-NLS-1$
-	public String RESOURCEADAPTER = "resourceadapter";//$NON-NLS-1$
-	public String SECURITY_PERMISSION = "security-permission";//$NON-NLS-1$
-	public String SECURITY_PERMISSION_SPEC = "security-permission-spec";//$NON-NLS-1$
-	public String SPEC_VERSION = "spec-version";//$NON-NLS-1$
-	public String TRANSACTION_SUPPORT = "transaction-support";//$NON-NLS-1$
-	public String VENDOR_NAME = "vendor-name";//$NON-NLS-1$
-	//JCA 1.5
-	public String RESOURCEADAPTER_VERSION = "resourceadapter-version";//$NON-NLS-1$
-	public String RESOURCEADAPTER_CLASS = "resourceadapter-class";//$NON-NLS-1$
-	public String OUTBOUND_RESOURCEADAPTER = "outbound-resourceadapter";//$NON-NLS-1$
-	public String INBOUND_RESOURCEADAPTER = "inbound-resourceadapter";//$NON-NLS-1$
-	
-	public String CONNECTION_DEFINITION = "connection-definition";//$NON-NLS-1$
-	public String MESSAGEADAPTER = "messageadapter";//$NON-NLS-1$
-	public String MESSAGELISTENER = "messagelistener";//$NON-NLS-1$
-	public String MESSAGELISTENER_TYPE = "messagelistener-type";//$NON-NLS-1$
-	public String ACTIVATIONSPEC = "activationspec";//$NON-NLS-1$
-	public String ACTIVATIONSPEC_CLASS = "activationspec-class";//$NON-NLS-1$
-	public String REQUIRED_CONFIG_PROPERTY = "required-config-property";//$NON-NLS-1$
-	
-	public String ADMINOBJECT = "adminobject";//$NON-NLS-1$
-	public String ADMINOBJECT_CLASS = "adminobject-class";//$NON-NLS-1$
-	public String ADMINOBJECT_INTERFACE = "adminobject-interface"; //$NON-NLS-1$
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WarDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WarDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index acf0eae..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WarDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-/**
- * This interface represents a catalog of all the tag names which occur in 
- * an WAR deployment descriptor. Interface shared by readers and 
- * writers to have access to common constants
- */
-public interface WarDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI {
-	public String AUTH_CONSTRAINT = "auth-constraint";//$NON-NLS-1$
-	public String AUTH_METHOD = "auth-method";//$NON-NLS-1$
-	public String CONTEXT_PARAM = "context-param";//$NON-NLS-1$
-	public String DISTRIBUTABLE = "distributable";//$NON-NLS-1$
-	public String ERROR_CODE = "error-code";//$NON-NLS-1$
-	public String ERROR_PAGE = "error-page";//$NON-NLS-1$
-	public String EXCEPTION_TYPE = "exception-type";//$NON-NLS-1$
-	public String EXTENSION = "extension";//$NON-NLS-1$
-	public String FILTER = "filter";			//$NON-NLS-1$		// Servlet2.3
-	public String FILTER_MAPPING = "filter-mapping";//$NON-NLS-1$	// Servlet2.3
-	public String FILTER_NAME = "filter-name";		//$NON-NLS-1$	// Servlet2.3
-	public String FILTER_CLASS = "filter-class";//$NON-NLS-1$		// Servlet2.3
-	public String FORM_ERROR_PAGE = "form-error-page";//$NON-NLS-1$
-	public String FORM_LOGIN_CONFIG = "form-login-config";//$NON-NLS-1$
-	public String FORM_LOGIN_PAGE = "form-login-page";//$NON-NLS-1$
-	public String HTTP_METHOD = "http-method";//$NON-NLS-1$
-	public String INIT_PARAM = "init-param";//$NON-NLS-1$
-	public String JSP_FILE = "jsp-file";//$NON-NLS-1$
-	public String LISTENER = "listener";	//$NON-NLS-1$			// Servlet2.3
-	public String LOAD_ON_STARTUP = "load-on-startup";//$NON-NLS-1$
-	public String LOCATION = "location";//$NON-NLS-1$
-	public String LOGIN_CONFIG = "login-config";//$NON-NLS-1$
-	public String MIME_MAPPING = "mime-mapping";//$NON-NLS-1$
-	public String MIME_TYPE = "mime-type";//$NON-NLS-1$
-	public String REALM_NAME = "realm-name";//$NON-NLS-1$
-	public String SECURITY_CONSTRAINT = "security-constraint";//$NON-NLS-1$
-	public String SERVLET = "servlet";//$NON-NLS-1$
-	public String SERVLET_CLASS = "servlet-class";//$NON-NLS-1$
-	public String SERVLET_MAPPING = "servlet-mapping";//$NON-NLS-1$
-	public String SERVLET_NAME = "servlet-name";//$NON-NLS-1$
-	public String SESSION_CONFIG = "session-config";//$NON-NLS-1$
-	public String SESSION_TIMEOUT = "session-timeout";//$NON-NLS-1$
-	public String TAGLIB = "taglib";//$NON-NLS-1$
-	public String TAGLIB_LOCATION = "taglib-location";//$NON-NLS-1$
-	public String TAGLIB_URI = "taglib-uri";//$NON-NLS-1$
-	public String TRANSPORT_GUARANTEE = "transport-guarantee";//$NON-NLS-1$
-	public String URL_PATTERN = "url-pattern";//$NON-NLS-1$
-	public String USER_DATA_CONSTRAINT = "user-data-constraint";//$NON-NLS-1$
-	public String WEB_APP = "web-app";//$NON-NLS-1$
-	public String WEB_RESOURCE_COLLECTION = "web-resource-collection";//$NON-NLS-1$
-	public String WEB_RESOURCE_NAME = "web-resource-name";//$NON-NLS-1$
-	public String WELCOME_FILE = "welcome-file";//$NON-NLS-1$
-	public String WELCOME_FILE_LIST = "welcome-file-list";//$NON-NLS-1$
-	
-	public String DISPATCHER = "dispatcher";//$NON-NLS-1$
-	public String LOCALE_ENCODING_MAPPING_LIST = "locale-encoding-mapping-list";//$NON-NLS-1$
-	public String LOCALE_ENCODING_MAPPING = "locale-encoding-mapping";//$NON-NLS-1$
-	public String LOCALE = "locale";//$NON-NLS-1$
-	public String ENCODING = "encoding";//$NON-NLS-1$
-	public String JSP_CONFIG = "jsp-config";//$NON-NLS-1$
-	public String JSP_PROPERTY_GROUP = "jsp-property-group";//$NON-NLS-1$
-	public String EL_IGNORED = "el-ignored";//$NON-NLS-1$
-	public String PAGE_ENCODING = "page-encoding";//$NON-NLS-1$
-	public String SCRIPTING_INVALID = "scripting-invalid";//$NON-NLS-1$
-	public String IS_XML = "is-xml";//$NON-NLS-1$
-	public String INCLUDE_PRELUDE = "include-prelude";//$NON-NLS-1$
-	public String INCLUDE_CODA = "include-coda";//$NON-NLS-1$
-	
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WebServicesDeploymentDescriptorXmlMapperI.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WebServicesDeploymentDescriptorXmlMapperI.java
deleted file mode 100644
index 49868b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/WebServicesDeploymentDescriptorXmlMapperI.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 5, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.xml;
-
-/**
- * @author dfholttp
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface WebServicesDeploymentDescriptorXmlMapperI extends DeploymentDescriptorXmlMapperI{
-	//1.3 specific WebServices DD
-	public String COMP_SCOPED_REFS = "component-scoped-refs";//$NON-NLS-1$
-	public String COMP_COMPONENT_NAME = "component-name";//$NON-NLS-1$
-	public String WEB_SERVICES_CLIENT = "webservicesclient";//$NON-NLS-1$
-	public String LOCALPART = "localpart";//$NON-NLS-1$
-	public String NAMESPACEURI = "namespaceURI";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XMLParseResourceHandler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XMLParseResourceHandler.java
deleted file mode 100644
index 385620f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XMLParseResourceHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class XMLParseResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("xmlparse");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String, String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle= getResourceBundle();
-		}
-		
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		} 
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-		
-	}
-public static String getString(String key, Object[] args) {
-
-	try {return MessageFormat.format(getString(key), args);}
-	catch (IllegalArgumentException e) {return getString(key);}
-
-}
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XmlDocumentReader.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XmlDocumentReader.java
deleted file mode 100644
index 4e63a94..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/XmlDocumentReader.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.xml;
-
-
-
-import java.io.InputStream;
-
-import org.eclipse.jst.j2ee.internal.WrappedRuntimeException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXParseException;
-
-/**
- * Insert the type's description here.
- * Creation date: (02/21/01 4:34:13 PM)
- * @author: Administrator
- */
-public class XmlDocumentReader extends GeneralXmlDocumentReader {
-/**
- * XmlDocumentReader constructor comment.
- */
-public XmlDocumentReader(InputSource source) {
-	super(source);
-	setFlagDefaults();
-}
-/**
- * XmlDocumentReader constructor comment.
- */
-public XmlDocumentReader(InputSource source, EntityResolver resolver, ErrorHandler handler) {
-	super(source, resolver, handler);
-	setFlagDefaults();
-}
-/**
- * Insert the method's description here.
- * Creation date: (03/19/01 10:13:26 AM)
- * @return org.xml.sax.EntityResolver
- */
-public org.xml.sax.EntityResolver createDefaultEntityResolver() {
-	return new J2EEXmlDtDEntityResolver();
-}
-
-protected void handleException(String aMessage, Throwable anException) {
-	if (anException instanceof SAXParseException) 
-		handleException(aMessage, (SAXParseException) anException);
-	else
-		super.handleException(aMessage, anException);
-}
-protected void handleException(String aMessage, SAXParseException parseException) {
-	primHandleException(J2EEXMLResourceHandler.getString("parse_exception_occured_EXC_", (new Object[] {new Integer(parseException.getLineNumber()), new Integer(parseException.getColumnNumber()) })), parseException);  //$NON-NLS-1$
-	//$NON-NLS-1$ = "An Exception occurred while parsing xml: {0} Line #: {1} :Column #: "
-}
-protected void primHandleException(String aMessage, Throwable anException) {
-	if (anException instanceof Exception)
-		throw new WrappedRuntimeException(aMessage, (Exception)anException);
-	super.primHandleException(aMessage, anException);
-}
-protected void setFlagDefaults() {
-	setAllowJavaEncodings(true);
-	setValidate(true);
-}
-   public static DocumentType readDocumentType(InputStream in, String uri) {
-    	InputSource source = new InputSource(in);
-    	GeneralXmlDocumentReader aReader =  new XmlDocumentReader(source);
-    	aReader.setValidate(false);
-    	Document aDocument = aReader.parseDocument();
-    	if (aDocument != null)
-    		return aDocument.getDoctype();
-    	return null;
-    }
-    	
-}
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ActivationSpec.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ActivationSpec.java
deleted file mode 100644
index 2e3bb89..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ActivationSpec.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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Activation Spec</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The activationspecType specifies an activation
- * specification.  The information includes fully qualified
- * Java class name of an activation specification and a set of
- * required configuration property names.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ActivationSpec#getActivationSpecClass <em>Activation Spec Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ActivationSpec#getRequiredConfigProperties <em>Required Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getActivationSpec()
- * @model 
- * @generated
- */
-public interface ActivationSpec extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Activation Spec Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Spec Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element activationspec-class specifies the fully
-	 *         qualified Java class name of the activation
-	 *         specification class. This class must implement the
-	 *         javax.resource.spi.ActivationSpec interface. The
-	 *         implementation of this class is required to be a
-	 *         JavaBean.
-	 * 
-	 *         Example:
-	 *             <activationspec-class>com.wombat.ActivationSpecImpl
-	 *             </activationspec-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Activation Spec Class</em>' attribute.
-	 * @see #setActivationSpecClass(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getActivationSpec_ActivationSpecClass()
-	 * @model 
-	 * @generated
-	 */
-	String getActivationSpecClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ActivationSpec#getActivationSpecClass <em>Activation Spec Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Spec Class</em>' attribute.
-	 * @see #getActivationSpecClass()
-	 * @generated
-	 */
-	void setActivationSpecClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Required Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Required Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Required Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getActivationSpec_RequiredConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType" containment="true"
-	 * @generated
-	 */
-	EList getRequiredConfigProperties();
-
-} // ActivationSpec
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AdminObject.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AdminObject.java
deleted file mode 100644
index e622c0d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AdminObject.java
+++ /dev/null
@@ -1,130 +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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Admin Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The adminobjectType specifies information about an
- * administered object.  Administered objects are specific to a
- * messaging style or message provider.  This contains
- * information on the Java type of the interface implemented by
- * an administered object, its Java class name and its
- * configuration properties.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectInterface <em>Admin Object Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectClass <em>Admin Object Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getAdminObject()
- * @model 
- * @generated
- */
-public interface AdminObject extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Admin Object Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Admin Object Interface</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element adminobject-interface specifies the
-	 *         fully qualified name of the Java type of the
-	 *         interface implemented by an administered object.
-	 * 
-	 *         Example:
-	 *           <adminobject-interface>javax.jms.Destination
-	 *           </adminobject-interface>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Admin Object Interface</em>' attribute.
-	 * @see #setAdminObjectInterface(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getAdminObject_AdminObjectInterface()
-	 * @model 
-	 * @generated
-	 */
-	String getAdminObjectInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectInterface <em>Admin Object Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Admin Object Interface</em>' attribute.
-	 * @see #getAdminObjectInterface()
-	 * @generated
-	 */
-	void setAdminObjectInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Admin Object Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Admin Object Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element adminobject-class specifies the fully
-	 *         qualified Java class name of an administered object.
-	 * 
-	 *         Example:
-	 *             <adminobject-class>com.wombat.DestinationImpl
-	 *             </adminobject-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Admin Object Class</em>' attribute.
-	 * @see #setAdminObjectClass(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getAdminObject_AdminObjectClass()
-	 * @model 
-	 * @generated
-	 */
-	String getAdminObjectClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.AdminObject#getAdminObjectClass <em>Admin Object Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Admin Object Class</em>' attribute.
-	 * @see #getAdminObjectClass()
-	 * @generated
-	 */
-	void setAdminObjectClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jca.ConfigProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getAdminObject_ConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.internal.jca.ConfigProperty" containment="true"
-	 * @generated
-	 */
-	EList getConfigProperties();
-
-} // AdminObject
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanism.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanism.java
deleted file mode 100644
index 99f827c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanism.java
+++ /dev/null
@@ -1,463 +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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * The element authentication-mechanism specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism.
- * 
- * Note that BasicPassword mechanism type should support the
- * javax.resource.spi.security.PasswordCredential interface.
- * The Kerbv5 mechanism type should support the
- * javax.resource.spi.security.GenericCredential interface.
-
- */
-public interface AuthenticationMechanism extends EObject{
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Authentication Mechanism</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Authentication Mechanism</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Authentication Mechanism</em>' attribute.
-	 * @see #setAuthenticationMechanism(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getAuthenticationMechanism_AuthenticationMechanism()
-	 * @model 
-	 * @generated
-	 */
-	String getAuthenticationMechanism();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getAuthenticationMechanism <em>Authentication Mechanism</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authentication Mechanism</em>' attribute.
-	 * @see #getAuthenticationMechanism()
-	 * @generated
-	 */
-	void setAuthenticationMechanism(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AuthenticationMechanismType attribute
-	 * The authentication-mechanism-type specifies type of an authentication mechanism.
-	 * 
-	 * The example values are:
-	 *   - BasicPassword
-	 *   - Kerbv5
-	 * 
-	 * Any additional security mechanisms are outside the scope of the
-	 * Connector architecture specification.
-
-	 */
-	AuthenticationMechanismType getAuthenticationMechanismType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getAuthenticationMechanismType <em>Authentication Mechanism Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authentication Mechanism Type</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanismType
-	 * @see #isSetAuthenticationMechanismType()
-	 * @see #unsetAuthenticationMechanismType()
-	 * @see #getAuthenticationMechanismType()
-	 * @generated
-	 */
-	void setAuthenticationMechanismType(AuthenticationMechanismType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getAuthenticationMechanismType <em>Authentication Mechanism Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAuthenticationMechanismType()
-	 * @see #getAuthenticationMechanismType()
-	 * @see #setAuthenticationMechanismType(AuthenticationMechanismType)
-	 * @generated
-	 */
-	void unsetAuthenticationMechanismType();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism#getAuthenticationMechanismType <em>Authentication Mechanism Type</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Authentication Mechanism Type</em>' attribute is set.
-	 * @see #unsetAuthenticationMechanismType()
-	 * @see #getAuthenticationMechanismType()
-	 * @see #setAuthenticationMechanismType(AuthenticationMechanismType)
-	 * @generated
-	 */
-	boolean isSetAuthenticationMechanismType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the CredentialInterface attribute
-	 * Specifies the interface that the resource adapter implementation supports for
-	 * the representation of the credentials. This element should be used by
-	 * application server to find out the Credential interface it should use as part
-	 * of the security contract.
-	 * 
-	 * The possible values are:
-	 *    javax.resource.spi.security.PasswordCredential
-	 *    javax.resource.spi.security.GenericCredential
-
-	 */
-	String getCredentialInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CredentialInterface attribute
-	 */
-	void setCredentialInterface(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the CustomAuthMechType attribute
-	 * This is an internal variable used to store the AthenticationMechanismType when
-	 * it is something other than BasicPassword or Kerbv5.  AuthenticationMecanismType 
-	 * is set to 'Custom' in those cases.  This attribute should not be used by
-	 * runtime.  It is only used by the writer to write back out the custom
-	 * AuthenticationMechanismType string in the case of custom
-	 * AuthenticationMechanismType's.  
-	 * This variable is internal, used only by the reader//writer classes, and can
-	 * change or disappear without notice.  
-	 */
-	String getCustomAuthMechType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the CustomAuthMechType attribute
-	 */
-	void setCustomAuthMechType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getAuthenticationMechanism_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanismType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanismType.java
deleted file mode 100644
index 77ff455..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/AuthenticationMechanismType.java
+++ /dev/null
@@ -1,126 +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.jca;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface AuthenticationMechanismType {}
- */
-public final class AuthenticationMechanismType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BASIC_PASSWORD= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int KERBV5= 1;
-
-	/**
-	 * The '<em><b>Basic Password</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Basic Password</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BASIC_PASSWORD
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthenticationMechanismType BASIC_PASSWORD_LITERAL = new AuthenticationMechanismType(BASIC_PASSWORD, "BasicPassword");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Kerbv5</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Kerbv5</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #KERBV5
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthenticationMechanismType KERBV5_LITERAL = new AuthenticationMechanismType(KERBV5, "Kerbv5");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Authentication Mechanism Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AuthenticationMechanismType[] VALUES_ARRAY =
-		new AuthenticationMechanismType[] {
-			BASIC_PASSWORD_LITERAL,
-			KERBV5_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Authentication Mechanism Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Authentication Mechanism Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthenticationMechanismType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AuthenticationMechanismType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Authentication Mechanism Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthenticationMechanismType get(int value) {
-		switch (value) {
-			case BASIC_PASSWORD: return BASIC_PASSWORD_LITERAL;
-			case KERBV5: return KERBV5_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AuthenticationMechanismType(int value, String name) {
-		super(value, name);
-	}
-
-} //AuthenticationMechanismType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConfigProperty.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConfigProperty.java
deleted file mode 100644
index 3d11ed0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConfigProperty.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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * The config property contains a declaration of a single
- * configuration property for a ManagedConnectionFactory instance.
- * 
- * Each ManagedConnectionFactory instance creates connections to a specific EIS instance based on the properties configured on the ManagedConnectionFactory instance. The configurable properties are specified only once in the deployment descriptor, even though a resource adapter can be used to configure multiple ManagedConnnection-Factory instances (that create connections to different instances of the same EIS).
- * 
- * The declaration consists of an optional description, name, type
- * and an optional value of the configuration property. If the resource
- * adapter provider does not specify a value than the deployer is
- * responsible for providing a valid value for a configuration property.
- * 
- * Any bounds or well-defined values of properties should be described in the description.
-
- */
-public interface ConfigProperty extends EObject{
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * Contains the name of a configuration property.
-	 * 
-	 * The connector architecture defines a set of well-defined properties all of type 
-	 * java.lang.String. These are as follows:
-	 * 
-	 *      ServerName
-	 *      PortNumber
-	 *      UserName
-	 *      Password
-	 *      ConnectionURL
-	 * 
-	 * A resource adapter provider can extend this property set to include properties
-	 * specific to the resource adapter and its underlying EIS.
-
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Type attribute
-	 * Contains the fully qualified Java type of a configuration property as required
-	 * by ManagedConnection-Factory instance.
-	 * 
-	 * The following are the legal values of config-property-type:
-	 *    java.lang.Boolean, java.lang.String, java.lang.Integer,
-	 *    java.lang.Double, java.lang.Byte, java.lang.Short,
-	 *    java.lang.Long, java.lang.Float, java.lang.Character
-	 */
-	String getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Type attribute
-	 */
-	void setType(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Value attribute
-	 * Contains the value of a configuration entry.
-	 */
-	String getValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Value attribute
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConfigProperty_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectionDefinition.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectionDefinition.java
deleted file mode 100644
index 51fd2d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectionDefinition.java
+++ /dev/null
@@ -1,255 +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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connection Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The connection-definitionType defines a set of connection
- * interfaces and classes pertaining to a particular connection
- * type. This also includes configurable properties for
- * ManagedConnectionFactory instances that may be produced out
- * of this set.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryInterface <em>Connection Factory Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionInterface <em>Connection Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionImplClass <em>Connection Impl Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConfigProperties <em>Config Properties</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConnectionDefinition()
- * @model 
- * @generated
- */
-public interface ConnectionDefinition extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Managed Connection Factory Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Managed Connection Factory Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element managedconnectionfactory-class specifies
-	 *         the fully qualified name of the Java class that
-	 *         implements the
-	 *         javax.resource.spi.ManagedConnectionFactory interface.
-	 *         This Java class is provided as part of resource
-	 *         adapter's implementation of connector architecture
-	 *         specified contracts. The implementation of this
-	 *         class is required to be a JavaBean.
-	 * 
-	 *         Example:
-	 *         <managedconnectionfactory-class>
-	 *             com.wombat.ManagedConnectionFactoryImpl
-	 *         </managedconnectionfactory-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Managed Connection Factory Class</em>' attribute.
-	 * @see #setManagedConnectionFactoryClass(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConnectionDefinition_ManagedConnectionFactoryClass()
-	 * @model 
-	 * @generated
-	 */
-	String getManagedConnectionFactoryClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getManagedConnectionFactoryClass <em>Managed Connection Factory Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Managed Connection Factory Class</em>' attribute.
-	 * @see #getManagedConnectionFactoryClass()
-	 * @generated
-	 */
-	void setManagedConnectionFactoryClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Factory Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Factory Interface</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element connectionfactory-interface specifies
-	 *         the fully qualified name of the ConnectionFactory
-	 *         interface supported by the resource adapter.
-	 * 
-	 *         Example:
-	 *         <connectionfactory-interface>com.wombat.ConnectionFactory
-	 *         </connectionfactory-interface>
-	 * 
-	 *         OR
-	 * 
-	 *         <connectionfactory-interface>javax.resource.cci.ConnectionFactory
-	 *         </connectionfactory-interface>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Factory Interface</em>' attribute.
-	 * @see #setConnectionFactoryInterface(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConnectionDefinition_ConnectionFactoryInterface()
-	 * @model 
-	 * @generated
-	 */
-	String getConnectionFactoryInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryInterface <em>Connection Factory Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Factory Interface</em>' attribute.
-	 * @see #getConnectionFactoryInterface()
-	 * @generated
-	 */
-	void setConnectionFactoryInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Factory Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Factory Impl Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element connectionfactory-impl-class specifies
-	 *         the fully qualified name of the ConnectionFactory
-	 *         class that implements resource adapter
-	 *         specific ConnectionFactory interface.
-	 * 
-	 *         Example:
-	 * 
-	 *         <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
-	 *         </connectionfactory-impl-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Factory Impl Class</em>' attribute.
-	 * @see #setConnectionFactoryImplClass(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConnectionDefinition_ConnectionFactoryImplClass()
-	 * @model 
-	 * @generated
-	 */
-	String getConnectionFactoryImplClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionFactoryImplClass <em>Connection Factory Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Factory Impl Class</em>' attribute.
-	 * @see #getConnectionFactoryImplClass()
-	 * @generated
-	 */
-	void setConnectionFactoryImplClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Interface</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The connection-interface element specifies the fully
-	 *         qualified name of the Connection interface supported
-	 *         by the resource adapter.
-	 * 
-	 *         Example:
-	 * 
-	 *             <connection-interface>javax.resource.cci.Connection
-	 *             </connection-interface>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Interface</em>' attribute.
-	 * @see #setConnectionInterface(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConnectionDefinition_ConnectionInterface()
-	 * @model 
-	 * @generated
-	 */
-	String getConnectionInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionInterface <em>Connection Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Interface</em>' attribute.
-	 * @see #getConnectionInterface()
-	 * @generated
-	 */
-	void setConnectionInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Connection Impl Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Impl Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The connection-impl-classType specifies the fully
-	 *         qualified name of the Connection class that
-	 *         implements resource adapter specific Connection
-	 *         interface.  It is used by the connection-impl-class
-	 *         elements.
-	 * 
-	 *         Example:
-	 * 
-	 *             <connection-impl-class>com.wombat.ConnectionImpl
-	 *             </connection-impl-class>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Connection Impl Class</em>' attribute.
-	 * @see #setConnectionImplClass(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConnectionDefinition_ConnectionImplClass()
-	 * @model 
-	 * @generated
-	 */
-	String getConnectionImplClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition#getConnectionImplClass <em>Connection Impl Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Connection Impl Class</em>' attribute.
-	 * @see #getConnectionImplClass()
-	 * @generated
-	 */
-	void setConnectionImplClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Config Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jca.ConfigProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Config Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config Properties</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getConnectionDefinition_ConfigProperties()
-	 * @model type="org.eclipse.jst.j2ee.internal.jca.ConfigProperty" containment="true"
-	 * @generated
-	 */
-	EList getConfigProperties();
-
-} // ConnectionDefinition
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/Connector.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/Connector.java
deleted file mode 100644
index b8e6c1c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/Connector.java
+++ /dev/null
@@ -1,126 +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.jca;
-
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-/**
- * The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, version, specification version supported, icon -  about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter.
-
- */
-public interface Connector extends CompatibilityDescriptionGroup{
-
-
-	/**
-	* This returns the module version id.  Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the VendorName attribute
-	 * Specifies the name of resource adapter provider vendor.
-	 * Example: Wombat Corp.
-	 */
-	String getVendorName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the VendorName attribute
-	 */
-	void setVendorName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SpecVersion attribute
-	 * Specifies the version of the connector architecture specification that is
-	 * supported by this resource adapter. This information enables deployer to
-	 * configure the resource adapter to support deployment and runtime requirements
-	 * of the corresponding connector architecture specification.
-
-	 */
-	String getSpecVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the SpecVersion attribute
-	 */
-	void setSpecVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the EisType attribute
-	 * Contains information about the type of the EIS. For example, the type of an EIS 
-	 * can be product name of EIS independent of any version info.
-	 * 
-	 * This helps in identifying EIS instances that can be used with
-	 * this resource adapter.
-
-	 */
-	String getEisType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the EisType attribute
-	 */
-	void setEisType(String value);
-
-	/**
-	 * These values are used in the deployment descriptor, use getVersionID() to determine module versions
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Version attribute
-	 * Specifies a string-based version of the resource adapter from the resource
-	 * adapter provider.
-	 * 
-	 * Example: 1.0
-	 */
-	String getVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Version attribute
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The License reference
-	 * Specifies licensing requirements for the resource adapter module. This element
-	 * specifies whether a license is required to deploy and use this resource
-	 * adapter, and an optional description of the licensing terms (examples: duration 
-	 * of license, number of
-	 * connection restrictions).
-	 */
-	License getLicense();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the License reference
-	 */
-	void setLicense(License value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ResourceAdapter reference
-	 */
-	ResourceAdapter getResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ResourceAdapter reference
-	 */
-	void setResourceAdapter(ResourceAdapter value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectorResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectorResource.java
deleted file mode 100644
index 6e52db3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ConnectorResource.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
- *******************************************************************************/
-/*
- * Created on Mar 31, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-public interface ConnectorResource extends XMLResource {
-	public Connector getConnector() ;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/InboundResourceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/InboundResourceAdapter.java
deleted file mode 100644
index 8c43bb9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/InboundResourceAdapter.java
+++ /dev/null
@@ -1,71 +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.jca;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Inbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The inbound-resourceadapterType specifies information
- * about an inbound resource adapter. This contains information
- * specific to the implementation of the resource adapter
- * library as specified through the messageadapter element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter#getMessageAdapter <em>Message Adapter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getInboundResourceAdapter()
- * @model 
- * @generated
- */
-public interface InboundResourceAdapter extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Message Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Adapter</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The messagelistener-type element content must be
-	 *         unique in the messageadapter. Several messagelisteners
-	 *         can not use the same messagelistener-type.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Adapter</em>' containment reference.
-	 * @see #setMessageAdapter(MessageAdapter)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getInboundResourceAdapter_MessageAdapter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MessageAdapter getMessageAdapter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.InboundResourceAdapter#getMessageAdapter <em>Message Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Adapter</em>' containment reference.
-	 * @see #getMessageAdapter()
-	 * @generated
-	 */
-	void setMessageAdapter(MessageAdapter value);
-
-} // InboundResourceAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java
deleted file mode 100644
index dc60718..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/JcaFactory.java
+++ /dev/null
@@ -1,289 +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.jca;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-/**
- * @generated
- */
-public interface JcaFactory extends EFactory{
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JcaFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.jca.impl.JcaFactoryImpl();
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Connector value
-	 */
-	Connector createConnector();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return License value
-	 */
-	License createLicense();
-
-	/**
-	 * Returns a new object of class '<em>Inbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Inbound Resource Adapter</em>'.
-	 * @generated
-	 */
-	InboundResourceAdapter createInboundResourceAdapter();
-
-	/**
-	 * Returns a new object of class '<em>Outbound Resource Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Outbound Resource Adapter</em>'.
-	 * @generated
-	 */
-	OutboundResourceAdapter createOutboundResourceAdapter();
-
-	/**
-	 * Returns a new object of class '<em>Message Adapter</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Adapter</em>'.
-	 * @generated
-	 */
-	MessageAdapter createMessageAdapter();
-
-	/**
-	 * Returns a new object of class '<em>Connection Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Connection Definition</em>'.
-	 * @generated
-	 */
-	ConnectionDefinition createConnectionDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Admin Object</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Admin Object</em>'.
-	 * @generated
-	 */
-	AdminObject createAdminObject();
-
-	/**
-	 * Returns a new object of class '<em>Message Listener</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Message Listener</em>'.
-	 * @generated
-	 */
-	MessageListener createMessageListener();
-
-	/**
-	 * Returns a new object of class '<em>Activation Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Activation Spec</em>'.
-	 * @generated
-	 */
-	ActivationSpec createActivationSpec();
-
-	/**
-	 * Returns a new object of class '<em>Required Config Property Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Required Config Property Type</em>'.
-	 * @generated
-	 */
-	RequiredConfigPropertyType createRequiredConfigPropertyType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ResourceAdapter value
-	 */
-	ResourceAdapter createResourceAdapter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityPermission value
-	 */
-	SecurityPermission createSecurityPermission();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthenticationMechanism value
-	 */
-	AuthenticationMechanism createAuthenticationMechanism();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ConfigProperty value
-	 */
-	ConfigProperty createConfigProperty();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	JcaPackage getJcaPackage();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/License.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/License.java
deleted file mode 100644
index 4cfc8f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/License.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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * 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).
- */
-public interface License extends EObject{
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Required attribute
-	 */
-	boolean isRequired();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Required attribute
-	 */
-	void setRequired(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.License#isRequired <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	void unsetRequired();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jca.License#isRequired <em>Required</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Required</em>' attribute is set.
-	 * @see #unsetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	boolean isSetRequired();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.jca.JcaPackage#getLicense_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageAdapter.java
deleted file mode 100644
index 9d44429..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageAdapter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Adapter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The messageadapterType specifies information about the
- * messaging capabilities of the resource adapter. This
- * contains information specific to the implementation of the
- * resource adapter library as specified through the
- * messagelistener element.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.MessageAdapter#getMessageListeners <em>Message Listeners</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getMessageAdapter()
- * @model 
- * @generated
- */
-public interface MessageAdapter extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Message Listeners</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jca.MessageListener}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Listeners</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Listeners</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getMessageAdapter_MessageListeners()
-	 * @model type="org.eclipse.jst.j2ee.internal.jca.MessageListener" containment="true" required="true"
-	 * @generated
-	 */
-	EList getMessageListeners();
-
-} // MessageAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageListener.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageListener.java
deleted file mode 100644
index 4502581..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/MessageListener.java
+++ /dev/null
@@ -1,104 +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.jca;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Message Listener</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The messagelistenerType specifies information about a
- * specific message listener supported by the messaging
- * resource adapter. It contains information on the Java type
- * of the message listener interface and an activation
- * specification.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.MessageListener#getMessageListenerType <em>Message Listener Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.MessageListener#getActivationSpec <em>Activation Spec</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getMessageListener()
- * @model 
- * @generated
- */
-public interface MessageListener extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Message Listener Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Listener Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element messagelistener-type specifies the fully
-	 *         qualified name of the Java type of a message
-	 *         listener interface.
-	 * 
-	 *         Example:
-	 * 
-	 *           <messagelistener-type>javax.jms.MessageListener
-	 *           </messagelistener-type>
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message Listener Type</em>' attribute.
-	 * @see #setMessageListenerType(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getMessageListener_MessageListenerType()
-	 * @model 
-	 * @generated
-	 */
-	String getMessageListenerType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.MessageListener#getMessageListenerType <em>Message Listener Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message Listener Type</em>' attribute.
-	 * @see #getMessageListenerType()
-	 * @generated
-	 */
-	void setMessageListenerType(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Activation Spec</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Activation Spec</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Activation Spec</em>' containment reference.
-	 * @see #setActivationSpec(ActivationSpec)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getMessageListener_ActivationSpec()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	ActivationSpec getActivationSpec();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.MessageListener#getActivationSpec <em>Activation Spec</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Activation Spec</em>' containment reference.
-	 * @see #getActivationSpec()
-	 * @generated
-	 */
-	void setActivationSpec(ActivationSpec value);
-
-} // MessageListener
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/OutboundResourceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/OutboundResourceAdapter.java
deleted file mode 100644
index 6a7de2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/OutboundResourceAdapter.java
+++ /dev/null
@@ -1,203 +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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Outbound Resource Adapter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The outbound-resourceadapterType specifies information about
- * an outbound resource adapter. The information includes fully
- * qualified names of classes/interfaces required as part of
- * the connector architecture specified contracts for
- * connection management, level of transaction support
- * provided, one or more authentication mechanisms supported
- * and additional required security permissions.
- * 
- * If there is no authentication-mechanism specified as part of
- * resource adapter element then the resource adapter does not
- * support any standard security authentication mechanisms as
- * part of security contract. The application server ignores
- * the security part of the system contracts in this case.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getConnectionDefinitions <em>Connection Definitions</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getAuthenticationMechanisms <em>Authentication Mechanisms</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getOutboundResourceAdapter()
- * @model 
- * @generated
- */
-public interface OutboundResourceAdapter extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Reauthentication Support</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Reauthentication Support</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element reauthentication-support specifies
-	 *         whether the resource adapter implementation supports
-	 *         re-authentication of existing Managed- Connection
-	 *         instance. Note that this information is for the
-	 *         resource adapter implementation and not for the
-	 *         underlying EIS instance. This element must have
-	 *         either a "true" or "false" value.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Reauthentication Support</em>' attribute.
-	 * @see #isSetReauthenticationSupport()
-	 * @see #unsetReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getOutboundResourceAdapter_ReauthenticationSupport()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	boolean isReauthenticationSupport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reauthentication Support</em>' attribute.
-	 * @see #isSetReauthenticationSupport()
-	 * @see #unsetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @generated
-	 */
-	void setReauthenticationSupport(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	void unsetReauthenticationSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Reauthentication Support</em>' attribute is set.
-	 * @see #unsetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	boolean isSetReauthenticationSupport();
-
-	/**
-	 * Returns the value of the '<em><b>Transaction Support</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.internal.jca.TransactionSupportKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Transaction Support</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Transaction Support</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.jca.TransactionSupportKind
-	 * @see #isSetTransactionSupport()
-	 * @see #unsetTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getOutboundResourceAdapter_TransactionSupport()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	TransactionSupportKind getTransactionSupport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Support</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.jca.TransactionSupportKind
-	 * @see #isSetTransactionSupport()
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @generated
-	 */
-	void setTransactionSupport(TransactionSupportKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	void unsetTransactionSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jca.OutboundResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Support</em>' attribute is set.
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	boolean isSetTransactionSupport();
-
-	/**
-	 * Returns the value of the '<em><b>Connection Definitions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connection Definitions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Connection Definitions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getOutboundResourceAdapter_ConnectionDefinitions()
-	 * @model type="org.eclipse.jst.j2ee.internal.jca.ConnectionDefinition" containment="true"
-	 * @generated
-	 */
-	EList getConnectionDefinitions();
-
-	/**
-	 * Returns the value of the '<em><b>Authentication Mechanisms</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Authentication Mechanisms</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Authentication Mechanisms</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getOutboundResourceAdapter_AuthenticationMechanisms()
-	 * @model type="org.eclipse.jst.j2ee.internal.jca.AuthenticationMechanism" containment="true"
-	 * @generated
-	 */
-	EList getAuthenticationMechanisms();
-
-} // OutboundResourceAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/RequiredConfigPropertyType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/RequiredConfigPropertyType.java
deleted file mode 100644
index 1bf1f6b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/RequiredConfigPropertyType.java
+++ /dev/null
@@ -1,88 +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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Required Config Property Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The required-config-propertyType contains a declaration
- * of a single configuration property used for specifying a
- * required configuration property name. It is used
- * by required-config-property elements.
- * 
- * Example:
- * 
- * <required-config-property>Destination</required-config-property>
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType#getDescriptions <em>Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getRequiredConfigPropertyType()
- * @model 
- * @generated
- */
-public interface RequiredConfigPropertyType extends EObject{
-	/**
-	 * 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.internal.jca.JcaPackage#getRequiredConfigPropertyType_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.RequiredConfigPropertyType#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.jca.JcaPackage#getRequiredConfigPropertyType_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-} // RequiredConfigPropertyType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ResourceAdapter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ResourceAdapter.java
deleted file mode 100644
index 7cc4a77..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/ResourceAdapter.java
+++ /dev/null
@@ -1,326 +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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Specifies information about the resource adapter. The information includes fully-qualified names of class//interfaces required as part of the connector architecture specified contracts, level of transaction support provided, configurable properties for ManagedConnectionFactory instances, one or more authentication mechanisms supported and additional
- * required security permissions.
- * 
- * If there is no authentication-mechanism specified as part of
- * resource adapter element then the resource adapter does not
- * support any standard security authentication mechanisms as part
- * of security contract. The application server ignores the security
- * part of the system contracts in this case.
-
- */
-public interface ResourceAdapter extends EObject{
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ManagedConnectionFactoryClass attribute
-	 * Specifies the fully qualified name of the Java class that implements the
-	 * javax.resource.spi.Managed-ConnectionFactory interface. This Java class is
-	 * provided as part of resource adapter's implementation of connector architecture 
-	 * specified contracts.
-
-	 */
-	String getManagedConnectionFactoryClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ManagedConnectionFactoryClass attribute
-	 */
-	void setManagedConnectionFactoryClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionFactoryInterface attribute
-	 * Specifies the fully-qualified name of the ConnectionFactory interface supported 
-	 * by the resource adapter.
-
-	 */
-	String getConnectionFactoryInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionFactoryInterface attribute
-	 */
-	void setConnectionFactoryInterface(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionFactoryImplClass attribute
-	 * Specifies the fully-qualified name of the ConnectionFactory class that
-	 * implements resource adapter specific ConnectionFactory interface.
-	 */
-	String getConnectionFactoryImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionFactoryImplClass attribute
-	 */
-	void setConnectionFactoryImplClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionInterface attribute
-	 */
-	String getConnectionInterface();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionInterface attribute
-	 */
-	void setConnectionInterface(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ConnectionImplClass attribute
-	 * Specifies the fully-qualified name of the Connection interface supported by the 
-	 * resource adapter.
-	 */
-	String getConnectionImplClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ConnectionImplClass attribute
-	 */
-	void setConnectionImplClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransactionSupport attribute
-	 * The transaction-support element specifies the level of transaction
-	 * support provided by the resource adapter.
-	 * The value of transaction-support must be one of the following:
-	 *   NoTransaction
-	 *   LocalTransaction
-	 *   XATransaction
-	 */
-	TransactionSupportKind getTransactionSupport();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transaction Support</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.jca.TransactionSupportKind
-	 * @see #isSetTransactionSupport()
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @generated
-	 */
-	void setTransactionSupport(TransactionSupportKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	void unsetTransactionSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getTransactionSupport <em>Transaction Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transaction Support</em>' attribute is set.
-	 * @see #unsetTransactionSupport()
-	 * @see #getTransactionSupport()
-	 * @see #setTransactionSupport(TransactionSupportKind)
-	 * @generated
-	 */
-	boolean isSetTransactionSupport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ReauthenticationSupport attribute
-	 * Specifies whether the resource adapter implementation supports
-	 * re-authentication of existing Managed-Connection instance. Note that this
-	 * information is for the resource adapter implementation and not for the
-	 * underlying EIS instance.
-	 */
-	boolean isReauthenticationSupport();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ReauthenticationSupport attribute
-	 */
-	void setReauthenticationSupport(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	void unsetReauthenticationSupport();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#isReauthenticationSupport <em>Reauthentication Support</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Reauthentication Support</em>' attribute is set.
-	 * @see #unsetReauthenticationSupport()
-	 * @see #isReauthenticationSupport()
-	 * @see #setReauthenticationSupport(boolean)
-	 * @generated
-	 */
-	boolean isSetReauthenticationSupport();
-
-	/**
-	 * Returns the value of the '<em><b>Resource Adapter Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resource Adapter Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The element resourceadapter-class specifies the
-	 *         fully qualified name of a Java class that implements
-	 *         the javax.resource.spi.ResourceAdapter
-	 *         interface. This Java class is provided as part of
-	 *         resource adapter's implementation of connector
-	 *         architecture specified contracts. The implementation
-	 *         of this class is required to be a JavaBean.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resource Adapter Class</em>' attribute.
-	 * @see #setResourceAdapterClass(String)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getResourceAdapter_ResourceAdapterClass()
-	 * @model 
-	 * @generated
-	 */
-	String getResourceAdapterClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getResourceAdapterClass <em>Resource Adapter Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resource Adapter Class</em>' attribute.
-	 * @see #getResourceAdapterClass()
-	 * @generated
-	 */
-	void setResourceAdapterClass(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityPermissions references
-	 */
-	EList getSecurityPermissions();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of AuthenticationMechanisms references
-	 */
-	EList getAuthenticationMechanisms();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ConfigProperties references
-	 */
-	EList getConfigProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Outbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Outbound Resource Adapter</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * The connectionfactory-interface element content must be
-	 *         unique in the outbound-resourceadapter. Multiple connection-definitions
-	 *         can not use the same connectionfactory-type.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Outbound Resource Adapter</em>' containment reference.
-	 * @see #setOutboundResourceAdapter(OutboundResourceAdapter)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getResourceAdapter_OutboundResourceAdapter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	OutboundResourceAdapter getOutboundResourceAdapter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getOutboundResourceAdapter <em>Outbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Outbound Resource Adapter</em>' containment reference.
-	 * @see #getOutboundResourceAdapter()
-	 * @generated
-	 */
-	void setOutboundResourceAdapter(OutboundResourceAdapter value);
-
-	/**
-	 * Returns the value of the '<em><b>Inbound Resource Adapter</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inbound Resource Adapter</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Inbound Resource Adapter</em>' containment reference.
-	 * @see #setInboundResourceAdapter(InboundResourceAdapter)
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getResourceAdapter_InboundResourceAdapter()
-	 * @model containment="true"
-	 * @generated
-	 */
-	InboundResourceAdapter getInboundResourceAdapter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jca.ResourceAdapter#getInboundResourceAdapter <em>Inbound Resource Adapter</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inbound Resource Adapter</em>' containment reference.
-	 * @see #getInboundResourceAdapter()
-	 * @generated
-	 */
-	void setInboundResourceAdapter(InboundResourceAdapter value);
-
-	/**
-	 * Returns the value of the '<em><b>Admin Objects</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jca.AdminObject}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Admin Objects</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Admin Objects</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getResourceAdapter_AdminObjects()
-	 * @model type="org.eclipse.jst.j2ee.internal.jca.AdminObject" containment="true"
-	 * @generated
-	 */
-	EList getAdminObjects();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/SecurityPermission.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/SecurityPermission.java
deleted file mode 100644
index 783228c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/SecurityPermission.java
+++ /dev/null
@@ -1,75 +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.jca;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Specifies a security permission that is required by the resource adapter code.
- * 
- * The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission.
-
- */
-public interface SecurityPermission extends EObject{
-
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Specification attribute
-	 * The element permission-spec specifies a security permission based on the
-	 * Security policy file syntax. 
-
-	 */
-	String getSpecification();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Specification attribute
-	 */
-	void setSpecification(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jca.JcaPackage#getSecurityPermission_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/TransactionSupportKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/TransactionSupportKind.java
deleted file mode 100644
index 83b9dda..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jca/TransactionSupportKind.java
+++ /dev/null
@@ -1,146 +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.jca;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-/**
- * @lastgen interface TransactionSupportKind {}
- */
-public final class TransactionSupportKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NO_TRANSACTION= 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int LOCAL_TRANSACTION= 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int XA_TRANSACTION= 2;
-
-	/**
-	 * The '<em><b>No Transaction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>No Transaction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NO_TRANSACTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionSupportKind NO_TRANSACTION_LITERAL = new TransactionSupportKind(NO_TRANSACTION, "NoTransaction");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Local Transaction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Local Transaction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOCAL_TRANSACTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionSupportKind LOCAL_TRANSACTION_LITERAL = new TransactionSupportKind(LOCAL_TRANSACTION, "LocalTransaction");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>XA Transaction</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>XA Transaction</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #XA_TRANSACTION
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransactionSupportKind XA_TRANSACTION_LITERAL = new TransactionSupportKind(XA_TRANSACTION, "XATransaction");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transaction Support Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransactionSupportKind[] VALUES_ARRAY =
-		new TransactionSupportKind[] {
-			NO_TRANSACTION_LITERAL,
-			LOCAL_TRANSACTION_LITERAL,
-			XA_TRANSACTION_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transaction Support Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transaction Support Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionSupportKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransactionSupportKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transaction Support Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransactionSupportKind get(int value) {
-		switch (value) {
-			case NO_TRANSACTION: return NO_TRANSACTION_LITERAL;
-			case LOCAL_TRANSACTION: return LOCAL_TRANSACTION_LITERAL;
-			case XA_TRANSACTION: return XA_TRANSACTION_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransactionSupportKind(int value, String name) {
-		super(value, name);
-	}
-
-} //TransactionSupportKind
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPConfig.java
deleted file mode 100644
index 5c3ad75..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPConfig.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jsp;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JSP Config</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The jsp-configType is used to provide global configuration
- * information for the JSP files in a web application. It has
- * two subelements, taglib and jsp-property-group.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPConfig#getTagLibs <em>Tag Libs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPConfig#getPropertyGroups <em>Property Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPConfig()
- * @model 
- * @generated
- */
-public interface JSPConfig extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Tag Libs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tag Libs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tag Libs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPConfig_TagLibs()
-	 * @model type="org.eclipse.jst.j2ee.internal.jsp.TagLibRefType" containment="true"
-	 * @generated
-	 */
-	EList getTagLibs();
-
-	/**
-	 * Returns the value of the '<em><b>Property Groups</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property Groups</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property Groups</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPConfig_PropertyGroups()
-	 * @model type="org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup" containment="true"
-	 * @generated
-	 */
-	EList getPropertyGroups();
-
-} // JSPConfig
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPPropertyGroup.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPPropertyGroup.java
deleted file mode 100644
index 416f68d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JSPPropertyGroup.java
+++ /dev/null
@@ -1,340 +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.jsp;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>JSP Property Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The jsp-property-groupType is used to group a number of
- * files so they can be given global property information.
- * All files so described are deemed to be JSP files. The
- * following additional properties can be described:
- * 
- * - Control enabling of EL evaluation. - Control enabling
- * of Scripting elements. - Indicate pageEncoding
- * information. - Indicating that a resource is a JSP
- * document - Prelude and Coda automatic includes.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getUrlPattern <em>Url Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getPageEncoding <em>Page Encoding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getIncludePreludes <em>Include Preludes</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getIncludeCodas <em>Include Codas</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup()
- * @model 
- * @generated
- */
-public interface JSPPropertyGroup extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Url Pattern</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Pattern</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Url Pattern</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup_UrlPattern()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getUrlPattern();
-
-	/**
-	 * Returns the value of the '<em><b>El Ignored</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>El Ignored</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Can be used to easily set the isELIgnored
-	 * 	property of a group of JSP pages. By default,
-	 * 	the EL evaluation is enabled for Web
-	 * 	Applications using a Servlet 2.4 or greater
-	 * 	web.xml, and disabled otherwise.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>El Ignored</em>' attribute.
-	 * @see #isSetElIgnored()
-	 * @see #unsetElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup_ElIgnored()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isElIgnored();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>El Ignored</em>' attribute.
-	 * @see #isSetElIgnored()
-	 * @see #unsetElIgnored()
-	 * @see #isElIgnored()
-	 * @generated
-	 */
-	void setElIgnored(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetElIgnored()
-	 * @see #isElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @generated
-	 */
-	void unsetElIgnored();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isElIgnored <em>El Ignored</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>El Ignored</em>' attribute is set.
-	 * @see #unsetElIgnored()
-	 * @see #isElIgnored()
-	 * @see #setElIgnored(boolean)
-	 * @generated
-	 */
-	boolean isSetElIgnored();
-
-	/**
-	 * Returns the value of the '<em><b>Page Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Page Encoding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The valid values of page-encoding are those of
-	 * 	the pageEncoding page directive. It is a
-	 * 	translation-time error to name different
-	 * 	encodings in the pageEncoding attribute of the
-	 * 	page directive of a JSP page and in a JSP
-	 * 	configuration element matching the page. It is
-	 * 	also a translation-time error to name different
-	 * 	encodings in the prolog of a document in XML
-	 * 	syntax and in a JSP configuration element
-	 * 	matching the document. It is legal to name the
-	 * 	same encoding through mulitple mechanisms.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Page Encoding</em>' attribute.
-	 * @see #setPageEncoding(String)
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup_PageEncoding()
-	 * @model 
-	 * @generated
-	 */
-	String getPageEncoding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#getPageEncoding <em>Page Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Page Encoding</em>' attribute.
-	 * @see #getPageEncoding()
-	 * @generated
-	 */
-	void setPageEncoding(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Scripting Invalid</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Scripting Invalid</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Can be used to easily disable scripting in a
-	 * 	group of JSP pages. By default, scripting is
-	 * 	enabled.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Scripting Invalid</em>' attribute.
-	 * @see #isSetScriptingInvalid()
-	 * @see #unsetScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup_ScriptingInvalid()
-	 * @model default="true" unsettable="true"
-	 * @generated
-	 */
-	boolean isScriptingInvalid();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scripting Invalid</em>' attribute.
-	 * @see #isSetScriptingInvalid()
-	 * @see #unsetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @generated
-	 */
-	void setScriptingInvalid(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @generated
-	 */
-	void unsetScriptingInvalid();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isScriptingInvalid <em>Scripting Invalid</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Scripting Invalid</em>' attribute is set.
-	 * @see #unsetScriptingInvalid()
-	 * @see #isScriptingInvalid()
-	 * @see #setScriptingInvalid(boolean)
-	 * @generated
-	 */
-	boolean isSetScriptingInvalid();
-
-	/**
-	 * Returns the value of the '<em><b>Is XML</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Is XML</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * If true, denotes that the group of resources
-	 * 	that match the URL pattern are JSP documents,
-	 * 	and thus must be interpreted as XML documents.
-	 * 	If false, the resources are assumed to not be
-	 * 	JSP documents, unless there is another property
-	 * 	group that indicates otherwise.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Is XML</em>' attribute.
-	 * @see #isSetIsXML()
-	 * @see #unsetIsXML()
-	 * @see #setIsXML(boolean)
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup_IsXML()
-	 * @model default="false" unsettable="true"
-	 * @generated
-	 */
-	boolean isIsXML();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is XML</em>' attribute.
-	 * @see #isSetIsXML()
-	 * @see #unsetIsXML()
-	 * @see #isIsXML()
-	 * @generated
-	 */
-	void setIsXML(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetIsXML()
-	 * @see #isIsXML()
-	 * @see #setIsXML(boolean)
-	 * @generated
-	 */
-	void unsetIsXML();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.JSPPropertyGroup#isIsXML <em>Is XML</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Is XML</em>' attribute is set.
-	 * @see #unsetIsXML()
-	 * @see #isIsXML()
-	 * @see #setIsXML(boolean)
-	 * @generated
-	 */
-	boolean isSetIsXML();
-
-	/**
-	 * Returns the value of the '<em><b>Include Preludes</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Include Preludes</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The include-prelude element is a
-	 * 	context-relative path that must correspond to
-	 * 	an element in the Web Application. When the
-	 * 	element is present, the given path will be
-	 * 	automatically included (as in an include
-	 * 	directive) at the beginning of each JSP page in
-	 * 	this jsp-property-group.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Include Preludes</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup_IncludePreludes()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getIncludePreludes();
-
-	/**
-	 * Returns the value of the '<em><b>Include Codas</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Include Codas</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The include-coda element is a context-relative
-	 * 	path that must correspond to an element in the
-	 * 	Web Application. When the element is present,
-	 * 	the given path will be automatically included
-	 * 	(as in an include directive) at the end of each
-	 * 	JSP page in this jsp-property-group.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Include Codas</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getJSPPropertyGroup_IncludeCodas()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getIncludeCodas();
-
-} // JSPPropertyGroup
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java
deleted file mode 100644
index 14c8186..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/JspFactory.java
+++ /dev/null
@@ -1,69 +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.jsp;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-
-/**
- * <!-- 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.internal.jsp.JspPackage
- * @generated
- */
-public interface JspFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	JspFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.jsp.impl.JspFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>JSP Config</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JSP Config</em>'.
-	 * @generated
-	 */
-	JSPConfig createJSPConfig();
-
-	/**
-	 * Returns a new object of class '<em>JSP Property Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>JSP Property Group</em>'.
-	 * @generated
-	 */
-	JSPPropertyGroup createJSPPropertyGroup();
-
-	/**
-	 * Returns a new object of class '<em>Tag Lib Ref Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tag Lib Ref Type</em>'.
-	 * @generated
-	 */
-	TagLibRefType createTagLibRefType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	JspPackage getJspPackage();
-
-} //JspFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/TagLibRefType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/TagLibRefType.java
deleted file mode 100644
index 206aee9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/TagLibRefType.java
+++ /dev/null
@@ -1,106 +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.jsp;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tag Lib Ref Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * A taglib can be used to provide information on a tag
- * library that is used by a JSP page within the Web
- * Application.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibURI <em>Taglib URI</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibLocation <em>Taglib Location</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getTagLibRefType()
- * @model 
- * @generated
- */
-public interface TagLibRefType extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Taglib URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taglib URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  A taglib-uri element describes a URI identifying a
-	 *         tag library used in the web application.  The body
-	 *         of the taglib-uri element may be either an
-	 *         absolute URI specification, or a relative URI.
-	 *         There should be no entries in web.xml with the
-	 *         same taglib-uri value.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Taglib URI</em>' attribute.
-	 * @see #setTaglibURI(String)
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getTagLibRefType_TaglibURI()
-	 * @model 
-	 * @generated
-	 */
-	String getTaglibURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibURI <em>Taglib URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taglib URI</em>' attribute.
-	 * @see #getTaglibURI()
-	 * @generated
-	 */
-	void setTaglibURI(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Taglib Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taglib Location</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * the taglib-location element contains the location
-	 *         (as a resource relative to the root of the web
-	 *         application) where to find the Tag Library
-	 *         Description file for the tag library.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Taglib Location</em>' attribute.
-	 * @see #setTaglibLocation(String)
-	 * @see org.eclipse.jst.j2ee.internal.jsp.JspPackage#getTagLibRefType_TaglibLocation()
-	 * @model 
-	 * @generated
-	 */
-	String getTaglibLocation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.jsp.TagLibRefType#getTaglibLocation <em>Taglib Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Taglib Location</em>' attribute.
-	 * @see #getTaglibLocation()
-	 * @generated
-	 */
-	void setTaglibLocation(String value);
-
-} // TagLibRefType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/BodyContentType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/BodyContentType.java
deleted file mode 100644
index 5861c4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/BodyContentType.java
+++ /dev/null
@@ -1,178 +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.taglib;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-public final class BodyContentType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int TAGDEPENDENT = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int JSP = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int EMPTY = 2;
-	/**
-	 * The '<em><b>Scriptless</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SCRIPTLESS_LITERAL
-	 * @model name="scriptless"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SCRIPTLESS = 3;
-
-	/**
-	 * The '<em><b>Tagdependent</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Tagdependent</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TAGDEPENDENT
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType TAGDEPENDENT_LITERAL = new BodyContentType(TAGDEPENDENT, "tagdependent");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>JSP</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>JSP</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JSP
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType JSP_LITERAL = new BodyContentType(JSP, "JSP");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Empty</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Empty</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EMPTY
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType EMPTY_LITERAL = new BodyContentType(EMPTY, "empty");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>Scriptless</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Scriptless</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SCRIPTLESS
-	 * @generated
-	 * @ordered
-	 */
-	public static final BodyContentType SCRIPTLESS_LITERAL = new BodyContentType(SCRIPTLESS, "scriptless");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Body Content Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final BodyContentType[] VALUES_ARRAY =
-		new BodyContentType[] {
-			TAGDEPENDENT_LITERAL,
-			JSP_LITERAL,
-			EMPTY_LITERAL,
-			SCRIPTLESS_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Body Content Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Body Content Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BodyContentType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			BodyContentType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Body Content Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static BodyContentType get(int value) {
-		switch (value) {
-			case TAGDEPENDENT: return TAGDEPENDENT_LITERAL;
-			case JSP: return JSP_LITERAL;
-			case EMPTY: return EMPTY_LITERAL;
-			case SCRIPTLESS: return SCRIPTLESS_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private BodyContentType(int value, String name) {
-		super(value, name);
-	}
-
-} //BodyContentType
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/ExtensibleType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/ExtensibleType.java
deleted file mode 100644
index ae5b84f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/ExtensibleType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.taglib;
-
-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.taglib.ExtensibleType#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getExtensibleType()
- * @model abstract="true"
- * @generated
- */
-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.internal.taglib.TaglibPackage#getExtensibleType_Value()
-	 * @model 
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.ExtensibleType#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // ExtensibleType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/Function.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/Function.java
deleted file mode 100644
index 8a0762f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/Function.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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Function</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * The function element is used to provide information on each
- * function in the tag library that is to be exposed to the EL.
- * 
- * The function element may have several subelements defining:
- * 
- * description         Optional tag-specific information
- * 
- * display-name        A short name that is intended to be
- *                     displayed by tools
- * 
- * icon                Optional icon element that can be used
- *                     by tools
- * 
- * name                A unique name for this function
- * 
- * function-class      Provides the name of the Java class that
- *                     implements the function
- * 
- * function-signature  Provides the signature, as in the Java
- *                     Language Specification, of the Java
- *                     method that is to be used to implement
- *                     the function.
- * 
- * example             Optional informal description of an
- *                     example of a use of this function
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.Function#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.Function#getSignature <em>Signature</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.Function#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.Function#getFunctionClass <em>Function Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.Function#getFunctionExtensions <em>Function Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getFunction()
- * @model 
- * @generated
- */
-public interface Function extends DescriptionGroup{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getFunction_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Signature</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Signature</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides the signature, as in the Java Language
-	 *         Specification, of the static Java method that is
-	 *         to be used to implement the function.
-	 * 
-	 *         Example:
-	 * 
-	 *         java.lang.String nickName( java.lang.String, int )
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Signature</em>' attribute.
-	 * @see #setSignature(String)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getFunction_Signature()
-	 * @model 
-	 * @generated
-	 */
-	String getSignature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getSignature <em>Signature</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Signature</em>' attribute.
-	 * @see #getSignature()
-	 * @generated
-	 */
-	void setSignature(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Example</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The example element contains an informal description
-	 *         of an example of the use of this function.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Example</em>' attribute.
-	 * @see #setExample(String)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getFunction_Example()
-	 * @model 
-	 * @generated
-	 */
-	String getExample();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getExample <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Example</em>' attribute.
-	 * @see #getExample()
-	 * @generated
-	 */
-	void setExample(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Function Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Function Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Provides the fully-qualified class name of the Java
-	 *         class containing the static method that implements
-	 *         the function.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Function Class</em>' reference.
-	 * @see #setFunctionClass(JavaClass)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getFunction_FunctionClass()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getFunctionClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.Function#getFunctionClass <em>Function Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Function Class</em>' reference.
-	 * @see #getFunctionClass()
-	 * @generated
-	 */
-	void setFunctionClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Function Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.taglib.TldExtension}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Function Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Function Extensions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getFunction_FunctionExtensions()
-	 * @model type="org.eclipse.jst.j2ee.internal.taglib.TldExtension" containment="true"
-	 * @generated
-	 */
-	EList getFunctionExtensions();
-
-} // Function
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPScriptingVariableScope.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPScriptingVariableScope.java
deleted file mode 100644
index 76aa8f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPScriptingVariableScope.java
+++ /dev/null
@@ -1,151 +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.taglib;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-public final class JSPScriptingVariableScope extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NESTED = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int AT_BEGIN = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int AT_END = 2;
-	/**
-	 * The '<em><b>NESTED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NESTED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NESTED
-	 * @generated
-	 * @ordered
-	 */
-	public static final JSPScriptingVariableScope NESTED_LITERAL = new JSPScriptingVariableScope(NESTED, "NESTED");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>AT BEGIN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AT BEGIN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AT_BEGIN
-	 * @generated
-	 * @ordered
-	 */
-	public static final JSPScriptingVariableScope AT_BEGIN_LITERAL = new JSPScriptingVariableScope(AT_BEGIN, "AT_BEGIN");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>AT END</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>AT END</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AT_END
-	 * @generated
-	 * @ordered
-	 */
-	public static final JSPScriptingVariableScope AT_END_LITERAL = new JSPScriptingVariableScope(AT_END, "AT_END");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>JSP Scripting Variable Scope</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final JSPScriptingVariableScope[] VALUES_ARRAY =
-		new JSPScriptingVariableScope[] {
-			NESTED_LITERAL,
-			AT_BEGIN_LITERAL,
-			AT_END_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>JSP Scripting Variable Scope</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>JSP Scripting Variable Scope</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JSPScriptingVariableScope get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			JSPScriptingVariableScope result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>JSP Scripting Variable Scope</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static JSPScriptingVariableScope get(int value) {
-		switch (value) {
-			case NESTED: return NESTED_LITERAL;
-			case AT_BEGIN: return AT_BEGIN_LITERAL;
-			case AT_END: return AT_END_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private JSPScriptingVariableScope(int value, String name) {
-		super(value, name);
-	}
-
-} //JSPScriptingVariableScope
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPTag.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPTag.java
deleted file mode 100644
index 1ea0f45..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPTag.java
+++ /dev/null
@@ -1,227 +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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-
-
-/**
- * The tag element defines an action in this tag library. The tag element has one attribute, id.
- * The tag element may have several subelements defining:
- * name -- The unique action name
- * tag-class -- The tag handler class implementing javax.servlet.jsp.tagext.Tag
- * tei-class -- An optional subclass of javax.servlet.jsp.tagext.TagExtraInfo
- * body-content -- The body content type
- * display-name -- A short name that is intended to be displayed by tools
- * small-icon -- Optional small-icon that can be used by tools
- * large-icon -- Optional large-icon that can be used by tools
- * description -- Optional tag-specific information
- * variable -- Optional scripting variable information
- * attribute -- All attributes of this action
- * example -- Optional informal description of an example of a use of this action.
-
- */
-public interface JSPTag extends DescriptionGroup{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the BodyContent attribute
-	 * Provides a hint as to the content of the body of this tag. Primarily intended
-	 * for use by page composition tools.There are currently three values specified:
-	 * 
-	 * tagdependent - The body of the tag is interpreted by the tag implementation
-	 * itself, and is most likely in a		different "langage", e.g embedded SQL
-	 * statements.
-	 * 
-	 * JSP - The body of the tag contains nested JSP syntax
-	 * 
-	 * empty - The body must be emptyThe default (if not defined) is JSP#PCDATA ::= 
-	 * tagdependent | JSP | empty
-	 */
-	BodyContentType getBodyContent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTag#getBodyContent <em>Body Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body Content</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.BodyContentType
-	 * @see #isSetBodyContent()
-	 * @see #unsetBodyContent()
-	 * @see #getBodyContent()
-	 * @generated
-	 */
-	void setBodyContent(BodyContentType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTag#getBodyContent <em>Body Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetBodyContent()
-	 * @see #getBodyContent()
-	 * @see #setBodyContent(BodyContentType)
-	 * @generated
-	 */
-	void unsetBodyContent();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTag#getBodyContent <em>Body Content</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Body Content</em>' attribute is set.
-	 * @see #unsetBodyContent()
-	 * @see #getBodyContent()
-	 * @see #setBodyContent(BodyContentType)
-	 * @generated
-	 */
-	boolean isSetBodyContent();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Example attribute
-	 * The example element provides an informal description of an example of the use
-	 * of a tag.
-	 */
-	String getExample();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Example attribute
-	 */
-	void setExample(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getJSPTag_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTag#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Dynamic Attributes</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dynamic Attributes</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dynamic Attributes</em>' attribute.
-	 * @see #setDynamicAttributes(boolean)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getJSPTag_DynamicAttributes()
-	 * @model 
-	 * @generated
-	 */
-	boolean isDynamicAttributes();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTag#isDynamicAttributes <em>Dynamic Attributes</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dynamic Attributes</em>' attribute.
-	 * @see #isDynamicAttributes()
-	 * @generated
-	 */
-	void setDynamicAttributes(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Attributes references
-	 */
-	EList getAttributes();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Variables references
-	 * The variable element provides information on the scripting variables defined by 
-	 * this tag.
-	 * It is a (translation time) error for an action that has one or more variable
-	 * subelements to have a TagExtraInfo class that returns a non-null object.
-	 * The subelements of variable are of the form:
-	 * name-given -- The variable name as a constant
-	 * name-from-attribute -- The name of an attribute whose (translation time) value
-	 * will give the name of the variable. One of name-given or namefrom-attribute is
-	 * required.
-	 * variable-class -- Name of the class of the variable. java.lang.String is
-	 * default.
-	 * declare -- Whether the variable is declared or not. True is the default.
-	 * scope -- The scope of the scripting variable defined. NESTED is default.
-
-	 */
-	EList getVariables();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The TagClass reference
-	 * The tag-class element indicates the subclass of javax.serlvet.jsp.tagext.Tag
-	 * that implements the request time semantics for this tag. This element is
-	 * required.
-	 * @regexp fully qualified Java class name
-
-	 */
-	JavaClass getTagClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the TagClass reference
-	 */
-	void setTagClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The TeiClass reference
-	 * The tei-class element indicates the subclass of
-	 * javax.servlet.jsp.tagext.TagExtraInfo for this tag. The class is instantiated
-	 * at translation time. This element is optional.
-	 * @regexp fully qualified Java class name
-	 */
-	JavaClass getTeiClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the TeiClass reference
-	 */
-	void setTeiClass(JavaClass value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPTagAttribute.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPTagAttribute.java
deleted file mode 100644
index c37401c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPTagAttribute.java
+++ /dev/null
@@ -1,186 +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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * The attribute tag defines an attribute for the nesting tag
- */
-public interface JSPTagAttribute extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * Defines the canonical name of a tag or attribute being defined (required).
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Required attribute
-	 * Defines if the nesting attribute is required or optional.
-	 */
-	boolean isRequired();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Required attribute
-	 */
-	void setRequired(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#isRequired <em>Required</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	void unsetRequired();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#isRequired <em>Required</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Required</em>' attribute is set.
-	 * @see #unsetRequired()
-	 * @see #isRequired()
-	 * @see #setRequired(boolean)
-	 * @generated
-	 */
-	boolean isSetRequired();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RtExprValue attribute
-	 * Defines if the nesting attribute can have scriptlet expressions asa value, i.e
-	 * the value of the attribute may be dynamically calculatedat request time, as
-	 * opposed to a static value determined at translationtime. (optional)
-	 * Default = false
-	 */
-	boolean isRtExprValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RtExprValue attribute
-	 */
-	void setRtExprValue(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#isRtExprValue <em>Rt Expr Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetRtExprValue()
-	 * @see #isRtExprValue()
-	 * @see #setRtExprValue(boolean)
-	 * @generated
-	 */
-	void unsetRtExprValue();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#isRtExprValue <em>Rt Expr Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Rt Expr Value</em>' attribute is set.
-	 * @see #unsetRtExprValue()
-	 * @see #isRtExprValue()
-	 * @see #setRtExprValue(boolean)
-	 * @generated
-	 */
-	boolean isSetRtExprValue();
-
-	/**
-	 * Returns the value of the '<em><b>Fragment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fragment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Fragment</em>' attribute.
-	 * @see #setFragment(boolean)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getJSPTagAttribute_Fragment()
-	 * @model 
-	 * @generated
-	 */
-	boolean isFragment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPTagAttribute#isFragment <em>Fragment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fragment</em>' attribute.
-	 * @see #isFragment()
-	 * @generated
-	 */
-	void setFragment(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Type reference
-	 * The value of the type element describes the Java type of the attributes value.
-	 * For static values (those determined at translation time) the type is always
-	 * java.lang.String.
-	 */
-	JavaClass getType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Type reference
-	 */
-	void setType(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getJSPTagAttribute_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPVariable.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPVariable.java
deleted file mode 100644
index 88e17bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/JSPVariable.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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * @generated
- */
-public interface JSPVariable extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the NameGiven attribute
-	 * The name-given element provides the name for the scripting variable.
-	 * 
-	 * One of name-given or name-from-attribute is required.
-	 */
-	String getNameGiven();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the NameGiven attribute
-	 */
-	void setNameGiven(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the NameFromAttribute attribute
-	 * The name of an attribute whose (translation-time) value will give the name of
-	 * the variable.
-	 */
-	String getNameFromAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the NameFromAttribute attribute
-	 */
-	void setNameFromAttribute(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Declare attribute
-	 * The value of the declare element indicates whether the scripting variable is to 
-	 * be defined or not. See TagExtraInfo for details.
-	 * This element is optional and is the default is true.
-
-	 */
-	boolean isDeclare();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Declare attribute
-	 */
-	void setDeclare(boolean value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Scope attribute
-	 */
-	JSPScriptingVariableScope getScope();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.JSPVariable#getScope <em>Scope</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.JSPScriptingVariableScope
-	 * @see #getScope()
-	 * @generated
-	 */
-	void setScope(JSPScriptingVariableScope value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The VariableClass reference
-	 */
-	JavaClass getVariableClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the VariableClass reference
-	 */
-	void setVariableClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.taglib.TaglibPackage#getJSPVariable_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TagFile.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TagFile.java
deleted file mode 100644
index 24994e4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TagFile.java
+++ /dev/null
@@ -1,148 +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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tag File</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4
- * Defines an action in this tag library that is implemented
- * as a .tag file.
- * 
- * The tag-file element has two required subelements:
- * 
- * name    The unique action name
- * 
- * path    Where to find the .tag file implementing this
- *         action, relative to the root of the web application or
- * 	the root of the JAR file for a tag library packaged in
- * 	a JAR.  This must begin with /WEB-INF/tags if the .tag
- * 	file resides in the WAR, or /META-INF/tags if the .tag
- * 	file resides in a JAR.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getExample <em>Example</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getTagExtensions <em>Tag Extensions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTagFile()
- * @model 
- * @generated
- */
-public interface TagFile extends DescriptionGroup{
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTagFile_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Path</em>' attribute.
-	 * @see #setPath(String)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTagFile_Path()
-	 * @model 
-	 * @generated
-	 */
-	String getPath();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getPath <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Path</em>' attribute.
-	 * @see #getPath()
-	 * @generated
-	 */
-	void setPath(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Example</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Example</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Example</em>' attribute.
-	 * @see #setExample(String)
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTagFile_Example()
-	 * @model 
-	 * @generated
-	 */
-	String getExample();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.TagFile#getExample <em>Example</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Example</em>' attribute.
-	 * @see #getExample()
-	 * @generated
-	 */
-	void setExample(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Tag Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.taglib.TldExtension}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tag Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tag Extensions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTagFile_TagExtensions()
-	 * @model type="org.eclipse.jst.j2ee.internal.taglib.TldExtension" containment="true"
-	 * @generated
-	 */
-	EList getTagExtensions();
-
-} // TagFile
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TagLib.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TagLib.java
deleted file mode 100644
index e9f0d5c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TagLib.java
+++ /dev/null
@@ -1,162 +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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-/**
- * The taglib tag is the document root.
-
- */
-public interface TagLib extends CompatibilityDescriptionGroup{
-	/**
-	 * These values are used in the deployment descriptor, use getVersionID() to determine module versions
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TagLibVersion attribute
-	 * Describes this version number of the tag library (dewey decimal).
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	String getTagLibVersion();
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException ;
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the TagLibVersion attribute
-	 */
-	void setTagLibVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the JspVersion attribute
-	 * Describes the JSP version (number) this tag library requires in order to
-	 * function (dewey decimal).  Default is 1.2
-	 * @regexp [0-9]*{ "."[0-9] }0..3
-	 */
-	String getJspVersion();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the JspVersion attribute
-	 */
-	void setJspVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ShortName attribute
-	 * The value of the short-name element is a name that could be used by a JSP
-	 * authoring tool to create names with a mnemonic value; for example, it may be
-	 * used as the prefered prefix value in taglib directives. Do not use white space, 
-	 * and do not start with digits or underscore.
-	 */
-	String getShortName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ShortName attribute
-	 */
-	void setShortName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Uri attribute
-	 * The value of the uri element is a public URI that uniquely identifies the exact 
-	 * semantics of this taglibrary.
-	 */
-	String getUri();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Uri attribute
-	 */
-	void setUri(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Tags references
-	 */
-	EList getTags();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Validator reference
-	 * The validator element provides information on an optional validator that can be 
-	 * used to validate the conformance of a JSP page to using this tag library.
-
-	 */
-	Validator getValidator();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Validator reference
-	 */
-	void setValidator(Validator value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Listeners references
-	 */
-	EList getListeners();
-
-	/**
-	 * Returns the value of the '<em><b>Functions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.taglib.Function}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Functions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Functions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTagLib_Functions()
-	 * @model type="org.eclipse.jst.j2ee.internal.taglib.Function" containment="true"
-	 * @generated
-	 */
-	EList getFunctions();
-
-	/**
-	 * Returns the value of the '<em><b>Taglib Extensions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.taglib.TldExtension}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Taglib Extensions</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Taglib Extensions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTagLib_TaglibExtensions()
-	 * @model type="org.eclipse.jst.j2ee.internal.taglib.TldExtension" containment="true"
-	 * @generated
-	 */
-	EList getTaglibExtensions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibFactory.java
deleted file mode 100644
index 624494c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TaglibFactory.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.taglib;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-/**
- * @generated
- */
-public interface TaglibFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TaglibFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.taglib.impl.TaglibFactoryImpl();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TagLib value
-	 */
-	TagLib createTagLib();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Validator value
-	 */
-	Validator createValidator();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPTag value
-	 */
-	JSPTag createJSPTag();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPTagAttribute value
-	 */
-	JSPTagAttribute createJSPTagAttribute();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPVariable value
-	 */
-	JSPVariable createJSPVariable();
-
-	/**
-	 * Returns a new object of class '<em>Function</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Function</em>'.
-	 * @generated
-	 */
-	Function createFunction();
-
-	/**
-	 * Returns a new object of class '<em>Tag File</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tag File</em>'.
-	 * @generated
-	 */
-	TagFile createTagFile();
-
-	/**
-	 * Returns a new object of class '<em>Tld Extension</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tld Extension</em>'.
-	 * @generated
-	 */
-	TldExtension createTldExtension();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	TaglibPackage getTaglibPackage();
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TldExtension.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TldExtension.java
deleted file mode 100644
index a91bd7e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/TldExtension.java
+++ /dev/null
@@ -1,76 +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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tld Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.TldExtension#getNamespace <em>Namespace</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.taglib.TldExtension#getExtensionElements <em>Extension Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getTldExtension()
- * @model 
- * @generated
- */
-public interface TldExtension 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.internal.taglib.TaglibPackage#getTldExtension_Namespace()
-	 * @model 
-	 * @generated
-	 */
-	String getNamespace();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.taglib.TldExtension#getNamespace <em>Namespace</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Namespace</em>' attribute.
-	 * @see #getNamespace()
-	 * @generated
-	 */
-	void setNamespace(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Extension Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.taglib.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.internal.taglib.TaglibPackage#getTldExtension_ExtensionElements()
-	 * @model type="org.eclipse.jst.j2ee.internal.taglib.ExtensibleType" containment="true" required="true"
-	 * @generated
-	 */
-	EList getExtensionElements();
-
-} // TldExtension
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/Validator.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/Validator.java
deleted file mode 100644
index 2292026..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/taglib/Validator.java
+++ /dev/null
@@ -1,74 +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.taglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.JavaClass;
-/**
- * The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.
-
- */
-public interface Validator extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ValidatorClass reference
-	 * defines the TagLibraryValidator class that can be
-	 * used to validate the conformance of a JSP page to using this tag library.
-	 */
-	JavaClass getValidatorClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ValidatorClass reference
-	 */
-	void setValidatorClass(JavaClass value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of InitParams references
-	 */
-	EList getInitParams();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.taglib.TaglibPackage#getValidator_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthConstraint.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthConstraint.java
deleted file mode 100644
index f69da81..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthConstraint.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * 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.
- */
-public interface AuthConstraint extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * A description of the auth constraint.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Roles attribute
-	 * A list of role names for the auth constraint.  Each element specifies the name
-	 * of a security role (a String).
-
-	 */
-	EList getRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecConstraint reference
-	 */
-	SecurityConstraint getSecConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the SecConstraint reference
-	 */
-	void setSecConstraint(SecurityConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getAuthConstraint_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthMethodKind.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthMethodKind.java
deleted file mode 100644
index 7b40f92..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/AuthMethodKind.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-public final class AuthMethodKind extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int UNSPECIFIED = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int BASIC = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int DIGEST = 2;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int FORM = 3;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CLIENT_CERT = 4;
-	/**
-	 * The '<em><b>UNSPECIFIED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>UNSPECIFIED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNSPECIFIED
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind UNSPECIFIED_LITERAL = new AuthMethodKind(UNSPECIFIED, "UNSPECIFIED");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>BASIC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>BASIC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BASIC
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind BASIC_LITERAL = new AuthMethodKind(BASIC, "BASIC");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>DIGEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DIGEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DIGEST
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind DIGEST_LITERAL = new AuthMethodKind(DIGEST, "DIGEST");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>FORM</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FORM</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FORM
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind FORM_LITERAL = new AuthMethodKind(FORM, "FORM");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>CLIENT CERT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CLIENT CERT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CLIENT_CERT
-	 * @generated
-	 * @ordered
-	 */
-	public static final AuthMethodKind CLIENT_CERT_LITERAL = new AuthMethodKind(CLIENT_CERT, "CLIENT_CERT");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Auth Method Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AuthMethodKind[] VALUES_ARRAY =
-		new AuthMethodKind[] {
-			UNSPECIFIED_LITERAL,
-			BASIC_LITERAL,
-			DIGEST_LITERAL,
-			FORM_LITERAL,
-			CLIENT_CERT_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Auth Method Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Auth Method Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthMethodKind get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AuthMethodKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Auth Method Kind</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AuthMethodKind get(int value) {
-		switch (value) {
-			case UNSPECIFIED: return UNSPECIFIED_LITERAL;
-			case BASIC: return BASIC_LITERAL;
-			case DIGEST: return DIGEST_LITERAL;
-			case FORM: return FORM_LITERAL;
-			case CLIENT_CERT: return CLIENT_CERT_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AuthMethodKind(int value, String name) {
-		super(value, name);
-	}
-
-} //AuthMethodKind
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ContextParam.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ContextParam.java
deleted file mode 100644
index 0cbd49f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ContextParam.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The context-param element contains the declaration of a web application's servlet context initialization parameters.
- */
-public interface ContextParam extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamName attribute
-	 * The param-name element contains the name of a parameter.
-	 */
-	String getParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamName attribute
-	 */
-	void setParamName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamValue attribute
-	 * The param-value element contains the value of a parameter.
-	 */
-	String getParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamValue attribute
-	 */
-	void setParamValue(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/DispatcherType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/DispatcherType.java
deleted file mode 100644
index a621367..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/DispatcherType.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Dispatcher Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getDispatcherType()
- * @model
- * @generated
- */
-public final class DispatcherType extends AbstractEnumerator
-{
-	/**
-	 * The '<em><b>FORWARD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FORWARD_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FORWARD = 0;
-
-	/**
-	 * The '<em><b>INCLUDE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INCLUDE_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INCLUDE = 1;
-
-	/**
-	 * The '<em><b>REQUEST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REQUEST_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REQUEST = 2;
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ERROR_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ERROR = 3;
-
-	/**
-	 * The '<em><b>FORWARD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FORWARD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FORWARD
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType FORWARD_LITERAL = new DispatcherType(FORWARD, "FORWARD");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>INCLUDE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INCLUDE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INCLUDE
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType INCLUDE_LITERAL = new DispatcherType(INCLUDE, "INCLUDE");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>REQUEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>REQUEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REQUEST
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType REQUEST_LITERAL = new DispatcherType(REQUEST, "REQUEST");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ERROR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ERROR
-	 * @generated
-	 * @ordered
-	 */
-	public static final DispatcherType ERROR_LITERAL = new DispatcherType(ERROR, "ERROR");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Dispatcher Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final DispatcherType[] VALUES_ARRAY =
-		new DispatcherType[] {
-			FORWARD_LITERAL,
-			INCLUDE_LITERAL,
-			REQUEST_LITERAL,
-			ERROR_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Dispatcher Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			DispatcherType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Dispatcher Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DispatcherType get(int value) {
-		switch (value) {
-			case FORWARD: return FORWARD_LITERAL;
-			case INCLUDE: return INCLUDE_LITERAL;
-			case REQUEST: return REQUEST_LITERAL;
-			case ERROR: return ERROR_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private DispatcherType(int value, String name) {
-		super(value, name);
-	}
-
-} //DispatcherType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorCodeErrorPage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorCodeErrorPage.java
deleted file mode 100644
index 24f051c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorCodeErrorPage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-
-/**
- * @generated
- */
-public interface ErrorCodeErrorPage extends ErrorPage{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ErrorCode attribute
-	 * The error-code contains an HTTP error code, ex: 404
-
-	 */
-	String getErrorCode();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ErrorCode attribute
-	 */
-	void setErrorCode(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorPage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorPage.java
deleted file mode 100644
index 549c27b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ErrorPage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The error-page element contains a mapping between an error code or exception type to the path of a resource in the web application
- */
-public interface ErrorPage extends EObject{
-
-public boolean isErrorCode();
-public boolean isExceptionType();
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Location attribute
-	 * The location element contains the location of the resource in the web
-	 * application
-	 */
-	String getLocation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Location attribute
-	 */
-	void setLocation(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ExceptionTypeErrorPage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ExceptionTypeErrorPage.java
deleted file mode 100644
index a990fc1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ExceptionTypeErrorPage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.java.JavaClass;
-/**
- * @generated
- */
-public interface ExceptionTypeErrorPage extends ErrorPage {
-
-
-
-
-public String getExceptionTypeName() ;
-void setExceptionTypeName(String exceptionTypeName) ;
-/**
- * @deprecated Use @link{#setExceptionTypeName(String)}
- */
-void setExceptionTypeName(String exceptionTypeName, ResourceSet context) ;
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ExceptionType reference
-	 * The exception type contains a fully qualified class name of a Java exception
-	 * type.
-	 */
-	JavaClass getExceptionType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ExceptionType reference
-	 */
-	void setExceptionType(JavaClass value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Filter.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Filter.java
deleted file mode 100644
index 90e0989..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Filter.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.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * Declares a filter in the web application application. The filter is mapped to either a servlet or a URL pattern in the filter-mapping element, using the filter-name value to reference. Filters can access the initialization parameters declared in the deployment descriptor at runtime via the FilterConfig interface.
-
- */
-public interface Filter extends CompatibilityDescriptionGroup{
-
-public String getFilterClassName();
-public void setFilterClassName(String filterClassName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Name attribute
-	 * The logical name of the filter. This name is used to map the filter.
-	 */
-	String getName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Name attribute
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of InitParams references
-	 * The init-params contain a name//value pairs as initialization params for the
-	 * filter
-
-	 */
-	EList getInitParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FilterClass reference
-	 * The fully qualified classname of the filter.
-	 */
-	JavaClass getFilterClass();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the FilterClass reference
-	 */
-	void setFilterClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Param Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Param Values</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * The init-param element contains a name/value pair as
-	 *         an initialization param of a servlet filter
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Init Param Values</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getFilter_InitParamValues()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getInitParamValues();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FilterMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FilterMapping.java
deleted file mode 100644
index efb4b7c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FilterMapping.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * Declaration of the filter mappings in this web application. The container uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. The container matches the request URI to a Servlet in the normal way. To determine which filters to apply it matches filter-mapping declarations either on servlet-name, or on url-pattern for each filter-mapping element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping elements.The filter-name value must be the value of the <filtername> sub-elements of one of the <filter> declarations in the deployment descriptor.
- * 
- * @invariant The filter-name value must be the value of the Filter::name of one of the Filter declarations in the deployment descriptor.
-
- */
-public interface FilterMapping extends EObject{
-
-/**
- * Returns the name of the servlet that this mapping applies to.
- */
-public String getServletName();
-/**
- * Sets the name of the servlet that this mapping applies to.
- */
-public void setServletName(String servletName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the UrlPattern attribute
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	String getUrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the UrlPattern attribute
-	 */
-	void setUrlPattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Dispatcher Type</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webapplication.DispatcherType}.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.internal.webapplication.DispatcherType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dispatcher Type</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dispatcher Type</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.DispatcherType
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getFilterMapping_DispatcherType()
-	 * @model type="org.eclipse.jst.j2ee.internal.webapplication.DispatcherType" upper="4"
-	 * @generated
-	 */
-	EList getDispatcherType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Filter reference
-	 * The filter being mapped
-	 */
-	Filter getFilter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Filter reference
-	 */
-	void setFilter(Filter value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Servlet reference
-	 * An optional servlet that is mapped by a filter mapping.  servletName is used to 
-	 * resolve the servlet reference.
-	 */
-	Servlet getServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Servlet reference
-	 */
-	void setServlet(Servlet value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FormLoginConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FormLoginConfig.java
deleted file mode 100644
index 398636d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/FormLoginConfig.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * 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.
- */
-public interface FormLoginConfig extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the FormLoginPage attribute
-	 * The form-login-page element defines the location in the web app where the page
-	 * that can be used for login can be found
-	 */
-	String getFormLoginPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the FormLoginPage attribute
-	 */
-	void setFormLoginPage(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the FormErrorPage attribute
-	 * The form-error-page element defines the location in the web app where the error 
-	 * page that is displayed when login is not successful can be found
-	 */
-	String getFormErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the FormErrorPage attribute
-	 */
-	void setFormErrorPage(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LoginConfig reference
-	 */
-	LoginConfig getLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the LoginConfig reference
-	 */
-	void setLoginConfig(LoginConfig value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodType.java
deleted file mode 100644
index eab42b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodType.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.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- *  @deprecated since 4/25/2003 use list on {@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection}
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodType#getHttpMethod <em>Http Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getHTTPMethodType()
- * @model 
- * @generated
- */
-public interface HTTPMethodType extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Http Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Http Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Http Method</em>' attribute.
-	 * @see #setHttpMethod(String)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getHTTPMethodType_HttpMethod()
-	 * @model 
-	 * @generated
-	 */
-	String getHttpMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodType#getHttpMethod <em>Http Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Http Method</em>' attribute.
-	 * @see #getHttpMethod()
-	 * @generated
-	 */
-	void setHttpMethod(String value);
-
-} // HTTPMethodType
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodTypeEnum.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodTypeEnum.java
deleted file mode 100644
index 3bba783..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/HTTPMethodTypeEnum.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>HTTP Method Type Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getHTTPMethodTypeEnum()
- * @model
- * @generated
- */
-public final class HTTPMethodTypeEnum extends AbstractEnumerator {
-	/**
-	 * The '<em><b>GET</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #GET_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GET = 0;
-
-	/**
-	 * The '<em><b>POST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #POST_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int POST = 1;
-
-	/**
-	 * The '<em><b>PUT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PUT_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PUT = 2;
-
-	/**
-	 * The '<em><b>DELETE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DELETE_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DELETE = 3;
-
-	/**
-	 * The '<em><b>HEAD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #HEAD_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int HEAD = 4;
-
-	/**
-	 * The '<em><b>OPTIONS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OPTIONS_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OPTIONS = 5;
-
-	/**
-	 * The '<em><b>TRACE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TRACE_LITERAL
-	 * @model 
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TRACE = 6;
-
-	/**
-	 * The '<em><b>GET</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>GET</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The http-method contains an HTTP method (GET | POST |...)
-	 * <!-- end-model-doc -->
-	 * @see #GET
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum GET_LITERAL = new HTTPMethodTypeEnum(GET, "GET");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>POST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>POST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #POST
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum POST_LITERAL = new HTTPMethodTypeEnum(POST, "POST");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>PUT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>PUT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PUT
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum PUT_LITERAL = new HTTPMethodTypeEnum(PUT, "PUT");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>DELETE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>DELETE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DELETE
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum DELETE_LITERAL = new HTTPMethodTypeEnum(DELETE, "DELETE");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>HEAD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>HEAD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HEAD
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum HEAD_LITERAL = new HTTPMethodTypeEnum(HEAD, "HEAD");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>OPTIONS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>OPTIONS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OPTIONS
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum OPTIONS_LITERAL = new HTTPMethodTypeEnum(OPTIONS, "OPTIONS");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>TRACE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>TRACE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TRACE
-	 * @generated
-	 * @ordered
-	 */
-	public static final HTTPMethodTypeEnum TRACE_LITERAL = new HTTPMethodTypeEnum(TRACE, "TRACE");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>HTTP Method Type Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final HTTPMethodTypeEnum[] VALUES_ARRAY =
-		new HTTPMethodTypeEnum[] {
-			GET_LITERAL,
-			POST_LITERAL,
-			PUT_LITERAL,
-			DELETE_LITERAL,
-			HEAD_LITERAL,
-			OPTIONS_LITERAL,
-			TRACE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>HTTP Method Type Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>HTTP Method Type Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static HTTPMethodTypeEnum get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			HTTPMethodTypeEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>HTTP Method Type Enum</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static HTTPMethodTypeEnum get(int value) {
-		switch (value) {
-			case GET: return GET_LITERAL;
-			case POST: return POST_LITERAL;
-			case PUT: return PUT_LITERAL;
-			case DELETE: return DELETE_LITERAL;
-			case HEAD: return HEAD_LITERAL;
-			case OPTIONS: return OPTIONS_LITERAL;
-			case TRACE: return TRACE_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private HTTPMethodTypeEnum(int value, String name) {
-		super(value, name);
-	}
-
-} //HTTPMethodTypeEnum
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/InitParam.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/InitParam.java
deleted file mode 100644
index e63e8bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/InitParam.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The init-param element contains a name//value pair as an initialization param of the servlet
- */
-public interface InitParam extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamName attribute
-	 * 
-	 * 
-
-	 */
-	String getParamName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamName attribute
-	 */
-	void setParamName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ParamValue attribute
-	 */
-	String getParamValue();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ParamValue attribute
-	 */
-	void setParamValue(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/JSPType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/JSPType.java
deleted file mode 100644
index b5a25e6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/JSPType.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.webapplication;
-
-
-/**
- * @generated
- */
-public interface JSPType extends WebType{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the JspFile attribute
-	 * The jsp-file element contains the full path to a JSP file within the web
-	 * application.
-
-	 */
-	String getJspFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the JspFile attribute
-	 */
-	void setJspFile(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMapping.java
deleted file mode 100644
index 5c5b98d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMapping.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Local Encoding Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getLocale <em>Locale</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getEncoding <em>Encoding</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getLocalEncodingMapping()
- * @model 
- * @generated
- */
-public interface LocalEncodingMapping extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Locale</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Locale</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Locale</em>' attribute.
-	 * @see #setLocale(String)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getLocalEncodingMapping_Locale()
-	 * @model 
-	 * @generated
-	 */
-	String getLocale();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getLocale <em>Locale</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Locale</em>' attribute.
-	 * @see #getLocale()
-	 * @generated
-	 */
-	void setLocale(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Encoding</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Encoding</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Encoding</em>' attribute.
-	 * @see #setEncoding(String)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getLocalEncodingMapping_Encoding()
-	 * @model 
-	 * @generated
-	 */
-	String getEncoding();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping#getEncoding <em>Encoding</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Encoding</em>' attribute.
-	 * @see #getEncoding()
-	 * @generated
-	 */
-	void setEncoding(String value);
-
-} // LocalEncodingMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMappingList.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMappingList.java
deleted file mode 100644
index 46ea47c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LocalEncodingMappingList.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Local Encoding Mapping List</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMappingList#getLocalEncodingMappings <em>Local Encoding Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getLocalEncodingMappingList()
- * @model 
- * @generated
- */
-public interface LocalEncodingMappingList extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Local Encoding Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Encoding Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Encoding Mappings</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getLocalEncodingMappingList_LocalEncodingMappings()
-	 * @model type="org.eclipse.jst.j2ee.internal.webapplication.LocalEncodingMapping" containment="true" required="true"
-	 * @generated
-	 */
-	EList getLocalEncodingMappings();
-
-} // LocalEncodingMappingList
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LoginConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LoginConfig.java
deleted file mode 100644
index b04136a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/LoginConfig.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * The login-config element is used to configure the authentication method that should be used, the realm name that should be used for this application, and the attributes that are needed by the form login
- * mechanism.
- */
-public interface LoginConfig extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the AuthMethod attribute
-	 * The auth-method element is used to configure the authentication mechanism for
-	 * the web application. As a prerequisite to gaining access to any web resources
-	 * which are protected by an authorization constraint, a user must have
-	 * authenticated using the configured mechanism. Legal values for this element are 
-	 * "BASIC", "DIGEST", "FORM", or "CLIENT-CERT".
-	 */
-	AuthMethodKind getAuthMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.LoginConfig#getAuthMethod <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Auth Method</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.AuthMethodKind
-	 * @see #isSetAuthMethod()
-	 * @see #unsetAuthMethod()
-	 * @see #getAuthMethod()
-	 * @generated
-	 */
-	void setAuthMethod(AuthMethodKind value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.LoginConfig#getAuthMethod <em>Auth Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetAuthMethod()
-	 * @see #getAuthMethod()
-	 * @see #setAuthMethod(AuthMethodKind)
-	 * @generated
-	 */
-	void unsetAuthMethod();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.LoginConfig#getAuthMethod <em>Auth Method</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Auth Method</em>' attribute is set.
-	 * @see #unsetAuthMethod()
-	 * @see #getAuthMethod()
-	 * @see #setAuthMethod(AuthMethodKind)
-	 * @generated
-	 */
-	boolean isSetAuthMethod();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RealmName attribute
-	 * The realm name element specifies the realm name to use in HTTP Basic
-	 * authorization
-	 */
-	String getRealmName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RealmName attribute
-	 */
-	void setRealmName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Authorization Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Authorization Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Authorization Method</em>' attribute.
-	 * @see #setAuthorizationMethod(String)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getLoginConfig_AuthorizationMethod()
-	 * @model 
-	 * @generated
-	 */
-	String getAuthorizationMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.LoginConfig#getAuthorizationMethod <em>Authorization Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authorization Method</em>' attribute.
-	 * @see #getAuthorizationMethod()
-	 * @generated
-	 */
-	void setAuthorizationMethod(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FormLoginConfig reference
-	 */
-	FormLoginConfig getFormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the FormLoginConfig reference
-	 */
-	void setFormLoginConfig(FormLoginConfig value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/MimeMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/MimeMapping.java
deleted file mode 100644
index 8c4989b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/MimeMapping.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The mime-mapping element defines a mapping between an extension and a mime type.
-
- */
-public interface MimeMapping extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Extension attribute
-	 * The extension element contains a string describing an extension. example: "txt"
-	 */
-	String getExtension();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Extension attribute
-	 */
-	void setExtension(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the MimeType attribute
-	 * The mime-type element contains a defined mime type. example: "text//plain"
-	 */
-	String getMimeType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the MimeType attribute
-	 */
-	void setMimeType(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ResAuthServletType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ResAuthServletType.java
deleted file mode 100644
index 9d6f256..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ResAuthServletType.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-public final class ResAuthServletType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CONTAINER = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int SERVLET = 1;
-	/**
-	 * The '<em><b>CONTAINER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CONTAINER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONTAINER
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthServletType CONTAINER_LITERAL = new ResAuthServletType(CONTAINER, "CONTAINER");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>SERVLET</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SERVLET</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SERVLET
-	 * @generated
-	 * @ordered
-	 */
-	public static final ResAuthServletType SERVLET_LITERAL = new ResAuthServletType(SERVLET, "SERVLET");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Res Auth Servlet Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ResAuthServletType[] VALUES_ARRAY =
-		new ResAuthServletType[] {
-			CONTAINER_LITERAL,
-			SERVLET_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Res Auth Servlet Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Res Auth Servlet Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthServletType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ResAuthServletType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Res Auth Servlet Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ResAuthServletType get(int value) {
-		switch (value) {
-			case CONTAINER: return CONTAINER_LITERAL;
-			case SERVLET: return SERVLET_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ResAuthServletType(int value, String name) {
-		super(value, name);
-	}
-
-} //ResAuthServletType
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/RoleNameType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/RoleNameType.java
deleted file mode 100644
index a5ef1f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/RoleNameType.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * @generated
- */
-public interface RoleNameType extends EObject {
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the RoleName attribute
-	 */
-	String getRoleName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the RoleName attribute
-	 */
-	void setRoleName(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SecurityConstraint.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SecurityConstraint.java
deleted file mode 100644
index 8930c20..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SecurityConstraint.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.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * The security-constraint element is used to associate security constraints with one or more web resource collections
- */
-public interface SecurityConstraint extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4 deprecated, becomes displayNames
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getSecurityConstraint_DisplayName()
-	 * @model 
-	 * @generated
-	 */
-	String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.SecurityConstraint#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-	void setDisplayName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of WebResourceCollections references
-	 */
-	EList getWebResourceCollections();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The AuthConstraint reference
-	 */
-	AuthConstraint getAuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the AuthConstraint reference
-	 */
-	void setAuthConstraint(AuthConstraint value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The UserDataConstraint reference
-	 */
-	UserDataConstraint getUserDataConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the UserDataConstraint reference
-	 */
-	void setUserDataConstraint(UserDataConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Names</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.webapplication.WebapplicationPackage#getSecurityConstraint_DisplayNames()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.DisplayName" containment="true"
-	 * @generated
-	 */
-	EList getDisplayNames();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Servlet.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Servlet.java
deleted file mode 100644
index 5a299c3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/Servlet.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-
-/**
- * The servlet element contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup element is present, then the JSP should be precompiled and loaded.
- */
-public interface Servlet extends CompatibilityDescriptionGroup{
-
-
-/**
- * Returns an unmodifiable list of the mappings that this
- * servlet participates in.  Since servletMappings is not
- * a bi-directional attribute, if you want to add or delete a
- * mapping, this must be done in the web-app.
- * @return java.util.List
- */
-public List getMappings();
-public Properties getParamsAsProperties() ;
-/**
- * Fix the role-link on any contained role refs
- */
-public void reSyncSecurityRoleRef(String existingRoleName, String newRoleName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ServletName attribute
-	 * The servlet-name element contains the canonical name of the servlet.
-	 */
-	String getServletName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ServletName attribute
-	 */
-	void setServletName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the LoadOnStartup attribute
-	 * The load-on-startup element indicates that this servlet should be loaded on the 
-	 * startup of the web application. The optional contents of these element must be
-	 * a positive integer indicating the order in which the servlet should be loaded.
-	 * Lower integers are loaded before higher integers. If no value is specified, or
-	 * if the value specified is not a positive integer, the container is free to load 
-	 * it at any time in the startup sequence.
-
-	 */
-	Integer getLoadOnStartup();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.Servlet#getLoadOnStartup <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Load On Startup</em>' attribute.
-	 * @see #isSetLoadOnStartup()
-	 * @see #unsetLoadOnStartup()
-	 * @see #getLoadOnStartup()
-	 * @generated
-	 */
-	void setLoadOnStartup(Integer value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.Servlet#getLoadOnStartup <em>Load On Startup</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetLoadOnStartup()
-	 * @see #getLoadOnStartup()
-	 * @see #setLoadOnStartup(Integer)
-	 * @generated
-	 */
-  void unsetLoadOnStartup();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.Servlet#getLoadOnStartup <em>Load On Startup</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Load On Startup</em>' attribute is set.
-	 * @see #unsetLoadOnStartup()
-	 * @see #getLoadOnStartup()
-	 * @see #setLoadOnStartup(Integer)
-	 * @generated
-	 */
-  boolean isSetLoadOnStartup();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebType reference
-	 */
-	WebType getWebType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebType reference
-	 */
-	void setWebType(WebType value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Params references
-	 */
-	EList getParams();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoleRefs references
-	 */
-	EList getSecurityRoleRefs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The RunAs reference
-	 * If defined for a servlet, overrides the security identity used to call an EJB
-	 * by that servlet in this web application. The role-name is one of the security
-	 * roles already defined for this web application.
-	 */
-	RunAsSpecifiedIdentity getRunAs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the RunAs reference
-	 */
-	void setRunAs(RunAsSpecifiedIdentity value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getServlet_InitParams()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getInitParams();
-
-	/**
-	 * return the java servlet class associated with this servlet
-	 */
-	public JavaClass getServletClass();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletMapping.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletMapping.java
deleted file mode 100644
index 3833af6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletMapping.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.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The servlet-mapping element defines a mapping between a servlet and a url pattern
- */
-public interface ServletMapping extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the UrlPattern attribute
-	 * The url-pattern element contains the url pattern of the mapping. Must follow
-	 * the rules specified in Section 10 of the Servlet API Specification.
-	 */
-	String getUrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the UrlPattern attribute
-	 */
-	void setUrlPattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * The servlet-name element contains the canonical name of the
-	 * servlet. Each servlet name is unique within the web
-	 * application.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getServletMapping_Name()
-	 * @model 
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.ServletMapping#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The Servlet reference
-	 */
-	Servlet getServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the Servlet reference
-	 */
-	void setServlet(Servlet value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletType.java
deleted file mode 100644
index bc8884f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/ServletType.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-
-/**
- * @generated
- */
-public interface ServletType extends WebType{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the ClassName attribute
-	 */
-	String getClassName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the ClassName attribute
-	 */
-	void setClassName(String value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SessionConfig.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SessionConfig.java
deleted file mode 100644
index 4fce30c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/SessionConfig.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The session-config element defines the session parameters for this web application.
- */
-public interface SessionConfig extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the SessionTimeout attribute
-	 * The session-timeout element defines the default session timeout interval for
-	 * all sessions created in this web application. The specified timeout must be
-	 * expressed in a whole number of minutes.
-	 */
-	int getSessionTimeout();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the SessionTimeout attribute
-	 */
-	void setSessionTimeout(int value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.SessionConfig#getSessionTimeout <em>Session Timeout</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #isSetSessionTimeout()
-	 * @see #getSessionTimeout()
-	 * @see #setSessionTimeout(int)
-	 * @generated
-	 */
-  void unsetSessionTimeout();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.SessionConfig#getSessionTimeout <em>Session Timeout</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Session Timeout</em>' attribute is set.
-	 * @see #unsetSessionTimeout()
-	 * @see #getSessionTimeout()
-	 * @see #setSessionTimeout(int)
-	 * @generated
-	 */
-  boolean isSetSessionTimeout();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TagLibRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TagLibRef.java
deleted file mode 100644
index 771559d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TagLibRef.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The taglib element is used to describe a JSP tag library.
- * @since since J2EE1.4 deprecated, use org.eclipse.jst.j2ee.internal.jsp.TagLibRef
- */
-public interface TagLibRef extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TaglibURI attribute
-	 * The taglib-uri element describes a URI, relative to the location of the web.xml 
-	 * document, identifying a Tag Library used in the Web Application.
-	 */
-	String getTaglibURI();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the TaglibURI attribute
-	 */
-	void setTaglibURI(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TaglibLocation attribute
-	 * The taglib-location element contains the location (as a resource relative to
-	 * the root of the web application) where to find the Tag Libary Description file
-	 * for the tag library.
-	 */
-	String getTaglibLocation();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the TaglibLocation attribute
-	 */
-	void setTaglibLocation(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Web App</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getTagLibs <em>Tag Libs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Web App</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Web App</em>' container reference.
-	 * @see #setWebApp(WebApp)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getTagLibRef_WebApp()
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebApp#getTagLibs
-	 * @model opposite="tagLibs"
-	 * @generated
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.TagLibRef#getWebApp <em>Web App</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web App</em>' container reference.
-	 * @see #getWebApp()
-	 * @generated
-	 */
-	void setWebApp(WebApp value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TransportGuaranteeType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TransportGuaranteeType.java
deleted file mode 100644
index e9f875c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/TransportGuaranteeType.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-
-
-
-public final class TransportGuaranteeType extends AbstractEnumerator{
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int NONE = 0;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int INTEGRAL = 1;
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	public static final int CONFIDENTIAL = 2;
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType NONE_LITERAL = new TransportGuaranteeType(NONE, "NONE");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>INTEGRAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INTEGRAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTEGRAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType INTEGRAL_LITERAL = new TransportGuaranteeType(INTEGRAL, "INTEGRAL");//$NON-NLS-1$
-
-	/**
-	 * The '<em><b>CONFIDENTIAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CONFIDENTIAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONFIDENTIAL
-	 * @generated
-	 * @ordered
-	 */
-	public static final TransportGuaranteeType CONFIDENTIAL_LITERAL = new TransportGuaranteeType(CONFIDENTIAL, "CONFIDENTIAL");//$NON-NLS-1$
-
-	/**
-	 * An array of all the '<em><b>Transport Guarantee Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TransportGuaranteeType[] VALUES_ARRAY =
-		new TransportGuaranteeType[] {
-			NONE_LITERAL,
-			INTEGRAL_LITERAL,
-			CONFIDENTIAL_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Transport Guarantee Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType get(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TransportGuaranteeType result = VALUES_ARRAY[i];
-			if (result.toString().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Transport Guarantee Type</b></em>' literal with the specified value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TransportGuaranteeType get(int value) {
-		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case INTEGRAL: return INTEGRAL_LITERAL;
-			case CONFIDENTIAL: return CONFIDENTIAL_LITERAL;
-		}
-		return null;	
-	}
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TransportGuaranteeType(int value, String name) {
-		super(value, name);
-	}
-
-} //TransportGuaranteeType
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/URLPatternType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/URLPatternType.java
deleted file mode 100644
index 80606ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/URLPatternType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- *  <!-- begin-user-doc -->
- * @deprecated since 4/25/2003 use list on {@link org.eclipse.jst.j2ee.internal.webapplication.WebResourceCollection} 
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.URLPatternType#getUrlPattern <em>Url Pattern</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webapplication.URLPatternType#getResCollection <em>Res Collection</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getURLPatternType()
- * @model 
- * @generated
- */
-public interface URLPatternType extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the UrlPattern attribute
-	 */
-	String getUrlPattern();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the UrlPattern attribute
-	 */
-	void setUrlPattern(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The ResCollection reference
-	 */
-	WebResourceCollection getResCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the ResCollection reference
-	 */
-	void setResCollection(WebResourceCollection value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/UserDataConstraint.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/UserDataConstraint.java
deleted file mode 100644
index d8f699e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/UserDataConstraint.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.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * The user-data-constraint element is used to indicate how data communicated between the client and container should be protected
- */
-public interface UserDataConstraint extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 * A description for the user data constraint.
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the TransportGuarantee attribute
-	 * The transport-guarantee element specifies that the communication between client 
-	 * and server should be NONE, INTEGRAL, or CONFIDENTIAL. NONE means that the
-	 * application does not require any
-	 * transport guarantees. A value of INTEGRAL means that the application requires
-	 * that the data sent between the client and server be sent in such a way that it
-	 * can't be changed in transit. CONFIDENTIAL means that the application requires
-	 * that the data be transmitted in a fashion that prevents other entities from
-	 * observing the contents of the transmission. In most cases, the presence of the
-	 * INTEGRAL or CONFIDENTIAL flag will indicate that the use of SSL is required.
-	 */
-	TransportGuaranteeType getTransportGuarantee();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Transport Guarantee</em>' attribute.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.TransportGuaranteeType
-	 * @see #isSetTransportGuarantee()
-	 * @see #unsetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @generated
-	 */
-	void setTransportGuarantee(TransportGuaranteeType value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @see #setTransportGuarantee(TransportGuaranteeType)
-	 * @generated
-	 */
-	void unsetTransportGuarantee();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.UserDataConstraint#getTransportGuarantee <em>Transport Guarantee</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Transport Guarantee</em>' attribute is set.
-	 * @see #unsetTransportGuarantee()
-	 * @see #getTransportGuarantee()
-	 * @see #setTransportGuarantee(TransportGuaranteeType)
-	 * @generated
-	 */
-	boolean isSetTransportGuarantee();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecConstraint reference
-	 */
-	SecurityConstraint getSecConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the SecConstraint reference
-	 */
-	void setSecConstraint(SecurityConstraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getUserDataConstraint_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebApp.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebApp.java
deleted file mode 100644
index c216473..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebApp.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-
-/**
- * The web-app element is the root of the deployment descriptor for
- * a web application.
- */
-public interface WebApp extends JNDIEnvRefsGroup{
-
-public boolean containsSecurityRole(String name);
-ErrorPage getErrorPageByCode(Integer code) ;
-ErrorPage getErrorPageByExceptionType(String exceptionType) ;
-/**
- * Finds a filter mapping for a specified filter.
- * @param filter The filter to find the mappings for.
- * @return The filter mapping for the specified filter, or null if no
- * mapping exists for the filter.
- */
-
-FilterMapping getFilterMapping(Filter aFilter);
-public Filter getFilterNamed(String name);
-/**
- * Gets the names of the filters defined for this web application.
- * @return A list of filter names (Strings).
- */
-
-List getFilterNames() ;
-/**
- * Returns the mime type for the specified extension
- * @param An extension to find the mime type for.
- */
- 
-String getMimeType(String extension);
-	public SecurityRole getSecurityRoleNamed(String roleName);
-/**
- * Finds a servlet mapping for a specified servlet.
- * @param servlet The servlet to find the mappings for.
- * @return The servlet mapping for the specified servlet, or null if no
- * mapping exists for the servlet.
- */
-
-ServletMapping getServletMapping(Servlet aServlet);
-public Servlet getServletNamed(String name);
-/**
- * Gets the names of the servlets defined for this web application.
- * @return A list of servlet names (Strings).
- */
-
-List getServletNames() ;
-/**
- * Return boolean indicating if this Web App was populated from an Servlet2.2 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_2Descriptor();
-/**
- * Return boolean indicating if this Web App was populated from an Servlet2.3 compliant descriptor
- * @return boolean
- * @deprecated Use getVersionID() to determine module level
- */
-public boolean isVersion2_3Descriptor();
-/**
- * Rename the security role if it exists; for each servlet, fix the role-link on any contained role
- * refs
- */
-public void renameSecurityRole(String existingRoleName, String newRoleName);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Distributable attribute
-	 * The distributable element, by its presence in a web application deployment
-	 * descriptor, indicates that this web application is programmed appropriately to
-	 * be deployed into a distributed servlet container
-	 */
-	boolean isDistributable();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Distributable attribute
-	 */
-	void setDistributable(boolean value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#isDistributable <em>Distributable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDistributable()
-	 * @see #isDistributable()
-	 * @see #setDistributable(boolean)
-	 * @generated
-	 */
-	void unsetDistributable();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#isDistributable <em>Distributable</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Distributable</em>' attribute is set.
-	 * @see #unsetDistributable()
-	 * @see #isDistributable()
-	 * @see #setDistributable(boolean)
-	 * @generated
-	 */
-	boolean isSetDistributable();
-
-	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebApp_Version()
-	 * @model 
-	 * @generated
-	 */
-	String getVersion();
-
-	/**
-	* This returns the module version id. Compare with J2EEVersionConstants to determine module level
-	*/
-	public int getVersionID() throws IllegalStateException ;
-	/**
-	 *This returns the j2ee version id. Compare with J2EEVersionConstants to determine j2ee level
-	 */
-	public int getJ2EEVersionID() throws IllegalStateException ;
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
-	void setVersion(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Contexts references
-	 */
-	EList getContexts();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ErrorPages references
-	 */
-	EList getErrorPages();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FileList reference
-	 */
-	WelcomeFileList getFileList();
-
-	/**
-	 * @deprecated : Use getEnvironmentProperties()
-	 */
-	EList getEnvEntries();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the FileList reference
-	 */
-	void setFileList(WelcomeFileList value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of TagLibs references
-	 */
-	EList getTagLibs();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Constraints references
-	 */
-	EList getConstraints();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The LoginConfig reference
-	 */
-	LoginConfig getLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the LoginConfig reference
-	 */
-	void setLoginConfig(LoginConfig value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of MimeMappings references
-	 */
-	EList getMimeMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SessionConfig reference
-	 */
-	SessionConfig getSessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the SessionConfig reference
-	 */
-	void setSessionConfig(SessionConfig value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of ServletMappings references
-	 */
-	EList getServletMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Servlets references
-	 */
-	EList getServlets();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of SecurityRoles references
-	 */
-	EList getSecurityRoles();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Filters references
-	 */
-	EList getFilters();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of FilterMappings references
-	 * Filter mappings defined for the web app
-	 */
-	EList getFilterMappings();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of Listeners references
-	 * The listeners collection contains deployment properties for a web application
-	 * listener beans in the web app.
-	 */
-	EList getListeners();
-
-	/**
-	 * Returns the value of the '<em><b>Context Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebApp_ContextParams()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getContextParams();
-
-	/**
-	 * Returns the value of the '<em><b>Jsp Config</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jsp Config</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Jsp Config</em>' containment reference.
-	 * @see #setJspConfig(JSPConfig)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebApp_JspConfig()
-	 * @model containment="true"
-	 * @generated
-	 */
-	JSPConfig getJspConfig();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getJspConfig <em>Jsp Config</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jsp Config</em>' containment reference.
-	 * @see #getJspConfig()
-	 * @generated
-	 */
-	void setJspConfig(JSPConfig value);
-
-	/**
-	 * Returns the value of the '<em><b>Message Destinations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.common.MessageDestination}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Message Destinations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Message Destinations</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebApp_MessageDestinations()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.MessageDestination" containment="true"
-	 * @generated
-	 */
-	EList getMessageDestinations();
-
-	/**
-	 * Returns the value of the '<em><b>Local Encoding Mapping List</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Local Encoding Mapping List</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Local Encoding Mapping List</em>' containment reference.
-	 * @see #setLocalEncodingMappingList(LocalEncodingMappingList)
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebApp_LocalEncodingMappingList()
-	 * @model containment="true"
-	 * @generated
-	 */
-	LocalEncodingMappingList getLocalEncodingMappingList();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webapplication.WebApp#getLocalEncodingMappingList <em>Local Encoding Mapping List</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local Encoding Mapping List</em>' containment reference.
-	 * @see #getLocalEncodingMappingList()
-	 * @generated
-	 */
-	void setLocalEncodingMappingList(LocalEncodingMappingList value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebAppResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebAppResource.java
deleted file mode 100644
index b7eeeba..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebAppResource.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 18, 2003
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-/**
- * @author schacher
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public interface WebAppResource extends XMLResource {
-	WebApp getWebApp();
-	/**
-	 * Return true if this Resource supports the Web 2.2 spec.
-	 */
-	boolean isWeb2_2();
-	/**
-	 * Return true if this Resource supports the Web 2.3 spec.
-	 */
-	boolean isWeb2_3();
-	/**
-	 * Return true if this Resource supports the Web 2.4 spec.
-	 */
-	boolean isWeb2_4();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebResourceCollection.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebResourceCollection.java
deleted file mode 100644
index e209ebe..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebResourceCollection.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * @generated
- * The web-resource-collection element is used to identify a subset of the resources and HTTP methods on those resources within a web application to which a security constraint applies. If no HTTP methods are specified, then the security constraint applies to all HTTP methods.
-
- */
-public interface WebResourceCollection extends EObject{
-
-public void addHTTP(String httpMethod);
-public void addURL(String urlPattern);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the WebResourceName attribute
-	 * The web-resource-name contains the name of this web resource collection
-	 */
-	String getWebResourceName();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WebResourceName attribute
-	 */
-	void setWebResourceName(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the Description attribute
-	 */
-	String getDescription();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the Description attribute
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Url Pattern</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Url Pattern</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Url Pattern</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebResourceCollection_UrlPattern()
-	 * @model type="java.lang.String" unique="false" required="true"
-	 * @generated
-	 */
-	EList getUrlPattern();
-
-	/**
-	 * Returns the value of the '<em><b>Http Method</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum}.
-	 * The literals are from the enumeration {@link org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Http Method</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Http Method</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebResourceCollection_HttpMethod()
-	 * @model type="org.eclipse.jst.j2ee.internal.webapplication.HTTPMethodTypeEnum"
-	 * @generated
-	 */
-	EList getHttpMethod();
-
-	/**
-	 * @deprecated : Use getHttpMethod();
-	 */
-	EList getHTTPs();
-	
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The SecConstraint reference
-	 */
-	
-	
-	SecurityConstraint getSecConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the SecConstraint reference
-	 */
-	void setSecConstraint(SecurityConstraint value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of URLs references
-	 */
-	EList getURLs();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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 -->
-	 * @since J2EE1.4
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage#getWebResourceCollection_Descriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.Description" containment="true"
-	 * @generated
-	 */
-	EList getDescriptions();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebType.java
deleted file mode 100644
index 7b58f23..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebType.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.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * @generated
- */
-public interface WebType extends EObject {
-
-public boolean isJspType();
-public boolean isServletType();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java
deleted file mode 100644
index 7d093ad..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WebapplicationFactory.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-/**
- * @generated
- */
-public interface WebapplicationFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	WebapplicationFactory eINSTANCE = new org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationFactoryImpl();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebApp value
-	 */
-	WebApp createWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ContextParam value
-	 */
-	ContextParam createContextParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorPage value
-	 */
-	ErrorPage createErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ExceptionTypeErrorPage value
-	 */
-	ExceptionTypeErrorPage createExceptionTypeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ErrorCodeErrorPage value
-	 */
-	ErrorCodeErrorPage createErrorCodeErrorPage();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFileList value
-	 */
-	WelcomeFileList createWelcomeFileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WelcomeFile value
-	 */
-	WelcomeFile createWelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return TagLibRef value
-	 */
-	TagLibRef createTagLibRef();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SecurityConstraint value
-	 */
-	SecurityConstraint createSecurityConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return WebResourceCollection value
-	 */
-	WebResourceCollection createWebResourceCollection();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return URLPatternType value
-	 */
-	URLPatternType createURLPatternType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return AuthConstraint value
-	 */
-	AuthConstraint createAuthConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return UserDataConstraint value
-	 */
-	UserDataConstraint createUserDataConstraint();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return LoginConfig value
-	 */
-	LoginConfig createLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FormLoginConfig value
-	 */
-	FormLoginConfig createFormLoginConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return MimeMapping value
-	 */
-	MimeMapping createMimeMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return SessionConfig value
-	 */
-	SessionConfig createSessionConfig();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletMapping value
-	 */
-	ServletMapping createServletMapping();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Servlet value
-	 */
-	Servlet createServlet();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return ServletType value
-	 */
-	ServletType createServletType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return JSPType value
-	 */
-	JSPType createJSPType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return InitParam value
-	 */
-	InitParam createInitParam();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return Filter value
-	 */
-	Filter createFilter();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return FilterMapping value
-	 */
-	FilterMapping createFilterMapping();
-
-	/**
-	 * Returns a new object of class '<em>Local Encoding Mapping List</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Local Encoding Mapping List</em>'.
-	 * @generated
-	 */
-	LocalEncodingMappingList createLocalEncodingMappingList();
-
-	/**
-	 * Returns a new object of class '<em>Local Encoding Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Local Encoding Mapping</em>'.
-	 * @generated
-	 */
-	LocalEncodingMapping createLocalEncodingMapping();
-
-	/**
-	 * Returns a new object of class '<em>HTTP Method Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>HTTP Method Type</em>'.
-	 * @generated
-	 */
-	HTTPMethodType createHTTPMethodType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return RoleNameType value
-	 */
-	RoleNameType createRoleNameType();
-
-	/**
-	 * @generated This field/method will be replaced during code generation.
-	 */
-	WebapplicationPackage getWebapplicationPackage();
-
-}
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFile.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFile.java
deleted file mode 100644
index e2eba57..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFile.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * The welcome-file element contains file name to use as a default welcome file, such as index.html
-
- */
-public interface WelcomeFile extends EObject{
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The value of the WelcomeFile attribute
-	 */
-	String getWelcomeFile();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param value The new value of the WelcomeFile attribute
-	 */
-	void setWelcomeFile(String value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The FileList reference
-	 */
-	WelcomeFileList getFileList();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the FileList reference
-	 */
-	void setFileList(WelcomeFileList value);
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFileList.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFileList.java
deleted file mode 100644
index e248b58..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webapplication/WelcomeFileList.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webapplication;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * The welcome-file-list contains an ordered list of welcome files elements.
- */
-public interface WelcomeFileList extends EObject{
-
-public void addFileNamed(String name);
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The WebApp reference
-	 */
-	WebApp getWebApp();
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @param l The new value of the WebApp reference
-	 */
-	void setWebApp(WebApp value);
-
-	/**
-	 * @generated This field/method will be replaced during code generation 
-	 * @return The list of File references
-	 */
-	EList getFile();
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java
deleted file mode 100644
index 1091bef..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.internal;
-
-public final class WebServiceConstants
-{
-  public static final String DEFAULT_XML_ENCODING = "UTF-8";//$NON-NLS-1$
-
-  public static final String WEBSERVICE_DD_SHORT_NAME   = "webservices.xml"; //$NON-NLS-1$
-  public static final String WEBSERVICE_SYSTEMID    = "http://www.ibm.com/webservices/dtd/j2ee_web_services_1_0.dtd"; //$NON-NLS-1$
-  public static final String WEBSERVICE_PUBLICID = "-//IBM Corporation, Inc.//DTD J2EE Web services 1.0//EN"; //$NON-NLS-1$  
-  public static final String WEBSERVICE_DOCTYPE = "webservices";//$NON-NLS-1$
-  public static final String WEBSERVICE_SCHEMA_LOC = "http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd";//$NON-NLS-1$
-  public static final String WEBSERVICE_SCHEMA_LOC_SUN = "http://java.sun.com/xml/ns/j2ee/j2ee_web_services_1_1.xsd";//$NON-NLS-1$
-
-  public static final String WEBSERVICECLIENT_DD_SHORT_NAME   = "webservicesclient.xml"; //$NON-NLS-1$
-  public static final String WEBSERVICECLIENT_SYSTEMID    = "http://www.ibm.com/webservices/dtd/j2ee_web_services_client_1_0.dtd"; //$NON-NLS-1$
-  public static final String WEBSERVICECLIENT_PUBLICID = "-//IBM Corporation, Inc.//DTD J2EE Web services client 1.0//EN"; //$NON-NLS-1$  
-  public static final String WEBSERVICECLIENT_DOCTYPE = "webservicesclient";//$NON-NLS-1$
-
-public static final String WEBSERVICE_TEMP_DD_SHORT_NAME = "webservices-temp.xml";//$NON-NLS-1$
-
-  //public static final String JAXRPCMAP_DD_SHORT_NAME   = "mapping.xml"; //$NON-NLS-1$ !!We don't have a standard name!!
-  public static final String JAXRPCMAP_SYSTEMID    = "http://www.ibm.com/webservices/dtd/j2ee_jaxrpc_mapping_1_0.dtd"; //$NON-NLS-1$
-  public static final String JAXRPCMAP_PUBLICID = "-//IBM Corporation, Inc.//DTD J2EE JAX-RPC mapping 1.0//EN"; //$NON-NLS-1$  
-  public static final String JAXRPCMAP_DOCTYPE = "java-wsdl-mapping";//$NON-NLS-1$
-  public static final String JAXRPCMAP_SCHEMA_LOC = "http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd";//$NON-NLS-1$
-  public static final String JAXRPCMAP_SCHEMA_LOC_SUN = "http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd";//$NON-NLS-1$
-  
-  
-
-  public static final int WEBSERVICE_1_0_ID = 10;
-  public static final int WEBSERVICE_1_1_ID = 11;
-  public static final String WEBSERVICE_SCHEMA_VERSION = "1.1";//$NON-NLS-1$
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceInit.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceInit.java
deleted file mode 100644
index fc4cacc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/WebServiceInit.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.j2ee.webservice.internal;
-
-import org.eclipse.jst.j2ee.internal.J2EEInit;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.impl.JaxrpcmapPackageImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-
-
-
-/**
-* Initializer class to preregister packages, register resource factories, and dtds for the web services models.
-*/
-public class WebServiceInit
-{
-  protected static boolean initialized = false;
-
-  public static void init()
-  {
-
-    if (initialized) return;
- 
-
-    // Initialize the Ecore package.
-    org.eclipse.emf.ecore.impl.EcorePackageImpl.init();
-
-    J2EEInit.init();    
-
-    // Initialize packages
-    JaxrpcmapPackageImpl.init();
-
-
-    // Register resource factories for xml descriptors
-
-
-    // Not calling JaxrpcmapResourceFactory.register() because it does nothing. Registration must be done for each filename as follows:
-    // J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(filename, new JaxrpcmapResourceFactory(EMF2DOMRendererFactory.INSTANCE));  
-    // where filename is a java.lang.String name of the mapping file
-
-    //Register DTDs
-    JaxrpcmapResourceFactory.registerDtds();
-
-
-    initialized = true;
-
-
-  }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/Webservice_clientPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/Webservice_clientPackage.java
deleted file mode 100644
index 97e24e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/Webservice_clientPackage.java
+++ /dev/null
@@ -1,730 +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.webservice.internal.wsclient;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-/**
- * <!-- 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.internal.webservice.wsclient.Webservice_clientFactory
- * @generated
- */
-public interface Webservice_clientPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "wsclient";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "webservice_client.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.webservice.wsclient";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Webservice_clientPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl <em>Service Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.Webservice_clientPackageImpl#getServiceRef()
-	 * @generated
-	 */
-	int SERVICE_REF = 0;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Service Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_INTERFACE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_REF_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__WSDL_FILE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__JAXRPC_MAPPING_FILE = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__PORT_COMPONENT_REFS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__HANDLERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Service Qname</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF__SERVICE_QNAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the the '<em>Service Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SERVICE_REF_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.PortComponentRefImpl <em>Port Component Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.PortComponentRefImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.Webservice_clientPackageImpl#getPortComponentRef()
-	 * @generated
-	 */
-	int PORT_COMPONENT_REF = 1;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__PORT_COMPONENT_LINK = 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Port Component Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_COMPONENT_REF_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl <em>Handler</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.Webservice_clientPackageImpl#getHandler()
-	 * @generated
-	 */
-	int HANDLER = 2;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__HANDLER_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Soap Roles</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__SOAP_ROLES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Port Names</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__PORT_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Handler Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__HANDLER_CLASS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER__SOAP_HEADERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the the '<em>Handler</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int HANDLER_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 6;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.WebServicesClientImpl <em>Web Services Client</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.WebServicesClientImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.Webservice_clientPackageImpl#getWebServicesClient()
-	 * @generated
-	 */
-    int WEB_SERVICES_CLIENT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Component Scoped Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int WEB_SERVICES_CLIENT__SERVICE_REFS = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Web Services Client</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int WEB_SERVICES_CLIENT_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ComponentScopedRefsImpl <em>Component Scoped Refs</em>}' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ComponentScopedRefsImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.Webservice_clientPackageImpl#getComponentScopedRefs()
-	 * @generated
-	 */
-    int COMPONENT_SCOPED_REFS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int COMPONENT_SCOPED_REFS__COMPONENT_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Refs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int COMPONENT_SCOPED_REFS__SERVICE_REFS = 1;
-
-	/**
-	 * The number of structural features of the the '<em>Component Scoped Refs</em>' class.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-    int COMPONENT_SCOPED_REFS_FEATURE_COUNT = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef <em>Service Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Ref</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef
-	 * @generated
-	 */
-	EClass getServiceRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceRefName <em>Service Ref Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Ref Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceRefName()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_ServiceRefName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getWsdlFile <em>Wsdl File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl File</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getWsdlFile()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_WsdlFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jaxrpc Mapping File</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getJaxrpcMappingFile()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EAttribute getServiceRef_JaxrpcMappingFile();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceInterface <em>Service Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Service Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceInterface()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_ServiceInterface();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getPortComponentRefs <em>Port Component Refs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Port Component Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getPortComponentRefs()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_PortComponentRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getHandlers <em>Handlers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Handlers</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getHandlers()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_Handlers();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceQname <em>Service Qname</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Service Qname</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceQname()
-	 * @see #getServiceRef()
-	 * @generated
-	 */
-	EReference getServiceRef_ServiceQname();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef <em>Port Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Component Ref</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef
-	 * @generated
-	 */
-	EClass getPortComponentRef();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Component Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getPortComponentLink()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EAttribute getPortComponentRef_PortComponentLink();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Service Endpoint Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getServiceEndpointInterface()
-	 * @see #getPortComponentRef()
-	 * @generated
-	 */
-	EReference getPortComponentRef_ServiceEndpointInterface();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Handler</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler
-	 * @generated
-	 */
-	EClass getHandler();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerName <em>Handler Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerName()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EAttribute getHandler_HandlerName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getSoapHeaders <em>Soap Headers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Soap Headers</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getSoapHeaders()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EReference getHandler_SoapHeaders();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getSoapRoles <em>Soap Roles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Soap Roles</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getSoapRoles()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EAttribute getHandler_SoapRoles();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getPortNames <em>Port Names</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Port Names</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getPortNames()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EAttribute getHandler_PortNames();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerClass <em>Handler Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Handler Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerClass()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EReference getHandler_HandlerClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getInitParams()
-	 * @see #getHandler()
-	 * @generated
-	 */
-	EReference getHandler_InitParams();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient <em>Web Services Client</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Web Services Client</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient
-	 * @generated
-	 */
-    EClass getWebServicesClient();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient#getComponentScopedRefs <em>Component Scoped Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Component Scoped Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient#getComponentScopedRefs()
-	 * @see #getWebServicesClient()
-	 * @generated
-	 */
-    EReference getWebServicesClient_ComponentScopedRefs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient#getServiceRefs()
-	 * @see #getWebServicesClient()
-	 * @generated
-	 */
-    EReference getWebServicesClient_ServiceRefs();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs <em>Component Scoped Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Component Scoped Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs
-	 * @generated
-	 */
-    EClass getComponentScopedRefs();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs#getComponentName <em>Component Name</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Component Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs#getComponent()
-	 * @see #getComponentScopedRefs()
-	 * @generated
-	 */
-    EAttribute getComponentScopedRefs_ComponentName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs#getServiceRefs <em>Service Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Service Refs</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs#getServiceRefs()
-	 * @see #getComponentScopedRefs()
-	 * @generated
-	 */
-    EReference getComponentScopedRefs_ServiceRefs();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	Webservice_clientFactory getWebservice_clientFactory();
-
-} //Webservice_clientPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ComponentScopedRefsImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ComponentScopedRefsImpl.java
deleted file mode 100644
index f37a225..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ComponentScopedRefsImpl.java
+++ /dev/null
@@ -1,223 +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.webservice.internal.wsclient.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.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.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Scoped Refs</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ComponentScopedRefsImpl#getComponentName <em>Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ComponentScopedRefsImpl#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComponentScopedRefsImpl extends EObjectImpl implements ComponentScopedRefs {
-	/**
-	 * The default value of the '{@link #getComponentName() <em>Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getComponentName()
-	 * @generated
-	 * @ordered
-	 */
-    protected static final String COMPONENT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComponentName() <em>Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getComponentName()
-	 * @generated
-	 * @ordered
-	 */
-    protected String componentName = COMPONENT_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-    protected EList serviceRefs = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected ComponentScopedRefsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected EClass eStaticClass() {
-		return Webservice_clientPackage.eINSTANCE.getComponentScopedRefs();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public String getComponentName() {
-		return componentName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void setComponentName(String newComponentName) {
-		String oldComponentName = componentName;
-		componentName = newComponentName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME, oldComponentName, componentName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EList getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).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 Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				return getComponentName();
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				return getServiceRefs();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				setComponentName((String)newValue);
-				return;
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				setComponentName(COMPONENT_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME:
-				return COMPONENT_NAME_EDEFAULT == null ? componentName != null : !COMPONENT_NAME_EDEFAULT.equals(componentName);
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-		}
-		return 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(" (componentName: ");//$NON-NLS-1$
-		result.append(componentName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ComponentScopedRefsImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/HandlerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/HandlerImpl.java
deleted file mode 100644
index db91fd6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/HandlerImpl.java
+++ /dev/null
@@ -1,473 +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.webservice.internal.wsclient.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl#getSoapRoles <em>Soap Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl#getPortNames <em>Port Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.HandlerImpl#getSoapHeaders <em>Soap Headers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HandlerImpl extends CompatibilityDescriptionGroupImpl implements Handler {
-	/**
-	 * The default value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HANDLER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String handlerName = HANDLER_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSoapRoles() <em>Soap Roles</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSoapRoles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList soapRoles = null;
-
-	/**
-	 * The cached value of the '{@link #getPortNames() <em>Port Names</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortNames()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList portNames = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass handlerClass = null;
-
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList initParams = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapHeaders() <em>Soap Headers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSoapHeaders()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList soapHeaders = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected HandlerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return Webservice_clientPackage.eINSTANCE.getHandler();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHandlerName() {
-		return handlerName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHandlerName(String newHandlerName) {
-		String oldHandlerName = handlerName;
-		handlerName = newHandlerName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.HANDLER__HANDLER_NAME, oldHandlerName, handlerName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSoapHeaders() {
-		if (soapHeaders == null) {
-			soapHeaders = new EObjectContainmentEList(QName.class, this, Webservice_clientPackage.HANDLER__SOAP_HEADERS);
-		}
-		return soapHeaders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getSoapRoles() {
-		if (soapRoles == null) {
-			soapRoles = new EDataTypeUniqueEList(String.class, this, Webservice_clientPackage.HANDLER__SOAP_ROLES);
-		}
-		return soapRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPortNames() {
-		if (portNames == null) {
-			portNames = new EDataTypeUniqueEList(String.class, this, Webservice_clientPackage.HANDLER__PORT_NAMES);
-		}
-		return portNames;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getHandlerClass() {
-		if (handlerClass != null && handlerClass.eIsProxy()) {
-			JavaClass oldHandlerClass = handlerClass;
-			handlerClass = (JavaClass)eResolveProxy((InternalEObject)handlerClass);
-			if (handlerClass != oldHandlerClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Webservice_clientPackage.HANDLER__HANDLER_CLASS, oldHandlerClass, handlerClass));
-			}
-		}
-		return handlerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetHandlerClass() {
-		return handlerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHandlerClass(JavaClass newHandlerClass) {
-		JavaClass oldHandlerClass = handlerClass;
-		handlerClass = newHandlerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.HANDLER__HANDLER_CLASS, oldHandlerClass, handlerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(ParamValue.class, this, Webservice_clientPackage.HANDLER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case Webservice_clientPackage.HANDLER__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.HANDLER__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.HANDLER__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-					return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-					return ((InternalEList)getSoapHeaders()).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 Webservice_clientPackage.HANDLER__ICONS:
-				return getIcons();
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAMES:
-				return getDisplayNames();
-			case Webservice_clientPackage.HANDLER__DESCRIPTIONS:
-				return getDescriptions();
-			case Webservice_clientPackage.HANDLER__SMALL_ICON:
-				return getSmallIcon();
-			case Webservice_clientPackage.HANDLER__LARGE_ICON:
-				return getLargeIcon();
-			case Webservice_clientPackage.HANDLER__DESCRIPTION:
-				return getDescription();
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAME:
-				return getDisplayName();
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				return getHandlerName();
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				return getSoapRoles();
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				return getPortNames();
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				if (resolve) return getHandlerClass();
-				return basicGetHandlerClass();
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				return getInitParams();
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				return getSoapHeaders();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.HANDLER__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				setHandlerName((String)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				getSoapRoles().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				getPortNames().clear();
-				getPortNames().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass((JavaClass)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				getSoapHeaders().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.HANDLER__ICONS:
-				getIcons().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case Webservice_clientPackage.HANDLER__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case Webservice_clientPackage.HANDLER__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				setHandlerName(HANDLER_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				getPortNames().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass((JavaClass)null);
-				return;
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.HANDLER__ICONS:
-				return icons != null && !icons.isEmpty();
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case Webservice_clientPackage.HANDLER__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case Webservice_clientPackage.HANDLER__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case Webservice_clientPackage.HANDLER__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case Webservice_clientPackage.HANDLER__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case Webservice_clientPackage.HANDLER__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case Webservice_clientPackage.HANDLER__HANDLER_NAME:
-				return HANDLER_NAME_EDEFAULT == null ? handlerName != null : !HANDLER_NAME_EDEFAULT.equals(handlerName);
-			case Webservice_clientPackage.HANDLER__SOAP_ROLES:
-				return soapRoles != null && !soapRoles.isEmpty();
-			case Webservice_clientPackage.HANDLER__PORT_NAMES:
-				return portNames != null && !portNames.isEmpty();
-			case Webservice_clientPackage.HANDLER__HANDLER_CLASS:
-				return handlerClass != null;
-			case Webservice_clientPackage.HANDLER__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case Webservice_clientPackage.HANDLER__SOAP_HEADERS:
-				return soapHeaders != null && !soapHeaders.isEmpty();
-		}
-		return 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(" (handlerName: ");//$NON-NLS-1$
-		result.append(handlerName);
-		result.append(", soapRoles: ");//$NON-NLS-1$
-		result.append(soapRoles);
-		result.append(", portNames: ");//$NON-NLS-1$
-		result.append(portNames);
-		result.append(')');
-		return result.toString();
-	}
-
-} //HandlerImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/PortComponentRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/PortComponentRefImpl.java
deleted file mode 100644
index a4bcd62..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/PortComponentRefImpl.java
+++ /dev/null
@@ -1,226 +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.webservice.internal.wsclient.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.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Component Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.PortComponentRefImpl#getPortComponentLink <em>Port Component Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.PortComponentRefImpl#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortComponentRefImpl extends EObjectImpl implements PortComponentRef {
-	/**
-	 * The default value of the '{@link #getPortComponentLink() <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PORT_COMPONENT_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentLink() <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected String portComponentLink = PORT_COMPONENT_LINK_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass serviceEndpointInterface = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PortComponentRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return Webservice_clientPackage.eINSTANCE.getPortComponentRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPortComponentLink() {
-		return portComponentLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPortComponentLink(String newPortComponentLink) {
-		String oldPortComponentLink = portComponentLink;
-		portComponentLink = newPortComponentLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK, oldPortComponentLink, portComponentLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getServiceEndpointInterface() {
-		if (serviceEndpointInterface != null && serviceEndpointInterface.eIsProxy()) {
-			JavaClass oldServiceEndpointInterface = serviceEndpointInterface;
-			serviceEndpointInterface = (JavaClass)eResolveProxy((InternalEObject)serviceEndpointInterface);
-			if (serviceEndpointInterface != oldServiceEndpointInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-			}
-		}
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetServiceEndpointInterface() {
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceEndpointInterface(JavaClass newServiceEndpointInterface) {
-		JavaClass oldServiceEndpointInterface = serviceEndpointInterface;
-		serviceEndpointInterface = newServiceEndpointInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				return getPortComponentLink();
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				if (resolve) return getServiceEndpointInterface();
-				return basicGetServiceEndpointInterface();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				setPortComponentLink((String)newValue);
-				return;
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((JavaClass)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				setPortComponentLink(PORT_COMPONENT_LINK_EDEFAULT);
-				return;
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((JavaClass)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK:
-				return PORT_COMPONENT_LINK_EDEFAULT == null ? portComponentLink != null : !PORT_COMPONENT_LINK_EDEFAULT.equals(portComponentLink);
-			case Webservice_clientPackage.PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE:
-				return serviceEndpointInterface != null;
-		}
-		return 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(" (portComponentLink: ");//$NON-NLS-1$
-		result.append(portComponentLink);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortComponentRefImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ServiceRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ServiceRefImpl.java
deleted file mode 100644
index d657c18..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/ServiceRefImpl.java
+++ /dev/null
@@ -1,575 +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.webservice.internal.wsclient.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.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.java.JavaClass;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl#getServiceRefName <em>Service Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl#getPortComponentRefs <em>Port Component Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.ServiceRefImpl#getServiceQname <em>Service Qname</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceRefImpl extends CompatibilityDescriptionGroupImpl implements ServiceRef {
-	/**
-	 * The cached value of the '{@link #getServiceInterface() <em>Service Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceInterface()
-	 * @generated
-	 * @ordered
-	 */
-	protected JavaClass serviceInterface = null;
-
-	/**
-	 * The default value of the '{@link #getServiceRefName() <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SERVICE_REF_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefName() <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceRefName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String serviceRefName = SERVICE_REF_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String WSDL_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String wsdlFile = WSDL_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String JAXRPC_MAPPING_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String jaxrpcMappingFile = JAXRPC_MAPPING_FILE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentRefs() <em>Port Component Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPortComponentRefs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList portComponentRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHandlers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList handlers = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceQname() <em>Service Qname</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getServiceQname()
-	 * @generated
-	 * @ordered
-	 */
-	protected QName serviceQname = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ServiceRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EClass eStaticClass() {
-		return Webservice_clientPackage.eINSTANCE.getServiceRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getServiceRefName() {
-		return serviceRefName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceRefName(String newServiceRefName) {
-		String oldServiceRefName = serviceRefName;
-		serviceRefName = newServiceRefName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME, oldServiceRefName, serviceRefName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getWsdlFile() {
-		return wsdlFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWsdlFile(String newWsdlFile) {
-		String oldWsdlFile = wsdlFile;
-		wsdlFile = newWsdlFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__WSDL_FILE, oldWsdlFile, wsdlFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getJaxrpcMappingFile() {
-		return jaxrpcMappingFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setJaxrpcMappingFile(String newJaxrpcMappingFile) {
-		String oldJaxrpcMappingFile = jaxrpcMappingFile;
-		jaxrpcMappingFile = newJaxrpcMappingFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE, oldJaxrpcMappingFile, jaxrpcMappingFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass getServiceInterface() {
-		if (serviceInterface != null && serviceInterface.eIsProxy()) {
-			JavaClass oldServiceInterface = serviceInterface;
-			serviceInterface = (JavaClass)eResolveProxy((InternalEObject)serviceInterface);
-			if (serviceInterface != oldServiceInterface) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE, oldServiceInterface, serviceInterface));
-			}
-		}
-		return serviceInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public JavaClass basicGetServiceInterface() {
-		return serviceInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceInterface(JavaClass newServiceInterface) {
-		JavaClass oldServiceInterface = serviceInterface;
-		serviceInterface = newServiceInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE, oldServiceInterface, serviceInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getPortComponentRefs() {
-		if (portComponentRefs == null) {
-			portComponentRefs = new EObjectContainmentEList(PortComponentRef.class, this, Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS);
-		}
-		return portComponentRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList getHandlers() {
-		if (handlers == null) {
-			handlers = new EObjectContainmentEList(Handler.class, this, Webservice_clientPackage.SERVICE_REF__HANDLERS);
-		}
-		return handlers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QName getServiceQname() {
-		return serviceQname;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetServiceQname(QName newServiceQname, NotificationChain msgs) {
-		QName oldServiceQname = serviceQname;
-		serviceQname = newServiceQname;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, oldServiceQname, newServiceQname);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setServiceQname(QName newServiceQname) {
-		if (newServiceQname != serviceQname) {
-			NotificationChain msgs = null;
-			if (serviceQname != null)
-				msgs = ((InternalEObject)serviceQname).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, null, msgs);
-			if (newServiceQname != null)
-				msgs = ((InternalEObject)newServiceQname).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, null, msgs);
-			msgs = basicSetServiceQname(newServiceQname, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME, newServiceQname, newServiceQname));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case Webservice_clientPackage.SERVICE_REF__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.SERVICE_REF__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-					return ((InternalEList)getPortComponentRefs()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-					return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-					return basicSetServiceQname(null, msgs);
-				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 Webservice_clientPackage.SERVICE_REF__ICONS:
-				return getIcons();
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAMES:
-				return getDisplayNames();
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTIONS:
-				return getDescriptions();
-			case Webservice_clientPackage.SERVICE_REF__SMALL_ICON:
-				return getSmallIcon();
-			case Webservice_clientPackage.SERVICE_REF__LARGE_ICON:
-				return getLargeIcon();
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTION:
-				return getDescription();
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAME:
-				return getDisplayName();
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				if (resolve) return getServiceInterface();
-				return basicGetServiceInterface();
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				return getServiceRefName();
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				return getWsdlFile();
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				return getJaxrpcMappingFile();
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return getPortComponentRefs();
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				return getHandlers();
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				return getServiceQname();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.SERVICE_REF__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				setServiceInterface((JavaClass)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				setServiceRefName((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				setWsdlFile((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile((String)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				getPortComponentRefs().clear();
-				getPortComponentRefs().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				getHandlers().clear();
-				getHandlers().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				setServiceQname((QName)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.SERVICE_REF__ICONS:
-				getIcons().clear();
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				setServiceInterface((JavaClass)null);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				setServiceRefName(SERVICE_REF_NAME_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				setWsdlFile(WSDL_FILE_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile(JAXRPC_MAPPING_FILE_EDEFAULT);
-				return;
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				getPortComponentRefs().clear();
-				return;
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				getHandlers().clear();
-				return;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				setServiceQname((QName)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.SERVICE_REF__ICONS:
-				return icons != null && !icons.isEmpty();
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case Webservice_clientPackage.SERVICE_REF__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case Webservice_clientPackage.SERVICE_REF__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case Webservice_clientPackage.SERVICE_REF__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case Webservice_clientPackage.SERVICE_REF__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_INTERFACE:
-				return serviceInterface != null;
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME:
-				return SERVICE_REF_NAME_EDEFAULT == null ? serviceRefName != null : !SERVICE_REF_NAME_EDEFAULT.equals(serviceRefName);
-			case Webservice_clientPackage.SERVICE_REF__WSDL_FILE:
-				return WSDL_FILE_EDEFAULT == null ? wsdlFile != null : !WSDL_FILE_EDEFAULT.equals(wsdlFile);
-			case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE:
-				return JAXRPC_MAPPING_FILE_EDEFAULT == null ? jaxrpcMappingFile != null : !JAXRPC_MAPPING_FILE_EDEFAULT.equals(jaxrpcMappingFile);
-			case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS:
-				return portComponentRefs != null && !portComponentRefs.isEmpty();
-			case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-				return handlers != null && !handlers.isEmpty();
-			case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME:
-				return serviceQname != null;
-		}
-		return 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(" (serviceRefName: ");//$NON-NLS-1$
-		result.append(serviceRefName);
-		result.append(", wsdlFile: ");//$NON-NLS-1$
-		result.append(wsdlFile);
-		result.append(", jaxrpcMappingFile: ");//$NON-NLS-1$
-		result.append(jaxrpcMappingFile);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServiceRefImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientImpl.java
deleted file mode 100644
index 8c75930..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientImpl.java
+++ /dev/null
@@ -1,191 +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.webservice.internal.wsclient.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Web Services Client</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.WebServicesClientImpl#getComponentScopedRefs <em>Component Scoped Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.impl.WebServicesClientImpl#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebServicesClientImpl extends EObjectImpl implements WebServicesClient {
-	/**
-	 * The cached value of the '{@link #getComponentScopedRefs() <em>Component Scoped Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getComponentScopedRefs()
-	 * @generated
-	 * @ordered
-	 */
-    protected EList componentScopedRefs = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceRefs() <em>Service Refs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @see #getServiceRefs()
-	 * @generated
-	 * @ordered
-	 */
-    protected EList serviceRefs = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected WebServicesClientImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    protected EClass eStaticClass() {
-		return Webservice_clientPackage.eINSTANCE.getWebServicesClient();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EList getComponentScopedRefs() {
-		if (componentScopedRefs == null) {
-			componentScopedRefs = new EObjectContainmentEList(ComponentScopedRefs.class, this, Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS);
-		}
-		return componentScopedRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EList getServiceRefs() {
-		if (serviceRefs == null) {
-			serviceRefs = new EObjectContainmentEList(ServiceRef.class, this, Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS);
-		}
-		return serviceRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-					return ((InternalEList)getComponentScopedRefs()).basicRemove(otherEnd, msgs);
-				case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-					return ((InternalEList)getServiceRefs()).basicRemove(otherEnd, msgs);
-				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 Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				return getComponentScopedRefs();
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				return getServiceRefs();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				getComponentScopedRefs().clear();
-				getComponentScopedRefs().addAll((Collection)newValue);
-				return;
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				getServiceRefs().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				getComponentScopedRefs().clear();
-				return;
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				getServiceRefs().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS:
-				return componentScopedRefs != null && !componentScopedRefs.isEmpty();
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS:
-				return serviceRefs != null && !serviceRefs.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //WebServicesClientImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientResourceFactory.java
deleted file mode 100644
index 9c55088..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesClientResourceFactory.java
+++ /dev/null
@@ -1,77 +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 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class WebServicesClientResourceFactory
-    extends TranslatorResourceFactory {
-		/**
-		 * Method registerDtds.
-		 */
-		public static void registerDtds() {
-			J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEB_SERVICES_CLIENT_SYSTEMID_1_0, "j2ee_web_services_client_1_0.dtd"); //$NON-NLS-1$
-			J2EEXmlDtDEntityResolver.registerDtD(J2EEConstants.WEB_SERVICES_CLIENT_SCHEMA_LOC_1_1, "j2ee_web_services_client_1_1.xsd"); //$NON-NLS-1$
-		}
-    /**
-     * @param aRendererFactory
-     */
-    public WebServicesClientResourceFactory(RendererFactory aRendererFactory) {
-        super(aRendererFactory);
-    }
-
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new WebServicesResourceImpl(uri, aRenderer);
-	}
-	  public static void register(FileNameResourceFactoryRegistry aRegistry) {
-			aRegistry.registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(RendererFactory.getDefaultRendererFactory()));
-	  }
-    
-	/**
-	 * Register myself with the Resource.Factory.Registry
-	 */
-	public static void registerWith(RendererFactory aRendererFactory) {
-		J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME, new WebServicesClientResourceFactory(aRendererFactory));
-	}
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-		registerWith(RendererFactory.getDefaultRendererFactory());
-	}
-
-	
-	public static Resource.Factory getRegisteredFactory() {
-		return J2EEResourceFactoryRegistry.INSTANCE.getFactory(J2EEConstants.WEB_SERVICES_CLIENT_DD_URI_OBJ);
-	}
-    
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesResourceImpl.java
deleted file mode 100644
index 6edcb83..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/WebServicesResourceImpl.java
+++ /dev/null
@@ -1,145 +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 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.webservice.internal.wsclient.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.model.translator.webservices.WebServicesTranslator;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class WebServicesResourceImpl extends XMLResourceImpl implements WebServicesResource {
-
-    /**
-     * @param uri
-     * @param aRenderer
-     */
-    public WebServicesResourceImpl(URI uri, Renderer aRenderer) {
-        super(uri, aRenderer);
-    }
-
-    /**
-     * @param aRenderer
-     */
-    public WebServicesResourceImpl(Renderer aRenderer) {
-        super(aRenderer);
-    }
-
-		/**
-	 * Return the first element in the EList.
-	 */
-	public WebServicesClient getWebServicesClient() {
-		return (WebServicesClient) getRootObject();
-	}
-    
-    public int getType() {
-        return WEB_SERVICES_CLIENT_TYPE;
-    }
-
-	public String getJ2EE_1_2_SystemID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_SYSTEMID_1_0;
-	}
-	public String getJ2EE_1_3_SystemID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_SYSTEMID_1_0;
-	}
-
-	public String getJ2EE_1_2_PublicID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_PUBLICID_1_0;
-	}
-	public String getJ2EE_1_3_PublicID() {
-		return J2EEConstants.WEB_SERVICES_CLIENT_PUBLICID_1_0;
-	}
-
-	public String getDoctype() {
-		switch (getJ2EEVersionID()) {
-			case (J2EE_1_2_ID) :
-			case (J2EE_1_3_ID) :	
-				return J2EEConstants.WEB_SERVICES_CLIENT_DOCTYPE;
-			default :
-				return null;
-		}
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#setDoctypeValues(java.lang.String, java.lang.String)
-	 * This is setting the module version on the resource.
-	 */
-	public void setDoctypeValues(String publicId, String systemId) {
-		int version = WEBSERVICES_1_0_ID;
-		super.setDoctypeValues(publicId, systemId);
-		super.setVersionID(version);
-	}
-		/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-		super.setVersionID(id);
-		switch (id) {
-				case (WEBSERVICES_1_0_ID) :
-					super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-			}
-		syncVersionOfRootObject();
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) {
-	switch (id) {
-		case (J2EE_1_3_ID) :
-					primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-					primSetVersionID(WEBSERVICES_1_0_ID);
-					break;
-		case (J2EE_1_2_ID) :
-					primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-					primSetVersionID(WEBSERVICES_1_0_ID);
-			}
-		syncVersionOfRootObject();
-	}
-	/* Return J2EE version based on module version
-	 */
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case J2EEVersionConstants.WEBSERVICES_1_0_ID :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			default :
-				return J2EEVersionConstants.J2EE_1_3_ID;
-		}
-	}
-	/**
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return WebServicesTranslator.INSTANCE;
-	}
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WEBSERVICES_1_0_ID;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl#syncVersionOfRootObject()
-	 */
-	protected void syncVersionOfRootObject() {
-		//not model for J2EE 1.4 so no operation required.
-	}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientFactoryImpl.java
deleted file mode 100644
index 8b198f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientFactoryImpl.java
+++ /dev/null
@@ -1,127 +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.webservice.internal.wsclient.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Webservice_clientFactoryImpl extends EFactoryImpl implements Webservice_clientFactory {
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case Webservice_clientPackage.SERVICE_REF: return createServiceRef();
-			case Webservice_clientPackage.PORT_COMPONENT_REF: return createPortComponentRef();
-			case Webservice_clientPackage.HANDLER: return createHandler();
-			case Webservice_clientPackage.WEB_SERVICES_CLIENT: return createWebServicesClient();
-			case Webservice_clientPackage.COMPONENT_SCOPED_REFS: return createComponentScopedRefs();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");  //$NON-NLS-1$//$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ServiceRef createServiceRef() {
-		ServiceRefImpl serviceRef = new ServiceRefImpl();
-		return serviceRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PortComponentRef createPortComponentRef() {
-		PortComponentRefImpl portComponentRef = new PortComponentRefImpl();
-		return portComponentRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Handler createHandler() {
-		HandlerImpl handler = new HandlerImpl();
-		return handler;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public WebServicesClient createWebServicesClient() {
-		WebServicesClientImpl webServicesClient = new WebServicesClientImpl();
-		return webServicesClient;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public ComponentScopedRefs createComponentScopedRefs() {
-		ComponentScopedRefsImpl componentScopedRefs = new ComponentScopedRefsImpl();
-		return componentScopedRefs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientPackage getWebservice_clientPackage() {
-		return (Webservice_clientPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	public static Webservice_clientPackage getPackage() {
-		return Webservice_clientPackage.eINSTANCE;
-	}
-} //Webservice_clientFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientPackageImpl.java
deleted file mode 100644
index e39ccb6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/impl/Webservice_clientPackageImpl.java
+++ /dev/null
@@ -1,531 +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.webservice.internal.wsclient.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class Webservice_clientPackageImpl extends EPackageImpl implements Webservice_clientPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass serviceRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass portComponentRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass handlerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private EClass webServicesClientEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    private EClass componentScopedRefsEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private Webservice_clientPackageImpl() {
-		super(eNS_URI, Webservice_clientFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static Webservice_clientPackage init() {
-		if (isInited) return (Webservice_clientPackage)EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new Webservice_clientPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theWebservice_clientPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theWebservice_clientPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-
-		return theWebservice_clientPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getServiceRef() {
-		return serviceRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_ServiceRefName() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_WsdlFile() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getServiceRef_JaxrpcMappingFile() {
-		return (EAttribute)serviceRefEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_ServiceInterface() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_PortComponentRefs() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_Handlers() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getServiceRef_ServiceQname() {
-		return (EReference)serviceRefEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPortComponentRef() {
-		return portComponentRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPortComponentRef_PortComponentLink() {
-		return (EAttribute)portComponentRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPortComponentRef_ServiceEndpointInterface() {
-		return (EReference)portComponentRefEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getHandler() {
-		return handlerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHandler_HandlerName() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getHandler_SoapHeaders() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHandler_SoapRoles() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getHandler_PortNames() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getHandler_HandlerClass() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getHandler_InitParams() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EClass getWebServicesClient() {
-		return webServicesClientEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EReference getWebServicesClient_ComponentScopedRefs() {
-		return (EReference)webServicesClientEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EReference getWebServicesClient_ServiceRefs() {
-		return (EReference)webServicesClientEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EClass getComponentScopedRefs() {
-		return componentScopedRefsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EAttribute getComponentScopedRefs_ComponentName() {
-		return (EAttribute)componentScopedRefsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @generated
-	 */
-    public EReference getComponentScopedRefs_ServiceRefs() {
-		return (EReference)componentScopedRefsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientFactory getWebservice_clientFactory() {
-		return (Webservice_clientFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		serviceRefEClass = createEClass(SERVICE_REF);
-		createEReference(serviceRefEClass, SERVICE_REF__SERVICE_INTERFACE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__SERVICE_REF_NAME);
-		createEAttribute(serviceRefEClass, SERVICE_REF__WSDL_FILE);
-		createEAttribute(serviceRefEClass, SERVICE_REF__JAXRPC_MAPPING_FILE);
-		createEReference(serviceRefEClass, SERVICE_REF__PORT_COMPONENT_REFS);
-		createEReference(serviceRefEClass, SERVICE_REF__HANDLERS);
-		createEReference(serviceRefEClass, SERVICE_REF__SERVICE_QNAME);
-
-		portComponentRefEClass = createEClass(PORT_COMPONENT_REF);
-		createEAttribute(portComponentRefEClass, PORT_COMPONENT_REF__PORT_COMPONENT_LINK);
-		createEReference(portComponentRefEClass, PORT_COMPONENT_REF__SERVICE_ENDPOINT_INTERFACE);
-
-		handlerEClass = createEClass(HANDLER);
-		createEAttribute(handlerEClass, HANDLER__HANDLER_NAME);
-		createEAttribute(handlerEClass, HANDLER__SOAP_ROLES);
-		createEAttribute(handlerEClass, HANDLER__PORT_NAMES);
-		createEReference(handlerEClass, HANDLER__HANDLER_CLASS);
-		createEReference(handlerEClass, HANDLER__INIT_PARAMS);
-		createEReference(handlerEClass, HANDLER__SOAP_HEADERS);
-
-		webServicesClientEClass = createEClass(WEB_SERVICES_CLIENT);
-		createEReference(webServicesClientEClass, WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS);
-		createEReference(webServicesClientEClass, WEB_SERVICES_CLIENT__SERVICE_REFS);
-
-		componentScopedRefsEClass = createEClass(COMPONENT_SCOPED_REFS);
-		createEAttribute(componentScopedRefsEClass, COMPONENT_SCOPED_REFS__COMPONENT_NAME);
-		createEReference(componentScopedRefsEClass, COMPONENT_SCOPED_REFS__SERVICE_REFS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
-		// Add supertypes to classes
-		serviceRefEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		handlerEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(serviceRefEClass, ServiceRef.class, "ServiceRef", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getServiceRef_ServiceInterface(), theJavaRefPackage.getJavaClass(), null, "serviceInterface", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getServiceRef_ServiceRefName(), ecorePackage.getEString(), "serviceRefName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getServiceRef_WsdlFile(), ecorePackage.getEString(), "wsdlFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getServiceRef_JaxrpcMappingFile(), ecorePackage.getEString(), "jaxrpcMappingFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServiceRef_PortComponentRefs(), this.getPortComponentRef(), null, "portComponentRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServiceRef_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServiceRef_ServiceQname(), theCommonPackage.getQName(), null, "serviceQname", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(portComponentRefEClass, PortComponentRef.class, "PortComponentRef", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getPortComponentRef_PortComponentLink(), ecorePackage.getEString(), "portComponentLink", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getPortComponentRef_ServiceEndpointInterface(), theJavaRefPackage.getJavaClass(), null, "serviceEndpointInterface", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(handlerEClass, Handler.class, "Handler", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getHandler_HandlerName(), ecorePackage.getEString(), "handlerName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getHandler_SoapRoles(), ecorePackage.getEString(), "soapRoles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getHandler_PortNames(), ecorePackage.getEString(), "portNames", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getHandler_HandlerClass(), theJavaRefPackage.getJavaClass(), null, "handlerClass", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getHandler_InitParams(), theCommonPackage.getParamValue(), null, "initParams", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getHandler_SoapHeaders(), theCommonPackage.getQName(), null, "soapHeaders", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(webServicesClientEClass, WebServicesClient.class, "WebServicesClient", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getWebServicesClient_ComponentScopedRefs(), this.getComponentScopedRefs(), null, "componentScopedRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebServicesClient_ServiceRefs(), this.getServiceRef(), null, "serviceRefs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(componentScopedRefsEClass, ComponentScopedRefs.class, "ComponentScopedRefs", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getComponentScopedRefs_ComponentName(), ecorePackage.getEString(), "componentName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getComponentScopedRefs_ServiceRefs(), this.getServiceRef(), null, "serviceRefs", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //Webservice_clientPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientAdapterFactory.java
deleted file mode 100644
index 0247eac..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientAdapterFactory.java
+++ /dev/null
@@ -1,231 +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.webservice.internal.wsclient.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage
- * @generated
- */
-public class Webservice_clientAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Webservice_clientPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = Webservice_clientPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Webservice_clientSwitch modelSwitch =
-		new Webservice_clientSwitch() {
-			public Object caseServiceRef(ServiceRef object) {
-				return createServiceRefAdapter();
-			}
-			public Object casePortComponentRef(PortComponentRef object) {
-				return createPortComponentRefAdapter();
-			}
-			public Object caseHandler(Handler object) {
-				return createHandlerAdapter();
-			}
-			public Object caseWebServicesClient(WebServicesClient object) {
-				return createWebServicesClientAdapter();
-			}
-			public Object caseComponentScopedRefs(ComponentScopedRefs object) {
-				return createComponentScopedRefsAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef <em>Service Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef
-	 * @generated
-	 */
-	public Adapter createServiceRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef <em>Port Component Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef
-	 * @generated
-	 */
-	public Adapter createPortComponentRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler
-	 * @generated
-	 */
-	public Adapter createHandlerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient <em>Web Services Client</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient
-	 * @generated
-	 */
-    public Adapter createWebServicesClientAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs <em>Component Scoped Refs</em>}'.
-	 * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs
-	 * @generated
-	 */
-    public Adapter createComponentScopedRefsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-	public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //Webservice_clientAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientSwitch.java
deleted file mode 100644
index 214ea88..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsclient/util/Webservice_clientSwitch.java
+++ /dev/null
@@ -1,230 +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.webservice.internal.wsclient.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-/**
- * <!-- 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.internal.webservice.wsclient.Webservice_clientPackage
- * @generated
- */
-public class Webservice_clientSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static Webservice_clientPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Webservice_clientSwitch() {
-		if (modelPackage == null) {
-			modelPackage = Webservice_clientPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case Webservice_clientPackage.SERVICE_REF: {
-					ServiceRef serviceRef = (ServiceRef)theEObject;
-					Object result = caseServiceRef(serviceRef);
-					if (result == null) result = caseCompatibilityDescriptionGroup(serviceRef);
-					if (result == null) result = caseDescriptionGroup(serviceRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case Webservice_clientPackage.PORT_COMPONENT_REF: {
-					PortComponentRef portComponentRef = (PortComponentRef)theEObject;
-					Object result = casePortComponentRef(portComponentRef);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case Webservice_clientPackage.HANDLER: {
-					Handler handler = (Handler)theEObject;
-					Object result = caseHandler(handler);
-					if (result == null) result = caseCompatibilityDescriptionGroup(handler);
-					if (result == null) result = caseDescriptionGroup(handler);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case Webservice_clientPackage.WEB_SERVICES_CLIENT: {
-					WebServicesClient webServicesClient = (WebServicesClient)theEObject;
-					Object result = caseWebServicesClient(webServicesClient);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case Webservice_clientPackage.COMPONENT_SCOPED_REFS: {
-					ComponentScopedRefs componentScopedRefs = (ComponentScopedRefs)theEObject;
-					Object result = caseComponentScopedRefs(componentScopedRefs);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseServiceRef(ServiceRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Component Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object casePortComponentRef(PortComponentRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseHandler(Handler object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Services Client</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Services Client</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseWebServicesClient(WebServicesClient object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Component Scoped Refs</em>'.
-	 * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Component Scoped Refs</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-    public Object caseComponentScopedRefs(ComponentScopedRefs object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //Webservice_clientSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/WscommonPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/WscommonPackage.java
deleted file mode 100644
index 70e6e99..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/WscommonPackage.java
+++ /dev/null
@@ -1,444 +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.webservice.internal.wscommon;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * <!-- 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.internal.webservice.wscommon.WscommonFactory
- * @generated
- */
-public interface WscommonPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNAME = "wscommon";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_URI = "wscommon.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.webservice.wscommon";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WscommonPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.InitParamImpl <em>Init Param</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.InitParamImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.WscommonPackageImpl#getInitParam()
-	 * @generated
-	 */
-  int INIT_PARAM = 0;
-
-	/**
-	 * The feature id for the '<em><b>Param Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__PARAM_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Param Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__PARAM_VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__DESCRIPTION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Description Types</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM__DESCRIPTION_TYPES = 3;
-
-	/**
-	 * The number of structural features of the the '<em>Init Param</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int INIT_PARAM_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.SOAPHeaderImpl <em>SOAP Header</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.SOAPHeaderImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.WscommonPackageImpl#getSOAPHeader()
-	 * @generated
-	 */
-  int SOAP_HEADER = 1;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the the '<em>SOAP Header</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_HEADER_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.SOAPRoleImpl <em>SOAP Role</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.SOAPRoleImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.WscommonPackageImpl#getSOAPRole()
-	 * @generated
-	 */
-  int SOAP_ROLE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Soap Role</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_ROLE__SOAP_ROLE = 0;
-
-	/**
-	 * The number of structural features of the the '<em>SOAP Role</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SOAP_ROLE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.PortNameImpl <em>Port Name</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.PortNameImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.WscommonPackageImpl#getPortName()
-	 * @generated
-	 */
-  int PORT_NAME = 3;
-
-	/**
-	 * The feature id for the '<em><b>Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_NAME__PORT_NAME = 0;
-
-	/**
-	 * The number of structural features of the the '<em>Port Name</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_NAME_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.DescriptionTypeImpl <em>Description Type</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.DescriptionTypeImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.WscommonPackageImpl#getDescriptionType()
-	 * @generated
-	 */
-  int DESCRIPTION_TYPE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DESCRIPTION_TYPE__LANG = CommonPackage.DESCRIPTION__LANG;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DESCRIPTION_TYPE__VALUE = CommonPackage.DESCRIPTION__VALUE;
-
-	/**
-	 * The number of structural features of the the '<em>Description Type</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DESCRIPTION_TYPE_FEATURE_COUNT = CommonPackage.DESCRIPTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.DisplayNameTypeImpl <em>Display Name Type</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.DisplayNameTypeImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.WscommonPackageImpl#getDisplayNameType()
-	 * @generated
-	 */
-  int DISPLAY_NAME_TYPE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Lang</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DISPLAY_NAME_TYPE__LANG = CommonPackage.DISPLAY_NAME__LANG;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DISPLAY_NAME_TYPE__VALUE = CommonPackage.DISPLAY_NAME__VALUE;
-
-	/**
-	 * The number of structural features of the the '<em>Display Name Type</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int DISPLAY_NAME_TYPE_FEATURE_COUNT = CommonPackage.DISPLAY_NAME_FEATURE_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam <em>Init Param</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Init Param</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam
-	 * @generated
-	 */
-  EClass getInitParam();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamName <em>Param Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamName()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EAttribute getInitParam_ParamName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamValue <em>Param Value</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Param Value</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamValue()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EAttribute getInitParam_ParamValue();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getDescription()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EAttribute getInitParam_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getDescriptionTypes <em>Description Types</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Description Types</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getDescriptionTypes()
-	 * @see #getInitParam()
-	 * @generated
-	 */
-  EReference getInitParam_DescriptionTypes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPHeader <em>SOAP Header</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>SOAP Header</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPHeader
-	 * @generated
-	 */
-  EClass getSOAPHeader();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole <em>SOAP Role</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>SOAP Role</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole
-	 * @generated
-	 */
-  EClass getSOAPRole();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole#getSoapRole <em>Soap Role</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Soap Role</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole#getSoapRole()
-	 * @see #getSOAPRole()
-	 * @generated
-	 */
-  EAttribute getSOAPRole_SoapRole();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName <em>Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName
-	 * @generated
-	 */
-  EClass getPortName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName#getPortName <em>Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName#getPortName()
-	 * @see #getPortName()
-	 * @generated
-	 */
-  EAttribute getPortName_PortName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.DescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Description Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.DescriptionType
-	 * @generated
-	 */
-  EClass getDescriptionType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.DisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Display Name Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.DisplayNameType
-	 * @generated
-	 */
-  EClass getDisplayNameType();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-  WscommonFactory getWscommonFactory();
-
-} //WscommonPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DescriptionTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DescriptionTypeImpl.java
deleted file mode 100644
index 7600080..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DescriptionTypeImpl.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.webservice.internal.wscommon.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.DescriptionImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DescriptionTypeImpl extends DescriptionImpl implements DescriptionType
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected DescriptionTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.eINSTANCE.getDescriptionType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DESCRIPTION_TYPE__LANG:
-				return getLang();
-			case WscommonPackage.DESCRIPTION_TYPE__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DESCRIPTION_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case WscommonPackage.DESCRIPTION_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DESCRIPTION_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case WscommonPackage.DESCRIPTION_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DESCRIPTION_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case WscommonPackage.DESCRIPTION_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //DescriptionTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DisplayNameTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DisplayNameTypeImpl.java
deleted file mode 100644
index 74645a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/DisplayNameTypeImpl.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.webservice.internal.wscommon.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.DisplayNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Display Name Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DisplayNameTypeImpl extends DisplayNameImpl implements DisplayNameType
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected DisplayNameTypeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.eINSTANCE.getDisplayNameType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DISPLAY_NAME_TYPE__LANG:
-				return getLang();
-			case WscommonPackage.DISPLAY_NAME_TYPE__VALUE:
-				return getValue();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DISPLAY_NAME_TYPE__LANG:
-				setLang((String)newValue);
-				return;
-			case WscommonPackage.DISPLAY_NAME_TYPE__VALUE:
-				setValue((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DISPLAY_NAME_TYPE__LANG:
-				setLang(LANG_EDEFAULT);
-				return;
-			case WscommonPackage.DISPLAY_NAME_TYPE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.DISPLAY_NAME_TYPE__LANG:
-				return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
-			case WscommonPackage.DISPLAY_NAME_TYPE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //DisplayNameTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/InitParamImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/InitParamImpl.java
deleted file mode 100644
index 9e4e3c0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/InitParamImpl.java
+++ /dev/null
@@ -1,332 +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.webservice.internal.wscommon.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.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.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Init Param</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.InitParamImpl#getParamName <em>Param Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.InitParamImpl#getParamValue <em>Param Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.InitParamImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.InitParamImpl#getDescriptionTypes <em>Description Types</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InitParamImpl extends EObjectImpl implements InitParam
-{
-	/**
-	 * The default value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PARAM_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamName() <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String paramName = PARAM_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PARAM_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getParamValue() <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getParamValue()
-	 * @generated
-	 * @ordered
-	 */
-  protected String paramValue = PARAM_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getDescriptionTypes() <em>Description Types</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescriptionTypes()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList descriptionTypes = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected InitParamImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.eINSTANCE.getInitParam();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getParamName() {
-		return paramName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setParamName(String newParamName) {
-		String oldParamName = paramName;
-		paramName = newParamName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.INIT_PARAM__PARAM_NAME, oldParamName, paramName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getParamValue() {
-		return paramValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setParamValue(String newParamValue) {
-		String oldParamValue = paramValue;
-		paramValue = newParamValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.INIT_PARAM__PARAM_VALUE, oldParamValue, paramValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.INIT_PARAM__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getDescriptionTypes() {
-		if (descriptionTypes == null) {
-			descriptionTypes = new EObjectContainmentEList(DescriptionType.class, this, WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES);
-		}
-		return descriptionTypes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-					return ((InternalEList)getDescriptionTypes()).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 WscommonPackage.INIT_PARAM__PARAM_NAME:
-				return getParamName();
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				return getParamValue();
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				return getDescription();
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				return getDescriptionTypes();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.INIT_PARAM__PARAM_NAME:
-				setParamName((String)newValue);
-				return;
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue((String)newValue);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				getDescriptionTypes().clear();
-				getDescriptionTypes().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.INIT_PARAM__PARAM_NAME:
-				setParamName(PARAM_NAME_EDEFAULT);
-				return;
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				setParamValue(PARAM_VALUE_EDEFAULT);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				getDescriptionTypes().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.INIT_PARAM__PARAM_NAME:
-				return PARAM_NAME_EDEFAULT == null ? paramName != null : !PARAM_NAME_EDEFAULT.equals(paramName);
-			case WscommonPackage.INIT_PARAM__PARAM_VALUE:
-				return PARAM_VALUE_EDEFAULT == null ? paramValue != null : !PARAM_VALUE_EDEFAULT.equals(paramValue);
-			case WscommonPackage.INIT_PARAM__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES:
-				return descriptionTypes != null && !descriptionTypes.isEmpty();
-		}
-		return 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(" (paramName: ");//$NON-NLS-1$
-		result.append(paramName);
-		result.append(", paramValue: ");//$NON-NLS-1$
-		result.append(paramValue);
-		result.append(", description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //InitParamImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/PortNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/PortNameImpl.java
deleted file mode 100644
index 8bf13f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/PortNameImpl.java
+++ /dev/null
@@ -1,165 +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.webservice.internal.wscommon.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.PortNameImpl#getPortName <em>Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortNameImpl extends EObjectImpl implements PortName
-{
-	/**
-	 * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PORT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String portName = PORT_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected PortNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.eINSTANCE.getPortName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getPortName() {
-		return portName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setPortName(String newPortName) {
-		String oldPortName = portName;
-		portName = newPortName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.PORT_NAME__PORT_NAME, oldPortName, portName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				return getPortName();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				setPortName((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				setPortName(PORT_NAME_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.PORT_NAME__PORT_NAME:
-				return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
-		}
-		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(" (portName: ");//$NON-NLS-1$
-		result.append(portName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPHeaderImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPHeaderImpl.java
deleted file mode 100644
index dd151d8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPHeaderImpl.java
+++ /dev/null
@@ -1,133 +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.webservice.internal.wscommon.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>SOAP Header</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class SOAPHeaderImpl extends QNameImpl implements SOAPHeader
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected SOAPHeaderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.eINSTANCE.getSOAPHeader();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_HEADER__NAMESPACE_URI:
-				return getNamespaceURI();
-			case WscommonPackage.SOAP_HEADER__LOCAL_PART:
-				return getLocalPart();
-			case WscommonPackage.SOAP_HEADER__COMBINED_QNAME:
-				return getCombinedQName();
-			case WscommonPackage.SOAP_HEADER__INTERNAL_PREFIX_OR_NS_URI:
-				return getInternalPrefixOrNsURI();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_HEADER__NAMESPACE_URI:
-				setNamespaceURI((String)newValue);
-				return;
-			case WscommonPackage.SOAP_HEADER__LOCAL_PART:
-				setLocalPart((String)newValue);
-				return;
-			case WscommonPackage.SOAP_HEADER__COMBINED_QNAME:
-				setCombinedQName((String)newValue);
-				return;
-			case WscommonPackage.SOAP_HEADER__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_HEADER__NAMESPACE_URI:
-				setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-				return;
-			case WscommonPackage.SOAP_HEADER__LOCAL_PART:
-				setLocalPart(LOCAL_PART_EDEFAULT);
-				return;
-			case WscommonPackage.SOAP_HEADER__COMBINED_QNAME:
-				setCombinedQName(COMBINED_QNAME_EDEFAULT);
-				return;
-			case WscommonPackage.SOAP_HEADER__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_HEADER__NAMESPACE_URI:
-				return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-			case WscommonPackage.SOAP_HEADER__LOCAL_PART:
-				return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-			case WscommonPackage.SOAP_HEADER__COMBINED_QNAME:
-				return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-			case WscommonPackage.SOAP_HEADER__INTERNAL_PREFIX_OR_NS_URI:
-				return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //SOAPHeaderImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPRoleImpl.java
deleted file mode 100644
index 9d5e99f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/SOAPRoleImpl.java
+++ /dev/null
@@ -1,165 +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.webservice.internal.wscommon.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>SOAP Role</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.impl.SOAPRoleImpl#getSoapRole <em>Soap Role</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SOAPRoleImpl extends EObjectImpl implements SOAPRole
-{
-	/**
-	 * The default value of the '{@link #getSoapRole() <em>Soap Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapRole()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SOAP_ROLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapRole() <em>Soap Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapRole()
-	 * @generated
-	 * @ordered
-	 */
-  protected String soapRole = SOAP_ROLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected SOAPRoleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WscommonPackage.eINSTANCE.getSOAPRole();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getSoapRole() {
-		return soapRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setSoapRole(String newSoapRole) {
-		String oldSoapRole = soapRole;
-		soapRole = newSoapRole;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WscommonPackage.SOAP_ROLE__SOAP_ROLE, oldSoapRole, soapRole));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				return getSoapRole();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				setSoapRole((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				setSoapRole(SOAP_ROLE_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WscommonPackage.SOAP_ROLE__SOAP_ROLE:
-				return SOAP_ROLE_EDEFAULT == null ? soapRole != null : !SOAP_ROLE_EDEFAULT.equals(soapRole);
-		}
-		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(" (soapRole: ");//$NON-NLS-1$
-		result.append(soapRole);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SOAPRoleImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonFactoryImpl.java
deleted file mode 100644
index ed06f82..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonFactoryImpl.java
+++ /dev/null
@@ -1,140 +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.webservice.internal.wscommon.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WscommonFactoryImpl extends EFactoryImpl implements WscommonFactory
-{
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WscommonPackage.INIT_PARAM: return createInitParam();
-			case WscommonPackage.SOAP_HEADER: return createSOAPHeader();
-			case WscommonPackage.SOAP_ROLE: return createSOAPRole();
-			case WscommonPackage.PORT_NAME: return createPortName();
-			case WscommonPackage.DESCRIPTION_TYPE: return createDescriptionType();
-			case WscommonPackage.DISPLAY_NAME_TYPE: return createDisplayNameType();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public InitParam createInitParam() {
-		InitParamImpl initParam = new InitParamImpl();
-		return initParam;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public SOAPHeader createSOAPHeader() {
-		SOAPHeaderImpl soapHeader = new SOAPHeaderImpl();
-		return soapHeader;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public SOAPRole createSOAPRole() {
-		SOAPRoleImpl soapRole = new SOAPRoleImpl();
-		return soapRole;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public PortName createPortName() {
-		PortNameImpl portName = new PortNameImpl();
-		return portName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DescriptionType createDescriptionType() {
-		DescriptionTypeImpl descriptionType = new DescriptionTypeImpl();
-		return descriptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DisplayNameType createDisplayNameType() {
-		DisplayNameTypeImpl displayNameType = new DisplayNameTypeImpl();
-		return displayNameType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonPackage getWscommonPackage() {
-		return (WscommonPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-  public static WscommonPackage getPackage() {
-		return WscommonPackage.eINSTANCE;
-	}
-} //WscommonFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonPackageImpl.java
deleted file mode 100644
index e8accd9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/impl/WscommonPackageImpl.java
+++ /dev/null
@@ -1,409 +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.webservice.internal.wscommon.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WscommonPackageImpl extends EPackageImpl implements WscommonPackage
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass initParamEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass soapHeaderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass soapRoleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass portNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass descriptionTypeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass displayNameTypeEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-  private WscommonPackageImpl() {
-		super(eNS_URI, WscommonFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-  public static WscommonPackage init() {
-		if (isInited) return (WscommonPackage)EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WscommonPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theWscommonPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWsddPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theWscommonPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWsddPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-
-		return theWscommonPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getInitParam() {
-		return initParamEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getInitParam_ParamName() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getInitParam_ParamValue() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getInitParam_Description() {
-		return (EAttribute)initParamEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getInitParam_DescriptionTypes() {
-		return (EReference)initParamEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getSOAPHeader() {
-		return soapHeaderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getSOAPRole() {
-		return soapRoleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getSOAPRole_SoapRole() {
-		return (EAttribute)soapRoleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getPortName() {
-		return portNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortName_PortName() {
-		return (EAttribute)portNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getDescriptionType() {
-		return descriptionTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getDisplayNameType() {
-		return displayNameTypeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonFactory getWscommonFactory() {
-		return (WscommonFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		initParamEClass = createEClass(INIT_PARAM);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_NAME);
-		createEAttribute(initParamEClass, INIT_PARAM__PARAM_VALUE);
-		createEAttribute(initParamEClass, INIT_PARAM__DESCRIPTION);
-		createEReference(initParamEClass, INIT_PARAM__DESCRIPTION_TYPES);
-
-		soapHeaderEClass = createEClass(SOAP_HEADER);
-
-		soapRoleEClass = createEClass(SOAP_ROLE);
-		createEAttribute(soapRoleEClass, SOAP_ROLE__SOAP_ROLE);
-
-		portNameEClass = createEClass(PORT_NAME);
-		createEAttribute(portNameEClass, PORT_NAME__PORT_NAME);
-
-		descriptionTypeEClass = createEClass(DESCRIPTION_TYPE);
-
-		displayNameTypeEClass = createEClass(DISPLAY_NAME_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		soapHeaderEClass.getESuperTypes().add(theCommonPackage.getQName());
-		descriptionTypeEClass.getESuperTypes().add(theCommonPackage.getDescription());
-		displayNameTypeEClass.getESuperTypes().add(theCommonPackage.getDisplayName());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(initParamEClass, InitParam.class, "InitParam", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getInitParam_ParamName(), ecorePackage.getEString(), "paramName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getInitParam_ParamValue(), ecorePackage.getEString(), "paramValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getInitParam_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getInitParam_DescriptionTypes(), this.getDescriptionType(), null, "descriptionTypes", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(soapHeaderEClass, SOAPHeader.class, "SOAPHeader", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-		initEClass(soapRoleEClass, SOAPRole.class, "SOAPRole", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getSOAPRole_SoapRole(), ecorePackage.getEString(), "soapRole", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(portNameEClass, PortName.class, "PortName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getPortName_PortName(), ecorePackage.getEString(), "portName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(descriptionTypeEClass, DescriptionType.class, "DescriptionType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-		initEClass(displayNameTypeEClass, DisplayNameType.class, "DisplayNameType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //WscommonPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonAdapterFactory.java
deleted file mode 100644
index 011c4f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonAdapterFactory.java
+++ /dev/null
@@ -1,269 +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.webservice.internal.wscommon.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage
- * @generated
- */
-public class WscommonAdapterFactory extends AdapterFactoryImpl
-{
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WscommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = WscommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-  public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WscommonSwitch modelSwitch =
-		new WscommonSwitch() {
-			public Object caseInitParam(InitParam object) {
-				return createInitParamAdapter();
-			}
-			public Object caseSOAPHeader(SOAPHeader object) {
-				return createSOAPHeaderAdapter();
-			}
-			public Object caseSOAPRole(SOAPRole object) {
-				return createSOAPRoleAdapter();
-			}
-			public Object casePortName(PortName object) {
-				return createPortNameAdapter();
-			}
-			public Object caseDescriptionType(DescriptionType object) {
-				return createDescriptionTypeAdapter();
-			}
-			public Object caseDisplayNameType(DisplayNameType object) {
-				return createDisplayNameTypeAdapter();
-			}
-			public Object caseQName(QName object) {
-				return createQNameAdapter();
-			}
-			public Object caseDescription(Description object) {
-				return createDescriptionAdapter();
-			}
-			public Object caseDisplayName(DisplayName object) {
-				return createDisplayNameAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-  public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam <em>Init Param</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam
-	 * @generated
-	 */
-  public Adapter createInitParamAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPHeader <em>SOAP Header</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPHeader
-	 * @generated
-	 */
-  public Adapter createSOAPHeaderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole <em>SOAP Role</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole
-	 * @generated
-	 */
-  public Adapter createSOAPRoleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName <em>Port Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName
-	 * @generated
-	 */
-  public Adapter createPortNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.DescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.DescriptionType
-	 * @generated
-	 */
-  public Adapter createDescriptionTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.DisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.DisplayNameType
-	 * @generated
-	 */
-  public Adapter createDisplayNameTypeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.Description <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.Description
-	 * @generated
-	 */
-  public Adapter createDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.DisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.DisplayName
-	 * @generated
-	 */
-  public Adapter createDisplayNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.QName
-	 * @generated
-	 */
-  public Adapter createQNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-  public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //WscommonAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonSwitch.java
deleted file mode 100644
index f8a3006..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wscommon/util/WscommonSwitch.java
+++ /dev/null
@@ -1,268 +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.webservice.internal.wscommon.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-
-
-
-/**
- * <!-- 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.internal.webservice.wscommon.WscommonPackage
- * @generated
- */
-public class WscommonSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WscommonPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WscommonSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WscommonPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-  public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case WscommonPackage.INIT_PARAM: {
-					InitParam initParam = (InitParam)theEObject;
-					Object result = caseInitParam(initParam);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WscommonPackage.SOAP_HEADER: {
-					SOAPHeader soapHeader = (SOAPHeader)theEObject;
-					Object result = caseSOAPHeader(soapHeader);
-					if (result == null) result = caseQName(soapHeader);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WscommonPackage.SOAP_ROLE: {
-					SOAPRole soapRole = (SOAPRole)theEObject;
-					Object result = caseSOAPRole(soapRole);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WscommonPackage.PORT_NAME: {
-					PortName portName = (PortName)theEObject;
-					Object result = casePortName(portName);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WscommonPackage.DESCRIPTION_TYPE: {
-					DescriptionType descriptionType = (DescriptionType)theEObject;
-					Object result = caseDescriptionType(descriptionType);
-					if (result == null) result = caseDescription(descriptionType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WscommonPackage.DISPLAY_NAME_TYPE: {
-					DisplayNameType displayNameType = (DisplayNameType)theEObject;
-					Object result = caseDisplayNameType(displayNameType);
-					if (result == null) result = caseDisplayName(displayNameType);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Init Param</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseInitParam(InitParam object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>SOAP Header</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>SOAP Header</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseSOAPHeader(SOAPHeader object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>SOAP Role</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>SOAP Role</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseSOAPRole(SOAPRole object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Name</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object casePortName(PortName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Type</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDescriptionType(DescriptionType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Display Name Type</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Display Name Type</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDisplayNameType(DisplayNameType object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDescription(Description object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Display Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDisplayName(DisplayName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseQName(QName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-  public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //WscommonSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddPackage.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddPackage.java
deleted file mode 100644
index 0b25998..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddPackage.java
+++ /dev/null
@@ -1,1181 +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.webservice.internal.wsdd;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-
-/**
- * <!-- 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.internal.webservice.wsdd.WsddFactory
- * @generated
- */
-public interface WsddPackage extends EPackage{
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNAME = "wsdd";//$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_URI = "wsdd.xmi";//$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.webservice.wsdd";//$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WsddPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServicesImpl <em>Web Services</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServicesImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getWebServices()
-	 * @generated
-	 */
-  int WEB_SERVICES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Web Service Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Web Services</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICES_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl <em>Web Service Description</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getWebServiceDescription()
-	 * @generated
-	 */
-  int WEB_SERVICE_DESCRIPTION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Web Service Description Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__WSDL_FILE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__SMALL_ICON = 3;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__LARGE_ICON = 4;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DESCRIPTION = 5;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DISPLAY_NAME = 6;
-
-	/**
-	 * The feature id for the '<em><b>Port Components</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS = 7;
-
-	/**
-	 * The feature id for the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION__ICON_TYPE = 10;
-
-	/**
-	 * The number of structural features of the the '<em>Web Service Description</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WEB_SERVICE_DESCRIPTION_FEATURE_COUNT = 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl <em>Port Component</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getPortComponent()
-	 * @generated
-	 */
-  int PORT_COMPONENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Port Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__PORT_COMPONENT_NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__SMALL_ICON = 2;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__LARGE_ICON = 3;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DESCRIPTION = 4;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DISPLAY_NAME = 5;
-
-	/**
-	 * The feature id for the '<em><b>Wsdl Port</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__WSDL_PORT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Service Impl Bean</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__SERVICE_IMPL_BEAN = 7;
-
-	/**
-	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__HANDLERS = 8;
-
-	/**
-	 * The feature id for the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DESCRIPTION_TYPE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__DISPLAY_NAME_TYPE = 10;
-
-	/**
-	 * The feature id for the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT__ICON_TYPE = 11;
-
-	/**
-	 * The number of structural features of the the '<em>Port Component</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int PORT_COMPONENT_FEATURE_COUNT = 12;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WSDLPortImpl <em>WSDL Port</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WSDLPortImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getWSDLPort()
-	 * @generated
-	 */
-  int WSDL_PORT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-	/**
-	 * The feature id for the '<em><b>Local Part</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-	/**
-	 * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-	/**
-	 * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-	/**
-	 * The number of structural features of the the '<em>WSDL Port</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int WSDL_PORT_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServiceImplBeanImpl <em>Service Impl Bean</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServiceImplBeanImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getServiceImplBean()
-	 * @generated
-	 */
-  int SERVICE_IMPL_BEAN = 4;
-
-	/**
-	 * The feature id for the '<em><b>EEJB Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN__EEJB_LINK = 0;
-
-	/**
-	 * The feature id for the '<em><b>EServlet Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN__ESERVLET_LINK = 1;
-
-	/**
-	 * The feature id for the '<em><b>Bean Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN__BEAN_LINK = 2;
-
-	/**
-	 * The number of structural features of the the '<em>Service Impl Bean</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVICE_IMPL_BEAN_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.BeanLinkImpl <em>Bean Link</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.BeanLinkImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getBeanLink()
-	 * @generated
-	 */
-  int BEAN_LINK = 8;
-
-	/**
-	 * The number of structural features of the the '<em>Bean Link</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int BEAN_LINK_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServletLinkImpl <em>Servlet Link</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServletLinkImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getServletLink()
-	 * @generated
-	 */
-  int SERVLET_LINK = 5;
-
-	/**
-	 * The feature id for the '<em><b>Servlet Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVLET_LINK__SERVLET_LINK = BEAN_LINK_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Servlet Link</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int SERVLET_LINK_FEATURE_COUNT = BEAN_LINK_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.EJBLinkImpl <em>EJB Link</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.EJBLinkImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getEJBLink()
-	 * @generated
-	 */
-  int EJB_LINK = 6;
-
-	/**
-	 * The feature id for the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EJB_LINK__EJB_LINK = BEAN_LINK_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>EJB Link</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int EJB_LINK_FEATURE_COUNT = BEAN_LINK_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.HandlerImpl <em>Handler</em>}' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.HandlerImpl
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WsddPackageImpl#getHandler()
-	 * @generated
-	 */
-  int HANDLER = 7;
-
-	/**
-	 * The feature id for the '<em><b>Icons</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__ICONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__ICONS;
-
-	/**
-	 * The feature id for the '<em><b>Display Names</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DISPLAY_NAMES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAMES;
-
-	/**
-	 * The feature id for the '<em><b>Descriptions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DESCRIPTIONS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTIONS;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__SMALL_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__LARGE_ICON = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DESCRIPTION = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__DISPLAY_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP__DISPLAY_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__HANDLER_NAME = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Handler Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__HANDLER_CLASS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Init Params</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__INIT_PARAMS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__SOAP_HEADERS = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Soap Roles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER__SOAP_ROLES = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the the '<em>Handler</em>' class.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-  int HANDLER_FEATURE_COUNT = CommonPackage.COMPATIBILITY_DESCRIPTION_GROUP_FEATURE_COUNT + 5;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServices <em>Web Services</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Web Services</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServices
-	 * @generated
-	 */
-  EClass getWebServices();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServices#getWebServiceDescriptions <em>Web Service Descriptions</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Web Service Descriptions</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServices#getWebServiceDescriptions()
-	 * @see #getWebServices()
-	 * @generated
-	 */
-  EReference getWebServices_WebServiceDescriptions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription <em>Web Service Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Web Service Description</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription
-	 * @generated
-	 */
-  EClass getWebServiceDescription();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Jaxrpc Mapping File</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_JaxrpcMappingFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName <em>Web Service Description Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Web Service Description Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_WebServiceDescriptionName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWsdlFile <em>Wsdl File</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Wsdl File</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWsdlFile()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_WsdlFile();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Small Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getSmallIcon()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Large Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getLargeIcon()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescription()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayName()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EAttribute getWebServiceDescription_DisplayName();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getPortComponents <em>Port Components</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Port Components</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getPortComponents()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_PortComponents();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Description Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescriptionType()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_DescriptionType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Display Name Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayNameType()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_DisplayNameType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getIconType <em>Icon Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Icon Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getIconType()
-	 * @see #getWebServiceDescription()
-	 * @generated
-	 */
-  EReference getWebServiceDescription_IconType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent <em>Port Component</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Port Component</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent
-	 * @generated
-	 */
-  EClass getPortComponent();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getPortComponentName <em>Port Component Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Port Component Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getPortComponentName()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_PortComponentName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceEndpointInterface <em>Service Endpoint Interface</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Service Endpoint Interface</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceEndpointInterface()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_ServiceEndpointInterface();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Small Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getSmallIcon()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_SmallIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Large Icon</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getLargeIcon()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescription()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_Description();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayName <em>Display Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Display Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayName()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EAttribute getPortComponent_DisplayName();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getWsdlPort <em>Wsdl Port</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Wsdl Port</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getWsdlPort()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_WsdlPort();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceImplBean <em>Service Impl Bean</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Service Impl Bean</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceImplBean()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_ServiceImplBean();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getHandlers <em>Handlers</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Handlers</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getHandlers()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_Handlers();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescriptionType <em>Description Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Description Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescriptionType()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_DescriptionType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayNameType <em>Display Name Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Display Name Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayNameType()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_DisplayNameType();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getIconType <em>Icon Type</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Icon Type</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getIconType()
-	 * @see #getPortComponent()
-	 * @generated
-	 */
-  EReference getPortComponent_IconType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WSDLPort <em>WSDL Port</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>WSDL Port</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WSDLPort
-	 * @generated
-	 */
-  EClass getWSDLPort();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean <em>Service Impl Bean</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Service Impl Bean</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean
-	 * @generated
-	 */
-  EClass getServiceImplBean();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEEJBLink <em>EEJB Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>EEJB Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEEJBLink()
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  EReference getServiceImplBean_EEJBLink();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEServletLink <em>EServlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>EServlet Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEServletLink()
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  EReference getServiceImplBean_EServletLink();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getBeanLink <em>Bean Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Bean Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getBeanLink()
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  EReference getServiceImplBean_BeanLink();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink <em>Servlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Servlet Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink
-	 * @generated
-	 */
-  EClass getServletLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink#getServletLink <em>Servlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Servlet Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink#getServletLink()
-	 * @see #getServletLink()
-	 * @generated
-	 */
-  EAttribute getServletLink_ServletLink();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink <em>EJB Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>EJB Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink
-	 * @generated
-	 */
-  EClass getEJBLink();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink#getEjbLink <em>Ejb Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ejb Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink#getEjbLink()
-	 * @see #getEJBLink()
-	 * @generated
-	 */
-  EAttribute getEJBLink_EjbLink();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Handler</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler
-	 * @generated
-	 */
-  EClass getHandler();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerName <em>Handler Name</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Name</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerName()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EAttribute getHandler_HandlerName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerClass <em>Handler Class</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Handler Class</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerClass()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EAttribute getHandler_HandlerClass();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getInitParams <em>Init Params</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Init Params</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getInitParams()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EReference getHandler_InitParams();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getSoapHeaders <em>Soap Headers</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Soap Headers</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getSoapHeaders()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EReference getHandler_SoapHeaders();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getSoapRoles <em>Soap Roles</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Soap Roles</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getSoapRoles()
-	 * @see #getHandler()
-	 * @generated
-	 */
-  EReference getHandler_SoapRoles();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.BeanLink <em>Bean Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bean Link</em>'.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.BeanLink
-	 * @generated
-	 */
-  EClass getBeanLink();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-  WsddFactory getWsddFactory();
-
-} //WsddPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java
deleted file mode 100644
index f82dccc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/WsddResourceFactory.java
+++ /dev/null
@@ -1,74 +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.webservice.internal.wsdd;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddResourceImpl;
-import org.eclipse.wst.common.internal.emf.resource.FileNameResourceFactoryRegistry;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class WsddResourceFactory extends TranslatorResourceFactory
-{
-  /**
-  * WsddResourceFactory constructor comment.
-  */
-  public WsddResourceFactory(RendererFactory aRendererFactory) 
-  {
-	  super(aRendererFactory);
-  }
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new WsddResourceImpl(uri, aRenderer);
-	}
-
-  /**
-   * Register myself with the Resource.Factory.Registry
-   */
-  public static void registerWith(RendererFactory aRendererFactory) {
-  	J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(aRendererFactory));
-  	J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(WebServiceConstants.WEBSERVICE_TEMP_DD_SHORT_NAME, new WsddResourceFactory(aRendererFactory));
-  }
-  public static void register(FileNameResourceFactoryRegistry aRegistry) {
-		aRegistry.registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(RendererFactory.getDefaultRendererFactory()));
-		aRegistry.registerLastFileSegment(WebServiceConstants.WEBSERVICE_TEMP_DD_SHORT_NAME, new WsddResourceFactory(RendererFactory.getDefaultRendererFactory()));
-  }
-	
-  /**
-   * register using the default renderer factory.
-   * @see #registerWith(RendererFactory)
-   */
-  public static void register() {
-  	registerWith(RendererFactory.getDefaultRendererFactory());
-  }
-
-  /**
-   * Method registerDtds.
-  */
-  public static void registerDtds() 
-  {
-    //http://www.ibm.com/webservices/dtd/j2ee_web_services_1_0.dtd
-  	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SYSTEMID, "j2ee_web_services_1_0.dtd");//$NON-NLS-1$
-	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC, "j2ee_web_services_1_1.xsd"); //$NON-NLS-1$
-    J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.WEBSERVICE_SCHEMA_LOC_SUN, "j2ee_web_services_1_1.xsd"); //$NON-NLS-1$	
-  }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/BeanLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/BeanLinkImpl.java
deleted file mode 100644
index 39aab99..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/BeanLinkImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.internal.wsdd.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class BeanLinkImpl extends EObjectImpl implements BeanLink
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected BeanLinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getBeanLink();
-	}
-
-} //BeanLinkImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/EJBLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/EJBLinkImpl.java
deleted file mode 100644
index e5ea1a6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/EJBLinkImpl.java
+++ /dev/null
@@ -1,164 +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.webservice.internal.wsdd.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EJB Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.EJBLinkImpl#getEjbLink <em>Ejb Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EJBLinkImpl extends BeanLinkImpl implements EJBLink
-{
-	/**
-	 * The default value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String EJB_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEjbLink() <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEjbLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected String ejbLink = EJB_LINK_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EJBLinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getEJBLink();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getEjbLink() {
-		return ejbLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setEjbLink(String newEjbLink) {
-		String oldEjbLink = ejbLink;
-		ejbLink = newEjbLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.EJB_LINK__EJB_LINK, oldEjbLink, ejbLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				return getEjbLink();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				setEjbLink((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				setEjbLink(EJB_LINK_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.EJB_LINK__EJB_LINK:
-				return EJB_LINK_EDEFAULT == null ? ejbLink != null : !EJB_LINK_EDEFAULT.equals(ejbLink);
-		}
-		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(" (ejbLink: ");//$NON-NLS-1$
-		result.append(ejbLink);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EJBLinkImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/HandlerImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/HandlerImpl.java
deleted file mode 100644
index 66c9dbd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/HandlerImpl.java
+++ /dev/null
@@ -1,431 +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.webservice.internal.wsdd.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.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.jst.j2ee.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.HandlerImpl#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.HandlerImpl#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.HandlerImpl#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.HandlerImpl#getSoapHeaders <em>Soap Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.HandlerImpl#getSoapRoles <em>Soap Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HandlerImpl extends CompatibilityDescriptionGroupImpl implements Handler
-{
-	/**
-	 * The default value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String HANDLER_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerName() <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String handlerName = HANDLER_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String HANDLER_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlerClass()
-	 * @generated
-	 * @ordered
-	 */
-  protected String handlerClass = HANDLER_CLASS_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInitParams() <em>Init Params</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getInitParams()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList initParams = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapHeaders() <em>Soap Headers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapHeaders()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList soapHeaders = null;
-
-	/**
-	 * The cached value of the '{@link #getSoapRoles() <em>Soap Roles</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSoapRoles()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList soapRoles = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected HandlerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getHandler();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getHandlerName() {
-		return handlerName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setHandlerName(String newHandlerName) {
-		String oldHandlerName = handlerName;
-		handlerName = newHandlerName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.HANDLER__HANDLER_NAME, oldHandlerName, handlerName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getHandlerClass() {
-		return handlerClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setHandlerClass(String newHandlerClass) {
-		String oldHandlerClass = handlerClass;
-		handlerClass = newHandlerClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.HANDLER__HANDLER_CLASS, oldHandlerClass, handlerClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getInitParams() {
-		if (initParams == null) {
-			initParams = new EObjectContainmentEList(InitParam.class, this, WsddPackage.HANDLER__INIT_PARAMS);
-		}
-		return initParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getSoapHeaders() {
-		if (soapHeaders == null) {
-			soapHeaders = new EObjectContainmentEList(SOAPHeader.class, this, WsddPackage.HANDLER__SOAP_HEADERS);
-		}
-		return soapHeaders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getSoapRoles() {
-		if (soapRoles == null) {
-			soapRoles = new EObjectContainmentEList(SOAPRole.class, this, WsddPackage.HANDLER__SOAP_ROLES);
-		}
-		return soapRoles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WsddPackage.HANDLER__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case WsddPackage.HANDLER__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case WsddPackage.HANDLER__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case WsddPackage.HANDLER__INIT_PARAMS:
-					return ((InternalEList)getInitParams()).basicRemove(otherEnd, msgs);
-				case WsddPackage.HANDLER__SOAP_HEADERS:
-					return ((InternalEList)getSoapHeaders()).basicRemove(otherEnd, msgs);
-				case WsddPackage.HANDLER__SOAP_ROLES:
-					return ((InternalEList)getSoapRoles()).basicRemove(otherEnd, msgs);
-				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 WsddPackage.HANDLER__ICONS:
-				return getIcons();
-			case WsddPackage.HANDLER__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WsddPackage.HANDLER__DESCRIPTIONS:
-				return getDescriptions();
-			case WsddPackage.HANDLER__SMALL_ICON:
-				return getSmallIcon();
-			case WsddPackage.HANDLER__LARGE_ICON:
-				return getLargeIcon();
-			case WsddPackage.HANDLER__DESCRIPTION:
-				return getDescription();
-			case WsddPackage.HANDLER__DISPLAY_NAME:
-				return getDisplayName();
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				return getHandlerName();
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				return getHandlerClass();
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				return getInitParams();
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				return getSoapHeaders();
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				return getSoapRoles();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.HANDLER__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WsddPackage.HANDLER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WsddPackage.HANDLER__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WsddPackage.HANDLER__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WsddPackage.HANDLER__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WsddPackage.HANDLER__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WsddPackage.HANDLER__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				setHandlerName((String)newValue);
-				return;
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass((String)newValue);
-				return;
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				getInitParams().addAll((Collection)newValue);
-				return;
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				getSoapHeaders().addAll((Collection)newValue);
-				return;
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				getSoapRoles().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.HANDLER__ICONS:
-				getIcons().clear();
-				return;
-			case WsddPackage.HANDLER__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WsddPackage.HANDLER__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WsddPackage.HANDLER__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				setHandlerName(HANDLER_NAME_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				setHandlerClass(HANDLER_CLASS_EDEFAULT);
-				return;
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				getInitParams().clear();
-				return;
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				getSoapHeaders().clear();
-				return;
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				getSoapRoles().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.HANDLER__ICONS:
-				return icons != null && !icons.isEmpty();
-			case WsddPackage.HANDLER__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WsddPackage.HANDLER__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WsddPackage.HANDLER__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WsddPackage.HANDLER__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WsddPackage.HANDLER__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WsddPackage.HANDLER__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WsddPackage.HANDLER__HANDLER_NAME:
-				return HANDLER_NAME_EDEFAULT == null ? handlerName != null : !HANDLER_NAME_EDEFAULT.equals(handlerName);
-			case WsddPackage.HANDLER__HANDLER_CLASS:
-				return HANDLER_CLASS_EDEFAULT == null ? handlerClass != null : !HANDLER_CLASS_EDEFAULT.equals(handlerClass);
-			case WsddPackage.HANDLER__INIT_PARAMS:
-				return initParams != null && !initParams.isEmpty();
-			case WsddPackage.HANDLER__SOAP_HEADERS:
-				return soapHeaders != null && !soapHeaders.isEmpty();
-			case WsddPackage.HANDLER__SOAP_ROLES:
-				return soapRoles != null && !soapRoles.isEmpty();
-		}
-		return 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(" (handlerName: ");//$NON-NLS-1$
-		result.append(handlerName);
-		result.append(", handlerClass: ");//$NON-NLS-1$
-		result.append(handlerClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //HandlerImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/PortComponentImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/PortComponentImpl.java
deleted file mode 100644
index 915094d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/PortComponentImpl.java
+++ /dev/null
@@ -1,829 +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.webservice.internal.wsdd.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.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.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Component</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getPortComponentName <em>Port Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getWsdlPort <em>Wsdl Port</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getServiceImplBean <em>Service Impl Bean</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.PortComponentImpl#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortComponentImpl extends EObjectImpl implements PortComponent
-{
-	/**
-	 * The default value of the '{@link #getPortComponentName() <em>Port Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortComponentName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String PORT_COMPONENT_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPortComponentName() <em>Port Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortComponentName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String portComponentName = PORT_COMPONENT_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SERVICE_ENDPOINT_INTERFACE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 * @ordered
-	 */
-  protected String serviceEndpointInterface = SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getWsdlPort() <em>Wsdl Port</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlPort()
-	 * @generated
-	 * @ordered
-	 */
-  protected WSDLPort wsdlPort = null;
-
-	/**
-	 * The cached value of the '{@link #getServiceImplBean() <em>Service Impl Bean</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServiceImplBean()
-	 * @generated
-	 * @ordered
-	 */
-  protected ServiceImplBean serviceImplBean = null;
-
-	/**
-	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getHandlers()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList handlers = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptionType() <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescriptionType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DescriptionType descriptionType = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNameType() <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayNameType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DisplayNameType displayNameType = null;
-
-	/**
-	 * The cached value of the '{@link #getIconType() <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getIconType()
-	 * @generated
-	 * @ordered
-	 */
-  protected IconType iconType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected PortComponentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getPortComponent();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getPortComponentName() {
-		return portComponentName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setPortComponentName(String newPortComponentName) {
-		String oldPortComponentName = portComponentName;
-		portComponentName = newPortComponentName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME, oldPortComponentName, portComponentName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getServiceEndpointInterface() {
-		return serviceEndpointInterface;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServiceEndpointInterface(String newServiceEndpointInterface) {
-		String oldServiceEndpointInterface = serviceEndpointInterface;
-		serviceEndpointInterface = newServiceEndpointInterface;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getSmallIcon() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setSmallIcon(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getLargeIcon() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setLargeIcon(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDisplayName() {
-		return displayName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayName(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLPort getWsdlPort() {
-		return wsdlPort;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetWsdlPort(WSDLPort newWsdlPort, NotificationChain msgs) {
-		WSDLPort oldWsdlPort = wsdlPort;
-		wsdlPort = newWsdlPort;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__WSDL_PORT, oldWsdlPort, newWsdlPort);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlPort(WSDLPort newWsdlPort) {
-		if (newWsdlPort != wsdlPort) {
-			NotificationChain msgs = null;
-			if (wsdlPort != null)
-				msgs = ((InternalEObject)wsdlPort).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__WSDL_PORT, null, msgs);
-			if (newWsdlPort != null)
-				msgs = ((InternalEObject)newWsdlPort).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__WSDL_PORT, null, msgs);
-			msgs = basicSetWsdlPort(newWsdlPort, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__WSDL_PORT, newWsdlPort, newWsdlPort));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServiceImplBean getServiceImplBean() {
-		return serviceImplBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetServiceImplBean(ServiceImplBean newServiceImplBean, NotificationChain msgs) {
-		ServiceImplBean oldServiceImplBean = serviceImplBean;
-		serviceImplBean = newServiceImplBean;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, oldServiceImplBean, newServiceImplBean);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServiceImplBean(ServiceImplBean newServiceImplBean) {
-		if (newServiceImplBean != serviceImplBean) {
-			NotificationChain msgs = null;
-			if (serviceImplBean != null)
-				msgs = ((InternalEObject)serviceImplBean).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, null, msgs);
-			if (newServiceImplBean != null)
-				msgs = ((InternalEObject)newServiceImplBean).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, null, msgs);
-			msgs = basicSetServiceImplBean(newServiceImplBean, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN, newServiceImplBean, newServiceImplBean));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getHandlers() {
-		if (handlers == null) {
-			handlers = new EObjectContainmentEList(Handler.class, this, WsddPackage.PORT_COMPONENT__HANDLERS);
-		}
-		return handlers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DescriptionType getDescriptionType() {
-		return descriptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDescriptionType(DescriptionType newDescriptionType, NotificationChain msgs) {
-		DescriptionType oldDescriptionType = descriptionType;
-		descriptionType = newDescriptionType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, oldDescriptionType, newDescriptionType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescriptionType(DescriptionType newDescriptionType) {
-		if (newDescriptionType != descriptionType) {
-			NotificationChain msgs = null;
-			if (descriptionType != null)
-				msgs = ((InternalEObject)descriptionType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, null, msgs);
-			if (newDescriptionType != null)
-				msgs = ((InternalEObject)newDescriptionType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, null, msgs);
-			msgs = basicSetDescriptionType(newDescriptionType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE, newDescriptionType, newDescriptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DisplayNameType getDisplayNameType() {
-		return displayNameType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDisplayNameType(DisplayNameType newDisplayNameType, NotificationChain msgs) {
-		DisplayNameType oldDisplayNameType = displayNameType;
-		displayNameType = newDisplayNameType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, oldDisplayNameType, newDisplayNameType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayNameType(DisplayNameType newDisplayNameType) {
-		if (newDisplayNameType != displayNameType) {
-			NotificationChain msgs = null;
-			if (displayNameType != null)
-				msgs = ((InternalEObject)displayNameType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, null, msgs);
-			if (newDisplayNameType != null)
-				msgs = ((InternalEObject)newDisplayNameType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, null, msgs);
-			msgs = basicSetDisplayNameType(newDisplayNameType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE, newDisplayNameType, newDisplayNameType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public IconType getIconType() {
-		return iconType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetIconType(IconType newIconType, NotificationChain msgs) {
-		IconType oldIconType = iconType;
-		iconType = newIconType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__ICON_TYPE, oldIconType, newIconType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setIconType(IconType newIconType) {
-		if (newIconType != iconType) {
-			NotificationChain msgs = null;
-			if (iconType != null)
-				msgs = ((InternalEObject)iconType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__ICON_TYPE, null, msgs);
-			if (newIconType != null)
-				msgs = ((InternalEObject)newIconType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.PORT_COMPONENT__ICON_TYPE, null, msgs);
-			msgs = basicSetIconType(newIconType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.PORT_COMPONENT__ICON_TYPE, newIconType, newIconType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-					return basicSetWsdlPort(null, msgs);
-				case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-					return basicSetServiceImplBean(null, msgs);
-				case WsddPackage.PORT_COMPONENT__HANDLERS:
-					return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-				case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-					return basicSetDescriptionType(null, msgs);
-				case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-					return basicSetDisplayNameType(null, msgs);
-				case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-					return basicSetIconType(null, msgs);
-				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 WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				return getPortComponentName();
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				return getServiceEndpointInterface();
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				return getSmallIcon();
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				return getLargeIcon();
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				return getDescription();
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				return getDisplayName();
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				return getWsdlPort();
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				return getServiceImplBean();
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				return getHandlers();
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				return getDescriptionType();
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				return getDisplayNameType();
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				return getIconType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				setPortComponentName((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				setWsdlPort((WSDLPort)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				setServiceImplBean((ServiceImplBean)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				getHandlers().clear();
-				getHandlers().addAll((Collection)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)newValue);
-				return;
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				setIconType((IconType)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				setPortComponentName(PORT_COMPONENT_NAME_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				setServiceEndpointInterface(SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				setWsdlPort((WSDLPort)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				setServiceImplBean((ServiceImplBean)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				getHandlers().clear();
-				return;
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)null);
-				return;
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				setIconType((IconType)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME:
-				return PORT_COMPONENT_NAME_EDEFAULT == null ? portComponentName != null : !PORT_COMPONENT_NAME_EDEFAULT.equals(portComponentName);
-			case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE:
-				return SERVICE_ENDPOINT_INTERFACE_EDEFAULT == null ? serviceEndpointInterface != null : !SERVICE_ENDPOINT_INTERFACE_EDEFAULT.equals(serviceEndpointInterface);
-			case WsddPackage.PORT_COMPONENT__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WsddPackage.PORT_COMPONENT__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WsddPackage.PORT_COMPONENT__WSDL_PORT:
-				return wsdlPort != null;
-			case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN:
-				return serviceImplBean != null;
-			case WsddPackage.PORT_COMPONENT__HANDLERS:
-				return handlers != null && !handlers.isEmpty();
-			case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE:
-				return descriptionType != null;
-			case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE:
-				return displayNameType != null;
-			case WsddPackage.PORT_COMPONENT__ICON_TYPE:
-				return iconType != null;
-		}
-		return 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(" (portComponentName: ");//$NON-NLS-1$
-		result.append(portComponentName);
-		result.append(", serviceEndpointInterface: ");//$NON-NLS-1$
-		result.append(serviceEndpointInterface);
-		result.append(", smallIcon: ");//$NON-NLS-1$
-		result.append(smallIcon);
-		result.append(", largeIcon: ");//$NON-NLS-1$
-		result.append(largeIcon);
-		result.append(", description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", displayName: ");//$NON-NLS-1$
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PortComponentImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServiceImplBeanImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServiceImplBeanImpl.java
deleted file mode 100644
index 268c75e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServiceImplBeanImpl.java
+++ /dev/null
@@ -1,316 +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.webservice.internal.wsdd.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Impl Bean</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServiceImplBeanImpl#getEEJBLink <em>EEJB Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServiceImplBeanImpl#getEServletLink <em>EServlet Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServiceImplBeanImpl#getBeanLink <em>Bean Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceImplBeanImpl extends EObjectImpl implements ServiceImplBean
-{
-	/**
-	 * The cached value of the '{@link #getEEJBLink() <em>EEJB Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEEJBLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected EJBLink eEJBLink = null;
-
-	/**
-	 * The cached value of the '{@link #getEServletLink() <em>EServlet Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getEServletLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected ServletLink eServletLink = null;
-
-	/**
-	 * The cached value of the '{@link #getBeanLink() <em>Bean Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getBeanLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected BeanLink beanLink = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ServiceImplBeanImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getServiceImplBean();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EJBLink getEEJBLink() {
-		return eEJBLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetEEJBLink(EJBLink newEEJBLink, NotificationChain msgs) {
-		EJBLink oldEEJBLink = eEJBLink;
-		eEJBLink = newEEJBLink;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, oldEEJBLink, newEEJBLink);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setEEJBLink(EJBLink newEEJBLink) {
-		if (newEEJBLink != eEJBLink) {
-			NotificationChain msgs = null;
-			if (eEJBLink != null)
-				msgs = ((InternalEObject)eEJBLink).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, null, msgs);
-			if (newEEJBLink != null)
-				msgs = ((InternalEObject)newEEJBLink).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, null, msgs);
-			msgs = basicSetEEJBLink(newEEJBLink, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK, newEEJBLink, newEEJBLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServletLink getEServletLink() {
-		return eServletLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetEServletLink(ServletLink newEServletLink, NotificationChain msgs) {
-		ServletLink oldEServletLink = eServletLink;
-		eServletLink = newEServletLink;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, oldEServletLink, newEServletLink);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setEServletLink(ServletLink newEServletLink) {
-		if (newEServletLink != eServletLink) {
-			NotificationChain msgs = null;
-			if (eServletLink != null)
-				msgs = ((InternalEObject)eServletLink).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, null, msgs);
-			if (newEServletLink != null)
-				msgs = ((InternalEObject)newEServletLink).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, null, msgs);
-			msgs = basicSetEServletLink(newEServletLink, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK, newEServletLink, newEServletLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public BeanLink getBeanLink() {
-		return beanLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetBeanLink(BeanLink newBeanLink, NotificationChain msgs) {
-		BeanLink oldBeanLink = beanLink;
-		beanLink = newBeanLink;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, oldBeanLink, newBeanLink);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setBeanLink(BeanLink newBeanLink) {
-		if (newBeanLink != beanLink) {
-			NotificationChain msgs = null;
-			if (beanLink != null)
-				msgs = ((InternalEObject)beanLink).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, null, msgs);
-			if (newBeanLink != null)
-				msgs = ((InternalEObject)newBeanLink).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, null, msgs);
-			msgs = basicSetBeanLink(newBeanLink, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK, newBeanLink, newBeanLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-					return basicSetEEJBLink(null, msgs);
-				case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-					return basicSetEServletLink(null, msgs);
-				case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-					return basicSetBeanLink(null, msgs);
-				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 WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				return getEEJBLink();
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				return getEServletLink();
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				return getBeanLink();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				setEEJBLink((EJBLink)newValue);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				setEServletLink((ServletLink)newValue);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				setBeanLink((BeanLink)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				setEEJBLink((EJBLink)null);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				setEServletLink((ServletLink)null);
-				return;
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				setBeanLink((BeanLink)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK:
-				return eEJBLink != null;
-			case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK:
-				return eServletLink != null;
-			case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK:
-				return beanLink != null;
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //ServiceImplBeanImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServletLinkImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServletLinkImpl.java
deleted file mode 100644
index a764173..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/ServletLinkImpl.java
+++ /dev/null
@@ -1,164 +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.webservice.internal.wsdd.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Servlet Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.ServletLinkImpl#getServletLink <em>Servlet Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServletLinkImpl extends BeanLinkImpl implements ServletLink
-{
-	/**
-	 * The default value of the '{@link #getServletLink() <em>Servlet Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServletLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SERVLET_LINK_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getServletLink() <em>Servlet Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getServletLink()
-	 * @generated
-	 * @ordered
-	 */
-  protected String servletLink = SERVLET_LINK_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected ServletLinkImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getServletLink();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getServletLink() {
-		return servletLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setServletLink(String newServletLink) {
-		String oldServletLink = servletLink;
-		servletLink = newServletLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.SERVLET_LINK__SERVLET_LINK, oldServletLink, servletLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				return getServletLink();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				setServletLink((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				setServletLink(SERVLET_LINK_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.SERVLET_LINK__SERVLET_LINK:
-				return SERVLET_LINK_EDEFAULT == null ? servletLink != null : !SERVLET_LINK_EDEFAULT.equals(servletLink);
-		}
-		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(" (servletLink: ");//$NON-NLS-1$
-		result.append(servletLink);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ServletLinkImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WSDLPortImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WSDLPortImpl.java
deleted file mode 100644
index 4b218bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WSDLPortImpl.java
+++ /dev/null
@@ -1,133 +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.webservice.internal.wsdd.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Port</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLPortImpl extends QNameImpl implements WSDLPort
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WSDLPortImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getWSDLPort();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WSDL_PORT__NAMESPACE_URI:
-				return getNamespaceURI();
-			case WsddPackage.WSDL_PORT__LOCAL_PART:
-				return getLocalPart();
-			case WsddPackage.WSDL_PORT__COMBINED_QNAME:
-				return getCombinedQName();
-			case WsddPackage.WSDL_PORT__INTERNAL_PREFIX_OR_NS_URI:
-				return getInternalPrefixOrNsURI();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WSDL_PORT__NAMESPACE_URI:
-				setNamespaceURI((String)newValue);
-				return;
-			case WsddPackage.WSDL_PORT__LOCAL_PART:
-				setLocalPart((String)newValue);
-				return;
-			case WsddPackage.WSDL_PORT__COMBINED_QNAME:
-				setCombinedQName((String)newValue);
-				return;
-			case WsddPackage.WSDL_PORT__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI((String)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WSDL_PORT__NAMESPACE_URI:
-				setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-				return;
-			case WsddPackage.WSDL_PORT__LOCAL_PART:
-				setLocalPart(LOCAL_PART_EDEFAULT);
-				return;
-			case WsddPackage.WSDL_PORT__COMBINED_QNAME:
-				setCombinedQName(COMBINED_QNAME_EDEFAULT);
-				return;
-			case WsddPackage.WSDL_PORT__INTERNAL_PREFIX_OR_NS_URI:
-				setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WSDL_PORT__NAMESPACE_URI:
-				return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-			case WsddPackage.WSDL_PORT__LOCAL_PART:
-				return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-			case WsddPackage.WSDL_PORT__COMBINED_QNAME:
-				return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-			case WsddPackage.WSDL_PORT__INTERNAL_PREFIX_OR_NS_URI:
-				return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //WSDLPortImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServiceDescriptionImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServiceDescriptionImpl.java
deleted file mode 100644
index 170880a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServiceDescriptionImpl.java
+++ /dev/null
@@ -1,969 +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.webservice.internal.wsdd.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.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.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionResource;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Web Service Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getWebServiceDescriptionName <em>Web Service Description Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getPortComponents <em>Port Components</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServiceDescriptionImpl#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebServiceDescriptionImpl extends EObjectImpl implements WebServiceDescription
-{
-	/**
-	 * The default value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String JAXRPC_MAPPING_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getJaxrpcMappingFile() <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected String jaxrpcMappingFile = JAXRPC_MAPPING_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWebServiceDescriptionName() <em>Web Service Description Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWebServiceDescriptionName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWebServiceDescriptionName() <em>Web Service Description Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWebServiceDescriptionName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String webServiceDescriptionName = WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String WSDL_FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getWsdlFile() <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWsdlFile()
-	 * @generated
-	 * @ordered
-	 */
-  protected String wsdlFile = WSDL_FILE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String SMALL_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String smallIcon = SMALL_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String LARGE_ICON_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-  protected String largeIcon = LARGE_ICON_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-  protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayName()
-	 * @generated
-	 * @ordered
-	 */
-  protected String displayName = DISPLAY_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getPortComponents() <em>Port Components</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getPortComponents()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList portComponents = null;
-
-	/**
-	 * The cached value of the '{@link #getDescriptionType() <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDescriptionType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DescriptionType descriptionType = null;
-
-	/**
-	 * The cached value of the '{@link #getDisplayNameType() <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getDisplayNameType()
-	 * @generated
-	 * @ordered
-	 */
-  protected DisplayNameType displayNameType = null;
-
-	/**
-	 * The cached value of the '{@link #getIconType() <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getIconType()
-	 * @generated
-	 * @ordered
-	 */
-  protected IconType iconType = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WebServiceDescriptionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getWebServiceDescription();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getJaxrpcMappingFile() {
-		return jaxrpcMappingFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setJaxrpcMappingFile(String newJaxrpcMappingFile) {
-		String oldJaxrpcMappingFile = jaxrpcMappingFile;
-		jaxrpcMappingFile = newJaxrpcMappingFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE, oldJaxrpcMappingFile, jaxrpcMappingFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWebServiceDescriptionName() {
-		return webServiceDescriptionName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWebServiceDescriptionName(String newWebServiceDescriptionName) {
-		String oldWebServiceDescriptionName = webServiceDescriptionName;
-		webServiceDescriptionName = newWebServiceDescriptionName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME, oldWebServiceDescriptionName, webServiceDescriptionName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getWsdlFile() {
-		return wsdlFile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setWsdlFile(String newWsdlFile) {
-		String oldWsdlFile = wsdlFile;
-		wsdlFile = newWsdlFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE, oldWsdlFile, wsdlFile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getSmallIconGen() {
-		return smallIcon;
-	}
-  public String getSmallIcon() {
-  	if(eResource() == null) 
-  		return getSmallIconGen();
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		return getSmallIconGen(); 
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		if (getIconType() != null)
-  			return getIconType().getSmallIcon();
-  	}
-  	return null;
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setSmallIconGen(String newSmallIcon) {
-		String oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON, oldSmallIcon, smallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getLargeIconGen() {
-		return largeIcon;
-	}
-  public String getLargeIcon() {
-  	if(eResource() == null) 
-  		return getLargeIconGen();
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		return getLargeIconGen(); 
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		if (getIconType() != null)
-  			return getIconType().getLargeIcon();
-  	}
-  	return null;
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setLargeIconGen(String newLargeIcon) {
-		String oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON, oldLargeIcon, largeIcon));
-	}
-  
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.jst.j2ee.internal.common.DescriptionGroup#getJ2EEVersionID()
-   */
-  public int getJ2EEVersionID() throws IllegalStateException {
-  	J2EEVersionResource res = (J2EEVersionResource) eResource();
-  	if (res == null)
-  		throw new IllegalStateException();
-  	return res.getJ2EEVersionID();
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getDescriptionGen() {
-  	return description;
-  }	
-
-	public String getDescription() {
-		if(eResource() == null) 
-			return getDescriptionGen();
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			return getDescriptionGen(); 
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default :
-			if (getDescriptionType() != null)
-				return ((Description)getDescriptionType()).getValue();
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescriptionGen(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION, oldDescription, description));
-	}
-  public void setDescription(String newDescription) {
-  	if(eResource() == null) {
-  		setDescriptionGen(newDescription);
-  		internalSetDescriptionType(newDescription);
-  		return;
-  	}
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		setDescriptionGen(newDescription);
-  		break;
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		internalSetDescriptionType(newDescription); 
-  		break;
-  	}
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public String getDisplayNameGen() {
-		return displayName;
-	}
-  public String getDisplayName() {
-  	if(eResource() == null) 
-  		return getDisplayNameGen();
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		return getDisplayNameGen(); 
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		if (getDisplayNameType() != null)
-  			return ((DisplayName)getDisplayNameType()).getValue();
-  	}
-  	return null;
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayNameGen(String newDisplayName) {
-		String oldDisplayName = displayName;
-		displayName = newDisplayName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME, oldDisplayName, displayName));
-	}
-  public void setDisplayName(String newDisplayName) {
-  	if(eResource() == null) {
-  		setDisplayNameGen(newDisplayName);
-  		internalSetDisplayNameType(newDisplayName);
-  		return;
-  	}
-  	
-  	switch (getJ2EEVersionID()) {
-  	case J2EEVersionConstants.J2EE_1_2_ID :
-  	case J2EEVersionConstants.J2EE_1_3_ID :
-  		setDisplayNameGen(newDisplayName);
-  		break;
-  	case J2EEVersionConstants.J2EE_1_4_ID :
-  	default :
-  		internalSetDisplayNameType(newDisplayName);
-  		break;
-  	}
-  }
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getPortComponents() {
-		if (portComponents == null) {
-			portComponents = new EObjectContainmentEList(PortComponent.class, this, WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS);
-		}
-		return portComponents;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DescriptionType getDescriptionType() {
-		return descriptionType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDescriptionType(DescriptionType newDescriptionType, NotificationChain msgs) {
-		DescriptionType oldDescriptionType = descriptionType;
-		descriptionType = newDescriptionType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, oldDescriptionType, newDescriptionType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDescriptionType(DescriptionType newDescriptionType) {
-		if (newDescriptionType != descriptionType) {
-			NotificationChain msgs = null;
-			if (descriptionType != null)
-				msgs = ((InternalEObject)descriptionType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, null, msgs);
-			if (newDescriptionType != null)
-				msgs = ((InternalEObject)newDescriptionType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, null, msgs);
-			msgs = basicSetDescriptionType(newDescriptionType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE, newDescriptionType, newDescriptionType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public DisplayNameType getDisplayNameType() {
-		return displayNameType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetDisplayNameType(DisplayNameType newDisplayNameType, NotificationChain msgs) {
-		DisplayNameType oldDisplayNameType = displayNameType;
-		displayNameType = newDisplayNameType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, oldDisplayNameType, newDisplayNameType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setDisplayNameType(DisplayNameType newDisplayNameType) {
-		if (newDisplayNameType != displayNameType) {
-			NotificationChain msgs = null;
-			if (displayNameType != null)
-				msgs = ((InternalEObject)displayNameType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, null, msgs);
-			if (newDisplayNameType != null)
-				msgs = ((InternalEObject)newDisplayNameType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, null, msgs);
-			msgs = basicSetDisplayNameType(newDisplayNameType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE, newDisplayNameType, newDisplayNameType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public IconType getIconType() {
-		return iconType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain basicSetIconType(IconType newIconType, NotificationChain msgs) {
-		IconType oldIconType = iconType;
-		iconType = newIconType;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, oldIconType, newIconType);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void setIconType(IconType newIconType) {
-		if (newIconType != iconType) {
-			NotificationChain msgs = null;
-			if (iconType != null)
-				msgs = ((InternalEObject)iconType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, null, msgs);
-			if (newIconType != null)
-				msgs = ((InternalEObject)newIconType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, null, msgs);
-			msgs = basicSetIconType(newIconType, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE, newIconType, newIconType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-					return ((InternalEList)getPortComponents()).basicRemove(otherEnd, msgs);
-				case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-					return basicSetDescriptionType(null, msgs);
-				case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-					return basicSetDisplayNameType(null, msgs);
-				case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-					return basicSetIconType(null, msgs);
-				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 WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				return getJaxrpcMappingFile();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				return getWebServiceDescriptionName();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				return getWsdlFile();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				return getSmallIcon();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				return getLargeIcon();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				return getDescription();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				return getDisplayName();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				return getPortComponents();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				return getDescriptionType();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				return getDisplayNameType();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				return getIconType();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				setWebServiceDescriptionName((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				setWsdlFile((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				getPortComponents().clear();
-				getPortComponents().addAll((Collection)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)newValue);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				setIconType((IconType)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				setJaxrpcMappingFile(JAXRPC_MAPPING_FILE_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				setWebServiceDescriptionName(WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				setWsdlFile(WSDL_FILE_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				getPortComponents().clear();
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				setDescriptionType((DescriptionType)null);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				setDisplayNameType((DisplayNameType)null);
-				return;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				setIconType((IconType)null);
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE:
-				return JAXRPC_MAPPING_FILE_EDEFAULT == null ? jaxrpcMappingFile != null : !JAXRPC_MAPPING_FILE_EDEFAULT.equals(jaxrpcMappingFile);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME:
-				return WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT == null ? webServiceDescriptionName != null : !WEB_SERVICE_DESCRIPTION_NAME_EDEFAULT.equals(webServiceDescriptionName);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE:
-				return WSDL_FILE_EDEFAULT == null ? wsdlFile != null : !WSDL_FILE_EDEFAULT.equals(wsdlFile);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS:
-				return portComponents != null && !portComponents.isEmpty();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE:
-				return descriptionType != null;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE:
-				return displayNameType != null;
-			case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE:
-				return iconType != null;
-		}
-		return 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(" (jaxrpcMappingFile: ");//$NON-NLS-1$
-		result.append(jaxrpcMappingFile);
-		result.append(", webServiceDescriptionName: ");//$NON-NLS-1$
-		result.append(webServiceDescriptionName);
-		result.append(", wsdlFile: ");//$NON-NLS-1$
-		result.append(wsdlFile);
-		result.append(", smallIcon: ");//$NON-NLS-1$
-		result.append(smallIcon);
-		result.append(", largeIcon: ");//$NON-NLS-1$
-		result.append(largeIcon);
-		result.append(", description: ");//$NON-NLS-1$
-		result.append(description);
-		result.append(", displayName: ");//$NON-NLS-1$
-		result.append(displayName);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * @param newDescription
-	 */
-	protected void internalSetDescriptionType(String newDescription) {
-		DescriptionType newValue = null;
-		if(getDescriptionType() != null) {
-			newValue = getDescriptionType();
-			newValue.setValue(newDescription);
-		}
-		else {
-			newValue = WscommonFactory.eINSTANCE.createDescriptionType();
-			newValue.setValue(newDescription);
-			setDescriptionType(newValue);
-		}
-		
-	}
-
-	/**
-	 * @param newDisplayName
-	 */
-	protected void internalSetDisplayNameType(String newDisplayName) {
-		DisplayNameType newValue = null;
-		if(getDisplayNameType() != null) {
-			newValue = getDisplayNameType();
-			newValue.setValue(newDisplayName);
-		}
-		else  {
-			newValue = WscommonFactory.eINSTANCE.createDisplayNameType();
-			newValue.setValue(newDisplayName);
-			setDisplayNameType(newValue);
-		}			  
-		
-	}
-
-	/**
-	 * @param newLargeIcon
-	 */
-	protected void internalSetLargeIconType(String newLargeIcon) {
-		IconType newValue = null;
-		if(getIconType() != null) {
-			newValue = getIconType();
-			newValue.setLargeIcon(newLargeIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setLargeIcon(newLargeIcon);
-			setIconType(newValue);
-		}
-		
-	}
-
-	/**
-	 * @param newSmallIcon
-	 */
-	protected void internalSetSmallIconType(String newSmallIcon) {
-		IconType newValue = null;
-		if(getIconType() != null) {
-			newValue = getIconType();
-			newValue.setSmallIcon(newSmallIcon);
-		}
-		else {
-			newValue = CommonFactory.eINSTANCE.createIconType();
-			newValue.setSmallIcon(newSmallIcon);
-			setIconType(newValue);
-		}
-	}
-
-	public void setLargeIcon(String newLargeIcon) {
-		if(eResource() == null) {
-			setLargeIconGen(newLargeIcon);
-			internalSetLargeIconType(newLargeIcon);
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setLargeIconGen(newLargeIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetLargeIconType(newLargeIcon); 
-			break;
-		}
-	}
-
-	public void setSmallIcon(String newSmallIcon) {
-		if(eResource() == null) {
-			setSmallIconGen(newSmallIcon);
-			internalSetSmallIconType(newSmallIcon); 
-			return;
-		}
-		
-		switch (getJ2EEVersionID()) {
-		case J2EEVersionConstants.J2EE_1_2_ID :
-		case J2EEVersionConstants.J2EE_1_3_ID :
-			setSmallIconGen(newSmallIcon);
-			break;
-		case J2EEVersionConstants.J2EE_1_4_ID :
-		default : 
-			internalSetSmallIconType(newSmallIcon); 
-			break;
-		}
-	}
-
-} //WebServiceDescriptionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServicesImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServicesImpl.java
deleted file mode 100644
index bfd0997..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WebServicesImpl.java
+++ /dev/null
@@ -1,241 +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.webservice.internal.wsdd.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.EStructuralFeature;
-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.internal.common.impl.CompatibilityDescriptionGroupImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Web Services</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.impl.WebServicesImpl#getWebServiceDescriptions <em>Web Service Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WebServicesImpl extends CompatibilityDescriptionGroupImpl implements WebServices
-{
-	/**
-	 * The cached value of the '{@link #getWebServiceDescriptions() <em>Web Service Descriptions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #getWebServiceDescriptions()
-	 * @generated
-	 * @ordered
-	 */
-  protected EList webServiceDescriptions = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WebServicesImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EClass eStaticClass() {
-		return WsddPackage.eINSTANCE.getWebServices();
-	}
-
-  /**
-   *
-   */
-  public void setDisplayName(String newDisplayName) {
-  	super.setDisplayName(newDisplayName);
-  }
-  
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EList getWebServiceDescriptions() {
-		if (webServiceDescriptions == null) {
-			webServiceDescriptions = new EObjectContainmentEList(WebServiceDescription.class, this, WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS);
-		}
-		return webServiceDescriptions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
-		if (featureID >= 0) {
-			switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
-				case WsddPackage.WEB_SERVICES__ICONS:
-					return ((InternalEList)getIcons()).basicRemove(otherEnd, msgs);
-				case WsddPackage.WEB_SERVICES__DISPLAY_NAMES:
-					return ((InternalEList)getDisplayNames()).basicRemove(otherEnd, msgs);
-				case WsddPackage.WEB_SERVICES__DESCRIPTIONS:
-					return ((InternalEList)getDescriptions()).basicRemove(otherEnd, msgs);
-				case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-					return ((InternalEList)getWebServiceDescriptions()).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 WsddPackage.WEB_SERVICES__ICONS:
-				return getIcons();
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAMES:
-				return getDisplayNames();
-			case WsddPackage.WEB_SERVICES__DESCRIPTIONS:
-				return getDescriptions();
-			case WsddPackage.WEB_SERVICES__SMALL_ICON:
-				return getSmallIcon();
-			case WsddPackage.WEB_SERVICES__LARGE_ICON:
-				return getLargeIcon();
-			case WsddPackage.WEB_SERVICES__DESCRIPTION:
-				return getDescription();
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAME:
-				return getDisplayName();
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				return getWebServiceDescriptions();
-		}
-		return eDynamicGet(eFeature, resolve);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eSet(EStructuralFeature eFeature, Object newValue) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WEB_SERVICES__ICONS:
-				getIcons().clear();
-				getIcons().addAll((Collection)newValue);
-				return;
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				getDisplayNames().addAll((Collection)newValue);
-				return;
-			case WsddPackage.WEB_SERVICES__DESCRIPTIONS:
-				getDescriptions().clear();
-				getDescriptions().addAll((Collection)newValue);
-				return;
-			case WsddPackage.WEB_SERVICES__SMALL_ICON:
-				setSmallIcon((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICES__LARGE_ICON:
-				setLargeIcon((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICES__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAME:
-				setDisplayName((String)newValue);
-				return;
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				getWebServiceDescriptions().clear();
-				getWebServiceDescriptions().addAll((Collection)newValue);
-				return;
-		}
-		eDynamicSet(eFeature, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void eUnset(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WEB_SERVICES__ICONS:
-				getIcons().clear();
-				return;
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAMES:
-				getDisplayNames().clear();
-				return;
-			case WsddPackage.WEB_SERVICES__DESCRIPTIONS:
-				getDescriptions().clear();
-				return;
-			case WsddPackage.WEB_SERVICES__SMALL_ICON:
-				setSmallIcon(SMALL_ICON_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICES__LARGE_ICON:
-				setLargeIcon(LARGE_ICON_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICES__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAME:
-				setDisplayName(DISPLAY_NAME_EDEFAULT);
-				return;
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				getWebServiceDescriptions().clear();
-				return;
-		}
-		eDynamicUnset(eFeature);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public boolean eIsSet(EStructuralFeature eFeature) {
-		switch (eDerivedStructuralFeatureID(eFeature)) {
-			case WsddPackage.WEB_SERVICES__ICONS:
-				return icons != null && !icons.isEmpty();
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAMES:
-				return displayNames != null && !displayNames.isEmpty();
-			case WsddPackage.WEB_SERVICES__DESCRIPTIONS:
-				return descriptions != null && !descriptions.isEmpty();
-			case WsddPackage.WEB_SERVICES__SMALL_ICON:
-				return SMALL_ICON_EDEFAULT == null ? smallIcon != null : !SMALL_ICON_EDEFAULT.equals(smallIcon);
-			case WsddPackage.WEB_SERVICES__LARGE_ICON:
-				return LARGE_ICON_EDEFAULT == null ? largeIcon != null : !LARGE_ICON_EDEFAULT.equals(largeIcon);
-			case WsddPackage.WEB_SERVICES__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case WsddPackage.WEB_SERVICES__DISPLAY_NAME:
-				return DISPLAY_NAME_EDEFAULT == null ? displayName != null : !DISPLAY_NAME_EDEFAULT.equals(displayName);
-			case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS:
-				return webServiceDescriptions != null && !webServiceDescriptions.isEmpty();
-		}
-		return eDynamicIsSet(eFeature);
-	}
-
-} //WebServicesImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddFactoryImpl.java
deleted file mode 100644
index 1cb78ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddFactoryImpl.java
+++ /dev/null
@@ -1,176 +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.webservice.internal.wsdd.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WsddFactoryImpl extends EFactoryImpl implements WsddFactory
-{
-	/**
-	 * Creates and instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case WsddPackage.WEB_SERVICES: return createWebServices();
-			case WsddPackage.WEB_SERVICE_DESCRIPTION: return createWebServiceDescription();
-			case WsddPackage.PORT_COMPONENT: return createPortComponent();
-			case WsddPackage.WSDL_PORT: return createWSDLPort();
-			case WsddPackage.SERVICE_IMPL_BEAN: return createServiceImplBean();
-			case WsddPackage.SERVLET_LINK: return createServletLink();
-			case WsddPackage.EJB_LINK: return createEJBLink();
-			case WsddPackage.HANDLER: return createHandler();
-			case WsddPackage.BEAN_LINK: return createBeanLink();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");//$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WebServices createWebServices() {
-		WebServicesImpl webServices = new WebServicesImpl();
-		return webServices;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WebServiceDescription createWebServiceDescription() {
-		WebServiceDescriptionImpl webServiceDescription = new WebServiceDescriptionImpl();
-		return webServiceDescription;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public PortComponent createPortComponent() {
-		PortComponentImpl portComponent = new PortComponentImpl();
-		return portComponent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WSDLPort createWSDLPort() {
-		WSDLPortImpl wsdlPort = new WSDLPortImpl();
-		return wsdlPort;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServiceImplBean createServiceImplBean() {
-		ServiceImplBeanImpl serviceImplBean = new ServiceImplBeanImpl();
-		return serviceImplBean;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public ServletLink createServletLink() {
-		ServletLinkImpl servletLink = new ServletLinkImpl();
-		return servletLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EJBLink createEJBLink() {
-		EJBLinkImpl ejbLink = new EJBLinkImpl();
-		return ejbLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public Handler createHandler() {
-		HandlerImpl handler = new HandlerImpl();
-		return handler;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BeanLink createBeanLink() {
-		BeanLinkImpl beanLink = new BeanLinkImpl();
-		return beanLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddPackage getWsddPackage() {
-		return (WsddPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-  public static WsddPackage getPackage() {
-		return WsddPackage.eINSTANCE;
-	}
-} //WsddFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddPackageImpl.java
deleted file mode 100644
index 11b68dd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddPackageImpl.java
+++ /dev/null
@@ -1,783 +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.webservice.internal.wsdd.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.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.jem.java.impl.JavaRefPackageImpl;
-import org.eclipse.jst.j2ee.internal.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl;
-import org.eclipse.jst.j2ee.internal.client.ClientPackage;
-import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.internal.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl;
-import org.eclipse.jst.j2ee.internal.jca.JcaPackage;
-import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl;
-import org.eclipse.jst.j2ee.internal.jsp.JspPackage;
-import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl;
-import org.eclipse.jst.j2ee.internal.taglib.TaglibPackage;
-import org.eclipse.jst.j2ee.internal.taglib.impl.TaglibPackageImpl;
-import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WsddPackageImpl extends EPackageImpl implements WsddPackage
-{
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass webServicesEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass webServiceDescriptionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass portComponentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass wsdlPortEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass serviceImplBeanEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass servletLinkEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass ejbLinkEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass handlerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private EClass beanLinkEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-  private WsddPackageImpl() {
-		super(eNS_URI, WsddFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-  public static WsddPackage init() {
-		if (isInited) return (WsddPackage)EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI);
-
-		// Obtain or create and register package.
-		WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new WsddPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackageImpl.init();
-		JavaRefPackageImpl.init();
-
-		// Obtain or create and register interdependencies
-		EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE);
-		ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE);
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE);
-		JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE);
-		Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-		WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE);
-		ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE);
-		JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE);
-		TaglibPackageImpl theTaglibPackage = (TaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(TaglibPackage.eNS_URI) : TaglibPackage.eINSTANCE);
-
-		// Step 1: create meta-model objects
-		theWsddPackage.createPackageContents();
-		theEjbPackage.createPackageContents();
-		theClientPackage.createPackageContents();
-		theCommonPackage.createPackageContents();
-		theJcaPackage.createPackageContents();
-		theWebservice_clientPackage.createPackageContents();
-		theWscommonPackage.createPackageContents();
-		theWebapplicationPackage.createPackageContents();
-		theApplicationPackage.createPackageContents();
-		theJspPackage.createPackageContents();
-		theTaglibPackage.createPackageContents();
-
-		// Step 2: complete initialization
-		theWsddPackage.initializePackageContents();
-		theEjbPackage.initializePackageContents();
-		theClientPackage.initializePackageContents();
-		theCommonPackage.initializePackageContents();
-		theJcaPackage.initializePackageContents();
-		theWebservice_clientPackage.initializePackageContents();
-		theWscommonPackage.initializePackageContents();
-		theWebapplicationPackage.initializePackageContents();
-		theApplicationPackage.initializePackageContents();
-		theJspPackage.initializePackageContents();
-		theTaglibPackage.initializePackageContents();
-
-		return theWsddPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWebServices() {
-		return webServicesEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServices_WebServiceDescriptions() {
-		return (EReference)webServicesEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWebServiceDescription() {
-		return webServiceDescriptionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_JaxrpcMappingFile() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_WebServiceDescriptionName() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_WsdlFile() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_SmallIcon() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_LargeIcon() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_Description() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getWebServiceDescription_DisplayName() {
-		return (EAttribute)webServiceDescriptionEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_PortComponents() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_DescriptionType() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_DisplayNameType() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getWebServiceDescription_IconType() {
-		return (EReference)webServiceDescriptionEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getPortComponent() {
-		return portComponentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_PortComponentName() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_ServiceEndpointInterface() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_SmallIcon() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_LargeIcon() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_Description() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getPortComponent_DisplayName() {
-		return (EAttribute)portComponentEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_WsdlPort() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_ServiceImplBean() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_Handlers() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_DescriptionType() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_DisplayNameType() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getPortComponent_IconType() {
-		return (EReference)portComponentEClass.getEStructuralFeatures().get(11);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getWSDLPort() {
-		return wsdlPortEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getServiceImplBean() {
-		return serviceImplBeanEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceImplBean_EEJBLink() {
-		return (EReference)serviceImplBeanEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceImplBean_EServletLink() {
-		return (EReference)serviceImplBeanEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getServiceImplBean_BeanLink() {
-		return (EReference)serviceImplBeanEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getServletLink() {
-		return servletLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getServletLink_ServletLink() {
-		return (EAttribute)servletLinkEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getEJBLink() {
-		return ejbLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getEJBLink_EjbLink() {
-		return (EAttribute)ejbLinkEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getHandler() {
-		return handlerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getHandler_HandlerName() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EAttribute getHandler_HandlerClass() {
-		return (EAttribute)handlerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getHandler_InitParams() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getHandler_SoapHeaders() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EReference getHandler_SoapRoles() {
-		return (EReference)handlerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public EClass getBeanLink() {
-		return beanLinkEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddFactory getWsddFactory() {
-		return (WsddFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		webServicesEClass = createEClass(WEB_SERVICES);
-		createEReference(webServicesEClass, WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS);
-
-		webServiceDescriptionEClass = createEClass(WEB_SERVICE_DESCRIPTION);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__WSDL_FILE);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__SMALL_ICON);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__LARGE_ICON);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DESCRIPTION);
-		createEAttribute(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DISPLAY_NAME);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE);
-		createEReference(webServiceDescriptionEClass, WEB_SERVICE_DESCRIPTION__ICON_TYPE);
-
-		portComponentEClass = createEClass(PORT_COMPONENT);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__PORT_COMPONENT_NAME);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__SMALL_ICON);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__LARGE_ICON);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__DESCRIPTION);
-		createEAttribute(portComponentEClass, PORT_COMPONENT__DISPLAY_NAME);
-		createEReference(portComponentEClass, PORT_COMPONENT__WSDL_PORT);
-		createEReference(portComponentEClass, PORT_COMPONENT__SERVICE_IMPL_BEAN);
-		createEReference(portComponentEClass, PORT_COMPONENT__HANDLERS);
-		createEReference(portComponentEClass, PORT_COMPONENT__DESCRIPTION_TYPE);
-		createEReference(portComponentEClass, PORT_COMPONENT__DISPLAY_NAME_TYPE);
-		createEReference(portComponentEClass, PORT_COMPONENT__ICON_TYPE);
-
-		wsdlPortEClass = createEClass(WSDL_PORT);
-
-		serviceImplBeanEClass = createEClass(SERVICE_IMPL_BEAN);
-		createEReference(serviceImplBeanEClass, SERVICE_IMPL_BEAN__EEJB_LINK);
-		createEReference(serviceImplBeanEClass, SERVICE_IMPL_BEAN__ESERVLET_LINK);
-		createEReference(serviceImplBeanEClass, SERVICE_IMPL_BEAN__BEAN_LINK);
-
-		servletLinkEClass = createEClass(SERVLET_LINK);
-		createEAttribute(servletLinkEClass, SERVLET_LINK__SERVLET_LINK);
-
-		ejbLinkEClass = createEClass(EJB_LINK);
-		createEAttribute(ejbLinkEClass, EJB_LINK__EJB_LINK);
-
-		handlerEClass = createEClass(HANDLER);
-		createEAttribute(handlerEClass, HANDLER__HANDLER_NAME);
-		createEAttribute(handlerEClass, HANDLER__HANDLER_CLASS);
-		createEReference(handlerEClass, HANDLER__INIT_PARAMS);
-		createEReference(handlerEClass, HANDLER__SOAP_HEADERS);
-		createEReference(handlerEClass, HANDLER__SOAP_ROLES);
-
-		beanLinkEClass = createEClass(BEAN_LINK);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-		WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI);
-
-		// Add supertypes to classes
-		webServicesEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-		wsdlPortEClass.getESuperTypes().add(theCommonPackage.getQName());
-		servletLinkEClass.getESuperTypes().add(this.getBeanLink());
-		ejbLinkEClass.getESuperTypes().add(this.getBeanLink());
-		handlerEClass.getESuperTypes().add(theCommonPackage.getCompatibilityDescriptionGroup());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(webServicesEClass, WebServices.class, "WebServices", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getWebServices_WebServiceDescriptions(), this.getWebServiceDescription(), null, "webServiceDescriptions", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(webServiceDescriptionEClass, WebServiceDescription.class, "WebServiceDescription", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getWebServiceDescription_JaxrpcMappingFile(), ecorePackage.getEString(), "jaxrpcMappingFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebServiceDescription_WebServiceDescriptionName(), ecorePackage.getEString(), "webServiceDescriptionName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebServiceDescription_WsdlFile(), ecorePackage.getEString(), "wsdlFile", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebServiceDescription_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebServiceDescription_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebServiceDescription_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getWebServiceDescription_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebServiceDescription_PortComponents(), this.getPortComponent(), null, "portComponents", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebServiceDescription_DescriptionType(), theWscommonPackage.getDescriptionType(), null, "descriptionType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebServiceDescription_DisplayNameType(), theWscommonPackage.getDisplayNameType(), null, "displayNameType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getWebServiceDescription_IconType(), theCommonPackage.getIconType(), null, "iconType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(portComponentEClass, PortComponent.class, "PortComponent", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getPortComponent_PortComponentName(), ecorePackage.getEString(), "portComponentName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getPortComponent_ServiceEndpointInterface(), ecorePackage.getEString(), "serviceEndpointInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getPortComponent_SmallIcon(), ecorePackage.getEString(), "smallIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getPortComponent_LargeIcon(), ecorePackage.getEString(), "largeIcon", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getPortComponent_Description(), ecorePackage.getEString(), "description", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getPortComponent_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getPortComponent_WsdlPort(), this.getWSDLPort(), null, "wsdlPort", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getPortComponent_ServiceImplBean(), this.getServiceImplBean(), null, "serviceImplBean", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getPortComponent_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getPortComponent_DescriptionType(), theWscommonPackage.getDescriptionType(), null, "descriptionType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getPortComponent_DisplayNameType(), theWscommonPackage.getDisplayNameType(), null, "displayNameType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getPortComponent_IconType(), theCommonPackage.getIconType(), null, "iconType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(wsdlPortEClass, WSDLPort.class, "WSDLPort", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-		initEClass(serviceImplBeanEClass, ServiceImplBean.class, "ServiceImplBean", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEReference(getServiceImplBean_EEJBLink(), this.getEJBLink(), null, "eEJBLink", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServiceImplBean_EServletLink(), this.getServletLink(), null, "eServletLink", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getServiceImplBean_BeanLink(), this.getBeanLink(), null, "beanLink", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(servletLinkEClass, ServletLink.class, "ServletLink", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getServletLink_ServletLink(), ecorePackage.getEString(), "servletLink", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(ejbLinkEClass, EJBLink.class, "EJBLink", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getEJBLink_EjbLink(), ecorePackage.getEString(), "ejbLink", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(handlerEClass, Handler.class, "Handler", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-		initEAttribute(getHandler_HandlerName(), ecorePackage.getEString(), "handlerName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEAttribute(getHandler_HandlerClass(), ecorePackage.getEString(), "handlerClass", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getHandler_InitParams(), theWscommonPackage.getInitParam(), null, "initParams", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getHandler_SoapHeaders(), theWscommonPackage.getSOAPHeader(), null, "soapHeaders", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-		initEReference(getHandler_SoapRoles(), theWscommonPackage.getSOAPRole(), null, "soapRoles", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED);//$NON-NLS-1$
-
-		initEClass(beanLinkEClass, BeanLink.class, "BeanLink", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-} //WsddPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddResourceImpl.java
deleted file mode 100644
index 3328182..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/impl/WsddResourceImpl.java
+++ /dev/null
@@ -1,181 +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.webservice.internal.wsdd.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.model.translator.webservices.WsddTranslator;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class WsddResourceImpl extends XMLResourceImpl implements WsddResource
-{
-	/**
-	 * Constructor for WsddResourceImpl.
-	 */
-	public WsddResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	/**
-	 * Constructor for WsddResourceImpl.
-	 * @param uri
-	 */
-	public WsddResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public WebServices getWebServices() {
-		return (WebServices) getRootObject();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return WsddTranslator.INSTANCE;
-	}
-
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.XMLResource#getType()
-	 */
-	public int getType() {
-		return WEB_SERVICE_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() 
-	{
-	  switch (getJ2EEVersionID()) 
-	  {
-	    case (J2EE_1_2_ID) :
-	    case (J2EE_1_3_ID) :	
-	      return WebServiceConstants.WEBSERVICE_DOCTYPE;
-	    default :
-    		return null;
-    }
-
-
-	}
-
-   public boolean isWebService1_0()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_0_ID);
-   }
-
-   public boolean isWebService1_1()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_1_ID);  
-   }
-
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-	super.setVersionID(id);
-	switch (id) {
-			case (WebServiceConstants.WEBSERVICE_1_1_ID) :
-				super.setDoctypeValues(null, null);
-				break;
-			case (WebServiceConstants.WEBSERVICE_1_0_ID) :
-				super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-				break;			
-		}
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) 
-  {
-    switch (id) {
-    	case (J2EE_1_4_ID) :
-    				primSetDoctypeValues(null, null);
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_1_ID);
-    				break;
-    	case (J2EE_1_3_ID) :
-    				primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    				break;
-    	case (J2EE_1_2_ID) :
-    				primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-	  return  WebServiceConstants.WEBSERVICE_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-	  return WebServiceConstants.WEBSERVICE_SYSTEMID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-	  return WebServiceConstants.WEBSERVICE_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-    return WebServiceConstants.WEBSERVICE_SYSTEMID;
-	}
-
-	/* Return J2EE version based on module version
-	*/
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case WebServiceConstants.WEBSERVICE_1_0_ID:
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case WebServiceConstants.WEBSERVICE_1_1_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WebServiceConstants.WEBSERVICE_1_1_ID;
-	}
-
-
-  protected void syncVersionOfRootObject()
-  {
-    //Do nothing for now since the root object does not have a version.
-  }
-
-  
-    
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddAdapterFactory.java
deleted file mode 100644
index 6b59de4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddAdapterFactory.java
+++ /dev/null
@@ -1,323 +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.webservice.internal.wsdd.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage
- * @generated
- */
-public class WsddAdapterFactory extends AdapterFactoryImpl
-{
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WsddPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = WsddPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-  public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected WsddSwitch modelSwitch =
-		new WsddSwitch() {
-			public Object caseWebServices(WebServices object) {
-				return createWebServicesAdapter();
-			}
-			public Object caseWebServiceDescription(WebServiceDescription object) {
-				return createWebServiceDescriptionAdapter();
-			}
-			public Object casePortComponent(PortComponent object) {
-				return createPortComponentAdapter();
-			}
-			public Object caseWSDLPort(WSDLPort object) {
-				return createWSDLPortAdapter();
-			}
-			public Object caseServiceImplBean(ServiceImplBean object) {
-				return createServiceImplBeanAdapter();
-			}
-			public Object caseServletLink(ServletLink object) {
-				return createServletLinkAdapter();
-			}
-			public Object caseEJBLink(EJBLink object) {
-				return createEJBLinkAdapter();
-			}
-			public Object caseHandler(Handler object) {
-				return createHandlerAdapter();
-			}
-			public Object caseBeanLink(BeanLink object) {
-				return createBeanLinkAdapter();
-			}
-			public Object caseDescriptionGroup(DescriptionGroup object) {
-				return createDescriptionGroupAdapter();
-			}
-			public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-				return createCompatibilityDescriptionGroupAdapter();
-			}
-			public Object caseQName(QName object) {
-				return createQNameAdapter();
-			}
-			public Object defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-  public Adapter createAdapter(Notifier target) {
-		return (Adapter)modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServices <em>Web Services</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServices
-	 * @generated
-	 */
-  public Adapter createWebServicesAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription <em>Web Service Description</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription
-	 * @generated
-	 */
-  public Adapter createWebServiceDescriptionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent <em>Port Component</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent
-	 * @generated
-	 */
-  public Adapter createPortComponentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WSDLPort <em>WSDL Port</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WSDLPort
-	 * @generated
-	 */
-  public Adapter createWSDLPortAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean <em>Service Impl Bean</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean
-	 * @generated
-	 */
-  public Adapter createServiceImplBeanAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink <em>Servlet Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink
-	 * @generated
-	 */
-  public Adapter createServletLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink <em>EJB Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink
-	 * @generated
-	 */
-  public Adapter createEJBLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler <em>Handler</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler
-	 * @generated
-	 */
-  public Adapter createHandlerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.BeanLink <em>Bean Link</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.BeanLink
-	 * @generated
-	 */
-  public Adapter createBeanLinkAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.DescriptionGroup
-	 * @generated
-	 */
-  public Adapter createDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.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.internal.common.CompatibilityDescriptionGroup
-	 * @generated
-	 */
-	public Adapter createCompatibilityDescriptionGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.QName <em>QName</em>}'.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.jst.j2ee.internal.common.QName
-	 * @generated
-	 */
-  public Adapter createQNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-  public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //WsddAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddSwitch.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddSwitch.java
deleted file mode 100644
index 4a6b157..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/internal/wsdd/util/WsddSwitch.java
+++ /dev/null
@@ -1,338 +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.webservice.internal.wsdd.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-
-
-/**
- * <!-- 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.internal.webservice.wsdd.WsddPackage
- * @generated
- */
-public class WsddSwitch {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected static WsddPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  public WsddSwitch() {
-		if (modelPackage == null) {
-			modelPackage = WsddPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-  public Object doSwitch(EObject theEObject) {
-		EClass theEClass = theEObject.eClass();
-		if (theEClass.eContainer() == modelPackage) {
-			switch (theEClass.getClassifierID()) {
-				case WsddPackage.WEB_SERVICES: {
-					WebServices webServices = (WebServices)theEObject;
-					Object result = caseWebServices(webServices);
-					if (result == null) result = caseCompatibilityDescriptionGroup(webServices);
-					if (result == null) result = caseDescriptionGroup(webServices);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.WEB_SERVICE_DESCRIPTION: {
-					WebServiceDescription webServiceDescription = (WebServiceDescription)theEObject;
-					Object result = caseWebServiceDescription(webServiceDescription);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.PORT_COMPONENT: {
-					PortComponent portComponent = (PortComponent)theEObject;
-					Object result = casePortComponent(portComponent);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.WSDL_PORT: {
-					WSDLPort wsdlPort = (WSDLPort)theEObject;
-					Object result = caseWSDLPort(wsdlPort);
-					if (result == null) result = caseQName(wsdlPort);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.SERVICE_IMPL_BEAN: {
-					ServiceImplBean serviceImplBean = (ServiceImplBean)theEObject;
-					Object result = caseServiceImplBean(serviceImplBean);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.SERVLET_LINK: {
-					ServletLink servletLink = (ServletLink)theEObject;
-					Object result = caseServletLink(servletLink);
-					if (result == null) result = caseBeanLink(servletLink);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.EJB_LINK: {
-					EJBLink ejbLink = (EJBLink)theEObject;
-					Object result = caseEJBLink(ejbLink);
-					if (result == null) result = caseBeanLink(ejbLink);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.HANDLER: {
-					Handler handler = (Handler)theEObject;
-					Object result = caseHandler(handler);
-					if (result == null) result = caseCompatibilityDescriptionGroup(handler);
-					if (result == null) result = caseDescriptionGroup(handler);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				case WsddPackage.BEAN_LINK: {
-					BeanLink beanLink = (BeanLink)theEObject;
-					Object result = caseBeanLink(beanLink);
-					if (result == null) result = defaultCase(theEObject);
-					return result;
-				}
-				default: return defaultCase(theEObject);
-			}
-		}
-		return defaultCase(theEObject);
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Services</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Services</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWebServices(WebServices object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Web Service Description</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Web Service Description</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWebServiceDescription(WebServiceDescription object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Port Component</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Port Component</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object casePortComponent(PortComponent object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>WSDL Port</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>WSDL Port</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseWSDLPort(WSDLPort object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Service Impl Bean</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Service Impl Bean</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseServiceImplBean(ServiceImplBean object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Servlet Link</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Servlet Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseServletLink(ServletLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EJB Link</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EJB Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseEJBLink(EJBLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Handler</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseHandler(Handler object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Bean Link</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Bean Link</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseBeanLink(BeanLink object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseDescriptionGroup(DescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Compatibility Description Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public Object caseCompatibilityDescriptionGroup(CompatibilityDescriptionGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-  public Object caseQName(QName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-  public Object defaultCase(EObject object) {
-		return null;
-	}
-
-} //WsddSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ComponentScopedRefs.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ComponentScopedRefs.java
deleted file mode 100644
index e0eb762..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ComponentScopedRefs.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Scoped Refs</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4 deprecated
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs#getComponentName <em>Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getComponentScopedRefs()
- * @model 
- * @generated
- */
-public interface ComponentScopedRefs extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Component Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Component Name</em>' attribute.
-	 * @see #setComponentName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getComponentScopedRefs_ComponentName()
-	 * @model 
-	 * @generated
-	 */
-    String getComponentName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs#getComponentName <em>Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Component Name</em>' attribute.
-	 * @see #getComponentName()
-	 * @generated
-	 */
-    void setComponentName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.webservice.wsclient.Webservice_clientPackage#getComponentScopedRefs_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef" containment="true" required="true"
-	 * @generated
-	 */
-    EList getServiceRefs();
-
-} // ComponentScopedRefs
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Handler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Handler.java
deleted file mode 100644
index 829bde1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Handler.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Declares the handler for a port-component. Handlers can access the
- *     init-param name/value pairs using the HandlerInfo interface. If
- *     port-name is not specified, the handler is assumed to be associated
- *     with all ports of the service.
- * 
- *     Used in: service-ref
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getSoapRoles <em>Soap Roles</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getPortNames <em>Port Names</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getSoapHeaders <em>Soap Headers</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getHandler()
- * @model 
- * @generated
- */
-public interface Handler extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handler Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines the name of the handler. The name must be unique within the module.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handler Name</em>' attribute.
-	 * @see #setHandlerName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getHandler_HandlerName()
-	 * @model 
-	 * @generated
-	 */
-	String getHandlerName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerName <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Name</em>' attribute.
-	 * @see #getHandlerName()
-	 * @generated
-	 */
-	void setHandlerName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.common.QName}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Soap Headers</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Headers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getHandler_SoapHeaders()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.QName" containment="true"
-	 * @generated
-	 */
-	EList getSoapHeaders();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Roles</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Soap Roles</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The soap-role element contains a SOAP actor definition that the Handler will play as a role.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Soap Roles</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getHandler_SoapRoles()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getSoapRoles();
-
-	/**
-	 * Returns the value of the '<em><b>Port Names</b></em>' attribute list.
-	 * The list contents are of type {@link java.lang.String}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port Names</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-name element defines the WSDL port-name that a handler should be associated with.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Names</em>' attribute list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getHandler_PortNames()
-	 * @model type="java.lang.String"
-	 * @generated
-	 */
-	EList getPortNames();
-
-	/**
-	 * Returns the value of the '<em><b>Handler Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handler Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Defines a fully qualified class name for the handler implementation.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handler Class</em>' reference.
-	 * @see #setHandlerClass(JavaClass)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getHandler_HandlerClass()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getHandlerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler#getHandlerClass <em>Handler Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Class</em>' reference.
-	 * @see #getHandlerClass()
-	 * @generated
-	 */
-	void setHandlerClass(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.common.ParamValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getHandler_InitParams()
-	 * @model type="org.eclipse.jst.j2ee.internal.common.ParamValue" containment="true"
-	 * @generated
-	 */
-	EList getInitParams();
-
-} // Handler
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/PortComponentRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/PortComponentRef.java
deleted file mode 100644
index 204f48c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/PortComponentRef.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Component Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The port-component-ref element declares a client dependency
- *     on the container for resolving a Service Endpoint Interface
- *     to a WSDL port. It optionally associates the Service Endpoint
- *     Interface with a particular port-component. This is only used
- *     by the container for a Service.getPort(Class) method call.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getPortComponentRef()
- * @model 
- * @generated
- */
-public interface PortComponentRef extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Port Component Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port Component Link</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-component-link element links a port-component-ref to a
-	 *         specific port-component required to be made available by a service
-	 *         reference.
-	 * 
-	 *         The value of a port-component-link must be the port-component-name
-	 *         of a port-component in the same module or another module in the same
-	 *         application unit. The syntax for specification follows the syntax
-	 *         defined for ejb-link in the EJB 2.0 specification.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Link</em>' attribute.
-	 * @see #setPortComponentLink(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getPortComponentRef_PortComponentLink()
-	 * @model 
-	 * @generated
-	 */
-	String getPortComponentLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getPortComponentLink <em>Port Component Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Component Link</em>' attribute.
-	 * @see #getPortComponentLink()
-	 * @generated
-	 */
-	void setPortComponentLink(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Endpoint Interface</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-endpoint-interface element defines a fully qualified
-	 *         Java class that represents the Service Endpoint Interface of a
-	 *         WSDL port.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint Interface</em>' reference.
-	 * @see #setServiceEndpointInterface(JavaClass)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getPortComponentRef_ServiceEndpointInterface()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getServiceEndpointInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef#getServiceEndpointInterface <em>Service Endpoint Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint Interface</em>' reference.
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 */
-	void setServiceEndpointInterface(JavaClass value);
-
-} // PortComponentRef
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ServiceRef.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ServiceRef.java
deleted file mode 100644
index a18ace5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/ServiceRef.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.QName;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The service-ref element declares a reference to a Web
- *     service. It contains optional description, display name and
- *     icons, a declaration of the required Service interface,
- *     an optional WSDL document location, an optional set
- *     of JAX-RPC mappings, an optional QName for the service element,
- *     an optional set of Service Endpoint Interfaces to be resolved
- *     by the container to a WSDL port, and an optional set of handlers.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceRefName <em>Service Ref Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getPortComponentRefs <em>Port Component Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceQname <em>Service Qname</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef()
- * @model 
- * @generated
- */
-public interface ServiceRef extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Service Ref Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Ref Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-ref-name element declares logical name that the
-	 *         components in the module use to look up the Web service. It
-	 *         is recommended that all service reference names start with
-	 *         "service/".
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Ref Name</em>' attribute.
-	 * @see #setServiceRefName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef_ServiceRefName()
-	 * @model 
-	 * @generated
-	 */
-	String getServiceRefName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceRefName <em>Service Ref Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Ref Name</em>' attribute.
-	 * @see #getServiceRefName()
-	 * @generated
-	 */
-	void setServiceRefName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Wsdl File</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  The wsdl-file element contains the URI location of a WSDL file. The
-	 *         location is relative to the root of the module.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl File</em>' attribute.
-	 * @see #setWsdlFile(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef_WsdlFile()
-	 * @model 
-	 * @generated
-	 */
-	String getWsdlFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getWsdlFile <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl File</em>' attribute.
-	 * @see #getWsdlFile()
-	 * @generated
-	 */
-	void setWsdlFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Jaxrpc Mapping File</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The jaxrpc-mapping-file element contains the name of a file that
-	 *         describes the JAX-RPC mapping between the Java interaces used by
-	 *         the application and the WSDL description in the wsdl-file.  The
-	 *         file name is a relative path within the module file.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #setJaxrpcMappingFile(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef_JaxrpcMappingFile()
-	 * @model 
-	 * @generated
-	 */
-	String getJaxrpcMappingFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 */
-	void setJaxrpcMappingFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Interface</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Interface</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-interface element declares the fully qualified class
-	 *         name of the JAX-RPC Service interface the client depends on.
-	 *         In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	 *         generated Service Interface class may also be specified.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Interface</em>' reference.
-	 * @see #setServiceInterface(JavaClass)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef_ServiceInterface()
-	 * @model required="true"
-	 * @generated
-	 */
-	JavaClass getServiceInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceInterface <em>Service Interface</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Interface</em>' reference.
-	 * @see #getServiceInterface()
-	 * @generated
-	 */
-	void setServiceInterface(JavaClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Component Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Port Component Refs</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-component-ref element declares a client dependency
-	 *         on the container for resolving a Service Endpoint Interface
-	 *         to a WSDL port. It optionally associates the Service Endpoint
-	 *         Interface with a particular port-component. This is only used
-	 *         by the container for a Service.getPort(Class) method call.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef_PortComponentRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsclient.PortComponentRef" containment="true"
-	 * @generated
-	 */
-	EList getPortComponentRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Handlers</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 *  Declares the handler for a port-component. Handlers can access the
-	 *         init-param name/value pairs using the HandlerInfo interface. If
-	 *         port-name is not specified, the handler is assumed to be associated
-	 *         with all ports of the service.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Handlers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef_Handlers()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsclient.Handler" containment="true"
-	 * @generated
-	 */
-	EList getHandlers();
-
-	/**
-	 * Returns the value of the '<em><b>Service Qname</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Service Qname</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Qname</em>' containment reference.
-	 * @see #setServiceQname(QName)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getServiceRef_ServiceQname()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	QName getServiceQname();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef#getServiceQname <em>Service Qname</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Qname</em>' containment reference.
-	 * @see #getServiceQname()
-	 * @generated
-	 */
-	void setServiceQname(QName value);
-
-} // ServiceRef
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesClient.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesClient.java
deleted file mode 100644
index fea7dda..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesClient.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Web Services Client</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * @since J2EE1.4 deprecated
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient#getComponentScopedRefs <em>Component Scoped Refs</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsclient.WebServicesClient#getServiceRefs <em>Service Refs</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getWebServicesClient()
- * @model 
- * @generated
- */
-public interface WebServicesClient extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Component Scoped Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs}.
-	 * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Component Scoped Refs</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-	 * @return the value of the '<em>Component Scoped Refs</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsclient.Webservice_clientPackage#getWebServicesClient_ComponentScopedRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsclient.ComponentScopedRefs" containment="true"
-	 * @generated
-	 */
-    EList getComponentScopedRefs();
-
-	/**
-	 * Returns the value of the '<em><b>Service Refs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.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.internal.webservice.wsclient.Webservice_clientPackage#getWebServicesClient_ServiceRefs()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsclient.ServiceRef" containment="true"
-	 * @generated
-	 */
-    EList getServiceRefs();
-
-} // WebServicesClient
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesResource.java
deleted file mode 100644
index cfe98a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/WebServicesResource.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
- *******************************************************************************/
-/*
- * Created on Aug 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.webservice.wsclient;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-public interface WebServicesResource extends XMLResource{
-	public WebServicesClient getWebServicesClient();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java
deleted file mode 100644
index 777c846..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/Webservice_clientFactory.java
+++ /dev/null
@@ -1,87 +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.webservice.wsclient;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage;
-
-/**
- * <!-- 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.internal.webservice.wsclient.Webservice_clientPackage
- * @generated
- */
-public interface Webservice_clientFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	Webservice_clientFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Service Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Ref</em>'.
-	 * @generated
-	 */
-	ServiceRef createServiceRef();
-
-	/**
-	 * Returns a new object of class '<em>Port Component Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Component Ref</em>'.
-	 * @generated
-	 */
-	PortComponentRef createPortComponentRef();
-
-	/**
-	 * Returns a new object of class '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Handler</em>'.
-	 * @generated
-	 */
-	Handler createHandler();
-
-	/**
-	 * Returns a new object of class '<em>Web Services Client</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Web Services Client</em>'.
-	 * @generated
-	 */
-    WebServicesClient createWebServicesClient();
-
-	/**
-	 * Returns a new object of class '<em>Component Scoped Refs</em>'.
-	 * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Component Scoped Refs</em>'.
-	 * @generated
-	 */
-    ComponentScopedRefs createComponentScopedRefs();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	Webservice_clientPackage getWebservice_clientPackage();
-
-} //Webservice_clientFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DescriptionType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DescriptionType.java
deleted file mode 100644
index 174bb05..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DescriptionType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.Description;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getDescriptionType()
- * @model 
- * @generated
- */
-public interface DescriptionType extends Description{
-// DescriptionType
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DisplayNameType.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DisplayNameType.java
deleted file mode 100644
index a23dabb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/DisplayNameType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.DisplayName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Display Name Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getDisplayNameType()
- * @model 
- * @generated
- */
-public interface DisplayNameType extends DisplayName{
-// DisplayNameType
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/InitParam.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/InitParam.java
deleted file mode 100644
index 12e7b86..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/InitParam.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Init Param</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamName <em>Param Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamValue <em>Param Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getDescriptionTypes <em>Description Types</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getInitParam()
- * @model 
- * @generated
- */
-public interface InitParam extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Param Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Param Name</em>' attribute.
-	 * @see #setParamName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getInitParam_ParamName()
-	 * @model 
-	 * @generated
-	 */
-  String getParamName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamName <em>Param Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Name</em>' attribute.
-	 * @see #getParamName()
-	 * @generated
-	 */
-  void setParamName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Param Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Value</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Param Value</em>' attribute.
-	 * @see #setParamValue(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getInitParam_ParamValue()
-	 * @model 
-	 * @generated
-	 */
-  String getParamValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getParamValue <em>Param Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param Value</em>' attribute.
-	 * @see #getParamValue()
-	 * @generated
-	 */
-  void setParamValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getInitParam_Description()
-	 * @model 
-	 * @generated
-	 */
-  String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-  void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description Types</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wscommon.DescriptionType}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description Types</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description Types</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getInitParam_DescriptionTypes()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wscommon.DescriptionType" containment="true"
-	 * @generated
-	 */
-  EList getDescriptionTypes();
-
-} // InitParam
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/PortName.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/PortName.java
deleted file mode 100644
index c83a92a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/PortName.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName#getPortName <em>Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getPortName()
- * @model 
- * @generated
- */
-public interface PortName extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Port Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port Name</em>' attribute.
-	 * @see #setPortName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getPortName_PortName()
-	 * @model 
-	 * @generated
-	 */
-  String getPortName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.PortName#getPortName <em>Port Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Name</em>' attribute.
-	 * @see #getPortName()
-	 * @generated
-	 */
-  void setPortName(String value);
-
-} // PortName
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPHeader.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPHeader.java
deleted file mode 100644
index 6b235bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPHeader.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>SOAP Header</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Defines the QName of a SOAP header that will be processed by the handler.
- * 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getSOAPHeader()
- * @model 
- * @generated
- */
-public interface SOAPHeader extends QName{
-// SOAPHeader
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPRole.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPRole.java
deleted file mode 100644
index 1a34918..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/SOAPRole.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wscommon;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>SOAP Role</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The soap-role element contains a SOAP actor definition that the Handler will play as a role.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole#getSoapRole <em>Soap Role</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getSOAPRole()
- * @model 
- * @generated
- */
-public interface SOAPRole extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Soap Role</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Role</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Role</em>' attribute.
-	 * @see #setSoapRole(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wscommon.WscommonPackage#getSOAPRole_SoapRole()
-	 * @model 
-	 * @generated
-	 */
-  String getSoapRole();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole#getSoapRole <em>Soap Role</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Soap Role</em>' attribute.
-	 * @see #getSoapRole()
-	 * @generated
-	 */
-  void setSoapRole(String value);
-
-} // SOAPRole
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.java
deleted file mode 100644
index 5b6608b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/WscommonFactory.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.webservice.wscommon;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-
-/**
- * <!-- 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.internal.webservice.wscommon.WscommonPackage
- * @generated
- */
-public interface WscommonFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WscommonFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Init Param</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Init Param</em>'.
-	 * @generated
-	 */
-  InitParam createInitParam();
-
-	/**
-	 * Returns a new object of class '<em>SOAP Header</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SOAP Header</em>'.
-	 * @generated
-	 */
-  SOAPHeader createSOAPHeader();
-
-	/**
-	 * Returns a new object of class '<em>SOAP Role</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SOAP Role</em>'.
-	 * @generated
-	 */
-  SOAPRole createSOAPRole();
-
-	/**
-	 * Returns a new object of class '<em>Port Name</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Name</em>'.
-	 * @generated
-	 */
-  PortName createPortName();
-
-	/**
-	 * Returns a new object of class '<em>Description Type</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Description Type</em>'.
-	 * @generated
-	 */
-  DescriptionType createDescriptionType();
-
-	/**
-	 * Returns a new object of class '<em>Display Name Type</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Display Name Type</em>'.
-	 * @generated
-	 */
-  DisplayNameType createDisplayNameType();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-  WscommonPackage getWscommonPackage();
-
-} //WscommonFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/BeanLink.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/BeanLink.java
deleted file mode 100644
index e252f5c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/BeanLink.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Link</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getBeanLink()
- * @model 
- * @generated
- */
-public interface BeanLink extends EObject{
- // BeanLink
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/EJBLink.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/EJBLink.java
deleted file mode 100644
index f17ece9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/EJBLink.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>EJB Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The ejb-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a Web Service Endpoint.
- * 
- * The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file.
- * 
- * Used in: service-impl-bean
- * 
- * Examples:
- * <ejb-link>EmployeeRecord</ejb-link>
- * 	<ejb-link>../products/product.jar#ProductEJB</ejb-link>
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink#getEjbLink <em>Ejb Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getEJBLink()
- * @model 
- * @generated
- */
-public interface EJBLink extends BeanLink{
-	/**
-	 * Returns the value of the '<em><b>Ejb Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Ejb Link</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ejb Link</em>' attribute.
-	 * @see #setEjbLink(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getEJBLink_EjbLink()
-	 * @model 
-	 * @generated
-	 */
-  String getEjbLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.EJBLink#getEjbLink <em>Ejb Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ejb Link</em>' attribute.
-	 * @see #getEjbLink()
-	 * @generated
-	 */
-  void setEjbLink(String value);
-
-} // EJBLink
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/Handler.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/Handler.java
deleted file mode 100644
index 2e943f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/Handler.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Declares the handler for a port-component. Handlers can access the init-param name/value pairs using the HandlerInfo interface.
- * 
- * Used in: port-component
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerName <em>Handler Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerClass <em>Handler Class</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getInitParams <em>Init Params</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getSoapHeaders <em>Soap Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getSoapRoles <em>Soap Roles</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getHandler()
- * @model 
- * @generated
- */
-public interface Handler extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Handler Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Handler Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handler Name</em>' attribute.
-	 * @see #setHandlerName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getHandler_HandlerName()
-	 * @model 
-	 * @generated
-	 */
-  String getHandlerName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerName <em>Handler Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Name</em>' attribute.
-	 * @see #getHandlerName()
-	 * @generated
-	 */
-  void setHandlerName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Handler Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Handler Class</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handler Class</em>' attribute.
-	 * @see #setHandlerClass(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getHandler_HandlerClass()
-	 * @model 
-	 * @generated
-	 */
-  String getHandlerClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler#getHandlerClass <em>Handler Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Handler Class</em>' attribute.
-	 * @see #getHandlerClass()
-	 * @generated
-	 */
-  void setHandlerClass(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Init Params</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Init Params</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Init Params</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getHandler_InitParams()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wscommon.InitParam" containment="true"
-	 * @generated
-	 */
-  EList getInitParams();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Headers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPHeader}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Headers</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Headers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getHandler_SoapHeaders()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPHeader" containment="true"
-	 * @generated
-	 */
-  EList getSoapHeaders();
-
-	/**
-	 * Returns the value of the '<em><b>Soap Roles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Roles</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Soap Roles</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getHandler_SoapRoles()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wscommon.SOAPRole" containment="true"
-	 * @generated
-	 */
-  EList getSoapRoles();
-
-} // Handler
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java
deleted file mode 100644
index a1f52c5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/PortComponent.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The port-component element associates a WSDL port with a Web service interface and implementation.  It defines the name of the port as a component, optional description, optional display name, optional iconic representations, WSDL port QName, Service Endpoint Interface, Service Implementation Bean.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getPortComponentName <em>Port Component Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getWsdlPort <em>Wsdl Port</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceImplBean <em>Service Impl Bean</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent()
- * @model 
- * @generated
- */
-public interface PortComponent extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Port Component Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Component Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The port-component-name element specifies a port component's name. This name is assigned by the module producer to name the service implementation bean in the module's deployment descriptor. The name must be unique among the port component names defined in the same module.
-	 * 
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Port Component Name</em>' attribute.
-	 * @see #setPortComponentName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_PortComponentName()
-	 * @model 
-	 * @generated
-	 */
-  String getPortComponentName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getPortComponentName <em>Port Component Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Port Component Name</em>' attribute.
-	 * @see #getPortComponentName()
-	 * @generated
-	 */
-  void setPortComponentName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Endpoint Interface</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Endpoint Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The service-endpoint-interface element contains the fully-qualified name of the port component's Service Endpoint Interface.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #setServiceEndpointInterface(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_ServiceEndpointInterface()
-	 * @model 
-	 * @generated
-	 */
-  String getServiceEndpointInterface();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceEndpointInterface <em>Service Endpoint Interface</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Endpoint Interface</em>' attribute.
-	 * @see #getServiceEndpointInterface()
-	 * @generated
-	 */
-  void setServiceEndpointInterface(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Small Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Small Icon</em>' attribute.
-	 * @see #setSmallIcon(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_SmallIcon()
-	 * @model 
-	 * @generated
-	 */
-  String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getSmallIcon <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' attribute.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-  void setSmallIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Large Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Large Icon</em>' attribute.
-	 * @see #setLargeIcon(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_LargeIcon()
-	 * @model 
-	 * @generated
-	 */
-  String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getLargeIcon <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' attribute.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-  void setLargeIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_Description()
-	 * @model 
-	 * @generated
-	 */
-  String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-  void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_DisplayName()
-	 * @model 
-	 * @generated
-	 */
-  String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-  void setDisplayName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl Port</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Port</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Wsdl Port</em>' containment reference.
-	 * @see #setWsdlPort(WSDLPort)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_WsdlPort()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  WSDLPort getWsdlPort();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getWsdlPort <em>Wsdl Port</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl Port</em>' containment reference.
-	 * @see #getWsdlPort()
-	 * @generated
-	 */
-  void setWsdlPort(WSDLPort value);
-
-	/**
-	 * Returns the value of the '<em><b>Service Impl Bean</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Impl Bean</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Service Impl Bean</em>' containment reference.
-	 * @see #setServiceImplBean(ServiceImplBean)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_ServiceImplBean()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-  ServiceImplBean getServiceImplBean();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getServiceImplBean <em>Service Impl Bean</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Service Impl Bean</em>' containment reference.
-	 * @see #getServiceImplBean()
-	 * @generated
-	 */
-  void setServiceImplBean(ServiceImplBean value);
-
-	/**
-	 * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Handlers</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Handlers</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_Handlers()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsdd.Handler" containment="true"
-	 * @generated
-	 */
-  EList getHandlers();
-
-	/**
-	 * Returns the value of the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description Type</em>' containment reference.
-	 * @see #setDescriptionType(DescriptionType)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_DescriptionType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DescriptionType getDescriptionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDescriptionType <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description Type</em>' containment reference.
-	 * @see #getDescriptionType()
-	 * @generated
-	 */
-  void setDescriptionType(DescriptionType value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #setDisplayNameType(DisplayNameType)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_DisplayNameType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DisplayNameType getDisplayNameType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getDisplayNameType <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #getDisplayNameType()
-	 * @generated
-	 */
-  void setDisplayNameType(DisplayNameType value);
-
-	/**
-	 * Returns the value of the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Icon Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icon Type</em>' containment reference.
-	 * @see #setIconType(IconType)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getPortComponent_IconType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  IconType getIconType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent#getIconType <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Icon Type</em>' containment reference.
-	 * @see #getIconType()
-	 * @generated
-	 */
-  void setIconType(IconType value);
-
-} // PortComponent
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServiceImplBean.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServiceImplBean.java
deleted file mode 100644
index 90e71d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServiceImplBean.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Impl Bean</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The service-impl-bean element defines the Web service implementation.A service implementation can be an EJB bean class or JAX-RPC web component. Existing EJB implementations are exposed as a Web service using an ejb-link.
- * 
- * Used in: port-component
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEEJBLink <em>EEJB Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEServletLink <em>EServlet Link</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getBeanLink <em>Bean Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getServiceImplBean()
- * @model 
- * @generated
- */
-public interface ServiceImplBean extends EObject{
-	/**
-	 * Returns the value of the '<em><b>EEJB Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EEJB Link</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>EEJB Link</em>' containment reference.
-	 * @see #setEEJBLink(EJBLink)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getServiceImplBean_EEJBLink()
-	 * @model containment="true"
-	 * @generated
-	 */
-  EJBLink getEEJBLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEEJBLink <em>EEJB Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EEJB Link</em>' containment reference.
-	 * @see #getEEJBLink()
-	 * @generated
-	 */
-  void setEEJBLink(EJBLink value);
-
-	/**
-	 * Returns the value of the '<em><b>EServlet Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EServlet Link</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>EServlet Link</em>' containment reference.
-	 * @see #setEServletLink(ServletLink)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getServiceImplBean_EServletLink()
-	 * @model containment="true"
-	 * @generated
-	 */
-  ServletLink getEServletLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getEServletLink <em>EServlet Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>EServlet Link</em>' containment reference.
-	 * @see #getEServletLink()
-	 * @generated
-	 */
-  void setEServletLink(ServletLink value);
-
-	/**
-	 * Returns the value of the '<em><b>Bean Link</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Bean Link</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bean Link</em>' containment reference.
-	 * @see #setBeanLink(BeanLink)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getServiceImplBean_BeanLink()
-	 * @model containment="true"
-	 * @generated
-	 */
-  BeanLink getBeanLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServiceImplBean#getBeanLink <em>Bean Link</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bean Link</em>' containment reference.
-	 * @see #getBeanLink()
-	 * @generated
-	 */
-  void setBeanLink(BeanLink value);
-
-} // ServiceImplBean
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServletLink.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServletLink.java
deleted file mode 100644
index ce509ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/ServletLink.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Servlet Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The servlet-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a JAX-RPC Service Endpoint.
- * 
- * The value of the servlet-link element must be the servlet-name of a JAX-RPC Service Endpoint in the same WAR file.
- * 
- * Used in: service-impl-bean
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink#getServletLink <em>Servlet Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getServletLink()
- * @model 
- * @generated
- */
-public interface ServletLink extends BeanLink{
-	/**
-	 * Returns the value of the '<em><b>Servlet Link</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Servlet Link</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Servlet Link</em>' attribute.
-	 * @see #setServletLink(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getServletLink_ServletLink()
-	 * @model 
-	 * @generated
-	 */
-  String getServletLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.ServletLink#getServletLink <em>Servlet Link</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Servlet Link</em>' attribute.
-	 * @see #getServletLink()
-	 * @generated
-	 */
-  void setServletLink(String value);
-
-} // ServletLink
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WSDLPort.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WSDLPort.java
deleted file mode 100644
index 8bc3b0c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WSDLPort.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Port</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Defines the name space and local name part of the WSDL port QName.
- * 
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWSDLPort()
- * @model 
- * @generated
- */
-public interface WSDLPort extends QName{
- // WSDLPort
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServiceDescription.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServiceDescription.java
deleted file mode 100644
index a2f3d2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServiceDescription.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Web Service Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The webservice-description element defines a WSDL document file and the set of Port components associated with the WSDL ports defined in the WSDL document.  There may be multiple webservice-descriptions defined within a module.
- * 
- * All WSDL file ports must have a corresponding port-component element defined.
- * 
- * Used in: webservices
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName <em>Web Service Description Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWsdlFile <em>Wsdl File</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayName <em>Display Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getPortComponents <em>Port Components</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescriptionType <em>Description Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayNameType <em>Display Name Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getIconType <em>Icon Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription()
- * @model 
- * @generated
- */
-public interface WebServiceDescription extends EObject{
-	/**
-	 * Returns the value of the '<em><b>Jaxrpc Mapping File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Jaxrpc Mapping File</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The jaxrpc-mapping-file element contains the name of a file that describes the JAX-RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #setJaxrpcMappingFile(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_JaxrpcMappingFile()
-	 * @model 
-	 * @generated
-	 */
-  String getJaxrpcMappingFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getJaxrpcMappingFile <em>Jaxrpc Mapping File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Jaxrpc Mapping File</em>' attribute.
-	 * @see #getJaxrpcMappingFile()
-	 * @generated
-	 */
-  void setJaxrpcMappingFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Web Service Description Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Web Service Description Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The webservice-description-name identifies the collection of port-components associated with a WSDL file and JAX-RPC mapping. The name must be unique within the deployment descriptor.
-	 * 
-	 * 
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Web Service Description Name</em>' attribute.
-	 * @see #setWebServiceDescriptionName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_WebServiceDescriptionName()
-	 * @model 
-	 * @generated
-	 */
-  String getWebServiceDescriptionName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWebServiceDescriptionName <em>Web Service Description Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Web Service Description Name</em>' attribute.
-	 * @see #getWebServiceDescriptionName()
-	 * @generated
-	 */
-  void setWebServiceDescriptionName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Wsdl File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl File</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The wsdl-file element contains the name of a WSDL file in the module. The file name is a relative path within the module.
-	 * 
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Wsdl File</em>' attribute.
-	 * @see #setWsdlFile(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_WsdlFile()
-	 * @model 
-	 * @generated
-	 */
-  String getWsdlFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getWsdlFile <em>Wsdl File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Wsdl File</em>' attribute.
-	 * @see #getWsdlFile()
-	 * @generated
-	 */
-  void setWsdlFile(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Small Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Small Icon</em>' attribute.
-	 * @see #setSmallIcon(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_SmallIcon()
-	 * @model 
-	 * @generated
-	 */
-  String getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getSmallIcon <em>Small Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' attribute.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-  void setSmallIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Large Icon</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Large Icon</em>' attribute.
-	 * @see #setLargeIcon(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_LargeIcon()
-	 * @model 
-	 * @generated
-	 */
-  String getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getLargeIcon <em>Large Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' attribute.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-  void setLargeIcon(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_Description()
-	 * @model 
-	 * @generated
-	 */
-  String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-  void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name</em>' attribute.
-	 * @see #setDisplayName(String)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_DisplayName()
-	 * @model 
-	 * @generated
-	 */
-  String getDisplayName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayName <em>Display Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name</em>' attribute.
-	 * @see #getDisplayName()
-	 * @generated
-	 */
-  void setDisplayName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Port Components</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Components</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Port Components</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_PortComponents()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsdd.PortComponent" containment="true" required="true"
-	 * @generated
-	 */
-  EList getPortComponents();
-
-	/**
-	 * Returns the value of the '<em><b>Description Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Description Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description Type</em>' containment reference.
-	 * @see #setDescriptionType(DescriptionType)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_DescriptionType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DescriptionType getDescriptionType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDescriptionType <em>Description Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description Type</em>' containment reference.
-	 * @see #getDescriptionType()
-	 * @generated
-	 */
-  void setDescriptionType(DescriptionType value);
-
-	/**
-	 * Returns the value of the '<em><b>Display Name Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Display Name Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #setDisplayNameType(DisplayNameType)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_DisplayNameType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  DisplayNameType getDisplayNameType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getDisplayNameType <em>Display Name Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Display Name Type</em>' containment reference.
-	 * @see #getDisplayNameType()
-	 * @generated
-	 */
-  void setDisplayNameType(DisplayNameType value);
-
-	/**
-	 * Returns the value of the '<em><b>Icon Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Icon Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icon Type</em>' containment reference.
-	 * @see #setIconType(IconType)
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServiceDescription_IconType()
-	 * @model containment="true"
-	 * @generated
-	 */
-  IconType getIconType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription#getIconType <em>Icon Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Icon Type</em>' containment reference.
-	 * @see #getIconType()
-	 * @generated
-	 */
-  void setIconType(IconType value);
-
-} // WebServiceDescription
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServices.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServices.java
deleted file mode 100644
index 4f3e57d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WebServices.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.wsdd;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Web Services</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The webservices element is the root element for the web services deployment descriptor.  It specifies the set of Web service descriptions that are to be deployed into the J2EE Application Server and the dependencies they have on container resources and services.
- * 
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServices#getWebServiceDescriptions <em>Web Service Descriptions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServices()
- * @model 
- * @generated
- */
-public interface WebServices extends CompatibilityDescriptionGroup {
-	/**
-	 * Returns the value of the '<em><b>Web Service Descriptions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription}.
-	 * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Web Service Descriptions</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-	 * @return the value of the '<em>Web Service Descriptions</em>' containment reference list.
-	 * @see org.eclipse.jst.j2ee.internal.webservice.wsdd.WsddPackage#getWebServices_WebServiceDescriptions()
-	 * @model type="org.eclipse.jst.j2ee.internal.webservice.wsdd.WebServiceDescription" containment="true" required="true"
-	 * @generated
-	 */
-  EList getWebServiceDescriptions();
-
-} // WebServices
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java
deleted file mode 100644
index 97f0f48..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddFactory.java
+++ /dev/null
@@ -1,123 +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.webservice.wsdd;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-
-/**
- * <!-- 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.internal.webservice.wsdd.WsddPackage
- * @generated
- */
-public interface WsddFactory extends EFactory{
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  WsddFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddFactoryImpl();
-
-	/**
-	 * Returns a new object of class '<em>Web Services</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Web Services</em>'.
-	 * @generated
-	 */
-  WebServices createWebServices();
-
-	/**
-	 * Returns a new object of class '<em>Web Service Description</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Web Service Description</em>'.
-	 * @generated
-	 */
-  WebServiceDescription createWebServiceDescription();
-
-	/**
-	 * Returns a new object of class '<em>Port Component</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Port Component</em>'.
-	 * @generated
-	 */
-  PortComponent createPortComponent();
-
-	/**
-	 * Returns a new object of class '<em>WSDL Port</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>WSDL Port</em>'.
-	 * @generated
-	 */
-  WSDLPort createWSDLPort();
-
-	/**
-	 * Returns a new object of class '<em>Service Impl Bean</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Service Impl Bean</em>'.
-	 * @generated
-	 */
-  ServiceImplBean createServiceImplBean();
-
-	/**
-	 * Returns a new object of class '<em>Servlet Link</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Servlet Link</em>'.
-	 * @generated
-	 */
-  ServletLink createServletLink();
-
-	/**
-	 * Returns a new object of class '<em>EJB Link</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>EJB Link</em>'.
-	 * @generated
-	 */
-  EJBLink createEJBLink();
-
-	/**
-	 * Returns a new object of class '<em>Handler</em>'.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Handler</em>'.
-	 * @generated
-	 */
-  Handler createHandler();
-
-	/**
-	 * Returns a new object of class '<em>Bean Link</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bean Link</em>'.
-	 * @generated
-	 */
-	BeanLink createBeanLink();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-  WsddPackage getWsddPackage();
-
-} //WsddFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.java
deleted file mode 100644
index 2d567c8..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/WsddResource.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.webservice.wsdd;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-public interface WsddResource extends XMLResource
-{
-  public static final int WEB_SERVICE_TYPE = 6;
-
-  WebServices getWebServices();
-  public boolean isWebService1_0();
-  public boolean isWebService1_1();
-  
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse.properties
deleted file mode 100644
index e59a583..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E Failed to invoke the method named: {0}
-failed_to_load_EXC_=IWAE0096E Failed to load: {0}
-method_not_found_EXC_=IWAE0097E Could not find the following method named: {0}
-failed_instantiating_EXC_=IWAE0098E Failed instantiating: {0}
-parse_exception_occured_EXC_=IWAE0099E An Exception occurred while parsing xml: Line #: {0} :Column #: {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_de.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_de.properties
deleted file mode 100644
index bb1ac13..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_de.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=Aufruf der Methode mit dem Namen {0} ist fehlgeschlagen.
-failed_to_load_EXC_=Laden von {0} ist fehlgeschlagen.
-method_not_found_EXC_=Methode mit dem Namen {0} konnte nicht gefunden werden.
-failed_instantiating_EXC_=Instantialisierung von {0} ist fehlgeschlagen
-parse_exception_occured_EXC_=Bei der Syntaxanalyse von XML ist eine Ausnahmebedingung aufgetreten: Zeile #: {0} :Spalte #: {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_es.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_es.properties
deleted file mode 100644
index 664779a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_es.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E No se ha podido invocar el m\u00e9todo denominado: {0}
-failed_to_load_EXC_=IWAE0096E No se ha podido cargar: {0}
-method_not_found_EXC_=IWAE0097E No se ha podido encontrar el siguiente m\u00e9todo denominado: {0}
-failed_instantiating_EXC_=IWAE0098E No se ha podido crear una instancia de: {0}
-parse_exception_occured_EXC_=IWAE0099E Se ha producido una excepci\u00f3n al analizar xml: N\u00ba de l\u00ednea: {0} :N\u00ba de columna: {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_fr.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_fr.properties
deleted file mode 100644
index 1a1d591..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_fr.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E Echec de l''appel de la m\u00e9thode nomm\u00e9e {0}
-failed_to_load_EXC_=IWAE0096E Echec du chargement de {0}
-method_not_found_EXC_=IWAE0097E Impossible de trouver la m\u00e9thode nomm\u00e9e {0}
-failed_instantiating_EXC_=IWAE0098E Echec de l''instanciation de {0}
-parse_exception_occured_EXC_=IWAE0099E Une exception d''E-S s''est produite lors de l''analyse du fichier xml : ligne # : {0}, Colonne # : {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_it.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_it.properties
deleted file mode 100644
index 2aec184..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_it.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E Impossibile richiamare il metodo: {0}
-failed_to_load_EXC_=IWAE0096E Impossibile caricare: {0}
-method_not_found_EXC_=IWAE0097E Impossibile trovare il seguente metodo: {0}
-failed_instantiating_EXC_=IWAE0098E Impossibile creare un''istanza: {0}
-parse_exception_occured_EXC_=IWAE0099E Eccezione durante l''analisi xml: riga: {0} : colonna: {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_ja.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_ja.properties
deleted file mode 100644
index 62d1c1f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_ja.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E {0} \u3068\u3044\u3046\u540d\u524d\u306e\u30e1\u30bd\u30c3\u30c9\u306e\u547c\u3073\u51fa\u3057\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-failed_to_load_EXC_=IWAE0096E {0} \u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-method_not_found_EXC_=IWAE0097E {0} \u3068\u3044\u3046\u540d\u524d\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
-failed_instantiating_EXC_=IWAE0098E {0} \u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f
-parse_exception_occured_EXC_=IWAE0099E xml: \u884c #: {0} :\u5217 #: {1} \u3092\u69cb\u6587\u89e3\u6790\u4e2d\u306b\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_ko.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_ko.properties
deleted file mode 100644
index 3d4976d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_ko.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E \ub2e4\uc74c \uc774\ub984\uc758 \uba54\uc18c\ub4dc\ub97c \ud638\ucd9c\ud558\uc9c0 \ubabb\ud568: {0}
-failed_to_load_EXC_=IWAE0096E \ub85c\ub4dc \uc2e4\ud328: {0}
-method_not_found_EXC_=IWAE0097E \ub2e4\uc74c \uc774\ub984\uc758 \uba54\uc18c\ub4dc\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc5c8\uc74c: {0}
-failed_instantiating_EXC_=IWAE0098E \uc778\uc2a4\ud134\uc2a4 \uc791\uc131 \uc2e4\ud328: {0}
-parse_exception_occured_EXC_=IWAE0099E xml\uc758 \uad6c\ubb38\uc744 \ubd84\uc11d\ud558\ub294 \ub3d9\uc548 \uc608\uc678 \ubc1c\uc0dd: \ud589 #: {0} :\uc5f4 #: {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_pt_BR.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_pt_BR.properties
deleted file mode 100644
index 5fa2eff..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_pt_BR.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E Falha ao chamar o m\u00e9todo denominado: {0}
-failed_to_load_EXC_=IWAE0096E Falha ao carregar: {0}
-method_not_found_EXC_=IWAE0097E N\u00e3o foi poss\u00edvel localizar o seguinte m\u00e9todo denominado: {0}
-failed_instantiating_EXC_=IWAE0098E Falha ao instanciar: {0}
-parse_exception_occured_EXC_=IWAE0099E Ocorreu uma Exce\u00e7\u00e3o ao analisar: Linha n\u00b0: {0} : Coluna n\u00b0: {1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_zh.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_zh.properties
deleted file mode 100644
index dd44a19..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_zh.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E \u65e0\u6cd5\u8c03\u7528\u540d\u4e3a {0} \u7684\u65b9\u6cd5
-failed_to_load_EXC_=IWAE0096E \u65e0\u6cd5\u88c5\u5165 {0}
-method_not_found_EXC_=IWAE0097E \u627e\u4e0d\u5230\u540d\u4e3a {0} \u7684\u4ee5\u4e0b\u65b9\u6cd5
-failed_instantiating_EXC_=IWAE0098E \u65e0\u6cd5\u5b9e\u4f8b\u5316 {0}
-parse_exception_occured_EXC_=IWAE0099E \u89e3\u6790 xml \u65f6\u53d1\u751f\u4e86\u5f02\u5e38\uff1a\u884c\u53f7\uff1a{0}\uff0c\u5217\u53f7\uff1a{1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_zh_TW.properties b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_zh_TW.properties
deleted file mode 100644
index d7ea23b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/xmlparse_zh_TW.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-method_invoke_failed_EXC_=IWAE0095E \u7121\u6cd5\u547c\u53eb\u540d\u70ba {0} \u7684\u65b9\u6cd5\uff1a
-failed_to_load_EXC_=IWAE0096E \u7121\u6cd5\u8f09\u5165\uff1a{0}
-method_not_found_EXC_=IWAE0097E \u627e\u4e0d\u5230\u4e0b\u5217\u540d\u70ba {0} \u7684\u65b9\u6cd5\uff1a
-failed_instantiating_EXC_=IWAE0098E \u5be6\u4f8b\u5316\u5931\u6557\uff1a{0}
-parse_exception_occured_EXC_=IWAE0099E \u5256\u6790 xml \u6642\u767c\u751f\u7570\u5e38\u72c0\u6cc1\uff1a\u884c\u865f\uff1a{0} \u6b04\u865f\uff1a{1}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/plugin.properties b/plugins/org.eclipse.jst.j2ee.core/plugin.properties
deleted file mode 100644
index 7741c04..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Model
-providerName=www.example.org
-EJB_VALIDATOR=EJB Validator
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/plugin.xml b/plugins/org.eclipse.jst.j2ee.core/plugin.xml
deleted file mode 100644
index 93ef93d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/plugin.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.jst.j2ee.core"
-   name="J2EE Core Component"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin">
-
-   <runtime>
-<!-- ejb jars ========================== -->
-      <library name="runtime/mofj2ee.jar">
-         <export name="*"/>
-      </library>
-      <library name="runtime/commonArchive.jar">
-         <export name="*"/>
-      </library>
-      <library name="runtime/j2ee-validation.jar">
-         <export name="*"/>
-      </library>
-<!--compatibility jars ========================== -->
-      <library name="runtime/j2eeCorePlugin.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.jem"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.wst.common.emf"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.validation"/>
-      <import plugin="org.eclipse.wst.common.modulecore"/>
-   </requires>
-
-
-   <extension-point id="ejbModelExtender" name="ejbModelExtender"/>
-
-<!--J2EEInit-->
-<!--============================-->
-<!-- J2EE Core Extension Point Registry-->
-<!--============================-->
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="common.xmi"
-            class="org.eclipse.jst.j2ee.internal.common.CommonPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="application.xmi"
-            class="org.eclipse.jst.j2ee.internal.application.ApplicationPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="client.xmi"
-            class="org.eclipse.jst.j2ee.internal.client.ClientPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="webapplication.xmi"
-            class="org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="ejb.xmi"
-            class="org.eclipse.jst.j2ee.internal.ejb.EjbPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="jca.xmi"
-            class="org.eclipse.jst.j2ee.internal.jca.JcaPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="jsp.xmi"
-            class="org.eclipse.jst.j2ee.internal.jsp.JspPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="webservice_client.xmi"
-            class="org.eclipse.jst.j2ee.webservice.internal.wsclient.Webservice_clientPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="wscommon.xmi"
-            class="org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="wsdd.xmi"
-            class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.ibm.com/websphere/appserver/schemas/5.0.2/wscommon.xmi"
-            class="org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.ibm.com/websphere/appserver/schemas/5.0.2/wsdd.xmi"
-            class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage">
-      </package>
-   </extension>
-<!--ArchiveInit-->
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="commonarchive.xmi"
-            class="org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage">
-      </package>
-   </extension>
-   <extension
-         point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="commonarchive.looseconfig.xmi"
-            class="org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage">
-      </package>
-   </extension>
-<!-- ====================================================== -->
-<!-- a place holder for the future.                         -->
-<!-- Several that have not changed are still registered as  -->
-<!-- Register package mappings                              -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.wst.common.emf.packageURIMap">
-      <map
-            uri="common.xmi"
-            prefix="common">
-      </map>
-      <map
-            uri="application.xmi"
-            prefix="application">
-      </map>
-      <map
-            uri="client.xmi"
-            prefix="client">
-      </map>
-      <map
-            uri="webapplication.xmi"
-            prefix="webapplication">
-      </map>
-      <map
-            uri="ejb.xmi"
-            prefix="ejb">
-      </map>
-      <map
-            uri="jca.xmi"
-            prefix="jca">
-      </map>
-      <map
-            uri="taglib.xmi"
-            prefix="taglib">
-      </map>
-      <map
-            uri="jsp.xmi"
-            prefix="jsp">
-      </map>
-      <map
-            uri="commonarchive.xmi"
-            prefix="commonarchive">
-      </map>
-      <map
-            uri="commonarchive.looseconfig.xmi"
-            prefix="commonarchive.looseconfig">
-      </map>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.core/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.core/prepareforpii.xml
deleted file mode 100644
index 0328959..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/prepareforpii.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-		
-	<!-- Setup temp variables -->
-	<target name="init">
-		<property name="nlsDir" value="d:/NLS/Corona/0526"/>
-		<property name="plugin" value="com.ibm.etools.j2ee.core"/>
-		<property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
-		<property name="outputDir" value="${nlsDir}/${plugin}"/>
-	</target>
-
-	<!-- Create the destination dir -->
-	<target name="nlsDir" depends="init">
-		<mkdir dir="${nlsDir}"/>
-	</target>
-	
-	<!-- Create the destination dir -->
-	<target name="plugindir" depends="nlsDir">
-		<delete dir="${outputDir}"/>
-		<mkdir dir="${outputDir}"/>
-	</target>
-
-	<!-- Move the files to the correct locations in the workspace. -->
-	<target name="main" depends="plugindir">
-	
-		<messageIdGen folderPath = "${plugindir}" componentId = "E" />
-		
-		<copy todir = "${outputDir}/mofj2ee" >
-			 <fileset dir="${plugindir}/mofj2ee">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		<copy todir = "${outputDir}/commonArchive" >
-			 <fileset dir="${plugindir}/commonArchive">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		<copy todir = "${outputDir}/j2ee-validation" >
-			 <fileset dir="${plugindir}/j2ee-validation">
-           	  <include name="**/*.properties"/>
-  			 </fileset>
-  		</copy>
-  		
-  		<copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-  		
-	</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/application.cat b/plugins/org.eclipse.jst.j2ee.core/rose/application.cat
deleted file mode 100644
index bf7431f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/application.cat
+++ /dev/null
@@ -1,956 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "application"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"IDL"

-	    name       	"uuid"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Application")))

-    quid       	"38C03008014E"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38FF3C1002A8"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "Application"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C030A803B1"

-	    documentation 	

-|The applicationType defines the structure of the

-|application.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AE930094"

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

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "version"

-		    quid       	"3E53F85800F7"

-		    documentation 	

-|@since J2EE1.4 

-|The required value for the version is 1.4.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "Module"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C0322C0006"

-	    documentation 	

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

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "uri"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C032B202DA"

-		    documentation 	

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

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "altDD"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C032E00204"

-		    documentation 	

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

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WebModule"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"3904860D027B"

-	    documentation 	

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

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"390486AE01C9"

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

-		    quidu      	"38C0322C0006"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "contextRoot"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"390486140358"

-		    documentation 	

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

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "JavaClientModule"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"390486730015"

-	    documentation 	

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

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"390486B201F6"

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

-		    quidu      	"38C0322C0006")))

-	(object Class "EjbModule"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"390486830253"

-	    documentation 	

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

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"390486B60379"

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

-		    quidu      	"38C0322C0006")))

-	(object Class "ConnectorModule"

-	    quid       	"39895BC00227"

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

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39895BCA0218"

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

-		    quidu      	"38C0322C0006")))

-	(object Association "$UNNAMED$0"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38C033F800B2"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C033F9017C"

-		    documentation 	"@deprecated"

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

-		    quidu      	"38C030A803B1"

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

-		    is_aggregate 	TRUE)

-		(object Role "securityRoles"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C033F9017D"

-		    documentation 	

-|Contains the definitions of security roles which are

-|global to the application. 

-		    

-		    label      	"securityRoles"

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

-		    quidu      	"38C031FE012D"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38C0340003C1"

-	    roles      	(list role_list

-		(object Role "application"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C0340102E6"

-		    label      	"application"

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

-		    quidu      	"38C030A803B1"

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

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "modules"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C0340102E7"

-		    documentation 	

-|The application deployment descriptor must have one

-|        module element for each J2EE module in the

-|        application package. A module element is defined

-|        by moduleType definition.

-		    

-		    label      	"modules"

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

-		    quidu      	"38C0322C0006"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Application Diagram"

-	    quid       	"38C0325900BF"

-	    title      	"Application Diagram"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(330, 1608)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(142, 1505)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	376

-			justify    	0

-			label      	"WebModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3904860D027B"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(142, 1566)

-			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  	413)

-		    width      	394

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(678, 1577)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(578, 1501)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	200

-			justify    	0

-			label      	"JavaClientModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390486730015"

-		    width      	218

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(922, 1575)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(841, 1499)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"EjbModule")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390486830253"

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1150, 1575)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(1049, 1499)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	202

-			justify    	0

-			label      	"ConnectorModule")

-		    icon_style 	"Icon"

-		    line_color 	16384

-		    fill_color 	13434833

-		    quidu      	"39895BC00227"

-		    width      	220

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @5

-		    location   	(2100, 1097)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1562, 635)

-			fill_color 	13434879

-			nlines     	18

-			max_width  	1040

-			label      	

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

-|

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

-|

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

-|

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

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1100

-		    height     	937)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(987, 136)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(809, 57)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(300, 1101)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(122, 947)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	356

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"38C031FE012D"

-		    compartment 	(object Compartment

-			Parent_View 	@7

-			location   	(122, 1062)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	391)

-		    width      	374

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(367, 439)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(114, 233)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	506

-			justify    	0

-			label      	"Application")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C030A803B1"

-		    compartment 	(object Compartment

-			Parent_View 	@8

-			location   	(114, 294)

-			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  	328)

-		    width      	524

-		    height     	436

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(356, 795)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C033F800B2"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@9

-			    location   	(4, -309)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @11

-				Parent_View 	@10

-				location   	(214, 694)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	231

-				justify    	0

-				label      	""

-				pctDist    	0.735426

-				height     	143

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C033F9017C"

-			    client     	@9

-			    supplier   	@8

-			    vertices   	(list Points

-				(356, 795)

-				(356, 657))

-			    line_style 	3

-			    origin_attachment 	(356, 795)

-			    terminal_attachment 	(356, 657)

-			    label      	(object SegLabel @12

-				Parent_View 	@10

-				location   	(423, 692)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.748879

-				height     	67

-				orientation 	1))

-			(object RoleView "securityRoles" @13

-			    Parent_View 	@9

-			    location   	(4, -309)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @14

-				Parent_View 	@13

-				location   	(212, 900)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	283

-				justify    	0

-				label      	"+securityRoles"

-				pctDist    	0.753623

-				height     	145

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C033F9017D"

-			    client     	@9

-			    supplier   	@7

-			    vertices   	(list Points

-				(356, 795)

-				(356, 934))

-			    line_style 	3

-			    origin_attachment 	(356, 795)

-			    terminal_attachment 	(356, 934)

-			    label      	(object SegLabel @15

-				Parent_View 	@13

-				location   	(412, 903)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.775362

-				height     	56

-				orientation 	0))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(833, 1072)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@16

-			location   	(702, 970)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	262

-			justify    	0

-			label      	"Module")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0322C0006"

-		    compartment 	(object Compartment

-			Parent_View 	@16

-			location   	(702, 1031)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	294)

-		    width      	280

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(878, 661)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0340003C1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "application" @18

-			    Parent_View 	@17

-			    location   	(-658, -491)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @19

-				Parent_View 	@18

-				location   	(758, 558)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	231

-				justify    	0

-				label      	"+application"

-				pctDist    	0.584615

-				height     	44

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C0340102E6"

-			    client     	@17

-			    supplier   	@8

-			    vertices   	(list Points

-				(878, 661)

-				(878, 601)

-				(629, 601))

-			    line_style 	3

-			    origin_attachment 	(878, 661)

-			    terminal_attachment 	(629, 601)

-			    label      	(object SegLabel @20

-				Parent_View 	@18

-				location   	(723, 643)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.695385

-				height     	42

-				orientation 	0))

-			(object RoleView "modules" @21

-			    Parent_View 	@17

-			    location   	(-658, -491)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @22

-				Parent_View 	@21

-				location   	(753, 914)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	180

-				justify    	0

-				label      	"+modules"

-				pctDist    	0.851449

-				height     	126

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C0340102E7"

-			    client     	@17

-			    supplier   	@16

-			    vertices   	(list Points

-				(878, 661)

-				(878, 958))

-			    line_style 	3

-			    origin_attachment 	(878, 661)

-			    terminal_attachment 	(878, 958)

-			    label      	(object SegLabel @23

-				Parent_View 	@21

-				location   	(948, 916)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.862319

-				height     	70

-				orientation 	0))))

-		(object InheritTreeView "" @24

-		    location   	(833, 1325)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@16

-		    vertices   	(list Points

-			(833, 1325)

-			(833, 1186)))

-		(object InheritView "" @25

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486B60379"

-		    client     	@3

-		    supplier   	@16

-		    vertices   	(list Points

-			(922, 1487)

-			(922, 1325))

-		    line_style 	3

-		    origin_attachment 	(922, 1487)

-		    terminal_attachment 	(922, 1325)

-		    drawSupplier 	@24)

-		(object InheritView "" @26

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486AE01C9"

-		    client     	@1

-		    supplier   	@16

-		    vertices   	(list Points

-			(419, 1492)

-			(419, 1325))

-		    line_style 	3

-		    origin_attachment 	(419, 1492)

-		    terminal_attachment 	(419, 1325)

-		    drawSupplier 	@24)

-		(object InheritView "" @27

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390486B201F6"

-		    client     	@2

-		    supplier   	@16

-		    vertices   	(list Points

-			(678, 1489)

-			(678, 1325))

-		    line_style 	3

-		    origin_attachment 	(678, 1489)

-		    terminal_attachment 	(678, 1325)

-		    drawSupplier 	@24)

-		(object InheritView "" @28

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39895BCA0218"

-		    client     	@4

-		    supplier   	@16

-		    vertices   	(list Points

-			(1141, 1487)

-			(1141, 1306)

-			(894, 1306)

-			(894, 1186))

-		    line_style 	3

-		    origin_attachment 	(1141, 1487)

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

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/application.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/application.ecore
deleted file mode 100644
index 777bec0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/application.ecore
+++ /dev/null
@@ -1,70 +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="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="@since 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">

-    <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/rose/client.cat b/plugins/org.eclipse.jst.j2ee.core/rose/client.cat
deleted file mode 100644
index ce7c7db..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/client.cat
+++ /dev/null
@@ -1,1579 +0,0 @@
-

-(object Petal

-    version    	47

-    _written   	"Rose 8.0.0303.1400"

-    charSet    	0)

-

-(object Class_Category "client"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"IDL"

-	    name       	"uuid"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Client")))

-    quid       	"38C0280700C0"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38FF3C180336"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "ApplicationClient"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38C028AB009E"

-	    documentation 	

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

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AEFC0009"

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

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "version"

-		    quid       	"3E559EEA0241"

-		    documentation 	

-|@since J2EE1.4

-|The required value for the version is 1.4.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ResAuthApplicationType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38C0A0C201A5"

-	    documentation 	

-|Application=0

-|Container=1

-	    

-	    stereotype 	"enumeration"

-	    language   	"Java")

-	(object Association "$UNNAMED$0"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38C02A5B0211"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C02A5D0002"

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

-		    quidu      	"38C028AB009E"

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

-		    is_aggregate 	TRUE)

-		(object Role "resourceRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C02A5D000C"

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

-		    label      	"resourceRefs"

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

-		    quidu      	"371BC79303C6"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38C02B4501D5"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$3"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C02B46021C"

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

-		    quidu      	"38C028AB009E"

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

-		    is_aggregate 	TRUE)

-		(object Role "environmentProps"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C02B460226"

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

-		    label      	"environmentProps"

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

-		    quidu      	"371BC77800E2"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38C02B4B0011"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$5"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C02B4C0044"

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

-		    quidu      	"38C028AB009E"

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

-		    is_aggregate 	TRUE)

-		(object Role "ejbReferences"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38C02B4C0045"

-		    documentation 	

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

-|bean's home. 

-		    

-		    label      	"ejbReferences"

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

-		    quidu      	"371BC78202B3"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"39895E8E00FD"

-	    roles      	(list role_list

-		(object Role "resourceEnvRefs"

-		    quid       	"39895E8F033A"

-		    documentation 	

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

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

-|

-|Used in: application-client

-|

-|Example:

-|

-|<resource-env-ref>

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

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

-|</resource-env-ref>

-|

-		    

-		    label      	"resourceEnvRefs"

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

-		    quidu      	"39BF207200D3"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"39895E8F034E"

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

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"39895F3D029A"

-	    roles      	(list role_list

-		(object Role "callbackHandler"

-		    quid       	"39895F3E01F1"

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

-		    label      	"callbackHandler"

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

-		    quidu      	"36549FCC00FA"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"39895F3E0223"

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

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E53F4AC005F"

-	    roles      	(list role_list

-		(object Role "serviceRefs"

-		    quid       	"3E53F4AC02F4"

-		    documentation 	"@since J2EE1.4"

-		    label      	"serviceRefs"

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

-		    quidu      	"3E4D2F560184"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E53F4AC0308"

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

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E53F50701D2"

-	    roles      	(list role_list

-		(object Role "messageDestinationRefs"

-		    quid       	"3E53F50800B1"

-		    documentation 	

-|@since J2EE1.4

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

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

-|    the message destination reference name used in the

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

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

-|    within an application client.

-		    

-		    label      	"messageDestinationRefs"

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

-		    quidu      	"3E4C1F52028C"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E53F50800BB"

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

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E53F5DB0372"

-	    roles      	(list role_list

-		(object Role "messageDestinations"

-		    quid       	"3E53F5DD003F"

-		    documentation 	"@since J2EE1.4"

-		    label      	"messageDestinations"

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

-		    quidu      	"3E4C211001CF"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E53F5DD0053"

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

-		    quidu      	"38C028AB009E"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Client Diagram"

-	    quid       	"38C028C600ED"

-	    title      	"Client Diagram"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(453, 729)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(275, 650)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2096, 2064)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1619, 1810)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	954

-			justify    	0

-			label      	"ResourceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"371BC79303C6"

-		    width      	972

-		    height     	532

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1024, 2016)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(778, 1812)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	492

-			justify    	0

-			label      	"EnvEntry")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"371BC77800E2"

-		    width      	510

-		    height     	432

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1456, 2064)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(1224, 1810)

-			fill_color 	16777215

-			nlines     	2

-			max_width  	464

-			justify    	0

-			label      	"EjbRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"371BC78202B3"

-		    width      	482

-		    height     	532

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2288, 640)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1951, 486)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	674

-			justify    	0

-			label      	"ResourceEnvRef")

-		    icon_style 	"Icon"

-		    line_color 	16384

-		    fill_color 	12632256

-		    quidu      	"39BF207200D3"

-		    width      	692

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(782, 218)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(689, 139)

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(432, 2016)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(336, 1941)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	192

-			justify    	0

-			label      	"ServiceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777088

-		    quidu      	"3E4D2F560184"

-		    compartment 	(object Compartment

-			Parent_View 	@7

-			location   	(336, 2108)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	0)

-		    width      	210

-		    height     	174

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1072, 640)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(637, 464)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	870

-			justify    	0

-			label      	"MessageDestinationRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4C1F52028C"

-		    width      	888

-		    height     	376

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1568, 496)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@9

-			location   	(1329, 392)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	478

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4C211001CF"

-		    width      	496

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(384, 1264)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@10

-			location   	(131, 1058)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	506

-			justify    	0

-			label      	"ApplicationClient")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C028AB009E"

-		    compartment 	(object Compartment

-			Parent_View 	@10

-			location   	(131, 1119)

-			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  	0)

-		    width      	524

-		    height     	436

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1564, 1330)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C02A5B0211"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@11

-			    location   	(1308, 274)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @13

-				Parent_View 	@12

-				location   	(831, 1289)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02A5D0002"

-			    client     	@11

-			    supplier   	@10

-			    line_style 	3

-			    origin_attachment 	(1564, 1330)

-			    terminal_attachment 	(646, 1330)

-			    label      	(object SegLabel @14

-				Parent_View 	@12

-				location   	(784, 1304)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.850107

-				height     	27

-				orientation 	1))

-			(object RoleView "resourceRefs" @15

-			    Parent_View 	@11

-			    location   	(1308, 274)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @16

-				Parent_View 	@15

-				location   	(2155, 1638)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	264

-				justify    	0

-				label      	"+resourceRefs"

-				pctDist    	0.826607

-				height     	142

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02A5D000C"

-			    client     	@11

-			    supplier   	@2

-			    vertices   	(list Points

-				(1564, 1330)

-				(2013, 1330)

-				(2013, 1798))

-			    line_style 	3

-			    origin_attachment 	(1564, 1330)

-			    terminal_attachment 	(2013, 1798)

-			    label      	(object SegLabel @17

-				Parent_View 	@15

-				location   	(2067, 1706)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

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

-		    location   	(993, 1454)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C02B4501D5"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@18

-			    location   	(113, 414)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @20

-				Parent_View 	@19

-				location   	(715, 1413)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B46021C"

-			    client     	@18

-			    supplier   	@10

-			    line_style 	3

-			    origin_attachment 	(993, 1454)

-			    terminal_attachment 	(646, 1454)

-			    label      	(object SegLabel @21

-				Parent_View 	@19

-				location   	(735, 1390)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.746108

-				height     	65

-				orientation 	1))

-			(object RoleView "environmentProps" @22

-			    Parent_View 	@18

-			    location   	(113, 414)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @23

-				Parent_View 	@22

-				location   	(1242, 1524)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	348

-				justify    	0

-				label      	"+environmentProps"

-				pctDist    	0.320896

-				height     	189

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B460226"

-			    client     	@18

-			    supplier   	@3

-			    vertices   	(list Points

-				(993, 1454)

-				(1053, 1454)

-				(1053, 1800))

-			    line_style 	3

-			    origin_attachment 	(993, 1454)

-			    terminal_attachment 	(1053, 1800)

-			    label      	(object SegLabel @24

-				Parent_View 	@22

-				location   	(1131, 1712)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.786025

-				height     	78

-				orientation 	0))))

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

-		    location   	(1233, 1415)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C02B4B0011"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@25

-			    location   	(-351, 327)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @27

-				Parent_View 	@26

-				location   	(764, 1374)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B4C0044"

-			    client     	@25

-			    supplier   	@10

-			    line_style 	3

-			    origin_attachment 	(1233, 1415)

-			    terminal_attachment 	(646, 1415)

-			    label      	(object SegLabel @28

-				Parent_View 	@26

-				location   	(706, 1362)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "ejbReferences" @29

-			    Parent_View 	@25

-			    location   	(-351, 327)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @30

-				Parent_View 	@29

-				location   	(1619, 1586)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	288

-				justify    	0

-				label      	"+ejbReferences"

-				pctDist    	0.638132

-				height     	182

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C02B4C0045"

-			    client     	@25

-			    supplier   	@4

-			    vertices   	(list Points

-				(1233, 1415)

-				(1437, 1415)

-				(1437, 1798))

-			    line_style 	3

-			    origin_attachment 	(1233, 1415)

-			    terminal_attachment 	(1437, 1798)

-			    label      	(object SegLabel @31

-				Parent_View 	@29

-				location   	(1534, 1718)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.864668

-				height     	97

-				orientation 	0))))

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

-		    location   	(1549, 1268)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39895E8E00FD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resourceEnvRefs" @33

-			    Parent_View 	@32

-			    location   	(1165, 1012)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @34

-				Parent_View 	@33

-				location   	(2169, 997)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	338

-				justify    	0

-				label      	"+resourceEnvRefs"

-				pctDist    	0.789588

-				height     	179

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895E8F033A"

-			    client     	@32

-			    supplier   	@5

-			    vertices   	(list Points

-				(1549, 1268)

-				(1990, 1268)

-				(1990, 806))

-			    line_style 	3

-			    origin_attachment 	(1549, 1268)

-			    terminal_attachment 	(1990, 806)

-			    label      	(object SegLabel @35

-				Parent_View 	@33

-				location   	(2038, 916)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.879377

-				height     	48

-				orientation 	1))

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

-			    Parent_View 	@32

-			    location   	(1165, 1012)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895E8F034E"

-			    client     	@32

-			    supplier   	@10

-			    line_style 	3

-			    origin_attachment 	(1549, 1268)

-			    terminal_attachment 	(646, 1268))))

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

-		    location   	(781, 760)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39895F3D029A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "callbackHandler" @38

-			    Parent_View 	@37

-			    location   	(397, 504)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @39

-				Parent_View 	@38

-				location   	(984, 355)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	315

-				justify    	0

-				label      	"+callbackHandler"

-				pctDist    	0.899209

-				height     	203

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895F3E01F1"

-			    client     	@37

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(781, 760)

-			    terminal_attachment 	(781, 309)

-			    label      	(object SegLabel @40

-				Parent_View 	@38

-				location   	(718, 353)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.905138

-				height     	64

-				orientation 	0))

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

-			    Parent_View 	@37

-			    location   	(397, 504)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39895F3E0223"

-			    client     	@37

-			    supplier   	@10

-			    vertices   	(list Points

-				(781, 760)

-				(781, 1076)

-				(646, 1076))

-			    line_style 	3

-			    origin_attachment 	(781, 760)

-			    terminal_attachment 	(646, 1076))))

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

-		    location   	(329, 1705)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53F4AC005F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceRefs" @43

-			    Parent_View 	@42

-			    location   	(-171, 1027)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @44

-				Parent_View 	@43

-				location   	(196, 1848)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	240

-				justify    	0

-				label      	"+serviceRefs"

-				pctDist    	0.639344

-				height     	134

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F4AC02F4"

-			    client     	@42

-			    supplier   	@7

-			    line_style 	3

-			    origin_attachment 	(329, 1705)

-			    terminal_attachment 	(329, 1928)

-			    label      	(object SegLabel @45

-				Parent_View 	@43

-				location   	(403, 1853)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.663934

-				height     	74

-				orientation 	0))

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

-			    Parent_View 	@42

-			    location   	(-171, 1027)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F4AC0308"

-			    client     	@42

-			    supplier   	@10

-			    line_style 	3

-			    origin_attachment 	(329, 1705)

-			    terminal_attachment 	(329, 1482))))

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

-		    location   	(896, 1080)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53F50701D2"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinationRefs" @48

-			    Parent_View 	@47

-			    location   	(396, 402)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @49

-				Parent_View 	@48

-				location   	(1146, 876)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	474

-				justify    	0

-				label      	"+messageDestinationRefs"

-				pctDist    	0.808765

-				height     	250

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F50800B1"

-			    client     	@47

-			    supplier   	@8

-			    line_style 	3

-			    origin_attachment 	(896, 1080)

-			    terminal_attachment 	(896, 827)

-			    label      	(object SegLabel @50

-				Parent_View 	@48

-				location   	(832, 876)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.808765

-				height     	65

-				orientation 	0))

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

-			    Parent_View 	@47

-			    location   	(396, 402)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F50800BB"

-			    client     	@47

-			    supplier   	@10

-			    vertices   	(list Points

-				(896, 1080)

-				(896, 1140)

-				(646, 1140))

-			    line_style 	3

-			    origin_attachment 	(896, 1080)

-			    terminal_attachment 	(646, 1140))))

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

-		    location   	(1401, 1202)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53F5DB0372"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinations" @53

-			    Parent_View 	@52

-			    location   	(1023, -60)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @54

-				Parent_View 	@53

-				location   	(1767, 690)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	424

-				justify    	0

-				label      	"+messageDestinations"

-				pctDist    	0.897567

-				height     	201

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F5DD003F"

-			    client     	@52

-			    supplier   	@9

-			    vertices   	(list Points

-				(1401, 1202)

-				(1566, 1202)

-				(1566, 612))

-			    line_style 	3

-			    origin_attachment 	(1401, 1202)

-			    terminal_attachment 	(1566, 612)

-			    label      	(object SegLabel @55

-				Parent_View 	@53

-				location   	(1483, 674)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.918987

-				height     	84

-				orientation 	0))

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

-			    Parent_View 	@52

-			    location   	(1023, -60)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53F5DD0053"

-			    client     	@52

-			    supplier   	@10

-			    line_style 	3

-			    origin_attachment 	(1401, 1202)

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

-	(object ClassDiagram "resAuth Relation"

-	    quid       	"38C0A0B10060"

-	    title      	"resAuth Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(275, 734)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@57

-			location   	(31, 708)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	488

-			justify    	0

-			label      	"ResAuthApplicationType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@57

-			location   	(31, 658)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	488

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A0C201A5"

-		    width      	506

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(272, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@58

-			location   	(94, 93)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"ResAuthTypeBase")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@58

-			location   	(94, 43)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	353

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C09ED400B4"

-		    width      	374

-		    height     	418

-		    annotation 	8

-		    autoResize 	TRUE)))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/client.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/client.ecore
deleted file mode 100644
index 4f5e454..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/client.ecore
+++ /dev/null
@@ -1,71 +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="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="@since 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 webservice_client.ecore#//ServiceRef" containment="true">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="documentation" value="@since 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="@since 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="@since 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/rose/common.cat b/plugins/org.eclipse.jst.j2ee.core/rose/common.cat
deleted file mode 100644
index 42aa495..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/common.cat
+++ /dev/null
@@ -1,6797 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "common"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Common")))

-    quid       	"38C08F0F038D"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    quid       	"39B7E48C0067"

-	    supplier   	"Logical View::ejb"

-	    quidu      	"3780E272032D")

-	(object Visibility_Relationship

-	    quid       	"39AB2BF100FA"

-	    supplier   	"Logical View::application"

-	    quidu      	"38C03008014E"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "EjbRef"

-	    quid       	"371BC78202B3"

-	    documentation 	

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

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

-|declaration consists of:

-|

-|    - an optional description

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

-|      the Deployment Component that's referencing the enterprise

-|      bean

-|    - the expected type of the referenced enterprise bean

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

-|      enterprise bean

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

-|      referenced enterprise bean

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"371BD4000185"

-		    documentation 	

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

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"371BD413018C"

-		    documentation 	

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

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

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

-		    

-		    type       	"EjbRefType"

-		    quidu      	"38C126FB0081"

-		    exportControl 	"Public")

-		(object ClassAttribute "home"

-		    quid       	"371BD425032D"

-		    documentation 	

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

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "remote"

-		    quid       	"371BD42E0073"

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

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"371BD45B028A"

-		    documentation 	

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

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38BDD87602E5"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "EnvEntry"

-	    quid       	"371BC77800E2"

-	    documentation 	

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

-|environment entry. The declaration consists of an optional

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

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

-|supplied during deployment.

-|

-|It is used by env-entry elements.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"371BD3710392"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"371BD3780111"

-		    documentation 	

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

-|        Deployment Component's environment entry.  The name

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

-|        context.  The name must be unique within a

-|        Deployment Component. The uniqueness

-|        constraints must be defined within the declared

-|        context.

-|

-|        Example:

-|

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"371BD38003A8"

-		    documentation 	

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

-|        Deployment Component's environment entry. The value

-|        must be a String that is valid for the

-|        constructor of the specified type that takes a

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

-|        a single character.

-|

-|        Example:

-|

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38BDD8340091"

-		    documentation 	

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

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

-		    

-		    type       	"EnvEntryType"

-		    quidu      	"38BDD7A60315"

-		    exportControl 	"Public")))

-	(object Class "ResourceRef"

-	    quid       	"371BC79303C6"

-	    documentation 	

-|The resource-refType contains a declaration of a

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

-|consists of an optional description, the resource manager

-|connection factory reference name, the indication of the

-|resource manager connection factory type expected by the

-|Deployment Component code, the type of authentication

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

-|the shareability of connections obtained from the resource

-|(Shareable or Unshareable).

-|

-|Example:

-|

-|<resource-ref>

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

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

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

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

-|</resource-ref>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"371BD5580338"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"371BD55F0310"

-		    documentation 	

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

-|        resource manager connection factory reference.

-|        The name is a JNDI name relative to the

-|        java:comp/env context.

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    quid       	"371BD575024A"

-		    documentation 	

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

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

-|        Java language class or interface

-|        expected to be implemented by the data source.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "auth"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38BDD8D900AC"

-		    documentation 	

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

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

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

-		    

-		    type       	"ResAuthTypeBase"

-		    quidu      	"38C09ED400B4"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"39A9C7430008"

-		    documentation 	"@since J2EE1.4 deprecated"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "resSharingScope"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF27FC03DB"

-		    documentation 	

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

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

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

-|two following:  Shareable, Unshareable

-|

-|The default value is Shareable.

-|

-		    

-		    type       	"ResSharingScopeType"

-		    quidu      	"39BF288C00A3"

-		    exportControl 	"Public")))

-	(object Class "EnvEntryType"

-	    quid       	"38BDD7A60315"

-	    documentation 	

-|@since J2EE1.3 added Character

-|String=0

-|Integer=1

-|Boolean=2

-|Double=3

-|Byte=4

-|Short=5

-|Long=6

-|Float=7

-|Character=8

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "String"

-		    quid       	"39A9C7D800CB"

-		    exportControl 	"Public")

-		(object ClassAttribute "Integer"

-		    quid       	"39A9C7DB009D"

-		    exportControl 	"Public")

-		(object ClassAttribute "Boolean"

-		    quid       	"39A9C7E200ED"

-		    exportControl 	"Public")

-		(object ClassAttribute "Double"

-		    quid       	"39A9C7E401C3"

-		    exportControl 	"Public")

-		(object ClassAttribute "Byte"

-		    quid       	"39A9C7E600E9"

-		    exportControl 	"Public")

-		(object ClassAttribute "Short"

-		    quid       	"39A9C7EF02FF"

-		    exportControl 	"Public")

-		(object ClassAttribute "Long"

-		    quid       	"39A9C7F103D4"

-		    exportControl 	"Public")

-		(object ClassAttribute "Float"

-		    quid       	"39A9C7F302F1"

-		    exportControl 	"Public")

-		(object ClassAttribute "Character"

-		    quid       	"39886ADD03A8"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SecurityRoleRef"

-	    quid       	"371BC7A0025C"

-	    documentation 	

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

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

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

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

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

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

-|appropriate security role.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"371BD4BC0135"

-		    documentation 	

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

-|        as the parameter to the

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

-|        HttpServletRequest.isUserInRole(String role) method.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38BDD89D01C8"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"38BDD8AC0134"

-		    documentation 	

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

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

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

-|        security-role elements.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ResAuthTypeBase"

-	    quid       	"38C09ED400B4"

-	    documentation 	

-|CONTAINER=0

-|Container=1

-|Application=2

-|SERVLET=3

-|

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Container"

-		    quid       	"3EA6D8F301E7"

-		    exportControl 	"Public")

-		(object ClassAttribute "Application"

-		    quid       	"3EA6D9000178"

-		    exportControl 	"Public")

-		(object ClassAttribute "SERVLET"

-		    quid       	"3EAFED8B0138"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "EjbRefType"

-	    quid       	"38C126FB0081"

-	    documentation 	

-|Session=0

-|Entity=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Session"

-		    quid       	"39A9C7C601D3"

-		    exportControl 	"Public")

-		(object ClassAttribute "Entity"

-		    quid       	"39A9C7CD0242"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SecurityRole"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C031FE012D"

-	    documentation 	

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

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

-|security role, and the security role name.

-|

-|Example:

-|

-|    <security-role>

-|    <description>

-|        This role includes all employees who are authorized

-|        to access the employee service application.

-|    </description>

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

-|    </security-role>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"38C032690159"

-		    documentation 	"@deprecated See descriptions"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roleName"

-		    quid       	"38C0327D014D"

-		    documentation 	

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

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ResourceEnvRef"

-	    quid       	"39BF207200D3"

-	    documentation 	

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

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

-|Deployment Component's reference to an administered object

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

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

-|resource environment reference name, and an indication of

-|the resource environment reference type expected by the

-|Deployment Component code.

-|

-|Example:

-|

-|<resource-env-ref>

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

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

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

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

-|</resource-env-ref>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF21C20177"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"39BF21CD03C1"

-		    documentation 	

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

-|        of a resource environment reference; its value is

-|        the environment entry name used in

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

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

-|        be unique within a Deployment Component.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ResSharingScopeType"

-	    quid       	"39BF288C00A3"

-	    documentation 	

-|Shareable=0

-|Unshareable=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Shareable"

-		    quid       	"39BF28AE00A2"

-		    exportControl 	"Public")

-		(object ClassAttribute "Unshareable"

-		    quid       	"39BF28B0027C"

-		    exportControl 	"Public")))

-	(object Class "EJBLocalRef"

-	    quid       	"398862E20101"

-	    documentation 	

-|@since J2EE1.3

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

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

-|home. The declaration consists of:

-|

-|    - an optional description

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

-|      Component that's referencing the enterprise bean

-|    - the expected type of the referenced enterprise bean

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

-|      referenced enterprise bean

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

-|      referenced enterprise bean

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E91E66A0374"

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

-		    quidu      	"371BC78202B3"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "localHome"

-		    quid       	"3E4BE9E1035D"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "local"

-		    quid       	"3E4BE9EC00B9"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "RunAsSpecifiedIdentity"

-	    quid       	"39BF2C9E02C8"

-	    documentation 	

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

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39BF2D0F0130"

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

-		    quidu      	"39BF2C040245")))

-	(object Class "Identity"

-	    quid       	"39BF2DA40058"

-	    documentation 	

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

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF2DDC00B3"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roleName"

-		    quid       	"39BF2DEB00F1"

-		    documentation 	

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

-|

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "IconType"

-	    quid       	"3E4A99EE003A"

-	    documentation 	

-|@since J2EE1.4

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

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

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

-|GUI tool.

-|

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

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

-|by default.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "smallIcon"

-		    quid       	"3E4A9A16027C"

-		    documentation 	

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

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

-|        name is a relative path within the Deployment

-|        Component's Deployment File.

-|

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

-|        The icon can be used by tools.

-|

-|        Example:

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"3E4A9A1D00E1"

-		    documentation 	

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

-|        containing a large

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

-|        path within the Deployment Component's Deployment

-|        File.

-|

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

-|        The icon can be used by tools.

-|

-|        Example:

-|

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

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "lang"

-		    quid       	"3E4A9AC101C4"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DisplayName"

-	    quid       	"3E4A9922000E"

-	    documentation 	

-|@since J2EE1.4

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

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

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

-|

-|Example:

-|

-|...

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

-|

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

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "lang"

-		    quid       	"3E4A993C0106"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3E4A99510341"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDestinationRef"

-	    quid       	"3E4C1F52028C"

-	    documentation 	

-|@since J2EE1.4

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

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

-|associated with a resource in Deployment Component's

-|environment. It consists of:

-|

-|        - an optional description

-|        - the message destination reference name

-|        - the message destination type

-|        - a specification as to whether the

-|          destination is used for

-|          consuming or producing messages, or both

-|        - a link to the message destination

-|

-|Examples:

-|

-|<message-destination-ref>

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

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

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

-|        </message-destination-type>

-|        <message-destination-usage>Consumes

-|        </message-destination-usage>

-|        <message-destination-link>CorporateStocks

-|        </message-destination-link>

-|</message-destination-ref>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4C1F7C01D8"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    quid       	"3E4C1F910002"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "usage"

-		    quid       	"3E4C1F9E02AA"

-		    type       	"MessageDestinationUsageType"

-		    quidu      	"3EAED1C200A8"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"3E4C1FBF00EE"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDestination"

-	    quid       	"3E4C211001CF"

-	    documentation 	

-|@since J2EE1.4

-|The message-destinationType specifies a message

-|destination. The logical destination described by this

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

-|

-|The message destination element contains:

-|

-|        - an optional description

-|        - an optional display-name

-|        - an optional icon

-|        - a message destination name which must be unique

-|          among message destination names within the same

-|          Deployment File.

-|

-|Example:

-|

-|<message-destination>

-|        <message-destination-name>CorporateStocks

-|        </message-destination-name>

-|</message-destination>

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E9D5FC6011C"

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

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4D2CFC03CD"

-		    documentation 	

-|The message-destination-name element specifies a

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

-|        unique among the names of message destinations

-|        within the Deployment File.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ParamValue"

-	    quid       	"3E4C221202C1"

-	    documentation 	

-|@since J2EE1.4

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

-|parameter/value lists.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4C22430217"

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

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3E4D426D03C6"

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

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3F7868BE0236"

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

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DescriptionGroup"

-	    quid       	"3E4D451F01FB"

-	    documentation 	

-|@since J2EE1.4

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

-|elements consistent across J2EE deployment descriptors.

-	    )

-	(object Class "JNDIEnvRefsGroup"

-	    quid       	"3E4D53950349"

-	    documentation 	

-|@since J2EE1.4

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

-|reference elements consistent across J2EE deployment descriptors.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B1F8006C"

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

-		    quidu      	"4023ADF20197"))

-	    abstract   	TRUE)

-	(object Class "SecurityIdentity"

-	    quid       	"39BF2C040245"

-	    documentation 	

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

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

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"398871C20279"

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

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "UseCallerIdentity"

-	    quid       	"39BF2C9002F0"

-	    documentation 	

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

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39BF2D0A007F"

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

-		    quidu      	"39BF2C040245")))

-	(object Class "Description"

-	    quid       	"3E4A98D602E0"

-	    documentation 	

-|@since J2EE1.4

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

-|provide text describing the parent element.  The elements

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

-|Deployment Component's Deployment File file producer wants

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

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

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

-|the description when processing the parent element that

-|contains the description.

-|

-|The lang attribute defines the language that the

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

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "lang"

-		    quid       	"3E4A98E001AE"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3E4A98E900DF"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDestinationUsageType"

-	    quid       	"3EAED1C200A8"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Consumes"

-		    quid       	"3EAED1DD016F"

-		    exportControl 	"Public")

-		(object ClassAttribute "Produces"

-		    quid       	"3EAED1F40190"

-		    exportControl 	"Public")

-		(object ClassAttribute "ConsumesProduces"

-		    quid       	"3EAED1F90332"

-		    exportControl 	"Public")))

-	(object Class "QName"

-	    quid       	"3F3BEF5D02C0"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "namespaceURI"

-		    quid       	"3F3BEF7000DD"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "localPart"

-		    quid       	"3F3BEFDE0230"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "combinedQName"

-		    quid       	"3F4391D100FA"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "internalPrefixOrNsURI"

-		    quid       	"3F437DD203B6"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "Listener"

-	    quid       	"39BFB26001BD"

-	    documentation 	

-|@since J2EE1.4 moved from webapp

-|

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

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4058AE790141"

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

-		    quidu      	"4023ADF20197")))

-	(object Class "CompatibilityDescriptionGroup"

-	    quid       	"4023ADF20197"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AE8701D8"

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

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "smallIcon"

-		    quid       	"4023AE130145"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"4023AE1D009F"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"4023AE25029F"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "displayName"

-		    quid       	"4023AE3001C9"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"3904632A005C"

-	    roles      	(list role_list

-		(object Role "/linkedSecurityRole"

-		    quid       	"3904632B016C"

-		    label      	"/linkedSecurityRole"

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

-		    quidu      	"38C031FE012D"

-		    keys       	(list class_attribute_list

-			(object ClassAttribute "name"

-			    quid       	"3989605401D3"

-			    type       	"String"))

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

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3904632B01BC"

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

-		    quidu      	"371BC7A0025C")))

-	(object Association "$UNNAMED$2"

-	    quid       	"398ED2980285"

-	    roles      	(list role_list

-		(object Role "/linkedEJB"

-		    quid       	"398ED29A00B1"

-		    label      	"/linkedEJB"

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

-		    quidu      	"3780E71A010A"

-		    keys       	(list class_attribute_list

-			(object ClassAttribute "name"

-			    quid       	"3989606A0116"

-			    type       	"String"))

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

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"398ED29A0151"

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

-		    quidu      	"371BC78202B3")))

-	(object Association "$UNNAMED$4"

-	    quid       	"399784A702BA"

-	    documentation 	

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

-|        of a resource environment reference.  It is the

-|        fully qualified name of a Java language class or

-|        interface.

-	    

-	    roles      	(list role_list

-		(object Role "type"

-		    quid       	"399784A802A7"

-		    documentation 	

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

-|        of a resource environment reference.  It is the

-|        fully qualified name of a Java language class or

-|        interface.

-		    

-		    label      	"type"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"399784A802D0"

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

-		    quidu      	"39BF207200D3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"39BF2DB5023D"

-	    roles      	(list role_list

-		(object Role "identity"

-		    quid       	"39BF2DB601D1"

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

-		    label      	"identity"

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

-		    quidu      	"39BF2DA40058"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"39BF2DB601D2"

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

-		    quidu      	"39BF2C9E02C8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"3E4D43320152"

-	    roles      	(list role_list

-		(object Role "icons"

-		    quid       	"3E4D43350016"

-		    label      	"icons"

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

-		    quidu      	"3E4A99EE003A"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"3E4D4335002A"

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

-		    quidu      	"3E4D451F01FB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E4D43540133"

-	    roles      	(list role_list

-		(object Role "displayNames"

-		    quid       	"3E4D43550152"

-		    label      	"displayNames"

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

-		    quidu      	"3E4A9922000E"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E4D43550166"

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

-		    quidu      	"3E4D451F01FB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E4D434D0255"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D434E012A"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E4D434E0152"

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

-		    quidu      	"3E4D451F01FB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E4C23ED00C5"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C23EE0153"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E4C23EE0167"

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

-		    quidu      	"371BC79303C6"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3E4C0B37005A"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C0B380084"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3E4C0B38008E"

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

-		    quidu      	"371BC77800E2"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"3E53ED900289"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E53ED9101EA"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"3E53ED910262"

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

-		    quidu      	"371BC7A0025C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E4D26DC03E6"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D26DE02DB"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E4D26DE0303"

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

-		    quidu      	"38C031FE012D"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3E4C23800295"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C2382011B"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3E4C2382012F"

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

-		    quidu      	"39BF207200D3"

-		    is_aggregate 	TRUE)))

-	(object Association "descriptions"

-	    quid       	"3E4C0978022E"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C09790230"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$24"

-		    quid       	"3E4C0979023A"

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

-		    quidu      	"371BC78202B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$25"

-	    quid       	"3E4C20210031"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C202101CC"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$26"

-		    quid       	"3E4C202101E0"

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

-		    quidu      	"3E4C1F52028C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$27"

-	    quid       	"3E5679FE0087"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E5679FE0344"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$28"

-		    quid       	"3E5679FE0362"

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

-		    quidu      	"39BF2C040245"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$29"

-	    quid       	"3E4C22270090"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4C222703C5"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$30"

-		    quid       	"3E4C222703D9"

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

-		    quidu      	"3E4C221202C1"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$31"

-	    quid       	"3E95CA660065"

-	    documentation 	"@since J2EE1.4"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E95CA66032C"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$32"

-		    quid       	"3E95CA66035E"

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

-		    quidu      	"39BF2DA40058"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Refs to Resources"

-	    quid       	"39044F8402E5"

-	    title      	"Refs to Resources"

-	    documentation 	"@since J2EE1.4 deprecated"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	2720

-	    items      	(list diagram_item_list

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2545, 441)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(2382, 357)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"EjbRefType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@1

-			location   	(2382, 307)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	323

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C126FB0081"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(2382, 418)

-			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  	206)

-		    width      	344

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @2

-		    location   	(2432, 2147)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1703, 1894)

-			fill_color 	13434879

-			nlines     	10

-			max_width  	1422

-			label      	

-|@since J2EE1.3 

-|ADDED resSharingScope:ResSharingScopeType

-|

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

-|     Shareable

-|     Unshareable

-|    

-|The default value is Shareable.

-			)

-		    line_color 	4227072

-		    fill_color 	13434833

-		    width      	1482

-		    height     	519)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(472, 2252)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(249, 2168)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	446

-			justify    	0

-			label      	"ResSharingScopeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@3

-			location   	(249, 2118)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	446

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF288C00A3"

-		    compartment 	(object Compartment

-			Parent_View 	@3

-			location   	(249, 2229)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	284)

-		    width      	464

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @4

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@2

-		    supplier   	@3

-		    vertices   	(list Points

-			(1690, 2261)

-			(704, 2261))

-		    line_style 	3

-		    origin_attachment 	(1690, 2261)

-		    terminal_attachment 	(704, 2261))

-		(object NoteView @5

-		    location   	(1963, 1691)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1400, 1597)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	1090

-			label      	

-|Deprecated:

-|description becomes descriptions:List<DescriptionType>

-|link becomes ??

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1150

-		    height     	200)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1599, 1451)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(1518, 1375)

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C031FE012D"

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2624, 1424)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(2446, 1299)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC7A0025C"

-		    compartment 	(object Compartment

-			Parent_View 	@7

-			location   	(2446, 1360)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	374

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2063, 1454)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3904632A005C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/linkedSecurityRole" @9

-			    Parent_View 	@8

-			    location   	(1151, 174)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @10

-				Parent_View 	@9

-				location   	(1912, 1496)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	372

-				justify    	0

-				label      	"+/linkedSecurityRole"

-				pctDist    	0.404624

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B016C"

-			    client     	@8

-			    supplier   	@6

-			    vertices   	(list Points

-				(2063, 1454)

-				(1689, 1454))

-			    line_style 	3

-			    origin_attachment 	(2063, 1454)

-			    terminal_attachment 	(1689, 1454)

-			    label      	(object SegLabel @11

-				Parent_View 	@9

-				location   	(1739, 1402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.867052

-				height     	53

-				orientation 	1))

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

-			    Parent_View 	@8

-			    location   	(1151, 174)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @13

-				Parent_View 	@12

-				location   	(2361, 1413)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	307

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B01BC"

-			    client     	@8

-			    supplier   	@7

-			    vertices   	(list Points

-				(2063, 1454)

-				(2437, 1454))

-			    line_style 	3

-			    origin_attachment 	(2063, 1454)

-			    terminal_attachment 	(2437, 1454)

-			    label      	(object SegLabel @14

-				Parent_View 	@12

-				location   	(2295, 1454)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    ShowOperationSignature 	TRUE

-		    location   	(288, 736)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(109, 609)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	358

-			justify    	0

-			label      	"EJBLocalRef")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398862E20101"

-		    compartment 	(object Compartment

-			Parent_View 	@15

-			location   	(109, 670)

-			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  	385)

-		    width      	376

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1328, 2656)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@16

-			location   	(1214, 2602)

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	246

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(416, 2608)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@17

-			location   	(151, 2481)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	530

-			justify    	0

-			label      	"ResourceEnvRef")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF207200D3"

-		    compartment 	(object Compartment

-			Parent_View 	@17

-			location   	(151, 2542)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	548

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(947, 2681)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399784A702BA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "type" @19

-			    Parent_View 	@18

-			    location   	(595, 777)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @20

-				Parent_View 	@19

-				location   	(1126, 2737)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	108

-				justify    	0

-				label      	"+type"

-				pctDist    	0.696335

-				height     	56

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399784A802A7"

-			    client     	@18

-			    supplier   	@16

-			    vertices   	(list Points

-				(947, 2681)

-				(1205, 2681))

-			    line_style 	3

-			    origin_attachment 	(947, 2681)

-			    terminal_attachment 	(1205, 2681)

-			    label      	(object SegLabel @21

-				Parent_View 	@19

-				location   	(1149, 2628)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.783691

-				height     	54

-				orientation 	0))

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

-			    Parent_View 	@18

-			    location   	(595, 777)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399784A802D0"

-			    client     	@18

-			    supplier   	@17

-			    vertices   	(list Points

-				(947, 2681)

-				(690, 2681))

-			    line_style 	3

-			    origin_attachment 	(947, 2681)

-			    terminal_attachment 	(690, 2681))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1472, 2416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@23

-			location   	(1344, 2314)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@23

-			location   	(1344, 2375)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1012, 2518)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C23800295"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@24

-			    location   	(-571, 1996)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @26

-				Parent_View 	@25

-				location   	(755, 2477)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C2382012F"

-			    client     	@24

-			    supplier   	@17

-			    vertices   	(list Points

-				(1012, 2518)

-				(690, 2518))

-			    line_style 	3

-			    origin_attachment 	(1012, 2518)

-			    terminal_attachment 	(690, 2518))

-			(object RoleView "descriptions" @27

-			    Parent_View 	@24

-			    location   	(-571, 1996)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @28

-				Parent_View 	@27

-				location   	(1062, 2484)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.158416

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C2382011B"

-			    client     	@24

-			    supplier   	@23

-			    vertices   	(list Points

-				(1012, 2518)

-				(1335, 2518))

-			    line_style 	3

-			    origin_attachment 	(1012, 2518)

-			    terminal_attachment 	(1335, 2518)

-			    label      	(object SegLabel @29

-				Parent_View 	@27

-				location   	(1275, 2486)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.818482

-				height     	33

-				orientation 	0))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(496, 1728)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@30

-			location   	(101, 1507)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	790

-			justify    	0

-			label      	"ResourceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC79303C6"

-		    compartment 	(object Compartment

-			Parent_View 	@30

-			location   	(101, 1568)

-			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  	810)

-		    width      	808

-		    height     	466

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @31

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@2

-		    supplier   	@30

-		    vertices   	(list Points

-			(1690, 1897)

-			(900, 1897))

-		    line_style 	3

-		    origin_attachment 	(1690, 1897)

-		    terminal_attachment 	(900, 1897))

-		(object AttachView "" @32

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@30

-		    supplier   	@5

-		    vertices   	(list Points

-			(900, 1716)

-			(1387, 1704))

-		    line_style 	0)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1600, 512)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@33

-			location   	(1472, 410)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@33

-			location   	(1472, 471)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(815, 735)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C23ED00C5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @35

-			    Parent_View 	@34

-			    location   	(307, -1087)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @36

-				Parent_View 	@35

-				location   	(1221, 582)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.681347

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C23EE0153"

-			    client     	@34

-			    supplier   	@33

-			    vertices   	(list Points

-				(815, 735)

-				(815, 622)

-				(1463, 622))

-			    line_style 	3

-			    origin_attachment 	(815, 735)

-			    terminal_attachment 	(1463, 622)

-			    label      	(object SegLabel @37

-				Parent_View 	@35

-				location   	(1392, 584)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.908031

-				height     	39

-				orientation 	0))

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

-			    Parent_View 	@34

-			    location   	(307, -1087)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C23EE0167"

-			    client     	@34

-			    supplier   	@30

-			    vertices   	(list Points

-				(815, 735)

-				(815, 1495))

-			    line_style 	3

-			    origin_attachment 	(815, 735)

-			    terminal_attachment 	(815, 1495))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1648, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@39

-			location   	(1554, 88)

-			nlines     	2

-			max_width  	188

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3780E71A010A"

-		    width      	206

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(288, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@40

-			location   	(110, 76)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"EjbRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC78202B3"

-		    compartment 	(object Compartment

-			Parent_View 	@40

-			location   	(110, 137)

-			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  	391)

-		    width      	374

-		    height     	416

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "descriptions" @41

-		    location   	(969, 400)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C0978022E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @42

-			    Parent_View 	@41

-			    location   	(681, 144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @43

-				Parent_View 	@42

-				location   	(1270, 365)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.608602

-				height     	36

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C09790230"

-			    client     	@41

-			    supplier   	@33

-			    vertices   	(list Points

-				(969, 400)

-				(1463, 400))

-			    line_style 	3

-			    origin_attachment 	(969, 400)

-			    terminal_attachment 	(1463, 400)

-			    label      	(object SegLabel @44

-				Parent_View 	@42

-				location   	(1475, 361)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	1.025806

-				height     	40

-				orientation 	0))

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

-			    Parent_View 	@41

-			    location   	(681, 144)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C0979023A"

-			    client     	@41

-			    supplier   	@40

-			    vertices   	(list Points

-				(969, 400)

-				(475, 400))

-			    line_style 	3

-			    origin_attachment 	(969, 400)

-			    terminal_attachment 	(475, 400))))

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

-		    location   	(1010, 141)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398ED2980285"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/linkedEJB" @47

-			    Parent_View 	@46

-			    location   	(738, -211)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @48

-				Parent_View 	@47

-				location   	(1336, 102)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+/linkedEJB"

-				pctDist    	0.611276

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398ED29A00B1"

-			    client     	@46

-			    supplier   	@39

-			    vertices   	(list Points

-				(1010, 141)

-				(1545, 141))

-			    line_style 	3

-			    origin_attachment 	(1010, 141)

-			    terminal_attachment 	(1545, 141)

-			    label      	(object SegLabel @49

-				Parent_View 	@47

-				location   	(1450, 164)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.824607

-				height     	23

-				orientation 	1))

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

-			    Parent_View 	@46

-			    location   	(738, -211)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398ED29A0151"

-			    client     	@46

-			    supplier   	@40

-			    vertices   	(list Points

-				(1010, 141)

-				(475, 141))

-			    line_style 	3

-			    origin_attachment 	(1010, 141)

-			    terminal_attachment 	(475, 141)

-			    label      	(object SegLabel @51

-				Parent_View 	@50

-				location   	(616, 141)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))))

-		(object InheritView "" @52

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E91E66A0374"

-		    client     	@15

-		    supplier   	@40

-		    vertices   	(list Points

-			(288, 596)

-			(288, 480))

-		    line_style 	0)))

-	(object ClassDiagram "Security"

-	    quid       	"3B7951F8018D"

-	    title      	"Security"

-	    documentation 	

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

-|        Deployment Component's environment entry.  The name

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

-|        context.  The name must be unique within a

-|        Deployment Component. The uniqueness

-|        constraints must be defined within the declared

-|        context.

-|

-|        Example:

-|

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

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1837

-	    items      	(list diagram_item_list

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(512, 2118)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@53

-			location   	(411, 2041)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	202

-			justify    	0

-			label      	"UseCallerIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C9002F0"

-		    width      	220

-		    height     	178

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(416, 1232)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@54

-			location   	(165, 1028)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	502

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    compartment 	(object Compartment

-			Parent_View 	@54

-			location   	(165, 1143)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	303)

-		    width      	520

-		    height     	432

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1664, 1504)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@55

-			location   	(1281, 1275)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	766

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    compartment 	(object Compartment

-			Parent_View 	@55

-			location   	(1281, 1390)

-			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  	659)

-		    width      	784

-		    height     	482

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(864, 1664)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@56

-			location   	(686, 1586)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C040245"

-		    compartment 	(object Compartment

-			Parent_View 	@56

-			location   	(686, 1647)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	391)

-		    width      	374

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @57

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF2D0A007F"

-		    client     	@53

-		    supplier   	@56

-		    vertices   	(list Points

-			(580, 2028)

-			(792, 1754))

-		    line_style 	0)

-		(object AssociationViewNew "" @58

-		    location   	(705, 1510)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39BF2C1F018F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @59

-			    Parent_View 	@58

-			    location   	(-159, -26)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @60

-				Parent_View 	@59

-				location   	(625, 1490)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200264"

-			    client     	@58

-			    supplier   	@54

-			    vertices   	(list Points

-				(705, 1510)

-				(640, 1448))

-			    line_style 	0)

-			(object RoleView "securityIdentity" @61

-			    Parent_View 	@58

-			    location   	(-159, -26)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @62

-				Parent_View 	@61

-				location   	(566, 1576)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	299

-				justify    	0

-				label      	"+securityIdentity"

-				pctDist    	-0.603746

-				height     	145

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200263"

-			    client     	@58

-			    supplier   	@56

-			    vertices   	(list Points

-				(705, 1510)

-				(770, 1573))

-			    line_style 	0

-			    label      	(object SegLabel @63

-				Parent_View 	@61

-				location   	(814, 1515)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.889576

-				height     	73

-				orientation 	0))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 336)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@64

-			location   	(158, 211)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC7A0025C"

-		    compartment 	(object Compartment

-			Parent_View 	@64

-			location   	(158, 272)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	374

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1584, 304)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@65

-			location   	(1406, 202)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C031FE012D"

-		    compartment 	(object Compartment

-			Parent_View 	@65

-			location   	(1406, 263)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	391)

-		    width      	374

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(960, 281)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3904632A005C"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@66

-			    location   	(-381, -107)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @68

-				Parent_View 	@67

-				location   	(705, 204)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	307

-				justify    	0

-				label      	""

-				pctDist    	0.585052

-				height     	78

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B01BC"

-			    client     	@66

-			    supplier   	@64

-			    vertices   	(list Points

-				(960, 281)

-				(523, 281))

-			    line_style 	3

-			    origin_attachment 	(960, 281)

-			    terminal_attachment 	(523, 281)

-			    label      	(object SegLabel @69

-				Parent_View 	@67

-				location   	(664, 281)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))

-			(object RoleView "/linkedSecurityRole" @70

-			    Parent_View 	@66

-			    location   	(-381, -107)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @71

-				Parent_View 	@70

-				location   	(1172, 238)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	372

-				justify    	0

-				label      	"+/linkedSecurityRole"

-				pctDist    	0.487113

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B016C"

-			    client     	@66

-			    supplier   	@65

-			    vertices   	(list Points

-				(960, 281)

-				(1397, 281))

-			    line_style 	3

-			    origin_attachment 	(960, 281)

-			    terminal_attachment 	(1397, 281)

-			    label      	(object SegLabel @72

-				Parent_View 	@70

-				location   	(1351, 342)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.896907

-				height     	61

-				orientation 	1))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1120, 2128)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@73

-			location   	(894, 2078)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	452

-			justify    	0

-			label      	"RunAsSpecifiedIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C9E02C8"

-		    width      	470

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @74

-		    location   	(1313, 1905)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39982A2E0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @75

-			    Parent_View 	@74

-			    location   	(216, -168)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @76

-				Parent_View 	@75

-				location   	(1393, 1750)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F018E"

-			    client     	@74

-			    supplier   	@55

-			    vertices   	(list Points

-				(1313, 1905)

-				(1452, 1745))

-			    line_style 	0)

-			(object RoleView "runAs" @77

-			    Parent_View 	@74

-			    location   	(216, -168)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @78

-				Parent_View 	@77

-				location   	(1172, 1983)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+runAs"

-				pctDist    	0.717360

-				height     	57

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F0184"

-			    client     	@74

-			    supplier   	@73

-			    vertices   	(list Points

-				(1313, 1905)

-				(1174, 2065))

-			    line_style 	0

-			    label      	(object SegLabel @79

-				Parent_View 	@77

-				location   	(1296, 2013)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.437963

-				height     	58

-				orientation 	0))))

-		(object InheritView "" @80

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF2D0F0130"

-		    client     	@73

-		    supplier   	@56

-		    vertices   	(list Points

-			(1085, 2065)

-			(914, 1754))

-		    line_style 	0)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1120, 880)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@81

-			location   	(992, 778)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@81

-			location   	(992, 839)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(987, 1283)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5679FE0087"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @83

-			    Parent_View 	@82

-			    location   	(120, -384)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @84

-				Parent_View 	@83

-				location   	(1181, 1107)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.750403

-				height     	130

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5679FE0344"

-			    client     	@82

-			    supplier   	@81

-			    vertices   	(list Points

-				(987, 1283)

-				(1082, 994))

-			    line_style 	0

-			    label      	(object SegLabel @85

-				Parent_View 	@83

-				location   	(1007, 1044)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.773758

-				height     	57

-				orientation 	0))

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

-			    Parent_View 	@82

-			    location   	(120, -384)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5679FE0362"

-			    client     	@82

-			    supplier   	@56

-			    vertices   	(list Points

-				(987, 1283)

-				(893, 1573))

-			    line_style 	0)))

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

-		    location   	(482, 869)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E53ED900289"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @88

-			    Parent_View 	@87

-			    location   	(76, 513)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @89

-				Parent_View 	@88

-				location   	(814, 835)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.662088

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53ED9101EA"

-			    client     	@87

-			    supplier   	@81

-			    vertices   	(list Points

-				(482, 869)

-				(983, 869))

-			    line_style 	3

-			    origin_attachment 	(482, 869)

-			    terminal_attachment 	(983, 869)

-			    label      	(object SegLabel @90

-				Parent_View 	@88

-				location   	(919, 920)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.872845

-				height     	51

-				orientation 	1))

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

-			    Parent_View 	@87

-			    location   	(76, 513)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E53ED910262"

-			    client     	@87

-			    supplier   	@64

-			    vertices   	(list Points

-				(482, 869)

-				(378, 869)

-				(378, 473))

-			    line_style 	3

-			    origin_attachment 	(482, 869)

-			    terminal_attachment 	(378, 473))))

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

-		    location   	(1634, 751)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4D26DC03E6"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@92

-			    location   	(1364, -89)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(1593, 485)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26DE0303"

-			    client     	@92

-			    supplier   	@65

-			    vertices   	(list Points

-				(1634, 751)

-				(1634, 418))

-			    line_style 	3

-			    origin_attachment 	(1634, 751)

-			    terminal_attachment 	(1634, 418))

-			(object RoleView "descriptions" @95

-			    Parent_View 	@92

-			    location   	(1364, -89)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @96

-				Parent_View 	@95

-				location   	(1443, 776)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.575000

-				height     	36

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26DE02DB"

-			    client     	@92

-			    supplier   	@81

-			    vertices   	(list Points

-				(1634, 751)

-				(1634, 811)

-				(1257, 811))

-			    line_style 	3

-			    origin_attachment 	(1634, 751)

-			    terminal_attachment 	(1257, 811)

-			    label      	(object SegLabel @97

-				Parent_View 	@95

-				location   	(1344, 849)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.801075

-				height     	38

-				orientation 	0))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2032, 2112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@98

-			location   	(1767, 2010)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	530

-			justify    	0

-			label      	"Identity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BF2DA40058"

-		    compartment 	(object Compartment

-			Parent_View 	@98

-			location   	(1767, 2071)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	548

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1556, 2119)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39BF2DB5023D"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@99

-			    location   	(-282, 91)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @101

-				Parent_View 	@100

-				location   	(1395, 2081)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2DB601D2"

-			    client     	@99

-			    supplier   	@73

-			    vertices   	(list Points

-				(1556, 2119)

-				(1355, 2123))

-			    line_style 	0)

-			(object RoleView "identity" @102

-			    Parent_View 	@99

-			    location   	(-282, 91)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @103

-				Parent_View 	@102

-				location   	(1653, 2076)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	172

-				justify    	0

-				label      	"+identity"

-				pctDist    	0.483528

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2DB601D1"

-			    client     	@99

-			    supplier   	@98

-			    vertices   	(list Points

-				(1556, 2119)

-				(1757, 2116))

-			    line_style 	0

-			    label      	(object SegLabel @104

-				Parent_View 	@102

-				location   	(1699, 2159)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.710327

-				height     	42

-				orientation 	1))))

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

-		    location   	(2122, 1057)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E95CA660065"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @106

-			    Parent_View 	@105

-			    location   	(88, -1056)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @107

-				Parent_View 	@106

-				location   	(1411, 1018)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.837607

-				height     	36

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E95CA66032C"

-			    client     	@105

-			    supplier   	@81

-			    vertices   	(list Points

-				(2122, 1057)

-				(2122, 982)

-				(1257, 982))

-			    line_style 	3

-			    origin_attachment 	(2122, 1057)

-			    terminal_attachment 	(1257, 982)

-			    label      	(object SegLabel @108

-				Parent_View 	@106

-				location   	(1302, 920)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.951826

-				height     	63

-				orientation 	1))

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

-			    Parent_View 	@105

-			    location   	(88, -1056)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E95CA66035E"

-			    client     	@105

-			    supplier   	@98

-			    vertices   	(list Points

-				(2122, 1057)

-				(2122, 1998))

-			    line_style 	3

-			    origin_attachment 	(2122, 1057)

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

-	(object ClassDiagram "Env Entries"

-	    quid       	"399825D90228"

-	    title      	"Env Entries"

-	    documentation 	

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

-|provide text describing the parent element.  The elements

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

-|Deployment Component's Deployment File file producer wants

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

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

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

-|the description when processing the parent element that

-|contains the description.

-|

-|The lang attribute defines the language that the

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

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1863

-	    items      	(list diagram_item_list

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1134, 1928)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@110

-			location   	(971, 1669)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"EnvEntryType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@110

-			location   	(971, 1619)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	323

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38BDD7A60315"

-		    compartment 	(object Compartment

-			Parent_View 	@110

-			location   	(971, 1730)

-			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     	10

-			max_width  	234)

-		    width      	344

-		    height     	642

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @111

-		    location   	(2034, 1896)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@111

-			location   	(1596, 1818)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	840

-			label      	

-|@since J2EE1.3

-|ADDED java.lang.Character to EnvEntryType

-			)

-		    line_color 	32768

-		    fill_color 	13434833

-		    width      	900

-		    height     	169)

-		(object AttachView "" @112

-		    stereotype 	TRUE

-		    line_color 	32768

-		    client     	@111

-		    supplier   	@110

-		    vertices   	(list Points

-			(1583, 1894)

-			(1306, 1894))

-		    line_style 	3

-		    origin_attachment 	(1583, 1894)

-		    terminal_attachment 	(1306, 1894))

-		(object NoteView @113

-		    location   	(940, 944)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@113

-			location   	(380, 872)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	1084

-			label      	

-|Deprecated:

-|description becomes descriptions:List<DescriptionType>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1144

-		    height     	157)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1440, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@114

-			location   	(1312, 1114)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@114

-			location   	(1312, 1175)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(384, 1328)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@115

-			location   	(193, 1154)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	382

-			justify    	0

-			label      	"EnvEntry")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC77800E2"

-		    compartment 	(object Compartment

-			Parent_View 	@115

-			location   	(193, 1215)

-			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  	416)

-		    width      	400

-		    height     	372

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @116

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@113

-		    supplier   	@115

-		    vertices   	(list Points

-			(826, 1022)

-			(584, 1189))

-		    line_style 	0)

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

-		    location   	(943, 1268)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C0B37005A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @118

-			    Parent_View 	@117

-			    location   	(478, 10)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @119

-				Parent_View 	@118

-				location   	(1157, 1193)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.612100

-				height     	53

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C0B380084"

-			    client     	@117

-			    supplier   	@114

-			    vertices   	(list Points

-				(943, 1268)

-				(1302, 1230))

-			    line_style 	0

-			    label      	(object SegLabel @120

-				Parent_View 	@118

-				location   	(1229, 1281)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.783837

-				height     	43

-				orientation 	1))

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

-			    Parent_View 	@117

-			    location   	(478, 10)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C0B38008E"

-			    client     	@117

-			    supplier   	@115

-			    vertices   	(list Points

-				(943, 1268)

-				(584, 1306))

-			    line_style 	0)))))

-	(object ClassDiagram "New J2EE1.4 Datatypes"

-	    quid       	"3E4BE5610107"

-	    title      	"New J2EE1.4 Datatypes"

-	    documentation 	

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

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

-|home. The declaration consists of:

-|

-|    - an optional description

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

-|      Component that's referencing the enterprise bean

-|    - the expected type of the referenced enterprise bean

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

-|      referenced enterprise bean

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

-|      referenced enterprise bean

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	2724

-	    origin_y   	481

-	    items      	(list diagram_item_list

-		(object Label @122

-		    location   	(1485, 315)

-		    font       	(object Font

-			size       	14

-			face       	"Arial Black"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	2

-		    max_width  	1663

-		    label      	

-|New types and datatypes introduced for J2EE1.4

-|(Corresponds to j2ee_1_4.xsd)

-		    )

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2898, 1903)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@123

-			location   	(2595, 1794)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	606

-			justify    	0

-			label      	"MessageDestinationUsageType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@123

-			location   	(2595, 1744)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	606

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3EAED1C200A8"

-		    compartment 	(object Compartment

-			Parent_View 	@123

-			location   	(2595, 1855)

-			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  	425)

-		    width      	624

-		    height     	342

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1968, 2416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@124

-			location   	(1622, 2260)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"QName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16744703

-		    quidu      	"3F3BEF5D02C0"

-		    compartment 	(object Compartment

-			Parent_View 	@124

-			location   	(1622, 2321)

-			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  	596)

-		    width      	710

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1968, 1888)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@125

-			location   	(1515, 1732)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	906

-			justify    	0

-			label      	"MessageDestinationRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4C1F52028C"

-		    compartment 	(object Compartment

-			Parent_View 	@125

-			location   	(1515, 1793)

-			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  	778)

-		    width      	924

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3202, 646)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@126

-			location   	(3023, 596)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3424, 1008)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@127

-			location   	(3255, 902)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	338

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@127

-			location   	(3255, 963)

-			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  	293)

-		    width      	356

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2745, 1417)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C20210031"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @129

-			    Parent_View 	@128

-			    location   	(603, -777)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @130

-				Parent_View 	@129

-				location   	(3022, 1190)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.606717

-				height     	52

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C202101CC"

-			    client     	@128

-			    supplier   	@127

-			    vertices   	(list Points

-				(2745, 1417)

-				(3245, 1114))

-			    line_style 	0

-			    label      	(object SegLabel @131

-				Parent_View 	@129

-				location   	(3124, 1240)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.711564

-				height     	44

-				orientation 	1))

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

-			    Parent_View 	@128

-			    location   	(603, -777)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C202101E0"

-			    client     	@128

-			    supplier   	@125

-			    vertices   	(list Points

-				(2745, 1417)

-				(2242, 1719))

-			    line_style 	0)))

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

-		    location   	(3295, 798)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4D434D0255"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@133

-			    location   	(-133, -747)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @135

-				Parent_View 	@134

-				location   	(3216, 748)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E0152"

-			    client     	@133

-			    supplier   	@126

-			    vertices   	(list Points

-				(3295, 798)

-				(3240, 708))

-			    line_style 	0)

-			(object RoleView "descriptions" @136

-			    Parent_View 	@133

-			    location   	(-133, -747)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @137

-				Parent_View 	@136

-				location   	(3305, 892)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E012A"

-			    client     	@133

-			    supplier   	@127

-			    vertices   	(list Points

-				(3295, 798)

-				(3351, 889))

-			    line_style 	0

-			    label      	(object SegLabel @138

-				Parent_View 	@136

-				location   	(3391, 852)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3488, 1536)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@139

-			location   	(3256, 1405)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	464

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4C221202C1"

-		    compartment 	(object Compartment

-			Parent_View 	@139

-			location   	(3256, 1466)

-			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  	400)

-		    width      	482

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(3454, 1259)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4C22270090"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @141

-			    Parent_View 	@140

-			    location   	(183, -1056)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @142

-				Parent_View 	@141

-				location   	(3317, 1190)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.637579

-				height     	129

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C222703C5"

-			    client     	@140

-			    supplier   	@127

-			    vertices   	(list Points

-				(3454, 1259)

-				(3438, 1126))

-			    line_style 	0

-			    label      	(object SegLabel @143

-				Parent_View 	@141

-				location   	(3494, 1134)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

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

-			    Parent_View 	@140

-			    location   	(183, -1056)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4C222703D9"

-			    client     	@140

-			    supplier   	@139

-			    vertices   	(list Points

-				(3454, 1259)

-				(3470, 1392))

-			    line_style 	0)))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2605, 1134)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@145

-			location   	(2430, 1028)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	350

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4C211001CF"

-		    compartment 	(object Compartment

-			Parent_View 	@145

-			location   	(2430, 1139)

-			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      	368

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2048, 1088)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@146

-			location   	(1957, 1038)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	182

-			justify    	0

-			label      	"Listener")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16744703

-		    quidu      	"39BFB26001BD"

-		    width      	200

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 800)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@147

-			location   	(1406, 746)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	246

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @148

-		    location   	(1794, 949)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39C03E6C035A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @149

-			    Parent_View 	@148

-			    location   	(1524, 829)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @150

-				Parent_View 	@149

-				location   	(1937, 980)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02CF"

-			    client     	@148

-			    supplier   	@146

-			    vertices   	(list Points

-				(1794, 949)

-				(1947, 1033))

-			    line_style 	0)

-			(object RoleView "listenerClass" @151

-			    Parent_View 	@148

-			    location   	(1524, 829)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @152

-				Parent_View 	@151

-				location   	(1653, 920)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	275

-				justify    	0

-				label      	"+listenerClass"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02A7"

-			    client     	@148

-			    supplier   	@147

-			    vertices   	(list Points

-				(1794, 949)

-				(1641, 866))

-			    line_style 	0

-			    label      	(object SegLabel @153

-				Parent_View 	@151

-				location   	(1682, 828)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

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

-		    location   	(2976, 1440)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@154

-			location   	(2799, 1405)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	354

-			justify    	0

-			label      	"java")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@154

-			location   	(2799, 1355)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"<<metamodel>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549F2C004E"

-		    width      	366

-		    height     	182)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2296, 703)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@155

-			location   	(1950, 547)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"4023ADF20197"

-		    compartment 	(object Compartment

-			Parent_View 	@155

-			location   	(1950, 608)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	13434879

-			anchor     	2

-			nlines     	5

-			max_width  	437)

-		    width      	710

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @156

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4023AE8701D8"

-		    client     	@155

-		    supplier   	@126

-		    vertices   	(list Points

-			(2651, 679)

-			(3013, 657))

-		    line_style 	0)

-		(object InheritView "" @157

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4058AE790141"

-		    client     	@146

-		    supplier   	@155

-		    vertices   	(list Points

-			(2087, 1025)

-			(2187, 871))

-		    line_style 	0)

-		(object InheritView "" @158

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E9D5FC6011C"

-		    client     	@145

-		    supplier   	@155

-		    vertices   	(list Points

-			(2519, 1015)

-			(2416, 871))

-		    line_style 	0)))

-	(object ClassDiagram "J2EE1.4 Description Groups"

-	    quid       	"3E4D458003A9"

-	    title      	"J2EE1.4 Description Groups"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	669

-	    items      	(list diagram_item_list

-		(object Label @159

-		    location   	(88, 200)

-		    font       	(object Font

-			size       	14

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"Description Groups")

-		(object Label @160

-		    location   	(103, 334)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	2

-		    max_width  	1281

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

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2330, 675)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@161

-			location   	(2114, 573)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A9922000E"

-		    compartment 	(object Compartment

-			Parent_View 	@161

-			location   	(2114, 634)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	466)

-		    width      	450

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(686, 684)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@162

-			location   	(431, 559)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	510

-			justify    	0

-			label      	"IconType")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A99EE003A"

-		    compartment 	(object Compartment

-			Parent_View 	@162

-			location   	(431, 620)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	547)

-		    width      	528

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1569, 672)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@163

-			location   	(1441, 570)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@163

-			location   	(1441, 631)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	284)

-		    width      	274

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1401, 1141)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@164

-			location   	(1222, 1091)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2087, 1150)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D43540133"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNames" @166

-			    Parent_View 	@165

-			    location   	(1735, 574)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @167

-				Parent_View 	@166

-				location   	(2043, 879)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+displayNames"

-				pctDist    	0.818662

-				height     	182

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43550152"

-			    client     	@165

-			    supplier   	@161

-			    vertices   	(list Points

-				(2087, 1150)

-				(2224, 1150)

-				(2224, 789))

-			    line_style 	3

-			    origin_attachment 	(2087, 1150)

-			    terminal_attachment 	(2224, 789)

-			    label      	(object SegLabel @168

-				Parent_View 	@166

-				location   	(2171, 839)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

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

-			    Parent_View 	@165

-			    location   	(1735, 574)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43550166"

-			    client     	@165

-			    supplier   	@164

-			    vertices   	(list Points

-				(2087, 1150)

-				(1589, 1150))

-			    line_style 	3

-			    origin_attachment 	(2087, 1150)

-			    terminal_attachment 	(1589, 1150))))

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

-		    location   	(937, 1083)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D43320152"

-		    roleview_list 	(list RoleViews

-			(object RoleView "icons" @171

-			    Parent_View 	@170

-			    location   	(585, 507)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @172

-				Parent_View 	@171

-				location   	(1049, 844)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+icons"

-				pctDist    	0.913669

-				height     	112

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43350016"

-			    client     	@170

-			    supplier   	@162

-			    vertices   	(list Points

-				(937, 1083)

-				(937, 821))

-			    line_style 	3

-			    origin_attachment 	(937, 1083)

-			    terminal_attachment 	(937, 821)

-			    label      	(object SegLabel @173

-				Parent_View 	@171

-				location   	(864, 843)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.920863

-				height     	74

-				orientation 	0))

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

-			    Parent_View 	@170

-			    location   	(585, 507)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4335002A"

-			    client     	@170

-			    supplier   	@164

-			    vertices   	(list Points

-				(937, 1083)

-				(937, 1143)

-				(1213, 1143))

-			    line_style 	3

-			    origin_attachment 	(937, 1083)

-			    terminal_attachment 	(1213, 1143))))

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

-		    location   	(1575, 932)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D434D0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @176

-			    Parent_View 	@175

-			    location   	(1223, 356)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @177

-				Parent_View 	@176

-				location   	(1407, 844)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.608392

-				height     	169

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E012A"

-			    client     	@175

-			    supplier   	@163

-			    vertices   	(list Points

-				(1575, 932)

-				(1575, 786))

-			    line_style 	3

-			    origin_attachment 	(1575, 932)

-			    terminal_attachment 	(1575, 786)

-			    label      	(object SegLabel @178

-				Parent_View 	@176

-				location   	(1522, 802)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

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

-			    Parent_View 	@175

-			    location   	(1223, 356)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D434E0152"

-			    client     	@175

-			    supplier   	@164

-			    vertices   	(list Points

-				(1575, 932)

-				(1575, 1079))

-			    line_style 	3

-			    origin_attachment 	(1575, 932)

-			    terminal_attachment 	(1575, 1079))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1426, 1608)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@180

-			location   	(1080, 1452)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16744703

-		    quidu      	"4023ADF20197"

-		    compartment 	(object Compartment

-			Parent_View 	@180

-			location   	(1080, 1513)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	13434879

-			anchor     	2

-			nlines     	5

-			max_width  	437)

-		    width      	710

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @181

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4023AE8701D8"

-		    client     	@180

-		    supplier   	@164

-		    vertices   	(list Points

-			(1416, 1439)

-			(1404, 1203))

-		    line_style 	0)))

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

-	    quid       	"3E4D547001BD"

-	    title      	"J2EE1.4 JNDI Env Refs Group"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	1956

-	    origin_y   	2150

-	    items      	(list diagram_item_list

-		(object NoteView @182

-		    location   	(3461, 2107)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@182

-			location   	(3123, 1985)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	640

-			label      	

-|See common "Security" diagram

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

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	700

-		    height     	256)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1744, 2816)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@183

-			location   	(1565, 2766)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2688, 2112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@184

-			location   	(2532, 2066)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	312

-			justify    	0

-			label      	"SecurityIdentity")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF2C040245"

-		    width      	330

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @185

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@182

-		    supplier   	@184

-		    vertices   	(list Points

-			(3110, 2108)

-			(2853, 2110))

-		    line_style 	0)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2816, 2624)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@186

-			location   	(2697, 2570)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	238

-			justify    	0

-			label      	"ServiceRef")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D2F560184"

-		    width      	256

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2848, 2384)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@187

-			location   	(2617, 2334)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	462

-			justify    	0

-			label      	"MessageDestinationRef")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C1F52028C"

-		    width      	480

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2720, 1856)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@188

-			location   	(2557, 1810)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"ResourceEnvRef")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF207200D3"

-		    width      	344

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2752, 1632)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@189

-			location   	(2619, 1586)

-			nlines     	1

-			max_width  	266

-			justify    	0

-			label      	"ResourceRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC79303C6"

-		    width      	284

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2736, 1424)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@190

-			location   	(2640, 1378)

-			nlines     	1

-			max_width  	192

-			justify    	0

-			label      	"EnvEntry")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC77800E2"

-		    width      	210

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2720, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@191

-			location   	(2586, 1170)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	268

-			justify    	0

-			label      	"EJBLocalRef")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398862E20101"

-		    width      	286

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2736, 976)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@192

-			location   	(2655, 930)

-			nlines     	1

-			max_width  	162

-			justify    	0

-			label      	"EjbRef")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC78202B3"

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1744, 2528)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@193

-			location   	(1553, 2478)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	382

-			justify    	0

-			label      	"JNDIEnvRefsGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4D53950349"

-		    width      	400

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @194

-		    location   	(2316, 2587)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D2FA901C9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceRefs" @195

-			    Parent_View 	@194

-			    location   	(1298, 1650)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @196

-				Parent_View 	@195

-				location   	(2532, 2640)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	240

-				justify    	0

-				label      	"+serviceRefs"

-				pctDist    	0.582555

-				height     	53

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2FAA02C5"

-			    client     	@194

-			    supplier   	@186

-			    vertices   	(list Points

-				(2316, 2587)

-				(2688, 2587))

-			    line_style 	3

-			    origin_attachment 	(2316, 2587)

-			    terminal_attachment 	(2688, 2587)

-			    label      	(object SegLabel @197

-				Parent_View 	@195

-				location   	(2650, 2534)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "" @198

-			    Parent_View 	@194

-			    location   	(1298, 1650)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2FAA02CF"

-			    client     	@194

-			    supplier   	@193

-			    vertices   	(list Points

-				(2316, 2587)

-				(1944, 2587))

-			    line_style 	3

-			    origin_attachment 	(2316, 2587)

-			    terminal_attachment 	(1944, 2587))))

-		(object AssociationViewNew "" @199

-		    location   	(2213, 2347)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D23AA024F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinationRefs" @200

-			    Parent_View 	@199

-			    location   	(1195, 1410)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @201

-				Parent_View 	@200

-				location   	(2336, 2295)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	474

-				justify    	0

-				label      	"+messageDestinationRefs"

-				pctDist    	0.314433

-				height     	53

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D23AD01AA"

-			    client     	@199

-			    supplier   	@187

-			    vertices   	(list Points

-				(2213, 2347)

-				(2608, 2347))

-			    line_style 	3

-			    origin_attachment 	(2213, 2347)

-			    terminal_attachment 	(2608, 2347)

-			    label      	(object SegLabel @202

-				Parent_View 	@200

-				location   	(2567, 2401)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "" @203

-			    Parent_View 	@199

-			    location   	(1195, 1410)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D23AD01B4"

-			    client     	@199

-			    supplier   	@193

-			    vertices   	(list Points

-				(2213, 2347)

-				(1936, 2347)

-				(1936, 2466))

-			    line_style 	3

-			    origin_attachment 	(2213, 2347)

-			    terminal_attachment 	(1936, 2466))))

-		(object AssociationViewNew "" @204

-		    location   	(1951, 1850)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF209F00C4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @205

-			    Parent_View 	@204

-			    location   	(1599, 122)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @206

-				Parent_View 	@205

-				location   	(1933, 2330)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF209F0396"

-			    client     	@204

-			    supplier   	@193

-			    vertices   	(list Points

-				(1951, 1850)

-				(1891, 1850)

-				(1891, 2466))

-			    line_style 	3

-			    origin_attachment 	(1951, 1850)

-			    terminal_attachment 	(1891, 2466))

-			(object RoleView "resourceEnvRefs" @207

-			    Parent_View 	@204

-			    location   	(1599, 122)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @208

-				Parent_View 	@207

-				location   	(2368, 1893)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	338

-				justify    	0

-				label      	"+resourceEnvRefs"

-				pctDist    	0.698113

-				height     	43

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF209F0395"

-			    client     	@204

-			    supplier   	@188

-			    vertices   	(list Points

-				(1951, 1850)

-				(2548, 1850))

-			    line_style 	3

-			    origin_attachment 	(1951, 1850)

-			    terminal_attachment 	(2548, 1850)

-			    label      	(object SegLabel @209

-				Parent_View 	@207

-				location   	(2488, 1797)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "" @210

-		    location   	(1857, 1658)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @211

-			Parent_View 	@210

-			location   	(1842, 1694)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			hidden     	TRUE

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	60

-			justify    	0

-			label      	""

-			pctDist    	0.250000

-			height     	36

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230139"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resourceRefs" @212

-			    Parent_View 	@210

-			    location   	(529, 1482)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @213

-				Parent_View 	@212

-				location   	(2473, 1640)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	362

-				justify    	0

-				label      	"+resourceRefs"

-				pctDist    	0.830875

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323013B"

-			    client     	@210

-			    supplier   	@189

-			    vertices   	(list Points

-				(1857, 1658)

-				(1857, 1598)

-				(2610, 1598))

-			    line_style 	3

-			    origin_attachment 	(1857, 1658)

-			    terminal_attachment 	(2610, 1598)

-			    label      	(object SegLabel @214

-				Parent_View 	@212

-				location   	(2559, 1553)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.938053

-				height     	46

-				orientation 	0))

-			(object RoleView "" @215

-			    Parent_View 	@210

-			    location   	(529, 1482)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @216

-				Parent_View 	@215

-				location   	(1916, 2404)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.925020

-				height     	59

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323013A"

-			    client     	@210

-			    supplier   	@193

-			    vertices   	(list Points

-				(1857, 1658)

-				(1857, 2466))

-			    line_style 	3

-			    origin_attachment 	(1857, 1658)

-			    terminal_attachment 	(1857, 2466))))

-		(object AssociationViewNew "" @217

-		    location   	(1796, 1508)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @218

-			Parent_View 	@217

-			location   	(1588, 1544)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			hidden     	TRUE

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	60

-			justify    	0

-			label      	""

-			pctDist    	-2.966667

-			height     	36

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E323012D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "environmentProperties" @219

-			    Parent_View 	@217

-			    location   	(420, 948)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @220

-				Parent_View 	@219

-				location   	(2361, 1448)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	586

-				justify    	0

-				label      	"+environmentProperties"

-				pctDist    	0.718367

-				height     	62

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323012F"

-			    client     	@217

-			    supplier   	@190

-			    vertices   	(list Points

-				(1796, 1508)

-				(1796, 1386)

-				(2631, 1386))

-			    line_style 	3

-			    origin_attachment 	(1796, 1508)

-			    terminal_attachment 	(2631, 1386)

-			    label      	(object SegLabel @221

-				Parent_View 	@219

-				location   	(2540, 1333)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.906040

-				height     	54

-				orientation 	0))

-			(object RoleView "" @222

-			    Parent_View 	@217

-			    location   	(420, 948)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @223

-				Parent_View 	@222

-				location   	(1709, 2400)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.932653

-				height     	88

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E323012E"

-			    client     	@217

-			    supplier   	@193

-			    vertices   	(list Points

-				(1796, 1508)

-				(1796, 2466))

-			    line_style 	3

-			    origin_attachment 	(1796, 1508)

-			    terminal_attachment 	(1796, 2466))))

-		(object AssociationViewNew "" @224

-		    location   	(1740, 1411)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398863840172"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbLocalRefs" @225

-			    Parent_View 	@224

-			    location   	(1324, 1075)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @226

-				Parent_View 	@225

-				location   	(2372, 1147)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	270

-				justify    	0

-				label      	"+ejbLocalRefs"

-				pctDist    	0.805630

-				height     	48

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988638502AA"

-			    client     	@224

-			    supplier   	@191

-			    vertices   	(list Points

-				(1740, 1411)

-				(1740, 1194)

-				(2577, 1194))

-			    line_style 	3

-			    origin_attachment 	(1740, 1411)

-			    terminal_attachment 	(2577, 1194)

-			    label      	(object SegLabel @227

-				Parent_View 	@225

-				location   	(2471, 1248)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "" @228

-			    Parent_View 	@224

-			    location   	(1324, 1075)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988638502B4"

-			    client     	@224

-			    supplier   	@193

-			    vertices   	(list Points

-				(1740, 1411)

-				(1740, 2466))

-			    line_style 	3

-			    origin_attachment 	(1740, 1411)

-			    terminal_attachment 	(1740, 2466))))

-		(object AssociationViewNew "" @229

-		    location   	(1677, 1248)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @230

-			Parent_View 	@229

-			location   	(1677, 1189)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			hidden     	TRUE

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	60

-			justify    	0

-			label      	""

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39045AE401F1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbRefs" @231

-			    Parent_View 	@229

-			    location   	(173, 1008)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @232

-				Parent_View 	@231

-				location   	(2437, 977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	226

-				justify    	0

-				label      	"+ejbRefs"

-				pctDist    	0.828194

-				height     	24

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045AE50301"

-			    client     	@229

-			    supplier   	@192

-			    vertices   	(list Points

-				(1677, 1248)

-				(1677, 1000)

-				(2646, 1000))

-			    line_style 	3

-			    origin_attachment 	(1677, 1248)

-			    terminal_attachment 	(2646, 1000)

-			    label      	(object SegLabel @233

-				Parent_View 	@231

-				location   	(2547, 1045)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.919236

-				height     	45

-				orientation 	1))

-			(object RoleView "" @234

-			    Parent_View 	@229

-			    location   	(173, 1008)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @235

-				Parent_View 	@234

-				location   	(1712, 2327)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.886095

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045AE50080"

-			    client     	@229

-			    supplier   	@193

-			    vertices   	(list Points

-				(1677, 1248)

-				(1677, 2466))

-			    line_style 	3

-			    origin_attachment 	(1677, 1248)

-			    terminal_attachment 	(1677, 2466))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/common.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/common.ecore
deleted file mode 100644
index 4ab70dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/common.ecore
+++ /dev/null
@@ -1,408 +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="common"

-    nsURI="common.xmi" nsPrefix="org.eclipse.jst.j2ee.j2ee.common">

-  <eClassifiers xsi:type="ecore:EClass" name="EjbRef">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EnvEntry">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ResourceRef">

-    <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="@since 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="@since 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="@since 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">

-    <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="@since 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">

-    <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">

-    <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="@since 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="@since 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">

-    <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="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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="@since 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 webservice_client.ecore#//ServiceRef" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="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&#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="@since 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="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <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="@since 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>

-</ecore:EPackage>

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.genmodel b/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.genmodel
deleted file mode 100644
index 2ae4962..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.genmodel
+++ /dev/null
@@ -1,153 +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.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"
-    usedGenPackages="../../org.eclipse.emf.ecore/src-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>commonArchive.mdl</foreignModel>
-  <foreignModel>WORKSPACE_ROOT</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="Commonarchive" basePackage="org.eclipse.jst.j2ee" ecorePackage="commonarchivecore.ecore#/">
-    <genClasses ecoreClass="commonarchivecore.ecore#//File">
-      <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/URI"/>
-      <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/lastModified"/>
-      <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/size"/>
-      <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/directoryEntry"/>
-      <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/originalURI"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//File/loadingContainer"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//File/container"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//Archive">
-      <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//Archive/types"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//EJBJarFile">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EJBJarFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//WARFile">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//WARFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//EARFile">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EARFile/moduleRefs"/>
-      <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EARFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ApplicationClientFile">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ApplicationClientFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ModuleFile"/>
-    <genClasses ecoreClass="commonarchivecore.ecore#//Container">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//Container/files"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ReadOnlyDirectory"/>
-    <genClasses ecoreClass="commonarchivecore.ecore#//RARFile">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//RARFile/deploymentDescriptor"/>
-    </genClasses>
-    <genClasses ecoreClass="commonarchivecore.ecore#//ModuleRef">
-      <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ModuleRef/moduleFile"/>
-      <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ModuleRef/earFile"/>
-    </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"
-        ecorePackage="commonarchivecore.ecore#//looseconfig">
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseApplication">
-        <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseApplication/looseArchives"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseArchive">
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/uri"/>
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/binariesPath"/>
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/resourcesPath"/>
-        <genFeatures property="None" notify="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" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseLibrary/looseWAR"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseModule">
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseModule/altDD"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseConfiguration">
-        <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseConfiguration/applications"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseWARFile">
-        <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseWARFile/looseLibs"/>
-      </genClasses>
-    </nestedGenPackages>
-    <nestedGenPackages prefix="Commonarchive" basePackage="org.eclipse.jst.j2ee" ecorePackage="commonarchivecore.ecore#/">
-      <genClasses ecoreClass="commonarchivecore.ecore#//File" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/URI"/>
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/lastModified"/>
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/size"/>
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/directoryEntry"/>
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//File/originalURI"/>
-        <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//File/loadingContainer"/>
-        <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//File/container"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//Archive" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//Archive/types"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//EJBJarFile" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EJBJarFile/deploymentDescriptor"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//WARFile" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//WARFile/deploymentDescriptor"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//EARFile" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EARFile/moduleRefs"/>
-        <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//EARFile/deploymentDescriptor"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//ApplicationClientFile" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ApplicationClientFile/deploymentDescriptor"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//ModuleFile" labelFeature="#//commonarchivecore/commonarchivecore/File/URI"/>
-      <genClasses ecoreClass="commonarchivecore.ecore#//Container" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//Container/files"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//ReadOnlyDirectory" labelFeature="#//commonarchivecore/commonarchivecore/File/URI"/>
-      <genClasses ecoreClass="commonarchivecore.ecore#//RARFile" labelFeature="#//commonarchivecore/commonarchivecore/File/URI">
-        <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//RARFile/deploymentDescriptor"/>
-      </genClasses>
-      <genClasses ecoreClass="commonarchivecore.ecore#//ModuleRef">
-        <genFeatures notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ModuleRef/moduleFile"/>
-        <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//ModuleRef/earFile"/>
-      </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"
-          ecorePackage="commonarchivecore.ecore#//looseconfig">
-        <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseApplication"
-            labelFeature="#//commonarchivecore/commonarchivecore/looseconfig/LooseArchive/uri">
-          <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseApplication/looseArchives"/>
-        </genClasses>
-        <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseArchive"
-            labelFeature="#//commonarchivecore/commonarchivecore/looseconfig/LooseArchive/uri">
-          <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/uri"/>
-          <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/binariesPath"/>
-          <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseArchive/resourcesPath"/>
-          <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseArchive/looseApp"/>
-          <genOperations ecoreOperation="commonarchivecore.ecore#//looseconfig/LooseArchive/isModule"/>
-        </genClasses>
-        <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseLibrary"
-            labelFeature="#//commonarchivecore/commonarchivecore/looseconfig/LooseArchive/uri">
-          <genFeatures property="None" notify="false" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseLibrary/looseWAR"/>
-        </genClasses>
-        <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseModule"
-            labelFeature="#//commonarchivecore/commonarchivecore/looseconfig/LooseArchive/uri">
-          <genFeatures ecoreFeature="ecore:EAttribute commonarchivecore.ecore#//looseconfig/LooseModule/altDD"/>
-        </genClasses>
-        <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseConfiguration">
-          <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseConfiguration/applications"/>
-        </genClasses>
-        <genClasses ecoreClass="commonarchivecore.ecore#//looseconfig/LooseWARFile"
-            labelFeature="#//commonarchivecore/commonarchivecore/looseconfig/LooseArchive/uri">
-          <genFeatures property="None" children="true" ecoreFeature="ecore:EReference commonarchivecore.ecore#//looseconfig/LooseWARFile/looseLibs"/>
-        </genClasses>
-      </nestedGenPackages>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.mdl b/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.mdl
deleted file mode 100644
index de3f353..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchive.mdl
+++ /dev/null
@@ -1,9301 +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       	"3A0B2474025F"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3A0B2474026A"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3A0B24790339"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3A0B24740269"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3A0B2474027D"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\src-ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E")
-	    (object Class_Category "application"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\application.cat"
-		quid       	"38C03008014E")
-	    (object Class_Category "client"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\client.cat"
-		quid       	"38C0280700C0")
-	    (object Class_Category "ejb"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\ejbschema.cat"
-		quid       	"3780E272032D")
-	    (object Class_Category "webapplication"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webapplication.cat"
-		quid       	"38C076D603DD")
-	    (object Class_Category "commonArchiveCore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\commonArchiveCore.cat"
-		quid       	"3A0DB68B0046")
-	    (object Class_Category "java"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jem\\rose\\edocjava2.cat"
-		quid       	"36549F2C004E")
-	    (object Class_Category "common"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\common.cat"
-		quid       	"38C08F0F038D")
-	    (object Class_Category "jca"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jca1_0.cat"
-		quid       	"3C60904200BB")
-	    (object Class_Category "wsclient"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webservices_client_1_0.cat"
-		quid       	"3E4D2F4B02AA")
-	    (object Class_Category "jsp"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jsp_2_0.cat"
-		quid       	"3E4D4F69036B"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3A0B24790360"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	650
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::ecore" @1
-			location   	(1104, 160)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(960, 76)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Label"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::application" @2
-			location   	(1904, 816)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(1760, 732)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"application")
-			icon_style 	"Label"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C03008014E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::client" @3
-			location   	(2368, 1104)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(2224, 1020)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"client")
-			icon_style 	"Label"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C0280700C0"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::ejb" @4
-			location   	(752, 848)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@4
-			    location   	(598, 813)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	308
-			    justify    	0
-			    label      	"ejb")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@4
-			    location   	(598, 763)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	308
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Label"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3780E272032D"
-			width      	320
-			height     	182)
-		    (object CategoryView "Logical View::webapplication" @5
-			location   	(1216, 880)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@5
-			    location   	(1072, 796)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"webapplication")
-			icon_style 	"Label"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C076D603DD"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::java" @6
-			location   	(640, 416)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@6
-			    location   	(486, 381)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	308
-			    justify    	0
-			    label      	"java")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@6
-			    location   	(486, 331)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	308
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"36549F2C004E"
-			width      	320
-			height     	182)
-		    (object ImportView "" @7
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"39BD366000FE"
-			client     	@6
-			supplier   	@1
-			vertices   	(list Points
-			    (768, 270)
-			    (768, 159)
-			    (953, 159))
-			line_style 	3
-			origin_attachment 	(768, 270)
-			terminal_attachment 	(953, 159))
-		    (object CategoryView "Logical View::common" @8
-			location   	(1200, 432)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@8
-			    location   	(1056, 348)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"common")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C08F0F038D"
-			width      	300
-			height     	180)
-		    (object ImportView "" @9
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"38FF3C150151"
-			client     	@5
-			supplier   	@8
-			line_style 	0)
-		    (object ImportView "" @10
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"38FF3C1002A8"
-			client     	@2
-			supplier   	@8
-			vertices   	(list Points
-			    (1756, 671)
-			    (1756, 513)
-			    (1350, 513))
-			line_style 	3
-			origin_attachment 	(1756, 671)
-			terminal_attachment 	(1350, 513))
-		    (object ImportView "" @11
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"380567F50384"
-			client     	@4
-			supplier   	@6
-			line_style 	3
-			origin_attachment 	(752, 702)
-			terminal_attachment 	(752, 507))
-		    (object ImportView "" @12
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"38FF3C1C0256"
-			client     	@4
-			supplier   	@8
-			vertices   	(list Points
-			    (863, 702)
-			    (863, 406)
-			    (1049, 406))
-			line_style 	3
-			origin_attachment 	(863, 702)
-			terminal_attachment 	(1049, 406))
-		    (object CategoryView "Logical View::jca" @13
-			location   	(1680, 192)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@13
-			    location   	(1536, 108)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"jca")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3C60904200BB"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::commonArchiveCore::looseconfig" @14
-			location   	(1744, 1152)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@14
-			    location   	(1500, 1068)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	488
-			    justify    	0
-			    label      	"looseconfig")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3C71147E033D"
-			width      	500
-			height     	180)
-		    (object CategoryView "Logical View::wsclient" @15
-			location   	(2048, 336)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@15
-			    location   	(1904, 252)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsclient")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3E4D2F4B02AA"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::jsp" @16
-			location   	(2448, 336)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@16
-			    location   	(2304, 252)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"jsp")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3E4D4F69036B"
-			width      	300
-			height     	180)
-		    (object ImportView "" @17
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			stereotype 	TRUE
-			line_color 	3342489
-			quidu      	"38FF3C180336"
-			client     	@3
-			supplier   	@8
-			vertices   	(list Points
-			    (2219, 959)
-			    (2219, 462)
-			    (1350, 462))
-			line_style 	3
-			origin_attachment 	(2219, 959)
-			terminal_attachment 	(1350, 462))
-		    (object CategoryView "Logical View::commonArchiveCore" @18
-			location   	(1072, 1184)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@18
-			    location   	(928, 1100)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"commonArchiveCore")
-			icon_style 	"Label"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3A0DB68B0046"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3A0B2474027D"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3A0B24790338"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3A0B2474027E"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3A0B24740291"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"roseId"
-		value      	"753117540")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Const"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSI C++ Event Watcher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	"${quote}=${quote}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteType"
-			value      	("IncompleteTypeSet" 1))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotDeclare"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"NoDiscriminantPart"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"UnknownDiscriminantPart"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"KnownDiscriminantPart"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	4)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	5)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	6)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdatable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText1"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText2"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagName3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagApply3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineTagText3"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAbstractBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SpecialDeclReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateFriendBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateFriendDecl"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ClearCase"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)))))
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Direction"
-			value      	("ParamDirectionTypeSet" 102))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ParamDirectionTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"in"
-				value      	102)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"inout"
-				value      	103)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"out"
-				value      	104))))))
-	quid       	"3A0B2474027F"))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchiveCore.cat b/plugins/org.eclipse.jst.j2ee.core/rose/commonArchiveCore.cat
deleted file mode 100644
index 12b5d44..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/commonArchiveCore.cat
+++ /dev/null
@@ -1,4370 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "commonArchiveCore"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jst.j2ee"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"prefix"
-	    value      	(value Text "Commonarchive"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsURI"
-	    value      	(value Text "commonarchive.xmi")))
-    quid       	"3A0DB68B0046"
-    visible_categories 	(list visibility_relationship_list
-	(object Visibility_Relationship
-	    quid       	"3F2E8236025A"
-	    supplier   	"Logical View::ejbext"
-	    quidu      	"39AA86660190")
-	(object Visibility_Relationship
-	    quid       	"3F2E8236025B"
-	    supplier   	"Logical View::webappext"
-	    quidu      	"39B534FD024C")
-	(object Visibility_Relationship
-	    quid       	"3F2E8236025C"
-	    supplier   	"Logical View::ejbbnd"
-	    quidu      	"39B960FC03CA")
-	(object Visibility_Relationship
-	    quid       	"3F2E82360264"
-	    supplier   	"Logical View::webappbnd"
-	    quidu      	"39B961060107")
-	(object Visibility_Relationship
-	    quid       	"3F2E82360265"
-	    supplier   	"Logical View::clientbnd"
-	    quidu      	"39B9614F031F")
-	(object Visibility_Relationship
-	    quid       	"3F2E82360266"
-	    supplier   	"Logical View::applicationext"
-	    quidu      	"3A22E6080303")
-	(object Visibility_Relationship
-	    quid       	"3F2E82360267"
-	    supplier   	"Logical View::applicationbnd"
-	    quidu      	"39B9611502A4")
-	(object Visibility_Relationship
-	    quid       	"3F2E82360268"
-	    supplier   	"Logical View::j2cbnd"
-	    quidu      	"39B9632E038C"))
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "File"
-	    quid       	"3A0DB75B00E5"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "URI"
-		    quid       	"3A1012D900AA"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "lastModified"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A1013300163"
-		    type       	"long"
-		    exportControl 	"Public")
-		(object ClassAttribute "size"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A101339008A"
-		    type       	"long"
-		    exportControl 	"Public")
-		(object ClassAttribute "directoryEntry"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3A3150640092"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "originalURI"
-		    attributes 	(list Attribute_Set)
-		    quid       	"3A423640032C"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "Archive"
-	    quid       	"3A0DB75F0177"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A54BF5D018C"
-		    supplier   	"Logical View::commonArchiveCore::Container"
-		    quidu      	"3A54BE55016E"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "types"
-		    quid       	"3FA17B530039"
-		    stereotype 	"0...*"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "EJBJarFile"
-	    quid       	"3A0DBB250022"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A0DC27D03BE"
-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"
-		    quidu      	"3A0DC1230136"))
-	    language   	"Java")
-	(object Class "WARFile"
-	    quid       	"3A0DBB49018C"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A0DC29003E4"
-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"
-		    quidu      	"3A0DC1230136"))
-	    language   	"Java")
-	(object Class "EARFile"
-	    quid       	"3A0DBB79007D"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A36452000DE"
-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"
-		    quidu      	"3A0DC1230136"))
-	    language   	"Java")
-	(object Class "ApplicationClientFile"
-	    quid       	"3A0DBB810128"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A0DC2790214"
-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"
-		    quidu      	"3A0DC1230136"))
-	    language   	"Java")
-	(object Class "ModuleFile"
-	    quid       	"3A0DC1230136"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A0DC2CE00AE"
-		    supplier   	"Logical View::commonArchiveCore::Archive"
-		    quidu      	"3A0DB75F0177"))
-	    language   	"Java"
-	    abstract   	TRUE)
-	(object Class "Container"
-	    quid       	"3A54BE55016E"
-	    stereotype 	"abstract"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A54C16801FC"
-		    supplier   	"Logical View::commonArchiveCore::File"
-		    quidu      	"3A0DB75B00E5"))
-	    abstract   	TRUE)
-	(object Class "ReadOnlyDirectory"
-	    quid       	"3A54BEB0004D"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A54BF750295"
-		    supplier   	"Logical View::commonArchiveCore::Container"
-		    quidu      	"3A54BE55016E")))
-	(object Class "RARFile"
-	    quid       	"3A6DEBCF03C5"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3A6DEBE701CB"
-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"
-		    quidu      	"3A0DC1230136")))
-	(object Class "ModuleRef"
-	    quid       	"3C711E300115"
-	    abstract   	TRUE)
-	(object Class "EJBModuleRef"
-	    quid       	"3C7125A802A5"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3C712A1D0165"
-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"
-		    quidu      	"3C711E300115")))
-	(object Class "WebModuleRef"
-	    quid       	"3C7125B10293"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3C712A2001EB"
-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"
-		    quidu      	"3C711E300115")))
-	(object Class "ClientModuleRef"
-	    quid       	"3C7125B90259"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3C712A23031C"
-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"
-		    quidu      	"3C711E300115")))
-	(object Class "ConnectorModuleRef"
-	    quid       	"3C7125C600E5"
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3C712A2B025F"
-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"
-		    quidu      	"3C711E300115")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3A0DC23C0270"
-	    roles      	(list role_list
-		(object Role "/moduleFiles"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    quid       	"3A0DC23D014F"
-		    label      	"/moduleFiles"
-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"
-		    quidu      	"3A0DC1230136"
-		    client_cardinality 	(value cardinality "0..n")
-		    is_navigable 	TRUE)
-		(object Role "earFile"
-		    quid       	"3A0DC23D02FE"
-		    label      	"earFile"
-		    supplier   	"Logical View::commonArchiveCore::EARFile"
-		    quidu      	"3A0DBB79007D"
-		    client_cardinality 	(value cardinality "0..1"))))
-	(object Association "$UNNAMED$1"
-	    quid       	"3A3A953E00A9"
-	    roles      	(list role_list
-		(object Role "loadingContainer"
-		    quid       	"3A3A953F0082"
-		    label      	"loadingContainer"
-		    supplier   	"Logical View::commonArchiveCore::Container"
-		    quidu      	"3A54BE55016E"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$2"
-		    quid       	"3A3A953F00AA"
-		    supplier   	"Logical View::commonArchiveCore::File"
-		    quidu      	"3A0DB75B00E5")))
-	(object Association "$UNNAMED$3"
-	    quid       	"3A54BF4E0022"
-	    roles      	(list role_list
-		(object Role "container"
-		    quid       	"3A54BF4E0023"
-		    label      	"container"
-		    supplier   	"Logical View::commonArchiveCore::Container"
-		    quidu      	"3A54BE55016E"
-		    client_cardinality 	(value cardinality "0..1")
-		    is_navigable 	TRUE
-		    is_aggregate 	TRUE)
-		(object Role "files"
-		    quid       	"3A54BF4E0024"
-		    label      	"files"
-		    supplier   	"Logical View::commonArchiveCore::File"
-		    quidu      	"3A0DB75B00E5"
-		    client_cardinality 	(value cardinality "0..*")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$4"
-	    quid       	"3C711EF902F4"
-	    roles      	(list role_list
-		(object Role "moduleFile"
-		    quid       	"3C711EFA024C"
-		    label      	"moduleFile"
-		    supplier   	"Logical View::commonArchiveCore::ModuleFile"
-		    quidu      	"3A0DC1230136"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3C711EFA024E"
-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"
-		    quidu      	"3C711E300115"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$6"
-	    quid       	"3C712223019B"
-	    roles      	(list role_list
-		(object Role "moduleRefs"
-		    quid       	"3C7122240246"
-		    label      	"moduleRefs"
-		    supplier   	"Logical View::commonArchiveCore::ModuleRef"
-		    quidu      	"3C711E300115"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "earFile"
-		    quid       	"3C7122240248"
-		    label      	"earFile"
-		    supplier   	"Logical View::commonArchiveCore::EARFile"
-		    quidu      	"3A0DBB79007D"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$7"
-	    quid       	"3F297D500278"
-	    roles      	(list role_list
-		(object Role "warFile"
-		    quid       	"3F297D500279"
-		    label      	"warFile"
-		    supplier   	"Logical View::commonArchiveCore::WARFile"
-		    quidu      	"3A0DBB49018C")
-		(object Role "deploymentDescriptor"
-		    quid       	"3F297D50027A"
-		    label      	"deploymentDescriptor"
-		    supplier   	"Logical View::webapplication::WebApp"
-		    quidu      	"38C077FB0352"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$8"
-	    quid       	"3F297E2800B5"
-	    roles      	(list role_list
-		(object Role "ejbJarFile"
-		    quid       	"3F297E2800B6"
-		    label      	"ejbJarFile"
-		    supplier   	"Logical View::commonArchiveCore::EJBJarFile"
-		    quidu      	"3A0DBB250022")
-		(object Role "deploymentDescriptor"
-		    quid       	"3F297E2800B7"
-		    label      	"deploymentDescriptor"
-		    supplier   	"Logical View::ejb::EJBJar"
-		    quidu      	"371BC55D01E1"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$9"
-	    quid       	"3F297F6E0245"
-	    roles      	(list role_list
-		(object Role "earFile"
-		    quid       	"3F297F6E0246"
-		    label      	"earFile"
-		    supplier   	"Logical View::commonArchiveCore::EARFile"
-		    quidu      	"3A0DBB79007D")
-		(object Role "deploymentDescriptor"
-		    quid       	"3F297F6E0247"
-		    label      	"deploymentDescriptor"
-		    supplier   	"Logical View::application::Application"
-		    quidu      	"38C030A803B1"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$10"
-	    quid       	"3F298321035F"
-	    roles      	(list role_list
-		(object Role "deploymentDescriptor"
-		    quid       	"3F2983220284"
-		    label      	"deploymentDescriptor"
-		    supplier   	"Logical View::jca::Connector"
-		    quidu      	"3C609091010F"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$11"
-		    quid       	"3F2983220298"
-		    supplier   	"Logical View::commonArchiveCore::RARFile"
-		    quidu      	"3A6DEBCF03C5")))
-	(object Association "$UNNAMED$12"
-	    quid       	"3F298462039D"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$13"
-		    quid       	"3F298462039E"
-		    supplier   	"Logical View::commonArchiveCore::ApplicationClientFile"
-		    quidu      	"3A0DBB810128")
-		(object Role "deploymentDescriptor"
-		    quid       	"3F298462039F"
-		    label      	"deploymentDescriptor"
-		    supplier   	"Logical View::client::ApplicationClient"
-		    quidu      	"38C028AB009E"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)))
-	(object Class_Category "looseconfig"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"Ecore"
-		    name       	"prefix"
-		    value      	(value Text "Looseconfig"))
-		(object Attribute
-		    tool       	"Ecore"
-		    name       	"basePackage"
-		    value      	(value Text "org.eclipse.jst.j2ee.commonarchivecore"))
-		(object Attribute
-		    tool       	"Ecore"
-		    name       	"nsURI"
-		    value      	(value Text "commonarchive.looseconfig.xmi")))
-	    quid       	"3C71147E033D"
-	    exportControl 	"Public"
-	    logical_models 	(list unit_reference_list
-		(object Class "LooseApplication"
-		    quid       	"3C56EB4E006A"
-		    superclasses 	(list inheritance_relationship_list
-			(object Inheritance_Relationship
-			    quid       	"3C753DEE00EA"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"
-			    quidu      	"3C56EAAF006C")))
-		(object Class "LooseArchive"
-		    quid       	"3C56EAAF006C"
-		    operations 	(list Operations
-			(object Operation "isModule"
-			    quid       	"3C5ABFC303DE"
-			    result     	"boolean"
-			    concurrency 	"Sequential"
-			    opExportControl 	"Public"
-			    uid        	0))
-		    class_attributes 	(list class_attribute_list
-			(object ClassAttribute "uri"
-			    quid       	"3C56EB9C01A3"
-			    type       	"String"
-			    exportControl 	"Public")
-			(object ClassAttribute "binariesPath"
-			    quid       	"3C56EBA900BB"
-			    type       	"String"
-			    exportControl 	"Public")
-			(object ClassAttribute "resourcesPath"
-			    quid       	"3C711DD3020B"
-			    type       	"String"
-			    exportControl 	"Public"))
-		    abstract   	TRUE)
-		(object Class "LooseLibrary"
-		    quid       	"3C5AF7AC0028"
-		    superclasses 	(list inheritance_relationship_list
-			(object Inheritance_Relationship
-			    quid       	"3C5AF7C2037C"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"
-			    quidu      	"3C56EAAF006C")))
-		(object Class "LooseModule"
-		    quid       	"3C5ABEFE0290"
-		    superclasses 	(list inheritance_relationship_list
-			(object Inheritance_Relationship
-			    quid       	"3C5AC03900EE"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"
-			    quidu      	"3C56EAAF006C"))
-		    class_attributes 	(list class_attribute_list
-			(object ClassAttribute "altDD"
-			    quid       	"3C5ABFFA021A"
-			    type       	"String"
-			    exportControl 	"Public")))
-		(object Class "LooseConfiguration"
-		    quid       	"3C56E92C00BF")
-		(object Class "LooseWARFile"
-		    quid       	"3C5AF7DB018E"
-		    superclasses 	(list inheritance_relationship_list
-			(object Inheritance_Relationship
-			    quid       	"3C5AF7F5028F"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseModule"
-			    quidu      	"3C5ABEFE0290")))
-		(object Association "$UNNAMED$14"
-		    quid       	"3C56FDE60173"
-		    roles      	(list role_list
-			(object Role "applications"
-			    quid       	"3C56FDE702DD"
-			    label      	"applications"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseApplication"
-			    quidu      	"3C56EB4E006A"
-			    client_cardinality 	(value cardinality "0..n")
-			    Containment 	"By Value"
-			    is_navigable 	TRUE)
-			(object Role "$UNNAMED$15"
-			    quid       	"3C56FDE702DF"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseConfiguration"
-			    quidu      	"3C56E92C00BF"
-			    is_aggregate 	TRUE)))
-		(object Association "$UNNAMED$16"
-		    quid       	"3C56FDEF0018"
-		    roles      	(list role_list
-			(object Role "looseArchives"
-			    quid       	"3C56FDF00023"
-			    label      	"looseArchives"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseArchive"
-			    quidu      	"3C56EAAF006C"
-			    client_cardinality 	(value cardinality "0..n")
-			    Containment 	"By Value"
-			    is_navigable 	TRUE)
-			(object Role "looseApp"
-			    quid       	"3C56FDF00025"
-			    label      	"looseApp"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseApplication"
-			    quidu      	"3C56EB4E006A"
-			    is_navigable 	TRUE
-			    is_aggregate 	TRUE)))
-		(object Association "$UNNAMED$17"
-		    quid       	"3C5AF80200DF"
-		    roles      	(list role_list
-			(object Role "looseLibs"
-			    quid       	"3C5AF8030087"
-			    label      	"looseLibs"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseLibrary"
-			    quidu      	"3C5AF7AC0028"
-			    client_cardinality 	(value cardinality "0..n")
-			    Containment 	"By Value"
-			    is_navigable 	TRUE)
-			(object Role "looseWAR"
-			    quid       	"3C5AF8030089"
-			    label      	"looseWAR"
-			    supplier   	"Logical View::commonArchiveCore::looseconfig::LooseWARFile"
-			    quidu      	"3C5AF7DB018E"
-			    is_navigable 	TRUE
-			    is_aggregate 	TRUE))))
-	    logical_presentations 	(list unit_reference_list
-		(object ClassDiagram "Main"
-		    quid       	"3C56E9120173"
-		    title      	"Main"
-		    zoom       	100
-		    max_height 	28350
-		    max_width  	21600
-		    origin_x   	0
-		    origin_y   	0
-		    items      	(list diagram_item_list
-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseConfiguration" @1
-			    ShowCompartmentStereotypes 	TRUE
-			    IncludeAttribute 	TRUE
-			    IncludeOperation 	TRUE
-			    location   	(384, 160)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@1
-				location   	(162, 110)
-				fill_color 	13434879
-				nlines     	1
-				max_width  	444
-				justify    	0
-				label      	"LooseConfiguration")
-			    icon_style 	"Icon"
-			    line_color 	3342489
-			    fill_color 	13434879
-			    quidu      	"3C56E92C00BF"
-			    width      	462
-			    height     	124
-			    annotation 	8
-			    autoResize 	TRUE)
-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseArchive" @2
-			    ShowCompartmentStereotypes 	TRUE
-			    IncludeAttribute 	TRUE
-			    IncludeOperation 	TRUE
-			    location   	(1312, 224)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	TRUE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@2
-				location   	(1141, 174)
-				fill_color 	13434879
-				nlines     	1
-				max_width  	342
-				justify    	0
-				label      	"LooseArchive")
-			    icon_style 	"Icon"
-			    line_color 	3342489
-			    fill_color 	13434879
-			    quidu      	"3C56EAAF006C"
-			    width      	360
-			    height     	124
-			    annotation 	8
-			    autoResize 	TRUE)
-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseApplication" @3
-			    ShowCompartmentStereotypes 	TRUE
-			    IncludeAttribute 	TRUE
-			    IncludeOperation 	TRUE
-			    location   	(368, 848)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@3
-				location   	(161, 798)
-				fill_color 	13434879
-				nlines     	1
-				max_width  	414
-				justify    	0
-				label      	"LooseApplication")
-			    icon_style 	"Icon"
-			    line_color 	3342489
-			    fill_color 	13434879
-			    quidu      	"3C56EB4E006A"
-			    width      	432
-			    height     	124
-			    annotation 	8
-			    autoResize 	TRUE)
-			(object AssociationViewNew "$UNNAMED$14" @4
-			    location   	(281, 503)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C56FDE60173"
-			    roleview_list 	(list RoleViews
-				(object RoleView "applications" @5
-				    Parent_View 	@4
-				    location   	(-103, 375)
-				    font       	(object Font
-					size       	10
-					face       	"Arial"
-					bold       	FALSE
-					italics    	FALSE
-					underline  	FALSE
-					strike     	FALSE
-					color      	0
-					default_color 	TRUE)
-				    label      	(object SegLabel @6
-					Parent_View 	@5
-					location   	(143, 694)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	1
-					anchor_loc 	1
-					nlines     	1
-					max_width  	247
-					justify    	0
-					label      	"+applications"
-					pctDist    	0.679688
-					height     	139
-					orientation 	1)
-				    stereotype 	TRUE
-				    line_color 	3342489
-				    quidu      	"3C56FDE702DD"
-				    client     	@4
-				    supplier   	@3
-				    line_style 	3
-				    origin_attachment 	(281, 503)
-				    terminal_attachment 	(281, 786)
-				    label      	(object SegLabel @7
-					Parent_View 	@5
-					location   	(334, 649)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	2
-					anchor_loc 	1
-					nlines     	1
-					max_width  	15
-					justify    	0
-					label      	"0..n"
-					pctDist    	0.516854
-					height     	53
-					orientation 	0))
-				(object RoleView "$UNNAMED$15" @8
-				    Parent_View 	@4
-				    location   	(-103, 375)
-				    stereotype 	TRUE
-				    line_color 	3342489
-				    quidu      	"3C56FDE702DF"
-				    client     	@4
-				    supplier   	@1
-				    line_style 	3
-				    origin_attachment 	(281, 503)
-				    terminal_attachment 	(281, 221))))
-			(object AssociationViewNew "$UNNAMED$16" @9
-			    location   	(546, 284)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C56FDEF0018"
-			    roleview_list 	(list RoleViews
-				(object RoleView "looseArchives" @10
-				    Parent_View 	@9
-				    location   	(162, -324)
-				    font       	(object Font
-					size       	10
-					face       	"Arial"
-					bold       	FALSE
-					italics    	FALSE
-					underline  	FALSE
-					strike     	FALSE
-					color      	0
-					default_color 	TRUE)
-				    label      	(object SegLabel @11
-					Parent_View 	@10
-					location   	(941, 245)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	1
-					anchor_loc 	1
-					nlines     	1
-					max_width  	285
-					justify    	0
-					label      	"+looseArchives"
-					pctDist    	0.676245
-					height     	40
-					orientation 	0)
-				    stereotype 	TRUE
-				    line_color 	3342489
-				    quidu      	"3C56FDF00023"
-				    client     	@9
-				    supplier   	@2
-				    line_style 	3
-				    origin_attachment 	(546, 284)
-				    terminal_attachment 	(1132, 284)
-				    label      	(object SegLabel @12
-					Parent_View 	@10
-					location   	(995, 324)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	2
-					anchor_loc 	1
-					nlines     	1
-					max_width  	15
-					justify    	0
-					label      	"0..n"
-					pctDist    	0.766284
-					height     	40
-					orientation 	1))
-				(object RoleView "looseApp" @13
-				    Parent_View 	@9
-				    location   	(162, -324)
-				    font       	(object Font
-					size       	10
-					face       	"Arial"
-					bold       	FALSE
-					italics    	FALSE
-					underline  	FALSE
-					strike     	FALSE
-					color      	0
-					default_color 	TRUE)
-				    label      	(object SegLabel @14
-					Parent_View 	@13
-					location   	(566, 612)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	1
-					anchor_loc 	1
-					nlines     	1
-					max_width  	208
-					justify    	0
-					label      	"+looseApp"
-					pctDist    	0.702495
-					height     	103
-					orientation 	0)
-				    stereotype 	TRUE
-				    line_color 	3342489
-				    quidu      	"3C56FDF00025"
-				    client     	@9
-				    supplier   	@3
-				    vertices   	(list Points
-					(546, 284)
-					(463, 284)
-					(463, 786))
-				    line_style 	3
-				    origin_attachment 	(546, 284)
-				    terminal_attachment 	(463, 786))))
-			(object NoteView @15
-			    location   	(448, 1680)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@15
-				location   	(44, 1543)
-				fill_color 	13434879
-				nlines     	5
-				max_width  	772
-				label      	"Assumption:  For a given running server, there exists only one config with a set of applications")
-			    line_color 	3342489
-			    fill_color 	13434879
-			    width      	832
-			    height     	287)
-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseModule" @16
-			    ShowCompartmentStereotypes 	TRUE
-			    IncludeAttribute 	TRUE
-			    IncludeOperation 	TRUE
-			    location   	(1632, 896)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@16
-				location   	(1466, 846)
-				fill_color 	13434879
-				nlines     	1
-				max_width  	332
-				justify    	0
-				label      	"LooseModule")
-			    icon_style 	"Icon"
-			    line_color 	3342489
-			    fill_color 	13434879
-			    quidu      	"3C5ABEFE0290"
-			    width      	350
-			    height     	124
-			    annotation 	8
-			    autoResize 	TRUE)
-			(object InheritTreeView "" @17
-			    location   	(1312, 703)
-			    line_color 	3342489
-			    fill_color 	13434879
-			    supplier   	@2
-			    vertices   	(list Points
-				(1312, 703)
-				(1312, 286)))
-			(object InheritView "" @18
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C5AC03900EE"
-			    client     	@16
-			    supplier   	@2
-			    line_style 	3
-			    origin_attachment 	(1650, 834)
-			    terminal_attachment 	(1650, 703)
-			    drawSupplier 	@17)
-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseLibrary" @19
-			    ShowCompartmentStereotypes 	TRUE
-			    IncludeAttribute 	TRUE
-			    IncludeOperation 	TRUE
-			    location   	(928, 912)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@19
-				location   	(775, 862)
-				fill_color 	13434879
-				nlines     	1
-				max_width  	306
-				justify    	0
-				label      	"LooseLibrary")
-			    icon_style 	"Icon"
-			    line_color 	3342489
-			    fill_color 	13434879
-			    quidu      	"3C5AF7AC0028"
-			    width      	324
-			    height     	124
-			    annotation 	8
-			    autoResize 	TRUE)
-			(object ClassView "Class" "Logical View::commonArchiveCore::looseconfig::LooseWARFile" @20
-			    ShowCompartmentStereotypes 	TRUE
-			    IncludeAttribute 	TRUE
-			    IncludeOperation 	TRUE
-			    location   	(1648, 1328)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@20
-				location   	(1462, 1278)
-				fill_color 	13434879
-				nlines     	1
-				max_width  	372
-				justify    	0
-				label      	"LooseWARFile")
-			    icon_style 	"Icon"
-			    line_color 	3342489
-			    fill_color 	13434879
-			    quidu      	"3C5AF7DB018E"
-			    width      	390
-			    height     	124
-			    annotation 	8
-			    autoResize 	TRUE)
-			(object AssociationViewNew "$UNNAMED$17" @21
-			    location   	(1006, 1312)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C5AF80200DF"
-			    roleview_list 	(list RoleViews
-				(object RoleView "looseLibs" @22
-				    Parent_View 	@21
-				    location   	(-642, -128)
-				    font       	(object Font
-					size       	10
-					face       	"Arial"
-					bold       	FALSE
-					italics    	FALSE
-					underline  	FALSE
-					strike     	FALSE
-					color      	0
-					default_color 	TRUE)
-				    label      	(object SegLabel @23
-					Parent_View 	@22
-					location   	(791, 1017)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	1
-					anchor_loc 	1
-					nlines     	1
-					max_width  	196
-					justify    	0
-					label      	"+looseLibs"
-					pctDist    	0.905963
-					height     	107
-					orientation 	0)
-				    stereotype 	TRUE
-				    line_color 	3342489
-				    quidu      	"3C5AF8030087"
-				    client     	@21
-				    supplier   	@19
-				    vertices   	(list Points
-					(1006, 1312)
-					(897, 1312)
-					(897, 974))
-				    line_style 	3
-				    origin_attachment 	(1006, 1312)
-				    terminal_attachment 	(897, 974)
-				    label      	(object SegLabel @24
-					Parent_View 	@22
-					location   	(951, 1019)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	2
-					anchor_loc 	1
-					nlines     	1
-					max_width  	15
-					justify    	0
-					label      	"0..n"
-					pctDist    	0.900000
-					height     	54
-					orientation 	1))
-				(object RoleView "looseWAR" @25
-				    Parent_View 	@21
-				    location   	(-642, -128)
-				    font       	(object Font
-					size       	10
-					face       	"Arial"
-					bold       	FALSE
-					italics    	FALSE
-					underline  	FALSE
-					strike     	FALSE
-					color      	0
-					default_color 	TRUE)
-				    label      	(object SegLabel @26
-					Parent_View 	@25
-					location   	(1311, 1272)
-					font       	(object Font
-					    size       	10
-					    face       	"Arial"
-					    bold       	FALSE
-					    italics    	FALSE
-					    underline  	FALSE
-					    strike     	FALSE
-					    color      	0
-					    default_color 	TRUE)
-					anchor     	1
-					anchor_loc 	1
-					nlines     	1
-					max_width  	226
-					justify    	0
-					label      	"+looseWAR"
-					pctDist    	0.683973
-					height     	41
-					orientation 	0)
-				    stereotype 	TRUE
-				    line_color 	3342489
-				    quidu      	"3C5AF8030089"
-				    client     	@21
-				    supplier   	@20
-				    line_style 	3
-				    origin_attachment 	(1006, 1312)
-				    terminal_attachment 	(1453, 1312))))
-			(object InheritView "" @27
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C5AF7C2037C"
-			    client     	@19
-			    supplier   	@2
-			    line_style 	3
-			    origin_attachment 	(913, 850)
-			    terminal_attachment 	(913, 703)
-			    drawSupplier 	@17)
-			(object NoteView @28
-			    location   	(1952, 320)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object ItemLabel
-				Parent_View 	@28
-				location   	(1755, 133)
-				fill_color 	13434879
-				nlines     	7
-				max_width  	359
-				label      	
-|uri is either relative to the EAR root or WEB-INF/lib.
-|binariesPath and resourcesPath are absolute
-				)
-			    line_color 	3342489
-			    fill_color 	13434879
-			    width      	419
-			    height     	387)
-			(object InheritView "" @29
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C5AF7F5028F"
-			    client     	@20
-			    supplier   	@16
-			    line_style 	3
-			    origin_attachment 	(1606, 1266)
-			    terminal_attachment 	(1606, 958))
-			(object InheritView "" @30
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C753DEE00EA"
-			    client     	@3
-			    supplier   	@2
-			    line_style 	3
-			    origin_attachment 	(513, 786)
-			    terminal_attachment 	(513, 703)
-			    drawSupplier 	@17))))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "common archive"
-	    quid       	"3A0DB75100E1"
-	    title      	"common archive"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	918
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBJarFile" @31
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1440, 1792)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@31
-			location   	(1300, 1741)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	280
-			justify    	0
-			label      	"EJBJarFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DBB250022"
-		    width      	298
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ApplicationClientFile" @32
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1824, 1792)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@32
-			location   	(1584, 1741)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	480
-			justify    	0
-			label      	"ApplicationClientFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DBB810128"
-		    width      	498
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object NoteView @33
-		    location   	(1328, 272)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@33
-			location   	(906, 119)
-			fill_color 	13434879
-			nlines     	6
-			max_width  	808
-			label      	"The loading container is the original container from which the file was opened.  If the file is copied and the copy added to a new archive, the new file can still get an input stream on itself from the loading container.")
-		    line_color 	3342489
-		    fill_color 	13434879
-		    width      	868
-		    height     	319)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ReadOnlyDirectory" @34
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(896, 1136)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@34
-			location   	(670, 1085)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	452
-			justify    	0
-			label      	"ReadOnlyDirectory")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A54BEB0004D"
-		    width      	470
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::Container" @35
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(480, 832)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@35
-			location   	(315, 804)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	330
-			justify    	0
-			label      	"Container")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@35
-			location   	(315, 754)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	330
-			justify    	0
-			label      	"<<abstract>>")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A54BE55016E"
-		    width      	348
-		    height     	180
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @36
-		    location   	(480, 1013)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@35
-		    vertices   	(list Points
-			(480, 1013)
-			(480, 922)))
-		(object InheritView "" @37
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A54BF750295"
-		    client     	@34
-		    supplier   	@35
-		    line_style 	3
-		    origin_attachment 	(851, 1073)
-		    terminal_attachment 	(851, 1013)
-		    drawSupplier 	@36)
-		(object ClassView "Class" "Logical View::commonArchiveCore::File" @38
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(496, 384)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@38
-			location   	(212, 203)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	568
-			justify    	0
-			label      	"File")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DB75B00E5"
-		    width      	586
-		    height     	386
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$3" @39
-		    location   	(113, 623)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A54BF4E0022"
-		    roleview_list 	(list RoleViews
-			(object RoleView "files" @40
-			    Parent_View 	@39
-			    location   	(-591, -81)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @41
-				Parent_View 	@40
-				location   	(137, 274)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	108
-				justify    	0
-				label      	"+files"
-				pctDist    	0.830532
-				height     	50
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A54BF4E0024"
-			    client     	@39
-			    supplier   	@38
-			    vertices   	(list Points
-				(113, 623)
-				(113, 323)
-				(203, 323))
-			    line_style 	3
-			    origin_attachment 	(113, 623)
-			    terminal_attachment 	(203, 323)
-			    label      	(object SegLabel @42
-				Parent_View 	@40
-				location   	(163, 377)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "container" @43
-			    Parent_View 	@39
-			    location   	(-591, -81)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @44
-				Parent_View 	@43
-				location   	(199, 861)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	194
-				justify    	0
-				label      	"+container"
-				pctDist    	0.725352
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A54BF4E0023"
-			    client     	@39
-			    supplier   	@35
-			    vertices   	(list Points
-				(113, 623)
-				(113, 819)
-				(306, 819))
-			    line_style 	3
-			    origin_attachment 	(113, 623)
-			    terminal_attachment 	(306, 819)
-			    label      	(object SegLabel @45
-				Parent_View 	@43
-				location   	(249, 771)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.854460
-				height     	49
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$1" @46
-		    location   	(828, 699)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A3A953E00A9"
-		    roleview_list 	(list RoleViews
-			(object RoleView "loadingContainer" @47
-			    Parent_View 	@46
-			    location   	(332, 315)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @48
-				Parent_View 	@47
-				location   	(1003, 772)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	324
-				justify    	0
-				label      	"+loadingContainer"
-				pctDist    	0.249344
-				height     	175
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A3A953F0082"
-			    client     	@46
-			    supplier   	@35
-			    vertices   	(list Points
-				(828, 699)
-				(828, 821)
-				(654, 821))
-			    line_style 	3
-			    origin_attachment 	(828, 699)
-			    terminal_attachment 	(654, 821)
-			    label      	(object SegLabel @49
-				Parent_View 	@47
-				location   	(684, 875)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$2" @50
-			    Parent_View 	@46
-			    location   	(332, 315)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A3A953F00AA"
-			    client     	@46
-			    supplier   	@38
-			    vertices   	(list Points
-				(828, 699)
-				(828, 442)
-				(789, 442))
-			    line_style 	3
-			    origin_attachment 	(828, 699)
-			    terminal_attachment 	(789, 442))))
-		(object AttachView "" @51
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    client     	@33
-		    supplier   	@46
-		    line_style 	0)
-		(object InheritView "" @52
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A54C16801FC"
-		    client     	@35
-		    supplier   	@38
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::commonArchiveCore::Archive" @53
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 1216)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@53
-			location   	(51, 1135)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	570
-			justify    	0
-			label      	"Archive")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DB75F0177"
-		    width      	588
-		    height     	186
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @54
-		    location   	(336, 1510)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@53
-		    vertices   	(list Points
-			(336, 1510)
-			(336, 1309)))
-		(object InheritView "" @55
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A54BF5D018C"
-		    client     	@53
-		    supplier   	@35
-		    line_style 	3
-		    origin_attachment 	(266, 1123)
-		    terminal_attachment 	(266, 1013)
-		    drawSupplier 	@36)
-		(object ClassView "Class" "Logical View::commonArchiveCore::WARFile" @56
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1168, 1792)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@56
-			location   	(1045, 1741)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	246
-			justify    	0
-			label      	"WARFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DBB49018C"
-		    width      	264
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::RARFile" @57
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(928, 1792)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@57
-			location   	(819, 1741)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	218
-			justify    	0
-			label      	"RARFile")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A6DEBCF03C5"
-		    width      	236
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleFile" @58
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(928, 1536)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@58
-			location   	(797, 1485)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	262
-			justify    	0
-			label      	"ModuleFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DC1230136"
-		    width      	280
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @59
-		    location   	(928, 1706)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@58
-		    vertices   	(list Points
-			(928, 1706)
-			(928, 1599)))
-		(object InheritView "" @60
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC27D03BE"
-		    client     	@31
-		    supplier   	@58
-		    line_style 	3
-		    origin_attachment 	(1425, 1729)
-		    terminal_attachment 	(1425, 1706)
-		    drawSupplier 	@59)
-		(object InheritView "" @61
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC2790214"
-		    client     	@32
-		    supplier   	@58
-		    line_style 	3
-		    origin_attachment 	(1611, 1728)
-		    terminal_attachment 	(1611, 1706)
-		    drawSupplier 	@59)
-		(object InheritView "" @62
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC2CE00AE"
-		    client     	@58
-		    supplier   	@53
-		    line_style 	3
-		    origin_attachment 	(803, 1485)
-		    terminal_attachment 	(803, 1510)
-		    drawSupplier 	@54)
-		(object InheritView "" @63
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC29003E4"
-		    client     	@56
-		    supplier   	@58
-		    line_style 	3
-		    origin_attachment 	(1168, 1729)
-		    terminal_attachment 	(1168, 1706)
-		    drawSupplier 	@59)
-		(object InheritView "" @64
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A6DEBE701CB"
-		    client     	@57
-		    supplier   	@58
-		    line_style 	3
-		    origin_attachment 	(929, 1729)
-		    terminal_attachment 	(929, 1706)
-		    drawSupplier 	@59)
-		(object ClassView "Class" "Logical View::commonArchiveCore::EARFile" @65
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(736, 1984)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@65
-			location   	(627, 1933)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	218
-			justify    	0
-			label      	"EARFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DBB79007D"
-		    width      	236
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$0" @66
-		    location   	(647, 1720)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC23C0270"
-		    roleview_list 	(list RoleViews
-			(object RoleView "/moduleFiles" @67
-			    Parent_View 	@66
-			    location   	(-169, 760)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @68
-				Parent_View 	@67
-				location   	(621, 1832)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	272
-				justify    	0
-				label      	"+/moduleFiles"
-				pctDist    	-0.383333
-				height     	27
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A0DC23D014F"
-			    client     	@66
-			    supplier   	@58
-			    vertices   	(list Points
-				(647, 1720)
-				(647, 1660)
-				(821, 1660)
-				(821, 1599))
-			    line_style 	3
-			    origin_attachment 	(647, 1720)
-			    terminal_attachment 	(821, 1599)
-			    label      	(object SegLabel @69
-				Parent_View 	@67
-				location   	(714, 1691)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.432515
-				height     	31
-				orientation 	1))
-			(object RoleView "earFile" @70
-			    Parent_View 	@66
-			    location   	(-169, 760)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3A0DC23D02FE"
-			    client     	@66
-			    supplier   	@65
-			    line_style 	3
-			    origin_attachment 	(647, 1720)
-			    terminal_attachment 	(647, 1921)
-			    label      	(object SegLabel @71
-				Parent_View 	@70
-				location   	(613, 1897)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.884161
-				height     	35
-				orientation 	1))))
-		(object InheritView "" @72
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A36452000DE"
-		    client     	@65
-		    supplier   	@58
-		    line_style 	3
-		    origin_attachment 	(769, 1921)
-		    terminal_attachment 	(769, 1706)
-		    drawSupplier 	@59)
-		(object ClassView "Class" "Logical View::application::Application" @73
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1984, 2016)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@73
-			location   	(1828, 1937)
-			nlines     	1
-			max_width  	312
-			justify    	0
-			label      	"Application")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"38C030A803B1"
-		    width      	330
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$9" @74
-		    location   	(1336, 1986)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F297F6E0245"
-		    roleview_list 	(list RoleViews
-			(object RoleView "deploymentDescriptor" @75
-			    Parent_View 	@74
-			    location   	(600, 2)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @76
-				Parent_View 	@75
-				location   	(1722, 1945)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	423
-				justify    	0
-				label      	"+deploymentDescriptor"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297F6E0247"
-			    client     	@74
-			    supplier   	@73
-			    line_style 	3
-			    origin_attachment 	(1336, 1986)
-			    terminal_attachment 	(1819, 1986)
-			    label      	(object SegLabel @77
-				Parent_View 	@75
-				location   	(1770, 2040)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "earFile" @78
-			    Parent_View 	@74
-			    location   	(600, 2)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @79
-				Parent_View 	@78
-				location   	(950, 1945)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	149
-				justify    	0
-				label      	"+earFile"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297F6E0246"
-			    client     	@74
-			    supplier   	@65
-			    line_style 	3
-			    origin_attachment 	(1336, 1986)
-			    terminal_attachment 	(854, 1986))))
-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleRef" @80
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(624, 2384)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@80
-			location   	(494, 2333)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"ModuleRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3C711E300115"
-		    width      	278
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$4" @81
-		    location   	(441, 1836)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C711EF902F4"
-		    roleview_list 	(list RoleViews
-			(object RoleView "moduleFile" @82
-			    Parent_View 	@81
-			    location   	(121, -532)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @83
-				Parent_View 	@82
-				location   	(597, 1561)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	232
-				justify    	0
-				label      	"+moduleFile"
-				pctDist    	0.681922
-				height     	25
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C711EFA024C"
-			    client     	@81
-			    supplier   	@58
-			    vertices   	(list Points
-				(441, 1836)
-				(441, 1585)
-				(788, 1585))
-			    line_style 	3
-			    origin_attachment 	(441, 1836)
-			    terminal_attachment 	(788, 1585)
-			    label      	(object SegLabel @84
-				Parent_View 	@82
-				location   	(714, 1623)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.876481
-				height     	38
-				orientation 	1))
-			(object RoleView "$UNNAMED$5" @85
-			    Parent_View 	@81
-			    location   	(121, -532)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C711EFA024E"
-			    client     	@81
-			    supplier   	@80
-			    vertices   	(list Points
-				(441, 1836)
-				(441, 2390)
-				(485, 2390))
-			    line_style 	3
-			    origin_attachment 	(441, 1836)
-			    terminal_attachment 	(485, 2390))))
-		(object AssociationViewNew "$UNNAMED$6" @86
-		    location   	(716, 2184)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C712223019B"
-		    roleview_list 	(list RoleViews
-			(object RoleView "moduleRefs" @87
-			    Parent_View 	@86
-			    location   	(252, 40)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @88
-				Parent_View 	@87
-				location   	(857, 2270)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	254
-				justify    	0
-				label      	"+moduleRefs"
-				pctDist    	0.635036
-				height     	141
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C7122240246"
-			    client     	@86
-			    supplier   	@80
-			    line_style 	3
-			    origin_attachment 	(716, 2184)
-			    terminal_attachment 	(716, 2321)
-			    label      	(object SegLabel @89
-				Parent_View 	@87
-				location   	(670, 2281)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.715736
-				height     	47
-				orientation 	1))
-			(object RoleView "earFile" @90
-			    Parent_View 	@86
-			    location   	(252, 40)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @91
-				Parent_View 	@90
-				location   	(803, 2144)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	149
-				justify    	0
-				label      	"+earFile"
-				pctDist    	0.301471
-				height     	87
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C7122240248"
-			    client     	@86
-			    supplier   	@65
-			    line_style 	3
-			    origin_attachment 	(716, 2184)
-			    terminal_attachment 	(716, 2047)
-			    label      	(object SegLabel @92
-				Parent_View 	@90
-				location   	(755, 2068)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.854626
-				height     	39
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::application::Module" @93
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1984, 2352)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@93
-			location   	(1829, 2302)
-			nlines     	1
-			max_width  	310
-			justify    	0
-			label      	"Module")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"38C0322C0006"
-		    width      	328
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "" @94
-		    location   	(1988, 2198)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"38C0340003C1"
-		    roleview_list 	(list RoleViews
-			(object RoleView "modules" @95
-			    Parent_View 	@94
-			    location   	(164, 1462)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @96
-				Parent_View 	@95
-				location   	(1885, 2243)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	180
-				justify    	0
-				label      	"+modules"
-				pctDist    	0.484848
-				height     	104
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"38C0340102E7"
-			    client     	@94
-			    supplier   	@93
-			    line_style 	3
-			    origin_attachment 	(1988, 2198)
-			    terminal_attachment 	(1988, 2290)
-			    label      	(object SegLabel @97
-				Parent_View 	@95
-				location   	(2043, 2260)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.678010
-				height     	55
-				orientation 	0))
-			(object RoleView "application" @98
-			    Parent_View 	@94
-			    location   	(164, 1462)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"38C0340102E6"
-			    client     	@94
-			    supplier   	@73
-			    line_style 	3
-			    origin_attachment 	(1988, 2198)
-			    terminal_attachment 	(1988, 2107)
-			    label      	(object SegLabel @99
-				Parent_View 	@98
-				location   	(2042, 2116)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    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 "" @100
-		    location   	(1291, 2367)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C711E680350"
-		    roleview_list 	(list RoleViews
-			(object RoleView "" @101
-			    Parent_View 	@100
-			    location   	(-693, 15)
-			    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      	"3C711E6A023C"
-			    client     	@100
-			    supplier   	@80
-			    line_style 	3
-			    origin_attachment 	(1291, 2367)
-			    terminal_attachment 	(763, 2367))
-			(object RoleView "module" @102
-			    Parent_View 	@100
-			    location   	(-693, 15)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @103
-				Parent_View 	@102
-				location   	(1714, 2326)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	172
-				justify    	0
-				label      	"+module"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C711E6A023A"
-			    client     	@100
-			    supplier   	@93
-			    line_style 	3
-			    origin_attachment 	(1291, 2367)
-			    terminal_attachment 	(1820, 2367)
-			    label      	(object SegLabel @104
-				Parent_View 	@102
-				location   	(1767, 2421)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))))
-	(object ClassDiagram "descriptors"
-	    quid       	"3A1015D70250"
-	    title      	"descriptors"
-	    zoom       	89
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	137
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::commonArchiveCore::WARFile" @105
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(256, 1616)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@105
-			location   	(139, 1563)
-			nlines     	1
-			max_width  	234
-			justify    	0
-			label      	"WARFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3A0DBB49018C"
-		    width      	252
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::webapplication::Servlet" @106
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1408, 1840)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@106
-			location   	(1223, 1763)
-			nlines     	1
-			max_width  	370
-			justify    	0
-			label      	"Servlet")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"38C079140251"
-		    width      	388
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::webapplication::WebApp" @107
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(1408, 1392)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@107
-			location   	(1247, 1339)
-			nlines     	1
-			max_width  	322
-			justify    	0
-			label      	"WebApp")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@107
-			location   	(1247, 1289)
-			anchor     	10
-			nlines     	1
-			max_width  	322
-			justify    	0
-			label      	"<<component>>")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"38C077FB0352"
-		    width      	340
-		    height     	230
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$7" @108
-		    location   	(809, 1508)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F297D500278"
-		    roleview_list 	(list RoleViews
-			(object RoleView "deploymentDescriptor" @109
-			    Parent_View 	@108
-			    location   	(73, -316)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @110
-				Parent_View 	@109
-				location   	(1078, 1411)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	542
-				justify    	0
-				label      	"+deploymentDescriptor"
-				pctDist    	0.649222
-				height     	45
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297D50027A"
-			    client     	@108
-			    supplier   	@107
-			    line_style 	0
-			    label      	(object SegLabel @111
-				Parent_View 	@109
-				location   	(1203, 1487)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "warFile" @112
-			    Parent_View 	@108
-			    location   	(73, -316)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297D500279"
-			    client     	@108
-			    supplier   	@105
-			    line_style 	0)))
-		(object AssociationViewNew "" @113
-		    location   	(1408, 1628)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"38C11D230120"
-		    roleview_list 	(list RoleViews
-			(object RoleView "servlets" @114
-			    Parent_View 	@113
-			    location   	(-1056, -1028)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @115
-				Parent_View 	@114
-				location   	(1367, 1725)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	226
-				justify    	0
-				label      	"+servlets"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"38C11D2402E4"
-			    client     	@113
-			    supplier   	@106
-			    line_style 	0
-			    label      	(object SegLabel @116
-				Parent_View 	@114
-				location   	(1462, 1737)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "webApp" @117
-			    Parent_View 	@113
-			    location   	(-1056, -1028)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @118
-				Parent_View 	@117
-				location   	(1367, 1531)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	216
-				justify    	0
-				label      	"+webApp"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"38C11D2402DA"
-			    client     	@113
-			    supplier   	@107
-			    line_style 	0
-			    label      	(object SegLabel @119
-				Parent_View 	@117
-				location   	(1462, 1519)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::ejb::EnterpriseBean" @120
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2288, 1088)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@120
-			location   	(2103, 1011)
-			nlines     	1
-			max_width  	370
-			justify    	0
-			label      	"EnterpriseBean")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3780E71A010A"
-		    width      	388
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::ejb::EJBJar" @121
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 1072)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@121
-			location   	(628, 1016)
-			nlines     	1
-			max_width  	376
-			justify    	0
-			label      	"EJBJar")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@121
-			location   	(628, 966)
-			anchor     	10
-			nlines     	1
-			max_width  	376
-			justify    	0
-			label      	"<<component>>")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"371BC55D01E1"
-		    width      	394
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "ejbJarToEnterpriseBeans" @122
-		    location   	(1553, 1079)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object SegLabel @123
-			Parent_View 	@122
-			location   	(1553, 1020)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			anchor     	1
-			anchor_loc 	1
-			nlines     	1
-			max_width  	600
-			justify    	0
-			label      	"ejbJarToEnterpriseBeans"
-			pctDist    	0.500000
-			height     	60
-			orientation 	0)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"38FF3D1F003B"
-		    roleview_list 	(list RoleViews
-			(object RoleView "ejbJar" @124
-			    Parent_View 	@122
-			    location   	(-1087, -505)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @125
-				Parent_View 	@124
-				location   	(1121, 1117)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	181
-				justify    	0
-				label      	"+ejbJar"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"38FF3D1F03CB"
-			    client     	@122
-			    supplier   	@121
-			    line_style 	0
-			    label      	(object SegLabel @126
-				Parent_View 	@124
-				location   	(1068, 1022)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "enterpriseBeans" @127
-			    Parent_View 	@122
-			    location   	(-1087, -505)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @128
-				Parent_View 	@127
-				location   	(1985, 1126)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	419
-				justify    	0
-				label      	"+enterpriseBeans"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"38FF3D1F037A"
-			    client     	@122
-			    supplier   	@120
-			    line_style 	0
-			    label      	(object SegLabel @129
-				Parent_View 	@127
-				location   	(2039, 1031)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBJarFile" @130
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 704)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@130
-			location   	(201, 651)
-			nlines     	1
-			max_width  	270
-			justify    	0
-			label      	"EJBJarFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3A0DBB250022"
-		    width      	288
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$8" @131
-		    location   	(541, 861)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F297E2800B5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "deploymentDescriptor" @132
-			    Parent_View 	@131
-			    location   	(-339, -771)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @133
-				Parent_View 	@132
-				location   	(647, 875)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	542
-				justify    	0
-				label      	"+deploymentDescriptor"
-				pctDist    	0.617915
-				height     	54
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297E2800B7"
-			    client     	@131
-			    supplier   	@121
-			    line_style 	0
-			    label      	(object SegLabel @134
-				Parent_View 	@132
-				location   	(690, 902)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.953052
-				height     	59
-				orientation 	0))
-			(object RoleView "ejbJarFile" @135
-			    Parent_View 	@131
-			    location   	(-339, -771)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @136
-				Parent_View 	@135
-				location   	(421, 821)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	265
-				justify    	0
-				label      	"+ejbJarFile"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297E2800B6"
-			    client     	@131
-			    supplier   	@130
-			    line_style 	0)))
-		(object ClassView "Class" "Logical View::commonArchiveCore::ApplicationClientFile" @137
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(976, 640)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@137
-			location   	(735, 587)
-			nlines     	1
-			max_width  	482
-			justify    	0
-			label      	"ApplicationClientFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3A0DBB810128"
-		    width      	500
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::client::ApplicationClient" @138
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2320, 704)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@138
-			location   	(2121, 627)
-			nlines     	1
-			max_width  	398
-			justify    	0
-			label      	"ApplicationClient")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"38C028AB009E"
-		    width      	416
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$12" @139
-		    location   	(1669, 660)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F298462039D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$13" @140
-			    Parent_View 	@139
-			    location   	(-795, 100)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @141
-				Parent_View 	@140
-				location   	(1407, 655)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	60
-				justify    	0
-				label      	""
-				pctDist    	0.591809
-				height     	6
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F298462039E"
-			    client     	@139
-			    supplier   	@137
-			    line_style 	3
-			    origin_attachment 	(1669, 660)
-			    terminal_attachment 	(1226, 660))
-			(object RoleView "deploymentDescriptor" @142
-			    Parent_View 	@139
-			    location   	(-795, 100)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @143
-				Parent_View 	@142
-				location   	(2022, 619)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	542
-				justify    	0
-				label      	"+deploymentDescriptor"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F298462039F"
-			    client     	@139
-			    supplier   	@138
-			    line_style 	3
-			    origin_attachment 	(1669, 660)
-			    terminal_attachment 	(2112, 660)
-			    label      	(object SegLabel @144
-				Parent_View 	@142
-				location   	(2068, 714)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::commonArchiveCore::RARFile" @145
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1888, 1600)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@145
-			location   	(1776, 1547)
-			nlines     	1
-			max_width  	224
-			justify    	0
-			label      	"RARFile")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3A6DEBCF03C5"
-		    width      	242
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jca::Connector" @146
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2544, 1648)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@146
-			location   	(2413, 1571)
-			nlines     	1
-			max_width  	262
-			justify    	0
-			label      	"Connector")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3C609091010F"
-		    width      	280
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$10" @147
-		    location   	(2206, 1612)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F298321035F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$11" @148
-			    Parent_View 	@147
-			    location   	(-338, -36)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @149
-				Parent_View 	@148
-				location   	(2049, 1571)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	148
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2983220298"
-			    client     	@147
-			    supplier   	@145
-			    line_style 	3
-			    origin_attachment 	(2206, 1612)
-			    terminal_attachment 	(2009, 1612))
-			(object RoleView "deploymentDescriptor" @150
-			    Parent_View 	@147
-			    location   	(-338, -36)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @151
-				Parent_View 	@150
-				location   	(2363, 1571)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	"+deploymentDescriptor"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2983220284"
-			    client     	@147
-			    supplier   	@146
-			    line_style 	3
-			    origin_attachment 	(2206, 1612)
-			    terminal_attachment 	(2404, 1612)
-			    label      	(object SegLabel @152
-				Parent_View 	@150
-				location   	(2384, 1666)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::application::Application" @153
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2608, 352)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@153
-			location   	(2456, 275)
-			nlines     	1
-			max_width  	304
-			justify    	0
-			label      	"Application")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"38C030A803B1"
-		    width      	322
-		    height     	178
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::EARFile" @154
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(384, 400)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@154
-			location   	(272, 348)
-			nlines     	1
-			max_width  	224
-			justify    	0
-			label      	"EARFile")
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	16777215
-		    quidu      	"3A0DBB79007D"
-		    width      	242
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$9" @155
-		    location   	(1476, 348)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F297F6E0245"
-		    roleview_list 	(list RoleViews
-			(object RoleView "deploymentDescriptor" @156
-			    Parent_View 	@155
-			    location   	(660, -612)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @157
-				Parent_View 	@156
-				location   	(2098, 312)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	542
-				justify    	0
-				label      	"+deploymentDescriptor"
-				pctDist    	0.641571
-				height     	37
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297F6E0247"
-			    client     	@155
-			    supplier   	@153
-			    line_style 	3
-			    origin_attachment 	(1476, 348)
-			    terminal_attachment 	(2447, 348)
-			    label      	(object SegLabel @158
-				Parent_View 	@156
-				location   	(2313, 388)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.862061
-				height     	40
-				orientation 	1))
-			(object RoleView "earFile" @159
-			    Parent_View 	@155
-			    location   	(660, -612)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F297F6E0246"
-			    client     	@155
-			    supplier   	@154
-			    line_style 	3
-			    origin_attachment 	(1476, 348)
-			    terminal_attachment 	(505, 348))))))
-	(object ClassDiagram "ModuleRefs"
-	    quid       	"3C7125820051"
-	    title      	"ModuleRefs"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBModuleRef" @160
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(768, 416)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@160
-			location   	(593, 365)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	350
-			justify    	0
-			label      	"EJBModuleRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3C7125A802A5"
-		    width      	368
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::WebModuleRef" @161
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(960, 592)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@161
-			location   	(779, 541)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	362
-			justify    	0
-			label      	"WebModuleRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3C7125B10293"
-		    width      	380
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ClientModuleRef" @162
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1120, 784)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@162
-			location   	(931, 733)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	378
-			justify    	0
-			label      	"ClientModuleRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3C7125B90259"
-		    width      	396
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ConnectorModuleRef" @163
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1216, 1008)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@163
-			location   	(972, 957)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	488
-			justify    	0
-			label      	"ConnectorModuleRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3C7125C600E5"
-		    width      	506
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::application::WebModule" @164
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1760, 752)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@164
-			location   	(1516, 648)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	488
-			justify    	0
-			label      	"WebModule")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3904860D027B"
-		    width      	506
-		    height     	232
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::application::JavaClientModule" @165
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2000, 1024)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@165
-			location   	(1823, 945)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	354
-			justify    	0
-			label      	"JavaClientModule")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"390486730015"
-		    width      	372
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::application::EjbModule" @166
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1616, 512)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@166
-			location   	(1460, 433)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	312
-			justify    	0
-			label      	"EjbModule")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"390486830253"
-		    width      	330
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::application::ConnectorModule" @167
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2224, 1296)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@167
-			location   	(2044, 1217)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	360
-			justify    	0
-			label      	"ConnectorModule")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"39895BC00227"
-		    width      	378
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::WARFile" @168
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(256, 544)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@168
-			location   	(133, 493)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	246
-			justify    	0
-			label      	"WARFile")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DBB49018C"
-		    width      	264
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ApplicationClientFile" @169
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(368, 736)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@169
-			location   	(128, 685)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	480
-			justify    	0
-			label      	"ApplicationClientFile")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DBB810128"
-		    width      	498
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::RARFile" @170
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(608, 944)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@170
-			location   	(499, 893)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	218
-			justify    	0
-			label      	"RARFile")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A6DEBCF03C5"
-		    width      	236
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::commonArchiveCore::EJBJarFile" @171
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(176, 352)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@171
-			location   	(36, 301)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	280
-			justify    	0
-			label      	"EJBJarFile")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DBB250022"
-		    width      	298
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::application::Module" @172
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1968, 160)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@172
-			location   	(1793, 31)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	350
-			justify    	0
-			label      	"Module")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"38C0322C0006"
-		    width      	368
-		    height     	282
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @173
-		    location   	(1968, 396)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@172
-		    vertices   	(list Points
-			(1968, 396)
-			(1968, 301)))
-		(object InheritView "" @174
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"390486B60379"
-		    client     	@166
-		    supplier   	@172
-		    line_style 	3
-		    origin_attachment 	(1675, 421)
-		    terminal_attachment 	(1675, 396)
-		    drawSupplier 	@173)
-		(object InheritView "" @175
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"390486AE01C9"
-		    client     	@164
-		    supplier   	@172
-		    line_style 	3
-		    origin_attachment 	(1766, 636)
-		    terminal_attachment 	(1766, 396)
-		    drawSupplier 	@173)
-		(object InheritView "" @176
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"390486B201F6"
-		    client     	@165
-		    supplier   	@172
-		    line_style 	3
-		    origin_attachment 	(2000, 933)
-		    terminal_attachment 	(2000, 396)
-		    drawSupplier 	@173)
-		(object InheritView "" @177
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"39895BCA0218"
-		    client     	@167
-		    supplier   	@172
-		    line_style 	3
-		    origin_attachment 	(2350, 1204)
-		    terminal_attachment 	(2350, 396)
-		    drawSupplier 	@173)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleRef" @178
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(928, 112)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@178
-			location   	(798, 61)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"ModuleRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3C711E300115"
-		    width      	278
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @179
-		    location   	(928, 297)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@178
-		    vertices   	(list Points
-			(928, 297)
-			(928, 175)))
-		(object InheritView "" @180
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C712A1D0165"
-		    client     	@160
-		    supplier   	@178
-		    line_style 	3
-		    origin_attachment 	(809, 353)
-		    terminal_attachment 	(809, 297)
-		    drawSupplier 	@179)
-		(object InheritView "" @181
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C712A2001EB"
-		    client     	@161
-		    supplier   	@178
-		    line_style 	3
-		    origin_attachment 	(975, 528)
-		    terminal_attachment 	(975, 297)
-		    drawSupplier 	@179)
-		(object InheritView "" @182
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C712A2B025F"
-		    client     	@163
-		    supplier   	@178
-		    line_style 	3
-		    origin_attachment 	(1350, 944)
-		    terminal_attachment 	(1350, 297)
-		    drawSupplier 	@179)
-		(object ClassView "Class" "Logical View::commonArchiveCore::ModuleFile" @183
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 112)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@183
-			location   	(141, 61)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	262
-			justify    	0
-			label      	"ModuleFile")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3A0DC1230136"
-		    width      	280
-		    height     	126
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @184
-		    location   	(272, 266)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@183
-		    vertices   	(list Points
-			(272, 266)
-			(272, 175)))
-		(object InheritView "" @185
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC29003E4"
-		    client     	@168
-		    supplier   	@183
-		    line_style 	3
-		    origin_attachment 	(319, 481)
-		    terminal_attachment 	(319, 266)
-		    drawSupplier 	@184)
-		(object InheritView "" @186
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC2790214"
-		    client     	@169
-		    supplier   	@183
-		    line_style 	3
-		    origin_attachment 	(384, 673)
-		    terminal_attachment 	(384, 266)
-		    drawSupplier 	@184)
-		(object InheritView "" @187
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A0DC27D03BE"
-		    client     	@171
-		    supplier   	@183
-		    line_style 	3
-		    origin_attachment 	(225, 288)
-		    terminal_attachment 	(225, 266)
-		    drawSupplier 	@184)
-		(object InheritView "" @188
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3A6DEBE701CB"
-		    client     	@170
-		    supplier   	@183
-		    line_style 	3
-		    origin_attachment 	(600, 881)
-		    terminal_attachment 	(600, 266)
-		    drawSupplier 	@184)
-		(object AssociationViewNew "$UNNAMED$4" @189
-		    location   	(600, 112)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C711EF902F4"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$5" @190
-			    Parent_View 	@189
-			    location   	(360, -112)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @191
-				Parent_View 	@190
-				location   	(750, 71)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C711EFA024E"
-			    client     	@189
-			    supplier   	@178
-			    line_style 	0)
-			(object RoleView "moduleFile" @192
-			    Parent_View 	@189
-			    location   	(360, -112)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @193
-				Parent_View 	@192
-				location   	(489, 73)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	232
-				justify    	0
-				label      	"+moduleFile"
-				pctDist    	0.594557
-				height     	40
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C711EFA024C"
-			    client     	@189
-			    supplier   	@183
-			    line_style 	0
-			    label      	(object SegLabel @194
-				Parent_View 	@192
-				location   	(432, 166)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))))
-		(object InheritView "" @195
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C712A23031C"
-		    client     	@162
-		    supplier   	@178
-		    line_style 	3
-		    origin_attachment 	(1200, 720)
-		    terminal_attachment 	(1200, 297)
-		    drawSupplier 	@179)))))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/commonarchivecore.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/commonarchivecore.ecore
deleted file mode 100644
index 24c56a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/commonarchivecore.ecore
+++ /dev/null
@@ -1,91 +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="commonarchivecore"
-    nsURI="commonarchive.xmi" nsPrefix="org.eclipse.jst.j2ee.commonarchivecore">
-  <eClassifiers xsi:type="ecore:EClass" name="File">
-    <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">
-    <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"/>
-  </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">
-      <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">
-      <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/rose/ejb.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/ejb.ecore
deleted file mode 100644
index b68050c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/ejb.ecore
+++ /dev/null
@@ -1,586 +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="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="@since 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">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AssemblyDescriptor">

-    <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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="MethodTransaction">

-    <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="@since 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="@since 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="@since 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">

-    <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="@since 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">

-    <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="@since 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="@since 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="../../org.eclipse.emf.ecore/src-ecore/model/Ecore.ecore#//EAttribute">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Relationships">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Query">

-    <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="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EJBRelationshipRole">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="RoleSource">

-    <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="@since 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="@since 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="@since 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="@since 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="@since 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="@since 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="@since 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">

-    <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">

-    <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="@since 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="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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/rose/ejbschema.cat b/plugins/org.eclipse.jst.j2ee.core/rose/ejbschema.cat
deleted file mode 100644
index af72406..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/ejbschema.cat
+++ /dev/null
@@ -1,13576 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "ejb"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"IDL"

-	    name       	"uuid"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Ejb")))

-    quid       	"3780E272032D"

-    stereotype 	"metamodel"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"380567F50384"

-	    supplier   	"Logical View::java"

-	    quidu      	"36549F2C004E")

-	(object Visibility_Relationship

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"38FF3C1C0256"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "ContainerManagedEntity"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"3780E3230174"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3780E3230175"

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

-		    quidu      	"3780E6970351"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "version"

-		    quid       	"39BF039F01CD"

-		    documentation 	

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

-|

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

-|@default 2.x

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    initv      	"2.x"

-		    exportControl 	"Public")

-		(object ClassAttribute "abstractSchemaName"

-		    quid       	"39BF1F2302C6"

-		    documentation 	

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

-|

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

-|

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public"))

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

-	    quidu      	"3780E363009F"

-	    language   	"Java")

-	(object Class "MethodPermission"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3780E35000D0"

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

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"392ED399030E"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "unchecked"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3996B52C0209"

-		    type       	"boolean"

-		    exportControl 	"Public"))

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

-	    quidu      	"3780E36300A0"

-	    language   	"Java")

-	(object Class "AssemblyDescriptor"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3780E35000D4"

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

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

-	    quidu      	"3780E35B02C5"

-	    language   	"Java")

-	(object Class "MethodTransaction"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3780E35000DE"

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

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "transactionAttribute"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E35000DF"

-		    documentation 	

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

-|

-		    

-		    type       	"TransactionAttributeType"

-		    quidu      	"379F634503C0"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38055C050296"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

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

-	    quidu      	"3780E36300A1"

-	    language   	"Java")

-	(object Class "Session"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"3780E5F901EB"

-	    documentation 	

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

-|declaration consists of:

-|

-|    - an optional description

-|    - an optional display name

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

-|      icon file name

-|    - a name assigned to the enterprise bean

-|      in the deployment description

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

-|      remote interfaces, if any

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

-|      local interfaces, if any

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

-|      interface, if any

-|    - the session bean's implementation class

-|    - the session bean's state management type

-|    - the session bean's transaction management type

-|    - an optional declaration of the bean's

-|      environment entries

-|    - an optional declaration of the bean's EJB references

-|    - an optional declaration of the bean's local

-|      EJB references

-|    - an optional declaration of the bean's web

-|      service references

-|    - an optional declaration of the security role

-|      references

-|    - an optional declaration of the security identity

-|      to be used for the execution of the bean's methods

-|    - an optional declaration of the bean's resource

-|      manager connection factory references

-|    - an optional declaration of the bean's resource

-|      environment references.

-|    - an optional declaration of the bean's message

-|      destination references

-|

-|The elements that are optional are "optional" in the sense

-|that they are omitted when if lists represented by them are

-|empty.

-|

-|Either both the local-home and the local elements or both

-|the home and the remote elements must be specified for the

-|session bean.

-|

-|The service-endpoint element may only be specified if the

-|bean is a stateless session bean.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3780E3230120"

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

-		    quidu      	"3780E71A010A"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "transactionType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E62403CE"

-		    documentation 	

-|The transaction-type element specifies an enterprise bean's transaction management type.

-|

-|

-		    

-		    type       	"TransactionType"

-		    quidu      	"37FCA48702EF"

-		    exportControl 	"Public")

-		(object ClassAttribute "sessionType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E65B037D"

-		    type       	"SessionType"

-		    quidu      	"371BCA07010C"

-		    exportControl 	"Public"))

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

-	    quidu      	"3780E81A0159"

-	    language   	"Java")

-	(object Class "Entity"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"3780E6970351"

-	    documentation 	

-|The entity element declares an entity bean. The declaration consists of: an optional description; optional display name; optional small icon file name; optional large icon file name; a unique name assigned to the enterprise bean in the deployment descriptor; the names of the entity beanÂ’s home and remote interfaces, if any; the names of the entity beanÂ’s local home and local interface, if any; the entity beanÂ’s implementation class; the entity beanÂ’s persistence management type; the entity beanÂ’s primary key class name; an indication of the entity beanÂ’s reentrancy; an optional specification of the entity beanÂ’s cmp-version; an optional specification of the entity beanÂ’s abstract schema name; an optional list of container-managed fields; an optional specification of the primary key field; an optional declaration of the beanÂ’s environment entries; an optional declaration of the beanÂ’s EJB references; an optional declaration of the beanÂ’s local EJB references; an optional declaration of the security role references; an optional declaration of the security identity to be used for the execution of the beanÂ’s methods; an optional declaration of the beanÂ’s resource manager connection factory references; an optional declaration of the beanÂ’s resource environment references; an optional set of query declarations for finder and select methods for an entity bean with cmp-version 2.x.

-|The optional abstract-schema-name element must be specified for an entity bean with container managed persistence and cmp-version 2.x. The optional primkey-field may be present in the descriptor if the entityÂ’s persistence-type is Container. The optional cmp-version element may be present in the descriptor if the entityÂ’s persistence-type is Container. If the persistence-type is Container and the cmp-version element is not specified, its value defaults to 2.x.

-|The optional home and remote elements must be specified if the entity bean cmp-version is 1.x.

-|The optional local-home and local elements must be specified if the entity bean has a local home and local interface.

-|The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.

-|The other elements that are optional are "optional" in the sense that they are omitted if the lists represented by them are empty. At least one cmp-field element must be present in the descriptor if

-|the entityÂ’s persistence-type is Container and the cmp-version is 1.x, and none must not be present if the entityÂ’s persistence-type is Bean.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3780E8080095"

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

-		    quidu      	"3780E71A010A"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "reentrant"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3780E6A2031B"

-		    documentation 	

-|The reentrant element specifies whether an entity bean is reentrant or not.

-|

-		    

-		    type       	"boolean"

-		    exportControl 	"Public"))

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

-	    quidu      	"3780E81A015A"

-	    language   	"Java")

-	(object Class "EnterpriseBean"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Final"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Static"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateDefaultConstructor"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFinalizer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateStaticInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateInstanceInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateCode"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"DisableAutoSync"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ConstructorIs"

-		    value      	("Ctor_Set" 62)))

-	    quid       	"3780E71A010A"

-	    documentation 	

-|EnterpriseJavaBean is a class.  It can have instances, someone could write an 

-|instance document containing Departments and Employees.  It also has 

-|attributes, operations, and associations.  These are actually derived/filtered 

-|from its implementation classes and interfaces.  For mapping and browsing 

-|purposes, though, you would like the EJB to appear as a class.  

-|

-|In this light, even Session Beans can have associations and properties 

-|implemented by their bean.  For example, it would be meaningful to describe 

-|associations from a Session to the Entities which it uses to perform its work.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set)

-		    quid       	"3E4D54C30090"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E885D490290"

-		    type       	"String"

-		    exportControl 	"Public"))

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

-	    quidu      	"3780E81A015B"

-	    language   	"Java"

-	    abstract   	TRUE)

-	(object Class "TransactionAttributeType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"379F634503C0"

-	    documentation 	

-|NotSupported=1

-|Supports=2

-|Required=3

-|RequiresNew=4

-|Mandatory=5

-|Never=6

-|

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NotSupported"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3805573C007D"

-		    exportControl 	"Public")

-		(object ClassAttribute "Supports"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3805574F0373"

-		    exportControl 	"Public")

-		(object ClassAttribute "Required"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"38055754017C"

-		    exportControl 	"Public")

-		(object ClassAttribute "RequiresNew"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3805575D01B1"

-		    exportControl 	"Public")

-		(object ClassAttribute "Mandatory"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3805576101AC"

-		    exportControl 	"Public")

-		(object ClassAttribute "Never"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"380557690122"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "TransactionType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0012-005d9e6adec4:1")))

-	    quid       	"37FCA48702EF"

-	    documentation 	

-|Bean=1

-|Container=2

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Bean"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0013-005d9e6adec4:1")))

-		    quid       	"380551D30153"

-		    exportControl 	"Public")

-		(object ClassAttribute "Container"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0014-005d9e6adec4:1")))

-		    quid       	"380551DC0138"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SessionType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0015-005d9e6adec4:1")))

-	    quid       	"371BCA07010C"

-	    documentation 	

-|Stateful=1

-|Stateless=2

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Stateful"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0016-005d9e6adec4:1")))

-		    quid       	"371BCA150080"

-		    exportControl 	"Public")

-		(object ClassAttribute "Stateless"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0017-005d9e6adec4:1")))

-		    quid       	"371BCA220115"

-		    exportControl 	"Public")))

-	(object Class "EJBMethodCategory"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0018-005d9e6adec4:1")))

-	    quid       	"3810D0380344"

-	    documentation 	"The valid EJB method category names are: EJBHOMEMETHOD, EJBCREATEMETHOD, EJBFINDERMETHOD, EJBREMOTEMETHOD."

-	    language   	"Java")

-	(object Class "EJBJar"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0019-005d9e6adec4:1")))

-	    quid       	"371BC55D01E1"

-	    documentation 	

-|The root element of the EJB deployment descriptor. It contains an optional description of the ejb-jar file; optional display name; optional small icon file name; optional large icon file

-|name; mandatory structural information about all included enterprise beans; a descriptor for container managed relationships, if any; an optional application-assembly descriptor; and an optional name of an ejb-client-jar file for the ejb-jar.

-	    

-	    stereotype 	"component"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B1580347"

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

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "ejbClientJar"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-001e-005d9e6adec4:1")))

-		    quid       	"38BDA8B000E0"

-		    documentation 	

-|The optional ejb-client-jar element specifies a JAR file that contains the class files necessary for a client program to access the enterprise beans in the ejb-jar file. The Deployer should make the ejb-client JAR file accessible to the client's class-loader.  Example:<ejb-client-jar>employee_service_client.jar</ejb-client-jar>

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "version"

-		    quid       	"3E55AE3B0217"

-		    documentation 	

-|@since J2EE1.4

-|The version specifies the version of the

-|    EJB specification that the instance document must

-|    comply with. This information enables deployment tools

-|    to validate a particular EJB Deployment

-|    Descriptor with respect to a specific version of the EJB

-|    schema.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MethodElement"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-001f-005d9e6adec4:1")))

-	    quid       	"392ED22D008A"

-	    documentation 	

-|The method element is used to denote a method of an enterprise bean's

-|home or remote interface, or a set of methods. The ejb-name element

-|must be the name of one of the enterprise beans in declared in the

-|deployment descriptor; the optional method-intf element allows to

-|distinguish between a method with the same signature that is defined in

-|both the home and remote interface; the method-name element specifies

-|the method name; and the optional method-params elements identify a

-|single method among multiple methods with an overloaded method name.

-|

-|There are three possible styles of the method element syntax:

-|

-|1. 	<method>

-|		<ejb-name>EJBNAME</ejb-name>

-|   		<method-name>*</method-name>

-|	</method>

-|

-|   This style is used to refer to all the methods of the specified

-|   enterprise bean's home and remote interfaces.

-|

-|2. 	<method>

-|		<ejb-name>EJBNAME</ejb-name>

-|   		<method-name>METHOD</method-name>

-|	</method>>

-|

-|   This style is used to refer to the specified method of the

-|   specified enterprise bean. If there are multiple methods with

-|   the same overloaded name, the element of this style refers to

-|   all the methods with the overloaded name.

-|

-|

-|

-|

-|

-|3. 	<method>

-|		<ejb-name>EJBNAME</ejb-name>

-|   		<method-name>METHOD</method-name>

-|		<method-params>

-|   			<method-param>PARAM-1</method-param>

-|   			<method-param>PARAM-2</method-param>

-|          			...

-|   			<method-param>PARAM-n</method-param>

-|		</method-params>

-|	<method>	

-|

-|   This style is used to refer to a single method within a set of

-|   methods with an overloaded name. PARAM-1 through PARAM-n are the

-|   fully-qualified Java types of the method's input parameters (if

-|   the method has no input arguments, the method-params element

-|   contains no method-param elements). Arrays are specified by the

-|   array element's type, followed by one or more pair of square

-|   brackets (e.g. int[][]).

-|

-|

-|Used in: method-permission and container-transaction

-|

-|Examples:

-|

-|    Style 1: The following method element refers to all the methods of

-|		the EmployeeService bean's home and remote interfaces:

-|

-|		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>*</method-name>

-|		</method>

-|

-|	Style 2: The following method element refers to all the create

-|		methods of the EmployeeService bean's home interface:

-|

-|    		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>create</method-name>

-|		</method>

-|

-|	Style 3: The following method element refers to the

-|		create(String firstName, String LastName) method of the

-|	 	EmployeeService bean's home interface.

-|

-|    		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>create</method-name>

-|			<method-params>

-|				<method-param>java.lang.String</method-param>

-|				<method-param>java.lang.String</method-param>

-|			</method-params>

-|		</method>

-|

-|	

-|	The following example illustrates a Style 3 element with

-|	more complex parameter types. The method

-|			foobar(char s, int i, int[] iar, mypackage.MyClass mycl,

-|				mypackage.MyClass[][] myclaar)

-|        would be specified as:

-|

-|    		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-name>foobar</method-name>

-|			<method-params>

-|				<method-param>char</method-param>

-|				<method-param>int</method-param>

-|				<method-param>int[]</method-param>

-|				<method-param>mypackage.MyClass</method-param>

-|				<method-param>mypackage.MyClass[][]</method-param>

-|			</method-params>

-|		</method>

-|

-|	The optional method-intf element can be used when it becomes

-|   necessary to differentiate between a method defined in the home

-|   interface and a method with the same name and signature that is

-|   defined in the remote interface.

-|

-|	For example, the method element

-|

-|   		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-intf>Remote</method-intf>

-|			<method-name>create</method-name>

-|			<method-params>

-|				<method-param>java.lang.String</method-param>

-|				<method-param>java.lang.String</method-param>

-|			</method-params>

-|		</method>

-|

-|	can be used to differentiate the create(String, String) method

-|   defined in the remote interface from the create(String, String)

-|   method defined in the home interface, which would be defined as

-|

-|   		<method>

-|			<ejb-name>EmployeeService</ejb-name>

-|			<method-intf>Home</method-intf>

-|			<method-name>create</method-name>

-|			<method-params>

-|				<method-param>java.lang.String</method-param>

-|				<method-param>java.lang.String</method-param>

-|			</method-params>

-|		</method>

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0020-005d9e6adec4:1")))

-		    quid       	"392ED2640378"

-		    documentation 	

-|The method-name element contains a name of an enterprise bean method,

-|or the asterisk (*) character. The asterisk is used when the element

-|denotes all the methods of an enterprise bean's remote and home

-|interfaces.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "parms"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0021-005d9e6adec4:1")))

-		    quid       	"392ED2640396"

-		    documentation 	

-|The method-params element contains a list of the fully-qualified Java type names of the method parameters.  In the current implementation this is a space delimitted String.  A null string indicates a generic method element that can apply to multiple methods with the same name.  An empty string indicates a method with zero parameters.  In future implementations (post V5), this field will be deprecated and migrated to use the multi-valued params field and the isZeroParams flag.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0022-005d9e6adec4:1"))

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"392ED26403B4"

-		    type       	"MethodElementKind"

-		    quidu      	"392ED2E70240"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0023-005d9e6adec4:1")))

-		    quid       	"398846C20370"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MethodElementKind"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0024-005d9e6adec4:1")))

-	    quid       	"392ED2E70240"

-	    documentation 	

-|@since J2EE1.4 added ServiceEndpoint

-|Unspecified=0

-|Remote=1

-|Home=2

-|Local=3

-|LocalHome=4

-|ServiceEndpoint=5

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Unspecified"

-		    quid       	"3CB47A280180")

-		(object ClassAttribute "Remote"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0026-005d9e6adec4:1")))

-		    quid       	"392ED311024A")

-		(object ClassAttribute "Home"

-		    quid       	"3CB47A730188")

-		(object ClassAttribute "Local"

-		    quid       	"39886E0D0301")

-		(object ClassAttribute "LocalHome"

-		    quid       	"39886E0F0209")

-		(object ClassAttribute "ServiceEndpoint"

-		    quid       	"3E4D28A10333")))

-	(object Class "CMPAttribute"

-	    quid       	"3A2288630003"

-	    documentation 	

-|Describes a container-managed field. The field element includes an optional description of the field, and the name of the field.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3A2288770341"

-		    supplier   	"Logical View::ecore::EAttribute"

-		    quidu      	"39238472039D"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"399ABC1500F0"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the cmr field.

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "Relationships"

-	    quid       	"39BEF81703B3"

-	    documentation 	"The relationships describes the relationships in which entity beans with container managed persistence participate. The relationships element contains an optional description; and a list of ejb-relation elements, which specify the container managed relationships."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF09670239"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the collection of relationships.

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "Query"

-	    quid       	"39BF02710327"

-	    documentation 	

-|The query element is used to specify a finder or select query. It contains an optional description of the query; the specification of the finder or select method it is used by; a specification of the return type mapping, if any, if the query is for a select method; and the EJB QL query string that defines the query. Queries that are expressible in EJB QL must use the ejb-ql element to specify the query. If a query

-|is not expressible in EJB QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF050D004D"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "ejbQL"

-		    quid       	"39BF058C0399"

-		    documentation 	

-|Contains the EJB QL query string that defines a finder or select query. This element is defined within the scope of a query element whose contents specify the finder or the select method that uses the query. The content must be a valid EJB QL query string for the entity bean for which the query is specified. The ejb-ql element must be specified for all queries that are expressible in EJB QL.

-|

-|@invariant The value must be a valid EJB QL query string for the entity bean or dependent object class for which the query is specified.

-|@invariant The ejb-ql element must be specified for all queries that are expressible in EJB QL.

-|

-|Example:

-|<query>

-|<query-method>

-|<method-name>ejbSelectPendingLineitems</method-name>

-|<method-params/>

-|</query-method>

-|<ejb-ql>SELECT ENTITY(l)

-|FROM LineItems l

-|WHERE l.shipped is FALSE

-|</ejb-ql>

-|</query>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "returnTypeMapping"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3988710702CA"

-		    documentation 	"The return-type-mapping element is used in the query element to specify whether an abstract schema type that is returned by a query for a select method is to be mapped to an EJBLocalObject or EJBObject type.  The value of the return-type-mapping element, if specified must be one of the following."

-		    stereotype 	"0..1"

-		    type       	"ReturnTypeMapping"

-		    quidu      	"398870D30276"

-		    exportControl 	"Public")))

-	(object Class "EJBRelation"

-	    quid       	"39BF0C0203BF"

-	    documentation 	

-|@since J2EE1.3

-|The ejb-relation element describes a relationship between two entity beans with container managed persistence. An ejb-relation element contains a description; an optional ejb-relation-name element; and exactly two relationship role declarations, defined by the ejb-relationship-roles. The name of the relationship, if specified, is unique within the ejb-jar file.

-|

-|@invariant The name of the relationship, if specified, is unique within the ejb-jar file.

-|@invariant self.relationshipRoles.size == 2

-|@invariant self.relationshipRoles[0].name != self.relationshipRoles[1].name

-|

-|@migration EJB1.1 Moved from ejbext::EjbRelationshipRole contained under ejbext::EJBJarExtension

-|@migration EJB1.1 added optional attribute, description:String

-|@migration EJB1.1 added optional attribute, name:String (May have been inherited from RefBaseObject previously)

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF0D4A02BC"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

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

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"39BF0D6F037E"

-		    documentation 	

-|The name of the relationship. If specified, must be unique within the ejb-jar file.

-|@invariant self.name unique within Set<collect(ejbJar.ejbRelations.name)>

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "EJBRelationshipRole"

-	    quid       	"39BF0DD0023D"

-	    documentation 	

-|@since J2EE1.3

-|The ejb-relationship-role element describes a role within a relationship.

-|There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is "not aware" of the relationship.

-|

-|@invariant multiplicity != null

-|@invariant roleSource != null

-|@invariant Cascade delete can only be specified in an EJBRelationshipRole element in which the roleSource element specifies a dependent object class. 

-|@invariant Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.

-|

-|Example:

-|<ejb-relation>

-|  <ejb-relation-name>Product-LineItem</ejb-relation-name>

-|  <ejb-relationship-role>

-|    <ejb-relationship-role-name>product-has-lineitems</ejb-relationship-role-name>

-|    <multiplicity>One</multiplicity>

-|    <relationship-role-source>

-|      <ejb-name>ProductEJB</ejb-name>

-|    </relationship-role-source>

-|  </ejb-relationship-role>

-|...

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"39BF102601B0"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

-|The description is used by the ejb-jar file producer to provide text describing the ejb relationship role.

-|

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

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roleName"

-		    quid       	"39BF11580052"

-		    documentation 	

-|Defines a name for a role that is unique within an ejb-relation. Different relationships can use the same name for a role.

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "multiplicity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF12E902CF"

-		    documentation 	

-|Describes the multiplicity of the role that participates in a relation.

-|

-|The multiplicity element must be one of the two following:

-|     One

-|     Many

-|

-		    

-		    type       	"MultiplicityKind"

-		    quidu      	"399AEBCB02B7"

-		    exportControl 	"Public")

-		(object ClassAttribute "cascadeDelete"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF161E02EE"

-		    documentation 	

-|Specifies that, within a particular relationship, the lifetime of one or more entity beans is dependent upon the lifetime of another entity bean. The cascade-delete element can Cascade delete can only be specified for an EJBRelationshipRole contained in an EJBrelation in which the other EJBRelationshipRole element specifies a multiplicity of One.

-|

-|

-|

-		    

-		    type       	"boolean"

-		    exportControl 	"Public")))

-	(object Class "RoleSource"

-	    quid       	"39BF147500E4"

-	    documentation 	

-|Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.

-|@invariant The content of each role-source element shall refer to an existing entity bean, entity bean reference.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3988849102EB"

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

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "CMRField"

-	    quid       	"39BF1810004B"

-	    documentation 	

-|@since J2EE1.3

-|Describes the bean provider's view of a relationship. It consists of an optional description, and the name and the class type of a field in the source of a role of a relationship. The CMRField::name element corresponds to the name used for the get and set accessor methods for the relationship. The CMRField::type element is used only for collection-valued CMRFields. It specifies the type of the collection that is used (a java class name).

-|

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"399AD4690170"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003")))

-	(object Class "MessageDriven"

-	    quid       	"39BF3248010B"

-	    documentation 	

-|The message-driven element declares a message-driven

-|bean. The declaration consists of:

-|

-|    - an optional description

-|    - an optional display name

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

-|      icon file name.

-|    - a name assigned to the enterprise bean in

-|      the deployment descriptor

-|    - the message-driven bean's implementation class

-|    - an optional declaration of the bean's messaging

-|      type

-|    - the message-driven bean's transaction management type

-|    - an optional declaration of the bean's

-|      message-destination-type

-|    - an optional declaration of the bean's

-|      message-destination-link

-|    - an optional declaration of the message-driven bean's

-|      activation configuration properties

-|    - an optional declaration of the bean's environment

-|      entries

-|    - an optional declaration of the bean's EJB references

-|    - an optional declaration of the bean's local EJB

-|      references

-|    - an optional declaration of the bean's web service

-|      references

-|    - an optional declaration of the security

-|      identity to be used for the execution of the bean's

-|      methods

-|    - an optional declaration of the bean's

-|      resource manager connection factory

-|      references

-|    - an optional declaration of the bean's resource

-|      environment references.

-|    - an optional declaration of the bean's message

-|      destination references

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39BF3253026F"

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

-		    quidu      	"3780E71A010A"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "transactionType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF33870164"

-		    documentation 	

-|The transaction-type element specifies an enterprise bean's transaction management type.

-|

-|The transaction-type element must be one of the two following: Bean, Container

-		    

-		    stereotype 	"0..1"

-		    type       	"TransactionType"

-		    quidu      	"37FCA48702EF"

-		    exportControl 	"Public")

-		(object ClassAttribute "messageSelector"

-		    quid       	"39BF33960133"

-		    documentation 	

-|The message-selector element is used to specify the JMS message

-|selector to be used in determining which messages a message-driven

-|bean is to receive.

-|

-|Example value: 

-|JMSType = `car' AND color = `blue' AND weight > 2500

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "acknowledgeMode"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF33AE0160"

-		    documentation 	

-|an optional declaration of the acknowledgment mode for the message-driven bean if bean-managed transaction demarcation is used (ie. self.transactionType = Bean)

-|

-|The acknowledge-mode specifies whether JMS AUTO_ACKNOWLEDGE or DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used for the onMessage message of a message-driven bean that uses bean managed transaction demarcation.

-|

-|The acknowledge-mode must be one of the two following:  Auto-acknowledge, Dups-ok-acknowledge

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"AcknowledgeMode"

-		    quidu      	"39BF36D703E4"

-		    exportControl 	"Public")

-		(object ClassAttribute "link"

-		    quid       	"4057A525008A"

-		    documentation 	

-| - an optional declaration of the bean's

-|	      message-destination-link

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageDrivenDestination"

-	    quid       	"39BF33F10044"

-	    documentation 	"The message-driven-destination element provides advice to the Deployer as to whether a message-driven bean is intended for a Queue or a Topic. The declaration consists of: the type of the message-driven bean's intended destination and an optional declaration of whether a durable or non-durable subscription should be used if the destination-type is javax.jms.Topic."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "type"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF386B002D"

-		    documentation 	

-|The destination-type element specifies the type of the JMS destination. The type is specified by the Java interface expected to be implemented by the destination.

-|

-|The destination-type element must be one of the two following: javax.jms.Queue, javax.jms.Topic

-		    

-		    type       	"DestinationType"

-		    quidu      	"39978F5C0106"

-		    exportControl 	"Public")

-		(object ClassAttribute "subscriptionDurability"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39BF389B0087"

-		    documentation 	

-|The subscription-durability element specifies whether a JMS topic subscription is intended to be durable or nondurable.

-|

-|The subscription-durability element must be one of the two following:  Durable, NonDurable

-|

-		    

-		    type       	"SubscriptionDurabilityKind"

-		    quidu      	"39BF38F0029C"

-		    exportControl 	"Public")))

-	(object Class "AcknowledgeMode"

-	    quid       	"39BF36D703E4"

-	    documentation 	

-|Auto-acknowledge=0

-|Dups-ok-acknowledge=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "AutoAcknowledge"

-		    quid       	"39BF36FA03BC"

-		    exportControl 	"Public")

-		(object ClassAttribute "DupsOkAcknowledge"

-		    quid       	"39BF3701038A"

-		    exportControl 	"Public")))

-	(object Class "SubscriptionDurabilityKind"

-	    quid       	"39BF38F0029C"

-	    documentation 	

-|Durable=0

-|NonDurable=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Durable"

-		    quid       	"39BF391B01AD"

-		    exportControl 	"Public")

-		(object ClassAttribute "NonDurable"

-		    quid       	"39BF391D02DC"

-		    exportControl 	"Public")))

-	(object Class "ReturnTypeMapping"

-	    quid       	"398870D30276"

-	    documentation 	

-|Local=0

-|Remote=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Local"

-		    quid       	"398870E402E8"

-		    exportControl 	"Public")

-		(object ClassAttribute "Remote"

-		    quid       	"3E9B0B4F002A"

-		    exportControl 	"Public")))

-	(object Class "ExcludeList"

-	    quid       	"3997216E0147"

-	    documentation 	

-|The exclude list element defines a set of methods which the Assembler marks to be uncallable. It contains one or more methods.

-|

-|If the method permission relation contains methods that are in the exclude list, the Deployer must consider those methods to be uncallable.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"399721A100A0"

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

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DestinationType"

-	    quid       	"39978F5C0106"

-	    documentation 	

-|Queue=0

-|Topic=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "Queue"

-		    quid       	"39978F680352"

-		    exportControl 	"Public")

-		(object ClassAttribute "Topic"

-		    quid       	"39978F7C0026"

-		    exportControl 	"Public")))

-	(object Class "QueryMethod"

-	    quid       	"399ACD9C02DF"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"399AD23802A9"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A")))

-	(object Class "MultiplicityKind"

-	    quid       	"399AEBCB02B7"

-	    documentation 	

-|One=0

-|Many=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "One"

-		    quid       	"399AEBEA0030"

-		    exportControl 	"Public")

-		(object ClassAttribute "Many"

-		    quid       	"399AEBEE0375"

-		    exportControl 	"Public")))

-	(object Class "ActivationConfigProperty"

-	    quid       	"3E4D1A1A00BF"

-	    documentation 	

-|@since J2EE1.4

-|The activation-config-propertyType contains a name/value

-|configuration property pair for a message-driven bean.

-|

-|The properties that are recognized for a particular

-|message-driven bean are determined by the messaging type.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "value"

-		    quid       	"3E4D1A36034A"

-		    documentation 	

-|The activation-config-property-value element

-|        contains the value for an activation configuration

-|        property of a message-driven bean.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3E4D1A49024D"

-		    documentation 	

-|The activation-config-property-name element contains

-|        the name for an activation configuration property of

-|        a message-driven bean.

-|

-|        For JMS message-driven beans, the following property

-|        names are recognized: acknowledgeMode,

-|        messageSelector, destinationType, subscriptionDurability

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ActivationConfig"

-	    quid       	"3E4D1A7E0131"

-	    documentation 	

-|@since J2EE1.4

-|The activation-configType defines information about the

-|expected configuration properties of the message-driven bean

-|in its operational environment. This may include information

-|about message acknowledgement, message selector, expected

-|destination type, etc.

-|

-|The configuration information is expressed in terms of

-|name/value configuration properties.

-|

-|The properties that are recognized for a particular

-|message-driven bean are determined by the messaging type.

-	    )

-	(object Association "$UNNAMED$0"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0028-005d9e6adec4:1")))

-	    quid       	"3780E323012D"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0029-005d9e6adec4:1")))

-		    quid       	"3780E323012E"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)

-		(object Role "environmentProperties"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002a-005d9e6adec4:1")))

-		    quid       	"3780E323012F"

-		    label      	"environmentProperties"

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

-		    quidu      	"371BC77800E2"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002b-005d9e6adec4:1")))

-	    quid       	"3780E3230139"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$3"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002c-005d9e6adec4:1")))

-		    quid       	"3780E323013A"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)

-		(object Role "resourceRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002d-005d9e6adec4:1")))

-		    quid       	"3780E323013B"

-		    label      	"resourceRefs"

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

-		    quidu      	"371BC79303C6"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "EjbToRoles"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002e-005d9e6adec4:1")))

-	    quid       	"3780E3230144"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$4"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-002f-005d9e6adec4:1")))

-		    quid       	"3780E3230145"

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

-		    quidu      	"3780E71A010A"

-		    is_aggregate 	TRUE)

-		(object Role "securityRoleRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0030-005d9e6adec4:1")))

-		    quid       	"3780E3230146"

-		    label      	"securityRoleRefs"

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

-		    quidu      	"371BC7A0025C"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "AssemblyDescriptorToMethodPermissions"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0031-005d9e6adec4:1")))

-	    quid       	"3780E35000D1"

-	    roles      	(list role_list

-		(object Role "assemblyDescriptor"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0032-005d9e6adec4:1")))

-		    quid       	"3780E35000D2"

-		    label      	"assemblyDescriptor"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "methodPermissions"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0033-005d9e6adec4:1")))

-		    quid       	"3780E35000D3"

-		    label      	"methodPermissions"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "MethodPermissionToMethods"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0034-005d9e6adec4:1")))

-	    quid       	"3780E35000EA"

-	    roles      	(list role_list

-		(object Role "/methods"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0035-005d9e6adec4:1")))

-		    quid       	"3780E35000EB"

-		    label      	"/methods"

-		    supplier   	"Logical View::java::Method"

-		    quidu      	"3654AE910271"

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

-		    is_navigable 	TRUE)

-		(object Role "/methodPermission"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0036-005d9e6adec4:1")))

-		    quid       	"3780E35000EC"

-		    label      	"/methodPermission"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

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

-	    derived    	TRUE)

-	(object Association "AssemblyDescriptorToMethodTransactions"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0037-005d9e6adec4:1")))

-	    quid       	"3780E35000D5"

-	    roles      	(list role_list

-		(object Role "assemblyDescriptor"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0038-005d9e6adec4:1")))

-		    quid       	"3780E35000D6"

-		    label      	"assemblyDescriptor"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "methodTransactions"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0039-005d9e6adec4:1")))

-		    quid       	"3780E35000D7"

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

-		    label      	"methodTransactions"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$5"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003a-005d9e6adec4:1")))

-	    quid       	"3780E35000E0"

-	    roles      	(list role_list

-		(object Role "/methods"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003b-005d9e6adec4:1")))

-		    quid       	"3780E35000E1"

-		    label      	"/methods"

-		    supplier   	"Logical View::java::Method"

-		    quidu      	"3654AE910271"

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

-		    is_navigable 	TRUE)

-		(object Role "/transactions"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003c-005d9e6adec4:1")))

-		    quid       	"3780E35000E2"

-		    label      	"/transactions"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

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

-	(object Association "ejbClass"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003d-005d9e6adec4:1")))

-	    quid       	"380FDC3402C7"

-	    documentation 	"The ejb-class element contains the fully-qualified name of the enterprise bean's class.  Example: <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>"

-	    roles      	(list role_list

-		(object Role "ejbClass"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003e-005d9e6adec4:1")))

-		    quid       	"380FDC3501EC"

-		    label      	"ejbClass"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-003f-005d9e6adec4:1")))

-		    quid       	"380FDC3501F6"

-		    label      	"ejb"

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

-		    quidu      	"3780E71A010A")))

-	(object Association "homeInterface"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0040-005d9e6adec4:1")))

-	    quid       	"380FDC3701C7"

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

-	    roles      	(list role_list

-		(object Role "homeInterface"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0041-005d9e6adec4:1")))

-		    quid       	"380FDC440143"

-		    label      	"homeInterface"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0042-005d9e6adec4:1")))

-		    quid       	"380FDC44014D"

-		    label      	"ejb"

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

-		    quidu      	"3780E71A010A")))

-	(object Association "remoteInterface"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0043-005d9e6adec4:1")))

-	    quid       	"380FDC46006A"

-	    documentation 	

-|The remote element contains the fully-qualified name of the enterprise bean's remote interface.

-|Example:	<remote>com.wombat.empl.EmployeeService</remote>

-|

-	    

-	    roles      	(list role_list

-		(object Role "remoteInterface"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0044-005d9e6adec4:1")))

-		    quid       	"380FDC470166"

-		    label      	"remoteInterface"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0045-005d9e6adec4:1")))

-		    quid       	"380FDC470167"

-		    label      	"ejb"

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

-		    quidu      	"3780E71A010A")))

-	(object Association "primaryKey"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0046-005d9e6adec4:1")))

-	    quid       	"380FDDDF006B"

-	    roles      	(list role_list

-		(object Role "primaryKey"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0047-005d9e6adec4:1")))

-		    quid       	"380FDDE00117"

-		    documentation 	

-|The primkey-field element is used to specify the name of the primary key field for an entity with container-managed persistence.  The primkey-field must be one of the fields declared in the cmp-field

-|element, and the type of the field must be the same as the primary key type.  The primkey-field element is not used if the primary key maps to multiple container-managed fields (i.e. the key is a compound key). In this case, the fields of the primary key class must be public, and their names must correspond to the field names of the entity bean class that comprise the key.

-|Examples:<prim-key-class>java.lang.String</prim-key-class>

-|	<prim-key-class>com.wombat.empl.EmployeeID</prim-key-class>

-|	<prim-key-class>java.lang.Object</prim-key-class>

-|

-		    

-		    label      	"primaryKey"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "ejb"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0048-005d9e6adec4:1")))

-		    quid       	"380FDDE00121"

-		    label      	"ejb"

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

-		    quidu      	"3780E6970351")))

-	(object Association "jarToAssemblyDescriptor"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0049-005d9e6adec4:1")))

-	    quid       	"38FF3CF801EE"

-	    roles      	(list role_list

-		(object Role "assemblyDescriptor"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004a-005d9e6adec4:1")))

-		    quid       	"38FF3CF90249"

-		    label      	"assemblyDescriptor"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "ejbJar"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004b-005d9e6adec4:1")))

-		    quid       	"38FF3CF90267"

-		    label      	"ejbJar"

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

-		    quidu      	"371BC55D01E1"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "ejbJarToEnterpriseBeans"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004c-005d9e6adec4:1")))

-	    quid       	"38FF3D1F003B"

-	    roles      	(list role_list

-		(object Role "enterpriseBeans"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004d-005d9e6adec4:1")))

-		    quid       	"38FF3D1F037A"

-		    documentation 	"The enterprise-beans element contains the declarations of one or more enterprise beans."

-		    label      	"enterpriseBeans"

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

-		    quidu      	"3780E71A010A"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "ejbJar"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004e-005d9e6adec4:1")))

-		    quid       	"38FF3D1F03CB"

-		    label      	"ejbJar"

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

-		    quidu      	"371BC55D01E1"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b4a5e0-8826-11e1-004f-005d9e6adec4:1")))

-	    quid       	"392ED18900FC"

-	    roles      	(list role_list

-		(object Role "roles"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0050-005d9e6adec4:1")))

-		    quid       	"392ED18A028E"

-		    label      	"roles"

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

-		    quidu      	"38C031FE012D"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b4a5e0-8826-11e1-0051-005d9e6adec4:1")))

-		    quid       	"392ED18A02D4"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"392ED2880077"

-	    roles      	(list role_list

-		(object Role "methodElements"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"392ED289001E"

-		    label      	"methodElements"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"392ED2890028"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"392ED40900D4"

-	    roles      	(list role_list

-		(object Role "methodElements"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"392ED40A018A"

-		    label      	"methodElements"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"392ED40A019E"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"3937D6FF011D"

-	    roles      	(list role_list

-		(object Role "enterpriseBean"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3937D7000178"

-		    label      	"enterpriseBean"

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

-		    quidu      	"3780E71A010A"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "methodElement"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"3937D7000218"

-		    label      	"methodElement"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

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

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$13"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"393EBFC500B4"

-	    roles      	(list role_list

-		(object Role "securityRoles"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"393EBFC60083"

-		    label      	"securityRoles"

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

-		    quidu      	"38C031FE012D"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$14"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"393EBFC600C0"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$15"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"39045AE401F1"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$16"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"39045AE50080"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)

-		(object Role "ejbRefs"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"39045AE50301"

-		    label      	"ejbRefs"

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

-		    quidu      	"371BC78202B3"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$17"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

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

-	    quid       	"398831C30245"

-	    roles      	(list role_list

-		(object Role "persistentAttributes"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"398831C50157"

-		    label      	"persistentAttributes"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

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

-		    quid       	"398831C5017F"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"IDL"

-		    name       	"uuid"

-		    value      	(value Text "DCE:d8b62c80-8826-11e1-0012-005d9e6adec4:1")))

-	    quid       	"3988323B0355"

-	    roles      	(list role_list

-		(object Role "keyAttributes"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0013-005d9e6adec4:1")))

-		    quid       	"3988323D025E"

-		    label      	"keyAttributes"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

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

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"IDL"

-			    name       	"uuid"

-			    value      	(value Text "DCE:d8b62c80-8826-11e1-0014-005d9e6adec4:1")))

-		    quid       	"3988323D027C"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$19"

-	    quid       	"39BEF8870378"

-	    roles      	(list role_list

-		(object Role "relationshipList"

-		    quid       	"39BEF889003C"

-		    documentation 	

-|The relationships collection describes the relationships in which container managed persistence entity beans and dependent objects participate. The relationships element contains an optional description; a list of ejb-entity-ref elements (references to entity beans that participate in container managed relationships but whose abstract persistence schemas are not included in the ejb-jar file);

-|and a list of ejb-relation elements, which specify the container managed relationships.

-		    

-		    label      	"relationshipList"

-		    supplier   	"Logical View::ejb::Relationships"

-		    quidu      	"39BEF81703B3"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "ejbJar"

-		    quid       	"39BEF889003D"

-		    label      	"ejbJar"

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

-		    quidu      	"371BC55D01E1"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"39BF056702CD"

-	    roles      	(list role_list

-		(object Role "queryMethod"

-		    quid       	"39BF056901EA"

-		    documentation 	

-|The query-method element is used to specify the method (DB/SR/CM-"on the home") for a finder or

-|select query.

-|

-|The method-name element specifies the name of a finder or select

-|method in the entity bean's implementation class or a select method in

-|the dependent object class.

-|

-|Each method-param must be defined for a query-method using the

-|method-params element.

-|

-|Used in: query

-|

-|Example:

-|

-|Example:

-|<query>

-|  <description>Method finds large orders</description>

-|  <query-method>

-|    <method-name>findLargeOrders</method-name>

-|    <method-params></method-params>

-|  </query-method>

-|  <ejb-ql>SELECT ENTITY(o) FROM Order o WHERE o.amount &gt; 1000</ejb-ql>

-|</query>

-		    

-		    label      	"queryMethod"

-		    supplier   	"Logical View::ejb::QueryMethod"

-		    quidu      	"399ACD9C02DF"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "query"

-		    quid       	"39BF056901F4"

-		    label      	"query"

-		    supplier   	"Logical View::ejb::Query"

-		    quidu      	"39BF02710327"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$21"

-	    quid       	"39BF0C400147"

-	    roles      	(list role_list

-		(object Role "ejbRelations"

-		    quid       	"39BF0C41001C"

-		    documentation 	"A list of ejb-relation elements, which specify the container managed relationships."

-		    label      	"ejbRelations"

-		    supplier   	"Logical View::ejb::EJBRelation"

-		    quidu      	"39BF0C0203BF"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "relationshipList"

-		    quid       	"39BF0C41001D"

-		    label      	"relationshipList"

-		    supplier   	"Logical View::ejb::Relationships"

-		    quidu      	"39BEF81703B3"

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

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"39BF0DE30136"

-	    roles      	(list role_list

-		(object Role "relationshipRoles"

-		    quid       	"39BF0DE303D5"

-		    documentation 	

-|A collection containing exactly two relationship roles.

-|

-|@migration EJB1.1 Containment used to be by reference on relation--now by value.

-|

-		    

-		    label      	"relationshipRoles"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    client_cardinality 	(value cardinality "2")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "relationship"

-		    quid       	"39BF0DE303D6"

-		    label      	"relationship"

-		    supplier   	"Logical View::ejb::EJBRelation"

-		    quidu      	"39BF0C0203BF"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$23"

-	    quid       	"39BF14EA02FF"

-	    roles      	(list role_list

-		(object Role "source"

-		    quid       	"39BF14EC0059"

-		    documentation 	

-|Designates the source of a role that participates in a relationship. A relationship-role-source element uniquely identifies an entity bean.

-|@migration EJB1.1: was ibmejbext::EjbRelationshipRole::sourceEJBName, but that may not be sufficient, as this can now refer to dependent class names or ejb refs

-		    

-		    label      	"source"

-		    supplier   	"Logical View::ejb::RoleSource"

-		    quidu      	"39BF147500E4"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "role"

-		    quid       	"39BF14EC005A"

-		    label      	"role"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"39BF182001C1"

-	    roles      	(list role_list

-		(object Role "cmrField"

-		    quid       	"39BF182100D2"

-		    documentation 	

-|A declaration of the CMRField, if any, by means of which the other side of the relationship is accessed from the perspective of the role source

-|

-|@migration EJB1.1: Used to be handled via ibmejbext::EjbRole::attributes list

-		    

-		    label      	"cmrField"

-		    supplier   	"Logical View::ejb::CMRField"

-		    quidu      	"39BF1810004B"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "role"

-		    quid       	"39BF182100DC"

-		    label      	"role"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$25"

-	    quid       	"39BF1BBD02ED"

-	    roles      	(list role_list

-		(object Role "/opposite"

-		    quid       	"39BF1BC0039C"

-		    label      	"/opposite"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$26"

-		    quid       	"39BF1BC003A6"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D")))

-	(object Association "$UNNAMED$27"

-	    quid       	"39BF209F00C4"

-	    roles      	(list role_list

-		(object Role "resourceEnvRefs"

-		    quid       	"39BF209F0395"

-		    documentation 	

-|A list of enterprise bean references to an administered object associated with a resource in the enterprise bean's environment. It consists of an optional description, the resource environment reference name, and an indication of the resource environment reference type expected by the enterprise bean code.

-|

-		    

-		    label      	"resourceEnvRefs"

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

-		    quidu      	"39BF207200D3"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$28"

-		    quid       	"39BF209F0396"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$29"

-	    quid       	"39BF2C1F018F"

-	    roles      	(list role_list

-		(object Role "securityIdentity"

-		    quid       	"39BF2C200263"

-		    documentation 	

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

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

-		    

-		    label      	"securityIdentity"

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

-		    quidu      	"39BF2C040245"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$30"

-		    quid       	"39BF2C200264"

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

-		    quidu      	"3780E71A010A"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$31"

-	    quid       	"39BF340801FF"

-	    roles      	(list role_list

-		(object Role "destination"

-		    quid       	"39BF34090052"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes activationConfig

-|An optional declaration of the intended destination type of the message-driven bean

-		    

-		    label      	"destination"

-		    supplier   	"Logical View::ejb::MessageDrivenDestination"

-		    quidu      	"39BF33F10044"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "bean"

-		    quid       	"39BF3409005C"

-		    label      	"bean"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"398863840172"

-	    roles      	(list role_list

-		(object Role "ejbLocalRefs"

-		    quid       	"3988638502AA"

-		    label      	"ejbLocalRefs"

-		    supplier   	"Logical View::common::EJBLocalRef"

-		    quidu      	"398862E20101"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3988638502B4"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "localHomeInterface"

-	    quid       	"39886C2B018B"

-	    documentation 	

-|Contains the fully-qualified name of the enterprise beanÂ’s local home interface.  

-|This reference is only used for Entity and Session beans.  Message Driven beans ignore the localHomeInterface if specified.

-	    

-	    roles      	(list role_list

-		(object Role "localHomeInterface"

-		    quid       	"39886C2C02AF"

-		    label      	"localHomeInterface"

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

-		    quidu      	"36549FCC00FA"

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

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$34"

-		    quid       	"39886C2C02D7"

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

-		    quidu      	"3780E71A010A")))

-	(object Association "localInterface"

-	    quid       	"39886CC20283"

-	    documentation 	

-|Contains the fully-qualified name of the enterprise beanÂ’s local interface.  

-|This reference is only used for Entity and Session beans.  Message Driven beans ignore the localInterface if specified.

-	    

-	    roles      	(list role_list

-		(object Role "localInterface"

-		    quid       	"39886CC600EE"

-		    label      	"localInterface"

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

-		    quidu      	"36549FCC00FA"

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

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"39886CC60120"

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

-		    quidu      	"3780E71A010A")))

-	(object Association "$UNNAMED$36"

-	    quid       	"398884C2036E"

-	    roles      	(list role_list

-		(object Role "entityBean"

-		    quid       	"398884C3027F"

-		    label      	"entityBean"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"398884C30289"

-		    supplier   	"Logical View::ejb::RoleSource"

-		    quidu      	"39BF147500E4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$38"

-	    quid       	"398886F503BD"

-	    roles      	(list role_list

-		(object Role "/roles"

-		    quid       	"398886F602D8"

-		    label      	"/roles"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

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

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$39"

-		    quid       	"398886F602E2"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174")))

-	(object Association "$UNNAMED$40"

-	    quid       	"399721B602F9"

-	    roles      	(list role_list

-		(object Role "excludeList"

-		    quid       	"399721B7023C"

-		    label      	"excludeList"

-		    supplier   	"Logical View::ejb::ExcludeList"

-		    quidu      	"3997216E0147"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$41"

-		    quid       	"399721B70246"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$42"

-	    quid       	"3997226501A6"

-	    roles      	(list role_list

-		(object Role "methodElements"

-		    quid       	"399722660284"

-		    label      	"methodElements"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$43"

-		    quid       	"399722660298"

-		    supplier   	"Logical View::ejb::ExcludeList"

-		    quidu      	"3997216E0147"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$44"

-	    quid       	"399AE0FB03D3"

-	    roles      	(list role_list

-		(object Role "collectionType"

-		    quid       	"399AE0FC038F"

-		    label      	"collectionType"

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

-		    quidu      	"36549FCC00FA"

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

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$45"

-		    quid       	"399AE0FC03B7"

-		    supplier   	"Logical View::ejb::CMRField"

-		    quidu      	"39BF1810004B"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$46"

-	    quid       	"3E4D1AE2015D"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3E4D1AE20333"

-		    label      	"configProperties"

-		    supplier   	"Logical View::ejb::ActivationConfigProperty"

-		    quidu      	"3E4D1A1A00BF"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$47"

-		    quid       	"3E4D1AE20335"

-		    supplier   	"Logical View::ejb::ActivationConfig"

-		    quidu      	"3E4D1A7E0131"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$48"

-	    quid       	"3E4D1B050149"

-	    roles      	(list role_list

-		(object Role "activationConfig"

-		    quid       	"3E4D1B0700A2"

-		    documentation 	"@since J2EE1.4"

-		    label      	"activationConfig"

-		    supplier   	"Logical View::ejb::ActivationConfig"

-		    quidu      	"3E4D1A7E0131"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$49"

-		    quid       	"3E4D1B0700A4"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$50"

-	    quid       	"3E4D1BF402E7"

-	    roles      	(list role_list

-		(object Role "messageDestinations"

-		    quid       	"3E4D1BF600B9"

-		    documentation 	"@since J2EE1.4"

-		    label      	"messageDestinations"

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

-		    quidu      	"3E4C211001CF"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$51"

-		    quid       	"3E4D1BF600C3"

-		    supplier   	"Logical View::ejb::AssemblyDescriptor"

-		    quidu      	"3780E35000D4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$52"

-	    quid       	"3E4D23AA024F"

-	    roles      	(list role_list

-		(object Role "messageDestinationRefs"

-		    quid       	"3E4D23AD01AA"

-		    label      	"messageDestinationRefs"

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

-		    quidu      	"3E4C1F52028C"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$53"

-		    quid       	"3E4D23AD01B4"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$54"

-	    quid       	"3E4D25D600F0"

-	    roles      	(list role_list

-		(object Role "entity"

-		    quid       	"3E4D25D600F1"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

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

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "queries"

-		    quid       	"3E4D25D600F2"

-		    documentation 	

-|@since J2EE1.4 moved from CME

-|The optional query elements must be present if the persistence-type is Container and the cmp-version is 2.x and query methods other than findByPrimaryKey have been defined for the entity bean.

-|

-|@invariant see description

-|

-		    

-		    label      	"queries"

-		    supplier   	"Logical View::ejb::Query"

-		    quidu      	"39BF02710327"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$55"

-	    quid       	"3E4D298201E2"

-	    roles      	(list role_list

-		(object Role "messageDestination"

-		    quid       	"3E4D29830270"

-		    documentation 	"@since J2EE1.4"

-		    label      	"messageDestination"

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

-		    quidu      	"36549FCC00FA"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$56"

-		    quid       	"3E4D2983027A"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B")))

-	(object Association "$UNNAMED$57"

-	    quid       	"3E4D2FA901C9"

-	    roles      	(list role_list

-		(object Role "serviceRefs"

-		    quid       	"3E4D2FAA02C5"

-		    label      	"serviceRefs"

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

-		    quidu      	"3E4D2F560184"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$58"

-		    quid       	"3E4D2FAA02CF"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$59"

-	    quid       	"3E4D2FE101FC"

-	    roles      	(list role_list

-		(object Role "serviceInterface"

-		    quid       	"3E4D2FE4012E"

-		    documentation 	

-|The service-interface element declares the fully qualified class

-|        name of the JAX-RPC Service interface the client depends on.

-|        In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC

-|        generated Service Interface class may also be specified.

-		    

-		    label      	"serviceInterface"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$60"

-		    quid       	"3E4D2FE4014C"

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

-		    quidu      	"3E4D2F560184")))

-	(object Association "$UNNAMED$61"

-	    quid       	"3E562D9E0254"

-	    roles      	(list role_list

-		(object Role "messagingType"

-		    quid       	"3E562D9F0183"

-		    documentation 	

-|@since J2EE1.4

-|The messaging-type element specifies the message

-|        listener interface of the message-driven bean. If

-|        the messaging-type element is not specified, it is

-|        assumed to be javax.jms.MessageListener.

-		    

-		    label      	"messagingType"

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

-		    quidu      	"36549FCC00FA"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$62"

-		    quid       	"3E562D9F0197"

-		    supplier   	"Logical View::ejb::MessageDriven"

-		    quidu      	"39BF3248010B")))

-	(object Association "$UNNAMED$63"

-	    quid       	"3E4D1AAD00AC"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1AAD03A5"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$64"

-		    quid       	"3E4D1AAD03CD"

-		    supplier   	"Logical View::ejb::ActivationConfig"

-		    quidu      	"3E4D1A7E0131"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$65"

-	    quid       	"3E4D1FCB01AA"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1FCC00C5"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$66"

-		    quid       	"3E4D1FCC00E3"

-		    supplier   	"Logical View::ejb::EJBRelation"

-		    quidu      	"39BF0C0203BF"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$67"

-	    quid       	"3E4D28600218"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D28620152"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$68"

-		    quid       	"3E4D28620198"

-		    supplier   	"Logical View::ejb::MethodElement"

-		    quidu      	"392ED22D008A"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$69"

-	    quid       	"3E4D210300CD"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D210502EC"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$70"

-		    quid       	"3E4D2105030A"

-		    supplier   	"Logical View::ejb::RoleSource"

-		    quidu      	"39BF147500E4"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$71"

-	    quid       	"3E4D1D1F0161"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1D2001DA"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$72"

-		    quid       	"3E4D1D2001EE"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$73"

-	    quid       	"3E4D1FBF01CB"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1FC1001F"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$74"

-		    quid       	"3E4D1FC10047"

-		    supplier   	"Logical View::ejb::Relationships"

-		    quidu      	"39BEF81703B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$75"

-	    quid       	"3E4D26BB00FA"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D26BC02F0"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$76"

-		    quid       	"3E4D26BC0318"

-		    supplier   	"Logical View::ejb::MethodPermission"

-		    quidu      	"3780E35000D0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$77"

-	    quid       	"3E4D20C102C6"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D20C400CC"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$78"

-		    quid       	"3E4D20C400EA"

-		    supplier   	"Logical View::ejb::EJBRelationshipRole"

-		    quidu      	"39BF0DD0023D"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$79"

-	    quid       	"3E4D1F230090"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D1F2303D9"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$80"

-		    quid       	"3E4D1F24000F"

-		    supplier   	"Logical View::ejb::MethodTransaction"

-		    quidu      	"3780E35000DE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$81"

-	    quid       	"3E4D26680317"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D266A00D5"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$82"

-		    quid       	"3E4D266A00F3"

-		    supplier   	"Logical View::ejb::ExcludeList"

-		    quidu      	"3997216E0147"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$83"

-	    quid       	"3E56500D0259"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E56500E0142"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$84"

-		    quid       	"3E56500E0174"

-		    supplier   	"Logical View::ejb::Query"

-		    quidu      	"39BF02710327"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$85"

-	    quid       	"3E567CA2007F"

-	    roles      	(list role_list

-		(object Role "serviceEndpoint"

-		    quid       	"3E567CA30225"

-		    documentation 	

-|@since J2EE1.4

-|The service-endpoint element contains the

-|        fully-qualified name of the enterprise bean's web

-|        service endpoint interface. The service-endpoint

-|        element may only be specified for a stateless

-|        session bean. The specified interface must be a

-|        valid JAX-RPC service endpoint interface.

-		    

-		    label      	"serviceEndpoint"

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

-		    quidu      	"36549FCC00FA"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$86"

-		    quid       	"3E567CA30243"

-		    supplier   	"Logical View::ejb::Session"

-		    quidu      	"3780E5F901EB")))

-	(object Association "$UNNAMED$87"

-	    quid       	"3FA688620267"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$88"

-		    quid       	"3FA68866035D"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$89"

-		    quid       	"3FA68866035F"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174")))

-	(object Association "$UNNAMED$90"

-	    quid       	"3FA695890240"

-	    roles      	(list role_list

-		(object Role "primKeyField"

-		    quid       	"3FA6958B0008"

-		    label      	"primKeyField"

-		    supplier   	"Logical View::ejb::CMPAttribute"

-		    quidu      	"3A2288630003"

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

-		    is_navigable 	TRUE)

-		(object Role "entity"

-		    quid       	"3FA6958B0012"

-		    label      	"entity"

-		    supplier   	"Logical View::ejb::ContainerManagedEntity"

-		    quidu      	"3780E3230174"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "EJB Jar"

-	    quid       	"3780E2870251"

-	    title      	"EJB Jar"

-	    documentation 	

-|Based on the Moscone DD, translating class name elements to class references.

-|

-|Note that EJB-links only appear in the deployment model, at anlysis/design time, they might be derived from the association roles for the EJB.

-|

-|Also, see notes on EnterpriseJavaBean.

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	2363

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::Session" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1133, 1756)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(766, 1625)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	734

-			justify    	0

-			label      	"Session")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E5F901EB"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(766, 1686)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	631)

-		    width      	752

-		    height     	286

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Entity" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1776, 1756)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1575, 1650)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	402

-			justify    	0

-			label      	"Entity")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E6970351"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1575, 1711)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	346)

-		    width      	420

-		    height     	236

-		    autoResize 	TRUE)

-		(object Label @3

-		    location   	(159, 47)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	1300

-		    label      	"EJB 2.1 Model (EJB2.0 & 1.1 Backward Compatible)")

-		(object NoteView @4

-		    location   	(526, 2067)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(260, 2002)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	496

-			label      	"See detail on separate class diagrams...")

-		    fill_color 	14679807

-		    width      	556

-		    height     	143)

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @5

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1773, 2140)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1537, 2099)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	472

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E3230174"

-		    width      	490

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @6

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"3780E3230175"

-		    client     	@5

-		    supplier   	@2

-		    vertices   	(list Points

-			(1775, 2087)

-			(1775, 1874))

-		    line_style 	3

-		    origin_attachment 	(1775, 2087)

-		    terminal_attachment 	(1775, 1874))

-		(object ClassView "Class" "Logical View::ejb::MessageDriven" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2275, 1683)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(2119, 1642)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	312

-			justify    	0

-			label      	"MessageDriven")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF3248010B"

-		    width      	330

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @8

-		    location   	(2431, 1971)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(2218, 1865)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	390

-			label      	"See EJB2.0 Message Driven Bean diagram for details.")

-		    fill_color 	14679807

-		    width      	450

-		    height     	225)

-		(object AttachView "" @9

-		    stereotype 	TRUE

-		    client     	@8

-		    supplier   	@7

-		    vertices   	(list Points

-			(2369, 1858)

-			(2303, 1736))

-		    line_style 	0)

-		(object NoteView @10

-		    location   	(1597, 2412)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@10

-			location   	(1394, 2306)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	371

-			label      	"See Container Managed Entity diagram for details.")

-		    fill_color 	14679807

-		    width      	431

-		    height     	225)

-		(object AttachView "" @11

-		    stereotype 	TRUE

-		    client     	@10

-		    supplier   	@5

-		    vertices   	(list Points

-			(1669, 2299)

-			(1738, 2193))

-		    line_style 	0)

-		(object NoteView @12

-		    location   	(845, 1388)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@12

-			location   	(617, 1307)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	421

-			label      	"Added ejbJar back reference")

-		    fill_color 	14679807

-		    width      	481

-		    height     	175)

-		(object NoteView @13

-		    location   	(381, 378)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@13

-			location   	(62, 134)

-			fill_color 	13434879

-			nlines     	9

-			max_width  	603

-			label      	

-|Deprecations:

-|EJBJar::description

-|EJBJar::displayName

-|EJBJar::smallIcon

-|EJBJar::largeIcon

-|EnterpriseBean::description

-|EnterpriseBean::displayName

-|EnterpriseBean::smallIcon

-|EnterpriseBean::largeIcon

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	663

-		    height     	500)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2250, 1040)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@14

-			location   	(2072, 961)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::AssemblyDescriptor" @15

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1322, 842)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(1212, 776)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	220

-			justify    	0

-			label      	"AssemblyDescriptor")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E35000D4"

-		    width      	238

-		    height     	157

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Relationships" @16

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(334, 1742)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@16

-			location   	(253, 1676)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"Relationships")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BEF81703B3"

-		    height     	157

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @17

-		    stereotype 	TRUE

-		    client     	@4

-		    supplier   	@16

-		    vertices   	(list Points

-			(484, 1995)

-			(380, 1820))

-		    line_style 	0)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1404, 1259)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@18

-			location   	(1182, 1078)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	444

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"3780E71A010A"

-		    compartment 	(object Compartment

-			Parent_View 	@18

-			location   	(1182, 1139)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	253)

-		    width      	462

-		    height     	386

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @19

-		    location   	(1404, 1547)

-		    line_color 	10485760

-		    fill_color 	14472649

-		    supplier   	@18

-		    vertices   	(list Points

-			(1404, 1547)

-			(1404, 1452)))

-		(object InheritView "" @20

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"3780E8080095"

-		    client     	@2

-		    supplier   	@18

-		    vertices   	(list Points

-			(1847, 1637)

-			(1847, 1547))

-		    line_style 	3

-		    origin_attachment 	(1847, 1637)

-		    terminal_attachment 	(1847, 1547)

-		    drawSupplier 	@19)

-		(object InheritView "" @21

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"3780E3230120"

-		    client     	@1

-		    supplier   	@18

-		    vertices   	(list Points

-			(1153, 1613)

-			(1153, 1547))

-		    line_style 	3

-		    origin_attachment 	(1153, 1613)

-		    terminal_attachment 	(1153, 1547)

-		    drawSupplier 	@19)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(367, 936)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@22

-			location   	(130, 752)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	474

-			justify    	0

-			label      	"EJBJar")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@22

-			location   	(130, 702)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	474

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	10485760

-		    fill_color 	14472649

-		    quidu      	"371BC55D01E1"

-		    compartment 	(object Compartment

-			Parent_View 	@22

-			location   	(130, 813)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	412)

-		    width      	492

-		    height     	492

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "jarToAssemblyDescriptor" @23

-		    location   	(908, 810)

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"38FF3CF801EE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "assemblyDescriptor" @24

-			    Parent_View 	@23

-			    location   	(684, 570)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @25

-				Parent_View 	@24

-				location   	(1007, 768)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	383

-				justify    	0

-				label      	"+assemblyDescriptor"

-				pctDist    	0.335385

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3CF90249"

-			    client     	@23

-			    supplier   	@15

-			    vertices   	(list Points

-				(908, 810)

-				(1203, 810))

-			    line_style 	3

-			    origin_attachment 	(908, 810)

-			    terminal_attachment 	(1203, 810)

-			    label      	(object SegLabel @26

-				Parent_View 	@24

-				location   	(1143, 863)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.795107

-				height     	53

-				orientation 	1))

-			(object RoleView "ejbJar" @27

-			    Parent_View 	@23

-			    location   	(684, 570)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3CF90267"

-			    client     	@23

-			    supplier   	@22

-			    vertices   	(list Points

-				(908, 810)

-				(613, 810))

-			    line_style 	3

-			    origin_attachment 	(908, 810)

-			    terminal_attachment 	(613, 810))))

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

-		    location   	(278, 1422)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BEF8870378"

-		    roleview_list 	(list RoleViews

-			(object RoleView "relationshipList" @29

-			    Parent_View 	@28

-			    location   	(-58, 1022)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @30

-				Parent_View 	@29

-				location   	(450, 1566)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+relationshipList"

-				pctDist    	0.597510

-				height     	172

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003C"

-			    client     	@28

-			    supplier   	@16

-			    vertices   	(list Points

-				(278, 1422)

-				(278, 1663))

-			    line_style 	3

-			    origin_attachment 	(278, 1422)

-			    terminal_attachment 	(278, 1663)

-			    label      	(object SegLabel @31

-				Parent_View 	@29

-				location   	(348, 1616)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.805031

-				height     	70

-				orientation 	0))

-			(object RoleView "ejbJar" @32

-			    Parent_View 	@28

-			    location   	(-58, 1022)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @33

-				Parent_View 	@32

-				location   	(384, 1253)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"+ejbJar"

-				pctDist    	0.707602

-				height     	106

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003D"

-			    client     	@28

-			    supplier   	@22

-			    vertices   	(list Points

-				(278, 1422)

-				(278, 1182))

-			    line_style 	3

-			    origin_attachment 	(278, 1422)

-			    terminal_attachment 	(278, 1182)

-			    label      	(object SegLabel @34

-				Parent_View 	@32

-				location   	(332, 1207)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "ejbJarToEnterpriseBeans" @35

-		    location   	(893, 1122)

-		    stereotype 	TRUE

-		    line_color 	10485760

-		    quidu      	"38FF3D1F003B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "enterpriseBeans" @36

-			    Parent_View 	@35

-			    location   	(669, 882)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @37

-				Parent_View 	@36

-				location   	(1005, 1159)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	335

-				justify    	0

-				label      	"+enterpriseBeans"

-				pctDist    	0.403279

-				height     	37

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3D1F037A"

-			    client     	@35

-			    supplier   	@18

-			    vertices   	(list Points

-				(893, 1122)

-				(1173, 1122))

-			    line_style 	3

-			    origin_attachment 	(893, 1122)

-			    terminal_attachment 	(1173, 1122)

-			    label      	(object SegLabel @38

-				Parent_View 	@36

-				location   	(1080, 1085)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.666113

-				height     	38

-				orientation 	0))

-			(object RoleView "ejbJar" @39

-			    Parent_View 	@35

-			    location   	(669, 882)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @40

-				Parent_View 	@39

-				location   	(669, 1081)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"+ejbJar"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38FF3D1F03CB"

-			    client     	@35

-			    supplier   	@22

-			    vertices   	(list Points

-				(893, 1122)

-				(613, 1122))

-			    line_style 	3

-			    origin_attachment 	(893, 1122)

-			    terminal_attachment 	(613, 1122)

-			    label      	(object SegLabel @41

-				Parent_View 	@39

-				location   	(642, 1176)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AttachView "" @42

-		    stereotype 	TRUE

-		    client     	@12

-		    supplier   	@40

-		    vertices   	(list Points

-			(794, 1300)

-			(684, 1107))

-		    line_style 	0)

-		(object InheritView "" @43

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF3253026F"

-		    client     	@7

-		    supplier   	@18

-		    vertices   	(list Points

-			(2269, 1630)

-			(2269, 1519)

-			(1397, 1519)

-			(1397, 1452))

-		    line_style 	3

-		    origin_attachment 	(2269, 1630)

-		    terminal_attachment 	(1397, 1452))))

-	(object ClassDiagram "Enterprise Bean"

-	    quid       	"3805531D02C3"

-	    title      	"Enterprise Bean"

-	    documentation 	

-|Roles are shared by multiple EJBs.

-|

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	2388

-	    origin_y   	656

-	    items      	(list diagram_item_list

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(478, 418)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@44

-			location   	(281, 339)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"JNDIEnvRefsGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D53950349"

-		    width      	412

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2868, 765)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@45

-			location   	(2646, 680)

-			nlines     	2

-			max_width  	444

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"371BC7A0025C"

-		    width      	462

-		    height     	194

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2817, 389)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@46

-			location   	(2703, 335)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	246

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(944, 928)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@47

-			location   	(791, 850)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	306

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    compartment 	(object Compartment

-			Parent_View 	@47

-			location   	(791, 911)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	244)

-		    width      	324

-		    height     	180

-		    autoResize 	TRUE)

-		(object AssociationViewNew "EjbToRoles" @48

-		    location   	(1871, 841)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @49

-			Parent_View 	@48

-			location   	(1867, 751)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"EjbToRoles"

-			pctDist    	0.450000

-			height     	91

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230144"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityRoleRefs" @50

-			    Parent_View 	@48

-			    location   	(991, 297)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @51

-				Parent_View 	@50

-				location   	(2367, 801)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	454

-				justify    	0

-				label      	"+securityRoleRefs"

-				pctDist    	0.648529

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E3230146"

-			    client     	@48

-			    supplier   	@45

-			    vertices   	(list Points

-				(1871, 841)

-				(2637, 841))

-			    line_style 	3

-			    origin_attachment 	(1871, 841)

-			    terminal_attachment 	(2637, 841)

-			    label      	(object SegLabel @52

-				Parent_View 	@50

-				location   	(2537, 878)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.870629

-				height     	37

-				orientation 	1))

-			(object RoleView "$UNNAMED$4" @53

-			    Parent_View 	@48

-			    location   	(991, 297)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @54

-				Parent_View 	@53

-				location   	(1259, 800)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E3230145"

-			    client     	@48

-			    supplier   	@47

-			    vertices   	(list Points

-				(1871, 841)

-				(1106, 841))

-			    line_style 	3

-			    origin_attachment 	(1871, 841)

-			    terminal_attachment 	(1106, 841))))

-		(object AssociationViewNew "ejbClass" @55

-		    location   	(1791, 538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @56

-			Parent_View 	@55

-			location   	(1791, 479)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"ejbClass"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3402C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejb" @57

-			    Parent_View 	@55

-			    location   	(1521, -572)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @58

-				Parent_View 	@57

-				location   	(1083, 628)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"+ejb"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501F6"

-			    client     	@55

-			    supplier   	@47

-			    vertices   	(list Points

-				(1791, 538)

-				(1041, 538)

-				(1041, 838))

-			    line_style 	3

-			    origin_attachment 	(1791, 538)

-			    terminal_attachment 	(1041, 838))

-			(object RoleView "ejbClass" @59

-			    Parent_View 	@55

-			    location   	(1521, -572)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @60

-				Parent_View 	@59

-				location   	(2630, 580)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+ejbClass"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501EC"

-			    client     	@55

-			    supplier   	@46

-			    vertices   	(list Points

-				(1791, 538)

-				(2757, 538)

-				(2757, 455))

-			    line_style 	3

-			    origin_attachment 	(1791, 538)

-			    terminal_attachment 	(2757, 455)

-			    label      	(object SegLabel @61

-				Parent_View 	@59

-				location   	(2734, 485)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "homeInterface" @62

-		    location   	(1991, 634)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @63

-			Parent_View 	@62

-			location   	(1991, 575)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"homeInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3701C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejb" @64

-			    Parent_View 	@62

-			    location   	(1721, -476)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @65

-				Parent_View 	@64

-				location   	(1116, 676)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"+ejb"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC44014D"

-			    client     	@62

-			    supplier   	@47

-			    vertices   	(list Points

-				(1991, 634)

-				(1100, 634)

-				(1100, 838))

-			    line_style 	3

-			    origin_attachment 	(1991, 634)

-			    terminal_attachment 	(1100, 838))

-			(object RoleView "homeInterface" @66

-			    Parent_View 	@62

-			    location   	(1721, -476)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @67

-				Parent_View 	@66

-				location   	(2732, 512)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	283

-				justify    	0

-				label      	"+homeInterface"

-				pctDist    	0.948617

-				height     	176

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC440143"

-			    client     	@62

-			    supplier   	@46

-			    vertices   	(list Points

-				(1991, 634)

-				(2907, 634)

-				(2907, 455))

-			    line_style 	3

-			    origin_attachment 	(1991, 634)

-			    terminal_attachment 	(2907, 455)

-			    label      	(object SegLabel @68

-				Parent_View 	@66

-				location   	(2854, 565)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "remoteInterface" @69

-		    location   	(1611, 406)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @70

-			Parent_View 	@69

-			location   	(1611, 347)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"remoteInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC46006A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejb" @71

-			    Parent_View 	@69

-			    location   	(1341, -704)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @72

-				Parent_View 	@71

-				location   	(1002, 621)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"+ejb"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470167"

-			    client     	@69

-			    supplier   	@47

-			    vertices   	(list Points

-				(1611, 406)

-				(960, 406)

-				(960, 838))

-			    line_style 	3

-			    origin_attachment 	(1611, 406)

-			    terminal_attachment 	(960, 838))

-			(object RoleView "remoteInterface" @73

-			    Parent_View 	@69

-			    location   	(1341, -704)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @74

-				Parent_View 	@73

-				location   	(2476, 448)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+remoteInterface"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470166"

-			    client     	@69

-			    supplier   	@46

-			    vertices   	(list Points

-				(1611, 406)

-				(2694, 406))

-			    line_style 	3

-			    origin_attachment 	(1611, 406)

-			    terminal_attachment 	(2694, 406)

-			    label      	(object SegLabel @75

-				Parent_View 	@73

-				location   	(2586, 353)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "localHomeInterface" @76

-		    location   	(1554, 256)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @77

-			Parent_View 	@76

-			location   	(1554, 197)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"localHomeInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39886C2B018B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$34" @78

-			    Parent_View 	@76

-			    location   	(1284, -854)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @79

-				Parent_View 	@78

-				location   	(967, 596)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02D7"

-			    client     	@76

-			    supplier   	@47

-			    vertices   	(list Points

-				(1554, 256)

-				(925, 256)

-				(925, 838))

-			    line_style 	3

-			    origin_attachment 	(1554, 256)

-			    terminal_attachment 	(925, 838))

-			(object RoleView "localHomeInterface" @80

-			    Parent_View 	@76

-			    location   	(1284, -854)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @81

-				Parent_View 	@80

-				location   	(2522, 298)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	374

-				justify    	0

-				label      	"+localHomeInterface"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02AF"

-			    client     	@76

-			    supplier   	@46

-			    vertices   	(list Points

-				(1554, 256)

-				(2698, 256)

-				(2698, 323))

-			    line_style 	3

-			    origin_attachment 	(1554, 256)

-			    terminal_attachment 	(2698, 323)

-			    label      	(object SegLabel @82

-				Parent_View 	@80

-				location   	(2643, 203)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "localInterface" @83

-		    location   	(1609, 113)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @84

-			Parent_View 	@83

-			location   	(1609, 54)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"localInterface"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39886CC20283"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@83

-			    location   	(1339, -997)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @86

-				Parent_View 	@85

-				location   	(930, 549)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC60120"

-			    client     	@83

-			    supplier   	@47

-			    vertices   	(list Points

-				(1609, 113)

-				(888, 113)

-				(888, 838))

-			    line_style 	3

-			    origin_attachment 	(1609, 113)

-			    terminal_attachment 	(888, 838))

-			(object RoleView "localInterface" @87

-			    Parent_View 	@83

-			    location   	(1339, -997)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @88

-				Parent_View 	@87

-				location   	(2766, 155)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	261

-				justify    	0

-				label      	"+localInterface"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC600EE"

-			    client     	@83

-			    supplier   	@46

-			    vertices   	(list Points

-				(1609, 113)

-				(2845, 113)

-				(2845, 323))

-			    line_style 	3

-			    origin_attachment 	(1609, 113)

-			    terminal_attachment 	(2845, 323)

-			    label      	(object SegLabel @89

-				Parent_View 	@87

-				location   	(2899, 178)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object InheritView "" @90

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D54C30090"

-		    client     	@47

-		    supplier   	@44

-		    vertices   	(list Points

-			(860, 837)

-			(561, 509))

-		    line_style 	0)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1725, 1368)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@91

-			location   	(1547, 1262)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"SecurityIdentity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BF2C040245"

-		    compartment 	(object Compartment

-			Parent_View 	@91

-			location   	(1547, 1377)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	391)

-		    width      	374

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1321, 1139)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39BF2C1F018F"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@92

-			    location   	(-114, -670)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(1128, 1079)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200264"

-			    client     	@92

-			    supplier   	@47

-			    vertices   	(list Points

-				(1321, 1139)

-				(1105, 1018))

-			    line_style 	0)

-			(object RoleView "securityIdentity" @95

-			    Parent_View 	@92

-			    location   	(-114, -670)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @96

-				Parent_View 	@95

-				location   	(1268, 1344)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	299

-				justify    	0

-				label      	"+securityIdentity"

-				pctDist    	0.219644

-				height     	205

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF2C200263"

-			    client     	@92

-			    supplier   	@91

-			    vertices   	(list Points

-				(1321, 1139)

-				(1537, 1261))

-			    line_style 	0

-			    label      	(object SegLabel @97

-				Parent_View 	@95

-				location   	(1566, 1185)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.957062

-				height     	81

-				orientation 	0))))))

-	(object ClassDiagram "Container Managed Entity"

-	    quid       	"3805550C008A"

-	    title      	"Container Managed Entity"

-	    documentation 	

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

-|

-	    

-	    zoom       	95

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1198

-	    items      	(list diagram_item_list

-		(object NoteView @98

-		    location   	(2288, 400)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@98

-			location   	(1932, 216)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	677

-			label      	"The keyFeatures relationship also determines the primkey-field setting.  If there is a single key feature, we will deploy that using primkey-field.  Conversely, if a descriptor uses primkey-field, we will set a single keyFeature.  (? BMP case ?)")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	737

-		    height     	381)

-		(object NoteView @99

-		    location   	(1472, 1568)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@99

-			location   	(1070, 1390)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	769

-			label      	"We have switched from explicitly referring from an Entity to its Java Fields to deriving that from its attributes and association ends.  The implementation should still support listing the key fields and persistent fields, but not adding or removing them.")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	829

-		    height     	369)

-		(object NoteView @100

-		    location   	(608, 1600)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@100

-			location   	(189, 1465)

-			fill_color 	13434879

-			nlines     	6

-			max_width  	802

-			label      	"Leaving the keyAttributes and persistentAttributes relationships typed to eAttribute for compatibility purposes.  This may change in the future to be typed to CMPAttribute.")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	862

-		    height     	283)

-		(object NoteView @101

-		    location   	(480, 1152)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@101

-			location   	(65, 990)

-			fill_color 	13434879

-			nlines     	6

-			max_width  	795

-			label      	

-|EJB2.0 - 

-|  Added version:String

-|  Added abstractSchemaName:String

-|TODO: Other new attrs:

-|  SecurityIdentity

-			)

-		    line_color 	4227072

-		    fill_color 	13434833

-		    width      	855

-		    height     	336)

-		(object NoteView @102

-		    location   	(624, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@102

-			location   	(426, 743)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	361

-			label      	"See further detail in EJB2.0 - Query diagram")

-		    line_color 	4227072

-		    fill_color 	13434833

-		    width      	421

-		    height     	191)

-		(object ClassView "Class" "Logical View::ejb::Query" @103

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(448, 576)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@103

-			location   	(367, 525)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"Query")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF02710327"

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @104

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@102

-		    supplier   	@103

-		    vertices   	(list Points

-			(558, 736)

-			(491, 639))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ecore::EAttribute" @105

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1581, 233)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@105

-			location   	(1369, 77)

-			nlines     	2

-			max_width  	424

-			justify    	0

-			label      	"EAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"39238472039D"

-		    compartment 	(object Compartment

-			Parent_View 	@105

-			location   	(1369, 191)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	2

-			max_width  	275)

-		    width      	442

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::CMRField" @106

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1595, 929)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@106

-			location   	(1485, 878)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	220

-			justify    	0

-			label      	"CMRField")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"39BF1810004B"

-		    width      	238

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1600, 1232)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@107

-			location   	(1503, 1154)

-			nlines     	2

-			max_width  	194

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	212

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1596, 1066)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"399AE0FB03D3"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@108

-			    location   	(-4, -166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @110

-				Parent_View 	@109

-				location   	(1554, 1008)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC03B7"

-			    client     	@108

-			    supplier   	@106

-			    vertices   	(list Points

-				(1596, 1066)

-				(1595, 992))

-			    line_style 	0)

-			(object RoleView "collectionType" @111

-			    Parent_View 	@108

-			    location   	(-4, -166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @112

-				Parent_View 	@111

-				location   	(1432, 1113)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	291

-				justify    	0

-				label      	"+collectionType"

-				pctDist    	0.597227

-				height     	166

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC038F"

-			    client     	@108

-			    supplier   	@107

-			    vertices   	(list Points

-				(1596, 1066)

-				(1597, 1141))

-			    line_style 	0

-			    label      	(object SegLabel @113

-				Parent_View 	@111

-				location   	(1668, 1111)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.599360

-				height     	71

-				orientation 	0))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2871, 729)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@114

-			location   	(2704, 598)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	334

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@114

-			location   	(2704, 712)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	283)

-		    width      	352

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::CMPAttribute" @115

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1581, 630)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@115

-			location   	(1297, 526)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	568

-			justify    	0

-			label      	"CMPAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A2288630003"

-		    compartment 	(object Compartment

-			Parent_View 	@115

-			location   	(1297, 586)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	565)

-		    width      	586

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @116

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3A2288770341"

-		    client     	@115

-		    supplier   	@105

-		    vertices   	(list Points

-			(1536, 514)

-			(1536, 400))

-		    line_style 	3

-		    origin_attachment 	(1536, 514)

-		    terminal_attachment 	(1536, 400))

-		(object InheritView "" @117

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AD4690170"

-		    client     	@106

-		    supplier   	@115

-		    vertices   	(list Points

-			(1563, 866)

-			(1563, 745))

-		    line_style 	3

-		    origin_attachment 	(1563, 866)

-		    terminal_attachment 	(1563, 745))

-		(object AssociationViewNew "$UNNAMED$71" @118

-		    location   	(2284, 674)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1D1F0161"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @119

-			    Parent_View 	@118

-			    location   	(674, 51)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @120

-				Parent_View 	@119

-				location   	(2569, 734)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.695136

-				height     	60

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1D2001DA"

-			    client     	@118

-			    supplier   	@114

-			    vertices   	(list Points

-				(2284, 674)

-				(2695, 674))

-			    line_style 	3

-			    origin_attachment 	(2284, 674)

-			    terminal_attachment 	(2695, 674)

-			    label      	(object SegLabel @121

-				Parent_View 	@119

-				location   	(2562, 611)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.677276

-				height     	64

-				orientation 	0))

-			(object RoleView "$UNNAMED$72" @122

-			    Parent_View 	@118

-			    location   	(674, 51)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1D2001EE"

-			    client     	@118

-			    supplier   	@115

-			    vertices   	(list Points

-				(2284, 674)

-				(1874, 674))

-			    line_style 	3

-			    origin_attachment 	(2284, 674)

-			    terminal_attachment 	(1874, 674))))

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @123

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(447, 176)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@123

-			location   	(76, 73)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	742

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E3230174"

-		    compartment 	(object Compartment

-			Parent_View 	@123

-			location   	(76, 133)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	739)

-		    width      	760

-		    height     	230

-		    autoResize 	TRUE)

-		(object AttachView "" @124

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    client     	@101

-		    supplier   	@123

-		    vertices   	(list Points

-			(171, 983)

-			(171, 291))

-		    line_style 	3

-		    origin_attachment 	(171, 983)

-		    terminal_attachment 	(171, 291))

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

-		    location   	(759, 709)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398831C30245"

-		    roleview_list 	(list RoleViews

-			(object RoleView "persistentAttributes" @126

-			    Parent_View 	@125

-			    location   	(407, -43)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @127

-				Parent_View 	@126

-				location   	(959, 672)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	453

-				justify    	0

-				label      	"+persistentAttributes"

-				pctDist    	0.378601

-				height     	38

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398831C50157"

-			    client     	@125

-			    supplier   	@115

-			    vertices   	(list Points

-				(759, 709)

-				(1288, 709))

-			    line_style 	3

-			    origin_attachment 	(759, 709)

-			    terminal_attachment 	(1288, 709)

-			    label      	(object SegLabel @128

-				Parent_View 	@126

-				location   	(1238, 747)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.905340

-				height     	38

-				orientation 	1))

-			(object RoleView "entity" @129

-			    Parent_View 	@125

-			    location   	(407, -43)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398831C5017F"

-			    client     	@125

-			    supplier   	@123

-			    vertices   	(list Points

-				(759, 709)

-				(648, 709)

-				(648, 291))

-			    line_style 	3

-			    origin_attachment 	(759, 709)

-			    terminal_attachment 	(648, 291))))

-		(object AssociationViewNew "$UNNAMED$90" @130

-		    location   	(939, 527)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3FA695890240"

-		    roleview_list 	(list RoleViews

-			(object RoleView "primKeyField" @131

-			    Parent_View 	@130

-			    location   	(492, 351)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @132

-				Parent_View 	@131

-				location   	(1099, 489)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	272

-				justify    	0

-				label      	"+primKeyField"

-				pctDist    	0.462046

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3FA6958B0008"

-			    client     	@130

-			    supplier   	@115

-			    vertices   	(list Points

-				(939, 527)

-				(1288, 527))

-			    line_style 	3

-			    origin_attachment 	(939, 527)

-			    terminal_attachment 	(1288, 527)

-			    label      	(object SegLabel @133

-				Parent_View 	@131

-				location   	(1228, 567)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.831683

-				height     	40

-				orientation 	1))

-			(object RoleView "entity" @134

-			    Parent_View 	@130

-			    location   	(492, 351)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3FA6958B0012"

-			    client     	@130

-			    supplier   	@123

-			    vertices   	(list Points

-				(939, 527)

-				(825, 527)

-				(825, 291))

-			    line_style 	3

-			    origin_attachment 	(939, 527)

-			    terminal_attachment 	(825, 291))))

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

-		    location   	(844, 632)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3988323B0355"

-		    roleview_list 	(list RoleViews

-			(object RoleView "keyAttributes" @136

-			    Parent_View 	@135

-			    location   	(492, 408)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @137

-				Parent_View 	@136

-				location   	(1100, 602)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	315

-				justify    	0

-				label      	"+keyAttributes"

-				pctDist    	0.579070

-				height     	31

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988323D025E"

-			    client     	@135

-			    supplier   	@115

-			    vertices   	(list Points

-				(844, 632)

-				(1288, 632))

-			    line_style 	3

-			    origin_attachment 	(844, 632)

-			    terminal_attachment 	(1288, 632)

-			    label      	(object SegLabel @138

-				Parent_View 	@136

-				location   	(1236, 663)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.885942

-				height     	31

-				orientation 	1))

-			(object RoleView "entity" @139

-			    Parent_View 	@135

-			    location   	(492, 408)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3988323D027C"

-			    client     	@135

-			    supplier   	@123

-			    vertices   	(list Points

-				(844, 632)

-				(740, 632)

-				(740, 291))

-			    line_style 	3

-			    origin_attachment 	(844, 632)

-			    terminal_attachment 	(740, 291))))))

-	(object ClassDiagram "Assembly"

-	    quid       	"3780E28E01B1"

-	    title      	"Assembly"

-	    documentation 	

-|I kept this portion of the model separate to reflect the spec.  It might be easier to work with if we integrated it more closely with the beans we are assembling.  On the other hand, this separation supports splitting the creation and assembly roles.

-|

-|An assembly descriptor basically contains method permissions and "Container Transactions".  

-|

-|In order to support the full power of the method element in the XML DD, we need to hold these method elements.  The actual methods will be derived.  Keeping with the method element, all method will be designated by the name "*".

-|

-|The methods relationship from MethodPermission and MethodTransaction will be derived in helper methods.

-|

-|

-	    

-	    zoom       	87

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1834

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::TransactionAttributeType" @140

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2147, 2019)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@140

-			location   	(1866, 1819)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"TransactionAttributeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@140

-			location   	(1866, 1769)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"379F634503C0"

-		    compartment 	(object Compartment

-			Parent_View 	@140

-			location   	(1866, 1884)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	256)

-		    width      	580

-		    height     	524

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MethodElementKind" @141

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1239, 2445)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@141

-			location   	(1003, 2245)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	472

-			justify    	0

-			label      	"MethodElementKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@141

-			location   	(1003, 2195)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	472

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"392ED2E70240"

-		    compartment 	(object Compartment

-			Parent_View 	@141

-			location   	(1003, 2310)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	300)

-		    width      	490

-		    height     	524

-		    autoResize 	TRUE)

-		(object NoteView @142

-		    location   	(3407, 808)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@142

-			location   	(3117, 728)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	544

-			label      	"This is the container-transaction element")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	604

-		    height     	172)

-		(object NoteView @143

-		    location   	(594, 2267)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@143

-			location   	(247, 2173)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	659

-			label      	"Local, LocalHome have been added for EJB2.0.  These correspond to the valid values for the methodIntf (methodType) field.")

-		    line_color 	16384

-		    fill_color 	13434833

-		    width      	719

-		    height     	201)

-		(object AttachView "" @144

-		    stereotype 	TRUE

-		    line_color 	16384

-		    client     	@143

-		    supplier   	@141

-		    vertices   	(list Points

-			(953, 2335)

-			(994, 2335))

-		    line_style 	3

-		    origin_attachment 	(953, 2335)

-		    terminal_attachment 	(994, 2335))

-		(object NoteView @145

-		    location   	(675, 1976)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@145

-			location   	(425, 1914)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	464

-			label      	"EJB2.0 pfd 2 added unchecked attribute.")

-		    line_color 	32768

-		    fill_color 	13434833

-		    width      	524

-		    height     	137)

-		(object NoteView @146

-		    location   	(431, 2626)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@146

-			location   	(141, 2503)

-			fill_color 	13434879

-			nlines     	5

-			max_width  	544

-			label      	

-|@since J2EE1.4 

-|

-|Added ServiceEndpoint

-			)

-		    line_color 	10949559

-		    fill_color 	15778042

-		    width      	604

-		    height     	258)

-		(object AttachView "" @147

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@146

-		    supplier   	@141

-		    vertices   	(list Points

-			(733, 2557)

-			(993, 2498))

-		    line_style 	0)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(206, 208)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@148

-			location   	(38, 77)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@148

-			location   	(38, 196)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	308)

-		    width      	354

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2945, 424)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@149

-			location   	(2739, 317)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	412

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C211001CF"

-		    compartment 	(object Compartment

-			Parent_View 	@149

-			location   	(2739, 436)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	319)

-		    width      	430

-		    height     	238

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1028, 787)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@150

-			location   	(860, 733)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Label"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"38C031FE012D"

-		    width      	354

-		    height     	132

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1470, 767)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@151

-			location   	(1360, 691)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	220

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    width      	238

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MethodPermission" @152

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(467, 1122)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@152

-			location   	(256, 994)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	422

-			justify    	0

-			label      	"MethodPermission")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E35000D0"

-		    compartment 	(object Compartment

-			Parent_View 	@152

-			location   	(256, 1059)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	467)

-		    width      	440

-		    height     	280

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @153

-		    stereotype 	TRUE

-		    line_color 	32768

-		    client     	@145

-		    supplier   	@152

-		    vertices   	(list Points

-			(535, 1907)

-			(535, 1262))

-		    line_style 	3

-		    origin_attachment 	(535, 1907)

-		    terminal_attachment 	(535, 1262))

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

-		    location   	(640, 842)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"392ED18900FC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "roles" @155

-			    Parent_View 	@154

-			    location   	(320, 330)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @156

-				Parent_View 	@155

-				location   	(745, 879)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	159

-				justify    	0

-				label      	"+roles"

-				pctDist    	0.500000

-				height     	37

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED18A028E"

-			    client     	@154

-			    supplier   	@150

-			    vertices   	(list Points

-				(640, 842)

-				(851, 842))

-			    line_style 	3

-			    origin_attachment 	(640, 842)

-			    terminal_attachment 	(851, 842)

-			    label      	(object SegLabel @157

-				Parent_View 	@155

-				location   	(770, 805)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.620690

-				height     	38

-				orientation 	0))

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

-			    Parent_View 	@154

-			    location   	(320, 330)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @159

-				Parent_View 	@158

-				location   	(528, 939)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED18A02D4"

-			    client     	@154

-			    supplier   	@152

-			    vertices   	(list Points

-				(640, 842)

-				(569, 842)

-				(569, 982))

-			    line_style 	3

-			    origin_attachment 	(640, 842)

-			    terminal_attachment 	(569, 982))))

-		(object AssociationViewNew "$UNNAMED$75" @160

-		    location   	(68, 828)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D26BB00FA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @161

-			    Parent_View 	@160

-			    location   	(-399, -294)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @162

-				Parent_View 	@161

-				location   	(215, 391)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.917184

-				height     	147

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26BC02F0"

-			    client     	@160

-			    supplier   	@148

-			    vertices   	(list Points

-				(68, 828)

-				(68, 351))

-			    line_style 	3

-			    origin_attachment 	(68, 828)

-			    terminal_attachment 	(68, 351)

-			    label      	(object SegLabel @163

-				Parent_View 	@161

-				location   	(134, 443)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.807453

-				height     	66

-				orientation 	1))

-			(object RoleView "$UNNAMED$76" @164

-			    Parent_View 	@160

-			    location   	(-399, -294)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D26BC0318"

-			    client     	@160

-			    supplier   	@152

-			    vertices   	(list Points

-				(68, 828)

-				(68, 1127)

-				(247, 1127))

-			    line_style 	3

-			    origin_attachment 	(68, 828)

-			    terminal_attachment 	(247, 1127))))

-		(object ClassView "Class" "Logical View::ejb::ExcludeList" @165

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1940, 659)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@165

-			location   	(1748, 555)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	384

-			justify    	0

-			label      	"ExcludeList")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"3997216E0147"

-		    compartment 	(object Compartment

-			Parent_View 	@165

-			location   	(1748, 620)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	423)

-		    width      	402

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::Method" @166

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1329, 1826)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@166

-			location   	(1034, 1551)

-			nlines     	1

-			max_width  	590

-			justify    	0

-			label      	"Method")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"3654AE910271"

-		    compartment 	(object Compartment

-			Parent_View 	@166

-			location   	(1034, 1670)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	9

-			max_width  	646)

-		    width      	608

-		    height     	574

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "MethodPermissionToMethods" @167

-		    location   	(624, 1612)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000EA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/methods" @168

-			    Parent_View 	@167

-			    location   	(299, 1172)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @169

-				Parent_View 	@168

-				location   	(761, 1568)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	256

-				justify    	0

-				label      	"+/methods"

-				pctDist    	0.342105

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000EB"

-			    client     	@167

-			    supplier   	@166

-			    vertices   	(list Points

-				(624, 1612)

-				(1025, 1612))

-			    line_style 	3

-			    origin_attachment 	(624, 1612)

-			    terminal_attachment 	(1025, 1612)

-			    label      	(object SegLabel @170

-				Parent_View 	@168

-				location   	(953, 1670)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.822680

-				height     	58

-				orientation 	1))

-			(object RoleView "/methodPermission" @171

-			    Parent_View 	@167

-			    location   	(299, 1172)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000EC"

-			    client     	@167

-			    supplier   	@152

-			    vertices   	(list Points

-				(624, 1612)

-				(564, 1612)

-				(564, 1262))

-			    line_style 	3

-			    origin_attachment 	(624, 1612)

-			    terminal_attachment 	(564, 1262)

-			    label      	(object SegLabel @172

-				Parent_View 	@171

-				location   	(528, 1333)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.826923

-				height     	37

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::ejb::AssemblyDescriptor" @173

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1172, 419)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@173

-			location   	(971, 368)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	402

-			justify    	0

-			label      	"AssemblyDescriptor")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E35000D4"

-		    width      	420

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$50" @174

-		    location   	(2056, 381)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1BF402E7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinations" @175

-			    Parent_View 	@174

-			    location   	(1048, 253)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @176

-				Parent_View 	@175

-				location   	(2523, 337)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	468

-				justify    	0

-				label      	"+messageDestinations"

-				pctDist    	0.692762

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1BF600B9"

-			    client     	@174

-			    supplier   	@149

-			    vertices   	(list Points

-				(2056, 381)

-				(2730, 381))

-			    line_style 	3

-			    origin_attachment 	(2056, 381)

-			    terminal_attachment 	(2730, 381)

-			    label      	(object SegLabel @177

-				Parent_View 	@175

-				location   	(2662, 435)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

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

-			    Parent_View 	@174

-			    location   	(1048, 253)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1BF600C3"

-			    client     	@174

-			    supplier   	@173

-			    vertices   	(list Points

-				(2056, 381)

-				(1382, 381))

-			    line_style 	3

-			    origin_attachment 	(2056, 381)

-			    terminal_attachment 	(1382, 381))))

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

-		    location   	(1116, 601)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"393EBFC500B4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityRoles" @180

-			    Parent_View 	@179

-			    location   	(108, 473)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @181

-				Parent_View 	@180

-				location   	(969, 675)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	364

-				justify    	0

-				label      	"+securityRoles"

-				pctDist    	0.617284

-				height     	148

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"393EBFC60083"

-			    client     	@179

-			    supplier   	@150

-			    vertices   	(list Points

-				(1116, 601)

-				(1116, 721))

-			    line_style 	3

-			    origin_attachment 	(1116, 601)

-			    terminal_attachment 	(1116, 721)

-			    label      	(object SegLabel @182

-				Parent_View 	@180

-				location   	(1175, 684)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.703704

-				height     	59

-				orientation 	0))

-			(object RoleView "$UNNAMED$14" @183

-			    Parent_View 	@179

-			    location   	(108, 473)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @184

-				Parent_View 	@183

-				location   	(1075, 506)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"393EBFC600C0"

-			    client     	@179

-			    supplier   	@173

-			    vertices   	(list Points

-				(1116, 601)

-				(1116, 482))

-			    line_style 	3

-			    origin_attachment 	(1116, 601)

-			    terminal_attachment 	(1116, 482))))

-		(object AssociationViewNew "AssemblyDescriptorToMethodPermissions" @185

-		    location   	(399, 451)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000D1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "assemblyDescriptor" @186

-			    Parent_View 	@185

-			    location   	(74, 11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @187

-				Parent_View 	@186

-				location   	(632, 348)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	512

-				justify    	0

-				label      	"+assemblyDescriptor"

-				pctDist    	0.471564

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D2"

-			    client     	@185

-			    supplier   	@173

-			    vertices   	(list Points

-				(399, 451)

-				(399, 391)

-				(962, 391))

-			    line_style 	3

-			    origin_attachment 	(399, 451)

-			    terminal_attachment 	(962, 391)

-			    label      	(object SegLabel @188

-				Parent_View 	@186

-				location   	(899, 445)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	72

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "methodPermissions" @189

-			    Parent_View 	@185

-			    location   	(74, 11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @190

-				Parent_View 	@189

-				location   	(388, 907)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	508

-				justify    	0

-				label      	"+methodPermissions"

-				pctDist    	0.859155

-				height     	12

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D3"

-			    client     	@185

-			    supplier   	@152

-			    vertices   	(list Points

-				(399, 451)

-				(399, 982))

-			    line_style 	3

-			    origin_attachment 	(399, 451)

-			    terminal_attachment 	(399, 982)

-			    label      	(object SegLabel @191

-				Parent_View 	@189

-				location   	(453, 944)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.929577

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$40" @192

-		    location   	(1498, 589)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399721B602F9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "excludeList" @193

-			    Parent_View 	@192

-			    location   	(490, 461)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @194

-				Parent_View 	@193

-				location   	(1626, 548)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	310

-				justify    	0

-				label      	"+excludeList"

-				pctDist    	0.530120

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399721B7023C"

-			    client     	@192

-			    supplier   	@165

-			    vertices   	(list Points

-				(1498, 589)

-				(1739, 589))

-			    line_style 	3

-			    origin_attachment 	(1498, 589)

-			    terminal_attachment 	(1739, 589)

-			    label      	(object SegLabel @195

-				Parent_View 	@193

-				location   	(1683, 629)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.767068

-				height     	40

-				orientation 	1))

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

-			    Parent_View 	@192

-			    location   	(490, 461)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399721B70246"

-			    client     	@192

-			    supplier   	@173

-			    vertices   	(list Points

-				(1498, 589)

-				(1364, 589)

-				(1364, 482))

-			    line_style 	3

-			    origin_attachment 	(1498, 589)

-			    terminal_attachment 	(1364, 482))))

-		(object ClassView "Class" "Logical View::ejb::MethodElement" @197

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1270, 1223)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@197

-			location   	(1008, 1072)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	524

-			justify    	0

-			label      	"MethodElement")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"392ED22D008A"

-		    compartment 	(object Compartment

-			Parent_View 	@197

-			location   	(1008, 1137)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	567)

-		    width      	542

-		    height     	326

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1356, 957)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3937D6FF011D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "enterpriseBean" @199

-			    Parent_View 	@198

-			    location   	(-468, 480)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000178"

-			    client     	@198

-			    supplier   	@151

-			    vertices   	(list Points

-				(1356, 957)

-				(1356, 855))

-			    line_style 	3

-			    origin_attachment 	(1356, 957)

-			    terminal_attachment 	(1356, 855)

-			    label      	(object SegLabel @200

-				Parent_View 	@199

-				location   	(1396, 891)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.648649

-				height     	40

-				orientation 	1))

-			(object RoleView "methodElement" @201

-			    Parent_View 	@198

-			    location   	(-468, 480)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000218"

-			    client     	@198

-			    supplier   	@197

-			    vertices   	(list Points

-				(1356, 957)

-				(1356, 1060))

-			    line_style 	3

-			    origin_attachment 	(1356, 957)

-			    terminal_attachment 	(1356, 1060)

-			    label      	(object SegLabel @202

-				Parent_View 	@201

-				location   	(1428, 1027)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.693333

-				height     	72

-				orientation 	0))))

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

-		    location   	(936, 2428)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"392ED2880077"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElements" @204

-			    Parent_View 	@203

-			    location   	(616, 1916)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @205

-				Parent_View 	@204

-				location   	(1191, 2389)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	433

-				justify    	0

-				label      	"+methodElements"

-				pctDist    	0.179688

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED289001E"

-			    client     	@203

-			    supplier   	@197

-			    vertices   	(list Points

-				(936, 2428)

-				(1311, 2428)

-				(1311, 1386))

-			    line_style 	3

-			    origin_attachment 	(936, 2428)

-			    terminal_attachment 	(1311, 1386)

-			    label      	(object SegLabel @206

-				Parent_View 	@204

-				location   	(1357, 1757)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.738636

-				height     	46

-				orientation 	1))

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

-			    Parent_View 	@203

-			    location   	(616, 1916)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED2890028"

-			    client     	@203

-			    supplier   	@152

-			    vertices   	(list Points

-				(936, 2428)

-				(685, 2428)

-				(685, 1262))

-			    line_style 	3

-			    origin_attachment 	(936, 2428)

-			    terminal_attachment 	(685, 1262))))

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

-		    location   	(1853, 1037)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3997226501A6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElements" @209

-			    Parent_View 	@208

-			    location   	(77, 669)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @210

-				Parent_View 	@209

-				location   	(1764, 1139)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	433

-				justify    	0

-				label      	"+methodElements"

-				pctDist    	0.400000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399722660284"

-			    client     	@208

-			    supplier   	@197

-			    vertices   	(list Points

-				(1853, 1037)

-				(1853, 1097)

-				(1541, 1097))

-			    line_style 	3

-			    origin_attachment 	(1853, 1037)

-			    terminal_attachment 	(1541, 1097)

-			    label      	(object SegLabel @211

-				Parent_View 	@209

-				location   	(1630, 1073)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.761719

-				height     	25

-				orientation 	1))

-			(object RoleView "$UNNAMED$43" @212

-			    Parent_View 	@208

-			    location   	(77, 669)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399722660298"

-			    client     	@208

-			    supplier   	@165

-			    vertices   	(list Points

-				(1853, 1037)

-				(1853, 775))

-			    line_style 	3

-			    origin_attachment 	(1853, 1037)

-			    terminal_attachment 	(1853, 775))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2782, 1692)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@213

-			location   	(2614, 1561)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@213

-			location   	(2614, 1680)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	309)

-		    width      	354

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$67" @214

-		    location   	(1953, 1623)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D28600218"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @215

-			    Parent_View 	@214

-			    location   	(649, 438)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @216

-				Parent_View 	@215

-				location   	(2475, 1582)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D28620152"

-			    client     	@214

-			    supplier   	@213

-			    vertices   	(list Points

-				(1953, 1623)

-				(2605, 1623))

-			    line_style 	3

-			    origin_attachment 	(1953, 1623)

-			    terminal_attachment 	(2605, 1623)

-			    label      	(object SegLabel @217

-				Parent_View 	@215

-				location   	(2540, 1677)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$68" @218

-			    Parent_View 	@214

-			    location   	(649, 438)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D28620198"

-			    client     	@214

-			    supplier   	@197

-			    vertices   	(list Points

-				(1953, 1623)

-				(1810, 1623)

-				(1810, 1383)

-				(1541, 1383))

-			    line_style 	3

-			    origin_attachment 	(1953, 1623)

-			    terminal_attachment 	(1541, 1383))))

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

-		    location   	(2874, 737)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D26680317"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @220

-			    Parent_View 	@219

-			    location   	(934, 78)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @221

-				Parent_View 	@220

-				location   	(3017, 1493)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.932432

-				height     	143

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D266A00D5"

-			    client     	@219

-			    supplier   	@213

-			    vertices   	(list Points

-				(2874, 737)

-				(2874, 1549))

-			    line_style 	3

-			    origin_attachment 	(2874, 737)

-			    terminal_attachment 	(2874, 1549)

-			    label      	(object SegLabel @222

-				Parent_View 	@220

-				location   	(2928, 1468)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$82" @223

-			    Parent_View 	@219

-			    location   	(934, 78)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D266A00F3"

-			    client     	@219

-			    supplier   	@165

-			    vertices   	(list Points

-				(2874, 737)

-				(2874, 659)

-				(2141, 659))

-			    line_style 	3

-			    origin_attachment 	(2874, 737)

-			    terminal_attachment 	(2141, 659))))

-		(object ClassView "Class" "Logical View::ejb::MethodTransaction" @224

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2752, 1159)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@224

-			location   	(2305, 1031)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	894

-			justify    	0

-			label      	"MethodTransaction")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E35000DE"

-		    compartment 	(object Compartment

-			Parent_View 	@224

-			location   	(2305, 1096)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	952)

-		    width      	912

-		    height     	280

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$5" @225

-		    location   	(2293, 1612)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000E0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/methods" @226

-			    Parent_View 	@225

-			    location   	(548, 1243)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @227

-				Parent_View 	@226

-				location   	(2060, 1561)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	256

-				justify    	0

-				label      	"+/methods"

-				pctDist    	0.355263

-				height     	52

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000E1"

-			    client     	@225

-			    supplier   	@166

-			    vertices   	(list Points

-				(2293, 1612)

-				(1633, 1612))

-			    line_style 	3

-			    origin_attachment 	(2293, 1612)

-			    terminal_attachment 	(1633, 1612)

-			    label      	(object SegLabel @228

-				Parent_View 	@226

-				location   	(1805, 1666)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.738775

-				height     	54

-				orientation 	0))

-			(object RoleView "/transactions" @229

-			    Parent_View 	@225

-			    location   	(548, 1243)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000E2"

-			    client     	@225

-			    supplier   	@224

-			    vertices   	(list Points

-				(2293, 1612)

-				(2640, 1612)

-				(2640, 1299))

-			    line_style 	3

-			    origin_attachment 	(2293, 1612)

-			    terminal_attachment 	(2640, 1299)

-			    label      	(object SegLabel @230

-				Parent_View 	@229

-				location   	(2587, 1394)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.858086

-				height     	54

-				orientation 	0))))

-		(object AttachView "" @231

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@142

-		    supplier   	@224

-		    vertices   	(list Points

-			(3244, 894)

-			(3010, 1018))

-		    line_style 	0)

-		(object AssociationViewNew "AssemblyDescriptorToMethodTransactions" @232

-		    location   	(2318, 456)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E35000D5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "assemblyDescriptor" @233

-			    Parent_View 	@232

-			    location   	(573, 87)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @234

-				Parent_View 	@233

-				location   	(1818, 417)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	512

-				justify    	0

-				label      	"+assemblyDescriptor"

-				pctDist    	0.535519

-				height     	40

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D6"

-			    client     	@232

-			    supplier   	@173

-			    vertices   	(list Points

-				(2318, 456)

-				(1382, 456))

-			    line_style 	3

-			    origin_attachment 	(2318, 456)

-			    terminal_attachment 	(1382, 456)

-			    label      	(object SegLabel @235

-				Parent_View 	@233

-				location   	(1476, 510)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "methodTransactions" @236

-			    Parent_View 	@232

-			    location   	(573, 87)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @237

-				Parent_View 	@236

-				location   	(2923, 947)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	515

-				justify    	0

-				label      	"+methodTransactions"

-				pctDist    	0.923684

-				height     	232

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3780E35000D7"

-			    client     	@232

-			    supplier   	@224

-			    vertices   	(list Points

-				(2318, 456)

-				(2691, 456)

-				(2691, 1019))

-			    line_style 	3

-			    origin_attachment 	(2318, 456)

-			    terminal_attachment 	(2691, 1019)

-			    label      	(object SegLabel @238

-				Parent_View 	@236

-				location   	(2603, 961)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	70

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.938326

-				height     	89

-				orientation 	1))))

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

-		    location   	(1918, 1261)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"392ED40900D4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElements" @240

-			    Parent_View 	@239

-			    location   	(94, 781)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @241

-				Parent_View 	@240

-				location   	(1906, 1223)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	433

-				justify    	0

-				label      	"+methodElements"

-				pctDist    	0.035294

-				height     	39

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED40A018A"

-			    client     	@239

-			    supplier   	@197

-			    vertices   	(list Points

-				(1918, 1261)

-				(1541, 1261))

-			    line_style 	3

-			    origin_attachment 	(1918, 1261)

-			    terminal_attachment 	(1541, 1261)

-			    label      	(object SegLabel @242

-				Parent_View 	@240

-				location   	(1673, 1314)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.653846

-				height     	53

-				orientation 	0))

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

-			    Parent_View 	@239

-			    location   	(94, 781)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"392ED40A019E"

-			    client     	@239

-			    supplier   	@224

-			    vertices   	(list Points

-				(1918, 1261)

-				(2296, 1261))

-			    line_style 	3

-			    origin_attachment 	(1918, 1261)

-			    terminal_attachment 	(2296, 1261))))

-		(object AssociationViewNew "$UNNAMED$79" @244

-		    location   	(3119, 1485)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1F230090"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @245

-			    Parent_View 	@244

-			    location   	(779, 298)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @246

-				Parent_View 	@245

-				location   	(3031, 1405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.677966

-				height     	141

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1F2303D9"

-			    client     	@244

-			    supplier   	@213

-			    vertices   	(list Points

-				(3119, 1485)

-				(3119, 1545)

-				(2959, 1545))

-			    line_style 	3

-			    origin_attachment 	(3119, 1485)

-			    terminal_attachment 	(2959, 1545)

-			    label      	(object SegLabel @247

-				Parent_View 	@245

-				location   	(3031, 1613)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.675214

-				height     	68

-				orientation 	0))

-			(object RoleView "$UNNAMED$80" @248

-			    Parent_View 	@244

-			    location   	(779, 298)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1F24000F"

-			    client     	@244

-			    supplier   	@224

-			    vertices   	(list Points

-				(3119, 1485)

-				(3119, 1299))

-			    line_style 	3

-			    origin_attachment 	(3119, 1485)

-			    terminal_attachment 	(3119, 1299))))))

-	(object ClassDiagram "EJB Implementation"

-	    quid       	"380FDB7B01DA"

-	    title      	"EJB Implementation"

-	    documentation 	"The session-type element describes whether the session bean is a stateful session, or stateless session."

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1631

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::EJBMethodCategory" @249

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(306, 261)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@249

-			location   	(193, 185)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	226

-			justify    	0

-			label      	"EJBMethodCategory")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3810D0380344"

-		    width      	244

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Entity" @250

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1771, 1761)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@250

-			location   	(1690, 1685)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	162

-			justify    	0

-			label      	"Entity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E6970351"

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(982, 1194)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@251

-			location   	(828, 1144)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	308

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    width      	326

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @252

-		    location   	(982, 1481)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@251

-		    vertices   	(list Points

-			(982, 1481)

-			(982, 1256)))

-		(object InheritView "" @253

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E8080095"

-		    client     	@250

-		    supplier   	@251

-		    vertices   	(list Points

-			(1713, 1673)

-			(1713, 1481))

-		    line_style 	3

-		    origin_attachment 	(1713, 1673)

-		    terminal_attachment 	(1713, 1481)

-		    drawSupplier 	@252)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1035, 545)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@254

-			location   	(881, 390)

-			nlines     	2

-			max_width  	308

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    compartment 	(object Compartment

-			Parent_View 	@254

-			location   	(881, 505)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	3

-			max_width  	335)

-		    width      	326

-		    height     	334

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "primaryKey" @255

-		    location   	(1820, 753)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @256

-			Parent_View 	@255

-			location   	(1937, 414)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	204

-			justify    	0

-			label      	"primaryKey"

-			pctDist    	2.450000

-			height     	340

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDDDF006B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "primaryKey" @257

-			    Parent_View 	@255

-			    location   	(364, -751)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDDE00117"

-			    client     	@255

-			    supplier   	@254

-			    vertices   	(list Points

-				(1820, 753)

-				(1820, 455)

-				(1198, 455))

-			    line_style 	3

-			    origin_attachment 	(1820, 753)

-			    terminal_attachment 	(1198, 455)

-			    label      	(object SegLabel @258

-				Parent_View 	@257

-				location   	(1290, 402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "ejb" @259

-			    Parent_View 	@255

-			    location   	(364, -751)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDDE00121"

-			    client     	@255

-			    supplier   	@250

-			    vertices   	(list Points

-				(1820, 753)

-				(1820, 1673))

-			    line_style 	3

-			    origin_attachment 	(1820, 753)

-			    terminal_attachment 	(1820, 1673))))

-		(object AssociationViewNew "remoteInterface" @260

-		    location   	(934, 921)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @261

-			Parent_View 	@260

-			location   	(974, 920)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	600

-			justify    	0

-			label      	"remoteInterface"

-			pctDist    	1.183333

-			height     	2

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC46006A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "remoteInterface" @262

-			    Parent_View 	@260

-			    location   	(335, 192)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470166"

-			    client     	@260

-			    supplier   	@254

-			    vertices   	(list Points

-				(934, 921)

-				(934, 711))

-			    line_style 	3

-			    origin_attachment 	(934, 921)

-			    terminal_attachment 	(934, 711)

-			    label      	(object SegLabel @263

-				Parent_View 	@262

-				location   	(881, 733)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "ejb" @264

-			    Parent_View 	@260

-			    location   	(335, 192)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC470167"

-			    client     	@260

-			    supplier   	@251

-			    vertices   	(list Points

-				(934, 921)

-				(934, 1132))

-			    line_style 	3

-			    origin_attachment 	(934, 921)

-			    terminal_attachment 	(934, 1132))))

-		(object AssociationViewNew "homeInterface" @265

-		    location   	(819, 864)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @266

-			Parent_View 	@265

-			location   	(841, 1013)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"homeInterface"

-			pctDist    	0.883333

-			height     	149

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3701C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "homeInterface" @267

-			    Parent_View 	@265

-			    location   	(227, 128)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC440143"

-			    client     	@265

-			    supplier   	@254

-			    vertices   	(list Points

-				(819, 864)

-				(819, 804)

-				(766, 804)

-				(766, 699)

-				(872, 699))

-			    line_style 	3

-			    origin_attachment 	(819, 864)

-			    terminal_attachment 	(872, 699)

-			    label      	(object SegLabel @268

-				Parent_View 	@267

-				location   	(833, 667)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.881919

-				height     	33

-				orientation 	0))

-			(object RoleView "ejb" @269

-			    Parent_View 	@265

-			    location   	(227, 128)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC44014D"

-			    client     	@265

-			    supplier   	@251

-			    vertices   	(list Points

-				(819, 864)

-				(819, 1132))

-			    line_style 	3

-			    origin_attachment 	(819, 864)

-			    terminal_attachment 	(819, 1132))))

-		(object AssociationViewNew "ejbClass" @270

-		    location   	(1131, 921)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @271

-			Parent_View 	@270

-			location   	(1125, 1031)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	157

-			justify    	0

-			label      	"ejbClass"

-			pctDist    	0.400000

-			height     	110

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"380FDC3402C7"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbClass" @272

-			    Parent_View 	@270

-			    location   	(539, 185)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501EC"

-			    client     	@270

-			    supplier   	@254

-			    vertices   	(list Points

-				(1131, 921)

-				(1131, 712))

-			    line_style 	3

-			    origin_attachment 	(1131, 921)

-			    terminal_attachment 	(1131, 712)

-			    label      	(object SegLabel @273

-				Parent_View 	@272

-				location   	(1091, 740)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.870550

-				height     	41

-				orientation 	0))

-			(object RoleView "ejb" @274

-			    Parent_View 	@270

-			    location   	(539, 185)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"380FDC3501F6"

-			    client     	@270

-			    supplier   	@251

-			    vertices   	(list Points

-				(1131, 921)

-				(1131, 1131))

-			    line_style 	3

-			    origin_attachment 	(1131, 921)

-			    terminal_attachment 	(1131, 1131))))

-		(object AssociationViewNew "localHomeInterface" @275

-		    location   	(1431, 941)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @276

-			Parent_View 	@275

-			location   	(1385, 978)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	32768

-			    default_color 	FALSE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"localHomeInterface"

-			pctDist    	-0.266667

-			height     	37

-			orientation 	1)

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39886C2B018B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localHomeInterface" @277

-			    Parent_View 	@275

-			    location   	(439, -275)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02AF"

-			    client     	@275

-			    supplier   	@254

-			    vertices   	(list Points

-				(1431, 941)

-				(1431, 625)

-				(1198, 625))

-			    line_style 	3

-			    origin_attachment 	(1431, 941)

-			    terminal_attachment 	(1198, 625)

-			    label      	(object SegLabel @278

-				Parent_View 	@277

-				location   	(1290, 696)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	32768

-				    default_color 	FALSE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.834746

-				height     	71

-				orientation 	0))

-			(object RoleView "$UNNAMED$34" @279

-			    Parent_View 	@275

-			    location   	(439, -275)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886C2C02D7"

-			    client     	@275

-			    supplier   	@251

-			    vertices   	(list Points

-				(1431, 941)

-				(1431, 1204)

-				(1145, 1204))

-			    line_style 	3

-			    origin_attachment 	(1431, 941)

-			    terminal_attachment 	(1145, 1204))))

-		(object AssociationViewNew "localInterface" @280

-		    location   	(481, 874)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @281

-			Parent_View 	@280

-			location   	(450, 831)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	32768

-			    default_color 	FALSE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	243

-			justify    	0

-			label      	"localInterface"

-			pctDist    	-0.016667

-			height     	44

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	16384

-		    quidu      	"39886CC20283"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localInterface" @282

-			    Parent_View 	@280

-			    location   	(-511, -342)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC600EE"

-			    client     	@280

-			    supplier   	@254

-			    vertices   	(list Points

-				(481, 874)

-				(481, 606)

-				(872, 606))

-			    line_style 	3

-			    origin_attachment 	(481, 874)

-			    terminal_attachment 	(872, 606)

-			    label      	(object SegLabel @283

-				Parent_View 	@282

-				location   	(736, 648)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	32768

-				    default_color 	FALSE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.793375

-				height     	42

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @284

-			    Parent_View 	@280

-			    location   	(-511, -342)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39886CC60120"

-			    client     	@280

-			    supplier   	@251

-			    vertices   	(list Points

-				(481, 874)

-				(481, 1194)

-				(819, 1194))

-			    line_style 	3

-			    origin_attachment 	(481, 874)

-			    terminal_attachment 	(819, 1194))))

-		(object ClassView "Class" "Logical View::ejb::Session" @285

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(696, 1762)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@285

-			location   	(371, 1660)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	650

-			justify    	0

-			label      	"Session")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E5F901EB"

-		    compartment 	(object Compartment

-			Parent_View 	@285

-			location   	(371, 1721)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	672)

-		    width      	668

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @286

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230120"

-		    client     	@285

-		    supplier   	@251

-		    vertices   	(list Points

-			(719, 1648)

-			(719, 1481))

-		    line_style 	3

-		    origin_attachment 	(719, 1648)

-		    terminal_attachment 	(719, 1481)

-		    drawSupplier 	@252)

-		(object AssociationViewNew "$UNNAMED$85" @287

-		    location   	(97, 860)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E567CA2007F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceEndpoint" @288

-			    Parent_View 	@287

-			    location   	(-630, -686)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @289

-				Parent_View 	@288

-				location   	(701, 477)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	310

-				justify    	0

-				label      	"+serviceEndpoint"

-				pctDist    	0.847826

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E567CA30225"

-			    client     	@287

-			    supplier   	@254

-			    vertices   	(list Points

-				(97, 860)

-				(97, 519)

-				(872, 519))

-			    line_style 	3

-			    origin_attachment 	(97, 860)

-			    terminal_attachment 	(872, 519)

-			    label      	(object SegLabel @290

-				Parent_View 	@288

-				location   	(771, 557)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.909420

-				height     	38

-				orientation 	1))

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

-			    Parent_View 	@287

-			    location   	(-630, -686)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E567CA30243"

-			    client     	@287

-			    supplier   	@285

-			    vertices   	(list Points

-				(97, 860)

-				(97, 1711)

-				(362, 1711))

-			    line_style 	3

-			    origin_attachment 	(97, 860)

-			    terminal_attachment 	(362, 1711))))))

-	(object ClassDiagram "Data Types"

-	    quid       	"3810D69C01E4"

-	    title      	"Data Types"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::SessionType" @292

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(272, 176)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@292

-			location   	(109, 92)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"SessionType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@292

-			location   	(109, 42)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BCA07010C"

-		    compartment 	(object Compartment

-			Parent_View 	@292

-			location   	(109, 153)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	231)

-		    width      	344

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::TransactionType" @293

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(704, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@293

-			location   	(541, 108)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"TransactionType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@293

-			location   	(541, 58)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	326

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37FCA48702EF"

-		    compartment 	(object Compartment

-			Parent_View 	@293

-			location   	(541, 169)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	231)

-		    width      	344

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::TransactionAttributeType" @294

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1216, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@294

-			location   	(978, 88)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"TransactionAttributeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@294

-			location   	(978, 38)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"379F634503C0"

-		    compartment 	(object Compartment

-			Parent_View 	@294

-			location   	(978, 149)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	306)

-		    width      	494

-		    height     	492

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "EJB2.1 - Relationships"

-	    quid       	"39BEF9C4039C"

-	    title      	"EJB2.1 - Relationships"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1876

-	    items      	(list diagram_item_list

-		(object Label @295

-		    location   	(31, 31)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"EJB 2.1 Relationships")

-		(object Label @296

-		    location   	(90, 3042)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	39

-		    max_width  	1925

-		    label      	

-|An entity bean may have relationships with other entity beans with container managed persistence.

-|Relationships may be one-to-one, one-to-many, or many-to-many relationships.

-|Container managed relationships can exist only among entity beans within the same local relationship

-|scope, as defined by the relationships element in the deployment descriptor. Container managed

-|relationships are defined in terms of the local interfaces of the related beans.

-|

-|Relationships may be either bidirectional or unidirectional. If a relationship is bidirectional, it can be

-|navigated in both directions, whereas a unidirectional relationship can be navigated in one direction

-|only.

-|

-|A unidirectional relationship is implemented with a cmr-field on the entity bean instance from which

-|navigation can take place, and no related cmr-field on the entity bean instance that is the target of the

-|relationship. Unidirectional relationships are typically used when the Bean Provider wishes to restrict

-|the visibility of a relationship.

-|

-|An entity bean that does not have a local interface can have only unidirectional relationships from itself

-|to other entity beans. The lack of a local interface prevents other entity beans from having a relationship

-|to it.

-|

-|The bean developer navigates or manipulates logical relationships by using the get and set accessor

-|methods for the container managed relationship fields and the java.util.Collection API for

-|collection-valued container managed relationship fields.

-|

-|The bean provider must consider the type and cardinality of relationships when the entity bean classes

-|are programmed. The get method for a cmr-field must return either the local interface of the entity bean

-|or a collection (more precisely, either java.util.Collection or java.util.Set) of the

-|same. The set method for the relationship must take as an argument the entity beanÂ’s local interface or a

-|collection of the same.

-		    )

-		(object Label @297

-		    location   	(90, 2962)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"Regarding Relationships")

-		(object ClassView "Class" "Logical View::ejb::CMPAttribute" @298

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(880, 2816)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@298

-			location   	(615, 2713)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	530

-			justify    	0

-			label      	"CMPAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3A2288630003"

-		    compartment 	(object Compartment

-			Parent_View 	@298

-			location   	(615, 2774)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	572)

-		    width      	548

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MultiplicityKind" @299

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2690, 1532)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@299

-			location   	(2528, 1448)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	324

-			justify    	0

-			label      	"MultiplicityKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@299

-			location   	(2528, 1398)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	321

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"399AEBCB02B7"

-		    compartment 	(object Compartment

-			Parent_View 	@299

-			location   	(2528, 1509)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	159)

-		    width      	342

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @300

-		    location   	(3339, 2015)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@300

-			location   	(2583, 1871)

-			fill_color 	13434879

-			nlines     	5

-			max_width  	1477

-			label      	"CCM - This was originally modeled as an eMultiplicity, but has been simplified to a specific set of enum values.  The enumeration type is different from eMultiplicity, which captures much more information, like upper and lower bounds.  If we find that the additional information captured by eMultiplicity is required, it can be added in an extension to RelationshipRole.")

-		    line_color 	32768

-		    fill_color 	13434833

-		    width      	1537

-		    height     	300)

-		(object NoteView @301

-		    location   	(1924, 2428)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@301

-			location   	(1367, 2156)

-			fill_color 	13434879

-			nlines     	10

-			max_width  	1078

-			label      	

-|The cmr-field-name element specifies the name of a logical relationship field in the entity bean class. The name of the cmr-field must begin with a lowercase letter. This field is accessed by methods whose names consists of the name of the field specified by cmr-field-name in which the first letter is uppercased, prefixed by "get" or "set".

-|

-|@invariant The name of the cmr-field must begin with a lowercase letter.

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1138

-		    height     	556)

-		(object AttachView "" @302

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@300

-		    supplier   	@299

-		    vertices   	(list Points

-			(2748, 1864)

-			(2748, 1678))

-		    line_style 	3

-		    origin_attachment 	(2748, 1864)

-		    terminal_attachment 	(2748, 1678))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(416, 2656)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@303

-			location   	(323, 2577)

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(544, 256)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@304

-			location   	(384, 233)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	320

-			justify    	0

-			label      	"EJBJar")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@304

-			location   	(384, 183)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	317

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC55D01E1"

-		    width      	338

-		    height     	170

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::CMRField" @305

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(432, 2304)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@305

-			location   	(328, 2254)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	208

-			justify    	0

-			label      	"CMRField")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF1810004B"

-		    width      	226

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @306

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AD4690170"

-		    client     	@305

-		    supplier   	@298

-		    vertices   	(list Points

-			(486, 2366)

-			(778, 2700))

-		    line_style 	0)

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

-		    location   	(416, 2465)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AE0FB03D3"

-		    roleview_list 	(list RoleViews

-			(object RoleView "collectionType" @308

-			    Parent_View 	@307

-			    location   	(0, 593)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @309

-				Parent_View 	@308

-				location   	(247, 2529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	291

-				justify    	0

-				label      	"+collectionType"

-				pctDist    	0.650813

-				height     	170

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC038F"

-			    client     	@307

-			    supplier   	@303

-			    vertices   	(list Points

-				(416, 2465)

-				(416, 2565))

-			    line_style 	3

-			    origin_attachment 	(416, 2465)

-			    terminal_attachment 	(416, 2565)

-			    label      	(object SegLabel @310

-				Parent_View 	@308

-				location   	(471, 2540)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.747475

-				height     	55

-				orientation 	0))

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

-			    Parent_View 	@307

-			    location   	(0, 593)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"399AE0FC03B7"

-			    client     	@307

-			    supplier   	@305

-			    vertices   	(list Points

-				(416, 2465)

-				(416, 2366))

-			    line_style 	3

-			    origin_attachment 	(416, 2465)

-			    terminal_attachment 	(416, 2366))))

-		(object ClassView "Class" "Logical View::ejb::EJBRelation" @312

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(616, 992)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@312

-			location   	(351, 865)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	530

-			justify    	0

-			label      	"EJBRelation")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF0C0203BF"

-		    compartment 	(object Compartment

-			Parent_View 	@312

-			location   	(351, 926)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	548

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::Relationships" @313

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(528, 577)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@313

-			location   	(263, 499)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	530

-			justify    	0

-			label      	"Relationships")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BEF81703B3"

-		    compartment 	(object Compartment

-			Parent_View 	@313

-			location   	(263, 560)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	572)

-		    width      	548

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(550, 413)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BEF8870378"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbJar" @315

-			    Parent_View 	@314

-			    location   	(54, 109)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @316

-				Parent_View 	@315

-				location   	(653, 369)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"+ejbJar"

-				pctDist    	0.608108

-				height     	103

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003D"

-			    client     	@314

-			    supplier   	@304

-			    vertices   	(list Points

-				(550, 413)

-				(550, 340))

-			    line_style 	3

-			    origin_attachment 	(550, 413)

-			    terminal_attachment 	(550, 340)

-			    label      	(object SegLabel @317

-				Parent_View 	@315

-				location   	(493, 364)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.675676

-				height     	58

-				orientation 	0))

-			(object RoleView "relationshipList" @318

-			    Parent_View 	@314

-			    location   	(54, 109)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @319

-				Parent_View 	@318

-				location   	(725, 459)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+relationshipList"

-				pctDist    	0.637363

-				height     	175

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BEF889003C"

-			    client     	@314

-			    supplier   	@313

-			    vertices   	(list Points

-				(550, 413)

-				(550, 487))

-			    line_style 	3

-			    origin_attachment 	(550, 413)

-			    terminal_attachment 	(550, 487)

-			    label      	(object SegLabel @320

-				Parent_View 	@318

-				location   	(487, 463)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.670330

-				height     	64

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$21" @321

-		    location   	(641, 759)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF0C400147"

-		    roleview_list 	(list RoleViews

-			(object RoleView "ejbRelations" @322

-			    Parent_View 	@321

-			    location   	(273, 503)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @323

-				Parent_View 	@322

-				location   	(492, 793)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"+ejbRelations"

-				pctDist    	0.379310

-				height     	150

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0C41001C"

-			    client     	@321

-			    supplier   	@312

-			    vertices   	(list Points

-				(641, 759)

-				(641, 852))

-			    line_style 	3

-			    origin_attachment 	(641, 759)

-			    terminal_attachment 	(641, 852)

-			    label      	(object SegLabel @324

-				Parent_View 	@322

-				location   	(697, 805)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.500000

-				height     	56

-				orientation 	0))

-			(object RoleView "relationshipList" @325

-			    Parent_View 	@321

-			    location   	(273, 503)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @326

-				Parent_View 	@325

-				location   	(840, 701)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	304

-				justify    	0

-				label      	"+relationshipList"

-				pctDist    	0.622222

-				height     	199

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0C41001D"

-			    client     	@321

-			    supplier   	@313

-			    vertices   	(list Points

-				(641, 759)

-				(641, 666))

-			    line_style 	3

-			    origin_attachment 	(641, 759)

-			    terminal_attachment 	(641, 666)

-			    label      	(object SegLabel @327

-				Parent_View 	@325

-				location   	(568, 694)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.711111

-				height     	74

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::ejb::EJBRelationshipRole" @328

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(537, 1569)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@328

-			location   	(272, 1420)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	530

-			justify    	0

-			label      	"EJBRelationshipRole")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF0DD0023D"

-		    compartment 	(object Compartment

-			Parent_View 	@328

-			location   	(272, 1481)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	572)

-		    width      	548

-		    height     	322

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(101, 1910)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF1BBD02ED"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/opposite" @330

-			    Parent_View 	@329

-			    location   	(-411, 774)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @331

-				Parent_View 	@330

-				location   	(493, 1785)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	188

-				justify    	0

-				label      	"+/opposite"

-				pctDist    	0.905192

-				height     	124

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF1BC0039C"

-			    client     	@329

-			    supplier   	@328

-			    vertices   	(list Points

-				(101, 1910)

-				(101, 1970)

-				(369, 1970)

-				(369, 1730))

-			    line_style 	3

-			    origin_attachment 	(101, 1910)

-			    terminal_attachment 	(369, 1730))

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

-			    Parent_View 	@329

-			    location   	(-411, 774)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF1BC003A6"

-			    client     	@329

-			    supplier   	@328

-			    vertices   	(list Points

-				(101, 1910)

-				(101, 1590)

-				(263, 1590))

-			    line_style 	3

-			    origin_attachment 	(101, 1910)

-			    terminal_attachment 	(263, 1590))))

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

-		    location   	(500, 1986)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF182001C1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "cmrField" @334

-			    Parent_View 	@333

-			    location   	(-12, 850)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @335

-				Parent_View 	@334

-				location   	(383, 2193)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	182

-				justify    	0

-				label      	"+cmrField"

-				pctDist    	0.809524

-				height     	118

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF182100D2"

-			    client     	@333

-			    supplier   	@305

-			    vertices   	(list Points

-				(500, 1986)

-				(500, 2242))

-			    line_style 	3

-			    origin_attachment 	(500, 1986)

-			    terminal_attachment 	(500, 2242)

-			    label      	(object SegLabel @336

-				Parent_View 	@334

-				location   	(539, 2179)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.752294

-				height     	39

-				orientation 	0))

-			(object RoleView "role" @337

-			    Parent_View 	@333

-			    location   	(-12, 850)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @338

-				Parent_View 	@337

-				location   	(572, 1780)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	104

-				justify    	0

-				label      	"+role"

-				pctDist    	0.805714

-				height     	72

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF182100DC"

-			    client     	@333

-			    supplier   	@328

-			    vertices   	(list Points

-				(500, 1986)

-				(500, 1730))

-			    line_style 	3

-			    origin_attachment 	(500, 1986)

-			    terminal_attachment 	(500, 1730))))

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

-		    location   	(647, 1268)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF0DE30136"

-		    roleview_list 	(list RoleViews

-			(object RoleView "relationshipRoles" @340

-			    Parent_View 	@339

-			    location   	(151, 564)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @341

-				Parent_View 	@340

-				location   	(460, 1363)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	332

-				justify    	0

-				label      	"+relationshipRoles"

-				pctDist    	0.685185

-				height     	188

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0DE303D5"

-			    client     	@339

-			    supplier   	@328

-			    vertices   	(list Points

-				(647, 1268)

-				(647, 1407))

-			    line_style 	3

-			    origin_attachment 	(647, 1268)

-			    terminal_attachment 	(647, 1407)

-			    label      	(object SegLabel @342

-				Parent_View 	@340

-				location   	(684, 1374)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"2"

-				pctDist    	0.761905

-				height     	37

-				orientation 	0))

-			(object RoleView "relationship" @343

-			    Parent_View 	@339

-			    location   	(151, 564)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @344

-				Parent_View 	@343

-				location   	(494, 1190)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	236

-				justify    	0

-				label      	"+relationship"

-				pctDist    	0.575342

-				height     	154

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF0DE303D6"

-			    client     	@339

-			    supplier   	@312

-			    vertices   	(list Points

-				(647, 1268)

-				(647, 1130))

-			    line_style 	3

-			    origin_attachment 	(647, 1268)

-			    terminal_attachment 	(647, 1130)

-			    label      	(object SegLabel @345

-				Parent_View 	@343

-				location   	(686, 1172)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.698630

-				height     	39

-				orientation 	1))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1596, 471)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@346

-			location   	(1468, 342)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@346

-			location   	(1468, 457)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$65" @347

-		    location   	(1042, 613)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1FCB01AA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @348

-			    Parent_View 	@347

-			    location   	(531, -379)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @349

-				Parent_View 	@348

-				location   	(1310, 597)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.645621

-				height     	17

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FCC00C5"

-			    client     	@347

-			    supplier   	@346

-			    vertices   	(list Points

-				(1042, 613)

-				(1459, 613))

-			    line_style 	3

-			    origin_attachment 	(1042, 613)

-			    terminal_attachment 	(1459, 613)

-			    label      	(object SegLabel @350

-				Parent_View 	@348

-				location   	(1366, 654)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.775967

-				height     	41

-				orientation 	1))

-			(object RoleView "$UNNAMED$66" @351

-			    Parent_View 	@347

-			    location   	(531, -379)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FCC00E3"

-			    client     	@347

-			    supplier   	@312

-			    vertices   	(list Points

-				(1042, 613)

-				(865, 613)

-				(865, 853))

-			    line_style 	3

-			    origin_attachment 	(1042, 613)

-			    terminal_attachment 	(865, 853))))

-		(object AssociationViewNew "$UNNAMED$73" @352

-		    location   	(1130, 506)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1FBF01CB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @353

-			    Parent_View 	@352

-			    location   	(602, -70)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @354

-				Parent_View 	@353

-				location   	(1299, 463)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.512903

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FC1001F"

-			    client     	@352

-			    supplier   	@346

-			    vertices   	(list Points

-				(1130, 506)

-				(1459, 506))

-			    line_style 	3

-			    origin_attachment 	(1130, 506)

-			    terminal_attachment 	(1459, 506)

-			    label      	(object SegLabel @355

-				Parent_View 	@353

-				location   	(1344, 542)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.654839

-				height     	36

-				orientation 	1))

-			(object RoleView "$UNNAMED$74" @356

-			    Parent_View 	@352

-			    location   	(602, -70)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1FC10047"

-			    client     	@352

-			    supplier   	@313

-			    vertices   	(list Points

-				(1130, 506)

-				(802, 506))

-			    line_style 	3

-			    origin_attachment 	(1130, 506)

-			    terminal_attachment 	(802, 506))))

-		(object AssociationViewNew "$UNNAMED$77" @357

-		    location   	(1285, 1169)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D20C102C6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @358

-			    Parent_View 	@357

-			    location   	(748, -400)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @359

-				Parent_View 	@358

-				location   	(1409, 724)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.861596

-				height     	125

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D20C400CC"

-			    client     	@357

-			    supplier   	@346

-			    vertices   	(list Points

-				(1285, 1169)

-				(1533, 1169)

-				(1533, 612))

-			    line_style 	3

-			    origin_attachment 	(1285, 1169)

-			    terminal_attachment 	(1533, 612)

-			    label      	(object SegLabel @360

-				Parent_View 	@358

-				location   	(1481, 676)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.921446

-				height     	53

-				orientation 	0))

-			(object RoleView "$UNNAMED$78" @361

-			    Parent_View 	@357

-			    location   	(748, -400)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D20C400EA"

-			    client     	@357

-			    supplier   	@328

-			    vertices   	(list Points

-				(1285, 1169)

-				(719, 1169)

-				(719, 1408))

-			    line_style 	3

-			    origin_attachment 	(1285, 1169)

-			    terminal_attachment 	(719, 1408))))

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @362

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2321, 1138)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@362

-			location   	(1949, 1036)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	744

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E3230174"

-		    compartment 	(object Compartment

-			Parent_View 	@362

-			location   	(1949, 1097)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	779)

-		    width      	762

-		    height     	228

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$38" @363

-		    location   	(1290, 1233)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398886F503BD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "/roles" @364

-			    Parent_View 	@363

-			    location   	(-966, -143)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @365

-				Parent_View 	@364

-				location   	(882, 1363)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	140

-				justify    	0

-				label      	"+/roles"

-				pctDist    	0.892857

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398886F602D8"

-			    client     	@363

-			    supplier   	@328

-			    vertices   	(list Points

-				(1290, 1233)

-				(1079, 1233)

-				(1079, 1403)

-				(811, 1403))

-			    line_style 	3

-			    origin_attachment 	(1290, 1233)

-			    terminal_attachment 	(811, 1403)

-			    label      	(object SegLabel @366

-				Parent_View 	@364

-				location   	(875, 1440)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900794

-				height     	37

-				orientation 	0))

-			(object RoleView "$UNNAMED$39" @367

-			    Parent_View 	@363

-			    location   	(-966, -143)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398886F602E2"

-			    client     	@363

-			    supplier   	@362

-			    vertices   	(list Points

-				(1290, 1233)

-				(1940, 1233))

-			    line_style 	3

-			    origin_attachment 	(1290, 1233)

-			    terminal_attachment 	(1940, 1233))))

-		(object ClassView "Class" "Logical View::ejb::RoleSource" @368

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1456, 1808)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@368

-			location   	(1278, 1705)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	356

-			justify    	0

-			label      	"RoleSource")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF147500E4"

-		    compartment 	(object Compartment

-			Parent_View 	@368

-			location   	(1278, 1766)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	391)

-		    width      	374

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$23" @369

-		    location   	(1040, 1717)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF14EA02FF"

-		    roleview_list 	(list RoleViews

-			(object RoleView "source" @370

-			    Parent_View 	@369

-			    location   	(528, 581)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @371

-				Parent_View 	@370

-				location   	(1191, 1663)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	145

-				justify    	0

-				label      	"+source"

-				pctDist    	0.659389

-				height     	55

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF14EC0059"

-			    client     	@369

-			    supplier   	@368

-			    vertices   	(list Points

-				(1040, 1717)

-				(1269, 1717))

-			    line_style 	3

-			    origin_attachment 	(1040, 1717)

-			    terminal_attachment 	(1269, 1717)

-			    label      	(object SegLabel @372

-				Parent_View 	@370

-				location   	(1245, 1771)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "role" @373

-			    Parent_View 	@369

-			    location   	(528, 581)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @374

-				Parent_View 	@373

-				location   	(888, 1661)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	104

-				justify    	0

-				label      	"+role"

-				pctDist    	0.663755

-				height     	57

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF14EC005A"

-			    client     	@369

-			    supplier   	@328

-			    vertices   	(list Points

-				(1040, 1717)

-				(811, 1717))

-			    line_style 	3

-			    origin_attachment 	(1040, 1717)

-			    terminal_attachment 	(811, 1717)

-			    label      	(object SegLabel @375

-				Parent_View 	@373

-				location   	(835, 1771)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$69" @376

-		    location   	(1644, 1152)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D210300CD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @377

-			    Parent_View 	@376

-			    location   	(188, -656)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @378

-				Parent_View 	@377

-				location   	(1797, 726)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.790657

-				height     	153

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D210502EC"

-			    client     	@376

-			    supplier   	@346

-			    vertices   	(list Points

-				(1644, 1152)

-				(1644, 612))

-			    line_style 	3

-			    origin_attachment 	(1644, 1152)

-			    terminal_attachment 	(1644, 612)

-			    label      	(object SegLabel @379

-				Parent_View 	@377

-				location   	(1698, 667)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$70" @380

-			    Parent_View 	@376

-			    location   	(188, -656)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2105030A"

-			    client     	@376

-			    supplier   	@368

-			    vertices   	(list Points

-				(1644, 1152)

-				(1644, 1693))

-			    line_style 	3

-			    origin_attachment 	(1644, 1152)

-			    terminal_attachment 	(1644, 1693))))

-		(object AssociationViewNew "$UNNAMED$36" @381

-		    location   	(1942, 1652)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398884C2036E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "entityBean" @382

-			    Parent_View 	@381

-			    location   	(710, 260)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @383

-				Parent_View 	@382

-				location   	(1964, 1917)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+entityBean"

-				pctDist    	-0.664634

-				height     	22

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398884C3027F"

-			    client     	@381

-			    supplier   	@362

-			    vertices   	(list Points

-				(1942, 1652)

-				(1942, 1252))

-			    line_style 	3

-			    origin_attachment 	(1942, 1652)

-			    terminal_attachment 	(1942, 1252)

-			    label      	(object SegLabel @384

-				Parent_View 	@382

-				location   	(1996, 1293)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$37" @385

-			    Parent_View 	@381

-			    location   	(710, 260)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398884C30289"

-			    client     	@381

-			    supplier   	@368

-			    vertices   	(list Points

-				(1942, 1652)

-				(1942, 1754)

-				(1643, 1754))

-			    line_style 	3

-			    origin_attachment 	(1942, 1652)

-			    terminal_attachment 	(1643, 1754))))))

-	(object ClassDiagram "EJB2.1 - Query"

-	    quid       	"39BF241E0193"

-	    title      	"EJB2.1 - Query"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	338

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::ejb::ReturnTypeMapping" @386

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(368, 1891)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@386

-			location   	(168, 1807)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"ReturnTypeMapping")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@386

-			location   	(168, 1757)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	16384

-		    fill_color 	13434833

-		    quidu      	"398870D30276"

-		    compartment 	(object Compartment

-			Parent_View 	@386

-			location   	(168, 1868)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	200)

-		    width      	418

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object Label @387

-		    location   	(199, 56)

-		    font       	(object Font

-			size       	14

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	600

-		    label      	"EJB2.1 Query")

-		(object ClassView "Class" "Logical View::ejb::MethodElement" @388

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1754, 1063)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@388

-			location   	(1505, 914)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	498

-			justify    	0

-			label      	"MethodElement")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"392ED22D008A"

-		    compartment 	(object Compartment

-			Parent_View 	@388

-			location   	(1505, 975)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	532)

-		    width      	516

-		    height     	322

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3072, 983)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@389

-			location   	(2858, 802)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	428

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    compartment 	(object Compartment

-			Parent_View 	@389

-			location   	(2858, 863)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	303)

-		    width      	446

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2446, 945)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3937D6FF011D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "methodElement" @391

-			    Parent_View 	@390

-			    location   	(-164, 465)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @392

-				Parent_View 	@391

-				location   	(2198, 932)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	322

-				justify    	0

-				label      	"+methodElement"

-				pctDist    	0.600998

-				height     	47

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000218"

-			    client     	@390

-			    supplier   	@388

-			    vertices   	(list Points

-				(2446, 945)

-				(2446, 978)

-				(2012, 978))

-			    line_style 	3

-			    origin_attachment 	(2446, 945)

-			    terminal_attachment 	(2012, 978)

-			    label      	(object SegLabel @393

-				Parent_View 	@391

-				location   	(2083, 1029)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.850374

-				height     	51

-				orientation 	0))

-			(object RoleView "enterpriseBean" @394

-			    Parent_View 	@390

-			    location   	(-164, 465)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @395

-				Parent_View 	@394

-				location   	(2673, 866)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	299

-				justify    	0

-				label      	"+enterpriseBean"

-				pctDist    	0.599503

-				height     	47

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3937D7000178"

-			    client     	@390

-			    supplier   	@389

-			    vertices   	(list Points

-				(2446, 945)

-				(2446, 912)

-				(2849, 912))

-			    line_style 	3

-			    origin_attachment 	(2446, 945)

-			    terminal_attachment 	(2849, 912)

-			    label      	(object SegLabel @396

-				Parent_View 	@394

-				location   	(2804, 966)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::ejb::Entity" @397

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1591, 361)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@397

-			location   	(1408, 258)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	366

-			justify    	0

-			label      	"Entity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E6970351"

-		    compartment 	(object Compartment

-			Parent_View 	@397

-			location   	(1408, 319)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	388)

-		    width      	384

-		    height     	230

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @398

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E8080095"

-		    client     	@397

-		    supplier   	@389

-		    vertices   	(list Points

-			(1783, 440)

-			(2848, 889))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ejb::QueryMethod" @399

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1984, 1481)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@399

-			location   	(1896, 1405)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	176

-			justify    	0

-			label      	"QueryMethod")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"399ACD9C02DF"

-		    width      	194

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @400

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"399AD23802A9"

-		    client     	@399

-		    supplier   	@388

-		    vertices   	(list Points

-			(1953, 1392)

-			(1953, 1224))

-		    line_style 	3

-		    origin_attachment 	(1953, 1392)

-		    terminal_attachment 	(1953, 1224))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(918, 2037)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@401

-			location   	(790, 1907)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	15778042

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@401

-			location   	(790, 2022)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	284

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::ContainerManagedEntity" @402

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(660, 397)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@402

-			location   	(288, 270)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	744

-			justify    	0

-			label      	"ContainerManagedEntity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E3230174"

-		    compartment 	(object Compartment

-			Parent_View 	@402

-			location   	(288, 331)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	779)

-		    width      	762

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @403

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3780E3230175"

-		    client     	@402

-		    supplier   	@397

-		    vertices   	(list Points

-			(1041, 366)

-			(1399, 366))

-		    line_style 	3

-		    origin_attachment 	(1041, 366)

-		    terminal_attachment 	(1399, 366))

-		(object ClassView "Class" "Logical View::ejb::Query" @404

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(782, 1478)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@404

-			location   	(305, 1353)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	954

-			justify    	0

-			label      	"Query")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF02710327"

-		    compartment 	(object Compartment

-			Parent_View 	@404

-			location   	(305, 1414)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	973)

-		    width      	972

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1577, 1475)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF056702CD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "queryMethod" @406

-			    Parent_View 	@405

-			    location   	(1257, 131)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @407

-				Parent_View 	@406

-				location   	(1729, 1438)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	262

-				justify    	0

-				label      	"+queryMethod"

-				pctDist    	0.491525

-				height     	38

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF056901EA"

-			    client     	@405

-			    supplier   	@399

-			    vertices   	(list Points

-				(1577, 1475)

-				(1887, 1475))

-			    line_style 	3

-			    origin_attachment 	(1577, 1475)

-			    terminal_attachment 	(1887, 1475)

-			    label      	(object SegLabel @408

-				Parent_View 	@406

-				location   	(1855, 1529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "query" @409

-			    Parent_View 	@405

-			    location   	(1257, 131)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @410

-				Parent_View 	@409

-				location   	(1330, 1434)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	138

-				justify    	0

-				label      	"+query"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF056901F4"

-			    client     	@405

-			    supplier   	@404

-			    vertices   	(list Points

-				(1577, 1475)

-				(1268, 1475))

-			    line_style 	3

-			    origin_attachment 	(1577, 1475)

-			    terminal_attachment 	(1268, 1475)

-			    label      	(object SegLabel @411

-				Parent_View 	@409

-				location   	(1299, 1529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$83" @412

-		    location   	(849, 1754)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E56500D0259"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @413

-			    Parent_View 	@412

-			    location   	(67, 276)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @414

-				Parent_View 	@413

-				location   	(1015, 1844)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.874408

-				height     	140

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E56500E0142"

-			    client     	@412

-			    supplier   	@401

-			    vertices   	(list Points

-				(849, 1754)

-				(883, 1894))

-			    line_style 	0

-			    label      	(object SegLabel @415

-				Parent_View 	@413

-				location   	(818, 1852)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.607463

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$84" @416

-			    Parent_View 	@412

-			    location   	(67, 276)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E56500E0174"

-			    client     	@412

-			    supplier   	@404

-			    vertices   	(list Points

-				(849, 1754)

-				(815, 1615))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$54" @417

-		    location   	(638, 1013)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E4D25D600F0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "entity" @418

-			    Parent_View 	@417

-			    location   	(174, -171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @419

-				Parent_View 	@418

-				location   	(696, 570)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+entity"

-				pctDist    	0.938272

-				height     	118

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D25D600F1"

-			    client     	@417

-			    supplier   	@402

-			    vertices   	(list Points

-				(638, 1013)

-				(578, 1013)

-				(578, 536))

-			    line_style 	3

-			    origin_attachment 	(638, 1013)

-			    terminal_attachment 	(578, 536)

-			    label      	(object SegLabel @420

-				Parent_View 	@418

-				location   	(509, 572)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.934568

-				height     	70

-				orientation 	0))

-			(object RoleView "queries" @421

-			    Parent_View 	@417

-			    location   	(174, -171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @422

-				Parent_View 	@421

-				location   	(910, 1283)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	158

-				justify    	0

-				label      	"+queries"

-				pctDist    	0.883951

-				height     	113

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D25D600F2"

-			    client     	@417

-			    supplier   	@404

-			    vertices   	(list Points

-				(638, 1013)

-				(797, 1013)

-				(797, 1341))

-			    line_style 	3

-			    origin_attachment 	(638, 1013)

-			    terminal_attachment 	(797, 1341)

-			    label      	(object SegLabel @423

-				Parent_View 	@421

-				location   	(883, 1320)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.958025

-				height     	86

-				orientation 	0))))))

-	(object ClassDiagram "EJB2.1 - Message Driven Bean"

-	    quid       	"39BF2749030C"

-	    title      	"EJB2.1 - Message Driven Bean"

-	    documentation 	

-|@since J2EE1.4

-|The messaging-type element specifies the message

-|        listener interface of the message-driven bean. If

-|        the messaging-type element is not specified, it is

-|        assumed to be javax.jms.MessageListener.

-	    

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1931

-	    items      	(list diagram_item_list

-		(object Label @424

-		    location   	(50, 41)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	762

-		    label      	"EJB2.1 Message Driven Bean")

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(396, 361)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@425

-			location   	(242, 315)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	308

-			justify    	0

-			label      	"EnterpriseBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3780E71A010A"

-		    width      	326

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::TransactionType" @426

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1825, 497)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@426

-			location   	(1659, 413)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	332

-			justify    	0

-			label      	"TransactionType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@426

-			location   	(1659, 363)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	332

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"37FCA48702EF"

-		    compartment 	(object Compartment

-			Parent_View 	@426

-			location   	(1659, 474)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	231)

-		    width      	350

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @427

-		    location   	(1626, 897)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@427

-			location   	(1488, 797)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	240

-			label      	"Was already used/defined by Session bean")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	300

-		    height     	212)

-		(object AttachView "" @428

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@427

-		    supplier   	@426

-		    vertices   	(list Points

-			(1678, 790)

-			(1751, 643))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::ejb::AcknowledgeMode" @429

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(784, 1169)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@429

-			location   	(564, 1085)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	440

-			justify    	0

-			label      	"AcknowledgeMode")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@429

-			location   	(564, 1035)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	440

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF36D703E4"

-		    compartment 	(object Compartment

-			Parent_View 	@429

-			location   	(564, 1146)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	446)

-		    width      	458

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::SubscriptionDurabilityKind" @430

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 1968)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@430

-			location   	(805, 1884)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	502

-			justify    	0

-			label      	"SubscriptionDurabilityKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@430

-			location   	(805, 1834)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	502

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF38F0029C"

-		    compartment 	(object Compartment

-			Parent_View 	@430

-			location   	(805, 1945)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	268)

-		    width      	520

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::DestinationType" @431

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(544, 1968)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@431

-			location   	(376, 1884)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"DestinationType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@431

-			location   	(376, 1834)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"39978F5C0106"

-		    compartment 	(object Compartment

-			Parent_View 	@431

-			location   	(376, 1945)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	178)

-		    width      	354

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MessageDrivenDestination" @432

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(568, 1616)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@432

-			location   	(112, 1489)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	912

-			justify    	0

-			label      	"MessageDrivenDestination")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF33F10044"

-		    compartment 	(object Compartment

-			Parent_View 	@432

-			location   	(112, 1550)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	951)

-		    width      	930

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1428, 547)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@433

-			location   	(1303, 450)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	251

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	269

-		    height     	219

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::ActivationConfigProperty" @434

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2620, 1797)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@434

-			location   	(2488, 1670)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	264

-			justify    	0

-			label      	"ActivationConfigProperty")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D1A1A00BF"

-		    compartment 	(object Compartment

-			Parent_View 	@434

-			location   	(2488, 1781)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	294)

-		    width      	282

-		    height     	278

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::MessageDriven" @435

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(564, 799)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@435

-			location   	(104, 650)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	920

-			justify    	0

-			label      	"MessageDriven")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BF3248010B"

-		    compartment 	(object Compartment

-			Parent_View 	@435

-			location   	(104, 711)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	944)

-		    width      	938

-		    height     	322

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @436

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF3253026F"

-		    client     	@435

-		    supplier   	@425

-		    vertices   	(list Points

-			(406, 637)

-			(406, 419))

-		    line_style 	3

-		    origin_attachment 	(406, 637)

-		    terminal_attachment 	(406, 419))

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

-		    location   	(353, 1218)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	4227072

-		    quidu      	"39BF340801FF"

-		    roleview_list 	(list RoleViews

-			(object RoleView "destination" @438

-			    Parent_View 	@437

-			    location   	(-47, 418)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @439

-				Parent_View 	@438

-				location   	(502, 1436)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+destination"

-				pctDist    	0.849817

-				height     	149

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF34090052"

-			    client     	@437

-			    supplier   	@432

-			    vertices   	(list Points

-				(353, 1218)

-				(353, 1476))

-			    line_style 	3

-			    origin_attachment 	(353, 1218)

-			    terminal_attachment 	(353, 1476)

-			    label      	(object SegLabel @440

-				Parent_View 	@438

-				location   	(316, 1422)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.790984

-				height     	38

-				orientation 	1))

-			(object RoleView "bean" @441

-			    Parent_View 	@437

-			    location   	(-47, 418)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @442

-				Parent_View 	@441

-				location   	(440, 998)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	128

-				justify    	0

-				label      	"+bean"

-				pctDist    	0.857143

-				height     	87

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BF3409005C"

-			    client     	@437

-			    supplier   	@435

-			    vertices   	(list Points

-				(353, 1218)

-				(353, 960))

-			    line_style 	3

-			    origin_attachment 	(353, 1218)

-			    terminal_attachment 	(353, 960)

-			    label      	(object SegLabel @443

-				Parent_View 	@441

-				location   	(296, 1001)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.845865

-				height     	58

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$55" @444

-		    location   	(951, 340)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D298201E2"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestination" @445

-			    Parent_View 	@444

-			    location   	(454, -460)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @446

-				Parent_View 	@445

-				location   	(1179, 292)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	396

-				justify    	0

-				label      	"+messageDestination"

-				pctDist    	0.424176

-				height     	49

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D29830270"

-			    client     	@444

-			    supplier   	@433

-			    vertices   	(list Points

-				(951, 340)

-				(1393, 340)

-				(1393, 438))

-			    line_style 	3

-			    origin_attachment 	(951, 340)

-			    terminal_attachment 	(1393, 438)

-			    label      	(object SegLabel @447

-				Parent_View 	@445

-				location   	(1340, 383)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

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

-			    Parent_View 	@444

-			    location   	(454, -460)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D2983027A"

-			    client     	@444

-			    supplier   	@435

-			    vertices   	(list Points

-				(951, 340)

-				(708, 340)

-				(708, 638))

-			    line_style 	3

-			    origin_attachment 	(951, 340)

-			    terminal_attachment 	(708, 638))))

-		(object AssociationViewNew "$UNNAMED$61" @449

-		    location   	(1077, 584)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E562D9E0254"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messagingType" @450

-			    Parent_View 	@449

-			    location   	(580, -216)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @451

-				Parent_View 	@450

-				location   	(1129, 552)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	312

-				justify    	0

-				label      	"+messagingType"

-				pctDist    	0.245455

-				height     	33

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E562D9F0183"

-			    client     	@449

-			    supplier   	@433

-			    vertices   	(list Points

-				(1077, 584)

-				(1294, 584))

-			    line_style 	3

-			    origin_attachment 	(1077, 584)

-			    terminal_attachment 	(1294, 584)

-			    label      	(object SegLabel @452

-				Parent_View 	@450

-				location   	(1243, 639)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.768182

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$62" @453

-			    Parent_View 	@449

-			    location   	(580, -216)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E562D9F0197"

-			    client     	@449

-			    supplier   	@435

-			    vertices   	(list Points

-				(1077, 584)

-				(914, 584)

-				(914, 638))

-			    line_style 	3

-			    origin_attachment 	(1077, 584)

-			    terminal_attachment 	(914, 638))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2490, 687)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@454

-			location   	(2362, 558)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@454

-			location   	(2362, 673)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	274

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::ejb::ActivationConfig" @455

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1848, 1387)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@455

-			location   	(1752, 1311)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	192

-			justify    	0

-			label      	"ActivationConfig")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D1A7E0131"

-		    width      	210

-		    height     	176

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2044, 1713)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1AE2015D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @457

-			    Parent_View 	@456

-			    location   	(196, 326)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @458

-				Parent_View 	@457

-				location   	(2299, 1776)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	0.585480

-				height     	63

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AE20333"

-			    client     	@456

-			    supplier   	@434

-			    vertices   	(list Points

-				(2044, 1713)

-				(2479, 1713))

-			    line_style 	3

-			    origin_attachment 	(2044, 1713)

-			    terminal_attachment 	(2479, 1713)

-			    label      	(object SegLabel @459

-				Parent_View 	@457

-				location   	(2322, 1656)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.641164

-				height     	58

-				orientation 	0))

-			(object RoleView "$UNNAMED$47" @460

-			    Parent_View 	@456

-			    location   	(196, 326)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AE20335"

-			    client     	@456

-			    supplier   	@455

-			    vertices   	(list Points

-				(2044, 1713)

-				(1847, 1713)

-				(1847, 1475))

-			    line_style 	3

-			    origin_attachment 	(2044, 1713)

-			    terminal_attachment 	(1847, 1475))))

-		(object AssociationViewNew "$UNNAMED$48" @461

-		    location   	(1318, 1145)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1B050149"

-		    roleview_list 	(list RoleViews

-			(object RoleView "activationConfig" @462

-			    Parent_View 	@461

-			    location   	(822, 345)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @463

-				Parent_View 	@462

-				location   	(1574, 1318)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	309

-				justify    	0

-				label      	"+activationConfig"

-				pctDist    	0.737631

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1B0700A2"

-			    client     	@461

-			    supplier   	@455

-			    vertices   	(list Points

-				(1318, 1145)

-				(1318, 1362)

-				(1743, 1362))

-			    line_style 	3

-			    origin_attachment 	(1318, 1145)

-			    terminal_attachment 	(1743, 1362)

-			    label      	(object SegLabel @464

-				Parent_View 	@462

-				location   	(1679, 1416)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$49" @465

-			    Parent_View 	@461

-			    location   	(822, 345)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1B0700A4"

-			    client     	@461

-			    supplier   	@435

-			    vertices   	(list Points

-				(1318, 1145)

-				(1318, 787)

-				(1033, 787))

-			    line_style 	3

-			    origin_attachment 	(1318, 1145)

-			    terminal_attachment 	(1033, 787))))

-		(object AssociationViewNew "$UNNAMED$63" @466

-		    location   	(1949, 807)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D1AAD00AC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @467

-			    Parent_View 	@466

-			    location   	(101, -580)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @468

-				Parent_View 	@467

-				location   	(2200, 668)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.691023

-				height     	51

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AAD03A5"

-			    client     	@466

-			    supplier   	@454

-			    vertices   	(list Points

-				(1949, 807)

-				(1949, 718)

-				(2353, 718))

-			    line_style 	3

-			    origin_attachment 	(1949, 807)

-			    terminal_attachment 	(2353, 718)

-			    label      	(object SegLabel @469

-				Parent_View 	@467

-				location   	(2290, 772)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.872651

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$64" @470

-			    Parent_View 	@466

-			    location   	(101, -580)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D1AAD03CD"

-			    client     	@466

-			    supplier   	@455

-			    vertices   	(list Points

-				(1949, 807)

-				(1949, 1299))

-			    line_style 	3

-			    origin_attachment 	(1949, 807)

-			    terminal_attachment 	(1949, 1299))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.genmodel b/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.genmodel
deleted file mode 100644
index 0a6c619..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.genmodel
+++ /dev/null
@@ -1,869 +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.jst.j2ee.core/mofj2ee"

-    editDirectory="/org.eclipse.jst.j2ee/commonedit" editorDirectory="/org.eclipse.jst.j2ee.core.editor/src"

-    modelPluginID="org.eclipse.jst.j2ee.core" templateDirectory="" modelName="J2ee"

-    editPluginClass="J2EEPlugin" editorPluginClass="org.eclipse.jst.j2ee.webapplication.presentation.J2eeEditorPlugin"

-    usedGenPackages="../../org.eclipse.emf.ecore/src-ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java">

-  <foreignModel>j2ee.mdl</foreignModel>

-  <foreignModel>WORKSPACE_ROOT</foreignModel>

-  <foreignModel>../..</foreignModel>

-  <genPackages prefix="Ejb" basePackage="org.eclipse.jst.j2ee" 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 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 notify="false" 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" 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 ecoreClass="taglib.ecore#//ExtensibleType">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute taglib.ecore#//ExtensibleType/value"/>

-    </genClasses>

-  </genPackages>

-  <genPackages prefix="Application" basePackage="org.eclipse.jst.j2ee" 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"/>

-  </genPackages>

-  <genPackages prefix="Wscommon" basePackage="org.eclipse.jst.j2ee.webservice" 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="Client" basePackage="org.eclipse.jst.j2ee" 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="Jsp" basePackage="org.eclipse.jst.j2ee" 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="Jca" basePackage="org.eclipse.jst.j2ee" 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"

-      ecorePackage="webservice_client.ecore#/">

-    <genClasses ecoreClass="webservice_client.ecore#//ServiceRef">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webservice_client.ecore#//ServiceRef/serviceInterface"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//ServiceRef/serviceRefName"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//ServiceRef/wsdlFile"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//ServiceRef/jaxrpcMappingFile"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//ServiceRef/portComponentRefs"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//ServiceRef/handlers"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//ServiceRef/serviceQname"/>

-    </genClasses>

-    <genClasses ecoreClass="webservice_client.ecore#//PortComponentRef">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//PortComponentRef/portComponentLink"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webservice_client.ecore#//PortComponentRef/serviceEndpointInterface"/>

-    </genClasses>

-    <genClasses ecoreClass="webservice_client.ecore#//Handler">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//Handler/handlerName"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//Handler/soapRoles"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//Handler/portNames"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference webservice_client.ecore#//Handler/handlerClass"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//Handler/initParams"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//Handler/soapHeaders"/>

-    </genClasses>

-    <genClasses ecoreClass="webservice_client.ecore#//WebServicesClient">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//WebServicesClient/componentScopedRefs"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//WebServicesClient/serviceRefs"/>

-    </genClasses>

-    <genClasses ecoreClass="webservice_client.ecore#//ComponentScopedRefs">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute webservice_client.ecore#//ComponentScopedRefs/componentName"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference webservice_client.ecore#//ComponentScopedRefs/serviceRefs"/>

-    </genClasses>

-  </genPackages>

-  <genPackages prefix="Webapplication" basePackage="org.eclipse.jst.j2ee" 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 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="Wsdd" basePackage="org.eclipse.jst.j2ee.webservice" 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>

-  <genPackages prefix="Common" basePackage="org.eclipse.jst.j2ee" 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 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>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.mdl b/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.mdl
deleted file mode 100644
index 0b57c4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee.mdl
+++ /dev/null
@@ -1,5711 +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       	"39EE0E7F014C"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	FALSE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"39EE0E7F014E"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"39EE0E8001F9"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"39EE0E7F014D"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"39EE0E7F014F"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\src-ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E")
-	    (object Class_Category "java"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jem\\rose\\edocjava2.cat"
-		quid       	"36549F2C004E")
-	    (object Class_Category "client"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\client.cat"
-		quid       	"38C0280700C0")
-	    (object Class_Category "application"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\application.cat"
-		quid       	"38C03008014E")
-	    (object Class_Category "common"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\common.cat"
-		quid       	"38C08F0F038D")
-	    (object Class_Category "ejb"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\ejbschema.cat"
-		quid       	"3780E272032D")
-	    (object Class_Category "taglib"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\taglib_1_1.cat"
-		quid       	"39A6BA5F0070")
-	    (object Class_Category "webapplication"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webapplication.cat"
-		quid       	"38C076D603DD")
-	    (object Class_Category "jca"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jca1_0.cat"
-		quid       	"3C60904200BB")
-	    (object Class_Category "wsclient"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webservices_client_1_0.cat"
-		quid       	"3E4D2F4B02AA")
-	    (object Class_Category "jsp"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jsp_2_0.cat"
-		quid       	"3E4D4F69036B")
-	    (object Class_Category "wscommon"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wscommon.cat"
-		quid       	"3E15B4C0016F")
-	    (object Class_Category "wsdd"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wsdd.cat"
-		quid       	"3E109EAD0319"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"39EE0E8001FA"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::ecore" @1
-			location   	(225, 218)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(81, 134)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::java" @2
-			location   	(687, 222)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(533, 187)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	308
-			    justify    	0
-			    label      	"java")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(533, 137)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	308
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"36549F2C004E"
-			width      	320
-			height     	182)
-		    (object CategoryView "Logical View::client" @3
-			location   	(1109, 231)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(965, 147)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"client")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C0280700C0"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::application" @4
-			location   	(1543, 222)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@4
-			    location   	(1399, 138)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"application")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C03008014E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::common" @5
-			location   	(1965, 218)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@5
-			    location   	(1821, 134)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"common")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C08F0F038D"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::ejb" @6
-			location   	(1189, 609)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@6
-			    location   	(1035, 574)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	308
-			    justify    	0
-			    label      	"ejb")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@6
-			    location   	(1035, 524)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	308
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3780E272032D"
-			width      	320
-			height     	182)
-		    (object CategoryView "Logical View::taglib" @7
-			location   	(1621, 612)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@7
-			    location   	(1477, 528)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"taglib")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A6BA5F0070"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::webapplication" @8
-			location   	(303, 614)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@8
-			    location   	(159, 530)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"webapplication")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C076D603DD"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::jca" @9
-			location   	(737, 627)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@9
-			    location   	(593, 543)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"jca")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3C60904200BB"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::wsclient" @10
-			location   	(2009, 618)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@10
-			    location   	(1865, 534)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsclient")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3E4D2F4B02AA"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::wscommon" @11
-			location   	(325, 934)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@11
-			    location   	(181, 850)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wscommon")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3E15B4C0016F"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::wsdd" @12
-			location   	(750, 940)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@12
-			    location   	(606, 856)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"wsdd")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3E109EAD0319"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"39EE0E7F014F"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"39EE0E8001F8"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"39EE0E7F0150"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"39EE0E7F0152"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteType"
-			value      	("IncompleteTypeSet" 1))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	(value Text 
-|"="
-			))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotDeclare"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"NoDiscriminantPart"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"UnknownDiscriminantPart"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"KnownDiscriminantPart"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	221)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	231)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Direction"
-			value      	("ParamDirectionTypeSet" 102))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ParamDirectionTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"in"
-				value      	102)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"inout"
-				value      	103)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"out"
-				value      	104)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	"None")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"39EE0E7F0151"))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee_codegen.scrapbook b/plugins/org.eclipse.jst.j2ee.core/rose/j2ee_codegen.scrapbook
deleted file mode 100644
index 78057e1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/j2ee_codegen.scrapbook
+++ /dev/null
@@ -1,28 +0,0 @@
-//WebSphere Config Model generation

-String[] args = {"R2X", 

-"(-file", "j2ee.mdl", 

-"-xmiDir", "umlxmi", 

-"-nameuuid", "true", 

-"-extensions", "true",

-"-pathMap", "ECLIPSE_RESOURCES=C:/dev/eclipse35/IDE/project_resources)"};

-//String[] args = {"?"};

-com.ibm.etools.java.init.JavaInit.executeToolkit(args)

-

-// Copy files up one dir then execute...

-

-String[] args = {

-"-modelPrefix","JavaRef","java",

-"-model", "j2ee.xml", 

-"-dir", "C:/dev/eclipse35/IDE/project_resources/eTools EJB Libraries/src", 

-"-package", "com.ibm.etools", 

-// Logical names of level-1 packages within the model which will be generated.  Nesting not supported.

-"-genAdapters", 

-"-genPackage", "common", "com.ibm.etools.j2ee","common","common.xmi",

-"-genPackage", "ejb","com.ibm.etools", "ejb","ejb.xmi",

-"-genPackage", "client","com.ibm.etools","client","client.xmi",

-"-genPackage", "application","com.ibm.etools","application","application.xmi",

-"-genPackage", "webapplication","com.ibm.etools","webapplication","webapplication.xmi",

-"-genPackage", "taglib","com.ibm.etools","taglib","taglib.xmi",

-"-refPackage", "ecore", "com.ibm.etools.emf", 

-"-4"};

-com.ibm.etools.java.init.JavaInit.executeU2M(args)
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/jaxrpcmap.cat b/plugins/org.eclipse.jst.j2ee.core/rose/jaxrpcmap.cat
deleted file mode 100644
index ff51a20..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jaxrpcmap.cat
+++ /dev/null
@@ -1,4728 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "jaxrpcmap"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"prefix"
-	    value      	(value Text "Jaxrpcmap"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsURI"
-	    value      	(value Text "jaxrpcmap.xmi")))
-    quid       	"3E161FA90266"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "JavaWSDLMapping"
-	    quid       	"3E1621C30168"
-	    documentation 	
-|The element describes the Java mapping to a known WSDL document.It contains the mapping between package names and XML namespaces, 
-|WSDL root types and Java artifacts, and the set of mappings for services.
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626A800F4"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "PackageMapping"
-	    quid       	"3E1621DB0360"
-	    documentation 	
-|The package-mapping indicates the mapping between java-package-name and XML namespace in the WSDL document.
-|
-|Used in: java-wsdl-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626B101A1"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "packageType"
-		    quid       	"3E5B83B50174"
-		    documentation 	
-|The package-type indicates the Java package name. It must be a fully qualified name.
-|
-|Used in: package-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "namespaceURI"
-		    quid       	"3E5B83C100D1"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaXMLTypeMapping"
-	    quid       	"3E1621EB016D"
-	    documentation 	
-|The java-xml-type-mapping element contains a class-type that is the fully qualified name of the Java class, QName of the XML root type, the WSDL type scope the QName applies to and the set of variable 
-|mappings for each public variable within the Java class.
-|
-|Used in: java-wsdl-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626BE0068"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "classType"
-		    quid       	"3E5B84D500EC"
-		    documentation 	
-|The class-type element is the fully qualified class name of a Java class.
-|
-|Used in: java-xml-type-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "qnameScope"
-		    quid       	"3E5B85280290"
-		    documentation 	
-|The qname-scope elements scopes the reference of a QName to the WSDL element type it applies to. The value of qname-scope may be simpleType, complexType, or element.
-|
-|Used in: java-xml-type-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "anonymousTypeQname"
-		    quid       	"3F9EFC4C00FF"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ExceptionMapping"
-	    quid       	"3E16220001C6"
-	    documentation 	
-|The exception-mapping element defines the mapping between the service specific exception types and the wsdl faults.
-|
-|This element should be interpreted with respect to the
-|mapping between a method and an operation which provides the mapping context.
-|
-|Used in: service-endpoint-method-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626E4010A"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "exceptionType"
-		    quid       	"3E5B8B9602F1"
-		    documentation 	
-|The exception-type element defines Java type of the exception. It may be a service specific exception.
-|
-|It must be a fully qualified class name.
-|
-|Used in: exception-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3F75E65F0303"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ServiceInterfaceMapping"
-	    quid       	"3E16222D009B"
-	    documentation 	
-|The service-interface-mapping element defines how a Java type for the service interface maps to a WSDL service.
-|
-|Used in: java-wsdl-mapping
-|
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3E5B9B670325"
-		    supplier   	"Logical View::jaxrpcmap::InterfaceMapping"
-		    quidu      	"3E162BC200DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1626EB01AA"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "serviceInterface"
-		    quid       	"3E5B9D3F033C"
-		    documentation 	
-|The service-interface element defines the Java type for the service. For static services, it is javax.xml.rpc.Service interface. For generated service, it would be the generated interface name.
-|
-|The name must be a fully qualified class name.
-|
-|Used in: service-interface-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ServiceEndpointInterfaceMapping"
-	    quid       	"3E1622380259"
-	    documentation 	
-|The service-endpoint-interface-mapping defines a tuple
-|to specify Service Endpoint Interfaces to WSDL port types and WSDL bindings.
-|
-|An interface may be mapped to a port-type and binding multiple times. This happens rarely.
-|
-|Used in: java-wsdl-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3E5B9C9202ED"
-		    supplier   	"Logical View::jaxrpcmap::InterfaceMapping"
-		    quidu      	"3E162BC200DD"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16271302F9"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "serviceEndpointInterface"
-		    quid       	"3E5B9FC501DE"
-		    documentation 	
-|The service-endpoint-interface element defines the Java type for the endpoint interface. The name must be a fully qualified class name.
-|
-|Used in: service-endpoint-interface-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "PackageType"
-	    quid       	"3E16226900F7"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16271B005B"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "packageType"
-		    quid       	"3E19B21C023A"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ClassType"
-	    quid       	"3E16227C005D"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162721024E"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "classType"
-		    quid       	"3E19B26600D3"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "RootTypeQname"
-	    quid       	"3E16229B00C3"
-	    documentation 	
-|The root-type-qname identifies the WSDL QName of an XML type.
-|
-|Used in: java-xml-type-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F46744A027C"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "QnameScope"
-	    quid       	"3E1622AA0273"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162732005D"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "qnameScope"
-		    quid       	"3E19B2AA03E3"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "VariableMapping"
-	    quid       	"3E1622B9033B"
-	    documentation 	
-|The variable-mapping element defines the correlation between a Java class data member or JavaBeans property to an XML element name of an XML root type. If the data-member element is present, the Java variable name is a public data member.  If data-member
-|is not present, the Java variable name is a JavaBeans property.
-|
-|Used in: java-xml-type-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627390048"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaVariableName"
-		    quid       	"3E5B861D0346"
-		    documentation 	
-|The java-variable-name defines the name of a public data member or  JavaBeans property within a Java class. 
-|
-|Used in: variable-mapping
-|
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlElementName"
-		    quid       	"3E5B86300037"
-		    documentation 	
-|The xml-element-name element defines name attribute value of a WSDL element within a root type.
-|
-|Used in: variable-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "dataMember"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F467518029C"
-		    type       	"boolean"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlAttributeName"
-		    quid       	"3F75E92900A7"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlWildcard"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F75EA0202B2"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ExceptionType"
-	    quid       	"3E1622D301E2"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16273F017D"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "name"
-		    quid       	"3E19B571022D"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLMessage"
-	    quid       	"3E1622E002BD"
-	    documentation 	
-|The wsdl-message  element defines a WSDL message by a QNAME.
-|
-|Used in: wsdl-message-mapping, wsdl-return-value-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F46722B03CB"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "ConstructorParameterOrder"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"Java"
-		    name       	"DisableAutoSync"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Final"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Static"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Strictfp"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateDefaultConstructor"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFinalizer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateStaticInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateInstanceInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateCode"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ReadOnly"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedExtends"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedImplements"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ConstructorIs"
-		    value      	("Ctor_Set" 62)))
-	    quid       	"3E1622EC01A1"
-	    documentation 	
-|The constructor-parameter-order element defines the order that complexType element values are applied to a Java exception constructor. Element names are specified for each parameter of the constructor, including element names of inherited types if necessary.
-|
-|Used in: exception-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16274F023D"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaVariableName"
-	    quid       	"3E16235C0262"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162756039B"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaVariableName"
-		    quid       	"3E19B362029A"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "XMLElementName"
-	    quid       	"3E1623A1039D"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627620366"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "xmlElementName"
-		    quid       	"3E19B37D039B"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ElementName"
-	    quid       	"3E1623B9006B"
-	    documentation 	
-|The element-name element defines the name of a complexType element name attribute value.
-|
-|Used in: constructor-parameter-order
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627680115"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "text"
-		    quid       	"3E19B5A202D4"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLServiceName"
-	    quid       	"3E16242903AD"
-	    documentation 	
-|The wsdl-service-name element defines the wsdl service name by a QNAME which uniquely identifies  the service.
-|
-|Used in: service-interface-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F4672A70143"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "PortMapping"
-	    quid       	"3E16243E03A2"
-	    documentation 	
-|The port-mapping defines the mapping of the WSDL port name attribute to the Java name used to generate the Generated Service Interface method get<java-name>.
-|
-|Used in: service-interface-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162772030D"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "portName"
-		    quid       	"3E5B9EC702EC"
-		    documentation 	
-|The port-name is the attribute value of a name attribute of a WSDL port element.
-|
-|Used in: port-mapping
-|
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaPortName"
-		    quid       	"3E5B9ECE0075"
-		    documentation 	
-|The java-port-name element is the string to use as the port name in Java.  It is used in generating the Generated Service Interface method
-|get<java-port-name>.
-|
-|Used in: port-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaPortName"
-	    quid       	"3E1624A301C9"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627780063"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaPortName"
-		    quid       	"3E19C09800E9"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLPortType"
-	    quid       	"3E1624EB0326"
-	    documentation 	
-|The wsdl-port-type element defines the wsdl port type
-|by a QNAME which uniquely identifies  the port type.
-|
-|Used in: service-endpoint-interface-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F4672C40083"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "WSDLBinding"
-	    quid       	"3E16250602A1"
-	    documentation 	
-|The wsdl-binding element defines the wsdl binding
-|by a QNAME which uniquely identifies  the binding.
-|
-|Used in: service-endpoint-interface-mapping
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"3F46737A0033"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"))
-	    language   	"Java")
-	(object Class "ServiceEndpointMethodMapping"
-	    quid       	"3E1625140124"
-	    documentation 	
-|The service-endpoint-method-mapping element defines the mapping of Java methods to operations (which are not uniquely qualified by qnames).
-|
-|The wsdl-operation should be interpreted with respect to the portType and binding in which this definition is embedded within. See the definitions for service-endpoint-interface-mapping and 
-|service-interface-mapping to acquire the proper context. The wrapped-element indicator should only be specified when a WSDL message wraps an element type.  The wsdl-return-value-mapping is not specified for one-way operations.
-|
-|Used in: service-endpoint-interface-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E16278A031A"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaMethodName"
-		    quid       	"3E5BA15D0077"
-		    documentation 	
-|The java-method-name element defines the name of a Java method within an interface.
-|
-|Used in: service-endpoint-method-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlOperation"
-		    quid       	"3E5BA16502F9"
-		    documentation 	
-|The wsdl-operation element defines an operation within a WSDL document. It must be interpreted with respect to a port type.
-|
-|Used in: service-endpoint-method-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wrappedElement"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F4675BF0274"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "JavaMethodName"
-	    quid       	"3E16252900BE"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E162790030E"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "javaMethodName"
-		    quid       	"3E19C3110121"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLOperation"
-	    quid       	"3E16253603C9"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627970340"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlOperation"
-		    quid       	"3E19C2B4019C"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "MethodParamPartsMapping"
-	    quid       	"3E16256A0171"
-	    documentation 	
-|The method-param-parts-mapping element defines the mapping between a Java method parameters and a wsdl-message.
-|
-|Used in: service-endpoint-method-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627A703BA"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramPosition"
-		    quid       	"3E5BA26002C3"
-		    documentation 	
-|The param-position element defines the position of a parameter within a Java method.  It must be an integer starting from 0.
-|
-|Used in: method-param-parts-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramType"
-		    quid       	"3E5BA2690366"
-		    documentation 	
-|The param-type element defines the Java type of a parameter within a Java method. It must be defined by a fully qualified name of a class.
-|
-|Used in: method-param-parts-mapping
-|
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLReturnValueMapping"
-	    attributes 	(list Attribute_Set
-		(object Attribute
-		    tool       	"Java"
-		    name       	"DisableAutoSync"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Final"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Static"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"Strictfp"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateDefaultConstructor"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFinalizer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateStaticInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateInstanceInitializer"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateCode"
-		    value      	TRUE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ReadOnly"
-		    value      	FALSE)
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedExtends"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"GenerateFullyQualifiedImplements"
-		    value      	"")
-		(object Attribute
-		    tool       	"Java"
-		    name       	"ConstructorIs"
-		    value      	("Ctor_Set" 62)))
-	    quid       	"3E1625870243"
-	    documentation 	
-|The wsdl-return-value-mapping  element defines the mapping for the method's return value. It defines the mapping to a specific message and its part.  Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely 
-|identified with their names. The wsdl-message-part-name is not
-|specified if there is no return value or OUT parameters.
-|
-|Used in: service-endpoint-method-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627AD0174"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "methodReturnValue"
-		    quid       	"3E5BA4F601E9"
-		    documentation 	
-|The method-return-value  element defines a fully qualified class name or void type for the method's return value type.
-|
-|Used in: wsdl-return-value-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3E5BA41D02B2"
-		    documentation 	
-|Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element
-|name of the element type.
-|
-|Used in: wsdl-message-mapping, wsdl-return-value-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ParamPosition"
-	    quid       	"3E1625CF02F6"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627B300D2"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramPosition"
-		    quid       	"3E19C4110059"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ParamType"
-	    quid       	"3E1625E20085"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627BC01C4"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "paramType"
-		    quid       	"3E19C41A03C2"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLMessageMapping"
-	    quid       	"3E1625FA038B"
-	    documentation 	
-|The wsdl-message-mapping element defines the mapping to a specific message and its part. Together they define uniquely the mapping for a specific parameter. Parts within a message context are uniquely 
-|identified with their names.
-|
-|The parameter-mode is defined by the mapping to indicate whether the mapping will be IN, OUT, or INOUT..  The presence of the soap-header
-|element indicates that the parameter is mapped to a soap header only. When absent, it means that the wsdl-message is mapped to a Java parameter. The soap headers are interpreted in the order they are
-|provided in the mapping.
-|
-|Used in: method-param-parts-mapping
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627C3000B"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3E5BA2AD019D"
-		    documentation 	
-|Interpretation of the wsdl-message-part-name element depends on whether or not wrapped-element has been defined in the service-endpoint-method-mapping.  If wrapped-element is not specified, wsdl-message-part-name defines a WSDL message part. It should always be interpreter with respect to a wsdl-message element. If wrapped-element is specified, wsdl-message-part-name refers to an element
-|name of the element type.
-|
-|Used in: wsdl-message-mapping, wsdl-return-value-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "parameterMode"
-		    quid       	"3E5BA32F01C4"
-		    documentation 	
-|The parameter-mode  element defines the mode of the parameter. It can have only three values, IN, OUT, INOUT.
-|
-|Used in: wsdl-message-mapping
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "soapHeader"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isUnsettable"
-			    value      	TRUE))
-		    quid       	"3F46765B00CB"
-		    type       	"boolean"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "WSDLMessagePartName"
-	    quid       	"3E1626250394"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627DA01C5"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlMessagePartName"
-		    quid       	"3E19B4B3004C"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "ParameterMode"
-	    quid       	"3E16264800C1"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627E10161"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "parameterMode"
-		    quid       	"3E19B4CB0190"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "MethodReturnValue"
-	    quid       	"3E16267A02F0"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "id"
-		    quid       	"3E1627F002CA"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "methodReturnValue"
-		    quid       	"3E19C3360117"
-		    type       	"String"
-		    exportControl 	"Public"))
-	    language   	"Java")
-	(object Class "InterfaceMapping"
-	    quid       	"3E162BC200DD"
-	    language   	"Java")
-	(object Association "$UNNAMED$0"
-	    quid       	"3E188B0E0371"
-	    roles      	(list role_list
-		(object Role "packageMappings"
-		    quid       	"3E188B1002AC"
-		    label      	"packageMappings"
-		    supplier   	"Logical View::jaxrpcmap::PackageMapping"
-		    quidu      	"3E1621DB0360"
-		    client_cardinality 	(value cardinality "1..n")
-		    Constraints 	"1"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$1"
-		    quid       	"3E188B1002B6"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$2"
-	    quid       	"3E188EAF01F6"
-	    roles      	(list role_list
-		(object Role "rootTypeQname"
-		    quid       	"3E188EB003A6"
-		    label      	"rootTypeQname"
-		    supplier   	"Logical View::jaxrpcmap::RootTypeQname"
-		    quidu      	"3E16229B00C3"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3E188EB003A8"
-		    supplier   	"Logical View::jaxrpcmap::JavaXMLTypeMapping"
-		    quidu      	"3E1621EB016D"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$4"
-	    quid       	"3E188EC50084"
-	    roles      	(list role_list
-		(object Role "variableMappings"
-		    quid       	"3E188EC70271"
-		    label      	"variableMappings"
-		    supplier   	"Logical View::jaxrpcmap::VariableMapping"
-		    quidu      	"3E1622B9033B"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3E188EC70273"
-		    supplier   	"Logical View::jaxrpcmap::JavaXMLTypeMapping"
-		    quidu      	"3E1621EB016D"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$6"
-	    quid       	"3E18919400B9"
-	    roles      	(list role_list
-		(object Role "javaXMLTypeMappings"
-		    quid       	"3E1891950382"
-		    label      	"javaXMLTypeMappings"
-		    supplier   	"Logical View::jaxrpcmap::JavaXMLTypeMapping"
-		    quidu      	"3E1621EB016D"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$7"
-		    quid       	"3E1891950384"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$8"
-	    quid       	"3E18A1AE00EB"
-	    roles      	(list role_list
-		(object Role "exceptionMappings"
-		    quid       	"3E18A1AF001A"
-		    label      	"exceptionMappings"
-		    supplier   	"Logical View::jaxrpcmap::ExceptionMapping"
-		    quidu      	"3E16220001C6"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$9"
-		    quid       	"3E18A1AF001C"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$10"
-	    quid       	"3E18A1B5019F"
-	    roles      	(list role_list
-		(object Role "wsdlMessage"
-		    quid       	"3E18A1B6020E"
-		    label      	"wsdlMessage"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessage"
-		    quidu      	"3E1622E002BD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$11"
-		    quid       	"3E18A1B60210"
-		    supplier   	"Logical View::jaxrpcmap::ExceptionMapping"
-		    quidu      	"3E16220001C6"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$12"
-	    quid       	"3E18A1BB03E2"
-	    roles      	(list role_list
-		(object Role "constructorParameterOrder"
-		    quid       	"3E18A1BD0037"
-		    label      	"constructorParameterOrder"
-		    supplier   	"Logical View::jaxrpcmap::ConstructorParameterOrder"
-		    quidu      	"3E1622EC01A1"
-		    client_cardinality 	(value cardinality "0..1")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$13"
-		    quid       	"3E18A1BD0039"
-		    supplier   	"Logical View::jaxrpcmap::ExceptionMapping"
-		    quidu      	"3E16220001C6"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$14"
-	    quid       	"3E18A1D80066"
-	    roles      	(list role_list
-		(object Role "elementNames"
-		    quid       	"3E18A1DA0023"
-		    label      	"elementNames"
-		    supplier   	"Logical View::jaxrpcmap::ElementName"
-		    quidu      	"3E1623B9006B"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$15"
-		    quid       	"3E18A1DA0025"
-		    supplier   	"Logical View::jaxrpcmap::ConstructorParameterOrder"
-		    quidu      	"3E1622EC01A1"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$16"
-	    quid       	"3E18A543024E"
-	    roles      	(list role_list
-		(object Role "interfaceMappings"
-		    quid       	"3E18A5440322"
-		    label      	"interfaceMappings"
-		    supplier   	"Logical View::jaxrpcmap::InterfaceMapping"
-		    quidu      	"3E162BC200DD"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$17"
-		    quid       	"3E18A5440324"
-		    supplier   	"Logical View::jaxrpcmap::JavaWSDLMapping"
-		    quidu      	"3E1621C30168"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$18"
-	    quid       	"3E18A5680096"
-	    roles      	(list role_list
-		(object Role "wsdlServiceName"
-		    quid       	"3E18A56803AD"
-		    label      	"wsdlServiceName"
-		    supplier   	"Logical View::jaxrpcmap::WSDLServiceName"
-		    quidu      	"3E16242903AD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$19"
-		    quid       	"3E18A56803AF"
-		    supplier   	"Logical View::jaxrpcmap::ServiceInterfaceMapping"
-		    quidu      	"3E16222D009B"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$20"
-	    quid       	"3E18A575004E"
-	    roles      	(list role_list
-		(object Role "portMappings"
-		    quid       	"3E18A576001D"
-		    label      	"portMappings"
-		    supplier   	"Logical View::jaxrpcmap::PortMapping"
-		    quidu      	"3E16243E03A2"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$21"
-		    quid       	"3E18A5760027"
-		    supplier   	"Logical View::jaxrpcmap::ServiceInterfaceMapping"
-		    quidu      	"3E16222D009B"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$22"
-	    quid       	"3E18A583022D"
-	    roles      	(list role_list
-		(object Role "wsdlPortType"
-		    quid       	"3E18A587014D"
-		    label      	"wsdlPortType"
-		    supplier   	"Logical View::jaxrpcmap::WSDLPortType"
-		    quidu      	"3E1624EB0326"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$23"
-		    quid       	"3E18A5870157"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping"
-		    quidu      	"3E1622380259"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$24"
-	    quid       	"3E18A5BD036D"
-	    roles      	(list role_list
-		(object Role "wsdlBinding"
-		    quid       	"3E18A5BE038D"
-		    label      	"wsdlBinding"
-		    supplier   	"Logical View::jaxrpcmap::WSDLBinding"
-		    quidu      	"3E16250602A1"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$25"
-		    quid       	"3E18A5BE0397"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping"
-		    quidu      	"3E1622380259"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$26"
-	    quid       	"3E18A5E30351"
-	    roles      	(list role_list
-		(object Role "serviceEndpointMethodMappings"
-		    quid       	"3E18A5E502D2"
-		    label      	"serviceEndpointMethodMappings"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointMethodMapping"
-		    quidu      	"3E1625140124"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$27"
-		    quid       	"3E18A5E502DC"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping"
-		    quidu      	"3E1622380259"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$28"
-	    quid       	"3E19A09E005D"
-	    roles      	(list role_list
-		(object Role "methodParamPartsMappings"
-		    quid       	"3E19A09F004A"
-		    label      	"methodParamPartsMappings"
-		    supplier   	"Logical View::jaxrpcmap::MethodParamPartsMapping"
-		    quidu      	"3E16256A0171"
-		    client_cardinality 	(value cardinality "0..n")
-		    Constraints 	"4"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$29"
-		    quid       	"3E19A09F004C"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointMethodMapping"
-		    quidu      	"3E1625140124"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$30"
-	    quid       	"3E19A0A3028A"
-	    roles      	(list role_list
-		(object Role "wsdlReturnValueMapping"
-		    quid       	"3E19A0A40354"
-		    label      	"wsdlReturnValueMapping"
-		    supplier   	"Logical View::jaxrpcmap::WSDLReturnValueMapping"
-		    quidu      	"3E1625870243"
-		    client_cardinality 	(value cardinality "0..1")
-		    Constraints 	"5"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$31"
-		    quid       	"3E19A0A4035E"
-		    supplier   	"Logical View::jaxrpcmap::ServiceEndpointMethodMapping"
-		    quidu      	"3E1625140124"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$32"
-	    quid       	"3E19A121008E"
-	    roles      	(list role_list
-		(object Role "wsdlMessage"
-		    quid       	"3E19A1220017"
-		    label      	"wsdlMessage"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessage"
-		    quidu      	"3E1622E002BD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"2"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$33"
-		    quid       	"3E19A1220022"
-		    supplier   	"Logical View::jaxrpcmap::WSDLReturnValueMapping"
-		    quidu      	"3E1625870243"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$34"
-	    quid       	"3E19A5D401CA"
-	    roles      	(list role_list
-		(object Role "wsdlMessageMapping"
-		    quid       	"3E19A5D5008B"
-		    label      	"wsdlMessageMapping"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessageMapping"
-		    quidu      	"3E1625FA038B"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"3"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$35"
-		    quid       	"3E19A5D5008D"
-		    supplier   	"Logical View::jaxrpcmap::MethodParamPartsMapping"
-		    quidu      	"3E16256A0171"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$36"
-	    quid       	"3E19A5DB0011"
-	    roles      	(list role_list
-		(object Role "wsdlMessage"
-		    quid       	"3E19A5DB0383"
-		    label      	"wsdlMessage"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessage"
-		    quidu      	"3E1622E002BD"
-		    client_cardinality 	(value cardinality "1")
-		    Constraints 	"1"
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$37"
-		    quid       	"3E19A5DB038E"
-		    supplier   	"Logical View::jaxrpcmap::WSDLMessageMapping"
-		    quidu      	"3E1625FA038B"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "PackageMapping"
-	    quid       	"3E188A5A02CB"
-	    title      	"PackageMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::PackageMapping" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1056, 208)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(826, 100)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	460
-			justify    	0
-			label      	"PackageMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621DB0360"
-		    width      	478
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 208)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(109, 141)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$0" @3
-		    location   	(662, 208)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E188B0E0371"
-		    roleview_list 	(list RoleViews
-			(object RoleView "packageMappings" @4
-			    Parent_View 	@3
-			    location   	(362, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @5
-				Parent_View 	@4
-				location   	(716, 87)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	294
-				justify    	0
-				label      	"+packageMappings"
-				pctDist    	0.349727
-				height     	122
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188B1002AC"
-			    client     	@3
-			    supplier   	@1
-			    line_style 	0
-			    label      	(object SegLabel @6
-				Parent_View 	@4
-				location   	(744, 151)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.535519
-				height     	58
-				orientation 	0)
-			    label      	(object SegLabel @7
-				Parent_View 	@4
-				location   	(786, 253)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{1}"
-				pctDist    	0.814208
-				height     	45
-				orientation 	1))
-			(object RoleView "$UNNAMED$1" @8
-			    Parent_View 	@3
-			    location   	(362, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188B1002B6"
-			    client     	@3
-			    supplier   	@2
-			    line_style 	0
-			    label      	(object SegLabel @9
-				Parent_View 	@8
-				location   	(523, 262)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.901099
-				height     	54
-				orientation 	0))))))
-	(object ClassDiagram "JavaXMLTypeMapping"
-	    quid       	"3E188BF0014A"
-	    title      	"JavaXMLTypeMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::RootTypeQname" @10
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1184, 720)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@10
-			location   	(1018, 678)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	332
-			justify    	0
-			label      	"RootTypeQname")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16229B00C3"
-		    width      	350
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::VariableMapping" @11
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1184, 1232)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@11
-			location   	(923, 1063)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	522
-			justify    	0
-			label      	"VariableMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622B9033B"
-		    width      	540
-		    height     	358
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaXMLTypeMapping" @12
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(320, 848)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@12
-			location   	(14, 720)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	612
-			justify    	0
-			label      	"JavaXMLTypeMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621EB016D"
-		    width      	630
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @13
-		    location   	(821, 773)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E188EAF01F6"
-		    roleview_list 	(list RoleViews
-			(object RoleView "rootTypeQname" @14
-			    Parent_View 	@13
-			    location   	(505, -75)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @15
-				Parent_View 	@14
-				location   	(890, 720)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	262
-				justify    	0
-				label      	"+rootTypeQname"
-				pctDist    	0.403230
-				height     	43
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EB003A6"
-			    client     	@13
-			    supplier   	@10
-			    line_style 	0
-			    label      	(object SegLabel @16
-				Parent_View 	@14
-				location   	(956, 690)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.767360
-				height     	64
-				orientation 	0)
-			    label      	(object SegLabel @17
-				Parent_View 	@14
-				location   	(984, 682)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.925304
-				height     	68
-				orientation 	0))
-			(object RoleView "$UNNAMED$3" @18
-			    Parent_View 	@13
-			    location   	(505, -75)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EB003A8"
-			    client     	@13
-			    supplier   	@12
-			    line_style 	0
-			    label      	(object SegLabel @19
-				Parent_View 	@18
-				location   	(663, 851)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896000
-				height     	54
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$4" @20
-		    location   	(771, 1048)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E188EC50084"
-		    roleview_list 	(list RoleViews
-			(object RoleView "variableMappings" @21
-			    Parent_View 	@20
-			    location   	(450, 199)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @22
-				Parent_View 	@21
-				location   	(812, 1149)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	292
-				justify    	0
-				label      	"+variableMappings"
-				pctDist    	0.510648
-				height     	76
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EC70271"
-			    client     	@20
-			    supplier   	@11
-			    line_style 	0
-			    label      	(object SegLabel @23
-				Parent_View 	@21
-				location   	(847, 1103)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.594874
-				height     	20
-				orientation 	1)
-			    label      	(object SegLabel @24
-				Parent_View 	@21
-				location   	(794, 1117)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{4}"
-				pctDist    	0.310863
-				height     	55
-				orientation 	1))
-			(object RoleView "$UNNAMED$5" @25
-			    Parent_View 	@20
-			    location   	(450, 199)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E188EC70273"
-			    client     	@20
-			    supplier   	@12
-			    line_style 	0
-			    label      	(object SegLabel @26
-				Parent_View 	@25
-				location   	(666, 944)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896312
-				height     	53
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @27
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(272, 160)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@27
-			location   	(77, 93)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$6" @28
-		    location   	(293, 473)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18919400B9"
-		    roleview_list 	(list RoleViews
-			(object RoleView "javaXMLTypeMappings" @29
-			    Parent_View 	@28
-			    location   	(21, 320)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @30
-				Parent_View 	@29
-				location   	(267, 665)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	370
-				justify    	0
-				label      	"+javaXMLTypeMappings"
-				pctDist    	0.797753
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E1891950382"
-			    client     	@28
-			    supplier   	@12
-			    line_style 	0
-			    label      	(object SegLabel @31
-				Parent_View 	@29
-				location   	(362, 681)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.898876
-				height     	54
-				orientation 	0)
-			    label      	(object SegLabel @32
-				Parent_View 	@29
-				location   	(416, 677)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.898876
-				height     	108
-				orientation 	0))
-			(object RoleView "$UNNAMED$7" @33
-			    Parent_View 	@28
-			    location   	(21, 320)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E1891950384"
-			    client     	@28
-			    supplier   	@27
-			    line_style 	0
-			    label      	(object SegLabel @34
-				Parent_View 	@33
-				location   	(333, 258)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898496
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::common::QName" @35
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1184, 224)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@35
-			location   	(898, 77)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	572
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16766421
-		    quidu      	"3F3BEF5D02C0"
-		    width      	590
-		    height     	314
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @36
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F46744A027C"
-		    client     	@10
-		    supplier   	@35
-		    line_style 	0)))
-	(object ClassDiagram "ExceptionMapping"
-	    quid       	"3E18934B039F"
-	    title      	"ExceptionMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @37
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 128)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@37
-			location   	(109, 61)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessage" @38
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1072, 656)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@38
-			location   	(923, 614)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"WSDLMessage")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622E002BD"
-		    width      	316
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ExceptionMapping" @39
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(304, 656)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@39
-			location   	(7, 548)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	594
-			justify    	0
-			label      	"ExceptionMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16220001C6"
-		    width      	612
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$8" @40
-		    location   	(304, 371)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1AE00EB"
-		    roleview_list 	(list RoleViews
-			(object RoleView "exceptionMappings" @41
-			    Parent_View 	@40
-			    location   	(0, 250)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @42
-				Parent_View 	@41
-				location   	(265, 475)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	323
-				justify    	0
-				label      	"+exceptionMappings"
-				pctDist    	0.631016
-				height     	40
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1AF001A"
-			    client     	@40
-			    supplier   	@39
-			    line_style 	0
-			    label      	(object SegLabel @43
-				Parent_View 	@41
-				location   	(358, 519)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.893048
-				height     	54
-				orientation 	0)
-			    label      	(object SegLabel @44
-				Parent_View 	@41
-				location   	(412, 519)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.893048
-				height     	108
-				orientation 	0))
-			(object RoleView "$UNNAMED$9" @45
-			    Parent_View 	@40
-			    location   	(0, 250)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1AF001C"
-			    client     	@40
-			    supplier   	@37
-			    line_style 	0
-			    label      	(object SegLabel @46
-				Parent_View 	@45
-				location   	(358, 223)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.892473
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$10" @47
-		    location   	(761, 656)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1B5019F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessage" @48
-			    Parent_View 	@47
-			    location   	(461, -6)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @49
-				Parent_View 	@48
-				location   	(784, 618)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	230
-				justify    	0
-				label      	"+wsdlMessage"
-				pctDist    	0.156463
-				height     	39
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1B6020E"
-			    client     	@47
-			    supplier   	@38
-			    line_style 	0
-			    label      	(object SegLabel @50
-				Parent_View 	@48
-				location   	(896, 710)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896552
-				height     	54
-				orientation 	1)
-			    label      	(object SegLabel @51
-				Parent_View 	@48
-				location   	(862, 701)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.666667
-				height     	45
-				orientation 	1))
-			(object RoleView "$UNNAMED$11" @52
-			    Parent_View 	@47
-			    location   	(461, -6)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1B60210"
-			    client     	@47
-			    supplier   	@39
-			    line_style 	0
-			    label      	(object SegLabel @53
-				Parent_View 	@52
-				location   	(626, 710)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898635
-				height     	54
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::ElementName" @54
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1888, 1424)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@54
-			location   	(1738, 1336)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	300
-			justify    	0
-			label      	"ElementName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1623B9006B"
-		    width      	318
-		    height     	196
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ConstructorParameterOrder" @55
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1152, 1088)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@55
-			location   	(902, 1021)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	500
-			justify    	0
-			label      	"ConstructorParameterOrder")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622EC01A1"
-		    width      	518
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$12" @56
-		    location   	(768, 892)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1BB03E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "constructorParameterOrder" @57
-			    Parent_View 	@56
-			    location   	(463, 235)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @58
-				Parent_View 	@57
-				location   	(688, 997)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	422
-				justify    	0
-				label      	"+constructorParameterOrder"
-				pctDist    	-0.102003
-				height     	130
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1BD0037"
-			    client     	@56
-			    supplier   	@55
-			    line_style 	0
-			    label      	(object SegLabel @59
-				Parent_View 	@57
-				location   	(1039, 980)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..1"
-				pctDist    	1.082131
-				height     	45
-				orientation 	0)
-			    label      	(object SegLabel @60
-				Parent_View 	@57
-				location   	(983, 940)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.817677
-				height     	55
-				orientation 	0))
-			(object RoleView "$UNNAMED$13" @61
-			    Parent_View 	@56
-			    location   	(463, 235)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1BD0039"
-			    client     	@56
-			    supplier   	@39
-			    line_style 	0
-			    label      	(object SegLabel @62
-				Parent_View 	@61
-				location   	(584, 739)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896194
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$14" @63
-		    location   	(1525, 1257)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A1D80066"
-		    roleview_list 	(list RoleViews
-			(object RoleView "elementNames" @64
-			    Parent_View 	@63
-			    location   	(323, -167)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @65
-				Parent_View 	@64
-				location   	(1718, 1264)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+elementNames"
-				pctDist    	0.804782
-				height     	75
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1DA0023"
-			    client     	@63
-			    supplier   	@54
-			    line_style 	0
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(1672, 1374)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.810582
-				height     	46
-				orientation 	1))
-			(object RoleView "$UNNAMED$15" @67
-			    Parent_View 	@63
-			    location   	(323, -167)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A1DA0025"
-			    client     	@63
-			    supplier   	@55
-			    line_style 	0
-			    label      	(object SegLabel @68
-				Parent_View 	@67
-				location   	(1321, 1223)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.902256
-				height     	54
-				orientation 	0))))
-		(object ClassView "Class" "Logical View::common::QName" @69
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1600, 192)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@69
-			location   	(1314, 45)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	572
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16766421
-		    quidu      	"3F3BEF5D02C0"
-		    width      	590
-		    height     	314
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @70
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F46722B03CB"
-		    client     	@38
-		    supplier   	@69
-		    line_style 	0)))
-	(object ClassDiagram "InterfaceMapping"
-	    quid       	"3E18A3F50002"
-	    title      	"InterfaceMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	2001
-	    origin_y   	1669
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceEndpointMethodMapping" @71
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2112, 2336)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@71
-			location   	(1806, 2208)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	612
-			justify    	0
-			label      	"ServiceEndpointMethodMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625140124"
-		    width      	630
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLPortType" @72
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2064, 1504)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@72
-			location   	(1909, 1462)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	310
-			justify    	0
-			label      	"WSDLPortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1624EB0326"
-		    width      	328
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLBinding" @73
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2064, 1888)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@73
-			location   	(1921, 1846)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	286
-			justify    	0
-			label      	"WSDLBinding")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16250602A1"
-		    width      	304
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceEndpointInterfaceMapping" @74
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1120, 1504)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@74
-			location   	(801, 1416)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	638
-			justify    	0
-			label      	"ServiceEndpointInterfaceMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622380259"
-		    width      	656
-		    height     	196
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$26" @75
-		    location   	(1592, 1899)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A5E30351"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceEndpointMethodMappings" @76
-			    Parent_View 	@75
-			    location   	(479, 394)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @77
-				Parent_View 	@76
-				location   	(1672, 2194)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	508
-				justify    	0
-				label      	"+serviceEndpointMethodMappings"
-				pctDist    	0.543006
-				height     	175
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5E502D2"
-			    client     	@75
-			    supplier   	@71
-			    line_style 	0
-			    label      	(object SegLabel @78
-				Parent_View 	@76
-				location   	(1692, 2158)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.522836
-				height     	134
-				orientation 	1)
-			    label      	(object SegLabel @79
-				Parent_View 	@76
-				location   	(1843, 2152)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{4}"
-				pctDist    	0.765691
-				height     	33
-				orientation 	1))
-			(object RoleView "$UNNAMED$27" @80
-			    Parent_View 	@75
-			    location   	(479, 394)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5E502DC"
-			    client     	@75
-			    supplier   	@74
-			    line_style 	0
-			    label      	(object SegLabel @81
-				Parent_View 	@80
-				location   	(1308, 1594)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.895582
-				height     	52
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$22" @82
-		    location   	(1673, 1504)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A583022D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlPortType" @83
-			    Parent_View 	@82
-			    location   	(547, 2)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @84
-				Parent_View 	@83
-				location   	(1843, 1433)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	231
-				justify    	0
-				label      	"+wsdlPortType"
-				pctDist    	0.755187
-				height     	72
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A587014D"
-			    client     	@82
-			    supplier   	@72
-			    line_style 	0
-			    label      	(object SegLabel @85
-				Parent_View 	@83
-				location   	(1877, 1543)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.906704
-				height     	39
-				orientation 	1)
-			    label      	(object SegLabel @86
-				Parent_View 	@83
-				location   	(1839, 1471)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.734016
-				height     	34
-				orientation 	0))
-			(object RoleView "$UNNAMED$23" @87
-			    Parent_View 	@82
-			    location   	(547, 2)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5870157"
-			    client     	@82
-			    supplier   	@74
-			    line_style 	0
-			    label      	(object SegLabel @88
-				Parent_View 	@87
-				location   	(1471, 1452)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.901961
-				height     	53
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$24" @89
-		    location   	(1648, 1718)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object SegLabel @90
-			Parent_View 	@89
-			location   	(1648, 1659)
-			font       	(object Font
-			    size       	8
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	TRUE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			hidden     	TRUE
-			anchor     	1
-			anchor_loc 	1
-			nlines     	1
-			max_width  	60
-			justify    	0
-			label      	""
-			pctDist    	0.500000
-			height     	60
-			orientation 	0)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A5BD036D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlBinding" @91
-			    Parent_View 	@89
-			    location   	(520, 221)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @92
-				Parent_View 	@91
-				location   	(2051, 1792)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	204
-				justify    	0
-				label      	"+wsdlBinding"
-				pctDist    	1.297847
-				height     	84
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5BE038D"
-			    client     	@89
-			    supplier   	@73
-			    line_style 	0
-			    label      	(object SegLabel @93
-				Parent_View 	@91
-				location   	(1888, 1848)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.869694
-				height     	30
-				orientation 	1)
-			    label      	(object SegLabel @94
-				Parent_View 	@91
-				location   	(1891, 1782)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.801582
-				height     	34
-				orientation 	0))
-			(object RoleView "$UNNAMED$25" @95
-			    Parent_View 	@89
-			    location   	(520, 221)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5BE0397"
-			    client     	@89
-			    supplier   	@74
-			    line_style 	0
-			    label      	(object SegLabel @96
-				Parent_View 	@95
-				location   	(1413, 1567)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.891640
-				height     	53
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::InterfaceMapping" @97
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(288, 1088)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@97
-			location   	(113, 1046)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	350
-			justify    	0
-			label      	"InterfaceMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E162BC200DD"
-		    width      	368
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::JavaWSDLMapping" @98
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(288, 128)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@98
-			location   	(93, 61)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	390
-			justify    	0
-			label      	"JavaWSDLMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1621C30168"
-		    width      	408
-		    height     	154
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$16" @99
-		    location   	(288, 620)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A543024E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "interfaceMappings" @100
-			    Parent_View 	@99
-			    location   	(0, 496)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @101
-				Parent_View 	@100
-				location   	(248, 951)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	296
-				justify    	0
-				label      	"+interfaceMappings"
-				pctDist    	0.798526
-				height     	41
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5440322"
-			    client     	@99
-			    supplier   	@97
-			    line_style 	0
-			    label      	(object SegLabel @102
-				Parent_View 	@100
-				location   	(342, 993)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.899263
-				height     	54
-				orientation 	0)
-			    label      	(object SegLabel @103
-				Parent_View 	@100
-				location   	(396, 993)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{4}"
-				pctDist    	0.899263
-				height     	108
-				orientation 	0))
-			(object RoleView "$UNNAMED$17" @104
-			    Parent_View 	@99
-			    location   	(0, 496)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5440324"
-			    client     	@99
-			    supplier   	@98
-			    line_style 	0
-			    label      	(object SegLabel @105
-				Parent_View 	@104
-				location   	(342, 247)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.899263
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLServiceName" @106
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1984, 736)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@106
-			location   	(1795, 694)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	378
-			justify    	0
-			label      	"WSDLServiceName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16242903AD"
-		    width      	396
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::PortMapping" @107
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1920, 1072)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@107
-			location   	(1698, 964)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	444
-			justify    	0
-			label      	"PortMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16243E03A2"
-		    width      	462
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceInterfaceMapping" @108
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1040, 736)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@108
-			location   	(799, 649)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	482
-			justify    	0
-			label      	"ServiceInterfaceMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16222D009B"
-		    width      	500
-		    height     	194
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$18" @109
-		    location   	(1537, 736)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A5680096"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlServiceName" @110
-			    Parent_View 	@109
-			    location   	(487, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @111
-				Parent_View 	@110
-				location   	(1733, 632)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	290
-				justify    	0
-				label      	"+wsdlServiceName"
-				pctDist    	0.788546
-				height     	105
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A56803AD"
-			    client     	@109
-			    supplier   	@106
-			    line_style 	0
-			    label      	(object SegLabel @112
-				Parent_View 	@110
-				location   	(1758, 790)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.893750
-				height     	54
-				orientation 	1)
-			    label      	(object SegLabel @113
-				Parent_View 	@110
-				location   	(1741, 702)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.828194
-				height     	35
-				orientation 	0))
-			(object RoleView "$UNNAMED$19" @114
-			    Parent_View 	@109
-			    location   	(487, 0)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A56803AF"
-			    client     	@109
-			    supplier   	@108
-			    line_style 	0
-			    label      	(object SegLabel @115
-				Parent_View 	@114
-				location   	(1316, 790)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.899371
-				height     	54
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$20" @116
-		    location   	(1489, 906)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E18A575004E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "portMappings" @117
-			    Parent_View 	@116
-			    location   	(456, 168)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @118
-				Parent_View 	@117
-				location   	(1660, 930)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	221
-				justify    	0
-				label      	"+portMappings"
-				pctDist    	0.793804
-				height     	40
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A576001D"
-			    client     	@116
-			    supplier   	@107
-			    line_style 	0
-			    label      	(object SegLabel @119
-				Parent_View 	@117
-				location   	(1649, 1023)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.899322
-				height     	52
-				orientation 	1)
-			    label      	(object SegLabel @120
-				Parent_View 	@117
-				location   	(1630, 1074)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.899516
-				height     	107
-				orientation 	1))
-			(object RoleView "$UNNAMED$21" @121
-			    Parent_View 	@116
-			    location   	(456, 168)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E18A5760027"
-			    client     	@116
-			    supplier   	@108
-			    line_style 	0
-			    label      	(object SegLabel @122
-				Parent_View 	@121
-				location   	(1329, 791)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898004
-				height     	52
-				orientation 	1))))
-		(object InheritView "" @123
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E5B9B670325"
-		    client     	@108
-		    supplier   	@97
-		    line_style 	0)
-		(object InheritView "" @124
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E5B9C9202ED"
-		    client     	@74
-		    supplier   	@97
-		    line_style 	0)
-		(object ClassView "Class" "Logical View::common::QName" @125
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1984, 240)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@125
-			location   	(1697, 93)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	574
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16766421
-		    quidu      	"3F3BEF5D02C0"
-		    width      	592
-		    height     	314
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @126
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F4672A70143"
-		    client     	@106
-		    supplier   	@125
-		    line_style 	0)
-		(object InheritView "" @127
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F4672C40083"
-		    client     	@72
-		    supplier   	@125
-		    vertices   	(list Points
-			(2228, 1504)
-			(2686, 1504)
-			(2679, 238)
-			(2280, 239))
-		    line_style 	0)
-		(object InheritView "" @128
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F46737A0033"
-		    client     	@73
-		    supplier   	@125
-		    vertices   	(list Points
-			(2216, 1887)
-			(2586, 1887)
-			(2586, 237)
-			(2280, 238))
-		    line_style 	0)))
-	(object ClassDiagram "ServiceEndpointMethodMapping"
-	    quid       	"3E199C510009"
-	    title      	"ServiceEndpointMethodMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	1589
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::MethodParamPartsMapping" @129
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1744, 576)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@129
-			location   	(1478, 468)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	532
-			justify    	0
-			label      	"MethodParamPartsMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16256A0171"
-		    width      	550
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::ServiceEndpointMethodMapping" @130
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(368, 576)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@130
-			location   	(62, 448)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	612
-			justify    	0
-			label      	"ServiceEndpointMethodMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625140124"
-		    width      	630
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$28" @131
-		    location   	(1075, 576)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A09E005D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "methodParamPartsMappings" @132
-			    Parent_View 	@131
-			    location   	(699, -305)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @133
-				Parent_View 	@132
-				location   	(1020, 594)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	451
-				justify    	0
-				label      	"+methodParamPartsMappings"
-				pctDist    	-0.144160
-				height     	18
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A09F004A"
-			    client     	@131
-			    supplier   	@129
-			    line_style 	0
-			    label      	(object SegLabel @134
-				Parent_View 	@132
-				location   	(1400, 608)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.830508
-				height     	32
-				orientation 	1)
-			    label      	(object SegLabel @135
-				Parent_View 	@132
-				location   	(1073, 560)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{4}"
-				pctDist    	-0.006768
-				height     	17
-				orientation 	0))
-			(object RoleView "$UNNAMED$29" @136
-			    Parent_View 	@131
-			    location   	(699, -305)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A09F004C"
-			    client     	@131
-			    supplier   	@130
-			    line_style 	0
-			    label      	(object SegLabel @137
-				Parent_View 	@136
-				location   	(723, 524)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.900100
-				height     	53
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessage" @138
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1776, 1664)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@138
-			location   	(1627, 1622)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"WSDLMessage")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622E002BD"
-		    width      	316
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLReturnValueMapping" @139
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1776, 992)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@139
-			location   	(1479, 884)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	594
-			justify    	0
-			label      	"WSDLReturnValueMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625870243"
-		    width      	612
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$30" @140
-		    location   	(1076, 784)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A0A3028A"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlReturnValueMapping" @141
-			    Parent_View 	@140
-			    location   	(715, -89)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @142
-				Parent_View 	@141
-				location   	(1029, 831)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	406
-				justify    	0
-				label      	"+wsdlReturnValueMapping"
-				pctDist    	-0.082016
-				height     	58
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A0A40354"
-			    client     	@140
-			    supplier   	@139
-			    line_style 	0
-			    label      	(object SegLabel @143
-				Parent_View 	@141
-				location   	(1334, 902)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	68
-				justify    	0
-				label      	"0..1"
-				pctDist    	0.683353
-				height     	40
-				orientation 	1)
-			    label      	(object SegLabel @144
-				Parent_View 	@141
-				location   	(1239, 899)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{5}"
-				pctDist    	0.459699
-				height     	64
-				orientation 	1))
-			(object RoleView "$UNNAMED$31" @145
-			    Parent_View 	@140
-			    location   	(715, -89)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A0A4035E"
-			    client     	@140
-			    supplier   	@130
-			    line_style 	0
-			    label      	(object SegLabel @146
-				Parent_View 	@145
-				location   	(739, 631)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.898596
-				height     	52
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$32" @147
-		    location   	(1776, 1360)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A121008E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessage" @148
-			    Parent_View 	@147
-			    location   	(116, -432)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @149
-				Parent_View 	@148
-				location   	(1817, 1560)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	230
-				justify    	0
-				label      	"+wsdlMessage"
-				pctDist    	0.798165
-				height     	41
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A1220017"
-			    client     	@147
-			    supplier   	@138
-			    line_style 	0
-			    label      	(object SegLabel @150
-				Parent_View 	@148
-				location   	(1723, 1584)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896024
-				height     	54
-				orientation 	1)
-			    label      	(object SegLabel @151
-				Parent_View 	@148
-				location   	(1669, 1584)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	48
-				justify    	0
-				label      	"{2}"
-				pctDist    	0.896024
-				height     	108
-				orientation 	1))
-			(object RoleView "$UNNAMED$33" @152
-			    Parent_View 	@147
-			    location   	(116, -432)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A1220022"
-			    client     	@147
-			    supplier   	@139
-			    line_style 	0
-			    label      	(object SegLabel @153
-				Parent_View 	@152
-				location   	(1723, 1136)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.896024
-				height     	54
-				orientation 	0))))))
-	(object ClassDiagram "MethodParamPartsMapping"
-	    quid       	"3E19A4EF0073"
-	    title      	"MethodParamPartsMapping"
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	431
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::jaxrpcmap::MethodParamPartsMapping" @154
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(336, 672)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@154
-			location   	(70, 564)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	532
-			justify    	0
-			label      	"MethodParamPartsMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E16256A0171"
-		    width      	550
-		    height     	236
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessage" @155
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2064, 688)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@155
-			location   	(1915, 646)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	298
-			justify    	0
-			label      	"WSDLMessage")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1622E002BD"
-		    width      	316
-		    height     	104
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::jaxrpcmap::WSDLMessageMapping" @156
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1232, 912)
-		    font       	(object Font
-			size       	8
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@156
-			location   	(935, 784)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	594
-			justify    	0
-			label      	"WSDLMessageMapping")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E1625FA038B"
-		    width      	612
-		    height     	276
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$34" @157
-		    location   	(768, 787)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A5D401CA"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessageMapping" @158
-			    Parent_View 	@157
-			    location   	(431, 114)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @159
-				Parent_View 	@158
-				location   	(728, 852)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	348
-				justify    	0
-				label      	"+wsdlMessageMapping"
-				pctDist    	-0.144660
-				height     	74
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5D5008B"
-			    client     	@157
-			    supplier   	@156
-			    line_style 	0
-			    label      	(object SegLabel @160
-				Parent_View 	@158
-				location   	(924, 775)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.899024
-				height     	53
-				orientation 	0)
-			    label      	(object SegLabel @161
-				Parent_View 	@158
-				location   	(893, 774)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{3}"
-				pctDist    	0.720715
-				height     	46
-				orientation 	0))
-			(object RoleView "$UNNAMED$35" @162
-			    Parent_View 	@157
-			    location   	(431, 114)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5D5008D"
-			    client     	@157
-			    supplier   	@154
-			    line_style 	0
-			    label      	(object SegLabel @163
-				Parent_View 	@162
-				location   	(642, 700)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.893115
-				height     	53
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$36" @164
-		    location   	(1721, 779)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E19A5DB0011"
-		    roleview_list 	(list RoleViews
-			(object RoleView "wsdlMessage" @165
-			    Parent_View 	@164
-			    location   	(782, -113)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @166
-				Parent_View 	@165
-				location   	(1775, 698)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	230
-				justify    	0
-				label      	"+wsdlMessage"
-				pctDist    	0.378885
-				height     	65
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5DB0383"
-			    client     	@164
-			    supplier   	@155
-			    line_style 	0
-			    label      	(object SegLabel @167
-				Parent_View 	@165
-				location   	(1882, 678)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.952522
-				height     	57
-				orientation 	0)
-			    label      	(object SegLabel @168
-				Parent_View 	@165
-				location   	(1789, 656)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	3
-				anchor_loc 	1
-				nlines     	1
-				max_width  	50
-				justify    	0
-				label      	"{1}"
-				pctDist    	0.512327
-				height     	102
-				orientation 	0))
-			(object RoleView "$UNNAMED$37" @169
-			    Parent_View 	@164
-			    location   	(782, -113)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E19A5DB038E"
-			    client     	@164
-			    supplier   	@156
-			    line_style 	0
-			    label      	(object SegLabel @170
-				Parent_View 	@169
-				location   	(1573, 874)
-				font       	(object Font
-				    size       	8
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	30
-				justify    	0
-				label      	"1"
-				pctDist    	0.892489
-				height     	54
-				orientation 	0))))))))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/jca.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/jca.ecore
deleted file mode 100644
index 5dfad95..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jca.ecore
+++ /dev/null
@@ -1,349 +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="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">

-    <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="@since 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="@since 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="@since 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="@since 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="@since 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="@since 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="@since 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="@since 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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AuthenticationMechanism">

-    <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="@since 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="@since 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="@since 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">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SecurityPermission">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="License">

-    <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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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/rose/jca1_0.cat b/plugins/org.eclipse.jst.j2ee.core/rose/jca1_0.cat
deleted file mode 100644
index f11699c..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jca1_0.cat
+++ /dev/null
@@ -1,4353 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "jca"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Jca")))

-    quid       	"3C60904200BB"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "Connector"

-	    quid       	"3C609091010F"

-	    documentation 	

-|The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, version, specification version supported, icon -  about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B0790134"

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

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "vendorName"

-		    quid       	"3C6090F3021E"

-		    documentation 	

-|Specifies the name of resource adapter provider vendor.

-|Example: Wombat Corp.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "specVersion"

-		    quid       	"3C6090FC019F"

-		    documentation 	

-|Specifies the version of the connector architecture specification that is supported by this resource adapter. This information enables deployer to configure the resource adapter to support deployment and runtime requirements of the corresponding connector architecture specification.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "eisType"

-		    quid       	"3C6091000123"

-		    documentation 	

-|Contains information about the type of the EIS. For example, the type of an EIS can be product name of EIS independent of any version info.

-|

-|This helps in identifying EIS instances that can be used with

-|this resource adapter.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "version"

-		    quid       	"3C609106010D"

-		    documentation 	

-|Specifies a string-based version of the resource adapter from the resource adapter provider.

-|

-|Example: 1.5

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ResourceAdapter"

-	    quid       	"3C60912A02A9"

-	    documentation 	

-|Specifies information about the resource adapter. The information includes fully-qualified names of class/interfaces required as part of the connector architecture specified contracts, level of transaction support provided, configurable properties for ManagedConnectionFactory instances, one or more authentication mechanisms supported and additional

-|required security permissions.

-|

-|If there is no authentication-mechanism specified as part of

-|resource adapter element then the resource adapter does not

-|support any standard security authentication mechanisms as part

-|of security contract. The application server ignores the security

-|part of the system contracts in this case.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "managedConnectionFactoryClass"

-		    quid       	"3C60936003DA"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.managedConnectionFactoryClass

-|Specifies the fully qualified name of the Java class that implements the javax.resource.spi.Managed-ConnectionFactory interface. This Java class is provided as part of resource adapter's implementation of connector architecture specified contracts.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryInterface"

-		    quid       	"3C60936C00C0"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionFactoryInterface

-|Specifies the fully-qualified name of the ConnectionFactory interface supported by the resource adapter.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryImplClass"

-		    quid       	"3C609375013B"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionFactoryImplClass

-|Specifies the fully-qualified name of the ConnectionFactory class that implements resource adapter specific ConnectionFactory interface.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionInterface"

-		    quid       	"3C60937E021A"

-		    documentation 	"@since J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionInterface"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionImplClass"

-		    quid       	"3C60939503D6"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes outboundResourceAdapter.connectionDefinitions.connectionImplClass

-|Specifies the fully-qualified name of the Connection interface supported by the resource adapter.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "transactionSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C60939F03DA"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes outboundResourceAdapter.transactionSupport

-|The transaction-support element specifies the level of transaction

-|support provided by the resource adapter.

-|The value of transaction-support must be one of the following:

-|  NoTransaction

-|  LocalTransaction

-|  XATransaction

-		    

-		    type       	"TransactionSupportKind"

-		    quidu      	"3C6098C80394"

-		    exportControl 	"Public")

-		(object ClassAttribute "reauthenticationSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C6093A8031F"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes outboundResourceAdapter.reauthenticationSupport

-|Specifies whether the resource adapter implementation supports re-authentication of existing Managed-Connection instance. Note that this information is for the resource adapter implementation and not for the underlying EIS instance.

-		    

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "resourceAdapterClass"

-		    quid       	"3E4AAD3302DC"

-		    documentation 	

-|The element resourceadapter-class specifies the

-|        fully qualified name of a Java class that implements

-|        the javax.resource.spi.ResourceAdapter

-|        interface. This Java class is provided as part of

-|        resource adapter's implementation of connector

-|        architecture specified contracts. The implementation

-|        of this class is required to be a JavaBean.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "AuthenticationMechanism"

-	    quid       	"3C60914003CE"

-	    documentation 	

-|The element authentication-mechanism specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism.

-|

-|Note that BasicPassword mechanism type should support the

-|javax.resource.spi.security.PasswordCredential interface.

-|The Kerbv5 mechanism type should support the

-|javax.resource.spi.security.GenericCredential interface.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C6091760371"

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

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "authenticationMechanism"

-		    quid       	"3E4AA98F0368"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "authenticationMechanismType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C6091820057"

-		    documentation 	

-|@deprecated See authenticationMechanism

-|

-|The authentication-mechanism-type specifies type of an authentication mechanism.

-|

-|The example values are:

-|  - BasicPassword

-|  - Kerbv5

-|

-|Any additional security mechanisms are outside the scope of the

-|Connector architecture specification.

-|

-		    

-		    type       	"AuthenticationMechanismType"

-		    quidu      	"3C6091C302A9"

-		    exportControl 	"Public")

-		(object ClassAttribute "credentialInterface"

-		    quid       	"3C6091AA0380"

-		    documentation 	

-|Specifies the interface that the resource adapter implementation supports for the representation of the credentials. This element should be used by application server to find out the Credential interface it should use as part of the security contract.

-|

-|The possible values are:

-|   javax.resource.spi.security.PasswordCredential

-|   javax.resource.spi.security.GenericCredential

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "customAuthMechType"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isTransient"

-			    value      	TRUE))

-		    quid       	"3D99E208038A"

-		    documentation 	

-|@deprecated

-|This is an internal variable used to store the AthenticationMechanismType when it is something other than BasicPassword or Kerbv5.  AuthenticationMecanismType is set to 'Custom' in those cases.  This attribute should not be used by runtime.  It is only used by the writer to write back out the custom AuthenticationMechanismType string in the case of custom AuthenticationMechanismType's.  

-|This variable is internal, used only by the reader/writer classes, and can change or disappear without notice.  

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "AuthenticationMechanismType"

-	    quid       	"3C6091C302A9"

-	    documentation 	

-|@since J2EE1.4

-|BasicPassword=0

-|Kerbv5=1

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "BasicPassword"

-		    quid       	"3C6091D000DC"

-		    exportControl 	"Public")

-		(object ClassAttribute "Kerbv5"

-		    quid       	"3C6091D5011F"

-		    exportControl 	"Public")))

-	(object Class "ConfigProperty"

-	    quid       	"3C60922C0188"

-	    documentation 	

-|The config property contains a declaration of a single

-|configuration property for a ManagedConnectionFactory instance.

-|

-|Each ManagedConnectionFactory instance creates connections to a specific EIS instance based on the properties configured on the ManagedConnectionFactory instance. The configurable properties are specified only once in the deployment descriptor, even though a resource adapter can be used to configure multiple ManagedConnnection-Factory instances (that create connections to different instances of the same EIS).

-|

-|The declaration consists of an optional description, name, type

-|and an optional value of the configuration property. If the resource

-|adapter provider does not specify a value than the deployer is

-|responsible for providing a valid value for a configuration property.

-|

-|Any bounds or well-defined values of properties should be described in the description.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C60923203B7"

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

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3C60923F0199"

-		    documentation 	

-|Contains the name of a configuration property.

-|

-|The connector architecture defines a set of well-defined properties all of type java.lang.String. These are as follows:

-|

-|     ServerName

-|     PortNumber

-|     UserName

-|     Password

-|     ConnectionURL

-|

-|A resource adapter provider can extend this property set to include properties specific to the resource adapter and its underlying EIS.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "type"

-		    quid       	"3C6092450198"

-		    documentation 	

-|Contains the fully qualified Java type of a configuration property as required by ManagedConnection-Factory instance.

-|

-|The following are the legal values of config-property-type:

-|   java.lang.Boolean, java.lang.String, java.lang.Integer,

-|   java.lang.Double, java.lang.Byte, java.lang.Short,

-|   java.lang.Long, java.lang.Float, java.lang.Character

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "value"

-		    quid       	"3C60924802DD"

-		    documentation 	

-|The element config-property-value contains the value

-|        of a configuration entry. Note, it is possible for a

-|        resource adapter deployer to override this

-|        configuration information during deployment.

-|

-|        Example:

-|        <config-property-value>WombatServer</config-property-value>

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "SecurityPermission"

-	    quid       	"3C6093C100F4"

-	    documentation 	

-|Specifies a security permission that is required by the resource adapter code.

-|

-|The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C6097E90162"

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

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "specification"

-		    quid       	"3C6097F503CC"

-		    documentation 	

-|The element permission-spec specifies a security permission based on the Security policy file syntax. 

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "License"

-	    quid       	"3C609529008E"

-	    documentation 	"Specifies licensing requirements for the resource adapter module. Specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of connection restrictions)."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"3C60953E0084"

-		    documentation 	

-|@deprecated Replaced with descriptions

-|The description is used to provide text describing the license.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "required"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3C60959F017E"

-		    type       	"boolean"

-		    exportControl 	"Public")))

-	(object Class "TransactionSupportKind"

-	    quid       	"3C6098C80394"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NoTransaction"

-		    quid       	"3C6098D201FE"

-		    exportControl 	"Public")

-		(object ClassAttribute "LocalTransaction"

-		    quid       	"3C6098D60235"

-		    exportControl 	"Public")

-		(object ClassAttribute "XATransaction"

-		    quid       	"3C6098DB0233"

-		    exportControl 	"Public")))

-	(object Class "InboundResourceAdapter"

-	    quid       	"3E4AA1DD0257"

-	    documentation 	

-|@since J2EE1.4

-|The inbound-resourceadapterType specifies information

-|about an inbound resource adapter. This contains information

-|specific to the implementation of the resource adapter

-|library as specified through the messageadapter element.

-	    )

-	(object Class "OutboundResourceAdapter"

-	    quid       	"3E4AA1E6023C"

-	    documentation 	

-|@since J2EE1.4

-|The outbound-resourceadapterType specifies information about

-|an outbound resource adapter. The information includes fully

-|qualified names of classes/interfaces required as part of

-|the connector architecture specified contracts for

-|connection management, level of transaction support

-|provided, one or more authentication mechanisms supported

-|and additional required security permissions.

-|

-|If there is no authentication-mechanism specified as part of

-|resource adapter element then the resource adapter does not

-|support any standard security authentication mechanisms as

-|part of security contract. The application server ignores

-|the security part of the system contracts in this case.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "reauthenticationSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4AA5BA003C"

-		    documentation 	

-|The element reauthentication-support specifies

-|        whether the resource adapter implementation supports

-|        re-authentication of existing Managed- Connection

-|        instance. Note that this information is for the

-|        resource adapter implementation and not for the

-|        underlying EIS instance. This element must have

-|        either a "true" or "false" value.

-		    

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "transactionSupport"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4AA862026B"

-		    type       	"TransactionSupportKind"

-		    quidu      	"3C6098C80394"

-		    exportControl 	"Public")))

-	(object Class "MessageAdapter"

-	    quid       	"3E4AA2D601F1"

-	    documentation 	

-|@since J2EE1.4

-|The messageadapterType specifies information about the

-|messaging capabilities of the resource adapter. This

-|contains information specific to the implementation of the

-|resource adapter library as specified through the

-|messagelistener element.

-	    )

-	(object Class "ConnectionDefinition"

-	    quid       	"3E4AA4CF00F2"

-	    documentation 	

-|@since J2EE1.4

-|The connection-definitionType defines a set of connection

-|interfaces and classes pertaining to a particular connection

-|type. This also includes configurable properties for

-|ManagedConnectionFactory instances that may be produced out

-|of this set.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "managedConnectionFactoryClass"

-		    quid       	"3E4AA6C203AD"

-		    documentation 	

-|The element managedconnectionfactory-class specifies

-|        the fully qualified name of the Java class that

-|        implements the

-|        javax.resource.spi.ManagedConnectionFactory interface.

-|        This Java class is provided as part of resource

-|        adapter's implementation of connector architecture

-|        specified contracts. The implementation of this

-|        class is required to be a JavaBean.

-|

-|        Example:

-|        <managedconnectionfactory-class>

-|            com.wombat.ManagedConnectionFactoryImpl

-|        </managedconnectionfactory-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryInterface"

-		    quid       	"3E4AA7480388"

-		    documentation 	

-|The element connectionfactory-interface specifies

-|        the fully qualified name of the ConnectionFactory

-|        interface supported by the resource adapter.

-|

-|        Example:

-|        <connectionfactory-interface>com.wombat.ConnectionFactory

-|        </connectionfactory-interface>

-|

-|        OR

-|

-|        <connectionfactory-interface>javax.resource.cci.ConnectionFactory

-|        </connectionfactory-interface>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionFactoryImplClass"

-		    quid       	"3E4AA7500180"

-		    documentation 	

-|The element connectionfactory-impl-class specifies

-|        the fully qualified name of the ConnectionFactory

-|        class that implements resource adapter

-|        specific ConnectionFactory interface.

-|

-|        Example:

-|

-|        <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl

-|        </connectionfactory-impl-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionInterface"

-		    quid       	"3E4AA75E01BD"

-		    documentation 	

-|The connection-interface element specifies the fully

-|        qualified name of the Connection interface supported

-|        by the resource adapter.

-|

-|        Example:

-|

-|            <connection-interface>javax.resource.cci.Connection

-|            </connection-interface>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "connectionImplClass"

-		    quid       	"3E4AA7770118"

-		    documentation 	

-|The connection-impl-classType specifies the fully

-|        qualified name of the Connection class that

-|        implements resource adapter specific Connection

-|        interface.  It is used by the connection-impl-class

-|        elements.

-|

-|        Example:

-|

-|            <connection-impl-class>com.wombat.ConnectionImpl

-|            </connection-impl-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "AdminObject"

-	    quid       	"3E4AADD6004B"

-	    documentation 	

-|@since J2EE1.4

-|The adminobjectType specifies information about an

-|administered object.  Administered objects are specific to a

-|messaging style or message provider.  This contains

-|information on the Java type of the interface implemented by

-|an administered object, its Java class name and its

-|configuration properties.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "adminObjectInterface"

-		    quid       	"3E4AB12B0188"

-		    documentation 	

-|The element adminobject-interface specifies the

-|        fully qualified name of the Java type of the

-|        interface implemented by an administered object.

-|

-|        Example:

-|          <adminobject-interface>javax.jms.Destination

-|          </adminobject-interface>

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "adminObjectClass"

-		    quid       	"3E4AB1310000"

-		    documentation 	

-|The element adminobject-class specifies the fully

-|        qualified Java class name of an administered object.

-|

-|        Example:

-|            <adminobject-class>com.wombat.DestinationImpl

-|            </adminobject-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "MessageListener"

-	    quid       	"3E4AAEC102FC"

-	    documentation 	

-|@since J2EE1.4

-|The messagelistenerType specifies information about a

-|specific message listener supported by the messaging

-|resource adapter. It contains information on the Java type

-|of the message listener interface and an activation

-|specification.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "messageListenerType"

-		    quid       	"3E4AAEF901A8"

-		    documentation 	

-|The element messagelistener-type specifies the fully

-|        qualified name of the Java type of a message

-|        listener interface.

-|

-|        Example:

-|

-|          <messagelistener-type>javax.jms.MessageListener

-|          </messagelistener-type>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ActivationSpec"

-	    quid       	"3E4AAF320042"

-	    documentation 	

-|@since J2EE1.4

-|The activationspecType specifies an activation

-|specification.  The information includes fully qualified

-|Java class name of an activation specification and a set of

-|required configuration property names.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "activationSpecClass"

-		    quid       	"3E4AAF9403AA"

-		    documentation 	

-|The element activationspec-class specifies the fully

-|        qualified Java class name of the activation

-|        specification class. This class must implement the

-|        javax.resource.spi.ActivationSpec interface. The

-|        implementation of this class is required to be a

-|        JavaBean.

-|

-|        Example:

-|            <activationspec-class>com.wombat.ActivationSpecImpl

-|            </activationspec-class>

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "RequiredConfigPropertyType"

-	    quid       	"3E4AAFD601A6"

-	    documentation 	

-|@since J2EE1.4

-|The required-config-propertyType contains a declaration

-|of a single configuration property used for specifying a

-|required configuration property name. It is used

-|by required-config-property elements.

-|

-|Example:

-|

-|<required-config-property>Destination</required-config-property>

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E4AB01F01BF"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"3C6093CC001E"

-	    roles      	(list role_list

-		(object Role "securityPermissions"

-		    quid       	"3C6093CC0367"

-		    documentation 	"@deprecated"

-		    label      	"securityPermissions"

-		    supplier   	"Logical View::jca::SecurityPermission"

-		    quidu      	"3C6093C100F4"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3C6093CC0369"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"3C6094120028"

-	    roles      	(list role_list

-		(object Role "authenticationMechanisms"

-		    quid       	"3C6094120390"

-		    label      	"authenticationMechanisms"

-		    supplier   	"Logical View::jca::AuthenticationMechanism"

-		    quidu      	"3C60914003CE"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"3C6094120392"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"3C60944C00D6"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3C60944D0196"

-		    label      	"configProperties"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"3C60944D0198"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"3C6095310180"

-	    roles      	(list role_list

-		(object Role "license"

-		    quid       	"3C609532000E"

-		    documentation 	

-|Specifies licensing requirements for the resource adapter module. This element specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of

-|connection restrictions).

-		    

-		    label      	"license"

-		    supplier   	"Logical View::jca::License"

-		    quidu      	"3C609529008E"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"3C6095320010"

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

-		    quidu      	"3C609091010F"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"3C60998900C0"

-	    roles      	(list role_list

-		(object Role "resourceAdapter"

-		    quid       	"3C60998902AB"

-		    label      	"resourceAdapter"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"3C60998902B5"

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

-		    quidu      	"3C609091010F"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E4AA3630302"

-	    roles      	(list role_list

-		(object Role "outboundResourceAdapter"

-		    quid       	"3E4AA3650369"

-		    documentation 	

-|@since J2EE1.4

-|The connectionfactory-interface element content must be

-|        unique in the outbound-resourceadapter. Multiple connection-definitions

-|        can not use the same connectionfactory-type.

-		    

-		    label      	"outboundResourceAdapter"

-		    supplier   	"Logical View::jca::OutboundResourceAdapter"

-		    quidu      	"3E4AA1E6023C"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E4AA365036B"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E4AA4DC026E"

-	    roles      	(list role_list

-		(object Role "connectionDefinitions"

-		    quid       	"3E4AA4DD005C"

-		    label      	"connectionDefinitions"

-		    supplier   	"Logical View::jca::ConnectionDefinition"

-		    quidu      	"3E4AA4CF00F2"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E4AA4DD0066"

-		    supplier   	"Logical View::jca::OutboundResourceAdapter"

-		    quidu      	"3E4AA1E6023C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E4AA54400FB"

-	    roles      	(list role_list

-		(object Role "authenticationMechanisms"

-		    quid       	"3E4AA545028D"

-		    label      	"authenticationMechanisms"

-		    supplier   	"Logical View::jca::AuthenticationMechanism"

-		    quidu      	"3C60914003CE"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E4AA545028F"

-		    supplier   	"Logical View::jca::OutboundResourceAdapter"

-		    quidu      	"3E4AA1E6023C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3E4AA6F20117"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3E4AA6F30169"

-		    label      	"configProperties"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3E4AA6F30173"

-		    supplier   	"Logical View::jca::ConnectionDefinition"

-		    quidu      	"3E4AA4CF00F2"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"3E4AADCD036A"

-	    roles      	(list role_list

-		(object Role "inboundResourceAdapter"

-		    quid       	"3E4AADCF0312"

-		    documentation 	"@since J2EE1.4"

-		    label      	"inboundResourceAdapter"

-		    supplier   	"Logical View::jca::InboundResourceAdapter"

-		    quidu      	"3E4AA1DD0257"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"3E4AADCF0314"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E4AAE020320"

-	    roles      	(list role_list

-		(object Role "adminObjects"

-		    quid       	"3E4AAE040160"

-		    documentation 	"@since J2EE1.4"

-		    label      	"adminObjects"

-		    supplier   	"Logical View::jca::AdminObject"

-		    quidu      	"3E4AADD6004B"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E4AAE04016B"

-		    supplier   	"Logical View::jca::ResourceAdapter"

-		    quidu      	"3C60912A02A9"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3E4AAE38025F"

-	    roles      	(list role_list

-		(object Role "messageAdapter"

-		    quid       	"3E4AAE390094"

-		    documentation 	

-|The messagelistener-type element content must be

-|        unique in the messageadapter. Several messagelisteners

-|        can not use the same messagelistener-type.

-		    

-		    label      	"messageAdapter"

-		    supplier   	"Logical View::jca::MessageAdapter"

-		    quidu      	"3E4AA2D601F1"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3E4AAE39009E"

-		    supplier   	"Logical View::jca::InboundResourceAdapter"

-		    quidu      	"3E4AA1DD0257"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"3E4AAECC0077"

-	    roles      	(list role_list

-		(object Role "messageListeners"

-		    quid       	"3E4AAECC03A2"

-		    label      	"messageListeners"

-		    supplier   	"Logical View::jca::MessageListener"

-		    quidu      	"3E4AAEC102FC"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"3E4AAECC03A4"

-		    supplier   	"Logical View::jca::MessageAdapter"

-		    quidu      	"3E4AA2D601F1"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$26"

-	    quid       	"3E4AAF480011"

-	    roles      	(list role_list

-		(object Role "activationSpec"

-		    quid       	"3E4AAF490103"

-		    label      	"activationSpec"

-		    supplier   	"Logical View::jca::ActivationSpec"

-		    quidu      	"3E4AAF320042"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"3E4AAF490105"

-		    supplier   	"Logical View::jca::MessageListener"

-		    quidu      	"3E4AAEC102FC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"3E4AAFAA027F"

-	    roles      	(list role_list

-		(object Role "requiredConfigProperties"

-		    quid       	"3E4AAFAB0349"

-		    label      	"requiredConfigProperties"

-		    supplier   	"Logical View::jca::RequiredConfigPropertyType"

-		    quidu      	"3E4AAFD601A6"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"3E4AAFAB0353"

-		    supplier   	"Logical View::jca::ActivationSpec"

-		    quidu      	"3E4AAF320042"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"3E4AB14A02B9"

-	    roles      	(list role_list

-		(object Role "configProperties"

-		    quid       	"3E4AB14B0347"

-		    label      	"configProperties"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"3E4AB14B0351"

-		    supplier   	"Logical View::jca::AdminObject"

-		    quidu      	"3E4AADD6004B"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"3E4AA8A2001E"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AA8A30033"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3E4AA8A3003D"

-		    supplier   	"Logical View::jca::AuthenticationMechanism"

-		    quidu      	"3C60914003CE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"3E4A9C86002A"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4A9C8603B0"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"3E4A9C8603B2"

-		    supplier   	"Logical View::jca::License"

-		    quidu      	"3C609529008E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$36"

-	    quid       	"3E4AAFEC01BC"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AAFF40019"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"3E4AAFF40024"

-		    supplier   	"Logical View::jca::RequiredConfigPropertyType"

-		    quidu      	"3E4AAFD601A6"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$38"

-	    quid       	"3E4AAB5A034A"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AAB6100BF"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$39"

-		    quid       	"3E4AAB6100C9"

-		    supplier   	"Logical View::jca::ConfigProperty"

-		    quidu      	"3C60922C0188"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$40"

-	    quid       	"3E4AAA3202FE"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4AAA340012"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

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

-		    quidu      	"3E4A98D602E0"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$41"

-		    quid       	"3E4AAA34001C"

-		    supplier   	"Logical View::jca::SecurityPermission"

-		    quidu      	"3C6093C100F4"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Connector Details"

-	    quid       	"3C60905E00E4"

-	    title      	"Connector Details"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	1808

-	    items      	(list diagram_item_list

-		(object Label @1

-		    location   	(53, 44)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	981

-		    label      	"JCA 1.5 Deployment Descriptor")

-		(object NoteView @2

-		    location   	(871, 368)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(71, 187)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	1565

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list with new J2EE type)

-|displayName replaced with displayNames:List<DisplayName>

-|description replaced with descriptions:List<DescriptionType>

-|smallIcon replaced with icons:List<IconType>

-|largeIcon replaced with icons:List<IconType>

-|version replaced with resourceVersion:String

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1625

-		    height     	375)

-		(object NoteView @3

-		    location   	(1350, 1628)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(843, 1516)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	978

-			label      	"The real XML tag for specVersion in JCA1.5 is <version>. In JCA1.0 it was <spec-version>.  In other words, JCA1.5 version elements will deserialize into the specVersion attribute.")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1038

-		    height     	237)

-		(object NoteView @4

-		    location   	(2200, 356)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(1709, 240)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	946

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list version)

-|description replaced with descriptions:List<String>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1006

-		    height     	244)

-		(object NoteView @5

-		    location   	(2421, 125)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1708, 34)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	1390

-			label      	"Many descriptive attributes have been changed to 'n' multiplicity to support localization of text and icons")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1450

-		    height     	194)

-		(object Label @6

-		    location   	(163, 2084)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	3

-		    max_width  	894

-		    label      	

-|SEE "RESOURCEADAPTER DETAILS" DIAGRAM

-		    )

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1749, 973)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(1571, 894)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::ResourceAdapter" @8

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(577, 1967)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(402, 1916)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	350

-			justify    	0

-			label      	"ResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60912A02A9"

-		    width      	368

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(616, 1059)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@9

-			location   	(309, 803)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	614

-			justify    	0

-			label      	"Connector")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C609091010F"

-		    compartment 	(object Compartment

-			Parent_View 	@9

-			location   	(309, 864)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	428)

-		    width      	632

-		    height     	536

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @10

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@2

-		    supplier   	@9

-		    vertices   	(list Points

-			(801, 555)

-			(714, 790))

-		    line_style 	0)

-		(object AttachView "" @11

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@3

-		    supplier   	@9

-		    vertices   	(list Points

-			(1198, 1509)

-			(932, 1303))

-		    line_style 	0)

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

-		    location   	(522, 1615)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C60998900C0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resourceAdapter" @13

-			    Parent_View 	@12

-			    location   	(-22, 1023)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @14

-				Parent_View 	@13

-				location   	(325, 1688)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	332

-				justify    	0

-				label      	"+resourceAdapter"

-				pctDist    	0.256881

-				height     	198

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60998902AB"

-			    client     	@12

-			    supplier   	@8

-			    vertices   	(list Points

-				(522, 1615)

-				(522, 1904))

-			    line_style 	3

-			    origin_attachment 	(522, 1615)

-			    terminal_attachment 	(522, 1904)

-			    label      	(object SegLabel @15

-				Parent_View 	@13

-				location   	(561, 1715)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.350877

-				height     	39

-				orientation 	0))

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

-			    Parent_View 	@12

-			    location   	(-22, 1023)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60998902B5"

-			    client     	@12

-			    supplier   	@9

-			    vertices   	(list Points

-				(522, 1615)

-				(522, 1326))

-			    line_style 	3

-			    origin_attachment 	(522, 1615)

-			    terminal_attachment 	(522, 1326))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2624, 706)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@17

-			location   	(2480, 552)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	288

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@17

-			location   	(2480, 657)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	285)

-		    width      	306

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::License" @18

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1810, 700)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@18

-			location   	(1522, 594)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	576

-			justify    	0

-			label      	"License")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C609529008E"

-		    compartment 	(object Compartment

-			Parent_View 	@18

-			location   	(1522, 655)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	594

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @19

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@4

-		    supplier   	@18

-		    vertices   	(list Points

-			(2059, 478)

-			(1942, 581))

-		    line_style 	0)

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

-		    location   	(1222, 796)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C6095310180"

-		    roleview_list 	(list RoleViews

-			(object RoleView "license" @21

-			    Parent_View 	@20

-			    location   	(870, 348)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @22

-				Parent_View 	@21

-				location   	(1354, 758)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	151

-				justify    	0

-				label      	"+license"

-				pctDist    	0.457447

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C609532000E"

-			    client     	@20

-			    supplier   	@18

-			    vertices   	(list Points

-				(1222, 796)

-				(1513, 796))

-			    line_style 	3

-			    origin_attachment 	(1222, 796)

-			    terminal_attachment 	(1513, 796)

-			    label      	(object SegLabel @23

-				Parent_View 	@21

-				location   	(1466, 850)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.841549

-				height     	54

-				orientation 	1))

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

-			    Parent_View 	@20

-			    location   	(870, 348)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6095320010"

-			    client     	@20

-			    supplier   	@9

-			    vertices   	(list Points

-				(1222, 796)

-				(932, 796))

-			    line_style 	3

-			    origin_attachment 	(1222, 796)

-			    terminal_attachment 	(932, 796))))

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

-		    location   	(2289, 653)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4A9C86002A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @26

-			    Parent_View 	@25

-			    location   	(473, -50)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @27

-				Parent_View 	@26

-				location   	(2354, 604)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.356886

-				height     	50

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4A9C8603B0"

-			    client     	@25

-			    supplier   	@17

-			    vertices   	(list Points

-				(2289, 653)

-				(2471, 653))

-			    line_style 	3

-			    origin_attachment 	(2289, 653)

-			    terminal_attachment 	(2471, 653)

-			    label      	(object SegLabel @28

-				Parent_View 	@26

-				location   	(2429, 704)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.767123

-				height     	51

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @29

-			    Parent_View 	@25

-			    location   	(473, -50)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4A9C8603B2"

-			    client     	@25

-			    supplier   	@18

-			    vertices   	(list Points

-				(2289, 653)

-				(2107, 653))

-			    line_style 	3

-			    origin_attachment 	(2289, 653)

-			    terminal_attachment 	(2107, 653))))))

-	(object ClassDiagram "Resource Adapter Details"

-	    quid       	"3E4AB21901B3"

-	    title      	"Resource Adapter Details"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	7305

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::jca::AuthenticationMechanismType" @30

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3365, 1379)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@30

-			location   	(3070, 1295)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	590

-			justify    	0

-			label      	"AuthenticationMechanismType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@30

-			location   	(3070, 1245)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	590

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C6091C302A9"

-		    compartment 	(object Compartment

-			Parent_View 	@30

-			location   	(3070, 1356)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	340)

-		    width      	608

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::TransactionSupportKind" @31

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3348, 2338)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@31

-			location   	(3118, 2229)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"TransactionSupportKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@31

-			location   	(3118, 2179)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C6098C80394"

-		    compartment 	(object Compartment

-			Parent_View 	@31

-			location   	(3118, 2290)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	365)

-		    width      	478

-		    height     	342

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object Label @32

-		    location   	(53, 44)

-		    font       	(object Font

-			size       	12

-			face       	"Arial"

-			bold       	TRUE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	981

-		    label      	

-|JCA 1.5 Deployment Descriptor

-|Resource Adapter Details

-		    )

-		(object NoteView @33

-		    location   	(875, 362)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@33

-			location   	(75, 181)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	1565

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list with new J2EE type)

-|displayName replaced with displayNames:List<DisplayName>

-|description replaced with descriptions:List<DescriptionType>

-|smallIcon replaced with icons:List<IconType>

-|largeIcon replaced with icons:List<IconType>

-|version replaced with resourceVersion:String

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1625

-		    height     	375)

-		(object NoteView @34

-		    location   	(2200, 356)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@34

-			location   	(1709, 240)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	946

-			label      	

-|Deprecated: (Note: the deprecated version becomes volatile and gets implementation redirected into list version)

-|description replaced with descriptions:List<String>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1006

-		    height     	244)

-		(object NoteView @35

-		    location   	(2421, 125)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@35

-			location   	(1708, 34)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	1390

-			label      	"Many descriptive attributes have been changed to 'n' multiplicity to support localization of text and icons")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1450

-		    height     	194)

-		(object NoteView @36

-		    location   	(4017, 1845)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@36

-			location   	(3782, 1729)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	434

-			label      	"Need to check collapseWhitespace attribute")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	494

-		    height     	244)

-		(object NoteView @37

-		    location   	(2132, 2082)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@37

-			location   	(1903, 1945)

-			fill_color 	13434879

-			nlines     	5

-			max_width  	422

-			label      	

-|Need basic type, AnyURI (place this in same package as new Password--maybe "common-datatypes")

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	482

-		    height     	287)

-		(object NoteView @38

-		    location   	(1175, 4758)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@38

-			location   	(178, 4514)

-			fill_color 	13434879

-			nlines     	9

-			max_width  	1959

-			label      	

-|managedConnectionFactoryClass is replaced by ra.outboundRA.connectionDefinitions.managedConnectionFactoryClass

-|connectionFactoryInterface is replaced by ra.outboundRA.connectionDefinitions.connectionFactoryInterface

-|connectionFactoryImplClass is replaced by ra.outboundRA.connectionDefinitions.connectionFactoryImplClass

-|transactionSupport is replaced by ra.outboundRA.transactionSupport 

-|connectionInterface is replaced by ra.outboundRA.connectionDefinitions.connectionInterface

-|connectionImplClass is replaced by ra.outboundRA.connectionDefinitions.connectionImplClass

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	2019

-		    height     	500)

-		(object NoteView @39

-		    location   	(1156, 5175)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@39

-			location   	(34, 5097)

-			fill_color 	13434879

-			nlines     	3

-			max_width  	2209

-			label      	"Readers will need to determine if the string type can be converted to the datatype specified. See the spec. Or maybe instead provide helpers to retrieve the value converted to the specified type?")

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	2269

-		    height     	169)

-		(object Label @40

-		    location   	(244, 2353)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	5

-		    max_width  	488

-		    label      	"There are some uniqueness constraints that must be validated here.")

-		(object NoteView @41

-		    location   	(3386, 625)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@41

-			location   	(2717, 522)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	1303

-			label      	

-|Deprecations

-|customAuthMechType replaced by authenticationMechanism

-|authenticationMechanismType replaced by authenticationMechanism

-|description replaced with descriptions:List<DescriptionType>

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	1363

-		    height     	219)

-		(object ClassView "Class" "Logical View::jca::MessageListener" @42

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2774, 3537)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@42

-			location   	(2477, 3456)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	594

-			justify    	0

-			label      	"MessageListener")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AAEC102FC"

-		    compartment 	(object Compartment

-			Parent_View 	@42

-			location   	(2477, 3517)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	591)

-		    width      	612

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::MessageAdapter" @43

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2792, 3139)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@43

-			location   	(2625, 3088)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	334

-			justify    	0

-			label      	"MessageAdapter")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA2D601F1"

-		    width      	352

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2746, 3322)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAECC0077"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageListeners" @45

-			    Parent_View 	@44

-			    location   	(-31, -446)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(2534, 3402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	367

-				justify    	0

-				label      	"+messageListeners"

-				pctDist    	0.666667

-				height     	213

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAECC03A2"

-			    client     	@44

-			    supplier   	@42

-			    vertices   	(list Points

-				(2746, 3322)

-				(2746, 3444))

-			    line_style 	3

-			    origin_attachment 	(2746, 3322)

-			    terminal_attachment 	(2746, 3444)

-			    label      	(object SegLabel @47

-				Parent_View 	@45

-				location   	(2838, 3405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.677778

-				height     	92

-				orientation 	0))

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

-			    Parent_View 	@44

-			    location   	(-31, -446)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAECC03A4"

-			    client     	@44

-			    supplier   	@43

-			    vertices   	(list Points

-				(2746, 3322)

-				(2746, 3201))

-			    line_style 	3

-			    origin_attachment 	(2746, 3322)

-			    terminal_attachment 	(2746, 3201))))

-		(object ClassView "Class" "Logical View::jca::ActivationSpec" @49

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2749, 3959)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@49

-			location   	(2468, 3878)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"ActivationSpec")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AAF320042"

-		    compartment 	(object Compartment

-			Parent_View 	@49

-			location   	(2468, 3939)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	560)

-		    width      	580

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$26" @50

-		    location   	(2753, 3747)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAF480011"

-		    roleview_list 	(list RoleViews

-			(object RoleView "activationSpec" @51

-			    Parent_View 	@50

-			    location   	(-87, -371)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @52

-				Parent_View 	@51

-				location   	(2578, 3835)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	294

-				justify    	0

-				label      	"+activationSpec"

-				pctDist    	0.741657

-				height     	176

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAF490103"

-			    client     	@50

-			    supplier   	@49

-			    vertices   	(list Points

-				(2753, 3747)

-				(2753, 3866))

-			    line_style 	3

-			    origin_attachment 	(2753, 3747)

-			    terminal_attachment 	(2753, 3866)

-			    label      	(object SegLabel @53

-				Parent_View 	@51

-				location   	(2801, 3838)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.761905

-				height     	48

-				orientation 	0))

-			(object RoleView "$UNNAMED$27" @54

-			    Parent_View 	@50

-			    location   	(-87, -371)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAF490105"

-			    client     	@50

-			    supplier   	@42

-			    vertices   	(list Points

-				(2753, 3747)

-				(2753, 3629))

-			    line_style 	3

-			    origin_attachment 	(2753, 3747)

-			    terminal_attachment 	(2753, 3629))))

-		(object ClassView "Class" "Logical View::jca::ConnectionDefinition" @55

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3021, 1915)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@55

-			location   	(2618, 1734)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	806

-			justify    	0

-			label      	"ConnectionDefinition")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA4CF00F2"

-		    compartment 	(object Compartment

-			Parent_View 	@55

-			location   	(2618, 1795)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	6

-			max_width  	803)

-		    width      	824

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::InboundResourceAdapter" @56

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1720, 3126)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@56

-			location   	(1475, 3075)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	490

-			justify    	0

-			label      	"InboundResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA1DD0257"

-		    width      	508

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2295, 3134)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAE38025F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageAdapter" @58

-			    Parent_View 	@57

-			    location   	(317, -634)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @59

-				Parent_View 	@58

-				location   	(2431, 3090)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	340

-				justify    	0

-				label      	"+messageAdapter"

-				pctDist    	0.425000

-				height     	45

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE390094"

-			    client     	@57

-			    supplier   	@43

-			    vertices   	(list Points

-				(2295, 3134)

-				(2616, 3134))

-			    line_style 	3

-			    origin_attachment 	(2295, 3134)

-			    terminal_attachment 	(2616, 3134)

-			    label      	(object SegLabel @60

-				Parent_View 	@58

-				location   	(2567, 3179)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.851803

-				height     	45

-				orientation 	1))

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

-			    Parent_View 	@57

-			    location   	(317, -634)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @62

-				Parent_View 	@61

-				location   	(2038, 3093)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE39009E"

-			    client     	@57

-			    supplier   	@56

-			    vertices   	(list Points

-				(2295, 3134)

-				(1974, 3134))

-			    line_style 	3

-			    origin_attachment 	(2295, 3134)

-			    terminal_attachment 	(1974, 3134))))

-		(object ClassView "Class" "Logical View::jca::AdminObject" @63

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1026, 4060)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@63

-			location   	(737, 3954)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	578

-			justify    	0

-			label      	"AdminObject")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AADD6004B"

-		    compartment 	(object Compartment

-			Parent_View 	@63

-			location   	(737, 4015)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	575)

-		    width      	596

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::RequiredConfigPropertyType" @64

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3798, 3913)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@64

-			location   	(3527, 3832)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	542

-			justify    	0

-			label      	"RequiredConfigPropertyType")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AAFD601A6"

-		    compartment 	(object Compartment

-			Parent_View 	@64

-			location   	(3527, 3893)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	294)

-		    width      	560

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$28" @65

-		    location   	(3278, 3984)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAFAA027F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "requiredConfigProperties" @66

-			    Parent_View 	@65

-			    location   	(422, -597)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @67

-				Parent_View 	@66

-				location   	(3312, 3938)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	468

-				justify    	0

-				label      	"+requiredConfigProperties"

-				pctDist    	0.145695

-				height     	47

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFAB0349"

-			    client     	@65

-			    supplier   	@64

-			    vertices   	(list Points

-				(3278, 3984)

-				(3518, 3984))

-			    line_style 	3

-			    origin_attachment 	(3278, 3984)

-			    terminal_attachment 	(3518, 3984)

-			    label      	(object SegLabel @68

-				Parent_View 	@66

-				location   	(3470, 4032)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.801324

-				height     	48

-				orientation 	1))

-			(object RoleView "$UNNAMED$29" @69

-			    Parent_View 	@65

-			    location   	(422, -597)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFAB0353"

-			    client     	@65

-			    supplier   	@49

-			    vertices   	(list Points

-				(3278, 3984)

-				(3039, 3984))

-			    line_style 	3

-			    origin_attachment 	(3278, 3984)

-			    terminal_attachment 	(3039, 3984))))

-		(object ClassView "Class" "Logical View::jca::ConfigProperty" @70

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(346, 3777)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@70

-			location   	(58, 3621)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	576

-			justify    	0

-			label      	"ConfigProperty")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60922C0188"

-		    compartment 	(object Compartment

-			Parent_View 	@70

-			location   	(58, 3682)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	572)

-		    width      	594

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(723, 1903)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA6F20117"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @72

-			    Parent_View 	@71

-			    location   	(-2159, -1529)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @73

-				Parent_View 	@72

-				location   	(578, 3385)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	0.881853

-				height     	36

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA6F30169"

-			    client     	@71

-			    supplier   	@70

-			    vertices   	(list Points

-				(723, 1903)

-				(542, 1903)

-				(542, 3609))

-			    line_style 	3

-			    origin_attachment 	(723, 1903)

-			    terminal_attachment 	(542, 3609)

-			    label      	(object SegLabel @74

-				Parent_View 	@72

-				location   	(596, 3419)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

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

-			    Parent_View 	@71

-			    location   	(-2159, -1529)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA6F30173"

-			    client     	@71

-			    supplier   	@55

-			    vertices   	(list Points

-				(723, 1903)

-				(2609, 1903))

-			    line_style 	3

-			    origin_attachment 	(723, 1903)

-			    terminal_attachment 	(2609, 1903))))

-		(object AttachView "" @76

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@39

-		    supplier   	@70

-		    vertices   	(list Points

-			(125, 5090)

-			(125, 3944))

-		    line_style 	3

-		    origin_attachment 	(125, 5090)

-		    terminal_attachment 	(125, 3944))

-		(object AssociationViewNew "$UNNAMED$30" @77

-		    location   	(491, 4071)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AB14A02B9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @78

-			    Parent_View 	@77

-			    location   	(-404, -143)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @79

-				Parent_View 	@78

-				location   	(546, 4032)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	-0.240876

-				height     	40

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AB14B0347"

-			    client     	@77

-			    supplier   	@70

-			    vertices   	(list Points

-				(491, 4071)

-				(381, 4071)

-				(381, 3945))

-			    line_style 	3

-			    origin_attachment 	(491, 4071)

-			    terminal_attachment 	(381, 3945)

-			    label      	(object SegLabel @80

-				Parent_View 	@78

-				location   	(435, 3969)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$31" @81

-			    Parent_View 	@77

-			    location   	(-404, -143)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AB14B0351"

-			    client     	@77

-			    supplier   	@63

-			    vertices   	(list Points

-				(491, 4071)

-				(728, 4071))

-			    line_style 	3

-			    origin_attachment 	(491, 4071)

-			    terminal_attachment 	(728, 4071))))

-		(object ClassView "Class" "Logical View::jca::SecurityPermission" @82

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1781, 2528)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@82

-			location   	(1494, 2422)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	574

-			justify    	0

-			label      	"SecurityPermission")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C6093C100F4"

-		    compartment 	(object Compartment

-			Parent_View 	@82

-			location   	(1494, 2483)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	572)

-		    width      	592

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jca::OutboundResourceAdapter" @83

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1881, 1657)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@83

-			location   	(1450, 1551)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	862

-			justify    	0

-			label      	"OutboundResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4AA1E6023C"

-		    compartment 	(object Compartment

-			Parent_View 	@83

-			location   	(1450, 1612)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	860)

-		    width      	880

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(2581, 1622)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA4DC026E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "connectionDefinitions" @85

-			    Parent_View 	@84

-			    location   	(925, -1807)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @86

-				Parent_View 	@85

-				location   	(2648, 1580)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	420

-				justify    	0

-				label      	"+connectionDefinitions"

-				pctDist    	0.262548

-				height     	43

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA4DD005C"

-			    client     	@84

-			    supplier   	@55

-			    vertices   	(list Points

-				(2581, 1622)

-				(2740, 1622)

-				(2740, 1722))

-			    line_style 	3

-			    origin_attachment 	(2581, 1622)

-			    terminal_attachment 	(2740, 1722)

-			    label      	(object SegLabel @87

-				Parent_View 	@85

-				location   	(2694, 1656)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.439516

-				height     	34

-				orientation 	1))

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

-			    Parent_View 	@84

-			    location   	(925, -1807)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA4DD0066"

-			    client     	@84

-			    supplier   	@83

-			    vertices   	(list Points

-				(2581, 1622)

-				(2321, 1622))

-			    line_style 	3

-			    origin_attachment 	(2581, 1622)

-			    terminal_attachment 	(2321, 1622))))

-		(object ClassView "Class" "Logical View::jca::ResourceAdapter" @89

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(612, 1045)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@89

-			location   	(181, 789)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	862

-			justify    	0

-			label      	"ResourceAdapter")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60912A02A9"

-		    compartment 	(object Compartment

-			Parent_View 	@89

-			location   	(181, 850)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	9

-			max_width  	860)

-		    width      	880

-		    height     	536

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1060, 1643)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA3630302"

-		    roleview_list 	(list RoleViews

-			(object RoleView "outboundResourceAdapter" @91

-			    Parent_View 	@90

-			    location   	(483, -324)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @92

-				Parent_View 	@91

-				location   	(1168, 1741)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	500

-				justify    	0

-				label      	"+outboundResourceAdapter"

-				pctDist    	0.283465

-				height     	98

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA3650369"

-			    client     	@90

-			    supplier   	@83

-			    vertices   	(list Points

-				(1060, 1643)

-				(1441, 1643))

-			    line_style 	3

-			    origin_attachment 	(1060, 1643)

-			    terminal_attachment 	(1441, 1643)

-			    label      	(object SegLabel @93

-				Parent_View 	@91

-				location   	(1403, 1697)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

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

-			    Parent_View 	@90

-			    location   	(483, -324)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA365036B"

-			    client     	@90

-			    supplier   	@89

-			    vertices   	(list Points

-				(1060, 1643)

-				(1000, 1643)

-				(1000, 1313))

-			    line_style 	3

-			    origin_attachment 	(1060, 1643)

-			    terminal_attachment 	(1000, 1313))))

-		(object AttachView "" @95

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@38

-		    supplier   	@89

-		    vertices   	(list Points

-			(291, 4507)

-			(291, 1313))

-		    line_style 	3

-		    origin_attachment 	(291, 4507)

-		    terminal_attachment 	(291, 1313))

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

-		    location   	(834, 2535)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AADCD036A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "inboundResourceAdapter" @97

-			    Parent_View 	@96

-			    location   	(257, 568)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @98

-				Parent_View 	@97

-				location   	(1199, 3079)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	489

-				justify    	0

-				label      	"+inboundResourceAdapter"

-				pctDist    	0.781739

-				height     	46

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AADCF0312"

-			    client     	@96

-			    supplier   	@56

-			    vertices   	(list Points

-				(834, 2535)

-				(834, 3124)

-				(1466, 3124))

-			    line_style 	3

-			    origin_attachment 	(834, 2535)

-			    terminal_attachment 	(1466, 3124)

-			    label      	(object SegLabel @99

-				Parent_View 	@97

-				location   	(1343, 3178)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

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

-			    Parent_View 	@96

-			    location   	(257, 568)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AADCF0314"

-			    client     	@96

-			    supplier   	@89

-			    vertices   	(list Points

-				(834, 2535)

-				(834, 1313))

-			    line_style 	3

-			    origin_attachment 	(834, 2535)

-			    terminal_attachment 	(834, 1313))))

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

-		    location   	(787, 2626)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AAE020320"

-		    roleview_list 	(list RoleViews

-			(object RoleView "adminObjects" @102

-			    Parent_View 	@101

-			    location   	(210, 659)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @103

-				Parent_View 	@102

-				location   	(963, 3896)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+adminObjects"

-				pctDist    	0.966472

-				height     	176

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE040160"

-			    client     	@101

-			    supplier   	@63

-			    vertices   	(list Points

-				(787, 2626)

-				(787, 3941))

-			    line_style 	3

-			    origin_attachment 	(787, 2626)

-			    terminal_attachment 	(787, 3941)

-			    label      	(object SegLabel @104

-				Parent_View 	@102

-				location   	(728, 3913)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.978863

-				height     	60

-				orientation 	1))

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

-			    Parent_View 	@101

-			    location   	(210, 659)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAE04016B"

-			    client     	@101

-			    supplier   	@89

-			    vertices   	(list Points

-				(787, 2626)

-				(787, 1312))

-			    line_style 	3

-			    origin_attachment 	(787, 2626)

-			    terminal_attachment 	(787, 1312))))

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

-		    location   	(244, 2461)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C60944C00D6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "configProperties" @107

-			    Parent_View 	@106

-			    location   	(-348, 1245)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @108

-				Parent_View 	@107

-				location   	(246, 3406)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	314

-				justify    	0

-				label      	"+configProperties"

-				pctDist    	0.823782

-				height     	2

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60944D0196"

-			    client     	@106

-			    supplier   	@70

-			    vertices   	(list Points

-				(244, 2461)

-				(244, 3609))

-			    line_style 	3

-			    origin_attachment 	(244, 2461)

-			    terminal_attachment 	(244, 3609)

-			    label      	(object SegLabel @109

-				Parent_View 	@107

-				location   	(192, 3494)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.899727

-				height     	53

-				orientation 	1))

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

-			    Parent_View 	@106

-			    location   	(-348, 1245)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C60944D0198"

-			    client     	@106

-			    supplier   	@89

-			    vertices   	(list Points

-				(244, 2461)

-				(244, 1313))

-			    line_style 	3

-			    origin_attachment 	(244, 2461)

-			    terminal_attachment 	(244, 1313))))

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

-		    location   	(931, 2174)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C6093CC001E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityPermissions" @112

-			    Parent_View 	@111

-			    location   	(339, 958)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @113

-				Parent_View 	@112

-				location   	(1271, 2442)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	407

-				justify    	0

-				label      	"+securityPermissions"

-				pctDist    	0.752688

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6093CC0367"

-			    client     	@111

-			    supplier   	@82

-			    vertices   	(list Points

-				(931, 2174)

-				(931, 2480)

-				(1485, 2480))

-			    line_style 	3

-			    origin_attachment 	(931, 2174)

-			    terminal_attachment 	(1485, 2480)

-			    label      	(object SegLabel @114

-				Parent_View 	@112

-				location   	(1408, 2533)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.910000

-				height     	53

-				orientation 	1))

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

-			    Parent_View 	@111

-			    location   	(339, 958)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6093CC0369"

-			    client     	@111

-			    supplier   	@89

-			    vertices   	(list Points

-				(931, 2174)

-				(931, 1313))

-			    line_style 	3

-			    origin_attachment 	(931, 2174)

-			    terminal_attachment 	(931, 1313))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2775, 2668)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@116

-			location   	(2631, 2539)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	288

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@116

-			location   	(2631, 2644)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	284)

-		    width      	306

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(3856, 2786)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAFEC01BC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @118

-			    Parent_View 	@117

-			    location   	(3375, -2308)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @119

-				Parent_View 	@118

-				location   	(3066, 2712)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.867906

-				height     	32

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFF40019"

-			    client     	@117

-			    supplier   	@116

-			    vertices   	(list Points

-				(3856, 2786)

-				(3856, 2680)

-				(2928, 2680))

-			    line_style 	3

-			    origin_attachment 	(3856, 2786)

-			    terminal_attachment 	(2928, 2680)

-			    label      	(object SegLabel @120

-				Parent_View 	@118

-				location   	(2990, 2758)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.941292

-				height     	78

-				orientation 	0))

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

-			    Parent_View 	@117

-			    location   	(3375, -2308)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAFF40024"

-			    client     	@117

-			    supplier   	@64

-			    vertices   	(list Points

-				(3856, 2786)

-				(3856, 3820))

-			    line_style 	3

-			    origin_attachment 	(3856, 2786)

-			    terminal_attachment 	(3856, 3820))))

-		(object AssociationViewNew "$UNNAMED$38" @122

-		    location   	(1193, 2734)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AAB5A034A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @123

-			    Parent_View 	@122

-			    location   	(887, -1040)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @124

-				Parent_View 	@123

-				location   	(2463, 2634)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.889044

-				height     	101

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAB6100BF"

-			    client     	@122

-			    supplier   	@116

-			    vertices   	(list Points

-				(1193, 2734)

-				(2622, 2734))

-			    line_style 	3

-			    origin_attachment 	(1193, 2734)

-			    terminal_attachment 	(2622, 2734)

-			    label      	(object SegLabel @125

-				Parent_View 	@123

-				location   	(2550, 2785)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.949756

-				height     	51

-				orientation 	1))

-			(object RoleView "$UNNAMED$39" @126

-			    Parent_View 	@122

-			    location   	(887, -1040)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAB6100C9"

-			    client     	@122

-			    supplier   	@70

-			    vertices   	(list Points

-				(1193, 2734)

-				(640, 2734)

-				(640, 3609))

-			    line_style 	3

-			    origin_attachment 	(1193, 2734)

-			    terminal_attachment 	(640, 3609))))

-		(object AssociationViewNew "$UNNAMED$40" @127

-		    location   	(2349, 2600)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AAA3202FE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @128

-			    Parent_View 	@127

-			    location   	(738, -240)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @129

-				Parent_View 	@128

-				location   	(3081, 2580)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	2.684982

-				height     	21

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAA340012"

-			    client     	@127

-			    supplier   	@116

-			    vertices   	(list Points

-				(2349, 2600)

-				(2622, 2600))

-			    line_style 	3

-			    origin_attachment 	(2349, 2600)

-			    terminal_attachment 	(2622, 2600)

-			    label      	(object SegLabel @130

-				Parent_View 	@128

-				location   	(2563, 2557)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.783883

-				height     	44

-				orientation 	0))

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

-			    Parent_View 	@127

-			    location   	(738, -240)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AAA34001C"

-			    client     	@127

-			    supplier   	@82

-			    vertices   	(list Points

-				(2349, 2600)

-				(2077, 2600))

-			    line_style 	3

-			    origin_attachment 	(2349, 2600)

-			    terminal_attachment 	(2077, 2600))))

-		(object ClassView "Class" "Logical View::jca::AuthenticationMechanism" @132

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2231, 1040)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@132

-			location   	(1633, 859)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	1196

-			justify    	0

-			label      	"AuthenticationMechanism")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3C60914003CE"

-		    compartment 	(object Compartment

-			Parent_View 	@132

-			location   	(1633, 920)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	6

-			max_width  	1194)

-		    width      	1214

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @133

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@33

-		    supplier   	@132

-		    vertices   	(list Points

-			(1250, 549)

-			(1846, 846))

-		    line_style 	0)

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

-		    location   	(2041, 1386)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4AA54400FB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "authenticationMechanisms" @135

-			    Parent_View 	@134

-			    location   	(385, -2043)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @136

-				Parent_View 	@135

-				location   	(2359, 1318)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	509

-				justify    	0

-				label      	"+authenticationMechanisms"

-				pctDist    	0.444444

-				height     	318

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA545028D"

-			    client     	@134

-			    supplier   	@132

-			    vertices   	(list Points

-				(2041, 1386)

-				(2041, 1233))

-			    line_style 	3

-			    origin_attachment 	(2041, 1386)

-			    terminal_attachment 	(2041, 1233)

-			    label      	(object SegLabel @137

-				Parent_View 	@135

-				location   	(2142, 1258)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.834370

-				height     	101

-				orientation 	1))

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

-			    Parent_View 	@134

-			    location   	(385, -2043)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA545028F"

-			    client     	@134

-			    supplier   	@83

-			    vertices   	(list Points

-				(2041, 1386)

-				(2041, 1539))

-			    line_style 	3

-			    origin_attachment 	(2041, 1386)

-			    terminal_attachment 	(2041, 1539))))

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

-		    location   	(1338, 1050)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3C6094120028"

-		    roleview_list 	(list RoleViews

-			(object RoleView "authenticationMechanisms" @140

-			    Parent_View 	@139

-			    location   	(746, -166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @141

-				Parent_View 	@140

-				location   	(1410, 1018)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	509

-				justify    	0

-				label      	"+authenticationMechanisms"

-				pctDist    	0.253394

-				height     	33

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6094120390"

-			    client     	@139

-			    supplier   	@132

-			    vertices   	(list Points

-				(1338, 1050)

-				(1624, 1050))

-			    line_style 	3

-			    origin_attachment 	(1338, 1050)

-			    terminal_attachment 	(1624, 1050)

-			    label      	(object SegLabel @142

-				Parent_View 	@140

-				location   	(1595, 1104)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.898601

-				height     	54

-				orientation 	1))

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

-			    Parent_View 	@139

-			    location   	(746, -166)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3C6094120392"

-			    client     	@139

-			    supplier   	@89

-			    vertices   	(list Points

-				(1338, 1050)

-				(1052, 1050))

-			    line_style 	3

-			    origin_attachment 	(1338, 1050)

-			    terminal_attachment 	(1052, 1050))))

-		(object AttachView "" @144

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@41

-		    supplier   	@132

-		    vertices   	(list Points

-			(3078, 734)

-			(2765, 846))

-		    line_style 	0)

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

-		    location   	(3734, 1703)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4AA8A2001E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @146

-			    Parent_View 	@145

-			    location   	(1463, -801)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @147

-				Parent_View 	@146

-				location   	(0, 2830)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	6.560976

-				height     	205

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA8A30033"

-			    client     	@145

-			    supplier   	@116

-			    vertices   	(list Points

-				(3734, 1703)

-				(3734, 2625)

-				(2928, 2625))

-			    line_style 	3

-			    origin_attachment 	(3734, 1703)

-			    terminal_attachment 	(2928, 2625)

-			    label      	(object SegLabel @148

-				Parent_View 	@146

-				location   	(2993, 2515)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.962138

-				height     	111

-				orientation 	1))

-			(object RoleView "$UNNAMED$33" @149

-			    Parent_View 	@145

-			    location   	(1463, -801)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4AA8A3003D"

-			    client     	@145

-			    supplier   	@132

-			    vertices   	(list Points

-				(3734, 1703)

-				(3734, 871)

-				(2838, 871))

-			    line_style 	3

-			    origin_attachment 	(3734, 1703)

-			    terminal_attachment 	(2838, 871))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/jsp.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/jsp.ecore
deleted file mode 100644
index 4b51ae9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jsp.ecore
+++ /dev/null
@@ -1,72 +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="jsp"

-    nsURI="jsp.xmi" nsPrefix="org.eclipse.jst.j2ee.jsp">

-  <eClassifiers xsi:type="ecore:EClass" name="JSPConfig">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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/rose/jsp_2_0.cat b/plugins/org.eclipse.jst.j2ee.core/rose/jsp_2_0.cat
deleted file mode 100644
index 9fccc9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/jsp_2_0.cat
+++ /dev/null
@@ -1,618 +0,0 @@
-

-(object Petal

-    version    	47

-    _written   	"Rose 8.0.0303.1400"

-    charSet    	0)

-

-(object Class_Category "jsp"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Jsp"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

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

-    quid       	"3E4D4F69036B"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "JSPConfig"

-	    quid       	"3E4D4A3A01C8"

-	    documentation 	

-|@since J2EE1.4

-|The jsp-configType is used to provide global configuration

-|information for the JSP files in a web application. It has

-|two subelements, taglib and jsp-property-group.

-	    )

-	(object Class "JSPPropertyGroup"

-	    quid       	"3E4D4A970353"

-	    documentation 	

-|@since J2EE1.4

-|The jsp-property-groupType is used to group a number of

-|files so they can be given global property information.

-|All files so described are deemed to be JSP files. The

-|following additional properties can be described:

-|

-|- Control enabling of EL evaluation. - Control enabling

-|of Scripting elements. - Indicate pageEncoding

-|information. - Indicating that a resource is a JSP

-|document - Prelude and Coda automatic includes.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E4D4CCD0144"

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

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"3E4D4CDC0236"

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "elIgnored"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4D4CE302B8"

-		    documentation 	

-|Can be used to easily set the isELIgnored

-|	property of a group of JSP pages. By default,

-|	the EL evaluation is enabled for Web

-|	Applications using a Servlet 2.4 or greater

-|	web.xml, and disabled otherwise.

-		    

-		    type       	"boolean"

-		    initv      	"true"

-		    exportControl 	"Public")

-		(object ClassAttribute "pageEncoding"

-		    quid       	"3E4D4D33010E"

-		    documentation 	

-|The valid values of page-encoding are those of

-|	the pageEncoding page directive. It is a

-|	translation-time error to name different

-|	encodings in the pageEncoding attribute of the

-|	page directive of a JSP page and in a JSP

-|	configuration element matching the page. It is

-|	also a translation-time error to name different

-|	encodings in the prolog of a document in XML

-|	syntax and in a JSP configuration element

-|	matching the document. It is legal to name the

-|	same encoding through mulitple mechanisms.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "scriptingInvalid"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4D4D5803E3"

-		    documentation 	

-|Can be used to easily disable scripting in a

-|	group of JSP pages. By default, scripting is

-|	enabled.

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    initv      	"true"

-		    exportControl 	"Public")

-		(object ClassAttribute "isXML"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"3E4D4DBA0018"

-		    documentation 	

-|If true, denotes that the group of resources

-|	that match the URL pattern are JSP documents,

-|	and thus must be interpreted as XML documents.

-|	If false, the resources are assumed to not be

-|	JSP documents, unless there is another property

-|	group that indicates otherwise.

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    initv      	"false"

-		    exportControl 	"Public")

-		(object ClassAttribute "includePreludes"

-		    quid       	"3E4D4E1700EE"

-		    documentation 	

-|The include-prelude element is a

-|	context-relative path that must correspond to

-|	an element in the Web Application. When the

-|	element is present, the given path will be

-|	automatically included (as in an include

-|	directive) at the beginning of each JSP page in

-|	this jsp-property-group.

-		    

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "includeCodas"

-		    quid       	"3E4D4E370235"

-		    documentation 	

-|The include-coda element is a context-relative

-|	path that must correspond to an element in the

-|	Web Application. When the element is present,

-|	the given path will be automatically included

-|	(as in an include directive) at the end of each

-|	JSP page in this jsp-property-group.

-		    

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "TagLibRefType"

-	    quid       	"3E4D4C370148"

-	    documentation 	

-|@since J2EE1.4

-|A taglib can be used to provide information on a tag

-|library that is used by a JSP page within the Web

-|Application.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "taglibURI"

-		    quid       	"3E4D4C4A02CC"

-		    documentation 	

-| A taglib-uri element describes a URI identifying a

-|        tag library used in the web application.  The body

-|        of the taglib-uri element may be either an

-|        absolute URI specification, or a relative URI.

-|        There should be no entries in web.xml with the

-|        same taglib-uri value.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "taglibLocation"

-		    quid       	"3E4D4C4F03B0"

-		    documentation 	

-|the taglib-location element contains the location

-|        (as a resource relative to the root of the web

-|        application) where to find the Tag Library

-|        Description file for the tag library.

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"3E4D4B560249"

-	    roles      	(list role_list

-		(object Role "tagLibs"

-		    quid       	"3E4D4B570074"

-		    label      	"tagLibs"

-		    supplier   	"Logical View::jsp::TagLibRefType"

-		    quidu      	"3E4D4C370148"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3E4D4B570076"

-		    supplier   	"Logical View::jsp::JSPConfig"

-		    quidu      	"3E4D4A3A01C8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"3E4D4C9D03DA"

-	    roles      	(list role_list

-		(object Role "propertyGroups"

-		    quid       	"3E4D4C9E034F"

-		    label      	"propertyGroups"

-		    supplier   	"Logical View::jsp::JSPPropertyGroup"

-		    quidu      	"3E4D4A970353"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"3E4D4C9E0351"

-		    supplier   	"Logical View::jsp::JSPConfig"

-		    quidu      	"3E4D4A3A01C8"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "JSP_2_0"

-	    quid       	"3E4D4FA203A9"

-	    title      	"JSP_2_0"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	531

-	    origin_y   	1684

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::jsp::JSPPropertyGroup" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 1791)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(591, 1560)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	930

-			justify    	0

-			label      	"JSPPropertyGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D4A970353"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(591, 1621)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	800)

-		    width      	948

-		    height     	486

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jsp::TagLibRefType" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2000, 1680)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1737, 1574)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	526

-			justify    	0

-			label      	"TagLibRefType")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D4C370148"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1737, 1635)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	444)

-		    width      	544

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jsp::JSPConfig" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 1184)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(1383, 1133)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"JSPConfig")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D4A3A01C8"

-		    width      	292

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

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

-		    location   	(1054, 1168)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4C9D03DA"

-		    roleview_list 	(list RoleViews

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

-			    Parent_View 	@4

-			    location   	(173, -1612)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @6

-				Parent_View 	@5

-				location   	(1310, 1127)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C9E0351"

-			    client     	@4

-			    supplier   	@3

-			    line_style 	3

-			    origin_attachment 	(1054, 1168)

-			    terminal_attachment 	(1374, 1168))

-			(object RoleView "propertyGroups" @7

-			    Parent_View 	@4

-			    location   	(173, -1612)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @8

-				Parent_View 	@7

-				location   	(819, 1504)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	308

-				justify    	0

-				label      	"+propertyGroups"

-				pctDist    	0.899498

-				height     	176

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C9E034F"

-			    client     	@4

-			    supplier   	@1

-			    vertices   	(list Points

-				(1054, 1168)

-				(994, 1168)

-				(994, 1548))

-			    line_style 	3

-			    origin_attachment 	(1054, 1168)

-			    terminal_attachment 	(994, 1548)

-			    label      	(object SegLabel @9

-				Parent_View 	@7

-				location   	(1061, 1509)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.912060

-				height     	67

-				orientation 	0))))

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

-		    location   	(2006, 1222)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4B560249"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tagLibs" @11

-			    Parent_View 	@10

-			    location   	(1676, 916)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @12

-				Parent_View 	@11

-				location   	(1901, 1516)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	172

-				justify    	0

-				label      	"+tagLibs"

-				pctDist    	0.866995

-				height     	106

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4B570074"

-			    client     	@10

-			    supplier   	@2

-			    line_style 	3

-			    origin_attachment 	(2006, 1222)

-			    terminal_attachment 	(2006, 1562)

-			    label      	(object SegLabel @13

-				Parent_View 	@11

-				location   	(2070, 1514)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.859606

-				height     	64

-				orientation 	0))

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

-			    Parent_View 	@10

-			    location   	(1676, 916)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4B570076"

-			    client     	@10

-			    supplier   	@3

-			    vertices   	(list Points

-				(2006, 1222)

-				(2006, 1162)

-				(1666, 1162))

-			    line_style 	3

-			    origin_attachment 	(2006, 1222)

-			    terminal_attachment 	(1666, 1162))))

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

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(411, 1233)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(65, 1054)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"4023ADF20197"

-		    compartment 	(object Compartment

-			Parent_View 	@15

-			location   	(65, 1159)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	13434879

-			anchor     	2

-			nlines     	5

-			max_width  	437)

-		    width      	710

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @16

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4CCD0144"

-		    client     	@1

-		    supplier   	@15

-		    vertices   	(list Points

-			(582, 1548)

-			(509, 1548)

-			(509, 1424))

-		    line_style 	3

-		    origin_attachment 	(582, 1548)

-		    terminal_attachment 	(509, 1424))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/taglib.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/taglib.ecore
deleted file mode 100644
index 64b66b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/taglib.ecore
+++ /dev/null
@@ -1,223 +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="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="@since 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">

-    <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="@since 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="@since 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="@since 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">

-    <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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="JSPVariable">

-    <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="@since 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="@since 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">

-    <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">

-    <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/rose/taglib_1_1.cat b/plugins/org.eclipse.jst.j2ee.core/rose/taglib_1_1.cat
deleted file mode 100644
index 061597f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/taglib_1_1.cat
+++ /dev/null
@@ -1,3446 +0,0 @@
-

-(object Petal

-    version    	47

-    _written   	"Rose 8.0.0303.1400"

-    charSet    	0)

-

-(object Class_Category "taglib"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

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

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Taglib")))

-    quid       	"39A6BA5F0070"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "TagLib"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F00E8"

-	    documentation 	

-|The taglib tag is the document root, it defines:

-|

-|description     a simple string describing the "use" of this taglib,

-|                should be user discernable

-|

-|display-name    the display-name element contains a

-|                short name that is intended to be displayed

-|                by tools

-|

-|icon            optional icon that can be used by tools

-|

-|tlib-version    the version of the tag library implementation

-|

-|short-name      a simple default short name that could be

-|                used by a JSP authoring tool to create

-|                names with a mnemonic value; for example,

-|                the it may be used as the prefered prefix

-|                value in taglib directives

-|

-|uri             a uri uniquely identifying this taglib

-|

-|validator       optional TagLibraryValidator information

-|

-|listener        optional event listener specification

-|

-|tag             one or more tags in the tag library

-|

-|tag-file        one or more tag files in the tag library

-|

-|function        zero or more EL functions defined in this

-|                tag library

-|

-|taglib-extension zero or more extensions that provide extra

-|		information about this taglib, for tool

-|		consumption

-	    

-	    stereotype 	"component"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B12101F3"

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

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "tagLibVersion"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"XML_DTD"

-			    name       	"DefaultDeclType"

-			    value      	"#IMPLIED"))

-		    quid       	"39A6BA5F0160"

-		    documentation 	

-|Describes this version number of the tag library (dewey decimal).

-|@regexp [0-9]*{ "."[0-9] }0..3

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "jspVersion"

-		    quid       	"39A6C5FA0221"

-		    documentation 	

-|Describes the JSP version (number) this tag library requires in order to function (dewey decimal).  Default is 1.2

-|@regexp [0-9]*{ "."[0-9] }0..3

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "shortName"

-		    quid       	"39A6C60001A7"

-		    documentation 	"The value of the short-name element is a name that could be used by a JSP authoring tool to create names with a mnemonic value; for example, it may be used as the prefered prefix value in taglib directives. Do not use white space, and do not start with digits or underscore."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "uri"

-		    quid       	"39A6C60600C9"

-		    documentation 	"The value of the uri element is a public URI that uniquely identifies the exact semantics of this taglibrary."

-		    type       	"String"

-		    exportControl 	"Public"))

-	    module     	"Component View::web-jsptaglibrary_1_1"

-	    quidu      	"39A6BA5F00C1"

-	    language   	"XML_DTD")

-	(object Class "JSPTag"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F0108"

-	    documentation 	

-|The tag element defines an action in this tag library. The tag element has one attribute, id.

-|The tag element may have several subelements defining:

-|name -- The unique action name

-|tag-class -- The tag handler class implementing javax.servlet.jsp.tagext.Tag

-|tei-class -- An optional subclass of javax.servlet.jsp.tagext.TagExtraInfo

-|body-content -- The body content type

-|display-name -- A short name that is intended to be displayed by tools

-|small-icon -- Optional small-icon that can be used by tools

-|large-icon -- Optional large-icon that can be used by tools

-|description -- Optional tag-specific information

-|variable -- Optional scripting variable information

-|attribute -- All attributes of this action

-|example -- Optional informal description of an example of a use of this action.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E5A978E00CA"

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

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "bodyContent"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39A6C904016B"

-		    documentation 	

-|Provides a hint as to the content of the body of this tag. Primarily intended for use by page composition tools.There are currently three values specified:

-|

-|tagdependent - The body of the tag is interpreted by the tag implementation itself, and is most likely in a		different "langage", e.g embedded SQL statements.

-|

-|JSP - The body of the tag contains nested JSP syntax

-|

-|empty - The body must be emptyThe default (if not defined) is JSP#PCDATA ::=  tagdependent | JSP | empty

-		    

-		    stereotype 	"0..1"

-		    type       	"BodyContentType"

-		    quidu      	"39ABE974027D"

-		    exportControl 	"Public")

-		(object ClassAttribute "example"

-		    quid       	"398967990188"

-		    documentation 	"The example element provides an informal description of an example of the use of a tag."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3E5A97D50127"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "dynamicAttributes"

-		    quid       	"3E5A9A11009D"

-		    type       	"boolean"

-		    exportControl 	"Public"))

-	    module     	"Component View::web-jsptaglibrary_1_1"

-	    quidu      	"39A6BA5F00C1"

-	    language   	"XML_DTD")

-	(object Class "JSPTagAttribute"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F0114"

-	    documentation 	"The attribute tag defines an attribute for the nesting tag"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"39A6C76E01F3"

-		    documentation 	"Defines the canonical name of a tag or attribute being defined (required)."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "required"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39A6C7720181"

-		    documentation 	"Defines if the nesting attribute is required or optional."

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "rtExprValue"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"39A6C7760209"

-		    documentation 	

-|Defines if the nesting attribute can have scriptlet expressions asa value, i.e the value of the attribute may be dynamically calculatedat request time, as opposed to a static value determined at translationtime. (optional)

-|Default = false

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    initv      	"false"

-		    exportControl 	"Public")

-		(object ClassAttribute "fragment"

-		    quid       	"3E67B8AE0095"

-		    documentation 	"@since J2EE1.4"

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    exportControl 	"Public"))

-	    module     	"Component View::web-jsptaglibrary_1_1"

-	    quidu      	"39A6BA5F00C1"

-	    language   	"XML_DTD")

-	(object Class "BodyContentType"

-	    quid       	"39ABE974027D"

-	    documentation 	

-|@since J2EE1.4, added TAGDEPENDENT,EMPTY,scriptless,SCRIPTLESS

-|Provides a hint as to the content of the body of this tag.

-|Primarily intended for use by page composition tools.

-|

-|There are currently four values specified:

-|

-|tagdependent    The body of the tag is interpreted by the tag

-|                implementation itself, and is most likely

-|                in a different "langage", e.g embedded SQL

-|                statements.

-|

-|JSP             The body of the tag contains nested JSP

-|                syntax.

-|

-|empty           The body must be empty

-|

-|scriptless      The body accepts only template text, EL

-|                Expressions, and JSP action elements.  No

-|                scripting elements are allowed.

-|JSP=0

-|empty=1

-|tagdependent=2

-|TAGDEPENDENT=3

-|EMPTY=4

-|scriptless=5

-|SCRIPTLESS=6

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "tagdependent"

-		    quid       	"3ECD280702B0")

-		(object ClassAttribute "JSP"

-		    quid       	"3ECD28150094")

-		(object ClassAttribute "empty"

-		    quid       	"3ECD281A0005")

-		(object ClassAttribute "scriptless"

-		    quid       	"3ECD282002C0")))

-	(object Class "Validator"

-	    quid       	"398962CA014C"

-	    documentation 	

-|The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.

-|

-	    )

-	(object Class "JSPVariable"

-	    quid       	"398965A900B3"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "nameGiven"

-		    quid       	"398967F80384"

-		    documentation 	

-|The name-given element provides the name for the scripting variable.

-|

-|One of name-given or name-from-attribute is required.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "nameFromAttribute"

-		    quid       	"398968440134"

-		    documentation 	"The name of an attribute whose (translation-time) value will give the name of the variable."

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "declare"

-		    quid       	"398968CA0295"

-		    documentation 	

-|The value of the declare element indicates whether the scripting variable is to be defined or not. See TagExtraInfo for details.

-|This element is optional and is the default is true.

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "scope"

-		    quid       	"3989692A03AC"

-		    stereotype 	"0..1"

-		    type       	"JSPScriptingVariableScope"

-		    quidu      	"398968FD025D"

-		    exportControl 	"Public")))

-	(object Class "JSPScriptingVariableScope"

-	    quid       	"398968FD025D"

-	    documentation 	

-|NESTED=0

-|AT_BEGIN=1

-|AT_END=2

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NESTED"

-		    quid       	"398969100105"

-		    exportControl 	"Public")

-		(object ClassAttribute "AT_BEGIN"

-		    quid       	"398969130164"

-		    exportControl 	"Public")

-		(object ClassAttribute "AT_END"

-		    quid       	"3989691702D2"

-		    exportControl 	"Public")))

-	(object Class "Function"

-	    quid       	"3E5A875400E5"

-	    documentation 	

-|@since J2EE1.4

-|The function element is used to provide information on each

-|function in the tag library that is to be exposed to the EL.

-|

-|The function element may have several subelements defining:

-|

-|description         Optional tag-specific information

-|

-|display-name        A short name that is intended to be

-|                    displayed by tools

-|

-|icon                Optional icon element that can be used

-|                    by tools

-|

-|name                A unique name for this function

-|

-|function-class      Provides the name of the Java class that

-|                    implements the function

-|

-|function-signature  Provides the signature, as in the Java

-|                    Language Specification, of the Java

-|                    method that is to be used to implement

-|                    the function.

-|

-|example             Optional informal description of an

-|                    example of a use of this function

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E5A876A0340"

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

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E5A87870066"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "signature"

-		    quid       	"3E5A898B039E"

-		    documentation 	

-|Provides the signature, as in the Java Language

-|        Specification, of the static Java method that is

-|        to be used to implement the function.

-|

-|        Example:

-|

-|        java.lang.String nickName( java.lang.String, int )

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "example"

-		    quid       	"3E5A8AAE0306"

-		    documentation 	

-|The example element contains an informal description

-|        of an example of the use of this function.

-		    

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "TagFile"

-	    quid       	"3E5A96DE029E"

-	    documentation 	

-|@since J2EE1.4

-|Defines an action in this tag library that is implemented

-|as a .tag file.

-|

-|The tag-file element has two required subelements:

-|

-|name    The unique action name

-|

-|path    Where to find the .tag file implementing this

-|        action, relative to the root of the web application or

-|	the root of the JAR file for a tag library packaged in

-|	a JAR.  This must begin with /WEB-INF/tags if the .tag

-|	file resides in the WAR, or /META-INF/tags if the .tag

-|	file resides in a JAR.

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3ECD2DE4011E"

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

-		    quidu      	"3E4D451F01FB"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"3E5A96F803C8"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "path"

-		    quid       	"3E5A970E00E4"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "example"

-		    quid       	"3ECD2DFF022B"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "TldExtension"

-	    quid       	"3ECD2A8D016F"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "namespace"

-		    quid       	"3ECD2CD202C9"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "ExtensibleType"

-	    quid       	"3ECD2C2A00F1"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "value"

-		    quid       	"3ECD2C3801E1"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    abstract   	TRUE)

-	(object Association "tag"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F0156"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$0"

-		    quid       	"39A6BA5F0157"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)

-		(object Role "tags"

-		    quid       	"39A6BA5F0158"

-		    label      	"tags"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "attribute"

-	    attributes 	(list Attribute_Set)

-	    quid       	"39A6BA5F01BA"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$1"

-		    quid       	"39A6BA5F01BB"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    Containment 	"By Value"

-		    is_aggregate 	TRUE)

-		(object Role "attributes"

-		    quid       	"39A6BA5F01BC"

-		    label      	"attributes"

-		    supplier   	"Logical View::taglib::JSPTagAttribute"

-		    quidu      	"39A6BA5F0114"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"398962E3003A"

-	    roles      	(list role_list

-		(object Role "validator"

-		    quid       	"398962E3033D"

-		    documentation 	

-|The validator element provides information on an optional validator that can be used to validate the conformance of a JSP page to using this tag library.

-|

-		    

-		    label      	"validator"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"398962E30347"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"3989632E01A0"

-	    roles      	(list role_list

-		(object Role "validatorClass"

-		    quid       	"3989632E039F"

-		    documentation 	

-|defines the TagLibraryValidator class that can be

-|used to validate the conformance of a JSP page to using this tag library.

-		    

-		    label      	"validatorClass"

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

-		    quidu      	"36549FCC00FA"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"3989632E03D1"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"398963F40082"

-	    roles      	(list role_list

-		(object Role "initParams"

-		    quid       	"398963F4032B"

-		    label      	"initParams"

-		    supplier   	"Logical View::webapplication::InitParam"

-		    quidu      	"38C08E9D0325"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"398963F4032C"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"398964E80322"

-	    roles      	(list role_list

-		(object Role "listeners"

-		    quid       	"398964E90279"

-		    label      	"listeners"

-		    supplier   	"Logical View::common::Listener"

-		    quidu      	"39BFB26001BD"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"398964E90283"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"398965BE00F9"

-	    roles      	(list role_list

-		(object Role "variables"

-		    quid       	"398965BF00E7"

-		    documentation 	

-|The variable element provides information on the scripting variables defined by this tag.

-|It is a (translation time) error for an action that has one or more variable subelements to have a TagExtraInfo class that returns a non-null object.

-|The subelements of variable are of the form:

-|name-given -- The variable name as a constant

-|name-from-attribute -- The name of an attribute whose (translation time) value will give the name of the variable. One of name-given or namefrom-attribute is required.

-|variable-class -- Name of the class of the variable. java.lang.String is default.

-|declare -- Whether the variable is declared or not. True is the default.

-|scope -- The scope of the scripting variable defined. NESTED is default.

-|

-		    

-		    label      	"variables"

-		    supplier   	"Logical View::taglib::JSPVariable"

-		    quidu      	"398965A900B3"

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

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"398965BF00E8"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"398966A3031F"

-	    roles      	(list role_list

-		(object Role "tagClass"

-		    quid       	"398966A4028A"

-		    documentation 	

-|The tag-class element indicates the subclass of javax.serlvet.jsp.tagext.Tag that implements the request time semantics for this tag. This element is required.

-|@regexp fully qualified Java class name

-|

-		    

-		    label      	"tagClass"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"398966A402C7"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"398966C20175"

-	    roles      	(list role_list

-		(object Role "teiClass"

-		    quid       	"398966C3005E"

-		    documentation 	

-|The tei-class element indicates the subclass of javax.servlet.jsp.tagext.TagExtraInfo for this tag. The class is instantiated at translation time. This element is optional.

-|@regexp fully qualified Java class name

-		    

-		    label      	"teiClass"

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

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"398966C3009A"

-		    supplier   	"Logical View::taglib::JSPTag"

-		    quidu      	"39A6BA5F0108"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3989688A0366"

-	    documentation 	

-|The name of the class for the scripting variable.

-|This element is optional; the default is java.lang.String.

-|

-	    

-	    roles      	(list role_list

-		(object Role "variableClass"

-		    quid       	"3989688D002B"

-		    label      	"variableClass"

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

-		    quidu      	"36549FCC00FA"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3989688D0067"

-		    supplier   	"Logical View::taglib::JSPVariable"

-		    quidu      	"398965A900B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"398969910273"

-	    roles      	(list role_list

-		(object Role "type"

-		    quid       	"3989699200EE"

-		    documentation 	

-|The value of the type element describes the Java type of the attributes value.

-|For static values (those determined at translation time) the type is always java.lang.String.

-		    

-		    label      	"type"

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

-		    quidu      	"36549FCC00FA"

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

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"39896992013E"

-		    supplier   	"Logical View::taglib::JSPTagAttribute"

-		    quidu      	"39A6BA5F0114"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E5A87CE03C6"

-	    roles      	(list role_list

-		(object Role "functionClass"

-		    quid       	"3E5A87CF034F"

-		    documentation 	

-|Provides the fully-qualified class name of the Java

-|        class containing the static method that implements

-|        the function.

-		    

-		    label      	"functionClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E5A87CF036D"

-		    supplier   	"Logical View::taglib::Function"

-		    quidu      	"3E5A875400E5"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3E5A9881000C"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E5A9881025A"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3E5A98810282"

-		    supplier   	"Logical View::taglib::JSPTagAttribute"

-		    quidu      	"39A6BA5F0114"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"3E67B391027D"

-	    roles      	(list role_list

-		(object Role "functions"

-		    quid       	"3E67B3920329"

-		    documentation 	"@since J2EE1.4"

-		    label      	"functions"

-		    supplier   	"Logical View::taglib::Function"

-		    quidu      	"3E5A875400E5"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"3E67B392032B"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$26"

-	    quid       	"3E67B9FE034B"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E67B9FF0392"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"3E67B9FF03B0"

-		    supplier   	"Logical View::taglib::Validator"

-		    quidu      	"398962CA014C"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"3E67BAA402B3"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E67BAA50297"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"3E67BAA502B5"

-		    supplier   	"Logical View::taglib::JSPVariable"

-		    quidu      	"398965A900B3"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"3ECD2C970011"

-	    roles      	(list role_list

-		(object Role "extensionElements"

-		    quid       	"3ECD2C9701CA"

-		    label      	"extensionElements"

-		    supplier   	"Logical View::taglib::ExtensibleType"

-		    quidu      	"3ECD2C2A00F1"

-		    client_cardinality 	(value cardinality "1..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"3ECD2C9701CC"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"3ECD2D5701DA"

-	    roles      	(list role_list

-		(object Role "functionExtensions"

-		    quid       	"3ECD2D58016D"

-		    label      	"functionExtensions"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3ECD2D580178"

-		    supplier   	"Logical View::taglib::Function"

-		    quidu      	"3E5A875400E5"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"3ECD2E5403C8"

-	    roles      	(list role_list

-		(object Role "tagExtensions"

-		    quid       	"3ECD2E590072"

-		    label      	"tagExtensions"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"3ECD2E59007C"

-		    supplier   	"Logical View::taglib::TagFile"

-		    quidu      	"3E5A96DE029E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$36"

-	    quid       	"3ECD2EE3003F"

-	    roles      	(list role_list

-		(object Role "taglibExtensions"

-		    quid       	"3ECD2EE503D1"

-		    label      	"taglibExtensions"

-		    supplier   	"Logical View::taglib::TldExtension"

-		    quidu      	"3ECD2A8D016F"

-		    client_cardinality 	(value cardinality "0..*")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"3ECD2EE503DB"

-		    supplier   	"Logical View::taglib::TagLib"

-		    quidu      	"39A6BA5F00E8"

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "TagLib"

-	    quid       	"39A6BA810155"

-	    title      	"TagLib"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	1962

-	    origin_y   	1318

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::taglib::BodyContentType" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2589, 366)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(2374, 232)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	430

-			justify    	0

-			label      	"BodyContentType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@1

-			location   	(2374, 182)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	430

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39ABE974027D"

-		    width      	448

-		    height     	392

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::taglib::JSPScriptingVariableScope" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3254, 2227)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(2983, 2124)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	542

-			justify    	0

-			label      	"JSPScriptingVariableScope")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@2

-			location   	(2983, 2074)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	542

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398968FD025D"

-		    width      	560

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(284, 572)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(106, 493)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::InitParam" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(914, 1967)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(670, 1788)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	488

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C08E9D0325"

-		    width      	506

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @5

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1295, 2418)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(1126, 2289)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	338

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E4A98D602E0"

-		    width      	356

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1381, 1453)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(1268, 1371)

-			nlines     	2

-			max_width  	226

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    quidu      	"36549FCC00FA"

-		    width      	244

-		    height     	188

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::taglib::JSPTagAttribute" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2024, 1723)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(1579, 1567)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	890

-			justify    	0

-			label      	"JSPTagAttribute")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39A6BA5F0114"

-		    width      	908

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @8

-		    location   	(1297, 1949)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E5A9881000C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @9

-			    Parent_View 	@8

-			    location   	(-727, 226)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @10

-				Parent_View 	@9

-				location   	(1430, 2151)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.615854

-				height     	133

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A9881025A"

-			    client     	@8

-			    supplier   	@5

-			    line_style 	3

-			    origin_attachment 	(1297, 1949)

-			    terminal_attachment 	(1297, 2277)

-			    label      	(object SegLabel @11

-				Parent_View 	@9

-				location   	(1248, 2154)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.625000

-				height     	50

-				orientation 	1))

-			(object RoleView "$UNNAMED$23" @12

-			    Parent_View 	@8

-			    location   	(-727, 226)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A98810282"

-			    client     	@8

-			    supplier   	@7

-			    vertices   	(list Points

-				(1297, 1949)

-				(1297, 1889)

-				(1570, 1889))

-			    line_style 	3

-			    origin_attachment 	(1297, 1949)

-			    terminal_attachment 	(1570, 1889))))

-		(object AssociationViewNew "$UNNAMED$18" @13

-		    location   	(1403, 1745)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398969910273"

-		    roleview_list 	(list RoleViews

-			(object RoleView "type" @14

-			    Parent_View 	@13

-			    location   	(-197, 241)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @15

-				Parent_View 	@14

-				location   	(1474, 1637)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	108

-				justify    	0

-				label      	"+type"

-				pctDist    	0.551587

-				height     	71

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989699200EE"

-			    client     	@13

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1403, 1745)

-			    terminal_attachment 	(1403, 1546)

-			    label      	(object SegLabel @16

-				Parent_View 	@14

-				location   	(1457, 1567)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$19" @17

-			    Parent_View 	@13

-			    location   	(-197, 241)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39896992013E"

-			    client     	@13

-			    supplier   	@7

-			    vertices   	(list Points

-				(1403, 1745)

-				(1403, 1805)

-				(1570, 1805))

-			    line_style 	3

-			    origin_attachment 	(1403, 1745)

-			    terminal_attachment 	(1570, 1805)

-			    label      	(object SegLabel @18

-				Parent_View 	@17

-				location   	(1508, 0)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	-7.929577

-				height     	105

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::taglib::JSPVariable" @19

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3093, 1712)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@19

-			location   	(2578, 1531)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	1030

-			justify    	0

-			label      	"JSPVariable")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398965A900B3"

-		    width      	1048

-		    height     	386

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$28" @20

-		    location   	(2387, 2351)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E67BAA402B3"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @21

-			    Parent_View 	@20

-			    location   	(-593, 639)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @22

-				Parent_View 	@21

-				location   	(1715, 2306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.736734

-				height     	46

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67BAA50297"

-			    client     	@20

-			    supplier   	@5

-			    line_style 	3

-			    origin_attachment 	(2387, 2351)

-			    terminal_attachment 	(1473, 2351)

-			    label      	(object SegLabel @23

-				Parent_View 	@21

-				location   	(1564, 2405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$29" @24

-			    Parent_View 	@20

-			    location   	(-593, 639)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67BAA502B5"

-			    client     	@20

-			    supplier   	@19

-			    vertices   	(list Points

-				(2387, 2351)

-				(2856, 2351)

-				(2856, 1905))

-			    line_style 	3

-			    origin_attachment 	(2387, 2351)

-			    terminal_attachment 	(2856, 1905))))

-		(object AssociationViewNew "$UNNAMED$16" @25

-		    location   	(1859, 2002)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3989688A0366"

-		    roleview_list 	(list RoleViews

-			(object RoleView "variableClass" @26

-			    Parent_View 	@25

-			    location   	(-413, 530)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @27

-				Parent_View 	@26

-				location   	(1192, 1616)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+variableClass"

-				pctDist    	0.930155

-				height     	137

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989688D002B"

-			    client     	@25

-			    supplier   	@6

-			    vertices   	(list Points

-				(1859, 2002)

-				(1328, 2002)

-				(1328, 1547))

-			    line_style 	3

-			    origin_attachment 	(1859, 2002)

-			    terminal_attachment 	(1328, 1547)

-			    label      	(object SegLabel @28

-				Parent_View 	@26

-				location   	(1287, 1660)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.885809

-				height     	42

-				orientation 	0))

-			(object RoleView "$UNNAMED$17" @29

-			    Parent_View 	@25

-			    location   	(-413, 530)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989688D0067"

-			    client     	@25

-			    supplier   	@19

-			    vertices   	(list Points

-				(1859, 2002)

-				(2749, 2002)

-				(2749, 1905))

-			    line_style 	3

-			    origin_attachment 	(1859, 2002)

-			    terminal_attachment 	(2749, 1905))))

-		(object ClassView "Class" "Logical View::taglib::ExtensibleType" @30

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(887, 2544)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@30

-			location   	(706, 2463)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	362

-			justify    	0

-			label      	"ExtensibleType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3ECD2C2A00F1"

-		    width      	380

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::taglib::TagFile" @31

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1946, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@31

-			location   	(1634, 109)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	624

-			justify    	0

-			label      	"TagFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E5A96DE029E"

-		    width      	642

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @32

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2DE4011E"

-		    client     	@31

-		    supplier   	@3

-		    vertices   	(list Points

-			(1625, 162)

-			(417, 162)

-			(417, 481))

-		    line_style 	3

-		    origin_attachment 	(1625, 162)

-		    terminal_attachment 	(417, 481))

-		(object ClassView "Class" "Logical View::common::Listener" @33

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1312, 1073)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@33

-			location   	(1180, 974)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	264

-			justify    	0

-			label      	"Listener")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BFB26001BD"

-		    width      	282

-		    height     	222

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @34

-		    location   	(1425, 1271)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39C03E6C035A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @35

-			    Parent_View 	@34

-			    location   	(1041, -169)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @36

-				Parent_View 	@35

-				location   	(1384, 1202)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02CF"

-			    client     	@34

-			    supplier   	@33

-			    vertices   	(list Points

-				(1425, 1271)

-				(1441, 1271)

-				(1441, 1184))

-			    line_style 	3

-			    origin_attachment 	(1425, 1271)

-			    terminal_attachment 	(1441, 1184))

-			(object RoleView "listenerClass" @37

-			    Parent_View 	@34

-			    location   	(1041, -169)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @38

-				Parent_View 	@37

-				location   	(1513, 1325)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	262

-				justify    	0

-				label      	"+listenerClass"

-				pctDist    	0.608696

-				height     	88

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02A7"

-			    client     	@34

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1425, 1271)

-			    terminal_attachment 	(1425, 1359)

-			    label      	(object SegLabel @39

-				Parent_View 	@37

-				location   	(1463, 1301)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.335404

-				height     	38

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::taglib::Function" @40

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(321, 1415)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@40

-			location   	(9, 1284)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	624

-			justify    	0

-			label      	"Function")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E5A875400E5"

-		    width      	642

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @41

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5A876A0340"

-		    client     	@40

-		    supplier   	@3

-		    line_style 	3

-		    origin_attachment 	(281, 1272)

-		    terminal_attachment 	(281, 663))

-		(object AssociationViewNew "$UNNAMED$20" @42

-		    location   	(950, 1484)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5A87CE03C6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "functionClass" @43

-			    Parent_View 	@42

-			    location   	(628, 75)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @44

-				Parent_View 	@43

-				location   	(1197, 1443)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	279

-				justify    	0

-				label      	"+functionClass"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A87CF034F"

-			    client     	@42

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(950, 1484)

-			    terminal_attachment 	(1259, 1484)

-			    label      	(object SegLabel @45

-				Parent_View 	@43

-				location   	(1228, 1538)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$21" @46

-			    Parent_View 	@42

-			    location   	(628, 75)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5A87CF036D"

-			    client     	@42

-			    supplier   	@40

-			    line_style 	3

-			    origin_attachment 	(950, 1484)

-			    terminal_attachment 	(642, 1484))))

-		(object ClassView "Class" "Logical View::taglib::Validator" @47

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(848, 1259)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@47

-			location   	(734, 1208)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	228

-			justify    	0

-			label      	"Validator")

-		    icon_style 	"Icon"

-		    line_color 	32768

-		    fill_color 	13434833

-		    quidu      	"398962CA014C"

-		    width      	246

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$6" @48

-		    location   	(953, 1548)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398963F40082"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams" @49

-			    Parent_View 	@48

-			    location   	(409, 492)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @50

-				Parent_View 	@49

-				location   	(816, 1741)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+initParams"

-				pctDist    	0.852761

-				height     	138

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398963F4032B"

-			    client     	@48

-			    supplier   	@4

-			    line_style 	3

-			    origin_attachment 	(953, 1548)

-			    terminal_attachment 	(953, 1775)

-			    label      	(object SegLabel @51

-				Parent_View 	@49

-				location   	(1007, 1752)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$7" @52

-			    Parent_View 	@48

-			    location   	(409, 492)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398963F4032C"

-			    client     	@48

-			    supplier   	@47

-			    line_style 	3

-			    origin_attachment 	(953, 1548)

-			    terminal_attachment 	(953, 1322))))

-		(object AssociationViewNew "$UNNAMED$4" @53

-		    location   	(1215, 1222)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3989632E01A0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "validatorClass" @54

-			    Parent_View 	@53

-			    location   	(671, 166)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @55

-				Parent_View 	@54

-				location   	(1233, 1309)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	291

-				justify    	0

-				label      	"+validatorClass"

-				pctDist    	0.078067

-				height     	87

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989632E039F"

-			    client     	@53

-			    supplier   	@6

-			    vertices   	(list Points

-				(1215, 1222)

-				(1322, 1222)

-				(1322, 1359))

-			    line_style 	3

-			    origin_attachment 	(1215, 1222)

-			    terminal_attachment 	(1322, 1359)

-			    label      	(object SegLabel @56

-				Parent_View 	@54

-				location   	(1291, 1283)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.692568

-				height     	32

-				orientation 	1))

-			(object RoleView "$UNNAMED$5" @57

-			    Parent_View 	@53

-			    location   	(671, 166)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3989632E03D1"

-			    client     	@53

-			    supplier   	@47

-			    line_style 	3

-			    origin_attachment 	(1215, 1222)

-			    terminal_attachment 	(971, 1222))))

-		(object AssociationViewNew "$UNNAMED$26" @58

-		    location   	(1112, 1694)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"3E67B9FE034B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @59

-			    Parent_View 	@58

-			    location   	(264, 435)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @60

-				Parent_View 	@59

-				location   	(1029, 2230)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.928460

-				height     	144

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B9FF0392"

-			    client     	@58

-			    supplier   	@5

-			    vertices   	(list Points

-				(1112, 1694)

-				(1172, 1694)

-				(1172, 2277))

-			    line_style 	3

-			    origin_attachment 	(1112, 1694)

-			    terminal_attachment 	(1172, 2277)

-			    label      	(object SegLabel @61

-				Parent_View 	@59

-				location   	(1226, 2212)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$27" @62

-			    Parent_View 	@58

-			    location   	(264, 435)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B9FF03B0"

-			    client     	@58

-			    supplier   	@47

-			    vertices   	(list Points

-				(1112, 1694)

-				(894, 1694)

-				(894, 1322))

-			    line_style 	3

-			    origin_attachment 	(1112, 1694)

-			    terminal_attachment 	(894, 1322))))

-		(object ClassView "Class" "Logical View::taglib::JSPTag" @63

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1998, 1021)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@63

-			location   	(1516, 865)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	964

-			justify    	0

-			label      	"JSPTag")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39A6BA5F0108"

-		    width      	982

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @64

-		    location   	(1762, 1398)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398966A3031F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tagClass" @65

-			    Parent_View 	@64

-			    location   	(178, 598)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @66

-				Parent_View 	@65

-				location   	(1689, 1433)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+tagClass"

-				pctDist    	0.283262

-				height     	35

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966A4028A"

-			    client     	@64

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1762, 1398)

-			    terminal_attachment 	(1503, 1398)

-			    label      	(object SegLabel @67

-				Parent_View 	@65

-				location   	(1563, 1433)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.771930

-				height     	35

-				orientation 	0))

-			(object RoleView "$UNNAMED$13" @68

-			    Parent_View 	@64

-			    location   	(178, 598)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966A402C7"

-			    client     	@64

-			    supplier   	@63

-			    vertices   	(list Points

-				(1762, 1398)

-				(1822, 1398)

-				(1822, 1189))

-			    line_style 	3

-			    origin_attachment 	(1762, 1398)

-			    terminal_attachment 	(1822, 1189))))

-		(object AssociationViewNew "$UNNAMED$14" @69

-		    location   	(1858, 1481)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"398966C20175"

-		    roleview_list 	(list RoleViews

-			(object RoleView "teiClass" @70

-			    Parent_View 	@69

-			    location   	(274, 681)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @71

-				Parent_View 	@70

-				location   	(1649, 1535)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	178

-				justify    	0

-				label      	"+teiClass"

-				pctDist    	0.589286

-				height     	54

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966C3005E"

-			    client     	@69

-			    supplier   	@6

-			    line_style 	3

-			    origin_attachment 	(1858, 1481)

-			    terminal_attachment 	(1503, 1481)

-			    label      	(object SegLabel @72

-				Parent_View 	@70

-				location   	(1539, 1535)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$15" @73

-			    Parent_View 	@69

-			    location   	(274, 681)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398966C3009A"

-			    client     	@69

-			    supplier   	@63

-			    vertices   	(list Points

-				(1858, 1481)

-				(1922, 1481)

-				(1922, 1189))

-			    line_style 	3

-			    origin_attachment 	(1858, 1481)

-			    terminal_attachment 	(1922, 1189))))

-		(object InheritView "" @74

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5A978E00CA"

-		    client     	@63

-		    supplier   	@3

-		    vertices   	(list Points

-			(1562, 853)

-			(1562, 109)

-			(287, 109)

-			(287, 481))

-		    line_style 	3

-		    origin_attachment 	(1562, 853)

-		    terminal_attachment 	(287, 481))

-		(object AssociationViewNew "attribute" @75

-		    location   	(2031, 1371)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39A6BA5F01BA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "attributes" @76

-			    Parent_View 	@75

-			    location   	(815, 363)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @77

-				Parent_View 	@76

-				location   	(2151, 1514)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	193

-				justify    	0

-				label      	"+attributes"

-				pctDist    	0.780488

-				height     	120

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F01BC"

-			    client     	@75

-			    supplier   	@7

-			    line_style 	3

-			    origin_attachment 	(2031, 1371)

-			    terminal_attachment 	(2031, 1555)

-			    label      	(object SegLabel @78

-				Parent_View 	@76

-				location   	(1978, 1537)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$1" @79

-			    Parent_View 	@75

-			    location   	(815, 363)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @80

-				Parent_View 	@79

-				location   	(2073, 1226)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F01BB"

-			    client     	@75

-			    supplier   	@63

-			    line_style 	3

-			    origin_attachment 	(2031, 1371)

-			    terminal_attachment 	(2031, 1188))))

-		(object AssociationViewNew "$UNNAMED$10" @81

-		    location   	(2946, 1104)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398965BE00F9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "variables" @82

-			    Parent_View 	@81

-			    location   	(1362, 304)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @83

-				Parent_View 	@82

-				location   	(3128, 1449)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	181

-				justify    	0

-				label      	"+variables"

-				pctDist    	0.854671

-				height     	122

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398965BF00E7"

-			    client     	@81

-			    supplier   	@19

-			    vertices   	(list Points

-				(2946, 1104)

-				(3006, 1104)

-				(3006, 1519))

-			    line_style 	3

-			    origin_attachment 	(2946, 1104)

-			    terminal_attachment 	(3006, 1519)

-			    label      	(object SegLabel @84

-				Parent_View 	@82

-				location   	(3076, 1389)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.726644

-				height     	70

-				orientation 	0))

-			(object RoleView "$UNNAMED$11" @85

-			    Parent_View 	@81

-			    location   	(1362, 304)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398965BF00E8"

-			    client     	@81

-			    supplier   	@63

-			    line_style 	3

-			    origin_attachment 	(2946, 1104)

-			    terminal_attachment 	(2489, 1104))))

-		(object ClassView "Class" "Logical View::taglib::TldExtension" @86

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(271, 2221)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@86

-			location   	(32, 2140)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	478

-			justify    	0

-			label      	"TldExtension")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3ECD2A8D016F"

-		    width      	496

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$30" @87

-		    location   	(580, 2382)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2C970011"

-		    roleview_list 	(list RoleViews

-			(object RoleView "extensionElements" @88

-			    Parent_View 	@87

-			    location   	(309, 161)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @89

-				Parent_View 	@88

-				location   	(905, 2405)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	378

-				justify    	0

-				label      	"+extensionElements"

-				pctDist    	2.034346

-				height     	131

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2C9701CA"

-			    client     	@87

-			    supplier   	@30

-			    line_style 	0

-			    label      	(object SegLabel @90

-				Parent_View 	@88

-				location   	(641, 2470)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..*"

-				pctDist    	0.639913

-				height     	50

-				orientation 	1))

-			(object RoleView "$UNNAMED$31" @91

-			    Parent_View 	@87

-			    location   	(309, 161)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2C9701CC"

-			    client     	@87

-			    supplier   	@86

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$32" @92

-		    location   	(293, 1842)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2D5701DA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "functionExtensions" @93

-			    Parent_View 	@92

-			    location   	(-19, 427)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(194, 2021)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	371

-				justify    	0

-				label      	"+functionExtensions"

-				pctDist    	0.643493

-				height     	89

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2D58016D"

-			    client     	@92

-			    supplier   	@86

-			    line_style 	0

-			    label      	(object SegLabel @95

-				Parent_View 	@93

-				location   	(214, 2077)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.834111

-				height     	66

-				orientation 	1))

-			(object RoleView "$UNNAMED$33" @96

-			    Parent_View 	@92

-			    location   	(-19, 427)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2D580178"

-			    client     	@92

-			    supplier   	@40

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$34" @97

-		    location   	(684, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2E5403C8"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tagExtensions" @98

-			    Parent_View 	@97

-			    location   	(-1262, 592)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @99

-				Parent_View 	@98

-				location   	(484, 2226)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+tagExtensions"

-				pctDist    	1.022972

-				height     	1

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2E590072"

-			    client     	@97

-			    supplier   	@86

-			    vertices   	(list Points

-				(684, 832)

-				(684, 2225)

-				(519, 2225))

-			    line_style 	3

-			    origin_attachment 	(684, 832)

-			    terminal_attachment 	(519, 2225)

-			    label      	(object SegLabel @100

-				Parent_View 	@98

-				location   	(608, 2200)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.942839

-				height     	26

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @101

-			    Parent_View 	@97

-			    location   	(-1262, 592)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2E59007C"

-			    client     	@97

-			    supplier   	@31

-			    vertices   	(list Points

-				(684, 832)

-				(684, 216)

-				(1625, 216))

-			    line_style 	3

-			    origin_attachment 	(684, 832)

-			    terminal_attachment 	(1625, 216))))

-		(object ClassView "Class" "Logical View::taglib::TagLib" @102

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1228, 534)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@102

-			location   	(967, 300)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	522

-			justify    	0

-			label      	"TagLib")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@102

-			location   	(967, 250)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	522

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39A6BA5F00E8"

-		    compartment 	(object Compartment

-			Parent_View 	@102

-			location   	(967, 361)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	0)

-		    width      	540

-		    height     	592

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$8" @103

-		    location   	(1231, 895)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398964E80322"

-		    roleview_list 	(list RoleViews

-			(object RoleView "listeners" @104

-			    Parent_View 	@103

-			    location   	(527, 543)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @105

-				Parent_View 	@104

-				location   	(1350, 902)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	186

-				justify    	0

-				label      	"+listeners"

-				pctDist    	0.103448

-				height     	119

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398964E90279"

-			    client     	@103

-			    supplier   	@33

-			    line_style 	3

-			    origin_attachment 	(1231, 895)

-			    terminal_attachment 	(1231, 961)

-			    label      	(object SegLabel @106

-				Parent_View 	@104

-				location   	(1287, 941)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.712121

-				height     	56

-				orientation 	0))

-			(object RoleView "$UNNAMED$9" @107

-			    Parent_View 	@103

-			    location   	(527, 543)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @108

-				Parent_View 	@107

-				location   	(1190, 842)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	200

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398964E90283"

-			    client     	@103

-			    supplier   	@102

-			    line_style 	3

-			    origin_attachment 	(1231, 895)

-			    terminal_attachment 	(1231, 829))))

-		(object AssociationViewNew "$UNNAMED$24" @109

-		    location   	(503, 755)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E67B391027D"

-		    roleview_list 	(list RoleViews

-			(object RoleView "functions" @110

-			    Parent_View 	@109

-			    location   	(-725, 255)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @111

-				Parent_View 	@110

-				location   	(410, 1157)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+functions"

-				pctDist    	0.802444

-				height     	34

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B3920329"

-			    client     	@109

-			    supplier   	@40

-			    vertices   	(list Points

-				(503, 755)

-				(443, 755)

-				(443, 1272))

-			    line_style 	3

-			    origin_attachment 	(503, 755)

-			    terminal_attachment 	(443, 1272)

-			    label      	(object SegLabel @112

-				Parent_View 	@110

-				location   	(497, 1214)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$25" @113

-			    Parent_View 	@109

-			    location   	(-725, 255)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E67B392032B"

-			    client     	@109

-			    supplier   	@102

-			    line_style 	3

-			    origin_attachment 	(503, 755)

-			    terminal_attachment 	(958, 755))))

-		(object AssociationViewNew "$UNNAMED$2" @114

-		    location   	(869, 953)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"398962E3003A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "validator" @115

-			    Parent_View 	@114

-			    location   	(165, 601)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @116

-				Parent_View 	@115

-				location   	(751, 1126)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	183

-				justify    	0

-				label      	"+validator"

-				pctDist    	0.716763

-				height     	119

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398962E3033D"

-			    client     	@114

-			    supplier   	@47

-			    line_style 	3

-			    origin_attachment 	(869, 953)

-			    terminal_attachment 	(869, 1196)

-			    label      	(object SegLabel @117

-				Parent_View 	@115

-				location   	(953, 1147)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.803468

-				height     	84

-				orientation 	0))

-			(object RoleView "$UNNAMED$3" @118

-			    Parent_View 	@114

-			    location   	(165, 601)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"398962E30347"

-			    client     	@114

-			    supplier   	@102

-			    vertices   	(list Points

-				(869, 953)

-				(869, 799)

-				(958, 799))

-			    line_style 	3

-			    origin_attachment 	(869, 953)

-			    terminal_attachment 	(958, 799))))

-		(object AssociationViewNew "tag" @119

-		    location   	(1910, 518)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object SegLabel @120

-			Parent_View 	@119

-			location   	(1910, 459)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	TRUE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			anchor     	1

-			anchor_loc 	1

-			nlines     	1

-			max_width  	600

-			justify    	0

-			label      	"tag"

-			pctDist    	0.500000

-			height     	60

-			orientation 	0)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39A6BA5F0156"

-		    roleview_list 	(list RoleViews

-			(object RoleView "tags" @121

-			    Parent_View 	@119

-			    location   	(1638, -234)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @122

-				Parent_View 	@121

-				location   	(2059, 811)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	108

-				justify    	0

-				label      	"+tags"

-				pctDist    	0.898190

-				height     	72

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F0158"

-			    client     	@119

-			    supplier   	@63

-			    vertices   	(list Points

-				(1910, 518)

-				(1987, 518)

-				(1987, 853))

-			    line_style 	3

-			    origin_attachment 	(1910, 518)

-			    terminal_attachment 	(1987, 853)

-			    label      	(object SegLabel @123

-				Parent_View 	@121

-				location   	(1933, 815)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.907240

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$0" @124

-			    Parent_View 	@119

-			    location   	(1638, -234)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @125

-				Parent_View 	@124

-				location   	(1581, 477)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39A6BA5F0157"

-			    client     	@119

-			    supplier   	@102

-			    line_style 	3

-			    origin_attachment 	(1910, 518)

-			    terminal_attachment 	(1498, 518))))

-		(object AssociationViewNew "$UNNAMED$36" @126

-		    location   	(665, 1456)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3ECD2EE3003F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "taglibExtensions" @127

-			    Parent_View 	@126

-			    location   	(-563, 922)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @128

-				Parent_View 	@127

-				location   	(581, 2057)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	325

-				justify    	0

-				label      	"+taglibExtensions"

-				pctDist    	0.922742

-				height     	163

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2EE503D1"

-			    client     	@126

-			    supplier   	@86

-			    vertices   	(list Points

-				(665, 1456)

-				(665, 1781)

-				(418, 1781)

-				(418, 2128))

-			    line_style 	3

-			    origin_attachment 	(665, 1456)

-			    terminal_attachment 	(418, 2128)

-			    label      	(object SegLabel @129

-				Parent_View 	@127

-				location   	(380, 2069)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..*"

-				pctDist    	0.935800

-				height     	38

-				orientation 	1))

-			(object RoleView "$UNNAMED$37" @130

-			    Parent_View 	@126

-			    location   	(-563, 922)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3ECD2EE503DB"

-			    client     	@126

-			    supplier   	@102

-			    vertices   	(list Points

-				(665, 1456)

-				(665, 831)

-				(958, 831))

-			    line_style 	3

-			    origin_attachment 	(665, 1456)

-			    terminal_attachment 	(958, 831))))))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/tcg.pty b/plugins/org.eclipse.jst.j2ee.core/rose/tcg.pty
deleted file mode 100644
index 67523e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/tcg.pty
+++ /dev/null
@@ -1,590 +0,0 @@
-#
-# Copyright (c) 2001, International Business Machines Corporation. ALL RIGHTS RESERVED
-# Thin Client Generator (TCG) properties file
-#
-(object Petal version 42)
-
-(list Attribute_Set
-	(object Attribute
-		tool       	"TCG"
-		name       	"roseId"
-		value      	"837263636"
-	)
-	(object Attribute
-		tool       	"TCG"
-		name       	"propertyId"
-		value      	"984747394"
-	)
-	#
-	# Class properties
-	#	
-	(object Attribute
-		tool       	"TCG"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-			# A description to use when displaying this class' name on panels or within text.
-			(object Attribute
-				tool       	"TCG"
-				name       	"DisplayName"
-				value      	""
-			)
-			# A comma delimited list of user roles which this field is used by 
-			(object Attribute
-				tool       	"TCG"
-				name       	"AppliesToRoles"
-				value      	""
-			)
-			# A classification of user experience level which would use this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"UserExperienceLevel"
-				value      	("UserExpLevel_Set" 100)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"UserExpLevel_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"BASIC"
-						value      	100
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ADVANCED"
-						value      	101
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"EXPERT"
-						value      	102
-					)
-				)
-			)
-			# A description to use for the title of detail panels containing an object of this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdDetailPanelTitle"
-				value      	""
-			)
-			# Contains a comma-separated list of attribute id's in the order they should appear on the
-			# default detail panel for this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdDetailPanelFieldsInOrder"
-				value      	""
-			)
-			# A description to use for the title of collection panels containing elements of this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdCollectionPanelTitle"
-				value      	""
-			)
-			# Contains a comma-separated list of attribute id's in the order they should appear on the
-			# default collection panel for this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"StdCollectionPanelFieldsInOrder"
-				value      	""
-			)
-			# A string containing attribute name parameter slots which will be filled in with values from the attributes.
-			# Typically used to calculate a tree node description for an object.
-			(object Attribute
-				tool       	"TCG"
-				name       	"DescriptionPattern"
-				value      	""
-			)
-			# A uri to content which will be included just above the description area of the detail page for this class
-			(object Attribute
-				tool       	"TCG"
-				name       	"PreDescriptionIncludeURI"
-				value      	""
-			)
-			# A uri to content which will be included just above the form area of the detail page for this class
-			(object Attribute
-				tool       	"TCG"
-				name       	"PreFormIncludeURI"
-				value      	""
-			)
-			# A uri to content which will be included in the footer area of the detail page for this class
-			(object Attribute
-				tool       	"TCG"
-				name       	"FooterIncludeURI"
-				value      	""
-			)
-			# Whether views should be generated for this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"SkipViewGeneration"
-				value      	FALSE
-			)
-			# The icon file uri for small 16x16 icon representing this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"SmallIcon"
-				value      	""
-			)
-			# The icon file uri for large 32x32 icon representing this class.
-			(object Attribute
-				tool       	"TCG"
-				name       	"LargeIcon"
-				value      	""
-			)
-			# An alternate uri (absolute or relative to web app root) to include as the description in the 
-			# detail panel.
-			(object Attribute
-				tool       	"TCG"
-				name       	"AltDescriptionURI"
-				value      	""
-			)
-		)
-	)
-	#
-	# Class Attribute Properties
-	#
-	(object Attribute
-		tool       	"TCG"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-			# The label text to use when displaying this attribute (without ':')
-			(object Attribute
-				tool       	"TCG"
-				name       	"DisplayName"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IsRequired"
-				value      	TRUE
-			)
-			# A string which can be used to group this field with other fields with the same categoryId
-			(object Attribute
-				tool       	"TCG"
-				name       	"CategoryId"
-				value      	""
-			)
-			# A comma delimited list of user roles which this field is used by 
-			(object Attribute
-				tool       	"TCG"
-				name       	"AppliesToRoles"
-				value      	""
-			)
-			# A classification of user experience level which would use this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"UserExperienceLevel"
-				value      	("UserExpLevel_Set" 100)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"UserExpLevel_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"BASIC"
-						value      	100
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ADVANCED"
-						value      	101
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"EXPERT"
-						value      	102
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"FieldType"
-				value      	("FieldType_Set" 71)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"FieldType_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_FIELD"
-						value      	71
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_AREA"
-						value      	72
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"COMBO_BOX"
-						value      	73
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"LIST_BOX"
-						value      	74
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CHECK_BOX"
-						value      	75
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"OPTION"
-						value      	76
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_READ_ONLY"
-						value      	77
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CUSTOM"
-						value      	78
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"FILE"
-						value      	79
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"URI"
-						value      	80
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"PASSWORD"
-						value      	81
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"MaxLength"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"BooleanValueKind"
-				value      	("BooleanValueKind_Set" 91)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"BooleanValueKind_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TRUE_FALSE"
-						value      	91
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ENABLE_DISABLE"
-						value      	92
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"YES_NO"
-						value      	93
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ON_OFF"
-						value      	94
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ColumnWidthPercent"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"VisibleSize"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeActionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeJSPURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"AltDescriptionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMinValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMaxValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationPattern"
-				value      	""
-			)
-			# A text description of special validation requirements that apply to this field
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationReqs"
-				value      	""
-			)
-			# The validation class which implements the special validation requirements for this field.
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationClass"
-				value      	""
-			)
-		)
-	)
-	
-	#
-	# Role Properties
-	#
-	(object Attribute
-		tool       	"TCG"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-			# The label text to use when displaying this attribute (without ':')
-			(object Attribute
-				tool       	"TCG"
-				name       	"DisplayName"
-				value      	""
-			)
-			# Specifies that this field should not appear in any views
-			(object Attribute
-				tool       	"TCG"
-				name       	"SkipGeneration"
-				value      	FALSE
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IsRequired"
-				value      	TRUE
-			)
-			# Whether or not to show this field in the tree if it is a composite field with card 0..1 or 1
-			# When FALSE, the code generator should embed the detail page of the contained type within
-			# the detail page of the container type.
-			(object Attribute
-				tool       	"TCG"
-				name       	"ShowCompositeInTree"
-				value      	TRUE
-			)
-			# When TRUE, the code generator should embed the collection page of the contained types within
-			# the properties page of the detail page of the container type.
-			(object Attribute
-				tool       	"TCG"
-				name       	"ShowAsPropertiesPage"
-				value      	FALSE
-			)
-			# A comma delimited list of user roles which this field is used by 
-			(object Attribute
-				tool       	"TCG"
-				name       	"AppliesToRoles"
-				value      	""
-			)
-			# A classification of user experience level which would use this type
-			(object Attribute
-				tool       	"TCG"
-				name       	"UserExperienceLevel"
-				value      	("UserExpLevel_Set" 100)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"UserExpLevel_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"BASIC"
-						value      	100
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ADVANCED"
-						value      	101
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"EXPERT"
-						value      	102
-					)
-				)
-			)
-			# A string which can be used to group this field with other fields with the same categoryId
-			(object Attribute
-				tool       	"TCG"
-				name       	"CategoryId"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"FieldType"
-				value      	("FieldType_Set" 71)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"FieldType_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_FIELD"
-						value      	71
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_AREA"
-						value      	72
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"COMBO_BOX"
-						value      	73
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"LIST_BOX"
-						value      	74
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CHECK_BOX"
-						value      	75
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"OPTION"
-						value      	76
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"TEXT_READ_ONLY"
-						value      	77
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"CUSTOM"
-						value      	78
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"FILE"
-						value      	79
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"URI"
-						value      	80
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"PASSWORD"
-						value      	81
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"MaxLength"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"BooleanValueKind"
-				value      	("BooleanValueKind_Set" 91)
-			)
-			(object Attribute
-				tool		"TCG"
-				name		"BooleanValueKind_Set"
-				value		(list Attribute_Set
-					(object Attribute
-						tool       	"TCG"
-						name       	"TRUE_FALSE"
-						value      	91
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ENABLE_DISABLE"
-						value      	92
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"YES_NO"
-						value      	93
-					)
-					(object Attribute
-						tool       	"TCG"
-						name       	"ON_OFF"
-						value      	94
-					)
-				)
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ColumnWidthPercent"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"VisibleSize"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeActionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"IncludeJSPURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"AltDescriptionURI"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMinValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationMaxValue"
-				value      	""
-			)
-			(object Attribute
-				tool       	"TCG"
-				name       	"ValidationPattern"
-				value      	""
-			)
-			# A text description of special validation requirements that apply to this field
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationReqs"
-				value      	""
-			)
-			# The validation class which implements the special validation requirements for this field.
-			(object Attribute
-				tool       	"TCG"
-				name       	"SpecialValidationClass"
-				value      	""
-			)
-		)
-	)
-)
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.cat b/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.cat
deleted file mode 100644
index 9f732d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.cat
+++ /dev/null
@@ -1,10347 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "webapplication"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "webapplication.xmi"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Webapplication")))

-    quid       	"38C076D603DD"

-    visible_categories 	(list visibility_relationship_list

-	(object Visibility_Relationship

-	    quid       	"38FF3C150151"

-	    supplier   	"Logical View::common"

-	    quidu      	"38C08F0F038D"))

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "WebApp"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C077FB0352"

-	    documentation 	

-|The web-app element is the root of the deployment descriptor for

-|a web application.

-	    

-	    stereotype 	"component"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3E4D55CA03E2"

-		    supplier   	"Logical View::common::JNDIEnvRefsGroup"

-		    quidu      	"3E4D53950349"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "distributable"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C0782D0231"

-		    documentation 	"The distributable element, by its presence in a web application deployment descriptor, indicates that this web application is programmed appropriately to be deployed into a distributed servlet container"

-		    type       	"boolean"

-		    exportControl 	"Public")

-		(object ClassAttribute "version"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Final"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Volatile"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Transient"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"IndividualChangeMgt"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"GenerateFullyQualifiedTypes"

-			    value      	FALSE)

-			(object Attribute

-			    tool       	"Java"

-			    name       	"PropertyType"

-			    value      	("BeanProperty_Set" 71))

-			(object Attribute

-			    tool       	"Java"

-			    name       	"Read/Write"

-			    value      	("Read/Write_Set" 81)))

-		    quid       	"3E4D57C20179"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ContextParam"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C078B602A6"

-	    documentation 	

-|@since J2EE1.4 deprecated

-|The context-param element contains the declaration of a web application's servlet context initialization parameters.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "paramName"

-		    quid       	"38C078C602F0"

-		    documentation 	

-|@deprecated

-|The param-name element contains the name of a parameter.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "paramValue"

-		    quid       	"38C078DB039A"

-		    documentation 	

-|@deprecated

-|The param-value element contains the value of a parameter.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38C078EA0319"

-		    documentation 	"@deprecated"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "Servlet"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C079140251"

-	    documentation 	"The servlet element contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup element is present, then the JSP should be precompiled and loaded."

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B1040300"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "servletName"

-		    quid       	"38C079300067"

-		    documentation 	"The servlet-name element contains the canonical name of the servlet."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "loadOnStartup"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C079550147"

-		    documentation 	

-|The load-on-startup element indicates that this servlet should be loaded on the startup of the web application. The optional contents of these element must be a positive integer indicating the order in which the servlet should be loaded. Lower integers are loaded before higher integers. If no value is specified, or if the value specified is not a positive integer, the container is free to load it at any time in the startup sequence.

-|

-		    

-		    stereotype 	"0..1"

-		    type       	"Integer"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ServletMapping"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C079BD02B9"

-	    documentation 	"The servlet-mapping element defines a mapping between a servlet and a url pattern"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"38C079DD0391"

-		    documentation 	"The url-pattern element contains the url pattern of the mapping. Must follow the rules specified in Section 10 of the Servlet API Specification."

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "name"

-		    quid       	"3E67C27A00D7"

-		    documentation 	

-|@since J2EE1.4

-|The servlet-name element contains the canonical name of the

-|servlet. Each servlet name is unique within the web

-|application.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SessionConfig"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07A5301BD"

-	    documentation 	"The session-config element defines the session parameters for this web application."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "sessionTimeout"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C07A5B0205"

-		    documentation 	

-|The session-timeout element defines the default

-|        session timeout interval for all sessions created

-|        in this web application. The specified timeout

-|        must be expressed in a whole number of minutes.

-|        If the timeout is 0 or less, the container ensures

-|        the default behaviour of sessions is never to time

-|        out. If this element is not specified, the container

-|        must set its default timeout period.

-		    

-		    type       	"int"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "MimeMapping"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07A7500FE"

-	    documentation 	

-|The mime-mapping element defines a mapping between an extension and a mime type.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "extension"

-		    quid       	"38C07A830017"

-		    documentation 	

-|The extension element contains a string describing an extension. example: "txt"

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "mimeType"

-		    quid       	"38C07A8C01BF"

-		    documentation 	

-|The mime-type element contains a defined mime type. example: "text/plain"

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WelcomeFileList"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07AAD01A8"

-	    documentation 	"The welcome-file-list contains an ordered list of welcome files elements."

-	    language   	"Java")

-	(object Class "ErrorPage"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07ACF03E2"

-	    documentation 	"The error-page element contains a mapping between an error code or exception type to the path of a resource in the web application"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "location"

-		    quid       	"38C07AEB02AC"

-		    documentation 	"The location element contains the location of the resource in the web application"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "TagLibRef"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07B3002E7"

-	    documentation 	

-|@since J2EE1.4 deprecated, becomes jsp::TagLibRef

-|The taglib element is used to describe a JSP tag library.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "taglibURI"

-		    quid       	"38C07B3700A2"

-		    documentation 	

-|@deprecated See jsp::TagLibRef

-|

-|The taglib-uri element describes a URI, relative to the location of the web.xml document, identifying a Tag Library used in the Web Application.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "taglibLocation"

-		    quid       	"38C07B4B0318"

-		    documentation 	

-|@deprecated See jsp::TagLibRef

-|

-|The taglib-location element contains the location (as a resource relative to the root of the web application) where to find the Tag Libary Description file for the tag library.

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SecurityConstraint"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07B6A02AE"

-	    documentation 	"The security-constraint element is used to associate security constraints with one or more web resource collections"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "displayName"

-		    quid       	"3E89D7E8012D"

-		    documentation 	"@since J2EE1.4 deprecated, becomes displayNames"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WebResourceCollection"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07B8703AB"

-	    documentation 	

-|The web-resource-collection element is used to identify a subset of the resources and HTTP methods on those resources within a web application to which a security constraint applies. If no HTTP methods are specified, then the security constraint applies to all HTTP methods.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "webResourceName"

-		    quid       	"38C07BA303D3"

-		    documentation 	"The web-resource-name contains the name of this web resource collection"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38C07BB80152"

-		    documentation 	"@since J2EE1.4 deprecated, becomes descriptions"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "urlPattern"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnique"

-			    value      	FALSE))

-		    quid       	"3E4D51EA0345"

-		    documentation 	"@since J2EE1.4"

-		    stereotype 	"1..*"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "httpMethod"

-		    quid       	"3E4D52020123"

-		    documentation 	"@since J2EE1.4"

-		    stereotype 	"0..*"

-		    type       	"HTTPMethodTypeEnum"

-		    quidu      	"38C0A2E200C6"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "AuthConstraint"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07C8001A0"

-	    documentation 	

-|The auth-constraintType indicates the user roles that

-|should be permitted access to this resource

-|collection. The role-name used here must either correspond

-|to the role-name of one of the security-role elements

-|defined for this web application, or be the specially

-|reserved role-name "*" that is a compact syntax for

-|indicating all roles in the web application. If both "*"

-|and rolenames appear, the container interprets this as all

-|roles.  If no roles are defined, no user is allowed access

-|to the portion of the web application described by the

-|containing security-constraint.  The container matches

-|role names case sensitively when determining access.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"38C07C9703B6"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

-|A description of the auth constraint.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "roles"

-		    quid       	"39C7AA9403D9"

-		    documentation 	

-|A list of role names for the auth constraint.  Each element specifies the name of a security role (a String).

-|

-		    

-		    stereotype 	"0..*"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "UserDataConstraint"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07CB800B0"

-	    documentation 	"The user-data-constraint element is used to indicate how data communicated between the client and container should be protected"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "description"

-		    quid       	"38C07CC6002E"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes descriptions

-|A description for the user data constraint.

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "transportGuarantee"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C07CD8035F"

-		    documentation 	

-|The transport-guarantee element specifies that the communication between client and server should be NONE, INTEGRAL, or CONFIDENTIAL. NONE means that the application does not require any

-|transport guarantees. A value of INTEGRAL means that the application requires that the data sent between the client and server be sent in such a way that it can't be changed in transit. CONFIDENTIAL means that the application requires that the data be transmitted in a fashion that prevents other entities from observing the contents of the transmission. In most cases, the presence of the INTEGRAL or CONFIDENTIAL flag will indicate that the use of SSL is required.

-		    

-		    type       	"TransportGuaranteeType"

-		    quidu      	"390461A9018F"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "LoginConfig"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07D0F006F"

-	    documentation 	

-|The login-config element is used to configure the authentication method that should be used, the realm name that should be used for this application, and the attributes that are needed by the form login

-|mechanism.

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "authMethod"

-		    attributes 	(list Attribute_Set

-			(object Attribute

-			    tool       	"Ecore"

-			    name       	"isUnsettable"

-			    value      	TRUE))

-		    quid       	"38C07D170066"

-		    documentation 	

-|@since J2EE1.4  deprecated, becomes initParamValues

-|

-|

-|The auth-method element is used to configure the authentication mechanism for the web application. As a prerequisite to gaining access to any web resources which are protected by an authorization constraint, a user must have authenticated using the configured mechanism. Legal values for this element are "BASIC", "DIGEST", "FORM", or "CLIENT-CERT".

-		    

-		    type       	"AuthMethodKind"

-		    quidu      	"3EE0A2D8029A"

-		    exportControl 	"Public")

-		(object ClassAttribute "realmName"

-		    quid       	"38C07D26034D"

-		    documentation 	"The realm name element specifies the realm name to use in HTTP Basic authorization"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "authorizationMethod"

-		    quid       	"3EE0A4300014"

-		    documentation 	"@since J2EE1.4"

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "FormLoginConfig"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C07D390296"

-	    documentation 	"The form-login-config element specifies the login and error pages that should be used in form based login. If form based authentication is not used, these elements are ignored."

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "formLoginPage"

-		    quid       	"38C07D44017A"

-		    documentation 	"The form-login-page element defines the location in the web app where the page that can be used for login can be found"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "formErrorPage"

-		    quid       	"38C07D570235"

-		    documentation 	"The form-error-page element defines the location in the web app where the error page that is displayed when login is not successful can be found"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "InitParam"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C08E9D0325"

-	    documentation 	

-|@since J2EE1.4 deprecated

-|The init-param element contains a name/value pair as an initialization param of the servlet

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "paramName"

-		    quid       	"38C08EB30330"

-		    documentation 	

-|@deprecated

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "paramValue"

-		    quid       	"38C08EC70221"

-		    documentation 	"@deprecated"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"38C08ED901D7"

-		    documentation 	"@deprecated"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "ResAuthServletType"

-	    quid       	"38C09EEA0265"

-	    documentation 	

-|CONTAINER=0

-|SERVLET=1

-|

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "CONTAINER"

-		    quid       	"399301960226"

-		    exportControl 	"Public")

-		(object ClassAttribute "SERVLET"

-		    quid       	"39930198000C"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WebType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C0A1F70294"

-	    language   	"Java"

-	    abstract   	TRUE)

-	(object Class "ServletType"

-	    quid       	"38C0A2320311"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"38C0A28C02AD"

-		    supplier   	"Logical View::webapplication::WebType"

-		    quidu      	"38C0A1F70294"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "className"

-		    quid       	"3904604200D5"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "JSPType"

-	    quid       	"38C0A2640273"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"38C0A2900258"

-		    supplier   	"Logical View::webapplication::WebType"

-		    quidu      	"38C0A1F70294"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "jspFile"

-		    quid       	"38C0A2760355"

-		    documentation 	

-|The jsp-file element contains the full path to a JSP file within the web application.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "URLPatternType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C0A2C50042"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"38C0A2CF0136"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "HTTPMethodTypeEnum"

-	    quid       	"38C0A2E200C6"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "GET"

-		    quid       	"38C0A2FC004B"

-		    documentation 	"The http-method contains an HTTP method (GET | POST |...)"

-		    exportControl 	"Public")

-		(object ClassAttribute "POST"

-		    quid       	"3E4D52380134"

-		    exportControl 	"Public")

-		(object ClassAttribute "PUT"

-		    quid       	"3E4D52390352"

-		    exportControl 	"Public")

-		(object ClassAttribute "DELETE"

-		    quid       	"3E4D523B00DE"

-		    exportControl 	"Public")

-		(object ClassAttribute "HEAD"

-		    quid       	"3E4D523C0393"

-		    exportControl 	"Public")

-		(object ClassAttribute "OPTIONS"

-		    quid       	"3E4D523F0012"

-		    exportControl 	"Public")

-		(object ClassAttribute "TRACE"

-		    quid       	"3E4D524001CC"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "RoleNameType"

-	    quid       	"38C0A3400139"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "roleName"

-		    quid       	"38C0A347003F"

-		    type       	"String"))

-	    language   	"Java")

-	(object Class "WelcomeFile"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"38C0A5A800E9"

-	    documentation 	

-|The welcome-file element contains file name to use as a default welcome file, such as index.html

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "welcomeFile"

-		    quid       	"38C0A5B1016E"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "TransportGuaranteeType"

-	    quid       	"390461A9018F"

-	    documentation 	

-|NONE=1

-|INTEGRAL=2

-|CONFIDENTIAL=3

-	    

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "NONE"

-		    quid       	"399301820214"

-		    exportControl 	"Public")

-		(object ClassAttribute "INTEGRAL"

-		    quid       	"39930183032D"

-		    exportControl 	"Public")

-		(object ClassAttribute "CONFIDENTIAL"

-		    quid       	"3993018E00E4"

-		    exportControl 	"Public")))

-	(object Class "ExceptionTypeErrorPage"

-	    quid       	"39883E110154"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39883E3A0058"

-		    supplier   	"Logical View::webapplication::ErrorPage"

-		    quidu      	"38C07ACF03E2")))

-	(object Class "ErrorCodeErrorPage"

-	    quid       	"39883E6C0209"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"39883E9400A8"

-		    supplier   	"Logical View::webapplication::ErrorPage"

-		    quidu      	"38C07ACF03E2"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "errorCode"

-		    quid       	"39883E8202AB"

-		    documentation 	

-|The error-code contains an HTTP error code, ex: 404

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "FilterMapping"

-	    quid       	"39BFB14C03DD"

-	    documentation 	

-|Declaration of the filter mappings in this web application. The container uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. The container matches the request URI to a Servlet in the normal way. To determine which filters to apply it matches filter-mapping declarations either on servlet-name, or on url-pattern for each filter-mapping element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping elements.The filter-name value must be the value of the <filtername> sub-elements of one of the <filter> declarations in the deployment descriptor.

-|

-|@invariant The filter-name value must be the value of the Filter::name of one of the Filter declarations in the deployment descriptor.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "urlPattern"

-		    quid       	"39BFB1890236"

-		    documentation 	"The url-pattern element contains the url pattern of the mapping. Must follow the rules specified in Section 10 of the Servlet API Specification."

-		    stereotype 	"0..1"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "dispatcherType"

-		    quid       	"3E4D447E0376"

-		    stereotype 	"0..4"

-		    type       	"DispatcherType"

-		    quidu      	"3E4D445B0376"

-		    exportControl 	"Public")))

-	(object Class "Filter"

-	    quid       	"39BFB15503CC"

-	    documentation 	

-|Declares a filter in the web application application. The filter is mapped to either a servlet or a URL pattern in the filter-mapping element, using the filter-name value to reference. Filters can access the initialization parameters declared in the deployment descriptor at runtime via the FilterConfig interface.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B08E0379"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "name"

-		    quid       	"39BFB1BC032A"

-		    documentation 	"The logical name of the filter. This name is used to map the filter."

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "DispatcherType"

-	    quid       	"3E4D445B0376"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "FORWARD"

-		    quid       	"3E4D446400BC"

-		    exportControl 	"Public")

-		(object ClassAttribute "INCLUDE"

-		    quid       	"3E4D446703A5"

-		    exportControl 	"Public")

-		(object ClassAttribute "REQUEST"

-		    quid       	"3E4D446902AE"

-		    exportControl 	"Public")

-		(object ClassAttribute "ERROR"

-		    quid       	"3E4D446B0152"

-		    exportControl 	"Public")))

-	(object Class "LocalEncodingMappingList"

-	    quid       	"3E4D56DA023E")

-	(object Class "LocalEncodingMapping"

-	    quid       	"3E4D56F20170"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "locale"

-		    quid       	"3E4D570501F0"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "encoding"

-		    quid       	"3E4D57080276"

-		    type       	"String"

-		    exportControl 	"Public")))

-	(object Class "HTTPMethodType"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E930B050065"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "httpMethod"

-		    quid       	"3E930B050066"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "AuthMethodKind"

-	    quid       	"3EE0A2D8029A"

-	    stereotype 	"enumeration"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "UNSPECIFIED"

-		    quid       	"3EE0A2FE037B"

-		    exportControl 	"Public")

-		(object ClassAttribute "BASIC"

-		    quid       	"3EE0A30F033A"

-		    exportControl 	"Public")

-		(object ClassAttribute "DIGEST"

-		    quid       	"3EE0A313023B"

-		    exportControl 	"Public")

-		(object ClassAttribute "FORM"

-		    quid       	"3EE0A31801F2"

-		    exportControl 	"Public")

-		(object ClassAttribute "CLIENT_CERT"

-		    quid       	"3EE0A31A0390"

-		    exportControl 	"Public")))

-	(object Association "$UNNAMED$0"

-	    quid       	"38C11CE60213"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CE8000D"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "contexts"

-		    quid       	"38C11CE8000E"

-		    documentation 	"@deprecated see contextParams"

-		    label      	"contexts"

-		    supplier   	"Logical View::webapplication::ContextParam"

-		    quidu      	"38C078B602A6"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$1"

-	    quid       	"38C11CF301A3"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CF4026D"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "errorPages"

-		    quid       	"38C11CF40277"

-		    label      	"errorPages"

-		    supplier   	"Logical View::webapplication::ErrorPage"

-		    quidu      	"38C07ACF03E2"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"38C11CF7034E"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CF803B3"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "fileList"

-		    quid       	"38C11CF803B4"

-		    label      	"fileList"

-		    supplier   	"Logical View::webapplication::WelcomeFileList"

-		    quidu      	"38C07AAD01A8"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$3"

-	    quid       	"38C11CFB0281"

-	    documentation 	"@since J2EE14 deprecated, replaced by tagLibRefs"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11CFD00A3"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "tagLibs"

-		    quid       	"38C11CFD00A4"

-		    documentation 	

-|@deprecated See jsp::TagLibRef

-|

-		    

-		    label      	"tagLibs"

-		    supplier   	"Logical View::webapplication::TagLibRef"

-		    quidu      	"38C07B3002E7"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"38C11D000134"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D01018F"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "constraints"

-		    quid       	"38C11D010199"

-		    label      	"constraints"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Constraints 	"ordered"

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$5"

-	    quid       	"38C11D110188"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D120067"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "loginConfig"

-		    quid       	"38C11D120071"

-		    label      	"loginConfig"

-		    supplier   	"Logical View::webapplication::LoginConfig"

-		    quidu      	"38C07D0F006F"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"38C11D1501C0"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D17023B"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "mimeMappings"

-		    quid       	"38C11D170245"

-		    label      	"mimeMappings"

-		    supplier   	"Logical View::webapplication::MimeMapping"

-		    quidu      	"38C07A7500FE"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$7"

-	    quid       	"38C11D1B0327"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D1C01F2"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "sessionConfig"

-		    quid       	"38C11D1C01F3"

-		    label      	"sessionConfig"

-		    supplier   	"Logical View::webapplication::SessionConfig"

-		    quidu      	"38C07A5301BD"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"38C11D1F02AB"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D200298"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "servletMappings"

-		    quid       	"38C11D2002A2"

-		    label      	"servletMappings"

-		    supplier   	"Logical View::webapplication::ServletMapping"

-		    quidu      	"38C079BD02B9"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$9"

-	    quid       	"38C11D230120"

-	    roles      	(list role_list

-		(object Role "webApp"

-		    quid       	"38C11D2402DA"

-		    label      	"webApp"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "servlets"

-		    quid       	"38C11D2402E4"

-		    label      	"servlets"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"38C11D2701DA"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$11"

-		    quid       	"38C11D2802C2"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "securityRoles"

-		    quid       	"38C11D2802CC"

-		    label      	"securityRoles"

-		    supplier   	"Logical View::common::SecurityRole"

-		    quidu      	"38C031FE012D"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"38C121ED02D6"

-	    roles      	(list role_list

-		(object Role "secConstraint"

-		    quid       	"38C121EE01E7"

-		    label      	"secConstraint"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "webResourceCollections"

-		    quid       	"38C121EE01F1"

-		    label      	"webResourceCollections"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$13"

-	    quid       	"38C121F200E9"

-	    roles      	(list role_list

-		(object Role "secConstraint"

-		    quid       	"38C121F3039D"

-		    label      	"secConstraint"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "authConstraint"

-		    quid       	"38C121F303A7"

-		    label      	"authConstraint"

-		    supplier   	"Logical View::webapplication::AuthConstraint"

-		    quidu      	"38C07C8001A0"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"38C121F70208"

-	    roles      	(list role_list

-		(object Role "secConstraint"

-		    quid       	"38C121F801EC"

-		    label      	"secConstraint"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "userDataConstraint"

-		    quid       	"38C121F801ED"

-		    label      	"userDataConstraint"

-		    supplier   	"Logical View::webapplication::UserDataConstraint"

-		    quidu      	"38C07CB800B0"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$15"

-	    quid       	"38C122AC014A"

-	    roles      	(list role_list

-		(object Role "servlet"

-		    quid       	"38C122AD0001"

-		    label      	"servlet"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_aggregate 	TRUE)

-		(object Role "webType"

-		    quid       	"38C122AD0015"

-		    label      	"webType"

-		    supplier   	"Logical View::webapplication::WebType"

-		    quidu      	"38C0A1F70294"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"38C122B501BB"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$17"

-		    quid       	"38C122B60145"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE)

-		(object Role "params"

-		    quid       	"38C122B60159"

-		    documentation 	"@since J2EE1.4 deprecated, becomes initParams"

-		    label      	"params"

-		    supplier   	"Logical View::webapplication::InitParam"

-		    quidu      	"38C08E9D0325"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"38C122C00199"

-	    roles      	(list role_list

-		(object Role "$UNNAMED$19"

-		    quid       	"38C122C1028B"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    is_aggregate 	TRUE)

-		(object Role "securityRoleRefs"

-		    quid       	"38C122C1029F"

-		    label      	"securityRoleRefs"

-		    supplier   	"Logical View::common::SecurityRoleRef"

-		    quidu      	"371BC7A0025C"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"38C123AF02C4"

-	    roles      	(list role_list

-		(object Role "fileList"

-		    quid       	"38C123B30111"

-		    label      	"fileList"

-		    supplier   	"Logical View::webapplication::WelcomeFileList"

-		    quidu      	"38C07AAD01A8"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "file"

-		    quid       	"38C123B3011B"

-		    label      	"file"

-		    supplier   	"Logical View::webapplication::WelcomeFile"

-		    quidu      	"38C0A5A800E9"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$21"

-	    quid       	"38C124090179"

-	    roles      	(list role_list

-		(object Role "resCollection"

-		    quid       	"38C1240A0256"

-		    label      	"resCollection"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "URLs"

-		    quid       	"38C1240A0260"

-		    documentation 	"@since J2EE1.4 deprecated, becomes urlPattern"

-		    label      	"URLs"

-		    supplier   	"Logical View::webapplication::URLPatternType"

-		    quidu      	"38C0A2C50042"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"38C1248900BE"

-	    roles      	(list role_list

-		(object Role "loginConfig"

-		    quid       	"38C124890303"

-		    label      	"loginConfig"

-		    supplier   	"Logical View::webapplication::LoginConfig"

-		    quidu      	"38C07D0F006F"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_navigable 	TRUE

-		    is_aggregate 	TRUE)

-		(object Role "formLoginConfig"

-		    quid       	"38C12489030D"

-		    label      	"formLoginConfig"

-		    supplier   	"Logical View::webapplication::FormLoginConfig"

-		    quidu      	"38C07D390296"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)))

-	(object Association "$UNNAMED$23"

-	    quid       	"39045E720204"

-	    roles      	(list role_list

-		(object Role "exceptionType"

-		    quid       	"39045E730364"

-		    documentation 	"The exception type contains a fully qualified class name of a Java exception type."

-		    label      	"exceptionType"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "errorPage"

-		    quid       	"39045E7401C1"

-		    label      	"errorPage"

-		    supplier   	"Logical View::webapplication::ExceptionTypeErrorPage"

-		    quidu      	"39883E110154"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"390460AA0189"

-	    roles      	(list role_list

-		(object Role "servlet"

-		    quid       	"390460AB0234"

-		    label      	"servlet"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"390460AB02B6"

-		    supplier   	"Logical View::webapplication::ServletMapping"

-		    quidu      	"38C079BD02B9")))

-	(object Association "$UNNAMED$26"

-	    quid       	"39BFB3B101CC"

-	    roles      	(list role_list

-		(object Role "filters"

-		    quid       	"39BFB3B20123"

-		    label      	"filters"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"39BFB3B2012D"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"39BFB4150298"

-	    roles      	(list role_list

-		(object Role "filterMappings"

-		    quid       	"39BFB4160127"

-		    documentation 	"Filter mappings defined for the web app"

-		    label      	"filterMappings"

-		    supplier   	"Logical View::webapplication::FilterMapping"

-		    quidu      	"39BFB14C03DD"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"39BFB4160128"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"39BFB54D01EC"

-	    roles      	(list role_list

-		(object Role "listeners"

-		    quid       	"39BFB54E0215"

-		    documentation 	"The listeners collection contains deployment properties for a web application listener beans in the web app."

-		    label      	"listeners"

-		    supplier   	"Logical View::common::Listener"

-		    quidu      	"39BFB26001BD"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"39BFB54E0220"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"39C0026E02D1"

-	    roles      	(list role_list

-		(object Role "initParams"

-		    quid       	"39C0026F0160"

-		    documentation 	

-|@since J2EE1.4 deprecated, becomes initParamValues

-|The init-params contain a name/value pairs as initialization params for the filter

-|

-		    

-		    label      	"initParams"

-		    supplier   	"Logical View::webapplication::InitParam"

-		    quidu      	"38C08E9D0325"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"39C0026F016A"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"39C0056A0293"

-	    roles      	(list role_list

-		(object Role "filter"

-		    quid       	"39C0056B0321"

-		    documentation 	"The filter being mapped"

-		    label      	"filter"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"39C0056B032B"

-		    supplier   	"Logical View::webapplication::FilterMapping"

-		    quidu      	"39BFB14C03DD"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$36"

-	    quid       	"39C005BB00B9"

-	    roles      	(list role_list

-		(object Role "servlet"

-		    quid       	"39C005BC004D"

-		    documentation 	"An optional servlet that is mapped by a filter mapping.  servletName is used to resolve the servlet reference."

-		    label      	"servlet"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Reference"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$37"

-		    quid       	"39C005BC0061"

-		    supplier   	"Logical View::webapplication::FilterMapping"

-		    quidu      	"39BFB14C03DD"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$38"

-	    quid       	"39C03C280356"

-	    roles      	(list role_list

-		(object Role "filterClass"

-		    quid       	"39C03C290267"

-		    documentation 	"The fully qualified classname of the filter."

-		    label      	"filterClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$39"

-		    quid       	"39C03C29028F"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$40"

-	    quid       	"39C03E6C035A"

-	    roles      	(list role_list

-		(object Role "listenerClass"

-		    quid       	"39C03E6D02A7"

-		    documentation 	"The listener-class element declares a class in the application must be registered as a web application listener bean."

-		    label      	"listenerClass"

-		    supplier   	"Logical View::java::JavaClass"

-		    quidu      	"36549FCC00FA"

-		    client_cardinality 	(value cardinality "1")

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$41"

-		    quid       	"39C03E6D02CF"

-		    supplier   	"Logical View::common::Listener"

-		    quidu      	"39BFB26001BD"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$42"

-	    quid       	"39982A2E0255"

-	    roles      	(list role_list

-		(object Role "runAs"

-		    quid       	"39982A2F0184"

-		    documentation 	"If defined for a servlet, overrides the security identity used to call an EJB by that servlet in this web application. The role-name is one of the security roles already defined for this web application."

-		    label      	"runAs"

-		    supplier   	"Logical View::common::RunAsSpecifiedIdentity"

-		    quidu      	"39BF2C9E02C8"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$43"

-		    quid       	"39982A2F018E"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$44"

-	    quid       	"3E4D42CA027F"

-	    roles      	(list role_list

-		(object Role "contextParams"

-		    quid       	"3E4D42CB0118"

-		    label      	"contextParams"

-		    supplier   	"Logical View::common::ParamValue"

-		    quidu      	"3E4C221202C1"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$45"

-		    quid       	"3E4D42CB0122"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$46"

-	    quid       	"3E4D43AA000A"

-	    roles      	(list role_list

-		(object Role "initParamValues"

-		    quid       	"3E4D43AA0245"

-		    documentation 	

-|@since J2EE1.4

-|The init-param element contains a name/value pair as

-|        an initialization param of a servlet filter

-		    

-		    label      	"initParamValues"

-		    supplier   	"Logical View::common::ParamValue"

-		    quidu      	"3E4C221202C1"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$47"

-		    quid       	"3E4D43AA024F"

-		    supplier   	"Logical View::webapplication::Filter"

-		    quidu      	"39BFB15503CC"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$48"

-	    quid       	"3E4D46E70387"

-	    roles      	(list role_list

-		(object Role "initParams"

-		    quid       	"3E4D46E90005"

-		    label      	"initParams"

-		    supplier   	"Logical View::common::ParamValue"

-		    quidu      	"3E4C221202C1"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$49"

-		    quid       	"3E4D46E90019"

-		    supplier   	"Logical View::webapplication::Servlet"

-		    quidu      	"38C079140251"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$50"

-	    quid       	"3E4D4BFF01C0"

-	    roles      	(list role_list

-		(object Role "jspConfig"

-		    quid       	"3E4D4C000225"

-		    label      	"jspConfig"

-		    supplier   	"Logical View::jsp::JSPConfig"

-		    quidu      	"3E4D4A3A01C8"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$51"

-		    quid       	"3E4D4C000227"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$52"

-	    quid       	"3E4D51010264"

-	    roles      	(list role_list

-		(object Role "displayNames"

-		    quid       	"3E4D5102025B"

-		    label      	"displayNames"

-		    supplier   	"Logical View::common::DisplayName"

-		    quidu      	"3E4A9922000E"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$53"

-		    quid       	"3E4D51020265"

-		    supplier   	"Logical View::webapplication::SecurityConstraint"

-		    quidu      	"38C07B6A02AE"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$54"

-	    quid       	"3E4D56A50224"

-	    roles      	(list role_list

-		(object Role "messageDestinations"

-		    quid       	"3E4D56A60257"

-		    label      	"messageDestinations"

-		    supplier   	"Logical View::common::MessageDestination"

-		    quidu      	"3E4C211001CF"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$55"

-		    quid       	"3E4D56A60261"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$56"

-	    quid       	"3E4D57140378"

-	    roles      	(list role_list

-		(object Role "localEncodingMappings"

-		    quid       	"3E4D57150135"

-		    label      	"localEncodingMappings"

-		    supplier   	"Logical View::webapplication::LocalEncodingMapping"

-		    quidu      	"3E4D56F20170"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$57"

-		    quid       	"3E4D5715013F"

-		    supplier   	"Logical View::webapplication::LocalEncodingMappingList"

-		    quidu      	"3E4D56DA023E"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$58"

-	    quid       	"3E4D572C0083"

-	    roles      	(list role_list

-		(object Role "localEncodingMappingList"

-		    quid       	"3E4D572C02DC"

-		    label      	"localEncodingMappingList"

-		    supplier   	"Logical View::webapplication::LocalEncodingMappingList"

-		    quidu      	"3E4D56DA023E"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$59"

-		    quid       	"3E4D572C02DE"

-		    supplier   	"Logical View::webapplication::WebApp"

-		    quidu      	"38C077FB0352"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$60"

-	    quid       	"3E4D515001BD"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D515101BE"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$61"

-		    quid       	"3E4D515101DC"

-		    supplier   	"Logical View::webapplication::UserDataConstraint"

-		    quidu      	"38C07CB800B0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$62"

-	    quid       	"3E4D514D0317"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D514E0106"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$63"

-		    quid       	"3E4D514E0124"

-		    supplier   	"Logical View::webapplication::AuthConstraint"

-		    quidu      	"38C07C8001A0"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$64"

-	    quid       	"3E4D514B0089"

-	    roles      	(list role_list

-		(object Role "descriptions"

-		    quid       	"3E4D514B03AA"

-		    documentation 	"@since J2EE1.4"

-		    label      	"descriptions"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$65"

-		    quid       	"3E4D514B03C8"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$66"

-	    quid       	"3E930B11030B"

-	    roles      	(list role_list

-		(object Role "HTTPs"

-		    quid       	"3E930B1200DC"

-		    documentation 	"@since J2EE1.4 deprecated, becomes httpMethod"

-		    label      	"HTTPs"

-		    supplier   	"Logical View::webapplication::HTTPMethodType"

-		    quidu      	"3E930B050065"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "resCollection"

-		    quid       	"3E930B1200E6"

-		    label      	"resCollection"

-		    supplier   	"Logical View::webapplication::WebResourceCollection"

-		    quidu      	"38C07B8703AB"

-		    client_cardinality 	(value cardinality "0..1")

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "Web Application"

-	    quid       	"38C08C880292"

-	    title      	"Web Application"

-	    documentation 	"@since J2EE1.4 deprecated, becomes descriptions"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object NoteView @1

-		    location   	(781, 3113)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(455, 2987)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	617

-			label      	

-|the servlet class reference is resolved via Beans.instantiate(),

-|this is probably a reference to a JavaBean object

-			)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    width      	677

-		    height     	264)

-		(object ClassView "Class" "Logical View::webapplication::ServletType" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1520, 2832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1320, 2751)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"ServletType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2320311"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1320, 2812)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	397)

-		    width      	418

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::JSPType" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2000, 2832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(1843, 2751)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	314

-			justify    	0

-			label      	"JSPType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2640273"

-		    compartment 	(object Compartment

-			Parent_View 	@3

-			location   	(1843, 2812)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	313)

-		    width      	332

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ErrorCodeErrorPage" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(240, 960)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(39, 879)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	402

-			justify    	0

-			label      	"ErrorCodeErrorPage")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39883E6C0209"

-		    compartment 	(object Compartment

-			Parent_View 	@4

-			location   	(39, 940)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	369)

-		    width      	420

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @5

-		    location   	(1125, 1431)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(834, 1368)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	546

-			label      	

-|DEPRECATED:

-|ContextParam

-			)

-		    line_color 	10949559

-		    fill_color 	15778042

-		    width      	606

-		    height     	138)

-		(object ClassView "Class" "Logical View::common::JNDIEnvRefsGroup" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2987, 848)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(2790, 769)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"JNDIEnvRefsGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D53950349"

-		    width      	412

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::java::JavaClass" @7

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(669, 1522)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@7

-			location   	(576, 1443)

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ExceptionTypeErrorPage" @8

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(448, 1216)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@8

-			location   	(205, 1165)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	486

-			justify    	0

-			label      	"ExceptionTypeErrorPage")

-		    icon_style 	"Label"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39883E110154"

-		    width      	504

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$23" @9

-		    location   	(588, 1354)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39045E720204"

-		    roleview_list 	(list RoleViews

-			(object RoleView "exceptionType" @10

-			    Parent_View 	@9

-			    location   	(-132, 410)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @11

-				Parent_View 	@10

-				location   	(417, 1397)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	480

-				justify    	0

-				label      	"+exceptionType"

-				pctDist    	0.555556

-				height     	172

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045E730364"

-			    client     	@9

-			    supplier   	@7

-			    vertices   	(list Points

-				(588, 1354)

-				(588, 1431))

-			    line_style 	3

-			    origin_attachment 	(588, 1354)

-			    terminal_attachment 	(588, 1431)

-			    label      	(object SegLabel @12

-				Parent_View 	@10

-				location   	(642, 1423)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "errorPage" @13

-			    Parent_View 	@9

-			    location   	(-132, 410)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39045E7401C1"

-			    client     	@9

-			    supplier   	@8

-			    vertices   	(list Points

-				(588, 1354)

-				(588, 1278))

-			    line_style 	3

-			    origin_attachment 	(588, 1354)

-			    terminal_attachment 	(588, 1278))))

-		(object ClassView "Class" "Logical View::webapplication::FormLoginConfig" @14

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3936, 2448)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@14

-			location   	(3704, 2342)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	464

-			justify    	0

-			label      	"FormLoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D390296"

-		    compartment 	(object Compartment

-			Parent_View 	@14

-			location   	(3704, 2403)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	463)

-		    width      	482

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WebType" @15

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1776, 2480)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@15

-			location   	(1674, 2429)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	204

-			justify    	0

-			label      	"WebType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A1F70294"

-		    width      	222

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @16

-		    location   	(1776, 2635)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@15

-		    vertices   	(list Points

-			(1776, 2635)

-			(1776, 2543)))

-		(object InheritView "" @17

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A2900258"

-		    client     	@3

-		    supplier   	@15

-		    vertices   	(list Points

-			(1949, 2739)

-			(1949, 2635))

-		    line_style 	3

-		    origin_attachment 	(1949, 2739)

-		    terminal_attachment 	(1949, 2635)

-		    drawSupplier 	@16)

-		(object InheritView "" @18

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A28C02AD"

-		    client     	@2

-		    supplier   	@15

-		    vertices   	(list Points

-			(1519, 2739)

-			(1519, 2635))

-		    line_style 	3

-		    origin_attachment 	(1519, 2739)

-		    terminal_attachment 	(1519, 2635)

-		    drawSupplier 	@16)

-		(object ClassView "Class" "Logical View::common::SecurityRoleRef" @19

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(241, 1782)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@19

-			location   	(44, 1603)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	394

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"371BC7A0025C"

-		    compartment 	(object Compartment

-			Parent_View 	@19

-			location   	(44, 1708)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	412

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::LocalEncodingMapping" @20

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3248, 256)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@20

-			location   	(3022, 150)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	452

-			justify    	0

-			label      	"LocalEncodingMapping")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D56F20170"

-		    compartment 	(object Compartment

-			Parent_View 	@20

-			location   	(3022, 211)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	356)

-		    width      	470

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ContextParam" @21

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 1296)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@21

-			location   	(943, 1255)

-			nlines     	1

-			max_width  	290

-			justify    	0

-			label      	"ContextParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C078B602A6"

-		    width      	308

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ErrorPage" @22

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(304, 592)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@22

-			location   	(136, 511)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	336

-			justify    	0

-			label      	"ErrorPage")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07ACF03E2"

-		    compartment 	(object Compartment

-			Parent_View 	@22

-			location   	(136, 572)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	335)

-		    width      	354

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritTreeView "" @23

-		    location   	(304, 800)

-		    line_color 	3342489

-		    fill_color 	13434879

-		    supplier   	@22

-		    vertices   	(list Points

-			(304, 800)

-			(304, 685)))

-		(object InheritView "" @24

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39883E3A0058"

-		    client     	@8

-		    supplier   	@22

-		    vertices   	(list Points

-			(447, 1153)

-			(447, 800))

-		    line_style 	3

-		    origin_attachment 	(447, 1153)

-		    terminal_attachment 	(447, 800)

-		    drawSupplier 	@23)

-		(object InheritView "" @25

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39883E9400A8"

-		    client     	@4

-		    supplier   	@22

-		    vertices   	(list Points

-			(209, 867)

-			(209, 800))

-		    line_style 	3

-		    origin_attachment 	(209, 867)

-		    terminal_attachment 	(209, 800)

-		    drawSupplier 	@23)

-		(object ClassView "Class" "Logical View::webapplication::WelcomeFileList" @26

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(272, 320)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@26

-			location   	(100, 279)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	344

-			justify    	0

-			label      	"WelcomeFileList")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07AAD01A8"

-		    width      	362

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::TagLibRef" @27

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1280, 144)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@27

-			location   	(1057, 38)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	446

-			justify    	0

-			label      	"TagLibRef")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B3002E7"

-		    compartment 	(object Compartment

-			Parent_View 	@27

-			location   	(1057, 99)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	444)

-		    width      	464

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::SecurityConstraint" @28

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1712, 128)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@28

-			location   	(1528, 87)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	368

-			justify    	0

-			label      	"SecurityConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B6A02AE"

-		    width      	386

-		    height     	107

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::LoginConfig" @29

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3840, 1792)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@29

-			location   	(3469, 1661)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	742

-			justify    	0

-			label      	"LoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D0F006F"

-		    compartment 	(object Compartment

-			Parent_View 	@29

-			location   	(3469, 1722)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	741)

-		    width      	760

-		    height     	286

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @30

-		    location   	(3918, 2132)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C1248900BE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "formLoginConfig" @31

-			    Parent_View 	@30

-			    location   	(291, 263)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @32

-				Parent_View 	@31

-				location   	(4103, 2263)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	327

-				justify    	0

-				label      	"+formLoginConfig"

-				pctDist    	0.671498

-				height     	185

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C12489030D"

-			    client     	@30

-			    supplier   	@14

-			    vertices   	(list Points

-				(3918, 2132)

-				(3918, 2329))

-			    line_style 	3

-			    origin_attachment 	(3918, 2132)

-			    terminal_attachment 	(3918, 2329)

-			    label      	(object SegLabel @33

-				Parent_View 	@31

-				location   	(3972, 2308)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "loginConfig" @34

-			    Parent_View 	@30

-			    location   	(291, 263)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @35

-				Parent_View 	@34

-				location   	(4089, 2033)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	229

-				justify    	0

-				label      	"+loginConfig"

-				pctDist    	0.500139

-				height     	171

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C124890303"

-			    client     	@30

-			    supplier   	@29

-			    vertices   	(list Points

-				(3918, 2132)

-				(3918, 1935))

-			    line_style 	3

-			    origin_attachment 	(3918, 2132)

-			    terminal_attachment 	(3918, 1935)

-			    label      	(object SegLabel @36

-				Parent_View 	@34

-				location   	(3992, 1971)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.820777

-				height     	74

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::webapplication::MimeMapping" @37

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2848, 1888)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@37

-			location   	(2656, 1782)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	384

-			justify    	0

-			label      	"MimeMapping")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07A7500FE"

-		    compartment 	(object Compartment

-			Parent_View 	@37

-			location   	(2656, 1843)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	381)

-		    width      	402

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::SessionConfig" @38

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2640, 2304)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@38

-			location   	(2431, 2223)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	418

-			justify    	0

-			label      	"SessionConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07A5301BD"

-		    compartment 	(object Compartment

-			Parent_View 	@38

-			location   	(2431, 2284)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	416)

-		    width      	436

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ServletMapping" @39

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1968, 2192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@39

-			location   	(1782, 2086)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	372

-			justify    	0

-			label      	"ServletMapping")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079BD02B9"

-		    compartment 	(object Compartment

-			Parent_View 	@39

-			location   	(1782, 2147)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	369)

-		    width      	390

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @40

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(992, 2416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@40

-			location   	(666, 2310)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	652

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    compartment 	(object Compartment

-			Parent_View 	@40

-			location   	(666, 2371)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	650)

-		    width      	670

-		    height     	236

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$15" @41

-		    location   	(1496, 2475)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122AC014A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webType" @42

-			    Parent_View 	@41

-			    location   	(760, 171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @43

-				Parent_View 	@42

-				location   	(1523, 2509)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	"+webType"

-				pctDist    	0.166667

-				height     	34

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0015"

-			    client     	@41

-			    supplier   	@15

-			    vertices   	(list Points

-				(1496, 2475)

-				(1665, 2475))

-			    line_style 	3

-			    origin_attachment 	(1496, 2475)

-			    terminal_attachment 	(1665, 2475)

-			    label      	(object SegLabel @44

-				Parent_View 	@42

-				location   	(1647, 2529)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "servlet" @45

-			    Parent_View 	@41

-			    location   	(760, 171)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0001"

-			    client     	@41

-			    supplier   	@40

-			    vertices   	(list Points

-				(1496, 2475)

-				(1327, 2475))

-			    line_style 	3

-			    origin_attachment 	(1496, 2475)

-			    terminal_attachment 	(1327, 2475)

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(1368, 2526)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.763636

-				height     	51

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$24" @47

-		    location   	(1609, 2352)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"390460AA0189"

-		    roleview_list 	(list RoleViews

-			(object RoleView "servlet" @48

-			    Parent_View 	@47

-			    location   	(-39, 144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @49

-				Parent_View 	@48

-				location   	(1457, 2312)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	245

-				justify    	0

-				label      	"+servlet"

-				pctDist    	0.543478

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"390460AB0234"

-			    client     	@47

-			    supplier   	@40

-			    vertices   	(list Points

-				(1609, 2352)

-				(1327, 2352))

-			    line_style 	3

-			    origin_attachment 	(1609, 2352)

-			    terminal_attachment 	(1327, 2352)

-			    label      	(object SegLabel @50

-				Parent_View 	@48

-				location   	(1356, 2406)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$25" @51

-			    Parent_View 	@47

-			    location   	(-39, 144)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"390460AB02B6"

-			    client     	@47

-			    supplier   	@39

-			    vertices   	(list Points

-				(1609, 2352)

-				(1848, 2352)

-				(1848, 2310))

-			    line_style 	3

-			    origin_attachment 	(1609, 2352)

-			    terminal_attachment 	(1848, 2310))))

-		(object AssociationViewNew "$UNNAMED$18" @52

-		    location   	(368, 2293)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122C00199"

-		    roleview_list 	(list RoleViews

-			(object RoleView "securityRoleRefs" @53

-			    Parent_View 	@52

-			    location   	(-688, -11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @54

-				Parent_View 	@53

-				location   	(551, 2046)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	540

-				justify    	0

-				label      	"+securityRoleRefs"

-				pctDist    	0.770492

-				height     	183

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1029F"

-			    client     	@52

-			    supplier   	@19

-			    vertices   	(list Points

-				(368, 2293)

-				(368, 1973))

-			    line_style 	3

-			    origin_attachment 	(368, 2293)

-			    terminal_attachment 	(368, 1973)

-			    label      	(object SegLabel @55

-				Parent_View 	@53

-				location   	(439, 2172)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.377049

-				height     	71

-				orientation 	1))

-			(object RoleView "$UNNAMED$19" @56

-			    Parent_View 	@52

-			    location   	(-688, -11)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @57

-				Parent_View 	@56

-				location   	(467, 2257)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	245

-				justify    	0

-				label      	""

-				pctDist    	0.455285

-				height     	97

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1028B"

-			    client     	@52

-			    supplier   	@40

-			    vertices   	(list Points

-				(368, 2293)

-				(368, 2353)

-				(657, 2353))

-			    line_style 	3

-			    origin_attachment 	(368, 2293)

-			    terminal_attachment 	(657, 2353))))

-		(object ClassView "Class" "Logical View::common::SecurityRole" @58

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1238, 1770)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@58

-			location   	(1041, 1641)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"SecurityRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C031FE012D"

-		    compartment 	(object Compartment

-			Parent_View 	@58

-			location   	(1041, 1746)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	391)

-		    width      	412

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "" @59

-		    location   	(716, 1835)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3904632A005C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "" @60

-			    Parent_View 	@59

-			    location   	(-372, 139)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @61

-				Parent_View 	@60

-				location   	(541, 1789)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	505

-				justify    	0

-				label      	""

-				pctDist    	0.671141

-				height     	63

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B01BC"

-			    client     	@59

-			    supplier   	@19

-			    vertices   	(list Points

-				(716, 1835)

-				(716, 1851)

-				(447, 1851))

-			    line_style 	3

-			    origin_attachment 	(716, 1835)

-			    terminal_attachment 	(447, 1851)

-			    label      	(object SegLabel @62

-				Parent_View 	@60

-				location   	(588, 1851)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	5

-				anchor_loc 	1

-				nlines     	1

-				max_width  	244

-				justify    	0

-				label      	"name : String"

-				pctDist    	0.900000

-				height     	12

-				orientation 	1))

-			(object RoleView "/linkedSecurityRole" @63

-			    Parent_View 	@59

-			    location   	(-372, 139)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @64

-				Parent_View 	@63

-				location   	(866, 1728)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	602

-				justify    	0

-				label      	"+/linkedSecurityRole"

-				pctDist    	0.500000

-				height     	92

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3904632B016C"

-			    client     	@59

-			    supplier   	@58

-			    vertices   	(list Points

-				(716, 1835)

-				(716, 1819)

-				(1032, 1819))

-			    line_style 	3

-			    origin_attachment 	(716, 1835)

-			    terminal_attachment 	(1032, 1819)

-			    label      	(object SegLabel @65

-				Parent_View 	@63

-				location   	(999, 1873)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::common::ParamValue" @66

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(778, 969)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@66

-			location   	(581, 815)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	394

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C221202C1"

-		    compartment 	(object Compartment

-			Parent_View 	@66

-			location   	(581, 920)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	412

-		    height     	332

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::jsp::JSPConfig" @67

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(688, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@67

-			location   	(551, 114)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"JSPConfig")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D4A3A01C8"

-		    width      	292

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::MessageDestination" @68

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(3040, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@68

-			location   	(2837, 1064)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	406

-			justify    	0

-			label      	"MessageDestination")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C211001CF"

-		    compartment 	(object Compartment

-			Parent_View 	@68

-			location   	(2837, 1169)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	294)

-		    width      	424

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::LocalEncodingMappingList" @69

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2032, 272)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@69

-			location   	(1769, 221)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	526

-			justify    	0

-			label      	"LocalEncodingMappingList")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	16711935

-		    quidu      	"3E4D56DA023E"

-		    width      	544

-		    height     	126

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$56" @70

-		    location   	(2658, 263)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D57140378"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localEncodingMappings" @71

-			    Parent_View 	@70

-			    location   	(604, 13)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @72

-				Parent_View 	@71

-				location   	(2704, 208)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	460

-				justify    	0

-				label      	"+localEncodingMappings"

-				pctDist    	0.130252

-				height     	55

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D57150135"

-			    client     	@70

-			    supplier   	@20

-			    vertices   	(list Points

-				(2658, 263)

-				(3012, 259))

-			    line_style 	0

-			    label      	(object SegLabel @73

-				Parent_View 	@71

-				location   	(2926, 313)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.755633

-				height     	53

-				orientation 	1))

-			(object RoleView "$UNNAMED$57" @74

-			    Parent_View 	@70

-			    location   	(604, 13)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D5715013F"

-			    client     	@70

-			    supplier   	@69

-			    vertices   	(list Points

-				(2658, 263)

-				(2304, 268))

-			    line_style 	0)))

-		(object ClassView "Class" "Logical View::webapplication::WebApp" @75

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1904, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@75

-			location   	(1679, 1084)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"WebApp")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@75

-			location   	(1679, 1034)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"<<component>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C077FB0352"

-		    compartment 	(object Compartment

-			Parent_View 	@75

-			location   	(1679, 1145)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	447)

-		    width      	468

-		    height     	292

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$0" @76

-		    location   	(1455, 1237)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CE60213"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @77

-			    Parent_View 	@76

-			    location   	(1135, -155)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @78

-				Parent_View 	@77

-				location   	(1622, 1169)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CE8000D"

-			    client     	@76

-			    supplier   	@75

-			    vertices   	(list Points

-				(1455, 1237)

-				(1669, 1204))

-			    line_style 	0

-			    label      	(object SegLabel @79

-				Parent_View 	@77

-				location   	(1655, 1260)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "contexts" @80

-			    Parent_View 	@76

-			    location   	(1135, -155)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @81

-				Parent_View 	@80

-				location   	(1363, 1205)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	289

-				justify    	0

-				label      	"+contexts"

-				pctDist    	0.396886

-				height     	48

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CE8000E"

-			    client     	@76

-			    supplier   	@21

-			    vertices   	(list Points

-				(1455, 1237)

-				(1242, 1271))

-			    line_style 	0

-			    label      	(object SegLabel @82

-				Parent_View 	@80

-				location   	(1312, 1306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.707751

-				height     	46

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$1" @83

-		    location   	(1075, 869)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CF301A3"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @84

-			    Parent_View 	@83

-			    location   	(707, -75)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @85

-				Parent_View 	@84

-				location   	(1563, 1001)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF4026D"

-			    client     	@83

-			    supplier   	@75

-			    vertices   	(list Points

-				(1075, 869)

-				(1669, 1083))

-			    line_style 	0

-			    label      	(object SegLabel @86

-				Parent_View 	@84

-				location   	(1591, 1112)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "errorPages" @87

-			    Parent_View 	@83

-			    location   	(707, -75)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @88

-				Parent_View 	@87

-				location   	(615, 659)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	364

-				justify    	0

-				label      	"+errorPages"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF40277"

-			    client     	@83

-			    supplier   	@22

-			    vertices   	(list Points

-				(1075, 869)

-				(481, 655))

-			    line_style 	0

-			    label      	(object SegLabel @89

-				Parent_View 	@87

-				location   	(525, 728)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$2" @90

-		    location   	(1021, 709)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CF7034E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @91

-			    Parent_View 	@90

-			    location   	(669, 149)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @92

-				Parent_View 	@91

-				location   	(1558, 942)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF803B3"

-			    client     	@90

-			    supplier   	@75

-			    vertices   	(list Points

-				(1021, 709)

-				(1669, 1045))

-			    line_style 	0

-			    label      	(object SegLabel @93

-				Parent_View 	@91

-				location   	(1579, 1059)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "fileList" @94

-			    Parent_View 	@90

-			    location   	(669, 149)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @95

-				Parent_View 	@94

-				location   	(523, 404)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	241

-				justify    	0

-				label      	"+fileList"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CF803B4"

-			    client     	@90

-			    supplier   	@26

-			    vertices   	(list Points

-				(1021, 709)

-				(374, 373))

-			    line_style 	0

-			    label      	(object SegLabel @96

-				Parent_View 	@94

-				location   	(386, 423)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.954993

-				height     	39

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$3" @97

-		    location   	(1582, 641)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11CFB0281"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @98

-			    Parent_View 	@97

-			    location   	(1086, 401)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @99

-				Parent_View 	@98

-				location   	(1803, 924)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CFD00A3"

-			    client     	@97

-			    supplier   	@75

-			    vertices   	(list Points

-				(1582, 641)

-				(1813, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @100

-				Parent_View 	@98

-				location   	(1745, 1011)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "tagLibs" @101

-			    Parent_View 	@97

-			    location   	(1086, 401)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @102

-				Parent_View 	@101

-				location   	(1434, 318)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	258

-				justify    	0

-				label      	"+tagLibs"

-				pctDist    	0.799648

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11CFD00A4"

-			    client     	@97

-			    supplier   	@27

-			    vertices   	(list Points

-				(1582, 641)

-				(1351, 262))

-			    line_style 	0

-			    label      	(object SegLabel @103

-				Parent_View 	@101

-				location   	(1329, 328)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$4" @104

-		    location   	(1799, 601)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D000134"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @105

-			    Parent_View 	@104

-			    location   	(647, 329)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @106

-				Parent_View 	@105

-				location   	(1821, 944)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D01018F"

-			    client     	@104

-			    supplier   	@75

-			    vertices   	(list Points

-				(1799, 601)

-				(1877, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @107

-				Parent_View 	@105

-				location   	(1922, 969)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "constraints" @108

-			    Parent_View 	@104

-			    location   	(647, 329)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @109

-				Parent_View 	@108

-				location   	(1869, 348)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	364

-				justify    	0

-				label      	"+constraints"

-				pctDist    	0.558074

-				height     	115

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D010199"

-			    client     	@104

-			    supplier   	@28

-			    vertices   	(list Points

-				(1799, 601)

-				(1721, 181))

-			    line_style 	0

-			    label      	(object SegLabel @110

-				Parent_View 	@108

-				location   	(1837, 400)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.449356

-				height     	74

-				orientation 	1)

-			    label      	(object SegLabel @111

-				Parent_View 	@108

-				location   	(1854, 290)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	3

-				anchor_loc 	1

-				nlines     	1

-				max_width  	163

-				justify    	0

-				label      	"{ordered}"

-				pctDist    	0.697317

-				height     	111

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$5" @112

-		    location   	(2798, 1456)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D110188"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @113

-			    Parent_View 	@112

-			    location   	(30, -48)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @114

-				Parent_View 	@113

-				location   	(2283, 1247)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D120067"

-			    client     	@112

-			    supplier   	@75

-			    vertices   	(list Points

-				(2798, 1456)

-				(2138, 1243))

-			    line_style 	0

-			    label      	(object SegLabel @115

-				Parent_View 	@113

-				location   	(2188, 1315)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "loginConfig" @116

-			    Parent_View 	@112

-			    location   	(30, -48)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @117

-				Parent_View 	@116

-				location   	(3339, 1587)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	369

-				justify    	0

-				label      	"+loginConfig"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D120071"

-			    client     	@112

-			    supplier   	@29

-			    vertices   	(list Points

-				(2798, 1456)

-				(3459, 1669))

-			    line_style 	0

-			    label      	(object SegLabel @118

-				Parent_View 	@116

-				location   	(3376, 1698)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$6" @119

-		    location   	(2394, 1541)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D1501C0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @120

-			    Parent_View 	@119

-			    location   	(-262, -411)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @121

-				Parent_View 	@120

-				location   	(2180, 1328)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D17023B"

-			    client     	@119

-			    supplier   	@75

-			    vertices   	(list Points

-				(2394, 1541)

-				(2095, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @122

-				Parent_View 	@120

-				location   	(2094, 1380)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "mimeMappings" @123

-			    Parent_View 	@119

-			    location   	(-262, -411)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @124

-				Parent_View 	@123

-				location   	(2869, 1728)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	502

-				justify    	0

-				label      	"+mimeMappings"

-				pctDist    	1.308311

-				height     	141

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D170245"

-			    client     	@119

-			    supplier   	@37

-			    vertices   	(list Points

-				(2394, 1541)

-				(2693, 1769))

-			    line_style 	0

-			    label      	(object SegLabel @125

-				Parent_View 	@123

-				location   	(2615, 1774)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.839808

-				height     	51

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$7" @126

-		    location   	(2288, 1762)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D1B0327"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @127

-			    Parent_View 	@126

-			    location   	(192, -622)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @128

-				Parent_View 	@127

-				location   	(2023, 1427)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D1C01F2"

-			    client     	@126

-			    supplier   	@75

-			    vertices   	(list Points

-				(2288, 1762)

-				(1998, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @129

-				Parent_View 	@127

-				location   	(2072, 1330)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "sessionConfig" @130

-			    Parent_View 	@126

-			    location   	(192, -622)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @131

-				Parent_View 	@130

-				location   	(2361, 2141)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	492

-				justify    	0

-				label      	"+sessionConfig"

-				pctDist    	0.668862

-				height     	146

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D1C01F3"

-			    client     	@126

-			    supplier   	@38

-			    vertices   	(list Points

-				(2288, 1762)

-				(2579, 2210))

-			    line_style 	0

-			    label      	(object SegLabel @132

-				Parent_View 	@130

-				location   	(2437, 2089)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.665477

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$8" @133

-		    location   	(1936, 1693)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D1F02AB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @134

-			    Parent_View 	@133

-			    location   	(496, -723)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @135

-				Parent_View 	@134

-				location   	(1877, 1393)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	303

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D200298"

-			    client     	@133

-			    supplier   	@75

-			    vertices   	(list Points

-				(1936, 1693)

-				(1913, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @136

-				Parent_View 	@134

-				location   	(1969, 1351)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "servletMappings" @137

-			    Parent_View 	@133

-			    location   	(496, -723)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @138

-				Parent_View 	@137

-				location   	(1787, 2031)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	543

-				justify    	0

-				label      	"+servletMappings"

-				pctDist    	0.859756

-				height     	171

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2002A2"

-			    client     	@133

-			    supplier   	@39

-			    vertices   	(list Points

-				(1936, 1693)

-				(1960, 2073))

-			    line_style 	0

-			    label      	(object SegLabel @139

-				Parent_View 	@137

-				location   	(1916, 1977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.745715

-				height     	39

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$9" @140

-		    location   	(1437, 1805)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D230120"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webApp" @141

-			    Parent_View 	@140

-			    location   	(637, -643)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @142

-				Parent_View 	@141

-				location   	(1691, 1389)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	"+webApp"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2402DA"

-			    client     	@140

-			    supplier   	@75

-			    vertices   	(list Points

-				(1437, 1805)

-				(1797, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @143

-				Parent_View 	@141

-				location   	(1805, 1395)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "servlets" @144

-			    Parent_View 	@140

-			    location   	(637, -643)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @145

-				Parent_View 	@144

-				location   	(1233, 2207)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	281

-				justify    	0

-				label      	"+servlets"

-				pctDist    	0.730379

-				height     	73

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2402E4"

-			    client     	@140

-			    supplier   	@40

-			    vertices   	(list Points

-				(1437, 1805)

-				(1077, 2297))

-			    line_style 	0

-			    label      	(object SegLabel @146

-				Parent_View 	@144

-				location   	(1195, 2256)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.833390

-				height     	71

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$10" @147

-		    location   	(1566, 1471)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C11D2701DA"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$11" @148

-			    Parent_View 	@147

-			    location   	(1198, -417)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @149

-				Parent_View 	@148

-				location   	(1677, 1316)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	267

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2802C2"

-			    client     	@147

-			    supplier   	@75

-			    vertices   	(list Points

-				(1566, 1471)

-				(1740, 1314))

-			    line_style 	0

-			    label      	(object SegLabel @150

-				Parent_View 	@148

-				location   	(1758, 1370)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	80

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "securityRoles" @151

-			    Parent_View 	@147

-			    location   	(1198, -417)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @152

-				Parent_View 	@151

-				location   	(1401, 1566)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	457

-				justify    	0

-				label      	"+securityRoles"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C11D2802CC"

-			    client     	@147

-			    supplier   	@58

-			    vertices   	(list Points

-				(1566, 1471)

-				(1392, 1628))

-			    line_style 	0

-			    label      	(object SegLabel @153

-				Parent_View 	@151

-				location   	(1446, 1652)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	74

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$44" @154

-		    location   	(1326, 1065)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E4D42CA027F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "contextParams" @155

-			    Parent_View 	@154

-			    location   	(-577, -102)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @156

-				Parent_View 	@155

-				location   	(1186, 981)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	316

-				justify    	0

-				label      	"+contextParams"

-				pctDist    	0.437430

-				height     	59

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D42CB0118"

-			    client     	@154

-			    supplier   	@66

-			    vertices   	(list Points

-				(1326, 1065)

-				(984, 1004))

-			    line_style 	0

-			    label      	(object SegLabel @157

-				Parent_View 	@155

-				location   	(1011, 1063)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$45" @158

-			    Parent_View 	@154

-			    location   	(-577, -102)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D42CB0122"

-			    client     	@154

-			    supplier   	@75

-			    vertices   	(list Points

-				(1326, 1065)

-				(1669, 1126))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$50" @159

-		    location   	(1261, 651)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D4BFF01C0"

-		    roleview_list 	(list RoleViews

-			(object RoleView "jspConfig" @160

-			    Parent_View 	@159

-			    location   	(-642, -516)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @161

-				Parent_View 	@160

-				location   	(827, 382)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	190

-				justify    	0

-				label      	"+jspConfig"

-				pctDist    	0.861516

-				height     	62

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C000225"

-			    client     	@159

-			    supplier   	@67

-			    vertices   	(list Points

-				(1261, 651)

-				(800, 282))

-			    line_style 	0

-			    label      	(object SegLabel @162

-				Parent_View 	@160

-				location   	(760, 323)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	1.012447

-				height     	57

-				orientation 	0))

-			(object RoleView "$UNNAMED$51" @163

-			    Parent_View 	@159

-			    location   	(-642, -516)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D4C000227"

-			    client     	@159

-			    supplier   	@75

-			    vertices   	(list Points

-				(1261, 651)

-				(1722, 1021))

-			    line_style 	0)))

-		(object InheritView "" @164

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D55CA03E2"

-		    client     	@75

-		    supplier   	@6

-		    vertices   	(list Points

-			(2138, 1098)

-			(2780, 908))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$54" @165

-		    location   	(2482, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D56A50224"

-		    roleview_list 	(list RoleViews

-			(object RoleView "messageDestinations" @166

-			    Parent_View 	@165

-			    location   	(579, 1)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @167

-				Parent_View 	@166

-				location   	(2562, 1122)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	424

-				justify    	0

-				label      	"+messageDestinations"

-				pctDist    	0.231859

-				height     	47

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D56A60257"

-			    client     	@165

-			    supplier   	@68

-			    vertices   	(list Points

-				(2482, 1168)

-				(2827, 1168))

-			    line_style 	0

-			    label      	(object SegLabel @168

-				Parent_View 	@166

-				location   	(2768, 1219)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.827856

-				height     	51

-				orientation 	1))

-			(object RoleView "$UNNAMED$55" @169

-			    Parent_View 	@165

-			    location   	(579, 1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D56A60261"

-			    client     	@165

-			    supplier   	@75

-			    vertices   	(list Points

-				(2482, 1168)

-				(2138, 1168))

-			    line_style 	0)))

-		(object AssociationViewNew "$UNNAMED$58" @170

-		    location   	(1974, 678)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D572C0083"

-		    roleview_list 	(list RoleViews

-			(object RoleView "localEncodingMappingList" @171

-			    Parent_View 	@170

-			    location   	(71, -489)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @172

-				Parent_View 	@171

-				location   	(2300, 370)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	496

-				justify    	0

-				label      	"+localEncodingMappingList"

-				pctDist    	1.015374

-				height     	279

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D572C02DC"

-			    client     	@170

-			    supplier   	@69

-			    vertices   	(list Points

-				(1974, 678)

-				(2023, 335))

-			    line_style 	0

-			    label      	(object SegLabel @173

-				Parent_View 	@171

-				location   	(1953, 375)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.861045

-				height     	65

-				orientation 	0))

-			(object RoleView "$UNNAMED$59" @174

-			    Parent_View 	@170

-			    location   	(71, -489)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D572C02DE"

-			    client     	@170

-			    supplier   	@75

-			    vertices   	(list Points

-				(1974, 678)

-				(1925, 1021))

-			    line_style 	0)))))

-	(object ClassDiagram "Security Constraint"

-	    quid       	"38C08DCB020A"

-	    title      	"Security Constraint"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::HTTPMethodTypeEnum" @175

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(304, 1840)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@175

-			location   	(74, 1643)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"HTTPMethodTypeEnum")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@175

-			location   	(74, 1593)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"38C0A2E200C6"

-		    compartment 	(object Compartment

-			Parent_View 	@175

-			location   	(74, 1704)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	228)

-		    width      	478

-		    height     	518

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object NoteView @176

-		    location   	(234, 1187)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@176

-			location   	(56, 1009)

-			fill_color 	13434879

-			nlines     	7

-			max_width  	321

-			label      	

-|@since J2EE1.4

-|urlPattern

-|httpMethod

-			)

-		    line_color 	10949559

-		    fill_color 	15778042

-		    width      	381

-		    height     	369)

-		(object ClassView "Class" "Logical View::webapplication::TransportGuaranteeType" @177

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2752, 688)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@177

-			location   	(2514, 585)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"TransportGuaranteeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@177

-			location   	(2514, 535)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390461A9018F"

-		    compartment 	(object Compartment

-			Parent_View 	@177

-			location   	(2514, 646)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	338)

-		    width      	494

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DisplayName" @178

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2503, 175)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@178

-			location   	(2287, 46)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A9922000E"

-		    compartment 	(object Compartment

-			Parent_View 	@178

-			location   	(2287, 161)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	466)

-		    width      	450

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::UserDataConstraint" @179

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2208, 1248)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@179

-			location   	(1772, 1147)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	872

-			justify    	0

-			label      	"UserDataConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07CB800B0"

-		    compartment 	(object Compartment

-			Parent_View 	@179

-			location   	(1772, 1208)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	878)

-		    width      	890

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::AuthConstraint" @180

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1488, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@180

-			location   	(1280, 731)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	416

-			justify    	0

-			label      	"AuthConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07C8001A0"

-		    compartment 	(object Compartment

-			Parent_View 	@180

-			location   	(1280, 792)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	456)

-		    width      	434

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::SecurityConstraint" @181

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 128)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@181

-			location   	(890, 50)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	396

-			justify    	0

-			label      	"SecurityConstraint")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B6A02AE"

-		    compartment 	(object Compartment

-			Parent_View 	@181

-			location   	(890, 111)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	428)

-		    width      	414

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$52" @182

-		    location   	(1786, 88)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D51010264"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNames" @183

-			    Parent_View 	@182

-			    location   	(698, -40)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @184

-				Parent_View 	@183

-				location   	(2118, 45)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+displayNames"

-				pctDist    	0.675510

-				height     	44

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D5102025B"

-			    client     	@182

-			    supplier   	@178

-			    vertices   	(list Points

-				(1786, 88)

-				(2278, 88))

-			    line_style 	3

-			    origin_attachment 	(1786, 88)

-			    terminal_attachment 	(2278, 88)

-			    label      	(object SegLabel @185

-				Parent_View 	@183

-				location   	(2228, 142)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$53" @186

-			    Parent_View 	@182

-			    location   	(698, -40)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D51020265"

-			    client     	@182

-			    supplier   	@181

-			    vertices   	(list Points

-				(1786, 88)

-				(1295, 88))

-			    line_style 	3

-			    origin_attachment 	(1786, 88)

-			    terminal_attachment 	(1295, 88))))

-		(object AssociationViewNew "$UNNAMED$14" @187

-		    location   	(2097, 234)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C121F70208"

-		    roleview_list 	(list RoleViews

-			(object RoleView "secConstraint" @188

-			    Parent_View 	@187

-			    location   	(257, -582)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @189

-				Parent_View 	@188

-				location   	(1599, 208)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	276

-				justify    	0

-				label      	"+secConstraint"

-				pctDist    	0.662192

-				height     	73

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F801EC"

-			    client     	@187

-			    supplier   	@181

-			    vertices   	(list Points

-				(2097, 234)

-				(2097, 135)

-				(1295, 135))

-			    line_style 	3

-			    origin_attachment 	(2097, 234)

-			    terminal_attachment 	(1295, 135)

-			    label      	(object SegLabel @190

-				Parent_View 	@188

-				location   	(1479, 121)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.796421

-				height     	15

-				orientation 	1))

-			(object RoleView "userDataConstraint" @191

-			    Parent_View 	@187

-			    location   	(257, -582)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @192

-				Parent_View 	@191

-				location   	(2296, 959)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	372

-				justify    	0

-				label      	"+userDataConstraint"

-				pctDist    	0.805369

-				height     	199

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F801ED"

-			    client     	@187

-			    supplier   	@179

-			    vertices   	(list Points

-				(2097, 234)

-				(2097, 1135))

-			    line_style 	3

-			    origin_attachment 	(2097, 234)

-			    terminal_attachment 	(2097, 1135)

-			    label      	(object SegLabel @193

-				Parent_View 	@191

-				location   	(2151, 1044)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$13" @194

-		    location   	(1412, 422)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C121F200E9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "secConstraint" @195

-			    Parent_View 	@194

-			    location   	(324, -362)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @196

-				Parent_View 	@195

-				location   	(1540, 216)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	276

-				justify    	0

-				label      	"+secConstraint"

-				pctDist    	0.648069

-				height     	149

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F3039D"

-			    client     	@194

-			    supplier   	@181

-			    vertices   	(list Points

-				(1412, 422)

-				(1391, 422)

-				(1391, 188)

-				(1295, 188))

-			    line_style 	3

-			    origin_attachment 	(1412, 422)

-			    terminal_attachment 	(1295, 188)

-			    label      	(object SegLabel @197

-				Parent_View 	@195

-				location   	(1330, 135)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "authConstraint" @198

-			    Parent_View 	@194

-			    location   	(324, -362)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @199

-				Parent_View 	@198

-				location   	(1586, 610)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	288

-				justify    	0

-				label      	"+authConstraint"

-				pctDist    	0.662393

-				height     	152

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121F303A7"

-			    client     	@194

-			    supplier   	@180

-			    vertices   	(list Points

-				(1412, 422)

-				(1434, 422)

-				(1434, 719))

-			    line_style 	3

-			    origin_attachment 	(1412, 422)

-			    terminal_attachment 	(1434, 719)

-			    label      	(object SegLabel @200

-				Parent_View 	@198

-				location   	(1488, 687)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::Description" @201

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1247, 1695)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@201

-			location   	(1119, 1566)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@201

-			location   	(1119, 1681)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	284)

-		    width      	274

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$60" @202

-		    location   	(1860, 1625)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	8421504

-		    quidu      	"3E4D515001BD"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @203

-			    Parent_View 	@202

-			    location   	(-44, 889)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @204

-				Parent_View 	@203

-				location   	(1615, 1699)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.516224

-				height     	74

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D515101BE"

-			    client     	@202

-			    supplier   	@201

-			    vertices   	(list Points

-				(1860, 1625)

-				(1384, 1625))

-			    line_style 	3

-			    origin_attachment 	(1860, 1625)

-			    terminal_attachment 	(1384, 1625)

-			    label      	(object SegLabel @205

-				Parent_View 	@203

-				location   	(1432, 1679)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$61" @206

-			    Parent_View 	@202

-			    location   	(-44, 889)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D515101DC"

-			    client     	@202

-			    supplier   	@179

-			    vertices   	(list Points

-				(1860, 1625)

-				(2071, 1625)

-				(2071, 1361))

-			    line_style 	3

-			    origin_attachment 	(1860, 1625)

-			    terminal_attachment 	(2071, 1361))))

-		(object AssociationViewNew "$UNNAMED$62" @207

-		    location   	(1331, 1263)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	8421504

-		    quidu      	"3E4D514D0317"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @208

-			    Parent_View 	@207

-			    location   	(195, 495)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @209

-				Parent_View 	@208

-				location   	(1149, 1437)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.649007

-				height     	143

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514E0106"

-			    client     	@207

-			    supplier   	@201

-			    vertices   	(list Points

-				(1331, 1263)

-				(1291, 1263)

-				(1291, 1554))

-			    line_style 	3

-			    origin_attachment 	(1331, 1263)

-			    terminal_attachment 	(1291, 1554)

-			    label      	(object SegLabel @210

-				Parent_View 	@208

-				location   	(1372, 1462)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.721854

-				height     	81

-				orientation 	0))

-			(object RoleView "$UNNAMED$63" @211

-			    Parent_View 	@207

-			    location   	(195, 495)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514E0124"

-			    client     	@207

-			    supplier   	@180

-			    vertices   	(list Points

-				(1331, 1263)

-				(1371, 1263)

-				(1371, 945))

-			    line_style 	3

-			    origin_attachment 	(1331, 1263)

-			    terminal_attachment 	(1371, 945))))

-		(object ClassView "Class" "Logical View::webapplication::WebResourceCollection" @212

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(592, 720)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@212

-			location   	(158, 572)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	868

-			justify    	0

-			label      	"WebResourceCollection")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B8703AB"

-		    compartment 	(object Compartment

-			Parent_View 	@212

-			location   	(158, 633)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	894)

-		    width      	886

-		    height     	320

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @213

-		    location   	(494, 110)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C121ED02D6"

-		    roleview_list 	(list RoleViews

-			(object RoleView "secConstraint" @214

-			    Parent_View 	@213

-			    location   	(174, -658)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @215

-				Parent_View 	@214

-				location   	(770, 71)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	276

-				justify    	0

-				label      	"+secConstraint"

-				pctDist    	0.715719

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121EE01E7"

-			    client     	@213

-			    supplier   	@181

-			    vertices   	(list Points

-				(494, 110)

-				(881, 110))

-			    line_style 	3

-			    origin_attachment 	(494, 110)

-			    terminal_attachment 	(881, 110)

-			    label      	(object SegLabel @216

-				Parent_View 	@214

-				location   	(842, 164)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "webResourceCollections" @217

-			    Parent_View 	@213

-			    location   	(174, -658)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @218

-				Parent_View 	@217

-				location   	(685, 528)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	468

-				justify    	0

-				label      	"+webResourceCollections"

-				pctDist    	0.939655

-				height     	251

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C121EE01F1"

-			    client     	@213

-			    supplier   	@212

-			    vertices   	(list Points

-				(494, 110)

-				(434, 110)

-				(434, 560))

-			    line_style 	3

-			    origin_attachment 	(494, 110)

-			    terminal_attachment 	(434, 560)

-			    label      	(object SegLabel @219

-				Parent_View 	@217

-				location   	(501, 481)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.847769

-				height     	67

-				orientation 	0))))

-		(object AttachView "" @220

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@176

-		    supplier   	@212

-		    vertices   	(list Points

-			(373, 1002)

-			(466, 880))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$64" @221

-		    location   	(691, 1474)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	8421504

-		    quidu      	"3E4D514B0089"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptions" @222

-			    Parent_View 	@221

-			    location   	(307, 722)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @223

-				Parent_View 	@222

-				location   	(889, 1610)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	260

-				justify    	0

-				label      	"+descriptions"

-				pctDist    	0.627204

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514B03AA"

-			    client     	@221

-			    supplier   	@201

-			    vertices   	(list Points

-				(691, 1474)

-				(691, 1648)

-				(1110, 1648))

-			    line_style 	3

-			    origin_attachment 	(691, 1474)

-			    terminal_attachment 	(1110, 1648)

-			    label      	(object SegLabel @224

-				Parent_View 	@222

-				location   	(1008, 1690)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.828715

-				height     	42

-				orientation 	1))

-			(object RoleView "$UNNAMED$65" @225

-			    Parent_View 	@221

-			    location   	(307, 722)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D514B03C8"

-			    client     	@221

-			    supplier   	@212

-			    vertices   	(list Points

-				(691, 1474)

-				(691, 880))

-			    line_style 	3

-			    origin_attachment 	(691, 1474)

-			    terminal_attachment 	(691, 880))))))

-	(object ClassDiagram "Servlet Descriptors"

-	    quid       	"38C08E5C01F5"

-	    title      	"Servlet Descriptors"

-	    documentation 	"The servlet-class element contains the fully qualified class name of the servlet."

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	1220

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @226

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(837, 2048)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@226

-			location   	(659, 1970)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4D451F01FB"

-		    width      	374

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ServletType" @227

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2000, 96)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@227

-			location   	(1818, 18)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	364

-			justify    	0

-			label      	"ServletType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2320311"

-		    compartment 	(object Compartment

-			Parent_View 	@227

-			location   	(1818, 79)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	397)

-		    width      	382

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::JSPType" @228

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1424, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@228

-			location   	(1286, 34)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	276

-			justify    	0

-			label      	"JSPType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2640273"

-		    compartment 	(object Compartment

-			Parent_View 	@228

-			location   	(1286, 95)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	313)

-		    width      	294

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::InitParam" @229

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(288, 1136)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@229

-			location   	(94, 1011)

-			nlines     	1

-			max_width  	388

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16777215

-		    quidu      	"38C08E9D0325"

-		    compartment 	(object Compartment

-			Parent_View 	@229

-			location   	(94, 1072)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			anchor     	2

-			nlines     	4

-			max_width  	413)

-		    width      	406

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::SecurityRoleRef" @230

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1824, 752)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@230

-			location   	(1646, 574)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	356

-			justify    	0

-			label      	"SecurityRoleRef")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"371BC7A0025C"

-		    compartment 	(object Compartment

-			Parent_View 	@230

-			location   	(1646, 689)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	374

-		    height     	380

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WebType" @231

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1792, 416)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@231

-			location   	(1690, 366)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	204

-			justify    	0

-			label      	"WebType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A1F70294"

-		    width      	222

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @232

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A28C02AD"

-		    client     	@227

-		    supplier   	@231

-		    vertices   	(list Points

-			(1941, 186)

-			(1832, 353))

-		    line_style 	0)

-		(object InheritView "" @233

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C0A2900258"

-		    client     	@228

-		    supplier   	@231

-		    vertices   	(list Points

-			(1533, 202)

-			(1716, 353))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::RunAsSpecifiedIdentity" @234

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1847, 1164)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@234

-			location   	(1622, 1055)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	450

-			justify    	0

-			label      	"RunAsSpecifiedIdentity")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"39BF2C9E02C8"

-		    width      	468

-		    height     	242

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ParamValue" @235

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(484, 1637)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@235

-			location   	(307, 1484)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C221202C1"

-		    compartment 	(object Compartment

-			Parent_View 	@235

-			location   	(307, 1599)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	372

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @236

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(496, 336)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@236

-			location   	(186, 235)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	620

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    compartment 	(object Compartment

-			Parent_View 	@236

-			location   	(186, 296)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	650)

-		    width      	638

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$16" @237

-		    location   	(393, 723)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122B501BB"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$17" @238

-			    Parent_View 	@237

-			    location   	(73, -413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @239

-				Parent_View 	@238

-				location   	(309, 532)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	144

-				justify    	0

-				label      	""

-				pctDist    	0.698718

-				height     	85

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122B60145"

-			    client     	@237

-			    supplier   	@236

-			    vertices   	(list Points

-				(393, 723)

-				(393, 448))

-			    line_style 	3

-			    origin_attachment 	(393, 723)

-			    terminal_attachment 	(393, 448)

-			    label      	(object SegLabel @240

-				Parent_View 	@238

-				location   	(465, 532)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.698718

-				height     	72

-				orientation 	1))

-			(object RoleView "params" @241

-			    Parent_View 	@237

-			    location   	(73, -413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @242

-				Parent_View 	@241

-				location   	(486, 916)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	165

-				justify    	0

-				label      	"+params"

-				pctDist    	0.707182

-				height     	93

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122B60159"

-			    client     	@237

-			    supplier   	@229

-			    vertices   	(list Points

-				(393, 723)

-				(393, 998))

-			    line_style 	3

-			    origin_attachment 	(393, 723)

-			    terminal_attachment 	(393, 998)

-			    label      	(object SegLabel @243

-				Parent_View 	@241

-				location   	(350, 915)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.700637

-				height     	44

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$18" @244

-		    location   	(1310, 396)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122C00199"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$19" @245

-			    Parent_View 	@244

-			    location   	(-594, -772)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @246

-				Parent_View 	@245

-				location   	(897, 360)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.836449

-				height     	37

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1028B"

-			    client     	@244

-			    supplier   	@236

-			    vertices   	(list Points

-				(1310, 396)

-				(815, 396))

-			    line_style 	3

-			    origin_attachment 	(1310, 396)

-			    terminal_attachment 	(815, 396))

-			(object RoleView "securityRoleRefs" @247

-			    Parent_View 	@244

-			    location   	(-594, -772)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @248

-				Parent_View 	@247

-				location   	(1573, 365)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	336

-				justify    	0

-				label      	"+securityRoleRefs"

-				pctDist    	0.533816

-				height     	32

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122C1029F"

-			    client     	@244

-			    supplier   	@230

-			    vertices   	(list Points

-				(1310, 396)

-				(1639, 396)

-				(1639, 562))

-			    line_style 	3

-			    origin_attachment 	(1310, 396)

-			    terminal_attachment 	(1639, 562)

-			    label      	(object SegLabel @249

-				Parent_View 	@247

-				location   	(1603, 448)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.770531

-				height     	37

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$15" @250

-		    location   	(1248, 359)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C122AC014A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webType" @251

-			    Parent_View 	@250

-			    location   	(112, 39)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @252

-				Parent_View 	@251

-				location   	(1562, 402)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	188

-				justify    	0

-				label      	"+webType"

-				pctDist    	0.724390

-				height     	43

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0015"

-			    client     	@250

-			    supplier   	@231

-			    vertices   	(list Points

-				(1248, 359)

-				(1681, 359))

-			    line_style 	3

-			    origin_attachment 	(1248, 359)

-			    terminal_attachment 	(1681, 359)

-			    label      	(object SegLabel @253

-				Parent_View 	@251

-				location   	(1637, 306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "servlet" @254

-			    Parent_View 	@250

-			    location   	(112, 39)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @255

-				Parent_View 	@254

-				location   	(903, 401)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	141

-				justify    	0

-				label      	"+servlet"

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C122AD0001"

-			    client     	@250

-			    supplier   	@236

-			    vertices   	(list Points

-				(1248, 359)

-				(815, 359))

-			    line_style 	3

-			    origin_attachment 	(1248, 359)

-			    terminal_attachment 	(815, 359)

-			    label      	(object SegLabel @256

-				Parent_View 	@254

-				location   	(877, 322)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.858537

-				height     	38

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$42" @257

-		    location   	(746, 1169)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"39982A2E0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "$UNNAMED$43" @258

-			    Parent_View 	@257

-			    location   	(-334, 239)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @259

-				Parent_View 	@258

-				location   	(558, 622)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	450

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F018E"

-			    client     	@257

-			    supplier   	@236

-			    vertices   	(list Points

-				(746, 1169)

-				(599, 1169)

-				(599, 449))

-			    line_style 	3

-			    origin_attachment 	(746, 1169)

-			    terminal_attachment 	(599, 449))

-			(object RoleView "runAs" @260

-			    Parent_View 	@257

-			    location   	(-334, 239)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @261

-				Parent_View 	@260

-				location   	(1516, 1223)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+runAs"

-				pctDist    	0.889843

-				height     	54

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F0184"

-			    client     	@257

-			    supplier   	@234

-			    vertices   	(list Points

-				(746, 1169)

-				(1613, 1169))

-			    line_style 	3

-			    origin_attachment 	(746, 1169)

-			    terminal_attachment 	(1613, 1169)

-			    label      	(object SegLabel @262

-				Parent_View 	@260

-				location   	(1543, 1126)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.919886

-				height     	44

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$48" @263

-		    location   	(528, 960)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D46E70387"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams" @264

-			    Parent_View 	@263

-			    location   	(14, 570)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @265

-				Parent_View 	@264

-				location   	(404, 1406)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+initParams"

-				pctDist    	0.871622

-				height     	125

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D46E90005"

-			    client     	@263

-			    supplier   	@235

-			    vertices   	(list Points

-				(528, 960)

-				(528, 1472))

-			    line_style 	3

-			    origin_attachment 	(528, 960)

-			    terminal_attachment 	(528, 1472)

-			    label      	(object SegLabel @266

-				Parent_View 	@264

-				location   	(582, 1421)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$49" @267

-			    Parent_View 	@263

-			    location   	(14, 570)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D46E90019"

-			    client     	@263

-			    supplier   	@236

-			    vertices   	(list Points

-				(528, 960)

-				(528, 449))

-			    line_style 	3

-			    origin_attachment 	(528, 960)

-			    terminal_attachment 	(528, 449))))))

-	(object ClassDiagram "WelcomeFile Relation"

-	    quid       	"38C0A8210287"

-	    title      	"WelcomeFile Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::WelcomeFileList" @268

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1120, 192)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@268

-			location   	(948, 142)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	344

-			justify    	0

-			label      	"WelcomeFileList")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07AAD01A8"

-		    width      	362

-		    height     	124

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WelcomeFile" @269

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 672)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@269

-			location   	(894, 594)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	388

-			justify    	0

-			label      	"WelcomeFile")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A5A800E9"

-		    compartment 	(object Compartment

-			Parent_View 	@269

-			location   	(894, 655)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	419)

-		    width      	406

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$20" @270

-		    location   	(1003, 417)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C123AF02C4"

-		    roleview_list 	(list RoleViews

-			(object RoleView "fileList" @271

-			    Parent_View 	@270

-			    location   	(-69, -191)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @272

-				Parent_View 	@271

-				location   	(899, 287)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	144

-				justify    	0

-				label      	"+fileList"

-				pctDist    	0.797101

-				height     	105

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C123B30111"

-			    client     	@270

-			    supplier   	@268

-			    vertices   	(list Points

-				(1003, 417)

-				(1003, 254))

-			    line_style 	3

-			    origin_attachment 	(1003, 417)

-			    terminal_attachment 	(1003, 254)

-			    label      	(object SegLabel @273

-				Parent_View 	@271

-				location   	(1074, 291)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.775362

-				height     	71

-				orientation 	1))

-			(object RoleView "file" @274

-			    Parent_View 	@270

-			    location   	(-69, -191)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @275

-				Parent_View 	@274

-				location   	(962, 548)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	72

-				justify    	0

-				label      	"+file"

-				pctDist    	0.800000

-				height     	42

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C123B3011B"

-			    client     	@270

-			    supplier   	@269

-			    vertices   	(list Points

-				(1003, 417)

-				(1003, 581))

-			    line_style 	3

-			    origin_attachment 	(1003, 417)

-			    terminal_attachment 	(1003, 581)

-			    label      	(object SegLabel @276

-				Parent_View 	@274

-				location   	(1058, 543)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.776978

-				height     	55

-				orientation 	0))))))

-	(object ClassDiagram "WebResourceCollection Relation"

-	    quid       	"38C0A8600241"

-	    title      	"WebResourceCollection Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	175

-	    origin_y   	106

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::HTTPMethodTypeEnum" @277

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1888, 688)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@277

-			location   	(1658, 479)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"HTTPMethodTypeEnum")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@277

-			location   	(1658, 429)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	460

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2E200C6"

-		    compartment 	(object Compartment

-			Parent_View 	@277

-			location   	(1658, 540)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	228)

-		    width      	478

-		    height     	542

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::URLPatternType" @278

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(656, 864)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@278

-			location   	(470, 783)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	372

-			justify    	0

-			label      	"URLPatternType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C0A2C50042"

-		    compartment 	(object Compartment

-			Parent_View 	@278

-			location   	(470, 844)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	369)

-		    width      	390

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::HTTPMethodType" @279

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1376, 832)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@279

-			location   	(1176, 751)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	400

-			justify    	0

-			label      	"HTTPMethodType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E930B050065"

-		    compartment 	(object Compartment

-			Parent_View 	@279

-			location   	(1176, 812)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	397)

-		    width      	418

-		    height     	186

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::WebResourceCollection" @280

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1040, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@280

-			location   	(592, 84)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	896

-			justify    	0

-			label      	"WebResourceCollection")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07B8703AB"

-		    compartment 	(object Compartment

-			Parent_View 	@280

-			location   	(592, 145)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	894)

-		    width      	914

-		    height     	336

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$21" @281

-		    location   	(824, 589)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C124090179"

-		    roleview_list 	(list RoleViews

-			(object RoleView "resCollection" @282

-			    Parent_View 	@281

-			    location   	(136, -115)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @283

-				Parent_View 	@282

-				location   	(750, 472)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	264

-				justify    	0

-				label      	"+resCollection"

-				pctDist    	0.289589

-				height     	126

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C1240A0256"

-			    client     	@281

-			    supplier   	@280

-			    vertices   	(list Points

-				(824, 589)

-				(935, 408))

-			    line_style 	0

-			    label      	(object SegLabel @284

-				Parent_View 	@282

-				location   	(810, 513)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.274733

-				height     	53

-				orientation 	0))

-			(object RoleView "URLs" @285

-			    Parent_View 	@281

-			    location   	(136, -115)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @286

-				Parent_View 	@285

-				location   	(627, 711)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	132

-				justify    	0

-				label      	"+URLs"

-				pctDist    	0.976229

-				height     	106

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C1240A0260"

-			    client     	@281

-			    supplier   	@278

-			    vertices   	(list Points

-				(824, 589)

-				(713, 770))

-			    line_style 	0

-			    label      	(object SegLabel @287

-				Parent_View 	@285

-				location   	(802, 739)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.663320

-				height     	60

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$66" @288

-		    location   	(1228, 573)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E930B11030B"

-		    roleview_list 	(list RoleViews

-			(object RoleView "HTTPs" @289

-			    Parent_View 	@288

-			    location   	(183, 328)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @290

-				Parent_View 	@289

-				location   	(1189, 679)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	145

-				justify    	0

-				label      	"+HTTPs"

-				pctDist    	0.381010

-				height     	87

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E930B1200DC"

-			    client     	@288

-			    supplier   	@279

-			    vertices   	(list Points

-				(1228, 573)

-				(1322, 738))

-			    line_style 	0

-			    label      	(object SegLabel @291

-				Parent_View 	@289

-				location   	(1359, 695)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "resCollection" @292

-			    Parent_View 	@288

-			    location   	(183, 328)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @293

-				Parent_View 	@292

-				location   	(1332, 468)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	257

-				justify    	0

-				label      	"+resCollection"

-				pctDist    	0.218163

-				height     	142

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E930B1200E6"

-			    client     	@288

-			    supplier   	@280

-			    vertices   	(list Points

-				(1228, 573)

-				(1135, 408))

-			    line_style 	0

-			    label      	(object SegLabel @294

-				Parent_View 	@292

-				location   	(1100, 466)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.827573

-				height     	60

-				orientation 	0))))))

-	(object ClassDiagram "loginConfig Relation"

-	    quid       	"38C0A8BF03E2"

-	    title      	"loginConfig Relation"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	13

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::LoginConfig" @295

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1104, 208)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@295

-			location   	(753, 83)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	702

-			justify    	0

-			label      	"LoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D0F006F"

-		    compartment 	(object Compartment

-			Parent_View 	@295

-			location   	(753, 144)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	742)

-		    width      	720

-		    height     	274

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::FormLoginConfig" @296

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1136, 896)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@296

-			location   	(917, 795)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	438

-			justify    	0

-			label      	"FormLoginConfig")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C07D390296"

-		    compartment 	(object Compartment

-			Parent_View 	@296

-			location   	(917, 856)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	463)

-		    width      	456

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$22" @297

-		    location   	(1136, 564)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"38C1248900BE"

-		    roleview_list 	(list RoleViews

-			(object RoleView "loginConfig" @298

-			    Parent_View 	@297

-			    location   	(0, -332)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @299

-				Parent_View 	@298

-				location   	(1004, 369)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+loginConfig"

-				pctDist    	0.892952

-				height     	133

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C124890303"

-			    client     	@297

-			    supplier   	@295

-			    vertices   	(list Points

-				(1136, 564)

-				(1136, 345))

-			    line_style 	3

-			    origin_attachment 	(1136, 564)

-			    terminal_attachment 	(1136, 345)

-			    label      	(object SegLabel @300

-				Parent_View 	@298

-				location   	(1190, 367)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "formLoginConfig" @301

-			    Parent_View 	@297

-			    location   	(0, -332)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @302

-				Parent_View 	@301

-				location   	(968, 748)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	327

-				justify    	0

-				label      	"+formLoginConfig"

-				pctDist    	0.844073

-				height     	169

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"38C12489030D"

-			    client     	@297

-			    supplier   	@296

-			    vertices   	(list Points

-				(1136, 564)

-				(1136, 783))

-			    line_style 	3

-			    origin_attachment 	(1136, 564)

-			    terminal_attachment 	(1136, 783)

-			    label      	(object SegLabel @303

-				Parent_View 	@301

-				location   	(1190, 761)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::webapplication::AuthMethodKind" @304

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(368, 640)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@304

-			location   	(190, 490)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"AuthMethodKind")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@304

-			location   	(190, 440)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	353

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3EE0A2D8029A"

-		    compartment 	(object Compartment

-			Parent_View 	@304

-			location   	(190, 551)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	6

-			max_width  	319)

-		    width      	374

-		    height     	424

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "data types"

-	    quid       	"39048A240321"

-	    title      	"data types"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::webapplication::TransportGuaranteeType" @305

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(352, 432)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@305

-			location   	(114, 329)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"TransportGuaranteeType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@305

-			location   	(114, 279)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	476

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"390461A9018F"

-		    compartment 	(object Compartment

-			Parent_View 	@305

-			location   	(114, 390)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	338)

-		    width      	494

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::ResAuthTypeBase" @306

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(944, 240)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@306

-			location   	(755, 108)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	378

-			justify    	0

-			label      	"ResAuthTypeBase")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@306

-			location   	(755, 58)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	378

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C09ED400B4"

-		    compartment 	(object Compartment

-			Parent_View 	@306

-			location   	(755, 223)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	259)

-		    width      	396

-		    height     	388

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::ResAuthServletType" @307

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(944, 736)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@307

-			location   	(741, 657)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	406

-			justify    	0

-			label      	"ResAuthServletType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@307

-			location   	(741, 607)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	406

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C09EEA0265"

-		    compartment 	(object Compartment

-			Parent_View 	@307

-			location   	(741, 718)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	281)

-		    width      	424

-		    height     	282

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "Servlet2.4 - Filters"

-	    quid       	"39BFB13E021A"

-	    title      	"Servlet2.4 - Filters"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object NoteView @308

-		    location   	(3070, 200)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	16777215

-			default_color 	FALSE)

-		    label      	(object ItemLabel

-			Parent_View 	@308

-			location   	(2691, 81)

-			fill_color 	13434879

-			nlines     	4

-			max_width  	722

-			label      	"TODO: Implement helpers for resolution of Servlet and Filter for FilterMapping by servletName and name.  Since we have refs, we may want to remove the names.")

-		    line_color 	3342489

-		    fill_color 	255

-		    width      	782

-		    height     	250)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @309

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2160, 544)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@309

-			location   	(2079, 498)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	162

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Listener" @310

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2267, 115)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@310

-			location   	(2147, 37)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	240

-			justify    	0

-			label      	"Listener")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434833

-		    quidu      	"39BFB26001BD"

-		    width      	258

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @311

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@308

-		    supplier   	@310

-		    vertices   	(list Points

-			(2678, 157)

-			(2396, 127))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::webapplication::InitParam" @312

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(256, 1168)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@312

-			location   	(62, 1067)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	388

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C08E9D0325"

-		    compartment 	(object Compartment

-			Parent_View 	@312

-			location   	(62, 1128)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	413)

-		    width      	406

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::FilterMapping" @313

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1408, 576)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@313

-			location   	(1011, 475)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	794

-			justify    	0

-			label      	"FilterMapping")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BFB14C03DD"

-		    compartment 	(object Compartment

-			Parent_View 	@313

-			location   	(1011, 536)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	826)

-		    width      	812

-		    height     	226

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$36" @314

-		    location   	(1942, 538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C005BB00B9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "servlet" @315

-			    Parent_View 	@314

-			    location   	(694, -6)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @316

-				Parent_View 	@315

-				location   	(2006, 499)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	141

-				justify    	0

-				label      	"+servlet"

-				pctDist    	0.497041

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C005BC004D"

-			    client     	@314

-			    supplier   	@309

-			    vertices   	(list Points

-				(1942, 538)

-				(2070, 538))

-			    line_style 	3

-			    origin_attachment 	(1942, 538)

-			    terminal_attachment 	(2070, 538)

-			    label      	(object SegLabel @317

-				Parent_View 	@315

-				location   	(2034, 591)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.715976

-				height     	53

-				orientation 	1))

-			(object RoleView "$UNNAMED$37" @318

-			    Parent_View 	@314

-			    location   	(694, -6)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C005BC0061"

-			    client     	@314

-			    supplier   	@313

-			    vertices   	(list Points

-				(1942, 538)

-				(1814, 538))

-			    line_style 	3

-			    origin_attachment 	(1942, 538)

-			    terminal_attachment 	(1814, 538))))

-		(object ClassView "Class" "Logical View::webapplication::WebApp" @319

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(912, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@319

-			location   	(818, 66)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	188

-			justify    	0

-			label      	"WebApp")

-		    icon_style 	"None"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C077FB0352"

-		    width      	206

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$28" @320

-		    location   	(1233, 207)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BFB4150298"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filterMappings" @321

-			    Parent_View 	@320

-			    location   	(321, 95)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @322

-				Parent_View 	@321

-				location   	(1398, 401)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+filterMappings"

-				pctDist    	0.757813

-				height     	165

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB4160127"

-			    client     	@320

-			    supplier   	@313

-			    vertices   	(list Points

-				(1233, 207)

-				(1233, 463))

-			    line_style 	3

-			    origin_attachment 	(1233, 207)

-			    terminal_attachment 	(1233, 463)

-			    label      	(object SegLabel @323

-				Parent_View 	@321

-				location   	(1179, 393)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.726563

-				height     	55

-				orientation 	1))

-			(object RoleView "$UNNAMED$29" @324

-			    Parent_View 	@320

-			    location   	(321, 95)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @325

-				Parent_View 	@324

-				location   	(1072, 189)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.800000

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB4160128"

-			    client     	@320

-			    supplier   	@319

-			    vertices   	(list Points

-				(1233, 207)

-				(1233, 147)

-				(1015, 147))

-			    line_style 	3

-			    origin_attachment 	(1233, 207)

-			    terminal_attachment 	(1015, 147))))

-		(object AssociationViewNew "$UNNAMED$30" @326

-		    location   	(1576, 119)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BFB54D01EC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "listeners" @327

-			    Parent_View 	@326

-			    location   	(664, 7)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @328

-				Parent_View 	@327

-				location   	(1915, 179)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	186

-				justify    	0

-				label      	"+listeners"

-				pctDist    	0.605735

-				height     	60

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB54E0215"

-			    client     	@326

-			    supplier   	@310

-			    vertices   	(list Points

-				(1576, 119)

-				(2138, 119))

-			    line_style 	3

-			    origin_attachment 	(1576, 119)

-			    terminal_attachment 	(2138, 119)

-			    label      	(object SegLabel @329

-				Parent_View 	@327

-				location   	(2083, 49)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.904412

-				height     	71

-				orientation 	0))

-			(object RoleView "$UNNAMED$31" @330

-			    Parent_View 	@326

-			    location   	(664, 7)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB54E0220"

-			    client     	@326

-			    supplier   	@319

-			    vertices   	(list Points

-				(1576, 119)

-				(1015, 119))

-			    line_style 	3

-			    origin_attachment 	(1576, 119)

-			    terminal_attachment 	(1015, 119))))

-		(object ClassView "Class" "Logical View::java::JavaClass" @331

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2258, 922)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@331

-			location   	(2165, 843)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	186

-			justify    	0

-			label      	"JavaClass")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"36549FCC00FA"

-		    width      	204

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$40" @332

-		    location   	(2328, 518)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C03E6C035A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "listenerClass" @333

-			    Parent_View 	@332

-			    location   	(424, 358)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @334

-				Parent_View 	@333

-				location   	(2191, 785)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	275

-				justify    	0

-				label      	"+listenerClass"

-				pctDist    	0.856269

-				height     	138

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02A7"

-			    client     	@332

-			    supplier   	@331

-			    vertices   	(list Points

-				(2328, 518)

-				(2328, 831))

-			    line_style 	3

-			    origin_attachment 	(2328, 518)

-			    terminal_attachment 	(2328, 831)

-			    label      	(object SegLabel @335

-				Parent_View 	@333

-				location   	(2382, 775)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.821918

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$41" @336

-			    Parent_View 	@332

-			    location   	(424, 358)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03E6D02CF"

-			    client     	@332

-			    supplier   	@310

-			    vertices   	(list Points

-				(2328, 518)

-				(2328, 205))

-			    line_style 	3

-			    origin_attachment 	(2328, 518)

-			    terminal_attachment 	(2328, 205))))

-		(object ClassView "Class" "Logical View::common::ParamValue" @337

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(384, 1538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@337

-			location   	(207, 1385)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"ParamValue")

-		    icon_style 	"Icon"

-		    line_color 	8421504

-		    fill_color 	12632256

-		    quidu      	"3E4C221202C1"

-		    compartment 	(object Compartment

-			Parent_View 	@337

-			location   	(207, 1500)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	391)

-		    width      	372

-		    height     	330

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::webapplication::Filter" @338

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(368, 576)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@338

-			location   	(237, 498)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	262

-			justify    	0

-			label      	"Filter")

-		    icon_style 	"Icon"

-		    line_color 	4227072

-		    fill_color 	13434833

-		    quidu      	"39BFB15503CC"

-		    compartment 	(object Compartment

-			Parent_View 	@338

-			location   	(237, 559)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	294)

-		    width      	280

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$32" @339

-		    location   	(265, 860)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C0026E02D1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams" @340

-			    Parent_View 	@339

-			    location   	(-87, 284)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @341

-				Parent_View 	@340

-				location   	(122, 977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	228

-				justify    	0

-				label      	"+initParams"

-				pctDist    	0.600000

-				height     	144

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0026F0160"

-			    client     	@339

-			    supplier   	@312

-			    vertices   	(list Points

-				(265, 860)

-				(265, 1055))

-			    line_style 	3

-			    origin_attachment 	(265, 860)

-			    terminal_attachment 	(265, 1055)

-			    label      	(object SegLabel @342

-				Parent_View 	@340

-				location   	(320, 977)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.600000

-				height     	55

-				orientation 	0))

-			(object RoleView "$UNNAMED$33" @343

-			    Parent_View 	@339

-			    location   	(-87, 284)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0026F016A"

-			    client     	@339

-			    supplier   	@338

-			    vertices   	(list Points

-				(265, 860)

-				(265, 666))

-			    line_style 	3

-			    origin_attachment 	(265, 860)

-			    terminal_attachment 	(265, 666))))

-		(object AssociationViewNew "$UNNAMED$34" @344

-		    location   	(755, 538)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C0056A0293"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filter" @345

-			    Parent_View 	@344

-			    location   	(-493, -6)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @346

-				Parent_View 	@345

-				location   	(616, 498)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	106

-				justify    	0

-				label      	"+filter"

-				pctDist    	0.566176

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0056B0321"

-			    client     	@344

-			    supplier   	@338

-			    vertices   	(list Points

-				(755, 538)

-				(508, 538))

-			    line_style 	3

-			    origin_attachment 	(755, 538)

-			    terminal_attachment 	(508, 538)

-			    label      	(object SegLabel @347

-				Parent_View 	@345

-				location   	(561, 591)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.786765

-				height     	53

-				orientation 	0))

-			(object RoleView "$UNNAMED$35" @348

-			    Parent_View 	@344

-			    location   	(-493, -6)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C0056B032B"

-			    client     	@344

-			    supplier   	@313

-			    vertices   	(list Points

-				(755, 538)

-				(1002, 538))

-			    line_style 	3

-			    origin_attachment 	(755, 538)

-			    terminal_attachment 	(1002, 538))))

-		(object AssociationViewNew "$UNNAMED$26" @349

-		    location   	(475, 112)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39BFB3B101CC"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filters" @350

-			    Parent_View 	@349

-			    location   	(-437, 0)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @351

-				Parent_View 	@350

-				location   	(502, 439)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	134

-				justify    	0

-				label      	"+filters"

-				pctDist    	0.893891

-				height     	87

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB3B20123"

-			    client     	@349

-			    supplier   	@338

-			    vertices   	(list Points

-				(475, 112)

-				(415, 112)

-				(415, 486))

-			    line_style 	3

-			    origin_attachment 	(475, 112)

-			    terminal_attachment 	(415, 486)

-			    label      	(object SegLabel @352

-				Parent_View 	@350

-				location   	(358, 439)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.893891

-				height     	58

-				orientation 	1))

-			(object RoleView "$UNNAMED$27" @353

-			    Parent_View 	@349

-			    location   	(-437, 0)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @354

-				Parent_View 	@353

-				location   	(672, 72)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				hidden     	TRUE

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	60

-				justify    	0

-				label      	""

-				pctDist    	0.589342

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39BFB3B2012D"

-			    client     	@349

-			    supplier   	@319

-			    vertices   	(list Points

-				(475, 112)

-				(809, 112))

-			    line_style 	3

-			    origin_attachment 	(475, 112)

-			    terminal_attachment 	(809, 112))))

-		(object AssociationViewNew "$UNNAMED$38" @355

-		    location   	(1211, 871)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39C03C280356"

-		    roleview_list 	(list RoleViews

-			(object RoleView "filterClass" @356

-			    Parent_View 	@355

-			    location   	(859, 295)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @357

-				Parent_View 	@356

-				location   	(1886, 925)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	215

-				justify    	0

-				label      	"+filterClass"

-				pctDist    	0.714542

-				height     	54

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03C290267"

-			    client     	@355

-			    supplier   	@331

-			    vertices   	(list Points

-				(1211, 871)

-				(2156, 871))

-			    line_style 	3

-			    origin_attachment 	(1211, 871)

-			    terminal_attachment 	(2156, 871)

-			    label      	(object SegLabel @358

-				Parent_View 	@356

-				location   	(2061, 925)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$39" @359

-			    Parent_View 	@355

-			    location   	(859, 295)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39C03C29028F"

-			    client     	@355

-			    supplier   	@338

-			    vertices   	(list Points

-				(1211, 871)

-				(922, 871)

-				(922, 629)

-				(508, 629))

-			    line_style 	3

-			    origin_attachment 	(1211, 871)

-			    terminal_attachment 	(508, 629))))

-		(object AttachView "" @360

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@308

-		    supplier   	@338

-		    vertices   	(list Points

-			(2678, 253)

-			(508, 555))

-		    line_style 	0)

-		(object AssociationViewNew "$UNNAMED$46" @361

-		    location   	(384, 1019)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	10949559

-		    quidu      	"3E4D43AA000A"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParamValues" @362

-			    Parent_View 	@361

-			    location   	(32, 443)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @363

-				Parent_View 	@362

-				location   	(219, 1311)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	320

-				justify    	0

-				label      	"+initParamValues"

-				pctDist    	0.825420

-				height     	166

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43AA0245"

-			    client     	@361

-			    supplier   	@337

-			    vertices   	(list Points

-				(384, 1019)

-				(384, 1373))

-			    line_style 	3

-			    origin_attachment 	(384, 1019)

-			    terminal_attachment 	(384, 1373)

-			    label      	(object SegLabel @364

-				Parent_View 	@362

-				location   	(438, 1338)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$47" @365

-			    Parent_View 	@361

-			    location   	(32, 443)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E4D43AA024F"

-			    client     	@361

-			    supplier   	@338

-			    vertices   	(list Points

-				(384, 1019)

-				(384, 666))

-			    line_style 	3

-			    origin_attachment 	(384, 1019)

-			    terminal_attachment 	(384, 666))))

-		(object ClassView "Class" "Logical View::webapplication::DispatcherType" @366

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2736, 624)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@366

-			location   	(2558, 498)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	356

-			justify    	0

-			label      	"DispatcherType")

-		    stereotype 	(object ItemLabel

-			Parent_View 	@366

-			location   	(2558, 448)

-			fill_color 	13434879

-			anchor     	10

-			nlines     	1

-			max_width  	353

-			justify    	0

-			label      	"<<enumeration>>")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D445B0376"

-		    compartment 	(object Compartment

-			Parent_View 	@366

-			location   	(2558, 559)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	260)

-		    width      	374

-		    height     	376

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @367

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1553, 1188)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	TRUE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@367

-			location   	(1374, 1110)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	358

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	10949559

-		    fill_color 	15778042

-		    quidu      	"3E4D451F01FB"

-		    width      	376

-		    height     	180

-		    annotation 	8

-		    autoResize 	TRUE)))

-	(object ClassDiagram "Servlet2.4 - Security"

-	    quid       	"399829CD0197"

-	    title      	"Servlet2.4 - Security"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object NoteView @368

-		    location   	(1104, 704)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@368

-			location   	(825, 641)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	522

-			label      	"See common::Security diagram for further details.")

-		    line_color 	3342489

-		    fill_color 	13434833

-		    width      	582

-		    height     	138)

-		(object ClassView "Class" "Logical View::common::RunAsSpecifiedIdentity" @369

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 368)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@369

-			location   	(919, 289)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	274

-			justify    	0

-			label      	"RunAsSpecifiedIdentity")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"39BF2C9E02C8"

-		    width      	292

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AttachView "" @370

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    client     	@368

-		    supplier   	@369

-		    vertices   	(list Points

-			(1093, 634)

-			(1068, 459))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::webapplication::Servlet" @371

-		    ShowCompartmentStereotypes 	TRUE

-		    SuppressAttribute 	TRUE

-		    SuppressOperation 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(320, 352)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@371

-			location   	(239, 306)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	162

-			justify    	0

-			label      	"Servlet")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"38C079140251"

-		    height     	117

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$42" @372

-		    location   	(660, 347)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	32768

-		    quidu      	"39982A2E0255"

-		    roleview_list 	(list RoleViews

-			(object RoleView "runAs" @373

-			    Parent_View 	@372

-			    location   	(340, -5)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @374

-				Parent_View 	@373

-				location   	(803, 306)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	136

-				justify    	0

-				label      	"+runAs"

-				pctDist    	0.572816

-				height     	42

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F0184"

-			    client     	@372

-			    supplier   	@369

-			    vertices   	(list Points

-				(660, 347)

-				(910, 347))

-			    line_style 	3

-			    origin_attachment 	(660, 347)

-			    terminal_attachment 	(910, 347)

-			    label      	(object SegLabel @375

-				Parent_View 	@373

-				location   	(847, 383)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.747573

-				height     	36

-				orientation 	1))

-			(object RoleView "$UNNAMED$43" @376

-			    Parent_View 	@372

-			    location   	(340, -5)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"39982A2F018E"

-			    client     	@372

-			    supplier   	@371

-			    vertices   	(list Points

-				(660, 347)

-				(410, 347))

-			    line_style 	3

-			    origin_attachment 	(660, 347)

-			    terminal_attachment 	(410, 347))))

-		(object Label @377

-		    location   	(80, 80)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    nlines     	1

-		    max_width  	1173

-		    label      	"Servlet 2.3 has introduced RunAs security identity for Servlets:")))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.ecore
deleted file mode 100644
index 8898d2a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webapplication.ecore
+++ /dev/null
@@ -1,538 +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="webapplication"

-    nsURI="webapplication.xmi" nsPrefix="com.ibm.etools.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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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="@since 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">

-    <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="@since 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">

-    <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">

-    <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">

-    <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">

-    <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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <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="@since 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">

-    <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="@since 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="@since 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="@since 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="@since 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="@since 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="@since J2EE1.4 deprecated, becomes httpMethod"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AuthConstraint">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="UserDataConstraint">

-    <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="@since 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="@since J2EE1.4"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="LoginConfig">

-    <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="@since 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="@since 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">

-    <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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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"/>

-  <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">

-    <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">

-    <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">

-    <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">

-    <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="@since 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="@since 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">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="localEncodingMappings"

-        lowerBound="1" upperBound="-1" eType="#//LocalEncodingMapping" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="LocalEncodingMapping">

-    <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">

-    <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/rose/webservice-j2ee.mdl b/plugins/org.eclipse.jst.j2ee.core/rose/webservice-j2ee.mdl
deleted file mode 100644
index b0c003f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webservice-j2ee.mdl
+++ /dev/null
@@ -1,8928 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Java"
-	    name       	"IDE"
-	    value      	"Internal Editor")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply1"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply2"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagName3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagText3"
-	    value      	"")
-	(object Attribute
-	    tool       	"Java"
-	    name       	"UserDefineTagApply3"
-	    value      	""))
-    quid       	"3E109E88030F"
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	TRUE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3E109E880311"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3E109E8A0178"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3E109E880310"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3E109E880312"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "wscommon"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wscommon.cat"
-		quid       	"3E15B4C0016F")
-	    (object Class_Category "jaxrpcmap"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jaxrpcmap.cat"
-		quid       	"3E161FA90266")
-	    (object Class_Category "wsdd"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\wsdd.cat"
-		quid       	"3E109EAD0319")
-	    (object Class_Category "common"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\common.cat"
-		quid       	"38C08F0F038D")
-	    (object Class_Category "java"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jem\\rose\\edocjava2.cat"
-		quid       	"36549F2C004E")
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.emf.ecore\\src-ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E")
-	    (object Class_Category "ejb"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\ejbschema.cat"
-		quid       	"3780E272032D")
-	    (object Class_Category "webapplication"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webapplication.cat"
-		quid       	"38C076D603DD")
-	    (object Class_Category "wsclient"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\webservices_client_1_0.cat"
-		quid       	"3E4D2F4B02AA")
-	    (object Class_Category "jsp"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$WORKSPACE_ROOT\\org.eclipse.jst.j2ee.core\\rose\\jsp_2_0.cat"
-		quid       	"3E4D4F69036B"))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3E15B47D02E0"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::common" @1
-			location   	(688, 768)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    location   	(544, 684)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"common")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"38C08F0F038D"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::ecore" @2
-			location   	(1104, 496)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    location   	(960, 412)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::ejb" @3
-			location   	(1104, 496)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			label      	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(960, 462)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ejb")
-			stereotype 	(object ItemLabel
-			    Parent_View 	@3
-			    location   	(960, 412)
-			    fill_color 	13434879
-			    anchor     	10
-			    nlines     	1
-			    max_width  	288
-			    justify    	0
-			    label      	"<<metamodel>>")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3780E272032D"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3E109E880312"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3E109E8A0177"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3E109E880313"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3E109E880315"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Const"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngRootDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RootPackage"
-			value      	"C++ Reverse Engineered")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"RevEngDirectoriesAsPackages"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderFileExtension"
-			value      	".h")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationFileExtension"
-			value      	".cpp")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewHeaderFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NewImplementationFileDirectory"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalization"
-			value      	("FileCapitalizationSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectories"
-			value      	("CodeGenExtraDirectoriesSet" 0))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"StripClassPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"TabWidth"
-			value      	8)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IndentWidth"
-			value      	4)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"AccessIndentation"
-			value      	-2)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRules"
-			value      	("ModelIdCommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"PageWidth"
-			value      	80)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassMemberOrder"
-			value      	("MemberOrderSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"OneParameterPerLine"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"NamespaceBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ClassBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FunctionBraceStyle"
-			value      	("BraceStyleSet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Copyright"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialHeaderIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialBodyIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeGenExtraDirectoriesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Namespaces"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Packages"
-				value      	2)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"FileCapitalizationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Same as model"
-				value      	0)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Upper case"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Lower case with underscores"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BraceStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B1"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B2"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B3"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B4"
-				value      	4)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"B5"
-				value      	5)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"MemberOrderSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Public First"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Private First"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Order by kind"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Unordered"
-				value      	4)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ModelIdCommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation and reverse engineering"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never generate model IDs"
-				value      	3)))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CreateBackupFiles"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRules"
-			value      	("CommentRulesSet" 1))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CommentRulesSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Always synchronize"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Code generation only"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Reverse engineering only"
-				value      	3)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Never synchronize"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"InitialCodeBody"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBody"
-			value      	("GenerateFunctionBodySet" 2))
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"GenerateFunctionBodySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"Default"
-				value      	2)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"Cplusplus"
-				name       	"False"
-				value      	0)))))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"Synchronize"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"HeaderSourceFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodySourceFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"IsNamespace"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSI C++ Event Watcher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ANSIConvert"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"$ROSEADA83_SOURCE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassAccess"
-			value      	("ImplementationSet" 43))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationType"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"PolymorphicUnit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleAccess"
-			value      	("ImplementationSet" 45))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Discriminant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorKind"
-			value      	("ConstructorKindSet" 199))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"HandleEqualityOperation"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsTask"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"LimitedPrivate"
-				value      	200)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ConstructorKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ClassParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"FunctionReturn"
-				value      	206)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"InOut"
-				value      	203)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Variant"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DataMemberName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada83"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada83"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada83"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"propertyId"
-		value      	"838326200")
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileExtension"
-			value      	"1.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileBackupExtension"
-			value      	"1.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SpecFileTemporaryExtension"
-			value      	"1.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileExtension"
-			value      	"2.ada")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileBackupExtension"
-			value      	"2.ad~")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"BodyFileTemporaryExtension"
-			value      	"2.ad#")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseColonNotation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateBodies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultCodeBody"
-			value      	"[statement]")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"UseFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"$ROSEADA95_SOURCE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeName"
-			value      	"Object")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementation"
-			value      	("TypeImplementationSet" 208))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControl"
-			value      	("TypeControlSet" 225))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlName"
-			value      	"Controlled_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementation"
-			value      	("RecordImplementationSet" 209))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordKindPackageName"
-			value      	"${class}_Record_Kinds")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsLimited"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubtype"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessType"
-			value      	("GenerateAccessTypeSet" 230))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeName"
-			value      	"Handle")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeVisibility"
-			value      	("TypeVisibilitySet" 45))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessTypeDefinition"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessClassWide"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"MaybeAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementation"
-			value      	("ParameterizedImplementationSet" 11))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParentClassName"
-			value      	"Superclass")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EnumerationLiteralPrefix"
-			value      	"A_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldPrefix"
-			value      	"The_")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfTypeName"
-			value      	"Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfTypeName"
-			value      	"Access_Array_Of_${type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayOfAccessTypeName"
-			value      	"Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessArrayOfAccessTypeName"
-			value      	"Access_Array_Of_${access_type}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ArrayIndexDefinition"
-			value      	"Positive range <>")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessorOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateStandardOperations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterName"
-			value      	"This")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDefaultConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DefaultConstructorName"
-			value      	"Create")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateCopyConstructor"
-			value      	("SubprogramKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyConstructorName"
-			value      	"Copy")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDestructor"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DestructorName"
-			value      	"Free")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateTypeEquality"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeEqualityName"
-			value      	"${quote}=${quote}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineEquality"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Tagged"
-				value      	208)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Record"
-				value      	210)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Mixin"
-				value      	211)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Task"
-				value      	212)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"SingleType"
-				value      	209)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"MultipleTypes"
-				value      	213)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterizedImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Unconstrained"
-				value      	214)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Private"
-				value      	43)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"None"
-				value      	225)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InitializationOnly"
-				value      	226)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AssignmentFinalizationOnly"
-				value      	227)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"All"
-				value      	228)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Always"
-				value      	229)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Auto"
-				value      	230)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteType"
-			value      	("IncompleteTypeSet" 1))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"TypeControlVisibility"
-			value      	("TypeVisibilitySet" 43))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IncompleteTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotDeclare"
-				value      	1)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"NoDiscriminantPart"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"UnknownDiscriminantPart"
-				value      	3)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"KnownDiscriminantPart"
-				value      	4)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenericFormalParameters"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsPrivate"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FileName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AdditionalWiths"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsSubunit"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementation"
-			value      	("SubprogramImplementationSet" 2))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Renames"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateOverriding"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterMode"
-			value      	("ParameterModeSet" 203))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ImplicitParameterClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialCodeBody"
-			value      	"${default}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"EntryBarrierCondition"
-			value      	"True")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SubprogramImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Spec"
-				value      	224)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Body"
-				value      	2)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Abstract"
-				value      	221)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Renaming"
-				value      	222)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"RenamingAsBody"
-				value      	231)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Separate"
-				value      	223)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Mode"
-			value      	("ParameterModeSet" 232))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ParameterModeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Default"
-				value      	232)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"In"
-				value      	204)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Out"
-				value      	205)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"InOut"
-				value      	203)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Access"
-				value      	220)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${supplier}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${relationship}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${attribute}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${association}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAssociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AssociateName"
-			value      	"Associate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineAssociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateDissociate"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DissociateName"
-			value      	"Dissociate")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineDissociate"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"NameIfUnlabeled"
-			value      	"The_${targetClass}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementation"
-			value      	("RecordFieldImplementationSet" 216))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldName"
-			value      	"${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateGet"
-			value      	("FunctionKindSet" 199))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessGet"
-			value      	("FunctionKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GetName"
-			value      	"Get_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateSet"
-			value      	("ProcedureKindSet" 202))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"GenerateAccessSet"
-			value      	("ProcedureKindSet" 201))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SetName"
-			value      	"Set_${target}")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsAliased"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"IsConstant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Declare"
-			value      	("DeclareSet" 234))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementation"
-			value      	("ContainerImplementationSet" 217))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerGeneric"
-			value      	"List")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerDeclarations"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ProcedureKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Procedure"
-				value      	202)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"DeclareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Before"
-				value      	233)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"After"
-				value      	234)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"RecordFieldImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Component"
-				value      	216)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Discriminant"
-				value      	218)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"AccessDiscriminant"
-				value      	219)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"ContainerImplementationSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Array"
-				value      	217)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Generic"
-				value      	11)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"FunctionKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"Function"
-				value      	199)
-			    (object Attribute
-				tool       	"Ada95"
-				name       	"DoNotCreate"
-				value      	201)))
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"AccessDiscriminantClassWide"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Representation"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ada95"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"Ada95"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IncludePath"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"PathSeparator"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ImplementationType"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM, 6.0.0-td-h"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM, 6.0.0-td-h"))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"OperationIsOneWay"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ArrayDimensions"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Order"
-			value      	"")
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"project"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SPPackageCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedureCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"JoinCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"cONTAINERCounter"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TablePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ViewPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DomainPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IndexPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"StoreProcedurePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForeignKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpacePrefix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDatabase"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TargetDatabase"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Location"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTableSpace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeault"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"BufferPool"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExtentSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PrefetchSize"
-			value      	1)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PageSize"
-			value      	4)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ManagedBy"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ContainerList"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmSchema"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmDomainPackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootSchema"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRootDomainPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSchemaPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DatabaseID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DBMS"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsView"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDomain"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSPPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Synonymns"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpaceID"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CorrelationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SelectClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckOption"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsSnapShot"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDistinct"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"PersistToServer"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsPackage"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdatable"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIdentity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"NullsAllowed"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ColumnType"
-			value      	"Native")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OID"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRelationship"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceId"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"SourceType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RIMethod"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentUpdateRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRule"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParentDeleteRuleName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrict"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildInsertRestrictName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ChildMultiplicityName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintName"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsConstraint"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ConstraintType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsTrigger"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsStoredProcedure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsCluster"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TableSpace"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"FillFactor"
-			value      	0)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"KeyList"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"CheckPredicate"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DeferalMode"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"InitialCheckTime"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"TriggerType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInsertEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsUpdateEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeleteEvent"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewTable"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefOldRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"RefNewRow"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsRow"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"WhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Language"
-			value      	"SQL")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ProcType"
-			value      	"Procedure")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsDeterministic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ParameterStyle"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ReturnedNull"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ExternalName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"default__Parameter"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"dmItem"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DMName"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsInParameter"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"IsOutParameter"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Ordinal"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"Scale"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"ForBitData"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValueType"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"DefaultValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Data Modeler"
-			name       	"OperationID"
-			value      	"")))
-	    (object Attribute
-		tool       	"Data Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Data Modeler Communicator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Deploy"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"RootDir"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"NotShowRoseIDDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ShowCodegenDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateRoseID"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultJ2EEJavadoc"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultReturnLine"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultAuthor"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocDefaultSince"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UserDefineJavaDocTags"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocNumAsterisks"
-			value      	0)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MaxNumChars"
-			value      	80)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VM"
-			value      	("VMType" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReferenceClasspath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"Java"
-				name       	"WindowsShell"
-				value      	101)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VMType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Sun"
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Microsoft"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"IBM"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"VAJavaWorkingFolder"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")
-		    (object Attribute
-			tool       	"Java"
-			name       	"NoClassCustomDlg"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GlobalImports"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceClassStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"OpenBraceMethodStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseTabs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"UseSpaces"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SpacingItems"
-			value      	3)
-		    (object Attribute
-			tool       	"Java"
-			name       	"RoseDefaultCommentStyle"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"AsteriskCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavaCommentStyle"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocAuthor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocSince"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"JavadocVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemotePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"RemoteSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"HomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"LocalHomeSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeyPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"PrimaryKeySuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDTDLocation"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultEJBVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultServletVersion"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SourceControl"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCSelected"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectSourceRoot"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCProjectName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"SCCComment"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Http_Servlet__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"Default_EJB__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate_XML_DD"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCmpField"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBEnvironmentProperties"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBCnxFactory"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReferences"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBNameInJAR"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType"
-			value      	("EJBSessionType_Set" 200))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	200)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateless"
-				value      	201)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Stateful"
-				value      	202)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType"
-			value      	("EJBTransactionType_Set" 211))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBTransactionType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	211)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	212)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType"
-			value      	("EJBPersistenceType_Set" 220))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBPersistenceType_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	""
-				value      	220)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bean"
-				value      	221)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Container"
-				value      	222)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBReentrant"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBSessionSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion"
-			value      	("EJBVersion_Set" 230))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBVersion_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"2.0"
-				value      	230)
-			    (object Attribute
-				tool       	"Java"
-				name       	"1.x"
-				value      	231)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"EJBXMLFilePath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"private"
-				value      	64)
-			    (object Attribute
-				tool       	"Java"
-				name       	"package"
-				value      	65)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DisableAutoSync"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletName"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContextRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsSingleThread"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletInitParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIsSecure"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcher"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestDispatcherPath"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherInclude"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"DispatcherForward"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletSecurityRoles"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletgetInfo"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttribute"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestAttributesNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestAttributes"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameter"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletRequestParameterNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForRequestParameters"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeader"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletHeaderNames"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForHeaders"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletIntHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletDateHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletCookie"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"MethodForCookie"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletContentType"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateHTML"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"BMP_Extend_CMP"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ServletXMLFilePath"
-			value      	"")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedReturn"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ReplaceExistingCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Strictfp"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"PropertyType"
-			value      	("BeanProperty_Set" 71))
-		    (object Attribute
-			tool       	"Java"
-			name       	"BeanProperty_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Not A Property"
-				value      	71)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Simple"
-				value      	72)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Bound"
-				value      	73)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Constrained"
-				value      	74)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"IndividualChangeMgt"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write"
-			value      	("Read/Write_Set" 81))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Read/Write_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read & Write"
-				value      	81)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Read Only"
-				value      	82)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Write Only"
-				value      	83)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFullyQualifiedTypes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"IsNavigable"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"ComponentTest"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Model Integrator"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Rose Web Publisher"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TopLink"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"COM"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"TypeKinds"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"COM"
-				name       	"enum"
-				value      	100)
-			    (object Attribute
-				tool       	"COM"
-				name       	"record"
-				value      	101)
-			    (object Attribute
-				tool       	"COM"
-				name       	"module"
-				value      	102)
-			    (object Attribute
-				tool       	"COM"
-				name       	"interface"
-				value      	103)
-			    (object Attribute
-				tool       	"COM"
-				name       	"dispinterface"
-				value      	104)
-			    (object Attribute
-				tool       	"COM"
-				name       	"coclass"
-				value      	105)
-			    (object Attribute
-				tool       	"COM"
-				name       	"alias"
-				value      	106)
-			    (object Attribute
-				tool       	"COM"
-				name       	"union"
-				value      	107)
-			    (object Attribute
-				tool       	"COM"
-				name       	"max"
-				value      	108)
-			    (object Attribute
-				tool       	"COM"
-				name       	"(none)"
-				value      	109)))
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"kind"
-			value      	("TypeKinds" 109))
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"dllname"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"alias"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"id"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"COM"
-			name       	"filename"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"library"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"uuid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"version"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpstring"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpfile"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"helpcontext"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"lcid"
-			value      	"")
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"COM"
-			name       	"attributes"
-			value      	"")))
-	    (object Attribute
-		tool       	"COM"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Version Control"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"InstancingSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"BaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	222)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"0"
-				value      	223)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"1"
-				value      	224)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	("BaseSet" 222))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Instancing"
-			value      	("InstancingSet" 219))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"(none)"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ReplaceExistingBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DefaultBody"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProcedureID"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"PropertyName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"FullName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByVal"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ByRef"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Optional"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ParamArray"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateCode"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"UpdateModel"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportReferences"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"QuickImport"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImportBinary"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Web Modeler"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Editor"
-			value      	("EditorType" 100))
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"EditorType"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"BuiltIn"
-				value      	100)
-			    (object Attribute
-				tool       	"XML_DTD"
-				name       	"WindowsShell"
-				value      	101)))))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Entity_PublicID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"NotationValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"InternalValue"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ParameterEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ExternalEntity"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_SystemID"
-			value      	"")
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Notation_PublicID"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"DefaultDeclType"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"Assign All"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"XML_DTD"
-			name       	"ComponentPath"
-			value      	"")))
-	    (object Attribute
-		tool       	"XML_DTD"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"RequisitePro"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SoDA"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"R2Editor"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler2.1__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue(sizeof($targetClass),$limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference($limit)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue(sizeof($targetClass))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"compiler3.0__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerAnnotations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowGenerateOverNewerVersion"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AlwaysKeepOrphanedCode"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM60TD"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) code/webservice/webservice-j2ee.mdl, WCCM.J2EE.WEBSERVICES, WCCM60TD"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAbstractBody"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SpecialDeclReturnType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CCRegion"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Cplusplus"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Cplusplus"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"CORBA"
-		name       	"default__Param"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"Direction"
-			value      	("ParamDirectionTypeSet" 102))
-		    (object Attribute
-			tool       	"CORBA"
-			name       	"ParamDirectionTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"in"
-				value      	102)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"inout"
-				value      	103)
-			    (object Attribute
-				tool       	"CORBA"
-				name       	"out"
-				value      	104)))))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969"))
-	quid       	"3E109E880314"))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/webservice.genmodel b/plugins/org.eclipse.jst.j2ee.core/rose/webservice.genmodel
deleted file mode 100644
index a8c5d4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webservice.genmodel
+++ /dev/null
@@ -1,89 +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.jst.j2ee.core/src"
-    editDirectory="/org.eclipse.jst.j2ee.core.edit/src" editorDirectory="/org.eclipse.jst.j2ee.core.editor/src"
-    modelPluginID="org.eclipse.jst.j2ee.core" modelName="Webservice" editPluginClass="org.eclipse.jst.j2ee.webservice.wsdd.provider.WebserviceEditPlugin"
-    editorPluginClass="org.eclipse.jst.j2ee.webservice.wsdd.presentation.WebserviceEditorPlugin"
-    usedGenPackages="j2ee.genmodel#//common ../../org.eclipse.jem/model/javaModel.genmodel#//java j2ee.genmodel#//wsclient ../../org.eclipse.emf.ecore/src-ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>webservice-j2ee.mdl</foreignModel>
-  <foreignModel>WORKSPACE_ROOT</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="Wsdd" basePackage="org.eclipse.jst.j2ee.webservice" ecorePackage="wsdd.ecore#/">
-    <genClasses ecoreClass="wsdd.ecore#//WebServices">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServices/description"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServices/displayName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServices/smallIcon"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServices/largeIcon"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServices/webServiceDescriptions"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//WebServiceDescription">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/jaxrpcMappingFile"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/webServiceDescriptionName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/wsdlFile"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/smallIcon"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/largeIcon"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/description"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//WebServiceDescription/displayName"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/portComponents"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/descriptionType"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/displayNameType"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//WebServiceDescription/iconType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//PortComponent">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/portComponentName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/serviceEndpointInterface"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/smallIcon"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/largeIcon"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/description"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//PortComponent/displayName"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/wsdlPort"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/serviceImplBean"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/handlers"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/descriptionType"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/displayNameType"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//PortComponent/iconType"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//WSDLPort"/>
-    <genClasses ecoreClass="wsdd.ecore#//ServiceImplBean">
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//ServiceImplBean/eEJBLink"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//ServiceImplBean/eServletLink"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//ServiceImplBean/beanLink"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//ServletLink">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//ServletLink/servletLink"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//EJBLink">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//EJBLink/ejbLink"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//Handler">
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/description"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/displayName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/smallIcon"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/largeIcon"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/handlerName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wsdd.ecore#//Handler/handlerClass"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//Handler/initParams"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//Handler/soapHeaders"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wsdd.ecore#//Handler/soapRoles"/>
-    </genClasses>
-    <genClasses ecoreClass="wsdd.ecore#//BeanLink"/>
-  </genPackages>
-  <genPackages prefix="Wscommon" basePackage="org.eclipse.jst.j2ee.webservice" ecorePackage="wscommon.ecore#/">
-    <genClasses ecoreClass="wscommon.ecore#//InitParam">
-      <genFeatures ecoreFeature="ecore:EAttribute wscommon.ecore#//InitParam/paramName"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wscommon.ecore#//InitParam/paramValue"/>
-      <genFeatures ecoreFeature="ecore:EAttribute wscommon.ecore#//InitParam/description"/>
-      <genFeatures property="None" children="true" ecoreFeature="ecore:EReference wscommon.ecore#//InitParam/descriptionTypes"/>
-    </genClasses>
-    <genClasses ecoreClass="wscommon.ecore#//SOAPHeader"/>
-    <genClasses ecoreClass="wscommon.ecore#//SOAPRole">
-      <genFeatures ecoreFeature="ecore:EAttribute wscommon.ecore#//SOAPRole/soapRole"/>
-    </genClasses>
-    <genClasses ecoreClass="wscommon.ecore#//PortName">
-      <genFeatures ecoreFeature="ecore:EAttribute wscommon.ecore#//PortName/portName"/>
-    </genClasses>
-    <genClasses ecoreClass="wscommon.ecore#//DescriptionType"/>
-    <genClasses ecoreClass="wscommon.ecore#//DisplayNameType"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/webservice_client.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/webservice_client.ecore
deleted file mode 100644
index 635463e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webservice_client.ecore
+++ /dev/null
@@ -1,111 +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="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">

-    <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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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">

-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="@since 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/rose/webservices_client_1_0.cat b/plugins/org.eclipse.jst.j2ee.core/rose/webservices_client_1_0.cat
deleted file mode 100644
index 6be378d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/webservices_client_1_0.cat
+++ /dev/null
@@ -1,1815 +0,0 @@
-
-(object Petal
-    version    	47
-    _written   	"Rose 8.0.0303.1400"
-    charSet    	0)
-
-(object Class_Category "wsclient"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"prefix"
-	    value      	(value Text "Webservice_client"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsURI"
-	    value      	(value Text "webservice_client.xmi")))
-    quid       	"3E4D2F4B02AA"
-    exportControl 	"Public"
-    logical_models 	(list unit_reference_list
-	(object Class "ServiceRef"
-	    quid       	"3E4D2F560184"
-	    documentation 	
-|The service-ref element declares a reference to a Web
-|    service. It contains optional description, display name and
-|    icons, a declaration of the required Service interface,
-|    an optional WSDL document location, an optional set
-|    of JAX-RPC mappings, an optional QName for the service element,
-|    an optional set of Service Endpoint Interfaces to be resolved
-|    by the container to a WSDL port, and an optional set of handlers.
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4023AF2C001C"
-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"
-		    quidu      	"4023ADF20197"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "serviceRefName"
-		    quid       	"3E4D2FD301A1"
-		    documentation 	
-|The service-ref-name element declares logical name that the
-|        components in the module use to look up the Web service. It
-|        is recommended that all service reference names start with
-|        "service/".
-		    
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "wsdlFile"
-		    quid       	"3E4D30050199"
-		    documentation 	
-| The wsdl-file element contains the URI location of a WSDL file. The
-|        location is relative to the root of the module.
-		    
-		    stereotype 	"0..1"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "jaxrpcMappingFile"
-		    quid       	"3E4D301C03CD"
-		    documentation 	
-|The jaxrpc-mapping-file element contains the name of a file that
-|        describes the JAX-RPC mapping between the Java interaces used by
-|        the application and the WSDL description in the wsdl-file.  The
-|        file name is a relative path within the module file.
-		    
-		    stereotype 	"0..1"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "PortComponentRef"
-	    quid       	"3E4D30D903A7"
-	    documentation 	
-|The port-component-ref element declares a client dependency
-|    on the container for resolving a Service Endpoint Interface
-|    to a WSDL port. It optionally associates the Service Endpoint
-|    Interface with a particular port-component. This is only used
-|    by the container for a Service.getPort(Class) method call.
-	    
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "portComponentLink"
-		    quid       	"3E4D31220348"
-		    documentation 	
-|The port-component-link element links a port-component-ref to a
-|        specific port-component required to be made available by a service
-|        reference.
-|
-|        The value of a port-component-link must be the port-component-name
-|        of a port-component in the same module or another module in the same
-|        application unit. The syntax for specification follows the syntax
-|        defined for ejb-link in the EJB 2.0 specification.
-		    
-		    stereotype 	"0..1"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "Handler"
-	    quid       	"3E4D31640072"
-	    documentation 	
-|Declares the handler for a port-component. Handlers can access the
-|    init-param name/value pairs using the HandlerInfo interface. If
-|    port-name is not specified, the handler is assumed to be associated
-|    with all ports of the service.
-|
-|    Used in: service-ref
-	    
-	    superclasses 	(list inheritance_relationship_list
-		(object Inheritance_Relationship
-		    quid       	"4023B0080005"
-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"
-		    quidu      	"4023ADF20197"))
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "handlerName"
-		    quid       	"3E4D31ED0097"
-		    documentation 	"Defines the name of the handler. The name must be unique within the module."
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "soapRoles"
-		    quid       	"3E4D32660285"
-		    documentation 	"The soap-role element contains a SOAP actor definition that the Handler will play as a role."
-		    stereotype 	"0..*"
-		    type       	"String"
-		    exportControl 	"Public")
-		(object ClassAttribute "portNames"
-		    quid       	"3E4D328A0331"
-		    documentation 	"The port-name element defines the WSDL port-name that a handler should be associated with."
-		    stereotype 	"0..*"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Class "WebServicesClient"
-	    quid       	"3F2EB3090267"
-	    documentation 	"@since J2EE1.4 deprecated")
-	(object Class "ComponentScopedRefs"
-	    quid       	"3F2EB42A00AA"
-	    documentation 	"@since J2EE1.4 deprecated"
-	    class_attributes 	(list class_attribute_list
-		(object ClassAttribute "componentName"
-		    quid       	"3F2EB454015F"
-		    type       	"String"
-		    exportControl 	"Public")))
-	(object Association "$UNNAMED$0"
-	    quid       	"3E4D310700E6"
-	    roles      	(list role_list
-		(object Role "serviceEndpointInterface"
-		    quid       	"3E4D31080354"
-		    documentation 	
-|The service-endpoint-interface element defines a fully qualified
-|        Java class that represents the Service Endpoint Interface of a
-|        WSDL port.
-		    
-		    label      	"serviceEndpointInterface"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$1"
-		    quid       	"3E4D31080372"
-		    supplier   	"Logical View::wsclient::PortComponentRef"
-		    quidu      	"3E4D30D903A7")))
-	(object Association "$UNNAMED$2"
-	    quid       	"3E4D313C039F"
-	    roles      	(list role_list
-		(object Role "portComponentRefs"
-		    quid       	"3E4D313D0256"
-		    documentation 	
-|The port-component-ref element declares a client dependency
-|        on the container for resolving a Service Endpoint Interface
-|        to a WSDL port. It optionally associates the Service Endpoint
-|        Interface with a particular port-component. This is only used
-|        by the container for a Service.getPort(Class) method call.
-		    
-		    label      	"portComponentRefs"
-		    supplier   	"Logical View::wsclient::PortComponentRef"
-		    quidu      	"3E4D30D903A7"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$3"
-		    quid       	"3E4D313D0260"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$4"
-	    quid       	"3E4D316E031F"
-	    roles      	(list role_list
-		(object Role "handlers"
-		    quid       	"3E4D316F0258"
-		    documentation 	
-| Declares the handler for a port-component. Handlers can access the
-|        init-param name/value pairs using the HandlerInfo interface. If
-|        port-name is not specified, the handler is assumed to be associated
-|        with all ports of the service.
-		    
-		    label      	"handlers"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$5"
-		    quid       	"3E4D316F0262"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$6"
-	    quid       	"3E4D31F9012A"
-	    roles      	(list role_list
-		(object Role "handlerClass"
-		    quid       	"3E4D31FA0280"
-		    documentation 	"Defines a fully qualified class name for the handler implementation."
-		    label      	"handlerClass"
-		    supplier   	"Logical View::java::JavaClass"
-		    quidu      	"36549FCC00FA"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Reference"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$7"
-		    quid       	"3E4D31FA02A8"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072")))
-	(object Association "$UNNAMED$8"
-	    quid       	"3E4D3221002D"
-	    roles      	(list role_list
-		(object Role "initParams"
-		    quid       	"3E4D322101E6"
-		    label      	"initParams"
-		    supplier   	"Logical View::common::ParamValue"
-		    quidu      	"3E4C221202C1"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$9"
-		    quid       	"3E4D322101E8"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$10"
-	    quid       	"3F2EB48E0271"
-	    roles      	(list role_list
-		(object Role "componentScopedRefs"
-		    quid       	"3F2EB4910275"
-		    label      	"componentScopedRefs"
-		    supplier   	"Logical View::wsclient::ComponentScopedRefs"
-		    quidu      	"3F2EB42A00AA"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$11"
-		    quid       	"3F2EB4910277"
-		    supplier   	"Logical View::wsclient::WebServicesClient"
-		    quidu      	"3F2EB3090267"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$12"
-	    quid       	"3F2EB52403D5"
-	    roles      	(list role_list
-		(object Role "serviceRefs"
-		    quid       	"3F2EB5270158"
-		    label      	"serviceRefs"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    client_cardinality 	(value cardinality "1..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$13"
-		    quid       	"3F2EB527016C"
-		    supplier   	"Logical View::wsclient::ComponentScopedRefs"
-		    quidu      	"3F2EB42A00AA"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$14"
-	    quid       	"3F2EB59B006F"
-	    roles      	(list role_list
-		(object Role "serviceRefs"
-		    quid       	"3F2EB59B0354"
-		    label      	"serviceRefs"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$15"
-		    quid       	"3F2EB59B0368"
-		    supplier   	"Logical View::wsclient::WebServicesClient"
-		    quidu      	"3F2EB3090267"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$16"
-	    quid       	"3F4392CC02FA"
-	    roles      	(list role_list
-		(object Role "serviceQname"
-		    quid       	"3F4392CD02F1"
-		    label      	"serviceQname"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"
-		    client_cardinality 	(value cardinality "1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$17"
-		    quid       	"3F4392CD02FB"
-		    supplier   	"Logical View::wsclient::ServiceRef"
-		    quidu      	"3E4D2F560184"
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$18"
-	    quid       	"3F43933C02A0"
-	    roles      	(list role_list
-		(object Role "soapHeaders"
-		    quid       	"3F43933D0193"
-		    label      	"soapHeaders"
-		    supplier   	"Logical View::common::QName"
-		    quidu      	"3F3BEF5D02C0"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$19"
-		    quid       	"3F43933D019D"
-		    supplier   	"Logical View::wsclient::Handler"
-		    quidu      	"3E4D31640072"
-		    is_aggregate 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "Service Ref"
-	    quid       	"3E4D30A20131"
-	    title      	"Service Ref"
-	    documentation 	
-|Declares the handler for a port-component. Handlers can access the
-|    init-param name/value pairs using the HandlerInfo interface. If
-|    port-name is not specified, the handler is assumed to be associated
-|    with all ports of the service.
-|
-|    Used in: service-ref
-	    
-	    zoom       	100
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	1050
-	    origin_y   	138
-	    items      	(list diagram_item_list
-		(object Label @1
-		    location   	(53, 56)
-		    font       	(object Font
-			size       	14
-			face       	"Arial"
-			bold       	TRUE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    nlines     	1
-		    max_width  	1006
-		    label      	"Web Services Client DD V1.1")
-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2820, 1918)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	TRUE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(2642, 1839)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	356
-			justify    	0
-			label      	"DescriptionGroup")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12632256
-		    quidu      	"3E4D451F01FB"
-		    width      	374
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::PortComponentRef" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 464)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(1607, 414)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	434
-			justify    	0
-			label      	"PortComponentRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E4D30D903A7"
-		    width      	452
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::ComponentScopedRefs" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(480, 1136)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(212, 1086)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	536
-			justify    	0
-			label      	"ComponentScopedRefs")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16745727
-		    quidu      	"3F2EB42A00AA"
-		    width      	554
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::WebServicesClient" @5
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(576, 304)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@5
-			location   	(352, 254)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	448
-			justify    	0
-			label      	"WebServicesClient")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	16745727
-		    quidu      	"3F2EB3090267"
-		    width      	466
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$10" @6
-		    location   	(527, 719)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F2EB48E0271"
-		    roleview_list 	(list RoleViews
-			(object RoleView "componentScopedRefs" @7
-			    Parent_View 	@6
-			    location   	(-1687, 291)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @8
-				Parent_View 	@7
-				location   	(453, 997)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	444
-				justify    	0
-				label      	"+componentScopedRefs"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB4910275"
-			    client     	@6
-			    supplier   	@4
-			    line_style 	0
-			    label      	(object SegLabel @9
-				Parent_View 	@7
-				location   	(544, 1043)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "$UNNAMED$11" @10
-			    Parent_View 	@6
-			    location   	(-1687, 291)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @11
-				Parent_View 	@10
-				location   	(519, 433)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	359
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB4910277"
-			    client     	@6
-			    supplier   	@5
-			    line_style 	0
-			    label      	(object SegLabel @12
-				Parent_View 	@10
-				location   	(618, 408)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::java::JavaClass" @13
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    SuppressOperation 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2767, 868)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@13
-			location   	(2633, 818)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	268
-			justify    	0
-			label      	"JavaClass")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12632256
-		    quidu      	"36549FCC00FA"
-		    width      	286
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$0" @14
-		    location   	(2558, 491)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D310700E6"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceEndpointInterface" @15
-			    Parent_View 	@14
-			    location   	(1515, -93)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @16
-				Parent_View 	@15
-				location   	(2999, 698)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	470
-				justify    	0
-				label      	"+serviceEndpointInterface"
-				pctDist    	0.786070
-				height     	249
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31080354"
-			    client     	@14
-			    supplier   	@13
-			    vertices   	(list Points
-				(2558, 491)
-				(2750, 491)
-				(2750, 806))
-			    line_style 	3
-			    origin_attachment 	(2558, 491)
-			    terminal_attachment 	(2750, 806)
-			    label      	(object SegLabel @17
-				Parent_View 	@15
-				location   	(2718, 692)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.776119
-				height     	33
-				orientation 	1))
-			(object RoleView "$UNNAMED$1" @18
-			    Parent_View 	@14
-			    location   	(1515, -93)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31080372"
-			    client     	@14
-			    supplier   	@3
-			    line_style 	3
-			    origin_attachment 	(2558, 491)
-			    terminal_attachment 	(2050, 491))))
-		(object ClassView "Class" "Logical View::common::ParamValue" @19
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1887, 2570)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@19
-			location   	(1655, 2416)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	464
-			justify    	0
-			label      	"ParamValue")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	12632256
-		    quidu      	"3E4C221202C1"
-		    width      	482
-		    height     	332
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsclient::ServiceRef" @20
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1824, 1120)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@20
-			location   	(1694, 1070)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"ServiceRef")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E4D2F560184"
-		    compartment 	(object Compartment
-			Parent_View 	@20
-			location   	(1694, 1131)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	0)
-		    width      	278
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$2" @21
-		    location   	(1824, 791)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D313C039F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "portComponentRefs" @22
-			    Parent_View 	@21
-			    location   	(759, -387)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @23
-				Parent_View 	@22
-				location   	(1618, 622)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	380
-				justify    	0
-				label      	"+portComponentRefs"
-				pctDist    	0.643080
-				height     	207
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D313D0256"
-			    client     	@21
-			    supplier   	@3
-			    line_style 	0
-			    label      	(object SegLabel @24
-				Parent_View 	@22
-				location   	(1892, 599)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.726080
-				height     	68
-				orientation 	1))
-			(object RoleView "$UNNAMED$3" @25
-			    Parent_View 	@21
-			    location   	(759, -387)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D313D0260"
-			    client     	@21
-			    supplier   	@20
-			    line_style 	0)))
-		(object AssociationViewNew "" @26
-		    location   	(2370, 1060)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D2FE101FC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "" @27
-			    Parent_View 	@26
-			    location   	(750, 940)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @28
-				Parent_View 	@27
-				location   	(2045, 1019)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	450
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D2FE4014C"
-			    client     	@26
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(2370, 1060)
-			    terminal_attachment 	(1963, 1060))
-			(object RoleView "serviceInterface" @29
-			    Parent_View 	@26
-			    location   	(750, 940)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @30
-				Parent_View 	@29
-				location   	(2296, 1168)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	304
-				justify    	0
-				label      	"+serviceInterface"
-				pctDist    	-0.185484
-				height     	108
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D2FE4012E"
-			    client     	@26
-			    supplier   	@13
-			    vertices   	(list Points
-				(2370, 1060)
-				(2647, 1060)
-				(2647, 930))
-			    line_style 	3
-			    origin_attachment 	(2370, 1060)
-			    terminal_attachment 	(2647, 930)
-			    label      	(object SegLabel @31
-				Parent_View 	@29
-				location   	(2701, 972)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object AssociationViewNew "$UNNAMED$12" @32
-		    location   	(1220, 1126)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F2EB52403D5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceRefs" @33
-			    Parent_View 	@32
-			    location   	(-1581, -20)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @34
-				Parent_View 	@33
-				location   	(1590, 1081)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+serviceRefs"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB5270158"
-			    client     	@32
-			    supplier   	@20
-			    line_style 	0
-			    label      	(object SegLabel @35
-				Parent_View 	@33
-				location   	(1639, 1175)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$13" @36
-			    Parent_View 	@32
-			    location   	(-1581, -20)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @37
-				Parent_View 	@36
-				location   	(851, 1090)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	444
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB527016C"
-			    client     	@32
-			    supplier   	@4
-			    line_style 	0
-			    label      	(object SegLabel @38
-				Parent_View 	@36
-				location   	(805, 1185)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))))
-		(object AssociationViewNew "$UNNAMED$14" @39
-		    location   	(1199, 711)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F2EB59B006F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceRefs" @40
-			    Parent_View 	@39
-			    location   	(843, 424)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @41
-				Parent_View 	@40
-				location   	(1645, 953)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	240
-				justify    	0
-				label      	"+serviceRefs"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB59B0354"
-			    client     	@39
-			    supplier   	@20
-			    line_style 	0
-			    label      	(object SegLabel @42
-				Parent_View 	@40
-				location   	(1646, 1067)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$15" @43
-			    Parent_View 	@39
-			    location   	(843, 424)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @44
-				Parent_View 	@43
-				location   	(755, 470)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				hidden     	TRUE
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	359
-				justify    	0
-				label      	""
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F2EB59B0368"
-			    client     	@39
-			    supplier   	@5
-			    line_style 	0
-			    label      	(object SegLabel @45
-				Parent_View 	@43
-				location   	(754, 357)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::common::QName" @46
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(934, 1813)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@46
-			location   	(587, 1634)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	694
-			justify    	0
-			label      	"QName")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3F3BEF5D02C0"
-		    width      	712
-		    height     	382
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$16" @47
-		    location   	(1183, 1184)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F4392CC02FA"
-		    roleview_list 	(list RoleViews
-			(object RoleView "serviceQname" @48
-			    Parent_View 	@47
-			    location   	(-647, 63)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @49
-				Parent_View 	@48
-				location   	(1078, 1521)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	300
-				justify    	0
-				label      	"+serviceQname"
-				pctDist    	0.800000
-				height     	42
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F4392CD02F1"
-			    client     	@47
-			    supplier   	@46
-			    vertices   	(list Points
-				(1183, 1184)
-				(1119, 1184)
-				(1119, 1622))
-			    line_style 	3
-			    origin_attachment 	(1183, 1184)
-			    terminal_attachment 	(1119, 1622)
-			    label      	(object SegLabel @50
-				Parent_View 	@48
-				location   	(1150, 1458)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.675299
-				height     	31
-				orientation 	0))
-			(object RoleView "$UNNAMED$17" @51
-			    Parent_View 	@47
-			    location   	(-647, 63)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F4392CD02FB"
-			    client     	@47
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(1183, 1184)
-			    terminal_attachment 	(1685, 1184))))
-		(object ClassView "Class" "Logical View::wsclient::Handler" @52
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1856, 1952)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@52
-			location   	(1754, 1902)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	204
-			justify    	0
-			label      	"Handler")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3E4D31640072"
-		    compartment 	(object Compartment
-			Parent_View 	@52
-			location   	(1754, 1963)
-			font       	(object Font
-			    size       	10
-			    face       	"Arial"
-			    bold       	FALSE
-			    italics    	FALSE
-			    underline  	FALSE
-			    strike     	FALSE
-			    color      	0
-			    default_color 	TRUE)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	4
-			max_width  	0)
-		    width      	222
-		    height     	124
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$6" @53
-		    location   	(2385, 1447)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D31F9012A"
-		    roleview_list 	(list RoleViews
-			(object RoleView "handlerClass" @54
-			    Parent_View 	@53
-			    location   	(1407, -594)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @55
-				Parent_View 	@54
-				location   	(2613, 1025)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	276
-				justify    	0
-				label      	"+handlerClass"
-				pctDist    	0.895404
-				height     	154
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31FA0280"
-			    client     	@53
-			    supplier   	@13
-			    vertices   	(list Points
-				(2385, 1447)
-				(2766, 1447)
-				(2766, 930))
-			    line_style 	3
-			    origin_attachment 	(2385, 1447)
-			    terminal_attachment 	(2766, 930)
-			    label      	(object SegLabel @56
-				Parent_View 	@54
-				location   	(2820, 1021)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$7" @57
-			    Parent_View 	@53
-			    location   	(1407, -594)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D31FA02A8"
-			    client     	@53
-			    supplier   	@52
-			    vertices   	(list Points
-				(2385, 1447)
-				(1930, 1447)
-				(1930, 1890))
-			    line_style 	3
-			    origin_attachment 	(2385, 1447)
-			    terminal_attachment 	(1930, 1890))))
-		(object AssociationViewNew "$UNNAMED$8" @58
-		    location   	(1885, 2209)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D3221002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "initParams" @59
-			    Parent_View 	@58
-			    location   	(907, 168)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @60
-				Parent_View 	@59
-				location   	(1757, 2309)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	228
-				justify    	0
-				label      	"+initParams"
-				pctDist    	0.515152
-				height     	129
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D322101E6"
-			    client     	@58
-			    supplier   	@19
-			    line_style 	3
-			    origin_attachment 	(1885, 2209)
-			    terminal_attachment 	(1885, 2404)
-			    label      	(object SegLabel @61
-				Parent_View 	@59
-				location   	(1958, 2345)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.697987
-				height     	73
-				orientation 	0))
-			(object RoleView "$UNNAMED$9" @62
-			    Parent_View 	@58
-			    location   	(907, 168)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D322101E8"
-			    client     	@58
-			    supplier   	@52
-			    line_style 	3
-			    origin_attachment 	(1885, 2209)
-			    terminal_attachment 	(1885, 2014))))
-		(object AssociationViewNew "$UNNAMED$4" @63
-		    location   	(1750, 1535)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3E4D316E031F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "handlers" @64
-			    Parent_View 	@63
-			    location   	(685, 357)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @65
-				Parent_View 	@64
-				location   	(1607, 1778)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	186
-				justify    	0
-				label      	"+handlers"
-				pctDist    	0.685185
-				height     	144
-				orientation 	1)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D316F0258"
-			    client     	@63
-			    supplier   	@52
-			    line_style 	3
-			    origin_attachment 	(1750, 1535)
-			    terminal_attachment 	(1750, 1889)
-			    label      	(object SegLabel @66
-				Parent_View 	@64
-				location   	(1817, 1797)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.740741
-				height     	67
-				orientation 	0))
-			(object RoleView "$UNNAMED$5" @67
-			    Parent_View 	@63
-			    location   	(685, 357)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3E4D316F0262"
-			    client     	@63
-			    supplier   	@20
-			    line_style 	3
-			    origin_attachment 	(1750, 1535)
-			    terminal_attachment 	(1750, 1181))))
-		(object AssociationViewNew "$UNNAMED$18" @68
-		    location   	(1194, 2007)
-		    font       	(object Font
-			size       	10
-			face       	"Arial"
-			bold       	FALSE
-			italics    	FALSE
-			underline  	FALSE
-			strike     	FALSE
-			color      	0
-			default_color 	TRUE)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F43933C02A0"
-		    roleview_list 	(list RoleViews
-			(object RoleView "soapHeaders" @69
-			    Parent_View 	@68
-			    location   	(-668, 54)
-			    font       	(object Font
-				size       	10
-				face       	"Arial"
-				bold       	FALSE
-				italics    	FALSE
-				underline  	FALSE
-				strike     	FALSE
-				color      	0
-				default_color 	TRUE)
-			    label      	(object SegLabel @70
-				Parent_View 	@69
-				location   	(865, 2123)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	1
-				anchor_loc 	1
-				nlines     	1
-				max_width  	271
-				justify    	0
-				label      	"+soapHeaders"
-				pctDist    	0.800000
-				height     	42
-				orientation 	0)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F43933D0193"
-			    client     	@68
-			    supplier   	@46
-			    vertices   	(list Points
-				(1194, 2007)
-				(1134, 2007)
-				(1134, 2159)
-				(906, 2159)
-				(906, 2004))
-			    line_style 	3
-			    origin_attachment 	(1194, 2007)
-			    terminal_attachment 	(906, 2004)
-			    label      	(object SegLabel @71
-				Parent_View 	@69
-				location   	(960, 2064)
-				font       	(object Font
-				    size       	10
-				    face       	"Arial"
-				    bold       	FALSE
-				    italics    	FALSE
-				    underline  	FALSE
-				    strike     	FALSE
-				    color      	0
-				    default_color 	TRUE)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..n"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))
-			(object RoleView "$UNNAMED$19" @72
-			    Parent_View 	@68
-			    location   	(-668, 54)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3F43933D019D"
-			    client     	@68
-			    supplier   	@52
-			    line_style 	3
-			    origin_attachment 	(1194, 2007)
-			    terminal_attachment 	(1745, 2007))))))))
diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.cat b/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.cat
deleted file mode 100644
index bfe1b76..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.cat
+++ /dev/null
@@ -1,103 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "wscommon"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Wscommon"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "wscommon.xmi")))

-    quid       	"3E15B4C0016F"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "InitParam"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC6E0280"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "paramName"

-		    quid       	"3E526C580355"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "paramValue"

-		    quid       	"3E526C5D0013"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3E526C63017A"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "SOAPHeader"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC99022F"

-	    documentation 	

-|Defines the QName of a SOAP header that will be processed by the handler.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F4671870049"

-		    supplier   	"Logical View::common::QName"

-		    quidu      	"3F3BEF5D02C0"))

-	    language   	"Java")

-	(object Class "SOAPRole"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10ACBC0164"

-	    documentation 	

-|The soap-role element contains a SOAP actor definition that the Handler will play as a role.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "soapRole"

-		    quid       	"3E11E9AD02D7"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "PortName"

-	    quid       	"3E15BBC90209"

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "portName"

-		    quid       	"3E15E4F70076"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "DescriptionType"

-	    quid       	"3F5CBC6D0353"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F5DDB7E00C1"

-		    supplier   	"Logical View::common::Description"

-		    quidu      	"3E4A98D602E0")))

-	(object Class "DisplayNameType"

-	    quid       	"3F5CBC780236"

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F5DDB82033D"

-		    supplier   	"Logical View::common::DisplayName"

-		    quidu      	"3E4A9922000E"))))

-    logical_presentations 	(list unit_reference_list))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.ecore
deleted file mode 100644
index b29b844..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/wscommon.ecore
+++ /dev/null
@@ -1,29 +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="wscommon"

-    nsURI="wscommon.xmi" nsPrefix="org.eclipse.jst.j2ee.webservice.wscommon">

-  <eClassifiers xsi:type="ecore:EClass" name="InitParam">

-    <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">

-    <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">

-    <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/rose/wsdd.cat b/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.cat
deleted file mode 100644
index d4d5577..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.cat
+++ /dev/null
@@ -1,4011 +0,0 @@
-

-(object Petal

-    version    	50

-    _written   	"Rose 8.3.0407.2800"

-    charSet    	0)

-

-(object Class_Category "wsdd"

-    is_unit    	TRUE

-    is_loaded  	TRUE

-    attributes 	(list Attribute_Set

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"basePackage"

-	    value      	(value Text "org.eclipse.jst.j2ee.webservice"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"prefix"

-	    value      	(value Text "Wsdd"))

-	(object Attribute

-	    tool       	"Ecore"

-	    name       	"nsURI"

-	    value      	(value Text "wsdd.xmi")))

-    quid       	"3E109EAD0319"

-    exportControl 	"Public"

-    logical_models 	(list unit_reference_list

-	(object Class "WebServices"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E109EEF012F"

-	    documentation 	

-|The webservices element is the root element for the web services deployment descriptor.  It specifies the set of Web service descriptions that are to be deployed into the J2EE Application Server and the dependencies they have on container resources and services.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023B0DD00DD"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    language   	"Java")

-	(object Class "WebServiceDescription"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10A1500313"

-	    documentation 	

-|The webservice-description element defines a WSDL document file and the set of Port components associated with the WSDL ports defined in the WSDL document.  There may be multiple webservice-descriptions defined within a module.

-|

-|All WSDL file ports must have a corresponding port-component element defined.

-|

-|Used in: webservices

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "jaxrpcMappingFile"

-		    quid       	"3E526A81010C"

-		    documentation 	

-|The jaxrpc-mapping-file element contains the name of a file that describes the JAX-RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "webServiceDescriptionName"

-		    quid       	"3E526A8F021A"

-		    documentation 	

-|The webservice-description-name identifies the collection of port-components associated with a WSDL file and JAX-RPC mapping. The name must be unique within the deployment descriptor.

-|

-|

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "wsdlFile"

-		    quid       	"3E526AA20392"

-		    documentation 	

-|The wsdl-file element contains the name of a WSDL file in the module. The file name is a relative path within the module.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "smallIcon"

-		    quid       	"3F5C91820023"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"3F5C91930276"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3F5CE5260163"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "displayName"

-		    quid       	"3F5CE531003C"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "PortComponent"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AB8D01F6"

-	    documentation 	

-|The port-component element associates a WSDL port with a Web service interface and implementation.  It defines the name of the port as a component, optional description, optional display name, optional iconic representations, WSDL port QName, Service Endpoint Interface, Service Implementation Bean.

-|

-	    

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "portComponentName"

-		    quid       	"3E526B110344"

-		    documentation 	

-|The port-component-name element specifies a port component's name. This name is assigned by the module producer to name the service implementation bean in the module's deployment descriptor. The name must be unique among the port component names defined in the same module.

-|

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "serviceEndpointInterface"

-		    quid       	"3E526B180177"

-		    documentation 	

-|The service-endpoint-interface element contains the fully-qualified name of the port component's Service Endpoint Interface.

-|

-		    

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "smallIcon"

-		    quid       	"3F5C91D1038D"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "largeIcon"

-		    quid       	"3F5C91E3019F"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "description"

-		    quid       	"3F5CE85902BC"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "displayName"

-		    quid       	"3F5CE8620070"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "WSDLPort"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10ABC40205"

-	    documentation 	

-|Defines the name space and local name part of the WSDL port QName.

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"3F438C890363"

-		    supplier   	"Logical View::common::QName"

-		    quidu      	"3F3BEF5D02C0"))

-	    language   	"Java")

-	(object Class "ServiceImplBean"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC0A0016"

-	    documentation 	

-|The service-impl-bean element defines the Web service implementation.A service implementation can be an EJB bean class or JAX-RPC web component. Existing EJB implementations are exposed as a Web service using an ejb-link.

-|

-|Used in: port-component

-|

-	    

-	    language   	"Java")

-	(object Class "ServletLink"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"DisableAutoSync"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Final"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Static"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Strictfp"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateDefaultConstructor"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFinalizer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateStaticInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateInstanceInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateCode"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ReadOnly"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedExtends"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedImplements"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ConstructorIs"

-		    value      	("Ctor_Set" 62))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC1502E2"

-	    documentation 	

-|The servlet-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a JAX-RPC Service Endpoint.

-|

-|The value of the servlet-link element must be the servlet-name of a JAX-RPC Service Endpoint in the same WAR file.

-|

-|Used in: service-impl-bean

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set)

-		    quid       	"3E3953A5010A"

-		    supplier   	"Logical View::wsdd::BeanLink"

-		    quidu      	"3E3952E700EC"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "servletLink"

-		    quid       	"3E11E935039B"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "EJBLink"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"DisableAutoSync"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Final"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Static"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"Strictfp"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateDefaultConstructor"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFinalizer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateStaticInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateInstanceInitializer"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateCode"

-		    value      	TRUE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ReadOnly"

-		    value      	FALSE)

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedExtends"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"GenerateFullyQualifiedImplements"

-		    value      	"")

-		(object Attribute

-		    tool       	"Java"

-		    name       	"ConstructorIs"

-		    value      	("Ctor_Set" 62))

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC20028D"

-	    documentation 	

-|The ejb-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a Web Service Endpoint.

-|

-|The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file.

-|

-|Used in: service-impl-bean

-|

-|Examples:

-|<ejb-link>EmployeeRecord</ejb-link>

-|	<ejb-link>../products/product.jar#ProductEJB</ejb-link>

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    attributes 	(list Attribute_Set)

-		    quid       	"3E39538B014B"

-		    supplier   	"Logical View::wsdd::BeanLink"

-		    quidu      	"3E3952E700EC"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "ejbLink"

-		    quid       	"3E11E9240095"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "Handler"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E10AC3B01D6"

-	    documentation 	

-|Declares the handler for a port-component. Handlers can access the init-param name/value pairs using the HandlerInfo interface.

-|

-|Used in: port-component

-|

-	    

-	    superclasses 	(list inheritance_relationship_list

-		(object Inheritance_Relationship

-		    quid       	"4023AFA0007D"

-		    supplier   	"Logical View::common::CompatibilityDescriptionGroup"

-		    quidu      	"4023ADF20197"))

-	    class_attributes 	(list class_attribute_list

-		(object ClassAttribute "handlerName"

-		    quid       	"3E526BFE0348"

-		    type       	"String"

-		    exportControl 	"Public")

-		(object ClassAttribute "handlerClass"

-		    quid       	"3E526C050103"

-		    type       	"String"

-		    exportControl 	"Public"))

-	    language   	"Java")

-	(object Class "BeanLink"

-	    attributes 	(list Attribute_Set

-		(object Attribute

-		    tool       	"Java"

-		    name       	"cg_style"

-		    value      	"Default_EJB"))

-	    quid       	"3E3952E700EC"

-	    language   	"Java")

-	(object Association "$UNNAMED$0"

-	    quid       	"3E11BD6900E8"

-	    roles      	(list role_list

-		(object Role "wsdlPort"

-		    quid       	"3E11BD6A034C"

-		    label      	"wsdlPort"

-		    supplier   	"Logical View::wsdd::WSDLPort"

-		    quidu      	"3E10ABC40205"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$1"

-		    quid       	"3E11BD6A0356"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$2"

-	    quid       	"3E11BD74029C"

-	    roles      	(list role_list

-		(object Role "serviceImplBean"

-		    quid       	"3E11BD7602F8"

-		    label      	"serviceImplBean"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$3"

-		    quid       	"3E11BD7602FA"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$4"

-	    quid       	"3E11BD80037E"

-	    roles      	(list role_list

-		(object Role "handlers "

-		    quid       	"3E11BD840293"

-		    label      	"handlers "

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$5"

-		    quid       	"3E11BD840295"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$6"

-	    quid       	"3E11C37103CF"

-	    roles      	(list role_list

-		(object Role "eEJBLink"

-		    quid       	"3E11C373015B"

-		    label      	"eEJBLink"

-		    supplier   	"Logical View::wsdd::EJBLink"

-		    quidu      	"3E10AC20028D"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$7"

-		    quid       	"3E11C373015D"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$8"

-	    quid       	"3E11C379038A"

-	    roles      	(list role_list

-		(object Role "eServletLink"

-		    quid       	"3E11C37C00D1"

-		    label      	"eServletLink"

-		    supplier   	"Logical View::wsdd::ServletLink"

-		    quidu      	"3E10AC1502E2"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$9"

-		    quid       	"3E11C37C00DC"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$10"

-	    quid       	"3E10CA7303C5"

-	    roles      	(list role_list

-		(object Role "webServiceDescriptions"

-		    quid       	"3E10CA760351"

-		    label      	"webServiceDescriptions"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$11"

-		    quid       	"3E10CA76035B"

-		    supplier   	"Logical View::wsdd::WebServices"

-		    quidu      	"3E109EEF012F"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$12"

-	    quid       	"3E11B7C8033F"

-	    roles      	(list role_list

-		(object Role "portComponents"

-		    quid       	"3E11B7CC02C3"

-		    label      	"portComponents"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$13"

-		    quid       	"3E11B7CC02CD"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$14"

-	    quid       	"3E11CEDE031E"

-	    roles      	(list role_list

-		(object Role "initParams "

-		    quid       	"3E11CEE00371"

-		    label      	"initParams "

-		    supplier   	"Logical View::wscommon::InitParam"

-		    quidu      	"3E10AC6E0280"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$15"

-		    quid       	"3E11CEE00373"

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$16"

-	    quid       	"3E11CEE80001"

-	    roles      	(list role_list

-		(object Role "soapHeaders"

-		    quid       	"3E11CEEA0298"

-		    label      	"soapHeaders"

-		    supplier   	"Logical View::wscommon::SOAPHeader"

-		    quidu      	"3E10AC99022F"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$17"

-		    quid       	"3E11CEEA02A2"

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$18"

-	    quid       	"3E3953020189"

-	    roles      	(list role_list

-		(object Role "beanLink"

-		    quid       	"3E3953050007"

-		    label      	"beanLink"

-		    supplier   	"Logical View::wsdd::BeanLink"

-		    quidu      	"3E3952E700EC"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$19"

-		    quid       	"3E3953050011"

-		    supplier   	"Logical View::wsdd::ServiceImplBean"

-		    quidu      	"3E10AC0A0016"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$20"

-	    quid       	"3E5276360293"

-	    roles      	(list role_list

-		(object Role "soapRoles"

-		    quid       	"3E5276380227"

-		    label      	"soapRoles"

-		    supplier   	"Logical View::wscommon::SOAPRole"

-		    quidu      	"3E10ACBC0164"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$21"

-		    quid       	"3E5276380231"

-		    supplier   	"Logical View::wsdd::Handler"

-		    quidu      	"3E10AC3B01D6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$22"

-	    quid       	"3F5CBEA10235"

-	    roles      	(list role_list

-		(object Role "descriptionType"

-		    quid       	"3F5CBEA200D8"

-		    label      	"descriptionType"

-		    supplier   	"Logical View::wscommon::DescriptionType"

-		    quidu      	"3F5CBC6D0353"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$23"

-		    quid       	"3F5CBEA200E2"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$24"

-	    quid       	"3F5CBEA700C1"

-	    roles      	(list role_list

-		(object Role "displayNameType"

-		    quid       	"3F5CBEA8031B"

-		    label      	"displayNameType"

-		    supplier   	"Logical View::wscommon::DisplayNameType"

-		    quidu      	"3F5CBC780236"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$25"

-		    quid       	"3F5CBEA80325"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$26"

-	    quid       	"3F5CBF8A0114"

-	    roles      	(list role_list

-		(object Role "descriptionTypes"

-		    quid       	"3F5CBF8B0075"

-		    label      	"descriptionTypes"

-		    supplier   	"Logical View::wscommon::DescriptionType"

-		    quidu      	"3F5CBC6D0353"

-		    client_cardinality 	(value cardinality "0..n")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$27"

-		    quid       	"3F5CBF8B0089"

-		    supplier   	"Logical View::wscommon::InitParam"

-		    quidu      	"3E10AC6E0280"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$28"

-	    quid       	"3F5DDBB70311"

-	    roles      	(list role_list

-		(object Role "descriptionType"

-		    quid       	"3F5DDBB80255"

-		    label      	"descriptionType"

-		    supplier   	"Logical View::wscommon::DescriptionType"

-		    quidu      	"3F5CBC6D0353"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$29"

-		    quid       	"3F5DDBB80269"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$30"

-	    quid       	"3F5DDBBE039E"

-	    roles      	(list role_list

-		(object Role "displayNameType"

-		    quid       	"3F5DDBBF0309"

-		    label      	"displayNameType"

-		    supplier   	"Logical View::wscommon::DisplayNameType"

-		    quidu      	"3F5CBC780236"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$31"

-		    quid       	"3F5DDBBF0313"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$32"

-	    quid       	"3F5DDC4500F9"

-	    roles      	(list role_list

-		(object Role "iconType"

-		    quid       	"3F5DDC460046"

-		    label      	"iconType"

-		    supplier   	"Logical View::common::IconType"

-		    quidu      	"3E4A99EE003A"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$33"

-		    quid       	"3F5DDC460050"

-		    supplier   	"Logical View::wsdd::WebServiceDescription"

-		    quidu      	"3E10A1500313"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE)))

-	(object Association "$UNNAMED$34"

-	    quid       	"3F5DDE950122"

-	    roles      	(list role_list

-		(object Role "iconType"

-		    quid       	"3F5DDE96016A"

-		    label      	"iconType"

-		    supplier   	"Logical View::common::IconType"

-		    quidu      	"3E4A99EE003A"

-		    client_cardinality 	(value cardinality "0..1")

-		    Containment 	"By Value"

-		    is_navigable 	TRUE)

-		(object Role "$UNNAMED$35"

-		    quid       	"3F5DDE96017E"

-		    supplier   	"Logical View::wsdd::PortComponent"

-		    quidu      	"3E10AB8D01F6"

-		    client_cardinality 	(value cardinality "1")

-		    is_aggregate 	TRUE))))

-    logical_presentations 	(list unit_reference_list

-	(object ClassDiagram "PortComponent"

-	    quid       	"3E11BAD902A3"

-	    title      	"PortComponent"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::wsdd::EJBLink" @1

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(870, 2734)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@1

-			location   	(725, 2661)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	290

-			justify    	0

-			label      	"EJBLink")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC20028D"

-		    compartment 	(object Compartment

-			Parent_View 	@1

-			location   	(725, 2713)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	286)

-		    width      	308

-		    height     	166

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::ServletLink" @2

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1567, 2719)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@2

-			location   	(1390, 2646)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	354

-			justify    	0

-			label      	"ServletLink")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC1502E2"

-		    compartment 	(object Compartment

-			Parent_View 	@2

-			location   	(1390, 2698)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	350)

-		    width      	372

-		    height     	166

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::QName" @3

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1856, 672)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@3

-			location   	(1575, 506)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"QName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3F3BEF5D02C0"

-		    compartment 	(object Compartment

-			Parent_View 	@3

-			location   	(1575, 602)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	558)

-		    width      	580

-		    height     	352

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @4

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(192, 129)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@4

-			location   	(64, 10)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@4

-			location   	(64, 106)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	253)

-		    width      	274

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DisplayName" @5

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(640, 129)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@5

-			location   	(424, 10)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A9922000E"

-		    compartment 	(object Compartment

-			Parent_View 	@5

-			location   	(424, 106)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	428)

-		    width      	450

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::BeanLink" @6

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1241, 2426)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@6

-			location   	(1154, 2381)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	174

-			justify    	0

-			label      	"BeanLink")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E3952E700EC"

-		    width      	192

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @7

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E39538B014B"

-		    client     	@1

-		    supplier   	@6

-		    vertices   	(list Points

-			(968, 2650)

-			(1172, 2481))

-		    line_style 	0)

-		(object InheritView "" @8

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E3953A5010A"

-		    client     	@2

-		    supplier   	@6

-		    vertices   	(list Points

-			(1474, 2635)

-			(1302, 2481))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::wsdd::Handler" @9

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 2239)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@9

-			location   	(119, 2069)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	434

-			justify    	0

-			label      	"Handler")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC3B01D6"

-		    compartment 	(object Compartment

-			Parent_View 	@9

-			location   	(119, 2121)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	375)

-		    width      	452

-		    height     	360

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::WSDLPort" @10

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1839, 1038)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@10

-			location   	(1747, 993)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	184

-			justify    	0

-			label      	"WSDLPort")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10ABC40205"

-		    width      	202

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @11

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F438C890363"

-		    client     	@10

-		    supplier   	@3

-		    vertices   	(list Points

-			(1841, 983)

-			(1841, 848))

-		    line_style 	3

-		    origin_attachment 	(1841, 983)

-		    terminal_attachment 	(1841, 848))

-		(object ClassView "Class" "Logical View::wsdd::ServiceImplBean" @12

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1231, 1409)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@12

-			location   	(1088, 1364)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	286

-			justify    	0

-			label      	"ServiceImplBean")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC0A0016"

-		    width      	304

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$18" @13

-		    location   	(1235, 1917)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E3953020189"

-		    roleview_list 	(list RoleViews

-			(object RoleView "beanLink" @14

-			    Parent_View 	@13

-			    location   	(19, 121)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @15

-				Parent_View 	@14

-				location   	(1102, 2172)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	162

-				justify    	0

-				label      	"+beanLink"

-				pctDist    	0.559441

-				height     	137

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E3953050007"

-			    client     	@13

-			    supplier   	@6

-			    vertices   	(list Points

-				(1235, 1917)

-				(1240, 2370))

-			    line_style 	0

-			    label      	(object SegLabel @16

-				Parent_View 	@14

-				location   	(1325, 2272)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.783217

-				height     	86

-				orientation 	0))

-			(object RoleView "$UNNAMED$19" @17

-			    Parent_View 	@13

-			    location   	(19, 121)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E3953050011"

-			    client     	@13

-			    supplier   	@12

-			    vertices   	(list Points

-				(1235, 1917)

-				(1231, 1464))

-			    line_style 	0

-			    label      	(object SegLabel @18

-				Parent_View 	@17

-				location   	(1285, 1512)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.895105

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::wscommon::DescriptionType" @19

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(192, 464)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@19

-			location   	(55, 396)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"DescriptionType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC6D0353"

-		    width      	292

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::DisplayNameType" @20

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(640, 464)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@20

-			location   	(491, 396)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	298

-			justify    	0

-			label      	"DisplayNameType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC780236"

-		    width      	316

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::IconType" @21

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1216, 400)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@21

-			location   	(961, 257)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	510

-			justify    	0

-			label      	"IconType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A99EE003A"

-		    compartment 	(object Compartment

-			Parent_View 	@21

-			location   	(961, 353)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	506)

-		    width      	528

-		    height     	306

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::PortComponent" @22

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(336, 1040)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@22

-			location   	(32, 850)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	608

-			justify    	0

-			label      	"PortComponent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AB8D01F6"

-		    compartment 	(object Compartment

-			Parent_View 	@22

-			location   	(32, 902)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	604)

-		    width      	626

-		    height     	400

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$4" @23

-		    location   	(336, 1649)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11BD80037E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "handlers " @24

-			    Parent_View 	@23

-			    location   	(48, 1541)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @25

-				Parent_View 	@24

-				location   	(296, 1976)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	149

-				justify    	0

-				label      	"+handlers "

-				pctDist    	0.799082

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD840293"

-			    client     	@23

-			    supplier   	@9

-			    vertices   	(list Points

-				(336, 1649)

-				(336, 2058))

-			    line_style 	0

-			    label      	(object SegLabel @26

-				Parent_View 	@24

-				location   	(390, 2016)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.900115

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$5" @27

-			    Parent_View 	@23

-			    location   	(48, 1541)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD840295"

-			    client     	@23

-			    supplier   	@22

-			    vertices   	(list Points

-				(336, 1649)

-				(336, 1240))

-			    line_style 	0

-			    label      	(object SegLabel @28

-				Parent_View 	@27

-				location   	(390, 1282)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.900115

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$0" @29

-		    location   	(1193, 1038)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11BD6900E8"

-		    roleview_list 	(list RoleViews

-			(object RoleView "wsdlPort" @30

-			    Parent_View 	@29

-			    location   	(909, 922)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @31

-				Parent_View 	@30

-				location   	(1422, 1083)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	192

-				justify    	0

-				label      	"+wsdlPort"

-				pctDist    	0.421296

-				height     	45

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD6A034C"

-			    client     	@29

-			    supplier   	@10

-			    vertices   	(list Points

-				(1193, 1038)

-				(1737, 1038))

-			    line_style 	0

-			    label      	(object SegLabel @32

-				Parent_View 	@30

-				location   	(1737, 998)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	1.003623

-				height     	41

-				orientation 	0))

-			(object RoleView "$UNNAMED$1" @33

-			    Parent_View 	@29

-			    location   	(909, 922)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD6A0356"

-			    client     	@29

-			    supplier   	@22

-			    vertices   	(list Points

-				(1193, 1038)

-				(649, 1039))

-			    line_style 	0

-			    label      	(object SegLabel @34

-				Parent_View 	@33

-				location   	(707, 988)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.894737

-				height     	52

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$2" @35

-		    location   	(874, 1260)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11BD74029C"

-		    roleview_list 	(list RoleViews

-			(object RoleView "serviceImplBean" @36

-			    Parent_View 	@35

-			    location   	(591, 1144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @37

-				Parent_View 	@36

-				location   	(971, 1539)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	273

-				justify    	0

-				label      	"+serviceImplBean"

-				pctDist    	0.797507

-				height     	222

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD7602F8"

-			    client     	@35

-			    supplier   	@12

-			    vertices   	(list Points

-				(874, 1260)

-				(1100, 1353))

-			    line_style 	0

-			    label      	(object SegLabel @38

-				Parent_View 	@36

-				location   	(1067, 1376)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.913571

-				height     	35

-				orientation 	1))

-			(object RoleView "$UNNAMED$3" @39

-			    Parent_View 	@35

-			    location   	(591, 1144)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11BD7602FA"

-			    client     	@35

-			    supplier   	@22

-			    vertices   	(list Points

-				(874, 1260)

-				(649, 1168))

-			    line_style 	0

-			    label      	(object SegLabel @40

-				Parent_View 	@39

-				location   	(692, 1129)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.897595

-				height     	53

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$22" @41

-		    location   	(248, 690)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5CBEA10235"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptionType" @42

-			    Parent_View 	@41

-			    location   	(-72, -132)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @43

-				Parent_View 	@42

-				location   	(179, 628)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	255

-				justify    	0

-				label      	"+descriptionType"

-				pctDist    	0.501320

-				height     	53

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA200D8"

-			    client     	@41

-			    supplier   	@19

-			    vertices   	(list Points

-				(248, 690)

-				(211, 542))

-			    line_style 	0

-			    label      	(object SegLabel @44

-				Parent_View 	@42

-				location   	(267, 581)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	137

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.668995

-				height     	45

-				orientation 	1))

-			(object RoleView "$UNNAMED$23" @45

-			    Parent_View 	@41

-			    location   	(-72, -132)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA200E2"

-			    client     	@41

-			    supplier   	@22

-			    vertices   	(list Points

-				(248, 690)

-				(285, 839))

-			    line_style 	0

-			    label      	(object SegLabel @46

-				Parent_View 	@45

-				location   	(333, 811)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.890954

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$24" @47

-		    location   	(519, 690)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5CBEA700C1"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNameType" @48

-			    Parent_View 	@47

-			    location   	(192, -124)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @49

-				Parent_View 	@48

-				location   	(534, 662)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	286

-				justify    	0

-				label      	"+displayNameType"

-				pctDist    	0.194674

-				height     	1

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA8031B"

-			    client     	@47

-			    supplier   	@20

-			    vertices   	(list Points

-				(519, 690)

-				(598, 542))

-			    line_style 	0

-			    label      	(object SegLabel @50

-				Parent_View 	@48

-				location   	(652, 612)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	157

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.778527

-				height     	81

-				orientation 	1))

-			(object RoleView "$UNNAMED$25" @51

-			    Parent_View 	@47

-			    location   	(192, -124)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBEA80325"

-			    client     	@47

-			    supplier   	@22

-			    vertices   	(list Points

-				(519, 690)

-				(441, 839))

-			    line_style 	0

-			    label      	(object SegLabel @52

-				Parent_View 	@51

-				location   	(497, 849)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.898276

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$34" @53

-		    location   	(807, 696)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDE950122"

-		    roleview_list 	(list RoleViews

-			(object RoleView "iconType" @54

-			    Parent_View 	@53

-			    location   	(474, -345)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @55

-				Parent_View 	@54

-				location   	(941, 550)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	168

-				justify    	0

-				label      	"+iconType"

-				pctDist    	0.799329

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDE96016A"

-			    client     	@53

-			    supplier   	@21

-			    vertices   	(list Points

-				(807, 696)

-				(1003, 553))

-			    line_style 	0

-			    label      	(object SegLabel @56

-				Parent_View 	@54

-				location   	(1015, 612)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.900575

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$35" @57

-			    Parent_View 	@53

-			    location   	(474, -345)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDE96017E"

-			    client     	@53

-			    supplier   	@22

-			    vertices   	(list Points

-				(807, 696)

-				(611, 839))

-			    line_style 	0

-			    label      	(object SegLabel @58

-				Parent_View 	@57

-				location   	(663, 868)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	0))))

-		(object InheritView "" @59

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB7E00C1"

-		    client     	@19

-		    supplier   	@4

-		    vertices   	(list Points

-			(192, 385)

-			(192, 258))

-		    line_style 	0)

-		(object InheritView "" @60

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB82033D"

-		    client     	@20

-		    supplier   	@5

-		    vertices   	(list Points

-			(640, 385)

-			(640, 258))

-		    line_style 	0)))

-	(object ClassDiagram "WebServices"

-	    quid       	"3E109E8A0181"

-	    title      	"WebServices"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	0

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::wsdd::WebServiceDescription" @61

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(484, 1216)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@61

-			location   	(142, 1002)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	684

-			justify    	0

-			label      	"WebServiceDescription")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10A1500313"

-		    compartment 	(object Compartment

-			Parent_View 	@61

-			location   	(142, 1054)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	681)

-		    width      	702

-		    height     	448

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::WebServices" @62

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(487, 690)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@62

-			location   	(374, 645)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	226

-			justify    	0

-			label      	"WebServices")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E109EEF012F"

-		    width      	244

-		    height     	110

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$10" @63

-		    location   	(485, 868)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E10CA7303C5"

-		    roleview_list 	(list RoleViews

-			(object RoleView "webServiceDescriptions" @64

-			    Parent_View 	@63

-			    location   	(-123, 563)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @65

-				Parent_View 	@64

-				location   	(239, 982)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	374

-				justify    	0

-				label      	"+webServiceDescriptions"

-				pctDist    	0.938416

-				height     	246

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E10CA760351"

-			    client     	@63

-			    supplier   	@61

-			    vertices   	(list Points

-				(485, 868)

-				(484, 991))

-			    line_style 	0

-			    label      	(object SegLabel @66

-				Parent_View 	@64

-				location   	(538, 978)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	62

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.898827

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$11" @67

-			    Parent_View 	@63

-			    location   	(-123, 563)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E10CA76035B"

-			    client     	@63

-			    supplier   	@62

-			    vertices   	(list Points

-				(485, 868)

-				(486, 745))

-			    line_style 	0

-			    label      	(object SegLabel @68

-				Parent_View 	@67

-				location   	(540, 758)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.898678

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::common::CompatibilityDescriptionGroup" @69

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(487, 281)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@69

-			location   	(141, 102)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	692

-			justify    	0

-			label      	"CompatibilityDescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"4023ADF20197"

-		    compartment 	(object Compartment

-			Parent_View 	@69

-			location   	(141, 217)

-			font       	(object Font

-			    size       	10

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	13434879

-			anchor     	2

-			nlines     	5

-			max_width  	437)

-		    width      	710

-		    height     	382

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @70

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"4023B0DD00DD"

-		    client     	@62

-		    supplier   	@69

-		    vertices   	(list Points

-			(487, 634)

-			(487, 472))

-		    line_style 	0)))

-	(object ClassDiagram "WebServiceDescription"

-	    quid       	"3E10D66B02EA"

-	    title      	"WebServiceDescription"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	26

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::DisplayName" @71

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2176, 640)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@71

-			location   	(1960, 521)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	432

-			justify    	0

-			label      	"DisplayName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A9922000E"

-		    compartment 	(object Compartment

-			Parent_View 	@71

-			location   	(1960, 617)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	428)

-		    width      	450

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::Description" @72

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2096, 320)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@72

-			location   	(1968, 201)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@72

-			location   	(1968, 297)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	253)

-		    width      	274

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::PortComponent" @73

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(395, 1621)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@73

-			location   	(91, 1431)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	608

-			justify    	0

-			label      	"PortComponent")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AB8D01F6"

-		    compartment 	(object Compartment

-			Parent_View 	@73

-			location   	(91, 1483)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	7

-			max_width  	604)

-		    width      	626

-		    height     	400

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::DescriptionType" @74

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1408, 320)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@74

-			location   	(1271, 252)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"DescriptionType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC6D0353"

-		    width      	292

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @75

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB7E00C1"

-		    client     	@74

-		    supplier   	@72

-		    vertices   	(list Points

-			(1554, 320)

-			(1958, 320))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::wscommon::DisplayNameType" @76

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1424, 640)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@76

-			location   	(1275, 572)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	298

-			justify    	0

-			label      	"DisplayNameType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC780236"

-		    width      	316

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @77

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB82033D"

-		    client     	@76

-		    supplier   	@71

-		    vertices   	(list Points

-			(1582, 640)

-			(1950, 640))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::common::IconType" @78

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1488, 992)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@78

-			location   	(1233, 849)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	510

-			justify    	0

-			label      	"IconType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A99EE003A"

-		    compartment 	(object Compartment

-			Parent_View 	@78

-			location   	(1233, 945)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	506)

-		    width      	528

-		    height     	306

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::WebServiceDescription" @79

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(395, 644)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@79

-			location   	(53, 430)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	684

-			justify    	0

-			label      	"WebServiceDescription")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10A1500313"

-		    compartment 	(object Compartment

-			Parent_View 	@79

-			location   	(53, 482)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	8

-			max_width  	681)

-		    width      	702

-		    height     	448

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$12" @80

-		    location   	(395, 1144)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11B7C8033F"

-		    roleview_list 	(list RoleViews

-			(object RoleView "portComponents" @81

-			    Parent_View 	@80

-			    location   	(107, 983)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @82

-				Parent_View 	@81

-				location   	(355, 1363)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	270

-				justify    	0

-				label      	"+portComponents"

-				pctDist    	0.797920

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11B7CC02C3"

-			    client     	@80

-			    supplier   	@73

-			    vertices   	(list Points

-				(395, 1144)

-				(395, 1420))

-			    line_style 	0

-			    label      	(object SegLabel @83

-				Parent_View 	@81

-				location   	(449, 1392)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"1..n"

-				pctDist    	0.898960

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$13" @84

-			    Parent_View 	@80

-			    location   	(107, 983)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11B7CC02CD"

-			    client     	@80

-			    supplier   	@79

-			    vertices   	(list Points

-				(395, 1144)

-				(395, 868))

-			    line_style 	0

-			    label      	(object SegLabel @85

-				Parent_View 	@84

-				location   	(449, 896)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.900298

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$28" @86

-		    location   	(1003, 448)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDBB70311"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptionType" @87

-			    Parent_View 	@86

-			    location   	(648, -189)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @88

-				Parent_View 	@87

-				location   	(1198, 346)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	264

-				justify    	0

-				label      	"+descriptionType"

-				pctDist    	0.796532

-				height     	40

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBB80255"

-			    client     	@86

-			    supplier   	@74

-			    vertices   	(list Points

-				(1003, 448)

-				(1261, 366))

-			    line_style 	0

-			    label      	(object SegLabel @89

-				Parent_View 	@87

-				location   	(1251, 425)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.896416

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$29" @90

-			    Parent_View 	@86

-			    location   	(648, -189)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBB80269"

-			    client     	@86

-			    supplier   	@79

-			    vertices   	(list Points

-				(1003, 448)

-				(746, 530))

-			    line_style 	0

-			    label      	(object SegLabel @91

-				Parent_View 	@90

-				location   	(789, 574)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.894875

-				height     	55

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$30" @92

-		    location   	(1005, 641)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDBBE039E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "displayNameType" @93

-			    Parent_View 	@92

-			    location   	(649, 1)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @94

-				Parent_View 	@93

-				location   	(1211, 600)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	296

-				justify    	0

-				label      	"+displayNameType"

-				pctDist    	0.796992

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBBF0309"

-			    client     	@92

-			    supplier   	@76

-			    vertices   	(list Points

-				(1005, 641)

-				(1265, 640))

-			    line_style 	0

-			    label      	(object SegLabel @95

-				Parent_View 	@93

-				location   	(1238, 694)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.898496

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$31" @96

-			    Parent_View 	@92

-			    location   	(649, 1)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDBBF0313"

-			    client     	@92

-			    supplier   	@79

-			    vertices   	(list Points

-				(1005, 641)

-				(746, 642))

-			    line_style 	0

-			    label      	(object SegLabel @97

-				Parent_View 	@96

-				location   	(772, 696)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.898496

-				height     	54

-				orientation 	0))))

-		(object AssociationViewNew "$UNNAMED$32" @98

-		    location   	(984, 830)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDC4500F9"

-		    roleview_list 	(list RoleViews

-			(object RoleView "iconType" @99

-			    Parent_View 	@98

-			    location   	(631, 185)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @100

-				Parent_View 	@99

-				location   	(1187, 853)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	168

-				justify    	0

-				label      	"+iconType"

-				pctDist    	0.795003

-				height     	41

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDC460046"

-			    client     	@98

-			    supplier   	@78

-			    vertices   	(list Points

-				(984, 830)

-				(1223, 907))

-			    line_style 	0

-			    label      	(object SegLabel @101

-				Parent_View 	@99

-				location   	(1183, 950)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..1"

-				pctDist    	0.901946

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$33" @102

-			    Parent_View 	@98

-			    location   	(631, 185)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5DDC460050"

-			    client     	@98

-			    supplier   	@79

-			    vertices   	(list Points

-				(984, 830)

-				(746, 754))

-			    line_style 	0

-			    label      	(object SegLabel @103

-				Parent_View 	@102

-				location   	(758, 812)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.889918

-				height     	53

-				orientation 	0))))))

-	(object ClassDiagram "Handler"

-	    quid       	"3E11CC500304"

-	    title      	"Handler"

-	    zoom       	100

-	    max_height 	28350

-	    max_width  	21600

-	    origin_x   	0

-	    origin_y   	694

-	    items      	(list diagram_item_list

-		(object ClassView "Class" "Logical View::common::QName" @104

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1836, 1012)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@104

-			location   	(1555, 846)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	562

-			justify    	0

-			label      	"QName")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3F3BEF5D02C0"

-		    compartment 	(object Compartment

-			Parent_View 	@104

-			location   	(1555, 942)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	5

-			max_width  	558)

-		    width      	580

-		    height     	352

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::SOAPHeader" @105

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1088, 1456)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@105

-			location   	(975, 1375)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	226

-			justify    	0

-			label      	"SOAPHeader")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC99022F"

-		    width      	244

-		    height     	182

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @106

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F4671870049"

-		    client     	@105

-		    supplier   	@104

-		    vertices   	(list Points

-			(1210, 1382)

-			(1545, 1183))

-		    line_style 	0)

-		(object ClassView "Class" "Logical View::wscommon::SOAPRole" @107

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(528, 1840)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@107

-			location   	(348, 1734)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	360

-			justify    	0

-			label      	"SOAPRole")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10ACBC0164"

-		    compartment 	(object Compartment

-			Parent_View 	@107

-			location   	(348, 1830)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	2

-			max_width  	312)

-		    width      	378

-		    height     	232

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wsdd::Handler" @108

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(281, 884)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@108

-			location   	(62, 757)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	438

-			justify    	0

-			label      	"Handler")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC3B01D6"

-		    compartment 	(object Compartment

-			Parent_View 	@108

-			location   	(62, 809)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	375)

-		    width      	456

-		    height     	275

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$16" @109

-		    location   	(719, 1195)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11CEE80001"

-		    roleview_list 	(list RoleViews

-			(object RoleView "soapHeaders" @110

-			    Parent_View 	@109

-			    location   	(582, 1090)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @111

-				Parent_View 	@110

-				location   	(892, 1367)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	213

-				justify    	0

-				label      	"+soapHeaders"

-				pctDist    	0.799970

-				height     	41

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEEA0298"

-			    client     	@109

-			    supplier   	@105

-			    vertices   	(list Points

-				(719, 1195)

-				(965, 1368))

-			    line_style 	0

-			    label      	(object SegLabel @112

-				Parent_View 	@110

-				location   	(970, 1308)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.901260

-				height     	54

-				orientation 	0))

-			(object RoleView "$UNNAMED$17" @113

-			    Parent_View 	@109

-			    location   	(582, 1090)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEEA02A2"

-			    client     	@109

-			    supplier   	@108

-			    vertices   	(list Points

-				(719, 1195)

-				(475, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @114

-				Parent_View 	@113

-				location   	(530, 996)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.897959

-				height     	54

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$20" @115

-		    location   	(406, 1372)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E5276360293"

-		    roleview_list 	(list RoleViews

-			(object RoleView "soapRoles" @116

-			    Parent_View 	@115

-			    location   	(187, 413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @117

-				Parent_View 	@116

-				location   	(375, 1655)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	180

-				justify    	0

-				label      	"+soapRoles"

-				pctDist    	0.732968

-				height     	102

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5276380227"

-			    client     	@115

-			    supplier   	@107

-			    vertices   	(list Points

-				(406, 1372)

-				(497, 1723))

-			    line_style 	0

-			    label      	(object SegLabel @118

-				Parent_View 	@116

-				location   	(574, 1680)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.940086

-				height     	86

-				orientation 	0))

-			(object RoleView "$UNNAMED$21" @119

-			    Parent_View 	@115

-			    location   	(187, 413)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E5276380231"

-			    client     	@115

-			    supplier   	@108

-			    vertices   	(list Points

-				(406, 1372)

-				(315, 1021))

-			    line_style 	0

-			    label      	(object SegLabel @120

-				Parent_View 	@119

-				location   	(376, 1042)

-				font       	(object Font

-				    size       	10

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	15

-				justify    	0

-				label      	"1"

-				pctDist    	0.900000

-				height     	54

-				orientation 	1))))

-		(object ClassView "Class" "Logical View::wscommon::DescriptionType" @121

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1728, 528)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@121

-			location   	(1591, 460)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	274

-			justify    	0

-			label      	"DescriptionType")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3F5CBC6D0353"

-		    width      	292

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::wscommon::InitParam" @122

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(1056, 960)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@122

-			location   	(850, 813)

-			fill_color 	13434879

-			nlines     	2

-			max_width  	412

-			justify    	0

-			label      	"InitParam")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	13434879

-		    quidu      	"3E10AC6E0280"

-		    compartment 	(object Compartment

-			Parent_View 	@122

-			location   	(850, 909)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	4

-			max_width  	356)

-		    width      	430

-		    height     	314

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object AssociationViewNew "$UNNAMED$14" @123

-		    location   	(674, 921)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3E11CEDE031E"

-		    roleview_list 	(list RoleViews

-			(object RoleView "initParams " @124

-			    Parent_View 	@123

-			    location   	(537, 808)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @125

-				Parent_View 	@124

-				location   	(696, 949)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	183

-				justify    	0

-				label      	"+initParams "

-				pctDist    	0.143590

-				height     	26

-				orientation 	1)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEE00371"

-			    client     	@123

-			    supplier   	@122

-			    vertices   	(list Points

-				(674, 921)

-				(840, 936))

-			    line_style 	0

-			    label      	(object SegLabel @126

-				Parent_View 	@124

-				location   	(828, 885)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.899359

-				height     	52

-				orientation 	0))

-			(object RoleView "$UNNAMED$15" @127

-			    Parent_View 	@123

-			    location   	(537, 808)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3E11CEE00373"

-			    client     	@123

-			    supplier   	@108

-			    vertices   	(list Points

-				(674, 921)

-				(509, 904))

-			    line_style 	0

-			    label      	(object SegLabel @128

-				Parent_View 	@127

-				location   	(532, 855)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.899125

-				height     	53

-				orientation 	1))))

-		(object AssociationViewNew "$UNNAMED$26" @129

-		    location   	(1438, 713)

-		    font       	(object Font

-			size       	10

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5CBF8A0114"

-		    roleview_list 	(list RoleViews

-			(object RoleView "descriptionTypes" @130

-			    Parent_View 	@129

-			    location   	(386, -242)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object SegLabel @131

-				Parent_View 	@130

-				location   	(1552, 595)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	1

-				anchor_loc 	1

-				nlines     	1

-				max_width  	278

-				justify    	0

-				label      	"+descriptionTypes"

-				pctDist    	0.803692

-				height     	39

-				orientation 	0)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBF8B0075"

-			    client     	@129

-			    supplier   	@121

-			    vertices   	(list Points

-				(1438, 713)

-				(1605, 606))

-			    line_style 	0

-			    label      	(object SegLabel @132

-				Parent_View 	@130

-				location   	(1615, 663)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	68

-				justify    	0

-				label      	"0..n"

-				pctDist    	0.895290

-				height     	54

-				orientation 	1))

-			(object RoleView "$UNNAMED$27" @133

-			    Parent_View 	@129

-			    location   	(386, -242)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    line_color 	3342489

-			    quidu      	"3F5CBF8B0089"

-			    client     	@129

-			    supplier   	@122

-			    vertices   	(list Points

-				(1438, 713)

-				(1271, 821))

-			    line_style 	0

-			    label      	(object SegLabel @134

-				Parent_View 	@133

-				location   	(1319, 854)

-				font       	(object Font

-				    size       	8

-				    face       	"Arial"

-				    bold       	FALSE

-				    italics    	FALSE

-				    underline  	FALSE

-				    strike     	FALSE

-				    color      	0

-				    default_color 	TRUE)

-				anchor     	2

-				anchor_loc 	1

-				nlines     	1

-				max_width  	30

-				justify    	0

-				label      	"1"

-				pctDist    	0.891508

-				height     	54

-				orientation 	0))))

-		(object ClassView "Class" "Logical View::common::Description" @135

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(2368, 528)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@135

-			location   	(2240, 409)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	256

-			justify    	0

-			label      	"Description")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4A98D602E0"

-		    compartment 	(object Compartment

-			Parent_View 	@135

-			location   	(2240, 505)

-			font       	(object Font

-			    size       	8

-			    face       	"Arial"

-			    bold       	FALSE

-			    italics    	FALSE

-			    underline  	FALSE

-			    strike     	FALSE

-			    color      	0

-			    default_color 	TRUE)

-			icon_style 	"Icon"

-			fill_color 	16777215

-			anchor     	2

-			nlines     	3

-			max_width  	253)

-		    width      	274

-		    height     	258

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object ClassView "Class" "Logical View::common::DescriptionGroup" @136

-		    ShowCompartmentStereotypes 	TRUE

-		    IncludeAttribute 	TRUE

-		    IncludeOperation 	TRUE

-		    location   	(224, 496)

-		    font       	(object Font

-			size       	8

-			face       	"Arial"

-			bold       	FALSE

-			italics    	FALSE

-			underline  	FALSE

-			strike     	FALSE

-			color      	0

-			default_color 	TRUE)

-		    label      	(object ItemLabel

-			Parent_View 	@136

-			location   	(82, 428)

-			fill_color 	13434879

-			nlines     	1

-			max_width  	284

-			justify    	0

-			label      	"DescriptionGroup")

-		    icon_style 	"Icon"

-		    line_color 	3342489

-		    fill_color 	16766421

-		    quidu      	"3E4D451F01FB"

-		    width      	302

-		    height     	156

-		    annotation 	8

-		    autoResize 	TRUE)

-		(object InheritView "" @137

-		    stereotype 	TRUE

-		    line_color 	3342489

-		    quidu      	"3F5DDB7E00C1"

-		    client     	@121

-		    supplier   	@135

-		    vertices   	(list Points

-			(1874, 528)

-			(2230, 528))

-		    line_style 	0)))))

diff --git a/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.ecore b/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.ecore
deleted file mode 100644
index 3510e90..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/rose/wsdd.ecore
+++ /dev/null
@@ -1,120 +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="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">

-    <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">

-    <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">

-    <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"/>

-</ecore:EPackage>

diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/JaxrpcmapPackage.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/JaxrpcmapPackage.java
deleted file mode 100644
index 0eef421..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/JaxrpcmapPackage.java
+++ /dev/null
@@ -1,3003 +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.webservice.internal.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-
-/**
- * <!-- 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.internal.webservice.jaxrpcmap.JaxrpcmapFactory
- * @generated
- */
-public interface JaxrpcmapPackage extends EPackage{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "jaxrpcmap";//$NON-NLS-1$
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.ibm.com/websphere/appserver/schemas/5.0.2/jaxrpcmap.xmi";//$NON-NLS-1$
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap";//$NON-NLS-1$
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  JaxrpcmapPackage eINSTANCE = org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.impl.JaxrpcmapPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaWSDLMappingImpl <em>Java WSDL Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaWSDLMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getJavaWSDLMapping()
-   * @generated
-   */
-  int JAVA_WSDL_MAPPING = 0;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_WSDL_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Package Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS = 1;
-
-  /**
-   * The feature id for the '<em><b>Java XML Type Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS = 2;
-
-  /**
-   * The feature id for the '<em><b>Exception Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS = 3;
-
-  /**
-   * The feature id for the '<em><b>Interface Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS = 4;
-
-  /**
-   * The number of structural features of the the '<em>Java WSDL Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_WSDL_MAPPING_FEATURE_COUNT = 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageMappingImpl <em>Package Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getPackageMapping()
-   * @generated
-   */
-  int PACKAGE_MAPPING = 1;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PACKAGE_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Package Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PACKAGE_MAPPING__PACKAGE_TYPE = 1;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PACKAGE_MAPPING__NAMESPACE_URI = 2;
-
-  /**
-   * The number of structural features of the the '<em>Package Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PACKAGE_MAPPING_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl <em>Java XML Type Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getJavaXMLTypeMapping()
-   * @generated
-   */
-  int JAVA_XML_TYPE_MAPPING = 2;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_XML_TYPE_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Class Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_XML_TYPE_MAPPING__CLASS_TYPE = 1;
-
-  /**
-   * The feature id for the '<em><b>Qname Scope</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_XML_TYPE_MAPPING__QNAME_SCOPE = 2;
-
-  /**
-   * The feature id for the '<em><b>Anonymous Type Qname</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME = 3;
-
-  /**
-   * The feature id for the '<em><b>Root Type Qname</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME = 4;
-
-  /**
-   * The feature id for the '<em><b>Variable Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS = 5;
-
-  /**
-   * The number of structural features of the the '<em>Java XML Type Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_XML_TYPE_MAPPING_FEATURE_COUNT = 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionMappingImpl <em>Exception Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getExceptionMapping()
-   * @generated
-   */
-  int EXCEPTION_MAPPING = 3;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Exception Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_MAPPING__EXCEPTION_TYPE = 1;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME = 2;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_MAPPING__WSDL_MESSAGE = 3;
-
-  /**
-   * The feature id for the '<em><b>Constructor Parameter Order</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER = 4;
-
-  /**
-   * The number of structural features of the the '<em>Exception Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_MAPPING_FEATURE_COUNT = 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.InterfaceMappingImpl <em>Interface Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.InterfaceMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getInterfaceMapping()
-   * @generated
-   */
-  int INTERFACE_MAPPING = 33;
-
-  /**
-   * The number of structural features of the the '<em>Interface Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INTERFACE_MAPPING_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceInterfaceMappingImpl <em>Service Interface Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceInterfaceMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getServiceInterfaceMapping()
-   * @generated
-   */
-  int SERVICE_INTERFACE_MAPPING = 4;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_INTERFACE_MAPPING__ID = INTERFACE_MAPPING_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Service Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE = INTERFACE_MAPPING_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Service Name</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME = INTERFACE_MAPPING_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Port Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS = INTERFACE_MAPPING_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the the '<em>Service Interface Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_INTERFACE_MAPPING_FEATURE_COUNT = INTERFACE_MAPPING_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointInterfaceMappingImpl <em>Service Endpoint Interface Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointInterfaceMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getServiceEndpointInterfaceMapping()
-   * @generated
-   */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING = 5;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__ID = INTERFACE_MAPPING_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Service Endpoint Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE = INTERFACE_MAPPING_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Port Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE = INTERFACE_MAPPING_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Binding</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING = INTERFACE_MAPPING_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Service Endpoint Method Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS = INTERFACE_MAPPING_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the the '<em>Service Endpoint Interface Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_INTERFACE_MAPPING_FEATURE_COUNT = INTERFACE_MAPPING_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageTypeImpl <em>Package Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageTypeImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getPackageType()
-   * @generated
-   */
-  int PACKAGE_TYPE = 6;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PACKAGE_TYPE__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Package Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PACKAGE_TYPE__PACKAGE_TYPE = 1;
-
-  /**
-   * The number of structural features of the the '<em>Package Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PACKAGE_TYPE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ClassTypeImpl <em>Class Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ClassTypeImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getClassType()
-   * @generated
-   */
-  int CLASS_TYPE = 7;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS_TYPE__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Class Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS_TYPE__CLASS_TYPE = 1;
-
-  /**
-   * The number of structural features of the the '<em>Class Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS_TYPE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.RootTypeQnameImpl <em>Root Type Qname</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.RootTypeQnameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getRootTypeQname()
-   * @generated
-   */
-  int ROOT_TYPE_QNAME = 8;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ROOT_TYPE_QNAME__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Local Part</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ROOT_TYPE_QNAME__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-  /**
-   * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ROOT_TYPE_QNAME__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-  /**
-   * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ROOT_TYPE_QNAME__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-  /**
-   * The number of structural features of the the '<em>Root Type Qname</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ROOT_TYPE_QNAME_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.QnameScopeImpl <em>Qname Scope</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.QnameScopeImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getQnameScope()
-   * @generated
-   */
-  int QNAME_SCOPE = 9;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int QNAME_SCOPE__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Qname Scope</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int QNAME_SCOPE__QNAME_SCOPE = 1;
-
-  /**
-   * The number of structural features of the the '<em>Qname Scope</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int QNAME_SCOPE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl <em>Variable Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getVariableMapping()
-   * @generated
-   */
-  int VARIABLE_MAPPING = 10;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Java Variable Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_MAPPING__JAVA_VARIABLE_NAME = 1;
-
-  /**
-   * The feature id for the '<em><b>Xml Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_MAPPING__XML_ELEMENT_NAME = 2;
-
-  /**
-   * The feature id for the '<em><b>Data Member</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_MAPPING__DATA_MEMBER = 3;
-
-  /**
-   * The feature id for the '<em><b>Xml Attribute Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_MAPPING__XML_ATTRIBUTE_NAME = 4;
-
-  /**
-   * The feature id for the '<em><b>Xml Wildcard</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_MAPPING__XML_WILDCARD = 5;
-
-  /**
-   * The number of structural features of the the '<em>Variable Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int VARIABLE_MAPPING_FEATURE_COUNT = 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionTypeImpl <em>Exception Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionTypeImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getExceptionType()
-   * @generated
-   */
-  int EXCEPTION_TYPE = 11;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_TYPE__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_TYPE__NAME = 1;
-
-  /**
-   * The number of structural features of the the '<em>Exception Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXCEPTION_TYPE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageImpl <em>WSDL Message</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLMessage()
-   * @generated
-   */
-  int WSDL_MESSAGE = 12;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Local Part</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-  /**
-   * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-  /**
-   * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Message</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ConstructorParameterOrderImpl <em>Constructor Parameter Order</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ConstructorParameterOrderImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getConstructorParameterOrder()
-   * @generated
-   */
-  int CONSTRUCTOR_PARAMETER_ORDER = 13;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONSTRUCTOR_PARAMETER_ORDER__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Element Names</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES = 1;
-
-  /**
-   * The number of structural features of the the '<em>Constructor Parameter Order</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CONSTRUCTOR_PARAMETER_ORDER_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaVariableNameImpl <em>Java Variable Name</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaVariableNameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getJavaVariableName()
-   * @generated
-   */
-  int JAVA_VARIABLE_NAME = 14;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_VARIABLE_NAME__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Java Variable Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_VARIABLE_NAME__JAVA_VARIABLE_NAME = 1;
-
-  /**
-   * The number of structural features of the the '<em>Java Variable Name</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_VARIABLE_NAME_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.XMLElementNameImpl <em>XML Element Name</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.XMLElementNameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getXMLElementName()
-   * @generated
-   */
-  int XML_ELEMENT_NAME = 15;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XML_ELEMENT_NAME__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Xml Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XML_ELEMENT_NAME__XML_ELEMENT_NAME = 1;
-
-  /**
-   * The number of structural features of the the '<em>XML Element Name</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int XML_ELEMENT_NAME_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ElementNameImpl <em>Element Name</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ElementNameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getElementName()
-   * @generated
-   */
-  int ELEMENT_NAME = 16;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ELEMENT_NAME__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Text</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ELEMENT_NAME__TEXT = 1;
-
-  /**
-   * The number of structural features of the the '<em>Element Name</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ELEMENT_NAME_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLServiceNameImpl <em>WSDL Service Name</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLServiceNameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLServiceName()
-   * @generated
-   */
-  int WSDL_SERVICE_NAME = 17;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_SERVICE_NAME__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Local Part</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_SERVICE_NAME__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-  /**
-   * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_SERVICE_NAME__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-  /**
-   * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_SERVICE_NAME__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Service Name</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_SERVICE_NAME_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PortMappingImpl <em>Port Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PortMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getPortMapping()
-   * @generated
-   */
-  int PORT_MAPPING = 18;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Port Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_MAPPING__PORT_NAME = 1;
-
-  /**
-   * The feature id for the '<em><b>Java Port Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_MAPPING__JAVA_PORT_NAME = 2;
-
-  /**
-   * The number of structural features of the the '<em>Port Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_MAPPING_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaPortNameImpl <em>Java Port Name</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaPortNameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getJavaPortName()
-   * @generated
-   */
-  int JAVA_PORT_NAME = 19;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_PORT_NAME__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Java Port Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_PORT_NAME__JAVA_PORT_NAME = 1;
-
-  /**
-   * The number of structural features of the the '<em>Java Port Name</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_PORT_NAME_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLPortTypeImpl <em>WSDL Port Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLPortTypeImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLPortType()
-   * @generated
-   */
-  int WSDL_PORT_TYPE = 20;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_PORT_TYPE__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Local Part</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_PORT_TYPE__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-  /**
-   * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_PORT_TYPE__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-  /**
-   * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_PORT_TYPE__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Port Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_PORT_TYPE_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLBindingImpl <em>WSDL Binding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLBindingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLBinding()
-   * @generated
-   */
-  int WSDL_BINDING = 21;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_BINDING__NAMESPACE_URI = CommonPackage.QNAME__NAMESPACE_URI;
-
-  /**
-   * The feature id for the '<em><b>Local Part</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_BINDING__LOCAL_PART = CommonPackage.QNAME__LOCAL_PART;
-
-  /**
-   * The feature id for the '<em><b>Combined QName</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_BINDING__COMBINED_QNAME = CommonPackage.QNAME__COMBINED_QNAME;
-
-  /**
-   * The feature id for the '<em><b>Internal Prefix Or Ns URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_BINDING__INTERNAL_PREFIX_OR_NS_URI = CommonPackage.QNAME__INTERNAL_PREFIX_OR_NS_URI;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Binding</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_BINDING_FEATURE_COUNT = CommonPackage.QNAME_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl <em>Service Endpoint Method Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getServiceEndpointMethodMapping()
-   * @generated
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING = 22;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Java Method Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME = 1;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Operation</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION = 2;
-
-  /**
-   * The feature id for the '<em><b>Wrapped Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT = 3;
-
-  /**
-   * The feature id for the '<em><b>Method Param Parts Mappings</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS = 4;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Return Value Mapping</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING = 5;
-
-  /**
-   * The number of structural features of the the '<em>Service Endpoint Method Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_ENDPOINT_METHOD_MAPPING_FEATURE_COUNT = 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaMethodNameImpl <em>Java Method Name</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaMethodNameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getJavaMethodName()
-   * @generated
-   */
-  int JAVA_METHOD_NAME = 23;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_METHOD_NAME__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Java Method Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_METHOD_NAME__JAVA_METHOD_NAME = 1;
-
-  /**
-   * The number of structural features of the the '<em>Java Method Name</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int JAVA_METHOD_NAME_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLOperationImpl <em>WSDL Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLOperationImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLOperation()
-   * @generated
-   */
-  int WSDL_OPERATION = 24;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_OPERATION__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Operation</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_OPERATION__WSDL_OPERATION = 1;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_OPERATION_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodParamPartsMappingImpl <em>Method Param Parts Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodParamPartsMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getMethodParamPartsMapping()
-   * @generated
-   */
-  int METHOD_PARAM_PARTS_MAPPING = 25;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_PARAM_PARTS_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Param Position</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION = 1;
-
-  /**
-   * The feature id for the '<em><b>Param Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE = 2;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message Mapping</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING = 3;
-
-  /**
-   * The number of structural features of the the '<em>Method Param Parts Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_PARAM_PARTS_MAPPING_FEATURE_COUNT = 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLReturnValueMappingImpl <em>WSDL Return Value Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLReturnValueMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLReturnValueMapping()
-   * @generated
-   */
-  int WSDL_RETURN_VALUE_MAPPING = 26;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_RETURN_VALUE_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Method Return Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE = 1;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME = 2;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE = 3;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Return Value Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_RETURN_VALUE_MAPPING_FEATURE_COUNT = 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamPositionImpl <em>Param Position</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamPositionImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getParamPosition()
-   * @generated
-   */
-  int PARAM_POSITION = 27;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAM_POSITION__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Param Position</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAM_POSITION__PARAM_POSITION = 1;
-
-  /**
-   * The number of structural features of the the '<em>Param Position</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAM_POSITION_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamTypeImpl <em>Param Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamTypeImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getParamType()
-   * @generated
-   */
-  int PARAM_TYPE = 28;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAM_TYPE__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Param Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAM_TYPE__PARAM_TYPE = 1;
-
-  /**
-   * The number of structural features of the the '<em>Param Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAM_TYPE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageMappingImpl <em>WSDL Message Mapping</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageMappingImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLMessageMapping()
-   * @generated
-   */
-  int WSDL_MESSAGE_MAPPING = 29;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_MAPPING__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME = 1;
-
-  /**
-   * The feature id for the '<em><b>Parameter Mode</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_MAPPING__PARAMETER_MODE = 2;
-
-  /**
-   * The feature id for the '<em><b>Soap Header</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_MAPPING__SOAP_HEADER = 3;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_MAPPING__WSDL_MESSAGE = 4;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Message Mapping</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_MAPPING_FEATURE_COUNT = 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessagePartNameImpl <em>WSDL Message Part Name</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessagePartNameImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getWSDLMessagePartName()
-   * @generated
-   */
-  int WSDL_MESSAGE_PART_NAME = 30;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_PART_NAME__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME = 1;
-
-  /**
-   * The number of structural features of the the '<em>WSDL Message Part Name</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int WSDL_MESSAGE_PART_NAME_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParameterModeImpl <em>Parameter Mode</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParameterModeImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getParameterMode()
-   * @generated
-   */
-  int PARAMETER_MODE = 31;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAMETER_MODE__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Parameter Mode</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAMETER_MODE__PARAMETER_MODE = 1;
-
-  /**
-   * The number of structural features of the the '<em>Parameter Mode</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAMETER_MODE_FEATURE_COUNT = 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodReturnValueImpl <em>Method Return Value</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodReturnValueImpl
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JaxrpcmapPackageImpl#getMethodReturnValue()
-   * @generated
-   */
-  int METHOD_RETURN_VALUE = 32;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_RETURN_VALUE__ID = 0;
-
-  /**
-   * The feature id for the '<em><b>Method Return Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_RETURN_VALUE__METHOD_RETURN_VALUE = 1;
-
-  /**
-   * The number of structural features of the the '<em>Method Return Value</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int METHOD_RETURN_VALUE_FEATURE_COUNT = 2;
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping <em>Java WSDL Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Java WSDL Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping
-   * @generated
-   */
-  EClass getJavaWSDLMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getId()
-   * @see #getJavaWSDLMapping()
-   * @generated
-   */
-  EAttribute getJavaWSDLMapping_Id();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getPackageMappings <em>Package Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Package Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getPackageMappings()
-   * @see #getJavaWSDLMapping()
-   * @generated
-   */
-  EReference getJavaWSDLMapping_PackageMappings();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getJavaXMLTypeMappings <em>Java XML Type Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Java XML Type Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getJavaXMLTypeMappings()
-   * @see #getJavaWSDLMapping()
-   * @generated
-   */
-  EReference getJavaWSDLMapping_JavaXMLTypeMappings();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getExceptionMappings <em>Exception Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Exception Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getExceptionMappings()
-   * @see #getJavaWSDLMapping()
-   * @generated
-   */
-  EReference getJavaWSDLMapping_ExceptionMappings();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getInterfaceMappings <em>Interface Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Interface Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getInterfaceMappings()
-   * @see #getJavaWSDLMapping()
-   * @generated
-   */
-  EReference getJavaWSDLMapping_InterfaceMappings();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping <em>Package Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Package Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping
-   * @generated
-   */
-  EClass getPackageMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getId()
-   * @see #getPackageMapping()
-   * @generated
-   */
-  EAttribute getPackageMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getPackageType <em>Package Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Package Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getPackageType()
-   * @see #getPackageMapping()
-   * @generated
-   */
-  EAttribute getPackageMapping_PackageType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getNamespaceURI <em>Namespace URI</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Namespace URI</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getNamespaceURI()
-   * @see #getPackageMapping()
-   * @generated
-   */
-  EAttribute getPackageMapping_NamespaceURI();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping <em>Java XML Type Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Java XML Type Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping
-   * @generated
-   */
-  EClass getJavaXMLTypeMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getId()
-   * @see #getJavaXMLTypeMapping()
-   * @generated
-   */
-  EAttribute getJavaXMLTypeMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType <em>Class Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Class Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType()
-   * @see #getJavaXMLTypeMapping()
-   * @generated
-   */
-  EAttribute getJavaXMLTypeMapping_ClassType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope <em>Qname Scope</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Qname Scope</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope()
-   * @see #getJavaXMLTypeMapping()
-   * @generated
-   */
-  EAttribute getJavaXMLTypeMapping_QnameScope();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname <em>Anonymous Type Qname</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Anonymous Type Qname</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname()
-   * @see #getJavaXMLTypeMapping()
-   * @generated
-   */
-  EAttribute getJavaXMLTypeMapping_AnonymousTypeQname();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname <em>Root Type Qname</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Root Type Qname</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname()
-   * @see #getJavaXMLTypeMapping()
-   * @generated
-   */
-  EReference getJavaXMLTypeMapping_RootTypeQname();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getVariableMappings <em>Variable Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Variable Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getVariableMappings()
-   * @see #getJavaXMLTypeMapping()
-   * @generated
-   */
-  EReference getJavaXMLTypeMapping_VariableMappings();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping <em>Exception Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Exception Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping
-   * @generated
-   */
-  EClass getExceptionMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getId()
-   * @see #getExceptionMapping()
-   * @generated
-   */
-  EAttribute getExceptionMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getExceptionType <em>Exception Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Exception Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getExceptionType()
-   * @see #getExceptionMapping()
-   * @generated
-   */
-  EAttribute getExceptionMapping_ExceptionType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName()
-   * @see #getExceptionMapping()
-   * @generated
-   */
-  EAttribute getExceptionMapping_WsdlMessagePartName();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage <em>Wsdl Message</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Message</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage()
-   * @see #getExceptionMapping()
-   * @generated
-   */
-  EReference getExceptionMapping_WsdlMessage();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder <em>Constructor Parameter Order</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Constructor Parameter Order</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder()
-   * @see #getExceptionMapping()
-   * @generated
-   */
-  EReference getExceptionMapping_ConstructorParameterOrder();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping <em>Service Interface Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Service Interface Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping
-   * @generated
-   */
-  EClass getServiceInterfaceMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getId()
-   * @see #getServiceInterfaceMapping()
-   * @generated
-   */
-  EAttribute getServiceInterfaceMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface <em>Service Interface</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Service Interface</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface()
-   * @see #getServiceInterfaceMapping()
-   * @generated
-   */
-  EAttribute getServiceInterfaceMapping_ServiceInterface();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName <em>Wsdl Service Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Service Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName()
-   * @see #getServiceInterfaceMapping()
-   * @generated
-   */
-  EReference getServiceInterfaceMapping_WsdlServiceName();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getPortMappings <em>Port Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Port Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getPortMappings()
-   * @see #getServiceInterfaceMapping()
-   * @generated
-   */
-  EReference getServiceInterfaceMapping_PortMappings();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping <em>Service Endpoint Interface Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Service Endpoint Interface Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping
-   * @generated
-   */
-  EClass getServiceEndpointInterfaceMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId()
-   * @see #getServiceEndpointInterfaceMapping()
-   * @generated
-   */
-  EAttribute getServiceEndpointInterfaceMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface <em>Service Endpoint Interface</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Service Endpoint Interface</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface()
-   * @see #getServiceEndpointInterfaceMapping()
-   * @generated
-   */
-  EAttribute getServiceEndpointInterfaceMapping_ServiceEndpointInterface();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType <em>Wsdl Port Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Port Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType()
-   * @see #getServiceEndpointInterfaceMapping()
-   * @generated
-   */
-  EReference getServiceEndpointInterfaceMapping_WsdlPortType();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding <em>Wsdl Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Binding</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding()
-   * @see #getServiceEndpointInterfaceMapping()
-   * @generated
-   */
-  EReference getServiceEndpointInterfaceMapping_WsdlBinding();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointMethodMappings <em>Service Endpoint Method Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Service Endpoint Method Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointMethodMappings()
-   * @see #getServiceEndpointInterfaceMapping()
-   * @generated
-   */
-  EReference getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType <em>Package Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Package Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType
-   * @generated
-   */
-  EClass getPackageType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getId()
-   * @see #getPackageType()
-   * @generated
-   */
-  EAttribute getPackageType_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getPackageType <em>Package Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Package Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getPackageType()
-   * @see #getPackageType()
-   * @generated
-   */
-  EAttribute getPackageType_PackageType();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType <em>Class Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Class Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType
-   * @generated
-   */
-  EClass getClassType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getId()
-   * @see #getClassType()
-   * @generated
-   */
-  EAttribute getClassType_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getClassType <em>Class Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Class Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getClassType()
-   * @see #getClassType()
-   * @generated
-   */
-  EAttribute getClassType_ClassType();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.RootTypeQname <em>Root Type Qname</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Root Type Qname</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.RootTypeQname
-   * @generated
-   */
-  EClass getRootTypeQname();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope <em>Qname Scope</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Qname Scope</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope
-   * @generated
-   */
-  EClass getQnameScope();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getId()
-   * @see #getQnameScope()
-   * @generated
-   */
-  EAttribute getQnameScope_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getQnameScope <em>Qname Scope</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Qname Scope</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getQnameScope()
-   * @see #getQnameScope()
-   * @generated
-   */
-  EAttribute getQnameScope_QnameScope();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping <em>Variable Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Variable Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping
-   * @generated
-   */
-  EClass getVariableMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getId()
-   * @see #getVariableMapping()
-   * @generated
-   */
-  EAttribute getVariableMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getJavaVariableName <em>Java Variable Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Java Variable Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getJavaVariableName()
-   * @see #getVariableMapping()
-   * @generated
-   */
-  EAttribute getVariableMapping_JavaVariableName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlElementName <em>Xml Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Xml Element Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlElementName()
-   * @see #getVariableMapping()
-   * @generated
-   */
-  EAttribute getVariableMapping_XmlElementName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Data Member</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isDataMember()
-   * @see #getVariableMapping()
-   * @generated
-   */
-  EAttribute getVariableMapping_DataMember();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName <em>Xml Attribute Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Xml Attribute Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName()
-   * @see #getVariableMapping()
-   * @generated
-   */
-  EAttribute getVariableMapping_XmlAttributeName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Xml Wildcard</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isXmlWildcard()
-   * @see #getVariableMapping()
-   * @generated
-   */
-  EAttribute getVariableMapping_XmlWildcard();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType <em>Exception Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Exception Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType
-   * @generated
-   */
-  EClass getExceptionType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType#getId()
-   * @see #getExceptionType()
-   * @generated
-   */
-  EAttribute getExceptionType_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType#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.internal.webservice.jaxrpcmap.ExceptionType#getName()
-   * @see #getExceptionType()
-   * @generated
-   */
-  EAttribute getExceptionType_Name();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessage <em>WSDL Message</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Message</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessage
-   * @generated
-   */
-  EClass getWSDLMessage();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder <em>Constructor Parameter Order</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Constructor Parameter Order</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder
-   * @generated
-   */
-  EClass getConstructorParameterOrder();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder#getId()
-   * @see #getConstructorParameterOrder()
-   * @generated
-   */
-  EAttribute getConstructorParameterOrder_Id();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder#getElementNames <em>Element Names</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Element Names</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder#getElementNames()
-   * @see #getConstructorParameterOrder()
-   * @generated
-   */
-  EReference getConstructorParameterOrder_ElementNames();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName <em>Java Variable Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Java Variable Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName
-   * @generated
-   */
-  EClass getJavaVariableName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getId()
-   * @see #getJavaVariableName()
-   * @generated
-   */
-  EAttribute getJavaVariableName_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getJavaVariableName <em>Java Variable Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Java Variable Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getJavaVariableName()
-   * @see #getJavaVariableName()
-   * @generated
-   */
-  EAttribute getJavaVariableName_JavaVariableName();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName <em>XML Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>XML Element Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName
-   * @generated
-   */
-  EClass getXMLElementName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getId()
-   * @see #getXMLElementName()
-   * @generated
-   */
-  EAttribute getXMLElementName_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getXmlElementName <em>Xml Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Xml Element Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getXmlElementName()
-   * @see #getXMLElementName()
-   * @generated
-   */
-  EAttribute getXMLElementName_XmlElementName();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName <em>Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Element Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName
-   * @generated
-   */
-  EClass getElementName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getId()
-   * @see #getElementName()
-   * @generated
-   */
-  EAttribute getElementName_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getText <em>Text</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Text</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getText()
-   * @see #getElementName()
-   * @generated
-   */
-  EAttribute getElementName_Text();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLServiceName <em>WSDL Service Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Service Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLServiceName
-   * @generated
-   */
-  EClass getWSDLServiceName();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping <em>Port Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Port Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping
-   * @generated
-   */
-  EClass getPortMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getId()
-   * @see #getPortMapping()
-   * @generated
-   */
-  EAttribute getPortMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getPortName <em>Port Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Port Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getPortName()
-   * @see #getPortMapping()
-   * @generated
-   */
-  EAttribute getPortMapping_PortName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getJavaPortName <em>Java Port Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Java Port Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getJavaPortName()
-   * @see #getPortMapping()
-   * @generated
-   */
-  EAttribute getPortMapping_JavaPortName();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName <em>Java Port Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Java Port Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName
-   * @generated
-   */
-  EClass getJavaPortName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getId()
-   * @see #getJavaPortName()
-   * @generated
-   */
-  EAttribute getJavaPortName_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getJavaPortName <em>Java Port Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Java Port Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getJavaPortName()
-   * @see #getJavaPortName()
-   * @generated
-   */
-  EAttribute getJavaPortName_JavaPortName();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLPortType <em>WSDL Port Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Port Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLPortType
-   * @generated
-   */
-  EClass getWSDLPortType();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLBinding <em>WSDL Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Binding</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLBinding
-   * @generated
-   */
-  EClass getWSDLBinding();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping <em>Service Endpoint Method Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Service Endpoint Method Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping
-   * @generated
-   */
-  EClass getServiceEndpointMethodMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId()
-   * @see #getServiceEndpointMethodMapping()
-   * @generated
-   */
-  EAttribute getServiceEndpointMethodMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName <em>Java Method Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Java Method Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName()
-   * @see #getServiceEndpointMethodMapping()
-   * @generated
-   */
-  EAttribute getServiceEndpointMethodMapping_JavaMethodName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation <em>Wsdl Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Wsdl Operation</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation()
-   * @see #getServiceEndpointMethodMapping()
-   * @generated
-   */
-  EAttribute getServiceEndpointMethodMapping_WsdlOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Wrapped Element</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement()
-   * @see #getServiceEndpointMethodMapping()
-   * @generated
-   */
-  EAttribute getServiceEndpointMethodMapping_WrappedElement();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getMethodParamPartsMappings <em>Method Param Parts Mappings</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Method Param Parts Mappings</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getMethodParamPartsMappings()
-   * @see #getServiceEndpointMethodMapping()
-   * @generated
-   */
-  EReference getServiceEndpointMethodMapping_MethodParamPartsMappings();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Return Value Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping()
-   * @see #getServiceEndpointMethodMapping()
-   * @generated
-   */
-  EReference getServiceEndpointMethodMapping_WsdlReturnValueMapping();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName <em>Java Method Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Java Method Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName
-   * @generated
-   */
-  EClass getJavaMethodName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getId()
-   * @see #getJavaMethodName()
-   * @generated
-   */
-  EAttribute getJavaMethodName_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getJavaMethodName <em>Java Method Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Java Method Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getJavaMethodName()
-   * @see #getJavaMethodName()
-   * @generated
-   */
-  EAttribute getJavaMethodName_JavaMethodName();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation <em>WSDL Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Operation</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation
-   * @generated
-   */
-  EClass getWSDLOperation();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getId()
-   * @see #getWSDLOperation()
-   * @generated
-   */
-  EAttribute getWSDLOperation_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation <em>Wsdl Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Wsdl Operation</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation()
-   * @see #getWSDLOperation()
-   * @generated
-   */
-  EAttribute getWSDLOperation_WsdlOperation();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping <em>Method Param Parts Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Method Param Parts Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping
-   * @generated
-   */
-  EClass getMethodParamPartsMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getId()
-   * @see #getMethodParamPartsMapping()
-   * @generated
-   */
-  EAttribute getMethodParamPartsMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition <em>Param Position</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Param Position</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition()
-   * @see #getMethodParamPartsMapping()
-   * @generated
-   */
-  EAttribute getMethodParamPartsMapping_ParamPosition();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType <em>Param Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Param Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType()
-   * @see #getMethodParamPartsMapping()
-   * @generated
-   */
-  EAttribute getMethodParamPartsMapping_ParamType();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Message Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping()
-   * @see #getMethodParamPartsMapping()
-   * @generated
-   */
-  EReference getMethodParamPartsMapping_WsdlMessageMapping();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping <em>WSDL Return Value Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Return Value Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping
-   * @generated
-   */
-  EClass getWSDLReturnValueMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getId()
-   * @see #getWSDLReturnValueMapping()
-   * @generated
-   */
-  EAttribute getWSDLReturnValueMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue <em>Method Return Value</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Method Return Value</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue()
-   * @see #getWSDLReturnValueMapping()
-   * @generated
-   */
-  EAttribute getWSDLReturnValueMapping_MethodReturnValue();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName()
-   * @see #getWSDLReturnValueMapping()
-   * @generated
-   */
-  EAttribute getWSDLReturnValueMapping_WsdlMessagePartName();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage <em>Wsdl Message</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Message</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage()
-   * @see #getWSDLReturnValueMapping()
-   * @generated
-   */
-  EReference getWSDLReturnValueMapping_WsdlMessage();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition <em>Param Position</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Param Position</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition
-   * @generated
-   */
-  EClass getParamPosition();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getId()
-   * @see #getParamPosition()
-   * @generated
-   */
-  EAttribute getParamPosition_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getParamPosition <em>Param Position</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Param Position</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getParamPosition()
-   * @see #getParamPosition()
-   * @generated
-   */
-  EAttribute getParamPosition_ParamPosition();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType <em>Param Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Param Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType
-   * @generated
-   */
-  EClass getParamType();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getId()
-   * @see #getParamType()
-   * @generated
-   */
-  EAttribute getParamType_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getParamType <em>Param Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Param Type</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getParamType()
-   * @see #getParamType()
-   * @generated
-   */
-  EAttribute getParamType_ParamType();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping <em>WSDL Message Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Message Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping
-   * @generated
-   */
-  EClass getWSDLMessageMapping();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getId()
-   * @see #getWSDLMessageMapping()
-   * @generated
-   */
-  EAttribute getWSDLMessageMapping_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName()
-   * @see #getWSDLMessageMapping()
-   * @generated
-   */
-  EAttribute getWSDLMessageMapping_WsdlMessagePartName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode <em>Parameter Mode</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Parameter Mode</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode()
-   * @see #getWSDLMessageMapping()
-   * @generated
-   */
-  EAttribute getWSDLMessageMapping_ParameterMode();
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage <em>Wsdl Message</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Wsdl Message</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage()
-   * @see #getWSDLMessageMapping()
-   * @generated
-   */
-  EReference getWSDLMessageMapping_WsdlMessage();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Soap Header</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader()
-   * @see #getWSDLMessageMapping()
-   * @generated
-   */
-  EAttribute getWSDLMessageMapping_SoapHeader();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName <em>WSDL Message Part Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>WSDL Message Part Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName
-   * @generated
-   */
-  EClass getWSDLMessagePartName();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getId()
-   * @see #getWSDLMessagePartName()
-   * @generated
-   */
-  EAttribute getWSDLMessagePartName_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Wsdl Message Part Name</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName()
-   * @see #getWSDLMessagePartName()
-   * @generated
-   */
-  EAttribute getWSDLMessagePartName_WsdlMessagePartName();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode <em>Parameter Mode</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Parameter Mode</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode
-   * @generated
-   */
-  EClass getParameterMode();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getId()
-   * @see #getParameterMode()
-   * @generated
-   */
-  EAttribute getParameterMode_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getParameterMode <em>Parameter Mode</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Parameter Mode</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getParameterMode()
-   * @see #getParameterMode()
-   * @generated
-   */
-  EAttribute getParameterMode_ParameterMode();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue <em>Method Return Value</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Method Return Value</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue
-   * @generated
-   */
-  EClass getMethodReturnValue();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getId <em>Id</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getId()
-   * @see #getMethodReturnValue()
-   * @generated
-   */
-  EAttribute getMethodReturnValue_Id();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getMethodReturnValue <em>Method Return Value</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Method Return Value</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getMethodReturnValue()
-   * @see #getMethodReturnValue()
-   * @generated
-   */
-  EAttribute getMethodReturnValue_MethodReturnValue();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.InterfaceMapping <em>Interface Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Interface Mapping</em>'.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.InterfaceMapping
-   * @generated
-   */
-  EClass getInterfaceMapping();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  JaxrpcmapFactory getJaxrpcmapFactory();
-
-} //JaxrpcmapPackage
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ClassTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ClassTypeImpl.java
deleted file mode 100644
index 88fd8fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ClassTypeImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ClassType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Class Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ClassTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ClassTypeImpl#getClassType <em>Class Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ClassTypeImpl extends EObjectImpl implements ClassType
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getClassType() <em>Class Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getClassType()
-   * @generated
-   * @ordered
-   */
-  protected static final String CLASS_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getClassType() <em>Class Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getClassType()
-   * @generated
-   * @ordered
-   */
-  protected String classType = CLASS_TYPE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ClassTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getClassType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.CLASS_TYPE__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getClassType()
-  {
-    return classType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setClassType(String newClassType)
-  {
-    String oldClassType = classType;
-    classType = newClassType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.CLASS_TYPE__CLASS_TYPE, oldClassType, classType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.CLASS_TYPE__ID:
-        return getId();
-      case JaxrpcmapPackage.CLASS_TYPE__CLASS_TYPE:
-        return getClassType();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.CLASS_TYPE__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.CLASS_TYPE__CLASS_TYPE:
-        setClassType((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.CLASS_TYPE__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.CLASS_TYPE__CLASS_TYPE:
-        setClassType(CLASS_TYPE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.CLASS_TYPE__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.CLASS_TYPE__CLASS_TYPE:
-        return CLASS_TYPE_EDEFAULT == null ? classType != null : !CLASS_TYPE_EDEFAULT.equals(classType);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", classType: ");//$NON-NLS-1$
-    result.append(classType);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ClassTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ConstructorParameterOrderImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ConstructorParameterOrderImpl.java
deleted file mode 100644
index a47979e..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ConstructorParameterOrderImpl.java
+++ /dev/null
@@ -1,241 +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.webservice.internal.jaxrpcmap.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.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.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constructor Parameter Order</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ConstructorParameterOrderImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ConstructorParameterOrderImpl#getElementNames <em>Element Names</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstructorParameterOrderImpl extends EObjectImpl implements ConstructorParameterOrder
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getElementNames() <em>Element Names</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getElementNames()
-   * @generated
-   * @ordered
-   */
-  protected EList elementNames = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ConstructorParameterOrderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getElementNames()
-  {
-    if (elementNames == null)
-    {
-      elementNames = new EObjectContainmentEList(ElementName.class, this, JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES);
-    }
-    return elementNames;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-          return ((InternalEList)getElementNames()).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 JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-        return getId();
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-        return getElementNames();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-        getElementNames().clear();
-        getElementNames().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-        getElementNames().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES:
-        return elementNames != null && !elementNames.isEmpty();
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ConstructorParameterOrderImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ElementNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ElementNameImpl.java
deleted file mode 100644
index 26c0dce..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ElementNameImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ElementNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ElementNameImpl#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ElementNameImpl extends EObjectImpl implements ElementName
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getText()
-   * @generated
-   * @ordered
-   */
-  protected static final String TEXT_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getText()
-   * @generated
-   * @ordered
-   */
-  protected String text = TEXT_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ElementNameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getElementName();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.ELEMENT_NAME__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getText()
-  {
-    return text;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setText(String newText)
-  {
-    String oldText = text;
-    text = newText;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.ELEMENT_NAME__TEXT, oldText, text));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ELEMENT_NAME__ID:
-        return getId();
-      case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-        return getText();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ELEMENT_NAME__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-        setText((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ELEMENT_NAME__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-        setText(TEXT_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ELEMENT_NAME__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.ELEMENT_NAME__TEXT:
-        return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", text: ");//$NON-NLS-1$
-    result.append(text);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ElementNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ExceptionMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ExceptionMappingImpl.java
deleted file mode 100644
index ad8b268..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ExceptionMappingImpl.java
+++ /dev/null
@@ -1,453 +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.webservice.internal.jaxrpcmap.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exception Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionMappingImpl#getExceptionType <em>Exception Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionMappingImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionMappingImpl#getWsdlMessage <em>Wsdl Message</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionMappingImpl#getConstructorParameterOrder <em>Constructor Parameter Order</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExceptionMappingImpl extends EObjectImpl implements ExceptionMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getExceptionType() <em>Exception Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getExceptionType()
-   * @generated
-   * @ordered
-   */
-  protected static final String EXCEPTION_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getExceptionType() <em>Exception Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getExceptionType()
-   * @generated
-   * @ordered
-   */
-  protected String exceptionType = EXCEPTION_TYPE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessage() <em>Wsdl Message</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessage()
-   * @generated
-   * @ordered
-   */
-  protected WSDLMessage wsdlMessage = null;
-
-  /**
-   * The cached value of the '{@link #getConstructorParameterOrder() <em>Constructor Parameter Order</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getConstructorParameterOrder()
-   * @generated
-   * @ordered
-   */
-  protected ConstructorParameterOrder constructorParameterOrder = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExceptionMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getExceptionMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getExceptionType()
-  {
-    return exceptionType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setExceptionType(String newExceptionType)
-  {
-    String oldExceptionType = exceptionType;
-    exceptionType = newExceptionType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE, oldExceptionType, exceptionType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getWsdlMessagePartName()
-  {
-    return wsdlMessagePartName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName)
-  {
-    String oldWsdlMessagePartName = wsdlMessagePartName;
-    wsdlMessagePartName = newWsdlMessagePartName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLMessage getWsdlMessage()
-  {
-    return wsdlMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlMessage(WSDLMessage newWsdlMessage, NotificationChain msgs)
-  {
-    WSDLMessage oldWsdlMessage = wsdlMessage;
-    wsdlMessage = newWsdlMessage;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, oldWsdlMessage, newWsdlMessage);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessage(WSDLMessage newWsdlMessage)
-  {
-    if (newWsdlMessage != wsdlMessage)
-    {
-      NotificationChain msgs = null;
-      if (wsdlMessage != null)
-        msgs = ((InternalEObject)wsdlMessage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, null, msgs);
-      if (newWsdlMessage != null)
-        msgs = ((InternalEObject)newWsdlMessage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, null, msgs);
-      msgs = basicSetWsdlMessage(newWsdlMessage, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE, newWsdlMessage, newWsdlMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ConstructorParameterOrder getConstructorParameterOrder()
-  {
-    return constructorParameterOrder;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetConstructorParameterOrder(ConstructorParameterOrder newConstructorParameterOrder, NotificationChain msgs)
-  {
-    ConstructorParameterOrder oldConstructorParameterOrder = constructorParameterOrder;
-    constructorParameterOrder = newConstructorParameterOrder;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, oldConstructorParameterOrder, newConstructorParameterOrder);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setConstructorParameterOrder(ConstructorParameterOrder newConstructorParameterOrder)
-  {
-    if (newConstructorParameterOrder != constructorParameterOrder)
-    {
-      NotificationChain msgs = null;
-      if (constructorParameterOrder != null)
-        msgs = ((InternalEObject)constructorParameterOrder).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, null, msgs);
-      if (newConstructorParameterOrder != null)
-        msgs = ((InternalEObject)newConstructorParameterOrder).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, null, msgs);
-      msgs = basicSetConstructorParameterOrder(newConstructorParameterOrder, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER, newConstructorParameterOrder, newConstructorParameterOrder));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-          return basicSetWsdlMessage(null, msgs);
-        case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-          return basicSetConstructorParameterOrder(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 JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-        return getExceptionType();
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-        return getWsdlMessagePartName();
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-        return getWsdlMessage();
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-        return getConstructorParameterOrder();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-        setExceptionType((String)newValue);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName((String)newValue);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-        setWsdlMessage((WSDLMessage)newValue);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-        setConstructorParameterOrder((ConstructorParameterOrder)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-        setExceptionType(EXCEPTION_TYPE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-        setWsdlMessage((WSDLMessage)null);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-        setConstructorParameterOrder((ConstructorParameterOrder)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE:
-        return EXCEPTION_TYPE_EDEFAULT == null ? exceptionType != null : !EXCEPTION_TYPE_EDEFAULT.equals(exceptionType);
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME:
-        return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE:
-        return wsdlMessage != null;
-      case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER:
-        return constructorParameterOrder != null;
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", exceptionType: ");//$NON-NLS-1$
-    result.append(exceptionType);
-    result.append(", wsdlMessagePartName: ");//$NON-NLS-1$
-    result.append(wsdlMessagePartName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ExceptionMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ExceptionTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ExceptionTypeImpl.java
deleted file mode 100644
index 334716f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ExceptionTypeImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exception Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ExceptionTypeImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExceptionTypeImpl extends EObjectImpl implements ExceptionType
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #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 ExceptionTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getExceptionType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.EXCEPTION_TYPE__ID, oldId, id));
-  }
-
-  /**
-   * <!-- 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, JaxrpcmapPackage.EXCEPTION_TYPE__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.EXCEPTION_TYPE__ID:
-        return getId();
-      case JaxrpcmapPackage.EXCEPTION_TYPE__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 JaxrpcmapPackage.EXCEPTION_TYPE__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_TYPE__NAME:
-        setName((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.EXCEPTION_TYPE__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.EXCEPTION_TYPE__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.EXCEPTION_TYPE__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.EXCEPTION_TYPE__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", name: ");//$NON-NLS-1$
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ExceptionTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/InterfaceMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/InterfaceMappingImpl.java
deleted file mode 100644
index f53ba9b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/InterfaceMappingImpl.java
+++ /dev/null
@@ -1,49 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class InterfaceMappingImpl extends EObjectImpl implements InterfaceMapping
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected InterfaceMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getInterfaceMapping();
-  }
-
-} //InterfaceMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaMethodNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaMethodNameImpl.java
deleted file mode 100644
index 6d3415f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaMethodNameImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaMethodName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Method Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaMethodNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaMethodNameImpl#getJavaMethodName <em>Java Method Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaMethodNameImpl extends EObjectImpl implements JavaMethodName
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getJavaMethodName() <em>Java Method Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaMethodName()
-   * @generated
-   * @ordered
-   */
-  protected static final String JAVA_METHOD_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getJavaMethodName() <em>Java Method Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaMethodName()
-   * @generated
-   * @ordered
-   */
-  protected String javaMethodName = JAVA_METHOD_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected JavaMethodNameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getJavaMethodName();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_METHOD_NAME__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getJavaMethodName()
-  {
-    return javaMethodName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setJavaMethodName(String newJavaMethodName)
-  {
-    String oldJavaMethodName = javaMethodName;
-    javaMethodName = newJavaMethodName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_METHOD_NAME__JAVA_METHOD_NAME, oldJavaMethodName, javaMethodName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__ID:
-        return getId();
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__JAVA_METHOD_NAME:
-        return getJavaMethodName();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__JAVA_METHOD_NAME:
-        setJavaMethodName((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__JAVA_METHOD_NAME:
-        setJavaMethodName(JAVA_METHOD_NAME_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.JAVA_METHOD_NAME__JAVA_METHOD_NAME:
-        return JAVA_METHOD_NAME_EDEFAULT == null ? javaMethodName != null : !JAVA_METHOD_NAME_EDEFAULT.equals(javaMethodName);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", javaMethodName: ");//$NON-NLS-1$
-    result.append(javaMethodName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //JavaMethodNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaPortNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaPortNameImpl.java
deleted file mode 100644
index becb52a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaPortNameImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaPortName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Port Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaPortNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaPortNameImpl#getJavaPortName <em>Java Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaPortNameImpl extends EObjectImpl implements JavaPortName
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getJavaPortName() <em>Java Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaPortName()
-   * @generated
-   * @ordered
-   */
-  protected static final String JAVA_PORT_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getJavaPortName() <em>Java Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaPortName()
-   * @generated
-   * @ordered
-   */
-  protected String javaPortName = JAVA_PORT_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected JavaPortNameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getJavaPortName();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_PORT_NAME__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getJavaPortName()
-  {
-    return javaPortName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setJavaPortName(String newJavaPortName)
-  {
-    String oldJavaPortName = javaPortName;
-    javaPortName = newJavaPortName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_PORT_NAME__JAVA_PORT_NAME, oldJavaPortName, javaPortName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_PORT_NAME__ID:
-        return getId();
-      case JaxrpcmapPackage.JAVA_PORT_NAME__JAVA_PORT_NAME:
-        return getJavaPortName();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_PORT_NAME__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_PORT_NAME__JAVA_PORT_NAME:
-        setJavaPortName((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_PORT_NAME__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_PORT_NAME__JAVA_PORT_NAME:
-        setJavaPortName(JAVA_PORT_NAME_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_PORT_NAME__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.JAVA_PORT_NAME__JAVA_PORT_NAME:
-        return JAVA_PORT_NAME_EDEFAULT == null ? javaPortName != null : !JAVA_PORT_NAME_EDEFAULT.equals(javaPortName);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", javaPortName: ");//$NON-NLS-1$
-    result.append(javaPortName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //JavaPortNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaVariableNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaVariableNameImpl.java
deleted file mode 100644
index 7d55887..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaVariableNameImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaVariableName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Variable Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaVariableNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaVariableNameImpl#getJavaVariableName <em>Java Variable Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaVariableNameImpl extends EObjectImpl implements JavaVariableName
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getJavaVariableName() <em>Java Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaVariableName()
-   * @generated
-   * @ordered
-   */
-  protected static final String JAVA_VARIABLE_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getJavaVariableName() <em>Java Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaVariableName()
-   * @generated
-   * @ordered
-   */
-  protected String javaVariableName = JAVA_VARIABLE_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected JavaVariableNameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getJavaVariableName();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_VARIABLE_NAME__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getJavaVariableName()
-  {
-    return javaVariableName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setJavaVariableName(String newJavaVariableName)
-  {
-    String oldJavaVariableName = javaVariableName;
-    javaVariableName = newJavaVariableName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_VARIABLE_NAME__JAVA_VARIABLE_NAME, oldJavaVariableName, javaVariableName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__ID:
-        return getId();
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__JAVA_VARIABLE_NAME:
-        return getJavaVariableName();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__JAVA_VARIABLE_NAME:
-        setJavaVariableName((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__JAVA_VARIABLE_NAME:
-        setJavaVariableName(JAVA_VARIABLE_NAME_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME__JAVA_VARIABLE_NAME:
-        return JAVA_VARIABLE_NAME_EDEFAULT == null ? javaVariableName != null : !JAVA_VARIABLE_NAME_EDEFAULT.equals(javaVariableName);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", javaVariableName: ");//$NON-NLS-1$
-    result.append(javaVariableName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //JavaVariableNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaWSDLMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaWSDLMappingImpl.java
deleted file mode 100644
index c096ac5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaWSDLMappingImpl.java
+++ /dev/null
@@ -1,358 +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.webservice.internal.jaxrpcmap.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.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.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java WSDL Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaWSDLMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaWSDLMappingImpl#getPackageMappings <em>Package Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaWSDLMappingImpl#getJavaXMLTypeMappings <em>Java XML Type Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaWSDLMappingImpl#getExceptionMappings <em>Exception Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaWSDLMappingImpl#getInterfaceMappings <em>Interface Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaWSDLMappingImpl extends EObjectImpl implements JavaWSDLMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getPackageMappings() <em>Package Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPackageMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList packageMappings = null;
-
-  /**
-   * The cached value of the '{@link #getJavaXMLTypeMappings() <em>Java XML Type Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaXMLTypeMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList javaXMLTypeMappings = null;
-
-  /**
-   * The cached value of the '{@link #getExceptionMappings() <em>Exception Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getExceptionMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList exceptionMappings = null;
-
-  /**
-   * The cached value of the '{@link #getInterfaceMappings() <em>Interface Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getInterfaceMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList interfaceMappings = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected JavaWSDLMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getPackageMappings()
-  {
-    if (packageMappings == null)
-    {
-      packageMappings = new EObjectContainmentEList(PackageMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS);
-    }
-    return packageMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getJavaXMLTypeMappings()
-  {
-    if (javaXMLTypeMappings == null)
-    {
-      javaXMLTypeMappings = new EObjectContainmentEList(JavaXMLTypeMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS);
-    }
-    return javaXMLTypeMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getExceptionMappings()
-  {
-    if (exceptionMappings == null)
-    {
-      exceptionMappings = new EObjectContainmentEList(ExceptionMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS);
-    }
-    return exceptionMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getInterfaceMappings()
-  {
-    if (interfaceMappings == null)
-    {
-      interfaceMappings = new EObjectContainmentEList(InterfaceMapping.class, this, JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS);
-    }
-    return interfaceMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-          return ((InternalEList)getPackageMappings()).basicRemove(otherEnd, msgs);
-        case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-          return ((InternalEList)getJavaXMLTypeMappings()).basicRemove(otherEnd, msgs);
-        case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-          return ((InternalEList)getExceptionMappings()).basicRemove(otherEnd, msgs);
-        case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-          return ((InternalEList)getInterfaceMappings()).basicRemove(otherEnd, msgs);
-        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 JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-        return getPackageMappings();
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-        return getJavaXMLTypeMappings();
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-        return getExceptionMappings();
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-        return getInterfaceMappings();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-        getPackageMappings().clear();
-        getPackageMappings().addAll((Collection)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-        getJavaXMLTypeMappings().clear();
-        getJavaXMLTypeMappings().addAll((Collection)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-        getExceptionMappings().clear();
-        getExceptionMappings().addAll((Collection)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-        getInterfaceMappings().clear();
-        getInterfaceMappings().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-        getPackageMappings().clear();
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-        getJavaXMLTypeMappings().clear();
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-        getExceptionMappings().clear();
-        return;
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-        getInterfaceMappings().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS:
-        return packageMappings != null && !packageMappings.isEmpty();
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS:
-        return javaXMLTypeMappings != null && !javaXMLTypeMappings.isEmpty();
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS:
-        return exceptionMappings != null && !exceptionMappings.isEmpty();
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS:
-        return interfaceMappings != null && !interfaceMappings.isEmpty();
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(')');
-    return result.toString();
-  }
-
-} //JavaWSDLMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaXMLTypeMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaXMLTypeMappingImpl.java
deleted file mode 100644
index 7b2ace0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JavaXMLTypeMappingImpl.java
+++ /dev/null
@@ -1,481 +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.webservice.internal.jaxrpcmap.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.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.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java XML Type Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl#getClassType <em>Class Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl#getQnameScope <em>Qname Scope</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl#getAnonymousTypeQname <em>Anonymous Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl#getRootTypeQname <em>Root Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.JavaXMLTypeMappingImpl#getVariableMappings <em>Variable Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaXMLTypeMappingImpl extends EObjectImpl implements JavaXMLTypeMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getClassType() <em>Class Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getClassType()
-   * @generated
-   * @ordered
-   */
-  protected static final String CLASS_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getClassType() <em>Class Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getClassType()
-   * @generated
-   * @ordered
-   */
-  protected String classType = CLASS_TYPE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getQnameScope() <em>Qname Scope</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQnameScope()
-   * @generated
-   * @ordered
-   */
-  protected static final String QNAME_SCOPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQnameScope() <em>Qname Scope</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQnameScope()
-   * @generated
-   * @ordered
-   */
-  protected String qnameScope = QNAME_SCOPE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getAnonymousTypeQname() <em>Anonymous Type Qname</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAnonymousTypeQname()
-   * @generated
-   * @ordered
-   */
-  protected static final String ANONYMOUS_TYPE_QNAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getAnonymousTypeQname() <em>Anonymous Type Qname</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAnonymousTypeQname()
-   * @generated
-   * @ordered
-   */
-  protected String anonymousTypeQname = ANONYMOUS_TYPE_QNAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getRootTypeQname() <em>Root Type Qname</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRootTypeQname()
-   * @generated
-   * @ordered
-   */
-  protected RootTypeQname rootTypeQname = null;
-
-  /**
-   * The cached value of the '{@link #getVariableMappings() <em>Variable Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getVariableMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList variableMappings = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected JavaXMLTypeMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getClassType()
-  {
-    return classType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setClassType(String newClassType)
-  {
-    String oldClassType = classType;
-    classType = newClassType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE, oldClassType, classType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getQnameScope()
-  {
-    return qnameScope;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQnameScope(String newQnameScope)
-  {
-    String oldQnameScope = qnameScope;
-    qnameScope = newQnameScope;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE, oldQnameScope, qnameScope));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getAnonymousTypeQname()
-  {
-    return anonymousTypeQname;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAnonymousTypeQname(String newAnonymousTypeQname)
-  {
-    String oldAnonymousTypeQname = anonymousTypeQname;
-    anonymousTypeQname = newAnonymousTypeQname;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME, oldAnonymousTypeQname, anonymousTypeQname));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public RootTypeQname getRootTypeQname()
-  {
-    return rootTypeQname;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetRootTypeQname(RootTypeQname newRootTypeQname, NotificationChain msgs)
-  {
-    RootTypeQname oldRootTypeQname = rootTypeQname;
-    rootTypeQname = newRootTypeQname;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, oldRootTypeQname, newRootTypeQname);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setRootTypeQname(RootTypeQname newRootTypeQname)
-  {
-    if (newRootTypeQname != rootTypeQname)
-    {
-      NotificationChain msgs = null;
-      if (rootTypeQname != null)
-        msgs = ((InternalEObject)rootTypeQname).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, null, msgs);
-      if (newRootTypeQname != null)
-        msgs = ((InternalEObject)newRootTypeQname).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, null, msgs);
-      msgs = basicSetRootTypeQname(newRootTypeQname, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME, newRootTypeQname, newRootTypeQname));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getVariableMappings()
-  {
-    if (variableMappings == null)
-    {
-      variableMappings = new EObjectContainmentEList(VariableMapping.class, this, JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS);
-    }
-    return variableMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-          return basicSetRootTypeQname(null, msgs);
-        case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-          return ((InternalEList)getVariableMappings()).basicRemove(otherEnd, msgs);
-        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 JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-        return getClassType();
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-        return getQnameScope();
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-        return getAnonymousTypeQname();
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-        return getRootTypeQname();
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-        return getVariableMappings();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-        setClassType((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-        setQnameScope((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-        setAnonymousTypeQname((String)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-        setRootTypeQname((RootTypeQname)newValue);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-        getVariableMappings().clear();
-        getVariableMappings().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-        setClassType(CLASS_TYPE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-        setQnameScope(QNAME_SCOPE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-        setAnonymousTypeQname(ANONYMOUS_TYPE_QNAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-        setRootTypeQname((RootTypeQname)null);
-        return;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-        getVariableMappings().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE:
-        return CLASS_TYPE_EDEFAULT == null ? classType != null : !CLASS_TYPE_EDEFAULT.equals(classType);
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE:
-        return QNAME_SCOPE_EDEFAULT == null ? qnameScope != null : !QNAME_SCOPE_EDEFAULT.equals(qnameScope);
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME:
-        return ANONYMOUS_TYPE_QNAME_EDEFAULT == null ? anonymousTypeQname != null : !ANONYMOUS_TYPE_QNAME_EDEFAULT.equals(anonymousTypeQname);
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME:
-        return rootTypeQname != null;
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS:
-        return variableMappings != null && !variableMappings.isEmpty();
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", classType: ");//$NON-NLS-1$
-    result.append(classType);
-    result.append(", qnameScope: ");//$NON-NLS-1$
-    result.append(qnameScope);
-    result.append(", anonymousTypeQname: ");//$NON-NLS-1$
-    result.append(anonymousTypeQname);
-    result.append(')');
-    return result.toString();
-  }
-
-} //JavaXMLTypeMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapFactoryImpl.java
deleted file mode 100644
index 1f5a1c6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapFactoryImpl.java
+++ /dev/null
@@ -1,514 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ClassType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaMethodName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaPortName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaVariableName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodReturnValue;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamPosition;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParameterMode;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.QnameScope;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.XMLElementName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JaxrpcmapFactoryImpl extends EFactoryImpl implements JaxrpcmapFactory
-{
-  /**
-   * Creates and instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JaxrpcmapFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case JaxrpcmapPackage.JAVA_WSDL_MAPPING: return createJavaWSDLMapping();
-      case JaxrpcmapPackage.PACKAGE_MAPPING: return createPackageMapping();
-      case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING: return createJavaXMLTypeMapping();
-      case JaxrpcmapPackage.EXCEPTION_MAPPING: return createExceptionMapping();
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING: return createServiceInterfaceMapping();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING: return createServiceEndpointInterfaceMapping();
-      case JaxrpcmapPackage.PACKAGE_TYPE: return createPackageType();
-      case JaxrpcmapPackage.CLASS_TYPE: return createClassType();
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME: return createRootTypeQname();
-      case JaxrpcmapPackage.QNAME_SCOPE: return createQnameScope();
-      case JaxrpcmapPackage.VARIABLE_MAPPING: return createVariableMapping();
-      case JaxrpcmapPackage.EXCEPTION_TYPE: return createExceptionType();
-      case JaxrpcmapPackage.WSDL_MESSAGE: return createWSDLMessage();
-      case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER: return createConstructorParameterOrder();
-      case JaxrpcmapPackage.JAVA_VARIABLE_NAME: return createJavaVariableName();
-      case JaxrpcmapPackage.XML_ELEMENT_NAME: return createXMLElementName();
-      case JaxrpcmapPackage.ELEMENT_NAME: return createElementName();
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME: return createWSDLServiceName();
-      case JaxrpcmapPackage.PORT_MAPPING: return createPortMapping();
-      case JaxrpcmapPackage.JAVA_PORT_NAME: return createJavaPortName();
-      case JaxrpcmapPackage.WSDL_PORT_TYPE: return createWSDLPortType();
-      case JaxrpcmapPackage.WSDL_BINDING: return createWSDLBinding();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING: return createServiceEndpointMethodMapping();
-      case JaxrpcmapPackage.JAVA_METHOD_NAME: return createJavaMethodName();
-      case JaxrpcmapPackage.WSDL_OPERATION: return createWSDLOperation();
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING: return createMethodParamPartsMapping();
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING: return createWSDLReturnValueMapping();
-      case JaxrpcmapPackage.PARAM_POSITION: return createParamPosition();
-      case JaxrpcmapPackage.PARAM_TYPE: return createParamType();
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING: return createWSDLMessageMapping();
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME: return createWSDLMessagePartName();
-      case JaxrpcmapPackage.PARAMETER_MODE: return createParameterMode();
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE: return createMethodReturnValue();
-      case JaxrpcmapPackage.INTERFACE_MAPPING: return createInterfaceMapping();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");//$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaWSDLMapping createJavaWSDLMapping()
-  {
-    JavaWSDLMappingImpl javaWSDLMapping = new JavaWSDLMappingImpl();
-    return javaWSDLMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PackageMapping createPackageMapping()
-  {
-    PackageMappingImpl packageMapping = new PackageMappingImpl();
-    return packageMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaXMLTypeMapping createJavaXMLTypeMapping()
-  {
-    JavaXMLTypeMappingImpl javaXMLTypeMapping = new JavaXMLTypeMappingImpl();
-    return javaXMLTypeMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ExceptionMapping createExceptionMapping()
-  {
-    ExceptionMappingImpl exceptionMapping = new ExceptionMappingImpl();
-    return exceptionMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ServiceInterfaceMapping createServiceInterfaceMapping()
-  {
-    ServiceInterfaceMappingImpl serviceInterfaceMapping = new ServiceInterfaceMappingImpl();
-    return serviceInterfaceMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ServiceEndpointInterfaceMapping createServiceEndpointInterfaceMapping()
-  {
-    ServiceEndpointInterfaceMappingImpl serviceEndpointInterfaceMapping = new ServiceEndpointInterfaceMappingImpl();
-    return serviceEndpointInterfaceMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PackageType createPackageType()
-  {
-    PackageTypeImpl packageType = new PackageTypeImpl();
-    return packageType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ClassType createClassType()
-  {
-    ClassTypeImpl classType = new ClassTypeImpl();
-    return classType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public RootTypeQname createRootTypeQname()
-  {
-    RootTypeQnameImpl rootTypeQname = new RootTypeQnameImpl();
-    return rootTypeQname;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QnameScope createQnameScope()
-  {
-    QnameScopeImpl qnameScope = new QnameScopeImpl();
-    return qnameScope;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public VariableMapping createVariableMapping()
-  {
-    VariableMappingImpl variableMapping = new VariableMappingImpl();
-    return variableMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ExceptionType createExceptionType()
-  {
-    ExceptionTypeImpl exceptionType = new ExceptionTypeImpl();
-    return exceptionType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLMessage createWSDLMessage()
-  {
-    WSDLMessageImpl wsdlMessage = new WSDLMessageImpl();
-    return wsdlMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ConstructorParameterOrder createConstructorParameterOrder()
-  {
-    ConstructorParameterOrderImpl constructorParameterOrder = new ConstructorParameterOrderImpl();
-    return constructorParameterOrder;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaVariableName createJavaVariableName()
-  {
-    JavaVariableNameImpl javaVariableName = new JavaVariableNameImpl();
-    return javaVariableName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XMLElementName createXMLElementName()
-  {
-    XMLElementNameImpl xmlElementName = new XMLElementNameImpl();
-    return xmlElementName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ElementName createElementName()
-  {
-    ElementNameImpl elementName = new ElementNameImpl();
-    return elementName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLServiceName createWSDLServiceName()
-  {
-    WSDLServiceNameImpl wsdlServiceName = new WSDLServiceNameImpl();
-    return wsdlServiceName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PortMapping createPortMapping()
-  {
-    PortMappingImpl portMapping = new PortMappingImpl();
-    return portMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaPortName createJavaPortName()
-  {
-    JavaPortNameImpl javaPortName = new JavaPortNameImpl();
-    return javaPortName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLPortType createWSDLPortType()
-  {
-    WSDLPortTypeImpl wsdlPortType = new WSDLPortTypeImpl();
-    return wsdlPortType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLBinding createWSDLBinding()
-  {
-    WSDLBindingImpl wsdlBinding = new WSDLBindingImpl();
-    return wsdlBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ServiceEndpointMethodMapping createServiceEndpointMethodMapping()
-  {
-    ServiceEndpointMethodMappingImpl serviceEndpointMethodMapping = new ServiceEndpointMethodMappingImpl();
-    return serviceEndpointMethodMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaMethodName createJavaMethodName()
-  {
-    JavaMethodNameImpl javaMethodName = new JavaMethodNameImpl();
-    return javaMethodName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLOperation createWSDLOperation()
-  {
-    WSDLOperationImpl wsdlOperation = new WSDLOperationImpl();
-    return wsdlOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public MethodParamPartsMapping createMethodParamPartsMapping()
-  {
-    MethodParamPartsMappingImpl methodParamPartsMapping = new MethodParamPartsMappingImpl();
-    return methodParamPartsMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLReturnValueMapping createWSDLReturnValueMapping()
-  {
-    WSDLReturnValueMappingImpl wsdlReturnValueMapping = new WSDLReturnValueMappingImpl();
-    return wsdlReturnValueMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ParamPosition createParamPosition()
-  {
-    ParamPositionImpl paramPosition = new ParamPositionImpl();
-    return paramPosition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ParamType createParamType()
-  {
-    ParamTypeImpl paramType = new ParamTypeImpl();
-    return paramType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLMessageMapping createWSDLMessageMapping()
-  {
-    WSDLMessageMappingImpl wsdlMessageMapping = new WSDLMessageMappingImpl();
-    return wsdlMessageMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLMessagePartName createWSDLMessagePartName()
-  {
-    WSDLMessagePartNameImpl wsdlMessagePartName = new WSDLMessagePartNameImpl();
-    return wsdlMessagePartName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ParameterMode createParameterMode()
-  {
-    ParameterModeImpl parameterMode = new ParameterModeImpl();
-    return parameterMode;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public MethodReturnValue createMethodReturnValue()
-  {
-    MethodReturnValueImpl methodReturnValue = new MethodReturnValueImpl();
-    return methodReturnValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public InterfaceMapping createInterfaceMapping()
-  {
-    InterfaceMappingImpl interfaceMapping = new InterfaceMappingImpl();
-    return interfaceMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JaxrpcmapPackage getJaxrpcmapPackage()
-  {
-    return (JaxrpcmapPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static JaxrpcmapPackage getPackage()
-  {
-    return JaxrpcmapPackage.eINSTANCE;
-  }
-
-} //JaxrpcmapFactoryImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapPackageImpl.java
deleted file mode 100644
index 6d4e12d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapPackageImpl.java
+++ /dev/null
@@ -1,1989 +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.webservice.internal.jaxrpcmap.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.impl.EPackageImpl;
-import org.eclipse.jst.j2ee.internal.common.CommonPackage;
-import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.WscommonPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wscommon.impl.WscommonPackageImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddPackage;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddPackageImpl;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ClassType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaMethodName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaPortName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaVariableName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodReturnValue;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamPosition;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParameterMode;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.QnameScope;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.XMLElementName;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class JaxrpcmapPackageImpl extends EPackageImpl implements JaxrpcmapPackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass javaWSDLMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass packageMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass javaXMLTypeMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass exceptionMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass serviceInterfaceMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass serviceEndpointInterfaceMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass packageTypeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass classTypeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass rootTypeQnameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass qnameScopeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass variableMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass exceptionTypeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlMessageEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass constructorParameterOrderEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass javaVariableNameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass xmlElementNameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass elementNameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlServiceNameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass portMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass javaPortNameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlPortTypeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlBindingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass serviceEndpointMethodMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass javaMethodNameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlOperationEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass methodParamPartsMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlReturnValueMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass paramPositionEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass paramTypeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlMessageMappingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass wsdlMessagePartNameEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass parameterModeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass methodReturnValueEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass interfaceMappingEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private JaxrpcmapPackageImpl()
-  {
-    super(eNS_URI, JaxrpcmapFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static JaxrpcmapPackage init()
-  {
-    if (isInited) return (JaxrpcmapPackage)EPackage.Registry.INSTANCE.getEPackage(JaxrpcmapPackage.eNS_URI);
-
-    // Obtain or create and register package.
-    JaxrpcmapPackageImpl theJaxrpcmapPackage = (JaxrpcmapPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JaxrpcmapPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    CommonPackageImpl.init();
-
-    // Obtain or create and register interdependencies
-    WscommonPackageImpl theWscommonPackage = (WscommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WscommonPackage.eNS_URI) : WscommonPackage.eINSTANCE);
-    WsddPackageImpl theWsddPackage = (WsddPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(WsddPackage.eNS_URI) : WsddPackage.eINSTANCE);
-
-    // Step 1: create meta-model objects
-    theJaxrpcmapPackage.createPackageContents();
-    theWscommonPackage.createPackageContents();
-    theWsddPackage.createPackageContents();
-
-    // Step 2: complete initialization
-    theJaxrpcmapPackage.initializePackageContents();
-    theWscommonPackage.initializePackageContents();
-    theWsddPackage.initializePackageContents();
-
-    return theJaxrpcmapPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getJavaWSDLMapping()
-  {
-    return javaWSDLMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaWSDLMapping_Id()
-  {
-    return (EAttribute)javaWSDLMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getJavaWSDLMapping_PackageMappings()
-  {
-    return (EReference)javaWSDLMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getJavaWSDLMapping_JavaXMLTypeMappings()
-  {
-    return (EReference)javaWSDLMappingEClass.getEReferences().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getJavaWSDLMapping_ExceptionMappings()
-  {
-    return (EReference)javaWSDLMappingEClass.getEReferences().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getJavaWSDLMapping_InterfaceMappings()
-  {
-    return (EReference)javaWSDLMappingEClass.getEReferences().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getPackageMapping()
-  {
-    return packageMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPackageMapping_Id()
-  {
-    return (EAttribute)packageMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPackageMapping_PackageType()
-  {
-    return (EAttribute)packageMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPackageMapping_NamespaceURI()
-  {
-    return (EAttribute)packageMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getJavaXMLTypeMapping()
-  {
-    return javaXMLTypeMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaXMLTypeMapping_Id()
-  {
-    return (EAttribute)javaXMLTypeMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaXMLTypeMapping_ClassType()
-  {
-    return (EAttribute)javaXMLTypeMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaXMLTypeMapping_QnameScope()
-  {
-    return (EAttribute)javaXMLTypeMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaXMLTypeMapping_AnonymousTypeQname()
-  {
-    return (EAttribute)javaXMLTypeMappingEClass.getEAttributes().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getJavaXMLTypeMapping_RootTypeQname()
-  {
-    return (EReference)javaXMLTypeMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getJavaXMLTypeMapping_VariableMappings()
-  {
-    return (EReference)javaXMLTypeMappingEClass.getEReferences().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getExceptionMapping()
-  {
-    return exceptionMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getExceptionMapping_Id()
-  {
-    return (EAttribute)exceptionMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getExceptionMapping_ExceptionType()
-  {
-    return (EAttribute)exceptionMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getExceptionMapping_WsdlMessagePartName()
-  {
-    return (EAttribute)exceptionMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getExceptionMapping_WsdlMessage()
-  {
-    return (EReference)exceptionMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getExceptionMapping_ConstructorParameterOrder()
-  {
-    return (EReference)exceptionMappingEClass.getEReferences().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getServiceInterfaceMapping()
-  {
-    return serviceInterfaceMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceInterfaceMapping_Id()
-  {
-    return (EAttribute)serviceInterfaceMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceInterfaceMapping_ServiceInterface()
-  {
-    return (EAttribute)serviceInterfaceMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getServiceInterfaceMapping_WsdlServiceName()
-  {
-    return (EReference)serviceInterfaceMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getServiceInterfaceMapping_PortMappings()
-  {
-    return (EReference)serviceInterfaceMappingEClass.getEReferences().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getServiceEndpointInterfaceMapping()
-  {
-    return serviceEndpointInterfaceMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceEndpointInterfaceMapping_Id()
-  {
-    return (EAttribute)serviceEndpointInterfaceMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceEndpointInterfaceMapping_ServiceEndpointInterface()
-  {
-    return (EAttribute)serviceEndpointInterfaceMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getServiceEndpointInterfaceMapping_WsdlPortType()
-  {
-    return (EReference)serviceEndpointInterfaceMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getServiceEndpointInterfaceMapping_WsdlBinding()
-  {
-    return (EReference)serviceEndpointInterfaceMappingEClass.getEReferences().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings()
-  {
-    return (EReference)serviceEndpointInterfaceMappingEClass.getEReferences().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getPackageType()
-  {
-    return packageTypeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPackageType_Id()
-  {
-    return (EAttribute)packageTypeEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPackageType_PackageType()
-  {
-    return (EAttribute)packageTypeEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getClassType()
-  {
-    return classTypeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getClassType_Id()
-  {
-    return (EAttribute)classTypeEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getClassType_ClassType()
-  {
-    return (EAttribute)classTypeEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getRootTypeQname()
-  {
-    return rootTypeQnameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getQnameScope()
-  {
-    return qnameScopeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getQnameScope_Id()
-  {
-    return (EAttribute)qnameScopeEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getQnameScope_QnameScope()
-  {
-    return (EAttribute)qnameScopeEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getVariableMapping()
-  {
-    return variableMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getVariableMapping_Id()
-  {
-    return (EAttribute)variableMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getVariableMapping_JavaVariableName()
-  {
-    return (EAttribute)variableMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getVariableMapping_XmlElementName()
-  {
-    return (EAttribute)variableMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getVariableMapping_DataMember()
-  {
-    return (EAttribute)variableMappingEClass.getEAttributes().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getVariableMapping_XmlAttributeName()
-  {
-    return (EAttribute)variableMappingEClass.getEAttributes().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getVariableMapping_XmlWildcard()
-  {
-    return (EAttribute)variableMappingEClass.getEAttributes().get(5);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getExceptionType()
-  {
-    return exceptionTypeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getExceptionType_Id()
-  {
-    return (EAttribute)exceptionTypeEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getExceptionType_Name()
-  {
-    return (EAttribute)exceptionTypeEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLMessage()
-  {
-    return wsdlMessageEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getConstructorParameterOrder()
-  {
-    return constructorParameterOrderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getConstructorParameterOrder_Id()
-  {
-    return (EAttribute)constructorParameterOrderEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getConstructorParameterOrder_ElementNames()
-  {
-    return (EReference)constructorParameterOrderEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getJavaVariableName()
-  {
-    return javaVariableNameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaVariableName_Id()
-  {
-    return (EAttribute)javaVariableNameEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaVariableName_JavaVariableName()
-  {
-    return (EAttribute)javaVariableNameEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getXMLElementName()
-  {
-    return xmlElementNameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getXMLElementName_Id()
-  {
-    return (EAttribute)xmlElementNameEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getXMLElementName_XmlElementName()
-  {
-    return (EAttribute)xmlElementNameEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getElementName()
-  {
-    return elementNameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getElementName_Id()
-  {
-    return (EAttribute)elementNameEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getElementName_Text()
-  {
-    return (EAttribute)elementNameEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLServiceName()
-  {
-    return wsdlServiceNameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getPortMapping()
-  {
-    return portMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPortMapping_Id()
-  {
-    return (EAttribute)portMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPortMapping_PortName()
-  {
-    return (EAttribute)portMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getPortMapping_JavaPortName()
-  {
-    return (EAttribute)portMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getJavaPortName()
-  {
-    return javaPortNameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaPortName_Id()
-  {
-    return (EAttribute)javaPortNameEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaPortName_JavaPortName()
-  {
-    return (EAttribute)javaPortNameEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLPortType()
-  {
-    return wsdlPortTypeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLBinding()
-  {
-    return wsdlBindingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getServiceEndpointMethodMapping()
-  {
-    return serviceEndpointMethodMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceEndpointMethodMapping_Id()
-  {
-    return (EAttribute)serviceEndpointMethodMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceEndpointMethodMapping_JavaMethodName()
-  {
-    return (EAttribute)serviceEndpointMethodMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceEndpointMethodMapping_WsdlOperation()
-  {
-    return (EAttribute)serviceEndpointMethodMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getServiceEndpointMethodMapping_WrappedElement()
-  {
-    return (EAttribute)serviceEndpointMethodMappingEClass.getEAttributes().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getServiceEndpointMethodMapping_MethodParamPartsMappings()
-  {
-    return (EReference)serviceEndpointMethodMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getServiceEndpointMethodMapping_WsdlReturnValueMapping()
-  {
-    return (EReference)serviceEndpointMethodMappingEClass.getEReferences().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getJavaMethodName()
-  {
-    return javaMethodNameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaMethodName_Id()
-  {
-    return (EAttribute)javaMethodNameEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getJavaMethodName_JavaMethodName()
-  {
-    return (EAttribute)javaMethodNameEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLOperation()
-  {
-    return wsdlOperationEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLOperation_Id()
-  {
-    return (EAttribute)wsdlOperationEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLOperation_WsdlOperation()
-  {
-    return (EAttribute)wsdlOperationEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getMethodParamPartsMapping()
-  {
-    return methodParamPartsMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getMethodParamPartsMapping_Id()
-  {
-    return (EAttribute)methodParamPartsMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getMethodParamPartsMapping_ParamPosition()
-  {
-    return (EAttribute)methodParamPartsMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getMethodParamPartsMapping_ParamType()
-  {
-    return (EAttribute)methodParamPartsMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getMethodParamPartsMapping_WsdlMessageMapping()
-  {
-    return (EReference)methodParamPartsMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLReturnValueMapping()
-  {
-    return wsdlReturnValueMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLReturnValueMapping_Id()
-  {
-    return (EAttribute)wsdlReturnValueMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLReturnValueMapping_MethodReturnValue()
-  {
-    return (EAttribute)wsdlReturnValueMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLReturnValueMapping_WsdlMessagePartName()
-  {
-    return (EAttribute)wsdlReturnValueMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getWSDLReturnValueMapping_WsdlMessage()
-  {
-    return (EReference)wsdlReturnValueMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getParamPosition()
-  {
-    return paramPositionEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParamPosition_Id()
-  {
-    return (EAttribute)paramPositionEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParamPosition_ParamPosition()
-  {
-    return (EAttribute)paramPositionEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getParamType()
-  {
-    return paramTypeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParamType_Id()
-  {
-    return (EAttribute)paramTypeEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParamType_ParamType()
-  {
-    return (EAttribute)paramTypeEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLMessageMapping()
-  {
-    return wsdlMessageMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLMessageMapping_Id()
-  {
-    return (EAttribute)wsdlMessageMappingEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLMessageMapping_WsdlMessagePartName()
-  {
-    return (EAttribute)wsdlMessageMappingEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLMessageMapping_ParameterMode()
-  {
-    return (EAttribute)wsdlMessageMappingEClass.getEAttributes().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLMessageMapping_SoapHeader()
-  {
-    return (EAttribute)wsdlMessageMappingEClass.getEAttributes().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getWSDLMessageMapping_WsdlMessage()
-  {
-    return (EReference)wsdlMessageMappingEClass.getEReferences().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getWSDLMessagePartName()
-  {
-    return wsdlMessagePartNameEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLMessagePartName_Id()
-  {
-    return (EAttribute)wsdlMessagePartNameEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getWSDLMessagePartName_WsdlMessagePartName()
-  {
-    return (EAttribute)wsdlMessagePartNameEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getParameterMode()
-  {
-    return parameterModeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParameterMode_Id()
-  {
-    return (EAttribute)parameterModeEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParameterMode_ParameterMode()
-  {
-    return (EAttribute)parameterModeEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getMethodReturnValue()
-  {
-    return methodReturnValueEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getMethodReturnValue_Id()
-  {
-    return (EAttribute)methodReturnValueEClass.getEAttributes().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getMethodReturnValue_MethodReturnValue()
-  {
-    return (EAttribute)methodReturnValueEClass.getEAttributes().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getInterfaceMapping()
-  {
-    return interfaceMappingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JaxrpcmapFactory getJaxrpcmapFactory()
-  {
-    return (JaxrpcmapFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    javaWSDLMappingEClass = createEClass(JAVA_WSDL_MAPPING);
-    createEAttribute(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__ID);
-    createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS);
-    createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS);
-    createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS);
-    createEReference(javaWSDLMappingEClass, JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS);
-
-    packageMappingEClass = createEClass(PACKAGE_MAPPING);
-    createEAttribute(packageMappingEClass, PACKAGE_MAPPING__ID);
-    createEAttribute(packageMappingEClass, PACKAGE_MAPPING__PACKAGE_TYPE);
-    createEAttribute(packageMappingEClass, PACKAGE_MAPPING__NAMESPACE_URI);
-
-    javaXMLTypeMappingEClass = createEClass(JAVA_XML_TYPE_MAPPING);
-    createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__ID);
-    createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__CLASS_TYPE);
-    createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__QNAME_SCOPE);
-    createEAttribute(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME);
-    createEReference(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME);
-    createEReference(javaXMLTypeMappingEClass, JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS);
-
-    exceptionMappingEClass = createEClass(EXCEPTION_MAPPING);
-    createEAttribute(exceptionMappingEClass, EXCEPTION_MAPPING__ID);
-    createEAttribute(exceptionMappingEClass, EXCEPTION_MAPPING__EXCEPTION_TYPE);
-    createEAttribute(exceptionMappingEClass, EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME);
-    createEReference(exceptionMappingEClass, EXCEPTION_MAPPING__WSDL_MESSAGE);
-    createEReference(exceptionMappingEClass, EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER);
-
-    serviceInterfaceMappingEClass = createEClass(SERVICE_INTERFACE_MAPPING);
-    createEAttribute(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__ID);
-    createEAttribute(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE);
-    createEReference(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME);
-    createEReference(serviceInterfaceMappingEClass, SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS);
-
-    serviceEndpointInterfaceMappingEClass = createEClass(SERVICE_ENDPOINT_INTERFACE_MAPPING);
-    createEAttribute(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__ID);
-    createEAttribute(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE);
-    createEReference(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE);
-    createEReference(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING);
-    createEReference(serviceEndpointInterfaceMappingEClass, SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS);
-
-    packageTypeEClass = createEClass(PACKAGE_TYPE);
-    createEAttribute(packageTypeEClass, PACKAGE_TYPE__ID);
-    createEAttribute(packageTypeEClass, PACKAGE_TYPE__PACKAGE_TYPE);
-
-    classTypeEClass = createEClass(CLASS_TYPE);
-    createEAttribute(classTypeEClass, CLASS_TYPE__ID);
-    createEAttribute(classTypeEClass, CLASS_TYPE__CLASS_TYPE);
-
-    rootTypeQnameEClass = createEClass(ROOT_TYPE_QNAME);
-
-    qnameScopeEClass = createEClass(QNAME_SCOPE);
-    createEAttribute(qnameScopeEClass, QNAME_SCOPE__ID);
-    createEAttribute(qnameScopeEClass, QNAME_SCOPE__QNAME_SCOPE);
-
-    variableMappingEClass = createEClass(VARIABLE_MAPPING);
-    createEAttribute(variableMappingEClass, VARIABLE_MAPPING__ID);
-    createEAttribute(variableMappingEClass, VARIABLE_MAPPING__JAVA_VARIABLE_NAME);
-    createEAttribute(variableMappingEClass, VARIABLE_MAPPING__XML_ELEMENT_NAME);
-    createEAttribute(variableMappingEClass, VARIABLE_MAPPING__DATA_MEMBER);
-    createEAttribute(variableMappingEClass, VARIABLE_MAPPING__XML_ATTRIBUTE_NAME);
-    createEAttribute(variableMappingEClass, VARIABLE_MAPPING__XML_WILDCARD);
-
-    exceptionTypeEClass = createEClass(EXCEPTION_TYPE);
-    createEAttribute(exceptionTypeEClass, EXCEPTION_TYPE__ID);
-    createEAttribute(exceptionTypeEClass, EXCEPTION_TYPE__NAME);
-
-    wsdlMessageEClass = createEClass(WSDL_MESSAGE);
-
-    constructorParameterOrderEClass = createEClass(CONSTRUCTOR_PARAMETER_ORDER);
-    createEAttribute(constructorParameterOrderEClass, CONSTRUCTOR_PARAMETER_ORDER__ID);
-    createEReference(constructorParameterOrderEClass, CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES);
-
-    javaVariableNameEClass = createEClass(JAVA_VARIABLE_NAME);
-    createEAttribute(javaVariableNameEClass, JAVA_VARIABLE_NAME__ID);
-    createEAttribute(javaVariableNameEClass, JAVA_VARIABLE_NAME__JAVA_VARIABLE_NAME);
-
-    xmlElementNameEClass = createEClass(XML_ELEMENT_NAME);
-    createEAttribute(xmlElementNameEClass, XML_ELEMENT_NAME__ID);
-    createEAttribute(xmlElementNameEClass, XML_ELEMENT_NAME__XML_ELEMENT_NAME);
-
-    elementNameEClass = createEClass(ELEMENT_NAME);
-    createEAttribute(elementNameEClass, ELEMENT_NAME__ID);
-    createEAttribute(elementNameEClass, ELEMENT_NAME__TEXT);
-
-    wsdlServiceNameEClass = createEClass(WSDL_SERVICE_NAME);
-
-    portMappingEClass = createEClass(PORT_MAPPING);
-    createEAttribute(portMappingEClass, PORT_MAPPING__ID);
-    createEAttribute(portMappingEClass, PORT_MAPPING__PORT_NAME);
-    createEAttribute(portMappingEClass, PORT_MAPPING__JAVA_PORT_NAME);
-
-    javaPortNameEClass = createEClass(JAVA_PORT_NAME);
-    createEAttribute(javaPortNameEClass, JAVA_PORT_NAME__ID);
-    createEAttribute(javaPortNameEClass, JAVA_PORT_NAME__JAVA_PORT_NAME);
-
-    wsdlPortTypeEClass = createEClass(WSDL_PORT_TYPE);
-
-    wsdlBindingEClass = createEClass(WSDL_BINDING);
-
-    serviceEndpointMethodMappingEClass = createEClass(SERVICE_ENDPOINT_METHOD_MAPPING);
-    createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__ID);
-    createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME);
-    createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION);
-    createEAttribute(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT);
-    createEReference(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS);
-    createEReference(serviceEndpointMethodMappingEClass, SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING);
-
-    javaMethodNameEClass = createEClass(JAVA_METHOD_NAME);
-    createEAttribute(javaMethodNameEClass, JAVA_METHOD_NAME__ID);
-    createEAttribute(javaMethodNameEClass, JAVA_METHOD_NAME__JAVA_METHOD_NAME);
-
-    wsdlOperationEClass = createEClass(WSDL_OPERATION);
-    createEAttribute(wsdlOperationEClass, WSDL_OPERATION__ID);
-    createEAttribute(wsdlOperationEClass, WSDL_OPERATION__WSDL_OPERATION);
-
-    methodParamPartsMappingEClass = createEClass(METHOD_PARAM_PARTS_MAPPING);
-    createEAttribute(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__ID);
-    createEAttribute(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION);
-    createEAttribute(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE);
-    createEReference(methodParamPartsMappingEClass, METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING);
-
-    wsdlReturnValueMappingEClass = createEClass(WSDL_RETURN_VALUE_MAPPING);
-    createEAttribute(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__ID);
-    createEAttribute(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE);
-    createEAttribute(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME);
-    createEReference(wsdlReturnValueMappingEClass, WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE);
-
-    paramPositionEClass = createEClass(PARAM_POSITION);
-    createEAttribute(paramPositionEClass, PARAM_POSITION__ID);
-    createEAttribute(paramPositionEClass, PARAM_POSITION__PARAM_POSITION);
-
-    paramTypeEClass = createEClass(PARAM_TYPE);
-    createEAttribute(paramTypeEClass, PARAM_TYPE__ID);
-    createEAttribute(paramTypeEClass, PARAM_TYPE__PARAM_TYPE);
-
-    wsdlMessageMappingEClass = createEClass(WSDL_MESSAGE_MAPPING);
-    createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__ID);
-    createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME);
-    createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__PARAMETER_MODE);
-    createEAttribute(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__SOAP_HEADER);
-    createEReference(wsdlMessageMappingEClass, WSDL_MESSAGE_MAPPING__WSDL_MESSAGE);
-
-    wsdlMessagePartNameEClass = createEClass(WSDL_MESSAGE_PART_NAME);
-    createEAttribute(wsdlMessagePartNameEClass, WSDL_MESSAGE_PART_NAME__ID);
-    createEAttribute(wsdlMessagePartNameEClass, WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME);
-
-    parameterModeEClass = createEClass(PARAMETER_MODE);
-    createEAttribute(parameterModeEClass, PARAMETER_MODE__ID);
-    createEAttribute(parameterModeEClass, PARAMETER_MODE__PARAMETER_MODE);
-
-    methodReturnValueEClass = createEClass(METHOD_RETURN_VALUE);
-    createEAttribute(methodReturnValueEClass, METHOD_RETURN_VALUE__ID);
-    createEAttribute(methodReturnValueEClass, METHOD_RETURN_VALUE__METHOD_RETURN_VALUE);
-
-    interfaceMappingEClass = createEClass(INTERFACE_MAPPING);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    CommonPackageImpl theCommonPackage = (CommonPackageImpl)EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI);
-
-    // Add supertypes to classes
-    serviceInterfaceMappingEClass.getESuperTypes().add(this.getInterfaceMapping());
-    serviceEndpointInterfaceMappingEClass.getESuperTypes().add(this.getInterfaceMapping());
-    rootTypeQnameEClass.getESuperTypes().add(theCommonPackage.getQName());
-    wsdlMessageEClass.getESuperTypes().add(theCommonPackage.getQName());
-    wsdlServiceNameEClass.getESuperTypes().add(theCommonPackage.getQName());
-    wsdlPortTypeEClass.getESuperTypes().add(theCommonPackage.getQName());
-    wsdlBindingEClass.getESuperTypes().add(theCommonPackage.getQName());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(javaWSDLMappingEClass, JavaWSDLMapping.class, "JavaWSDLMapping", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-    initEAttribute(getJavaWSDLMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getJavaWSDLMapping_PackageMappings(), this.getPackageMapping(), null, "packageMappings", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getJavaWSDLMapping_JavaXMLTypeMappings(), this.getJavaXMLTypeMapping(), null, "javaXMLTypeMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getJavaWSDLMapping_ExceptionMappings(), this.getExceptionMapping(), null, "exceptionMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getJavaWSDLMapping_InterfaceMappings(), this.getInterfaceMapping(), null, "interfaceMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(packageMappingEClass, PackageMapping.class, "PackageMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getPackageMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getPackageMapping_PackageType(), ecorePackage.getEString(), "packageType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getPackageMapping_NamespaceURI(), ecorePackage.getEString(), "namespaceURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(javaXMLTypeMappingEClass, JavaXMLTypeMapping.class, "JavaXMLTypeMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getJavaXMLTypeMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getJavaXMLTypeMapping_ClassType(), ecorePackage.getEString(), "classType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getJavaXMLTypeMapping_QnameScope(), ecorePackage.getEString(), "qnameScope", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getJavaXMLTypeMapping_AnonymousTypeQname(), ecorePackage.getEString(), "anonymousTypeQname", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getJavaXMLTypeMapping_RootTypeQname(), this.getRootTypeQname(), null, "rootTypeQname", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getJavaXMLTypeMapping_VariableMappings(), this.getVariableMapping(), null, "variableMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(exceptionMappingEClass, ExceptionMapping.class, "ExceptionMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getExceptionMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getExceptionMapping_ExceptionType(), ecorePackage.getEString(), "exceptionType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getExceptionMapping_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getExceptionMapping_WsdlMessage(), this.getWSDLMessage(), null, "wsdlMessage", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getExceptionMapping_ConstructorParameterOrder(), this.getConstructorParameterOrder(), null, "constructorParameterOrder", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(serviceInterfaceMappingEClass, ServiceInterfaceMapping.class, "ServiceInterfaceMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getServiceInterfaceMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getServiceInterfaceMapping_ServiceInterface(), ecorePackage.getEString(), "serviceInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getServiceInterfaceMapping_WsdlServiceName(), this.getWSDLServiceName(), null, "wsdlServiceName", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getServiceInterfaceMapping_PortMappings(), this.getPortMapping(), null, "portMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(serviceEndpointInterfaceMappingEClass, ServiceEndpointInterfaceMapping.class, "ServiceEndpointInterfaceMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getServiceEndpointInterfaceMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getServiceEndpointInterfaceMapping_ServiceEndpointInterface(), ecorePackage.getEString(), "serviceEndpointInterface", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getServiceEndpointInterfaceMapping_WsdlPortType(), this.getWSDLPortType(), null, "wsdlPortType", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getServiceEndpointInterfaceMapping_WsdlBinding(), this.getWSDLBinding(), null, "wsdlBinding", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings(), this.getServiceEndpointMethodMapping(), null, "serviceEndpointMethodMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(packageTypeEClass, PackageType.class, "PackageType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getPackageType_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getPackageType_PackageType(), ecorePackage.getEString(), "packageType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(classTypeEClass, ClassType.class, "ClassType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getClassType_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getClassType_ClassType(), ecorePackage.getEString(), "classType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(rootTypeQnameEClass, RootTypeQname.class, "RootTypeQname", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-    initEClass(qnameScopeEClass, QnameScope.class, "QnameScope", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getQnameScope_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getQnameScope_QnameScope(), ecorePackage.getEString(), "qnameScope", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(variableMappingEClass, VariableMapping.class, "VariableMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getVariableMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getVariableMapping_JavaVariableName(), ecorePackage.getEString(), "javaVariableName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getVariableMapping_XmlElementName(), ecorePackage.getEString(), "xmlElementName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getVariableMapping_DataMember(), ecorePackage.getEBoolean(), "dataMember", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getVariableMapping_XmlAttributeName(), ecorePackage.getEString(), "xmlAttributeName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getVariableMapping_XmlWildcard(), ecorePackage.getEBoolean(), "xmlWildcard", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(exceptionTypeEClass, ExceptionType.class, "ExceptionType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getExceptionType_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getExceptionType_Name(), ecorePackage.getEString(), "name", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(wsdlMessageEClass, WSDLMessage.class, "WSDLMessage", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-    initEClass(constructorParameterOrderEClass, ConstructorParameterOrder.class, "ConstructorParameterOrder", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getConstructorParameterOrder_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getConstructorParameterOrder_ElementNames(), this.getElementName(), null, "elementNames", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(javaVariableNameEClass, JavaVariableName.class, "JavaVariableName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getJavaVariableName_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getJavaVariableName_JavaVariableName(), ecorePackage.getEString(), "javaVariableName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(xmlElementNameEClass, XMLElementName.class, "XMLElementName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getXMLElementName_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getXMLElementName_XmlElementName(), ecorePackage.getEString(), "xmlElementName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(elementNameEClass, ElementName.class, "ElementName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getElementName_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getElementName_Text(), ecorePackage.getEString(), "text", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(wsdlServiceNameEClass, WSDLServiceName.class, "WSDLServiceName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-    initEClass(portMappingEClass, PortMapping.class, "PortMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getPortMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getPortMapping_PortName(), ecorePackage.getEString(), "portName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getPortMapping_JavaPortName(), ecorePackage.getEString(), "javaPortName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(javaPortNameEClass, JavaPortName.class, "JavaPortName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getJavaPortName_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getJavaPortName_JavaPortName(), ecorePackage.getEString(), "javaPortName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(wsdlPortTypeEClass, WSDLPortType.class, "WSDLPortType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-    initEClass(wsdlBindingEClass, WSDLBinding.class, "WSDLBinding", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-    initEClass(serviceEndpointMethodMappingEClass, ServiceEndpointMethodMapping.class, "ServiceEndpointMethodMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getServiceEndpointMethodMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getServiceEndpointMethodMapping_JavaMethodName(), ecorePackage.getEString(), "javaMethodName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getServiceEndpointMethodMapping_WsdlOperation(), ecorePackage.getEString(), "wsdlOperation", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getServiceEndpointMethodMapping_WrappedElement(), ecorePackage.getEBoolean(), "wrappedElement", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getServiceEndpointMethodMapping_MethodParamPartsMappings(), this.getMethodParamPartsMapping(), null, "methodParamPartsMappings", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getServiceEndpointMethodMapping_WsdlReturnValueMapping(), this.getWSDLReturnValueMapping(), null, "wsdlReturnValueMapping", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(javaMethodNameEClass, JavaMethodName.class, "JavaMethodName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getJavaMethodName_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getJavaMethodName_JavaMethodName(), ecorePackage.getEString(), "javaMethodName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(wsdlOperationEClass, WSDLOperation.class, "WSDLOperation", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getWSDLOperation_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getWSDLOperation_WsdlOperation(), ecorePackage.getEString(), "wsdlOperation", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(methodParamPartsMappingEClass, MethodParamPartsMapping.class, "MethodParamPartsMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getMethodParamPartsMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getMethodParamPartsMapping_ParamPosition(), ecorePackage.getEString(), "paramPosition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getMethodParamPartsMapping_ParamType(), ecorePackage.getEString(), "paramType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getMethodParamPartsMapping_WsdlMessageMapping(), this.getWSDLMessageMapping(), null, "wsdlMessageMapping", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(wsdlReturnValueMappingEClass, WSDLReturnValueMapping.class, "WSDLReturnValueMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getWSDLReturnValueMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getWSDLReturnValueMapping_MethodReturnValue(), ecorePackage.getEString(), "methodReturnValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getWSDLReturnValueMapping_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getWSDLReturnValueMapping_WsdlMessage(), this.getWSDLMessage(), null, "wsdlMessage", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(paramPositionEClass, ParamPosition.class, "ParamPosition", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getParamPosition_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getParamPosition_ParamPosition(), ecorePackage.getEString(), "paramPosition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(paramTypeEClass, ParamType.class, "ParamType", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getParamType_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getParamType_ParamType(), ecorePackage.getEString(), "paramType", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(wsdlMessageMappingEClass, WSDLMessageMapping.class, "WSDLMessageMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getWSDLMessageMapping_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getWSDLMessageMapping_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getWSDLMessageMapping_ParameterMode(), ecorePackage.getEString(), "parameterMode", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getWSDLMessageMapping_SoapHeader(), ecorePackage.getEBoolean(), "soapHeader", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEReference(getWSDLMessageMapping_WsdlMessage(), this.getWSDLMessage(), null, "wsdlMessage", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(wsdlMessagePartNameEClass, WSDLMessagePartName.class, "WSDLMessagePartName", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getWSDLMessagePartName_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getWSDLMessagePartName_WsdlMessagePartName(), ecorePackage.getEString(), "wsdlMessagePartName", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(parameterModeEClass, ParameterMode.class, "ParameterMode", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getParameterMode_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getParameterMode_ParameterMode(), ecorePackage.getEString(), "parameterMode", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(methodReturnValueEClass, MethodReturnValue.class, "MethodReturnValue", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-    initEAttribute(getMethodReturnValue_Id(), ecorePackage.getEString(), "id", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-    initEAttribute(getMethodReturnValue_MethodReturnValue(), ecorePackage.getEString(), "methodReturnValue", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false);//$NON-NLS-1$
-
-    initEClass(interfaceMappingEClass, InterfaceMapping.class, "InterfaceMapping", !IS_ABSTRACT, !IS_INTERFACE);//$NON-NLS-1$
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-} //JaxrpcmapPackageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapResourceImpl.java
deleted file mode 100644
index 6d39d89..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/JaxrpcmapResourceImpl.java
+++ /dev/null
@@ -1,173 +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.webservice.internal.jaxrpcmap.impl;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.model.translator.webservices.JaxrpcmapTranslator;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResource;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-public class JaxrpcmapResourceImpl extends XMLResourceImpl implements JaxrpcmapResource
-{
-	public JaxrpcmapResourceImpl(Renderer aRenderer) {
-		super(aRenderer);
-	}
-
-	public JaxrpcmapResourceImpl(URI uri, Renderer aRenderer) {
-		super(uri, aRenderer);
-	}
-
-	/**
-	 * Return the first element in the EList.
-	 */
-	public JavaWSDLMapping getJavaWSDLMapping() {
-		return (JavaWSDLMapping) getRootObject();
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getRootTranslator()
-	 */
-	public Translator getRootTranslator() {
-		return JaxrpcmapTranslator.INSTANCE;
-	}
-	
-	/**
-	 * @see org.eclipse.jst.j2ee.internal.common.XMLResource#getType()
-	 */
-	public int getType() {
-		return JAXRPC_MAP_TYPE;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.TranslatorResource#getDoctype()
-	 */
-	public String getDoctype() 
-	{
-	  switch (getJ2EEVersionID()) 
-	  {
-	    case (J2EE_1_2_ID) :
-	    case (J2EE_1_3_ID) :	
-	      return WebServiceConstants.JAXRPCMAP_DOCTYPE;
-	    default :
-    		return null;
-      }
-	}
-
-
-   public boolean isJaxrpcmap1_0()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_0_ID);
-   }
-
-   public boolean isJaxrpcmap1_1()
-   {
-      return (getModuleVersionID()==WebServiceConstants.WEBSERVICE_1_1_ID) ;   
-   }
-
-
-	/* 
-	 * This directly sets the module version id
-	 */
-	public void setModuleVersionID(int id) {
-	super.setVersionID(id);
-	switch (id) {
-			case (WebServiceConstants.WEBSERVICE_1_1_ID) :
-				super.setDoctypeValues(null, null);
-				break;
-			case (WebServiceConstants.WEBSERVICE_1_0_ID) :
-				super.setDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-				break;			
-		}
-	}
-	/*
-	 * Based on the J2EE version, this will set the module version
-	 */
-	public void setJ2EEVersionID(int id) 
-  {
-    switch (id) {
-    	case (J2EE_1_4_ID) :
-    				primSetDoctypeValues(null, null);
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_1_ID);
-    				break;
-    	case (J2EE_1_3_ID) :
-    				primSetDoctypeValues(getJ2EE_1_3_PublicID(), getJ2EE_1_3_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    				break;
-    	case (J2EE_1_2_ID) :
-    				primSetDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID());
-    				primSetVersionID(WebServiceConstants.WEBSERVICE_1_0_ID);
-    		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_PublicID()
-	 */
-	public String getJ2EE_1_2_PublicID() {
-	  return  WebServiceConstants.JAXRPCMAP_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_2_SystemID()
-	 */
-	public String getJ2EE_1_2_SystemID() {
-	  return WebServiceConstants.JAXRPCMAP_SYSTEMID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_PublicID()
-	 */
-	public String getJ2EE_1_3_PublicID() {
-	  return WebServiceConstants.JAXRPCMAP_PUBLICID;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.j2eexml.XMLResourceImpl#getJ2EE_1_3_SystemID()
-	 */
-	public String getJ2EE_1_3_SystemID() {
-    return WebServiceConstants.JAXRPCMAP_SYSTEMID;
-	}
-
-	/* Return J2EE version based on module version
-	*/
-	public int getJ2EEVersionID() {
-		switch (getModuleVersionID()) {
-			case WebServiceConstants.WEBSERVICE_1_0_ID:
-				return J2EEVersionConstants.J2EE_1_3_ID;
-			case WebServiceConstants.WEBSERVICE_1_1_ID :
-				return J2EEVersionConstants.J2EE_1_4_ID;
-			default :
-			return J2EEVersionConstants.J2EE_1_4_ID;
-		}
-	}
-
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceImpl#getDefaultVersionID()
-	 */
-	protected int getDefaultVersionID() {
-		return WebServiceConstants.WEBSERVICE_1_1_ID;
-	}
-
-  protected void syncVersionOfRootObject()
-  {
-    //Do nothing for now since the root object does not have a version.
-  }
-
-    
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/MethodParamPartsMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/MethodParamPartsMappingImpl.java
deleted file mode 100644
index bb25579..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/MethodParamPartsMappingImpl.java
+++ /dev/null
@@ -1,381 +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.webservice.internal.jaxrpcmap.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Param Parts Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodParamPartsMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodParamPartsMappingImpl#getParamPosition <em>Param Position</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodParamPartsMappingImpl#getParamType <em>Param Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodParamPartsMappingImpl#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodParamPartsMappingImpl extends EObjectImpl implements MethodParamPartsMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getParamPosition() <em>Param Position</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamPosition()
-   * @generated
-   * @ordered
-   */
-  protected static final String PARAM_POSITION_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getParamPosition() <em>Param Position</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamPosition()
-   * @generated
-   * @ordered
-   */
-  protected String paramPosition = PARAM_POSITION_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getParamType() <em>Param Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamType()
-   * @generated
-   * @ordered
-   */
-  protected static final String PARAM_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getParamType() <em>Param Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamType()
-   * @generated
-   * @ordered
-   */
-  protected String paramType = PARAM_TYPE_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessageMapping() <em>Wsdl Message Mapping</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessageMapping()
-   * @generated
-   * @ordered
-   */
-  protected WSDLMessageMapping wsdlMessageMapping = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MethodParamPartsMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getParamPosition()
-  {
-    return paramPosition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setParamPosition(String newParamPosition)
-  {
-    String oldParamPosition = paramPosition;
-    paramPosition = newParamPosition;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION, oldParamPosition, paramPosition));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getParamType()
-  {
-    return paramType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setParamType(String newParamType)
-  {
-    String oldParamType = paramType;
-    paramType = newParamType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE, oldParamType, paramType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLMessageMapping getWsdlMessageMapping()
-  {
-    return wsdlMessageMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlMessageMapping(WSDLMessageMapping newWsdlMessageMapping, NotificationChain msgs)
-  {
-    WSDLMessageMapping oldWsdlMessageMapping = wsdlMessageMapping;
-    wsdlMessageMapping = newWsdlMessageMapping;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, oldWsdlMessageMapping, newWsdlMessageMapping);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessageMapping(WSDLMessageMapping newWsdlMessageMapping)
-  {
-    if (newWsdlMessageMapping != wsdlMessageMapping)
-    {
-      NotificationChain msgs = null;
-      if (wsdlMessageMapping != null)
-        msgs = ((InternalEObject)wsdlMessageMapping).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, null, msgs);
-      if (newWsdlMessageMapping != null)
-        msgs = ((InternalEObject)newWsdlMessageMapping).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, null, msgs);
-      msgs = basicSetWsdlMessageMapping(newWsdlMessageMapping, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING, newWsdlMessageMapping, newWsdlMessageMapping));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-          return basicSetWsdlMessageMapping(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 JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-        return getParamPosition();
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-        return getParamType();
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-        return getWsdlMessageMapping();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-        setParamPosition((String)newValue);
-        return;
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-        setParamType((String)newValue);
-        return;
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-        setWsdlMessageMapping((WSDLMessageMapping)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-        setParamPosition(PARAM_POSITION_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-        setParamType(PARAM_TYPE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-        setWsdlMessageMapping((WSDLMessageMapping)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION:
-        return PARAM_POSITION_EDEFAULT == null ? paramPosition != null : !PARAM_POSITION_EDEFAULT.equals(paramPosition);
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE:
-        return PARAM_TYPE_EDEFAULT == null ? paramType != null : !PARAM_TYPE_EDEFAULT.equals(paramType);
-      case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING:
-        return wsdlMessageMapping != null;
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", paramPosition: ");//$NON-NLS-1$
-    result.append(paramPosition);
-    result.append(", paramType: ");//$NON-NLS-1$
-    result.append(paramType);
-    result.append(')');
-    return result.toString();
-  }
-
-} //MethodParamPartsMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/MethodReturnValueImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/MethodReturnValueImpl.java
deleted file mode 100644
index d658048..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/MethodReturnValueImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodReturnValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Return Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodReturnValueImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.MethodReturnValueImpl#getMethodReturnValue <em>Method Return Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MethodReturnValueImpl extends EObjectImpl implements MethodReturnValue
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getMethodReturnValue() <em>Method Return Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMethodReturnValue()
-   * @generated
-   * @ordered
-   */
-  protected static final String METHOD_RETURN_VALUE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getMethodReturnValue() <em>Method Return Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMethodReturnValue()
-   * @generated
-   * @ordered
-   */
-  protected String methodReturnValue = METHOD_RETURN_VALUE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MethodReturnValueImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getMethodReturnValue();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_RETURN_VALUE__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getMethodReturnValue()
-  {
-    return methodReturnValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setMethodReturnValue(String newMethodReturnValue)
-  {
-    String oldMethodReturnValue = methodReturnValue;
-    methodReturnValue = newMethodReturnValue;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.METHOD_RETURN_VALUE__METHOD_RETURN_VALUE, oldMethodReturnValue, methodReturnValue));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__ID:
-        return getId();
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__METHOD_RETURN_VALUE:
-        return getMethodReturnValue();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__METHOD_RETURN_VALUE:
-        setMethodReturnValue((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__METHOD_RETURN_VALUE:
-        setMethodReturnValue(METHOD_RETURN_VALUE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.METHOD_RETURN_VALUE__METHOD_RETURN_VALUE:
-        return METHOD_RETURN_VALUE_EDEFAULT == null ? methodReturnValue != null : !METHOD_RETURN_VALUE_EDEFAULT.equals(methodReturnValue);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", methodReturnValue: ");//$NON-NLS-1$
-    result.append(methodReturnValue);
-    result.append(')');
-    return result.toString();
-  }
-
-} //MethodReturnValueImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PackageMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PackageMappingImpl.java
deleted file mode 100644
index 3c1e6f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PackageMappingImpl.java
+++ /dev/null
@@ -1,289 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Package Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageMappingImpl#getPackageType <em>Package Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageMappingImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PackageMappingImpl extends EObjectImpl implements PackageMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPackageType() <em>Package Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPackageType()
-   * @generated
-   * @ordered
-   */
-  protected static final String PACKAGE_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPackageType() <em>Package Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPackageType()
-   * @generated
-   * @ordered
-   */
-  protected String packageType = PACKAGE_TYPE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAMESPACE_URI_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getNamespaceURI() <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getNamespaceURI()
-   * @generated
-   * @ordered
-   */
-  protected String namespaceURI = NAMESPACE_URI_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PackageMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getPackageMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPackageType()
-  {
-    return packageType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPackageType(String newPackageType)
-  {
-    String oldPackageType = packageType;
-    packageType = newPackageType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE, oldPackageType, packageType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setNamespaceURI(String newNamespaceURI)
-  {
-    String oldNamespaceURI = namespaceURI;
-    namespaceURI = newNamespaceURI;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI, oldNamespaceURI, namespaceURI));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-        return getPackageType();
-      case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-        return getNamespaceURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-        setPackageType((String)newValue);
-        return;
-      case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-        setPackageType(PACKAGE_TYPE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE:
-        return PACKAGE_TYPE_EDEFAULT == null ? packageType != null : !PACKAGE_TYPE_EDEFAULT.equals(packageType);
-      case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", packageType: ");//$NON-NLS-1$
-    result.append(packageType);
-    result.append(", namespaceURI: ");//$NON-NLS-1$
-    result.append(namespaceURI);
-    result.append(')');
-    return result.toString();
-  }
-
-} //PackageMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PackageTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PackageTypeImpl.java
deleted file mode 100644
index 42e84c6..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PackageTypeImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Package Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PackageTypeImpl#getPackageType <em>Package Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PackageTypeImpl extends EObjectImpl implements PackageType
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPackageType() <em>Package Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPackageType()
-   * @generated
-   * @ordered
-   */
-  protected static final String PACKAGE_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPackageType() <em>Package Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPackageType()
-   * @generated
-   * @ordered
-   */
-  protected String packageType = PACKAGE_TYPE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PackageTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getPackageType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_TYPE__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPackageType()
-  {
-    return packageType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPackageType(String newPackageType)
-  {
-    String oldPackageType = packageType;
-    packageType = newPackageType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PACKAGE_TYPE__PACKAGE_TYPE, oldPackageType, packageType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_TYPE__ID:
-        return getId();
-      case JaxrpcmapPackage.PACKAGE_TYPE__PACKAGE_TYPE:
-        return getPackageType();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_TYPE__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.PACKAGE_TYPE__PACKAGE_TYPE:
-        setPackageType((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_TYPE__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PACKAGE_TYPE__PACKAGE_TYPE:
-        setPackageType(PACKAGE_TYPE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PACKAGE_TYPE__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.PACKAGE_TYPE__PACKAGE_TYPE:
-        return PACKAGE_TYPE_EDEFAULT == null ? packageType != null : !PACKAGE_TYPE_EDEFAULT.equals(packageType);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", packageType: ");//$NON-NLS-1$
-    result.append(packageType);
-    result.append(')');
-    return result.toString();
-  }
-
-} //PackageTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParamPositionImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParamPositionImpl.java
deleted file mode 100644
index 31570dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParamPositionImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamPosition;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Param Position</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamPositionImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamPositionImpl#getParamPosition <em>Param Position</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParamPositionImpl extends EObjectImpl implements ParamPosition
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getParamPosition() <em>Param Position</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamPosition()
-   * @generated
-   * @ordered
-   */
-  protected static final String PARAM_POSITION_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getParamPosition() <em>Param Position</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamPosition()
-   * @generated
-   * @ordered
-   */
-  protected String paramPosition = PARAM_POSITION_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ParamPositionImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getParamPosition();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PARAM_POSITION__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getParamPosition()
-  {
-    return paramPosition;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setParamPosition(String newParamPosition)
-  {
-    String oldParamPosition = paramPosition;
-    paramPosition = newParamPosition;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PARAM_POSITION__PARAM_POSITION, oldParamPosition, paramPosition));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_POSITION__ID:
-        return getId();
-      case JaxrpcmapPackage.PARAM_POSITION__PARAM_POSITION:
-        return getParamPosition();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_POSITION__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.PARAM_POSITION__PARAM_POSITION:
-        setParamPosition((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_POSITION__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PARAM_POSITION__PARAM_POSITION:
-        setParamPosition(PARAM_POSITION_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_POSITION__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.PARAM_POSITION__PARAM_POSITION:
-        return PARAM_POSITION_EDEFAULT == null ? paramPosition != null : !PARAM_POSITION_EDEFAULT.equals(paramPosition);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", paramPosition: ");//$NON-NLS-1$
-    result.append(paramPosition);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ParamPositionImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParamTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParamTypeImpl.java
deleted file mode 100644
index 44067ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParamTypeImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Param Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamTypeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParamTypeImpl#getParamType <em>Param Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParamTypeImpl extends EObjectImpl implements ParamType
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getParamType() <em>Param Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamType()
-   * @generated
-   * @ordered
-   */
-  protected static final String PARAM_TYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getParamType() <em>Param Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParamType()
-   * @generated
-   * @ordered
-   */
-  protected String paramType = PARAM_TYPE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ParamTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getParamType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PARAM_TYPE__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getParamType()
-  {
-    return paramType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setParamType(String newParamType)
-  {
-    String oldParamType = paramType;
-    paramType = newParamType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PARAM_TYPE__PARAM_TYPE, oldParamType, paramType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_TYPE__ID:
-        return getId();
-      case JaxrpcmapPackage.PARAM_TYPE__PARAM_TYPE:
-        return getParamType();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_TYPE__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.PARAM_TYPE__PARAM_TYPE:
-        setParamType((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_TYPE__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PARAM_TYPE__PARAM_TYPE:
-        setParamType(PARAM_TYPE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAM_TYPE__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.PARAM_TYPE__PARAM_TYPE:
-        return PARAM_TYPE_EDEFAULT == null ? paramType != null : !PARAM_TYPE_EDEFAULT.equals(paramType);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", paramType: ");//$NON-NLS-1$
-    result.append(paramType);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ParamTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParameterModeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParameterModeImpl.java
deleted file mode 100644
index f574c6a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ParameterModeImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParameterMode;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameter Mode</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParameterModeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ParameterModeImpl#getParameterMode <em>Parameter Mode</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParameterModeImpl extends EObjectImpl implements ParameterMode
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParameterMode()
-   * @generated
-   * @ordered
-   */
-  protected static final String PARAMETER_MODE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParameterMode()
-   * @generated
-   * @ordered
-   */
-  protected String parameterMode = PARAMETER_MODE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ParameterModeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getParameterMode();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PARAMETER_MODE__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getParameterMode()
-  {
-    return parameterMode;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setParameterMode(String newParameterMode)
-  {
-    String oldParameterMode = parameterMode;
-    parameterMode = newParameterMode;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PARAMETER_MODE__PARAMETER_MODE, oldParameterMode, parameterMode));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAMETER_MODE__ID:
-        return getId();
-      case JaxrpcmapPackage.PARAMETER_MODE__PARAMETER_MODE:
-        return getParameterMode();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAMETER_MODE__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.PARAMETER_MODE__PARAMETER_MODE:
-        setParameterMode((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAMETER_MODE__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PARAMETER_MODE__PARAMETER_MODE:
-        setParameterMode(PARAMETER_MODE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PARAMETER_MODE__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.PARAMETER_MODE__PARAMETER_MODE:
-        return PARAMETER_MODE_EDEFAULT == null ? parameterMode != null : !PARAMETER_MODE_EDEFAULT.equals(parameterMode);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", parameterMode: ");//$NON-NLS-1$
-    result.append(parameterMode);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ParameterModeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PortMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PortMappingImpl.java
deleted file mode 100644
index d8b0ec9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/PortMappingImpl.java
+++ /dev/null
@@ -1,289 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Port Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PortMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PortMappingImpl#getPortName <em>Port Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.PortMappingImpl#getJavaPortName <em>Java Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortMappingImpl extends EObjectImpl implements PortMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPortName()
-   * @generated
-   * @ordered
-   */
-  protected static final String PORT_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPortName()
-   * @generated
-   * @ordered
-   */
-  protected String portName = PORT_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getJavaPortName() <em>Java Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaPortName()
-   * @generated
-   * @ordered
-   */
-  protected static final String JAVA_PORT_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getJavaPortName() <em>Java Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaPortName()
-   * @generated
-   * @ordered
-   */
-  protected String javaPortName = JAVA_PORT_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PortMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getPortMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PORT_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPortName()
-  {
-    return portName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPortName(String newPortName)
-  {
-    String oldPortName = portName;
-    portName = newPortName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PORT_MAPPING__PORT_NAME, oldPortName, portName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getJavaPortName()
-  {
-    return javaPortName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setJavaPortName(String newJavaPortName)
-  {
-    String oldJavaPortName = javaPortName;
-    javaPortName = newJavaPortName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME, oldJavaPortName, javaPortName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PORT_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-        return getPortName();
-      case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-        return getJavaPortName();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PORT_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-        setPortName((String)newValue);
-        return;
-      case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-        setJavaPortName((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PORT_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-        setPortName(PORT_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-        setJavaPortName(JAVA_PORT_NAME_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.PORT_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME:
-        return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
-      case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME:
-        return JAVA_PORT_NAME_EDEFAULT == null ? javaPortName != null : !JAVA_PORT_NAME_EDEFAULT.equals(javaPortName);
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", portName: ");//$NON-NLS-1$
-    result.append(portName);
-    result.append(", javaPortName: ");//$NON-NLS-1$
-    result.append(javaPortName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //PortMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/QnameScopeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/QnameScopeImpl.java
deleted file mode 100644
index 7a4c39a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/QnameScopeImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.QnameScope;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Qname Scope</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.QnameScopeImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.QnameScopeImpl#getQnameScope <em>Qname Scope</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QnameScopeImpl extends EObjectImpl implements QnameScope
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getQnameScope() <em>Qname Scope</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQnameScope()
-   * @generated
-   * @ordered
-   */
-  protected static final String QNAME_SCOPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getQnameScope() <em>Qname Scope</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQnameScope()
-   * @generated
-   * @ordered
-   */
-  protected String qnameScope = QNAME_SCOPE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected QnameScopeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getQnameScope();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.QNAME_SCOPE__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getQnameScope()
-  {
-    return qnameScope;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setQnameScope(String newQnameScope)
-  {
-    String oldQnameScope = qnameScope;
-    qnameScope = newQnameScope;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.QNAME_SCOPE__QNAME_SCOPE, oldQnameScope, qnameScope));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.QNAME_SCOPE__ID:
-        return getId();
-      case JaxrpcmapPackage.QNAME_SCOPE__QNAME_SCOPE:
-        return getQnameScope();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.QNAME_SCOPE__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.QNAME_SCOPE__QNAME_SCOPE:
-        setQnameScope((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.QNAME_SCOPE__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.QNAME_SCOPE__QNAME_SCOPE:
-        setQnameScope(QNAME_SCOPE_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.QNAME_SCOPE__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.QNAME_SCOPE__QNAME_SCOPE:
-        return QNAME_SCOPE_EDEFAULT == null ? qnameScope != null : !QNAME_SCOPE_EDEFAULT.equals(qnameScope);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", qnameScope: ");//$NON-NLS-1$
-    result.append(qnameScope);
-    result.append(')');
-    return result.toString();
-  }
-
-} //QnameScopeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/RootTypeQnameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/RootTypeQnameImpl.java
deleted file mode 100644
index deb2611..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/RootTypeQnameImpl.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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Root Type Qname</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class RootTypeQnameImpl extends QNameImpl implements RootTypeQname
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected RootTypeQnameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getRootTypeQname();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__NAMESPACE_URI:
-        return getNamespaceURI();
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__LOCAL_PART:
-        return getLocalPart();
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__COMBINED_QNAME:
-        return getCombinedQName();
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__INTERNAL_PREFIX_OR_NS_URI:
-        return getInternalPrefixOrNsURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__LOCAL_PART:
-        setLocalPart((String)newValue);
-        return;
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__COMBINED_QNAME:
-        setCombinedQName((String)newValue);
-        return;
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__LOCAL_PART:
-        setLocalPart(LOCAL_PART_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__COMBINED_QNAME:
-        setCombinedQName(COMBINED_QNAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__LOCAL_PART:
-        return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__COMBINED_QNAME:
-        return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-      case JaxrpcmapPackage.ROOT_TYPE_QNAME__INTERNAL_PREFIX_OR_NS_URI:
-        return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-} //RootTypeQnameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceEndpointInterfaceMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceEndpointInterfaceMappingImpl.java
deleted file mode 100644
index 21e9c82..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceEndpointInterfaceMappingImpl.java
+++ /dev/null
@@ -1,440 +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.webservice.internal.jaxrpcmap.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.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.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Endpoint Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointInterfaceMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointInterfaceMappingImpl#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointInterfaceMappingImpl#getWsdlPortType <em>Wsdl Port Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointInterfaceMappingImpl#getWsdlBinding <em>Wsdl Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointInterfaceMappingImpl#getServiceEndpointMethodMappings <em>Service Endpoint Method Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceEndpointInterfaceMappingImpl extends InterfaceMappingImpl implements ServiceEndpointInterfaceMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getServiceEndpointInterface()
-   * @generated
-   * @ordered
-   */
-  protected static final String SERVICE_ENDPOINT_INTERFACE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getServiceEndpointInterface() <em>Service Endpoint Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getServiceEndpointInterface()
-   * @generated
-   * @ordered
-   */
-  protected String serviceEndpointInterface = SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getWsdlPortType() <em>Wsdl Port Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlPortType()
-   * @generated
-   * @ordered
-   */
-  protected WSDLPortType wsdlPortType = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlBinding() <em>Wsdl Binding</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlBinding()
-   * @generated
-   * @ordered
-   */
-  protected WSDLBinding wsdlBinding = null;
-
-  /**
-   * The cached value of the '{@link #getServiceEndpointMethodMappings() <em>Service Endpoint Method Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getServiceEndpointMethodMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList serviceEndpointMethodMappings = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ServiceEndpointInterfaceMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getServiceEndpointInterface()
-  {
-    return serviceEndpointInterface;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setServiceEndpointInterface(String newServiceEndpointInterface)
-  {
-    String oldServiceEndpointInterface = serviceEndpointInterface;
-    serviceEndpointInterface = newServiceEndpointInterface;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE, oldServiceEndpointInterface, serviceEndpointInterface));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLPortType getWsdlPortType()
-  {
-    return wsdlPortType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlPortType(WSDLPortType newWsdlPortType, NotificationChain msgs)
-  {
-    WSDLPortType oldWsdlPortType = wsdlPortType;
-    wsdlPortType = newWsdlPortType;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, oldWsdlPortType, newWsdlPortType);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlPortType(WSDLPortType newWsdlPortType)
-  {
-    if (newWsdlPortType != wsdlPortType)
-    {
-      NotificationChain msgs = null;
-      if (wsdlPortType != null)
-        msgs = ((InternalEObject)wsdlPortType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, null, msgs);
-      if (newWsdlPortType != null)
-        msgs = ((InternalEObject)newWsdlPortType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, null, msgs);
-      msgs = basicSetWsdlPortType(newWsdlPortType, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE, newWsdlPortType, newWsdlPortType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLBinding getWsdlBinding()
-  {
-    return wsdlBinding;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlBinding(WSDLBinding newWsdlBinding, NotificationChain msgs)
-  {
-    WSDLBinding oldWsdlBinding = wsdlBinding;
-    wsdlBinding = newWsdlBinding;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, oldWsdlBinding, newWsdlBinding);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlBinding(WSDLBinding newWsdlBinding)
-  {
-    if (newWsdlBinding != wsdlBinding)
-    {
-      NotificationChain msgs = null;
-      if (wsdlBinding != null)
-        msgs = ((InternalEObject)wsdlBinding).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, null, msgs);
-      if (newWsdlBinding != null)
-        msgs = ((InternalEObject)newWsdlBinding).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, null, msgs);
-      msgs = basicSetWsdlBinding(newWsdlBinding, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING, newWsdlBinding, newWsdlBinding));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getServiceEndpointMethodMappings()
-  {
-    if (serviceEndpointMethodMappings == null)
-    {
-      serviceEndpointMethodMappings = new EObjectContainmentEList(ServiceEndpointMethodMapping.class, this, JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS);
-    }
-    return serviceEndpointMethodMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-          return basicSetWsdlPortType(null, msgs);
-        case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-          return basicSetWsdlBinding(null, msgs);
-        case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-          return ((InternalEList)getServiceEndpointMethodMappings()).basicRemove(otherEnd, msgs);
-        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 JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-        return getServiceEndpointInterface();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-        return getWsdlPortType();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-        return getWsdlBinding();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-        return getServiceEndpointMethodMappings();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-        setServiceEndpointInterface((String)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-        setWsdlPortType((WSDLPortType)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-        setWsdlBinding((WSDLBinding)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-        getServiceEndpointMethodMappings().clear();
-        getServiceEndpointMethodMappings().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-        setServiceEndpointInterface(SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-        setWsdlPortType((WSDLPortType)null);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-        setWsdlBinding((WSDLBinding)null);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-        getServiceEndpointMethodMappings().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE:
-        return SERVICE_ENDPOINT_INTERFACE_EDEFAULT == null ? serviceEndpointInterface != null : !SERVICE_ENDPOINT_INTERFACE_EDEFAULT.equals(serviceEndpointInterface);
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE:
-        return wsdlPortType != null;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING:
-        return wsdlBinding != null;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS:
-        return serviceEndpointMethodMappings != null && !serviceEndpointMethodMappings.isEmpty();
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", serviceEndpointInterface: ");//$NON-NLS-1$
-    result.append(serviceEndpointInterface);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ServiceEndpointInterfaceMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceEndpointMethodMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceEndpointMethodMappingImpl.java
deleted file mode 100644
index cb412c0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceEndpointMethodMappingImpl.java
+++ /dev/null
@@ -1,517 +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.webservice.internal.jaxrpcmap.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.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.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Endpoint Method Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl#getJavaMethodName <em>Java Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl#getWsdlOperation <em>Wsdl Operation</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl#isWrappedElement <em>Wrapped Element</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl#getMethodParamPartsMappings <em>Method Param Parts Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceEndpointMethodMappingImpl#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceEndpointMethodMappingImpl extends EObjectImpl implements ServiceEndpointMethodMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getJavaMethodName() <em>Java Method Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaMethodName()
-   * @generated
-   * @ordered
-   */
-  protected static final String JAVA_METHOD_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getJavaMethodName() <em>Java Method Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaMethodName()
-   * @generated
-   * @ordered
-   */
-  protected String javaMethodName = JAVA_METHOD_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlOperation()
-   * @generated
-   * @ordered
-   */
-  protected static final String WSDL_OPERATION_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlOperation()
-   * @generated
-   * @ordered
-   */
-  protected String wsdlOperation = WSDL_OPERATION_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isWrappedElement() <em>Wrapped Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isWrappedElement()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean WRAPPED_ELEMENT_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isWrappedElement() <em>Wrapped Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isWrappedElement()
-   * @generated
-   * @ordered
-   */
-  protected boolean wrappedElement = WRAPPED_ELEMENT_EDEFAULT;
-
-  /**
-   * This is true if the Wrapped Element attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean wrappedElementESet = false;
-
-  /**
-   * The cached value of the '{@link #getMethodParamPartsMappings() <em>Method Param Parts Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMethodParamPartsMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList methodParamPartsMappings = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlReturnValueMapping() <em>Wsdl Return Value Mapping</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlReturnValueMapping()
-   * @generated
-   * @ordered
-   */
-  protected WSDLReturnValueMapping wsdlReturnValueMapping = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ServiceEndpointMethodMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getJavaMethodName()
-  {
-    return javaMethodName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setJavaMethodName(String newJavaMethodName)
-  {
-    String oldJavaMethodName = javaMethodName;
-    javaMethodName = newJavaMethodName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME, oldJavaMethodName, javaMethodName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getWsdlOperation()
-  {
-    return wsdlOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlOperation(String newWsdlOperation)
-  {
-    String oldWsdlOperation = wsdlOperation;
-    wsdlOperation = newWsdlOperation;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION, oldWsdlOperation, wsdlOperation));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isWrappedElement()
-  {
-    return wrappedElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWrappedElement(boolean newWrappedElement)
-  {
-    boolean oldWrappedElement = wrappedElement;
-    wrappedElement = newWrappedElement;
-    boolean oldWrappedElementESet = wrappedElementESet;
-    wrappedElementESet = true;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT, oldWrappedElement, wrappedElement, !oldWrappedElementESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetWrappedElement()
-  {
-    boolean oldWrappedElement = wrappedElement;
-    boolean oldWrappedElementESet = wrappedElementESet;
-    wrappedElement = WRAPPED_ELEMENT_EDEFAULT;
-    wrappedElementESet = false;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT, oldWrappedElement, WRAPPED_ELEMENT_EDEFAULT, oldWrappedElementESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetWrappedElement()
-  {
-    return wrappedElementESet;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getMethodParamPartsMappings()
-  {
-    if (methodParamPartsMappings == null)
-    {
-      methodParamPartsMappings = new EObjectContainmentEList(MethodParamPartsMapping.class, this, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS);
-    }
-    return methodParamPartsMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLReturnValueMapping getWsdlReturnValueMapping()
-  {
-    return wsdlReturnValueMapping;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlReturnValueMapping(WSDLReturnValueMapping newWsdlReturnValueMapping, NotificationChain msgs)
-  {
-    WSDLReturnValueMapping oldWsdlReturnValueMapping = wsdlReturnValueMapping;
-    wsdlReturnValueMapping = newWsdlReturnValueMapping;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, oldWsdlReturnValueMapping, newWsdlReturnValueMapping);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlReturnValueMapping(WSDLReturnValueMapping newWsdlReturnValueMapping)
-  {
-    if (newWsdlReturnValueMapping != wsdlReturnValueMapping)
-    {
-      NotificationChain msgs = null;
-      if (wsdlReturnValueMapping != null)
-        msgs = ((InternalEObject)wsdlReturnValueMapping).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, null, msgs);
-      if (newWsdlReturnValueMapping != null)
-        msgs = ((InternalEObject)newWsdlReturnValueMapping).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, null, msgs);
-      msgs = basicSetWsdlReturnValueMapping(newWsdlReturnValueMapping, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING, newWsdlReturnValueMapping, newWsdlReturnValueMapping));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-          return ((InternalEList)getMethodParamPartsMappings()).basicRemove(otherEnd, msgs);
-        case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-          return basicSetWsdlReturnValueMapping(null, msgs);
-        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 JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-        return getJavaMethodName();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-        return getWsdlOperation();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-        return isWrappedElement() ? Boolean.TRUE : Boolean.FALSE;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-        return getMethodParamPartsMappings();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-        return getWsdlReturnValueMapping();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-        setJavaMethodName((String)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-        setWsdlOperation((String)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-        setWrappedElement(((Boolean)newValue).booleanValue());
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-        getMethodParamPartsMappings().clear();
-        getMethodParamPartsMappings().addAll((Collection)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-        setWsdlReturnValueMapping((WSDLReturnValueMapping)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-        setJavaMethodName(JAVA_METHOD_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-        setWsdlOperation(WSDL_OPERATION_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-        unsetWrappedElement();
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-        getMethodParamPartsMappings().clear();
-        return;
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-        setWsdlReturnValueMapping((WSDLReturnValueMapping)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME:
-        return JAVA_METHOD_NAME_EDEFAULT == null ? javaMethodName != null : !JAVA_METHOD_NAME_EDEFAULT.equals(javaMethodName);
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION:
-        return WSDL_OPERATION_EDEFAULT == null ? wsdlOperation != null : !WSDL_OPERATION_EDEFAULT.equals(wsdlOperation);
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT:
-        return isSetWrappedElement();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS:
-        return methodParamPartsMappings != null && !methodParamPartsMappings.isEmpty();
-      case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING:
-        return wsdlReturnValueMapping != null;
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", javaMethodName: ");//$NON-NLS-1$
-    result.append(javaMethodName);
-    result.append(", wsdlOperation: ");//$NON-NLS-1$
-    result.append(wsdlOperation);
-    result.append(", wrappedElement: ");//$NON-NLS-1$
-    if (wrappedElementESet) result.append(wrappedElement); else result.append("<unset>");//$NON-NLS-1$
-    result.append(')');
-    return result.toString();
-  }
-
-} //ServiceEndpointMethodMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceInterfaceMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceInterfaceMappingImpl.java
deleted file mode 100644
index 67b04bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/ServiceInterfaceMappingImpl.java
+++ /dev/null
@@ -1,368 +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.webservice.internal.jaxrpcmap.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.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.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceInterfaceMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceInterfaceMappingImpl#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceInterfaceMappingImpl#getWsdlServiceName <em>Wsdl Service Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.ServiceInterfaceMappingImpl#getPortMappings <em>Port Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceInterfaceMappingImpl extends InterfaceMappingImpl implements ServiceInterfaceMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getServiceInterface() <em>Service Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getServiceInterface()
-   * @generated
-   * @ordered
-   */
-  protected static final String SERVICE_INTERFACE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getServiceInterface() <em>Service Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getServiceInterface()
-   * @generated
-   * @ordered
-   */
-  protected String serviceInterface = SERVICE_INTERFACE_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getWsdlServiceName() <em>Wsdl Service Name</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlServiceName()
-   * @generated
-   * @ordered
-   */
-  protected WSDLServiceName wsdlServiceName = null;
-
-  /**
-   * The cached value of the '{@link #getPortMappings() <em>Port Mappings</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPortMappings()
-   * @generated
-   * @ordered
-   */
-  protected EList portMappings = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ServiceInterfaceMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getServiceInterface()
-  {
-    return serviceInterface;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setServiceInterface(String newServiceInterface)
-  {
-    String oldServiceInterface = serviceInterface;
-    serviceInterface = newServiceInterface;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE, oldServiceInterface, serviceInterface));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLServiceName getWsdlServiceName()
-  {
-    return wsdlServiceName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlServiceName(WSDLServiceName newWsdlServiceName, NotificationChain msgs)
-  {
-    WSDLServiceName oldWsdlServiceName = wsdlServiceName;
-    wsdlServiceName = newWsdlServiceName;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, oldWsdlServiceName, newWsdlServiceName);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlServiceName(WSDLServiceName newWsdlServiceName)
-  {
-    if (newWsdlServiceName != wsdlServiceName)
-    {
-      NotificationChain msgs = null;
-      if (wsdlServiceName != null)
-        msgs = ((InternalEObject)wsdlServiceName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, null, msgs);
-      if (newWsdlServiceName != null)
-        msgs = ((InternalEObject)newWsdlServiceName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, null, msgs);
-      msgs = basicSetWsdlServiceName(newWsdlServiceName, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME, newWsdlServiceName, newWsdlServiceName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getPortMappings()
-  {
-    if (portMappings == null)
-    {
-      portMappings = new EObjectContainmentEList(PortMapping.class, this, JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS);
-    }
-    return portMappings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-          return basicSetWsdlServiceName(null, msgs);
-        case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-          return ((InternalEList)getPortMappings()).basicRemove(otherEnd, msgs);
-        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 JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-        return getServiceInterface();
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-        return getWsdlServiceName();
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-        return getPortMappings();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-        setServiceInterface((String)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-        setWsdlServiceName((WSDLServiceName)newValue);
-        return;
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-        getPortMappings().clear();
-        getPortMappings().addAll((Collection)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-        setServiceInterface(SERVICE_INTERFACE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-        setWsdlServiceName((WSDLServiceName)null);
-        return;
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-        getPortMappings().clear();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE:
-        return SERVICE_INTERFACE_EDEFAULT == null ? serviceInterface != null : !SERVICE_INTERFACE_EDEFAULT.equals(serviceInterface);
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME:
-        return wsdlServiceName != null;
-      case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS:
-        return portMappings != null && !portMappings.isEmpty();
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", serviceInterface: ");//$NON-NLS-1$
-    result.append(serviceInterface);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ServiceInterfaceMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/VariableMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/VariableMappingImpl.java
deleted file mode 100644
index c104690..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/VariableMappingImpl.java
+++ /dev/null
@@ -1,529 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Variable Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl#getJavaVariableName <em>Java Variable Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl#getXmlElementName <em>Xml Element Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl#isDataMember <em>Data Member</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl#getXmlAttributeName <em>Xml Attribute Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.VariableMappingImpl#isXmlWildcard <em>Xml Wildcard</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VariableMappingImpl extends EObjectImpl implements VariableMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getJavaVariableName() <em>Java Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaVariableName()
-   * @generated
-   * @ordered
-   */
-  protected static final String JAVA_VARIABLE_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getJavaVariableName() <em>Java Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaVariableName()
-   * @generated
-   * @ordered
-   */
-  protected String javaVariableName = JAVA_VARIABLE_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getXmlElementName() <em>Xml Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXmlElementName()
-   * @generated
-   * @ordered
-   */
-  protected static final String XML_ELEMENT_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getXmlElementName() <em>Xml Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXmlElementName()
-   * @generated
-   * @ordered
-   */
-  protected String xmlElementName = XML_ELEMENT_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isDataMember() <em>Data Member</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isDataMember()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean DATA_MEMBER_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isDataMember() <em>Data Member</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isDataMember()
-   * @generated
-   * @ordered
-   */
-  protected boolean dataMember = DATA_MEMBER_EDEFAULT;
-
-  /**
-   * This is true if the Data Member attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean dataMemberESet = false;
-
-  /**
-   * The default value of the '{@link #getXmlAttributeName() <em>Xml Attribute Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXmlAttributeName()
-   * @generated
-   * @ordered
-   */
-  protected static final String XML_ATTRIBUTE_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getXmlAttributeName() <em>Xml Attribute Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXmlAttributeName()
-   * @generated
-   * @ordered
-   */
-  protected String xmlAttributeName = XML_ATTRIBUTE_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isXmlWildcard() <em>Xml Wildcard</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isXmlWildcard()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean XML_WILDCARD_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isXmlWildcard() <em>Xml Wildcard</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isXmlWildcard()
-   * @generated
-   * @ordered
-   */
-  protected boolean xmlWildcard = XML_WILDCARD_EDEFAULT;
-
-  /**
-   * This is true if the Xml Wildcard attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean xmlWildcardESet = false;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected VariableMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getVariableMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getJavaVariableName()
-  {
-    return javaVariableName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setJavaVariableName(String newJavaVariableName)
-  {
-    String oldJavaVariableName = javaVariableName;
-    javaVariableName = newJavaVariableName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME, oldJavaVariableName, javaVariableName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getXmlElementName()
-  {
-    return xmlElementName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setXmlElementName(String newXmlElementName)
-  {
-    String oldXmlElementName = xmlElementName;
-    xmlElementName = newXmlElementName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME, oldXmlElementName, xmlElementName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isDataMember()
-  {
-    return dataMember;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDataMember(boolean newDataMember)
-  {
-    boolean oldDataMember = dataMember;
-    dataMember = newDataMember;
-    boolean oldDataMemberESet = dataMemberESet;
-    dataMemberESet = true;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER, oldDataMember, dataMember, !oldDataMemberESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetDataMember()
-  {
-    boolean oldDataMember = dataMember;
-    boolean oldDataMemberESet = dataMemberESet;
-    dataMember = DATA_MEMBER_EDEFAULT;
-    dataMemberESet = false;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER, oldDataMember, DATA_MEMBER_EDEFAULT, oldDataMemberESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetDataMember()
-  {
-    return dataMemberESet;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getXmlAttributeName()
-  {
-    return xmlAttributeName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setXmlAttributeName(String newXmlAttributeName)
-  {
-    String oldXmlAttributeName = xmlAttributeName;
-    xmlAttributeName = newXmlAttributeName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME, oldXmlAttributeName, xmlAttributeName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isXmlWildcard()
-  {
-    return xmlWildcard;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setXmlWildcard(boolean newXmlWildcard)
-  {
-    boolean oldXmlWildcard = xmlWildcard;
-    xmlWildcard = newXmlWildcard;
-    boolean oldXmlWildcardESet = xmlWildcardESet;
-    xmlWildcardESet = true;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD, oldXmlWildcard, xmlWildcard, !oldXmlWildcardESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetXmlWildcard()
-  {
-    boolean oldXmlWildcard = xmlWildcard;
-    boolean oldXmlWildcardESet = xmlWildcardESet;
-    xmlWildcard = XML_WILDCARD_EDEFAULT;
-    xmlWildcardESet = false;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD, oldXmlWildcard, XML_WILDCARD_EDEFAULT, oldXmlWildcardESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetXmlWildcard()
-  {
-    return xmlWildcardESet;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-        return getJavaVariableName();
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-        return getXmlElementName();
-      case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-        return isDataMember() ? Boolean.TRUE : Boolean.FALSE;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-        return getXmlAttributeName();
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-        return isXmlWildcard() ? Boolean.TRUE : Boolean.FALSE;
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-        setJavaVariableName((String)newValue);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-        setXmlElementName((String)newValue);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-        setDataMember(((Boolean)newValue).booleanValue());
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-        setXmlAttributeName((String)newValue);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-        setXmlWildcard(((Boolean)newValue).booleanValue());
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-        setJavaVariableName(JAVA_VARIABLE_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-        setXmlElementName(XML_ELEMENT_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-        unsetDataMember();
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-        setXmlAttributeName(XML_ATTRIBUTE_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-        unsetXmlWildcard();
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.VARIABLE_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME:
-        return JAVA_VARIABLE_NAME_EDEFAULT == null ? javaVariableName != null : !JAVA_VARIABLE_NAME_EDEFAULT.equals(javaVariableName);
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME:
-        return XML_ELEMENT_NAME_EDEFAULT == null ? xmlElementName != null : !XML_ELEMENT_NAME_EDEFAULT.equals(xmlElementName);
-      case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER:
-        return isSetDataMember();
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME:
-        return XML_ATTRIBUTE_NAME_EDEFAULT == null ? xmlAttributeName != null : !XML_ATTRIBUTE_NAME_EDEFAULT.equals(xmlAttributeName);
-      case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD:
-        return isSetXmlWildcard();
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", javaVariableName: ");//$NON-NLS-1$
-    result.append(javaVariableName);
-    result.append(", xmlElementName: ");//$NON-NLS-1$
-    result.append(xmlElementName);
-    result.append(", dataMember: ");//$NON-NLS-1$
-    if (dataMemberESet) result.append(dataMember); else result.append("<unset>");//$NON-NLS-1$
-    result.append(", xmlAttributeName: ");//$NON-NLS-1$
-    result.append(xmlAttributeName);
-    result.append(", xmlWildcard: ");//$NON-NLS-1$
-    if (xmlWildcardESet) result.append(xmlWildcard); else result.append("<unset>");//$NON-NLS-1$
-    result.append(')');
-    return result.toString();
-  }
-
-} //VariableMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLBindingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLBindingImpl.java
deleted file mode 100644
index 5505749..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLBindingImpl.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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Binding</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLBindingImpl extends QNameImpl implements WSDLBinding
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLBindingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLBinding();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_BINDING__NAMESPACE_URI:
-        return getNamespaceURI();
-      case JaxrpcmapPackage.WSDL_BINDING__LOCAL_PART:
-        return getLocalPart();
-      case JaxrpcmapPackage.WSDL_BINDING__COMBINED_QNAME:
-        return getCombinedQName();
-      case JaxrpcmapPackage.WSDL_BINDING__INTERNAL_PREFIX_OR_NS_URI:
-        return getInternalPrefixOrNsURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_BINDING__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_BINDING__LOCAL_PART:
-        setLocalPart((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_BINDING__COMBINED_QNAME:
-        setCombinedQName((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_BINDING__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_BINDING__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_BINDING__LOCAL_PART:
-        setLocalPart(LOCAL_PART_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_BINDING__COMBINED_QNAME:
-        setCombinedQName(COMBINED_QNAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_BINDING__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_BINDING__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case JaxrpcmapPackage.WSDL_BINDING__LOCAL_PART:
-        return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-      case JaxrpcmapPackage.WSDL_BINDING__COMBINED_QNAME:
-        return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-      case JaxrpcmapPackage.WSDL_BINDING__INTERNAL_PREFIX_OR_NS_URI:
-        return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-} //WSDLBindingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessageImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessageImpl.java
deleted file mode 100644
index 1ab2f41..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessageImpl.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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Message</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLMessageImpl extends QNameImpl implements WSDLMessage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLMessageImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLMessage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE__NAMESPACE_URI:
-        return getNamespaceURI();
-      case JaxrpcmapPackage.WSDL_MESSAGE__LOCAL_PART:
-        return getLocalPart();
-      case JaxrpcmapPackage.WSDL_MESSAGE__COMBINED_QNAME:
-        return getCombinedQName();
-      case JaxrpcmapPackage.WSDL_MESSAGE__INTERNAL_PREFIX_OR_NS_URI:
-        return getInternalPrefixOrNsURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE__LOCAL_PART:
-        setLocalPart((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE__COMBINED_QNAME:
-        setCombinedQName((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE__LOCAL_PART:
-        setLocalPart(LOCAL_PART_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE__COMBINED_QNAME:
-        setCombinedQName(COMBINED_QNAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case JaxrpcmapPackage.WSDL_MESSAGE__LOCAL_PART:
-        return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-      case JaxrpcmapPackage.WSDL_MESSAGE__COMBINED_QNAME:
-        return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-      case JaxrpcmapPackage.WSDL_MESSAGE__INTERNAL_PREFIX_OR_NS_URI:
-        return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-} //WSDLMessageImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessageMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessageMappingImpl.java
deleted file mode 100644
index 04b66fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessageMappingImpl.java
+++ /dev/null
@@ -1,473 +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.webservice.internal.jaxrpcmap.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Message Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageMappingImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageMappingImpl#getParameterMode <em>Parameter Mode</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageMappingImpl#isSoapHeader <em>Soap Header</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessageMappingImpl#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLMessageMappingImpl extends EObjectImpl implements WSDLMessageMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParameterMode()
-   * @generated
-   * @ordered
-   */
-  protected static final String PARAMETER_MODE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getParameterMode() <em>Parameter Mode</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParameterMode()
-   * @generated
-   * @ordered
-   */
-  protected String parameterMode = PARAMETER_MODE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isSoapHeader() <em>Soap Header</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSoapHeader()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean SOAP_HEADER_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isSoapHeader() <em>Soap Header</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSoapHeader()
-   * @generated
-   * @ordered
-   */
-  protected boolean soapHeader = SOAP_HEADER_EDEFAULT;
-
-  /**
-   * This is true if the Soap Header attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean soapHeaderESet = false;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessage() <em>Wsdl Message</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessage()
-   * @generated
-   * @ordered
-   */
-  protected WSDLMessage wsdlMessage = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLMessageMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getWsdlMessagePartName()
-  {
-    return wsdlMessagePartName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName)
-  {
-    String oldWsdlMessagePartName = wsdlMessagePartName;
-    wsdlMessagePartName = newWsdlMessagePartName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getParameterMode()
-  {
-    return parameterMode;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setParameterMode(String newParameterMode)
-  {
-    String oldParameterMode = parameterMode;
-    parameterMode = newParameterMode;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE, oldParameterMode, parameterMode));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSoapHeader()
-  {
-    return soapHeader;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSoapHeader(boolean newSoapHeader)
-  {
-    boolean oldSoapHeader = soapHeader;
-    soapHeader = newSoapHeader;
-    boolean oldSoapHeaderESet = soapHeaderESet;
-    soapHeaderESet = true;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER, oldSoapHeader, soapHeader, !oldSoapHeaderESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetSoapHeader()
-  {
-    boolean oldSoapHeader = soapHeader;
-    boolean oldSoapHeaderESet = soapHeaderESet;
-    soapHeader = SOAP_HEADER_EDEFAULT;
-    soapHeaderESet = false;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER, oldSoapHeader, SOAP_HEADER_EDEFAULT, oldSoapHeaderESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetSoapHeader()
-  {
-    return soapHeaderESet;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLMessage getWsdlMessage()
-  {
-    return wsdlMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlMessage(WSDLMessage newWsdlMessage, NotificationChain msgs)
-  {
-    WSDLMessage oldWsdlMessage = wsdlMessage;
-    wsdlMessage = newWsdlMessage;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, oldWsdlMessage, newWsdlMessage);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessage(WSDLMessage newWsdlMessage)
-  {
-    if (newWsdlMessage != wsdlMessage)
-    {
-      NotificationChain msgs = null;
-      if (wsdlMessage != null)
-        msgs = ((InternalEObject)wsdlMessage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, null, msgs);
-      if (newWsdlMessage != null)
-        msgs = ((InternalEObject)newWsdlMessage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, null, msgs);
-      msgs = basicSetWsdlMessage(newWsdlMessage, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE, newWsdlMessage, newWsdlMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-          return basicSetWsdlMessage(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 JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        return getWsdlMessagePartName();
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-        return getParameterMode();
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-        return isSoapHeader() ? Boolean.TRUE : Boolean.FALSE;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-        return getWsdlMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-        setParameterMode((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-        setSoapHeader(((Boolean)newValue).booleanValue());
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-        setWsdlMessage((WSDLMessage)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-        setParameterMode(PARAMETER_MODE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-        unsetSoapHeader();
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-        setWsdlMessage((WSDLMessage)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE:
-        return PARAMETER_MODE_EDEFAULT == null ? parameterMode != null : !PARAMETER_MODE_EDEFAULT.equals(parameterMode);
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER:
-        return isSetSoapHeader();
-      case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE:
-        return wsdlMessage != null;
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", wsdlMessagePartName: ");//$NON-NLS-1$
-    result.append(wsdlMessagePartName);
-    result.append(", parameterMode: ");//$NON-NLS-1$
-    result.append(parameterMode);
-    result.append(", soapHeader: ");//$NON-NLS-1$
-    if (soapHeaderESet) result.append(soapHeader); else result.append("<unset>");//$NON-NLS-1$
-    result.append(')');
-    return result.toString();
-  }
-
-} //WSDLMessageMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessagePartNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessagePartNameImpl.java
deleted file mode 100644
index e2cc2ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLMessagePartNameImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Message Part Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessagePartNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLMessagePartNameImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLMessagePartNameImpl extends EObjectImpl implements WSDLMessagePartName
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLMessagePartNameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLMessagePartName();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getWsdlMessagePartName()
-  {
-    return wsdlMessagePartName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName)
-  {
-    String oldWsdlMessagePartName = wsdlMessagePartName;
-    wsdlMessagePartName = newWsdlMessagePartName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-        return getId();
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-        return getWsdlMessagePartName();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME:
-        return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", wsdlMessagePartName: ");//$NON-NLS-1$
-    result.append(wsdlMessagePartName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //WSDLMessagePartNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLOperationImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLOperationImpl.java
deleted file mode 100644
index 288af4d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLOperationImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLOperationImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLOperationImpl#getWsdlOperation <em>Wsdl Operation</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLOperationImpl extends EObjectImpl implements WSDLOperation
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlOperation()
-   * @generated
-   * @ordered
-   */
-  protected static final String WSDL_OPERATION_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlOperation() <em>Wsdl Operation</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlOperation()
-   * @generated
-   * @ordered
-   */
-  protected String wsdlOperation = WSDL_OPERATION_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLOperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLOperation();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_OPERATION__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getWsdlOperation()
-  {
-    return wsdlOperation;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlOperation(String newWsdlOperation)
-  {
-    String oldWsdlOperation = wsdlOperation;
-    wsdlOperation = newWsdlOperation;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION, oldWsdlOperation, wsdlOperation));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_OPERATION__ID:
-        return getId();
-      case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-        return getWsdlOperation();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_OPERATION__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-        setWsdlOperation((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_OPERATION__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-        setWsdlOperation(WSDL_OPERATION_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_OPERATION__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION:
-        return WSDL_OPERATION_EDEFAULT == null ? wsdlOperation != null : !WSDL_OPERATION_EDEFAULT.equals(wsdlOperation);
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", wsdlOperation: ");//$NON-NLS-1$
-    result.append(wsdlOperation);
-    result.append(')');
-    return result.toString();
-  }
-
-} //WSDLOperationImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLPortTypeImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLPortTypeImpl.java
deleted file mode 100644
index 21a6f33..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLPortTypeImpl.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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Port Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLPortTypeImpl extends QNameImpl implements WSDLPortType
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLPortTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLPortType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__NAMESPACE_URI:
-        return getNamespaceURI();
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__LOCAL_PART:
-        return getLocalPart();
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__COMBINED_QNAME:
-        return getCombinedQName();
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__INTERNAL_PREFIX_OR_NS_URI:
-        return getInternalPrefixOrNsURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__LOCAL_PART:
-        setLocalPart((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__COMBINED_QNAME:
-        setCombinedQName((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__LOCAL_PART:
-        setLocalPart(LOCAL_PART_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__COMBINED_QNAME:
-        setCombinedQName(COMBINED_QNAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__LOCAL_PART:
-        return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__COMBINED_QNAME:
-        return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-      case JaxrpcmapPackage.WSDL_PORT_TYPE__INTERNAL_PREFIX_OR_NS_URI:
-        return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-} //WSDLPortTypeImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLReturnValueMappingImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLReturnValueMappingImpl.java
deleted file mode 100644
index 834899d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLReturnValueMappingImpl.java
+++ /dev/null
@@ -1,381 +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.webservice.internal.jaxrpcmap.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.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Return Value Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLReturnValueMappingImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLReturnValueMappingImpl#getMethodReturnValue <em>Method Return Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLReturnValueMappingImpl#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.WSDLReturnValueMappingImpl#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDLReturnValueMappingImpl extends EObjectImpl implements WSDLReturnValueMapping
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getMethodReturnValue() <em>Method Return Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMethodReturnValue()
-   * @generated
-   * @ordered
-   */
-  protected static final String METHOD_RETURN_VALUE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getMethodReturnValue() <em>Method Return Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMethodReturnValue()
-   * @generated
-   * @ordered
-   */
-  protected String methodReturnValue = METHOD_RETURN_VALUE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected static final String WSDL_MESSAGE_PART_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessagePartName() <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessagePartName()
-   * @generated
-   * @ordered
-   */
-  protected String wsdlMessagePartName = WSDL_MESSAGE_PART_NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getWsdlMessage() <em>Wsdl Message</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getWsdlMessage()
-   * @generated
-   * @ordered
-   */
-  protected WSDLMessage wsdlMessage = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLReturnValueMappingImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getMethodReturnValue()
-  {
-    return methodReturnValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setMethodReturnValue(String newMethodReturnValue)
-  {
-    String oldMethodReturnValue = methodReturnValue;
-    methodReturnValue = newMethodReturnValue;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE, oldMethodReturnValue, methodReturnValue));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getWsdlMessagePartName()
-  {
-    return wsdlMessagePartName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessagePartName(String newWsdlMessagePartName)
-  {
-    String oldWsdlMessagePartName = wsdlMessagePartName;
-    wsdlMessagePartName = newWsdlMessagePartName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME, oldWsdlMessagePartName, wsdlMessagePartName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public WSDLMessage getWsdlMessage()
-  {
-    return wsdlMessage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetWsdlMessage(WSDLMessage newWsdlMessage, NotificationChain msgs)
-  {
-    WSDLMessage oldWsdlMessage = wsdlMessage;
-    wsdlMessage = newWsdlMessage;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, oldWsdlMessage, newWsdlMessage);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setWsdlMessage(WSDLMessage newWsdlMessage)
-  {
-    if (newWsdlMessage != wsdlMessage)
-    {
-      NotificationChain msgs = null;
-      if (wsdlMessage != null)
-        msgs = ((InternalEObject)wsdlMessage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, null, msgs);
-      if (newWsdlMessage != null)
-        msgs = ((InternalEObject)newWsdlMessage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, null, msgs);
-      msgs = basicSetWsdlMessage(newWsdlMessage, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE, newWsdlMessage, newWsdlMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-          return basicSetWsdlMessage(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 JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-        return getId();
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-        return getMethodReturnValue();
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        return getWsdlMessagePartName();
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-        return getWsdlMessage();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-        setMethodReturnValue((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-        setWsdlMessage((WSDLMessage)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-        setMethodReturnValue(METHOD_RETURN_VALUE_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        setWsdlMessagePartName(WSDL_MESSAGE_PART_NAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-        setWsdlMessage((WSDLMessage)null);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE:
-        return METHOD_RETURN_VALUE_EDEFAULT == null ? methodReturnValue != null : !METHOD_RETURN_VALUE_EDEFAULT.equals(methodReturnValue);
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME:
-        return WSDL_MESSAGE_PART_NAME_EDEFAULT == null ? wsdlMessagePartName != null : !WSDL_MESSAGE_PART_NAME_EDEFAULT.equals(wsdlMessagePartName);
-      case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE:
-        return wsdlMessage != null;
-    }
-    return 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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", methodReturnValue: ");//$NON-NLS-1$
-    result.append(methodReturnValue);
-    result.append(", wsdlMessagePartName: ");//$NON-NLS-1$
-    result.append(wsdlMessagePartName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //WSDLReturnValueMappingImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLServiceNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLServiceNameImpl.java
deleted file mode 100644
index 6b86ab4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/WSDLServiceNameImpl.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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.common.impl.QNameImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL Service Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class WSDLServiceNameImpl extends QNameImpl implements WSDLServiceName
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected WSDLServiceNameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getWSDLServiceName();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__NAMESPACE_URI:
-        return getNamespaceURI();
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__LOCAL_PART:
-        return getLocalPart();
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__COMBINED_QNAME:
-        return getCombinedQName();
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__INTERNAL_PREFIX_OR_NS_URI:
-        return getInternalPrefixOrNsURI();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__NAMESPACE_URI:
-        setNamespaceURI((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__LOCAL_PART:
-        setLocalPart((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__COMBINED_QNAME:
-        setCombinedQName((String)newValue);
-        return;
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__NAMESPACE_URI:
-        setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__LOCAL_PART:
-        setLocalPart(LOCAL_PART_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__COMBINED_QNAME:
-        setCombinedQName(COMBINED_QNAME_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__INTERNAL_PREFIX_OR_NS_URI:
-        setInternalPrefixOrNsURI(INTERNAL_PREFIX_OR_NS_URI_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__NAMESPACE_URI:
-        return NAMESPACE_URI_EDEFAULT == null ? namespaceURI != null : !NAMESPACE_URI_EDEFAULT.equals(namespaceURI);
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__LOCAL_PART:
-        return LOCAL_PART_EDEFAULT == null ? localPart != null : !LOCAL_PART_EDEFAULT.equals(localPart);
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__COMBINED_QNAME:
-        return COMBINED_QNAME_EDEFAULT == null ? combinedQName != null : !COMBINED_QNAME_EDEFAULT.equals(combinedQName);
-      case JaxrpcmapPackage.WSDL_SERVICE_NAME__INTERNAL_PREFIX_OR_NS_URI:
-        return INTERNAL_PREFIX_OR_NS_URI_EDEFAULT == null ? internalPrefixOrNsURI != null : !INTERNAL_PREFIX_OR_NS_URI_EDEFAULT.equals(internalPrefixOrNsURI);
-    }
-    return eDynamicIsSet(eFeature);
-  }
-
-} //WSDLServiceNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/XMLElementNameImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/XMLElementNameImpl.java
deleted file mode 100644
index 46abb37..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/impl/XMLElementNameImpl.java
+++ /dev/null
@@ -1,233 +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.webservice.internal.jaxrpcmap.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.XMLElementName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XML Element Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.XMLElementNameImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.util.XMLElementNameImpl#getXmlElementName <em>Xml Element Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class XMLElementNameImpl extends EObjectImpl implements XMLElementName
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final String ID_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected String id = ID_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getXmlElementName() <em>Xml Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXmlElementName()
-   * @generated
-   * @ordered
-   */
-  protected static final String XML_ELEMENT_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getXmlElementName() <em>Xml Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXmlElementName()
-   * @generated
-   * @ordered
-   */
-  protected String xmlElementName = XML_ELEMENT_NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected XMLElementNameImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return JaxrpcmapPackage.eINSTANCE.getXMLElementName();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getId()
-  {
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setId(String newId)
-  {
-    String oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.XML_ELEMENT_NAME__ID, oldId, id));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getXmlElementName()
-  {
-    return xmlElementName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setXmlElementName(String newXmlElementName)
-  {
-    String oldXmlElementName = xmlElementName;
-    xmlElementName = newXmlElementName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, JaxrpcmapPackage.XML_ELEMENT_NAME__XML_ELEMENT_NAME, oldXmlElementName, xmlElementName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(EStructuralFeature eFeature, boolean resolve)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__ID:
-        return getId();
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__XML_ELEMENT_NAME:
-        return getXmlElementName();
-    }
-    return eDynamicGet(eFeature, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(EStructuralFeature eFeature, Object newValue)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__ID:
-        setId((String)newValue);
-        return;
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__XML_ELEMENT_NAME:
-        setXmlElementName((String)newValue);
-        return;
-    }
-    eDynamicSet(eFeature, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__ID:
-        setId(ID_EDEFAULT);
-        return;
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__XML_ELEMENT_NAME:
-        setXmlElementName(XML_ELEMENT_NAME_EDEFAULT);
-        return;
-    }
-    eDynamicUnset(eFeature);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(EStructuralFeature eFeature)
-  {
-    switch (eDerivedStructuralFeatureID(eFeature))
-    {
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__ID:
-        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-      case JaxrpcmapPackage.XML_ELEMENT_NAME__XML_ELEMENT_NAME:
-        return XML_ELEMENT_NAME_EDEFAULT == null ? xmlElementName != null : !XML_ELEMENT_NAME_EDEFAULT.equals(xmlElementName);
-    }
-    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(" (id: ");//$NON-NLS-1$
-    result.append(id);
-    result.append(", xmlElementName: ");//$NON-NLS-1$
-    result.append(xmlElementName);
-    result.append(')');
-    return result.toString();
-  }
-
-} //XMLElementNameImpl
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/util/JaxrpcmapAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/util/JaxrpcmapAdapterFactory.java
deleted file mode 100644
index b6fc283..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/util/JaxrpcmapAdapterFactory.java
+++ /dev/null
@@ -1,816 +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.webservice.internal.jaxrpcmap.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.QName;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ClassType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaMethodName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaPortName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaVariableName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodReturnValue;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamPosition;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParameterMode;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.QnameScope;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.XMLElementName;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage
- * @generated
- */
-public class JaxrpcmapAdapterFactory extends AdapterFactoryImpl
-{
-
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static JaxrpcmapPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JaxrpcmapAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = JaxrpcmapPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
-
-  /**
-   * The switch the delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected JaxrpcmapSwitch modelSwitch =
-    new JaxrpcmapSwitch()
-    {
-      public Object caseJavaWSDLMapping(JavaWSDLMapping object)
-      {
-        return createJavaWSDLMappingAdapter();
-      }
-      public Object casePackageMapping(PackageMapping object)
-      {
-        return createPackageMappingAdapter();
-      }
-      public Object caseJavaXMLTypeMapping(JavaXMLTypeMapping object)
-      {
-        return createJavaXMLTypeMappingAdapter();
-      }
-      public Object caseExceptionMapping(ExceptionMapping object)
-      {
-        return createExceptionMappingAdapter();
-      }
-      public Object caseServiceInterfaceMapping(ServiceInterfaceMapping object)
-      {
-        return createServiceInterfaceMappingAdapter();
-      }
-      public Object caseServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping object)
-      {
-        return createServiceEndpointInterfaceMappingAdapter();
-      }
-      public Object casePackageType(PackageType object)
-      {
-        return createPackageTypeAdapter();
-      }
-      public Object caseClassType(ClassType object)
-      {
-        return createClassTypeAdapter();
-      }
-      public Object caseRootTypeQname(RootTypeQname object)
-      {
-        return createRootTypeQnameAdapter();
-      }
-      public Object caseQnameScope(QnameScope object)
-      {
-        return createQnameScopeAdapter();
-      }
-      public Object caseVariableMapping(VariableMapping object)
-      {
-        return createVariableMappingAdapter();
-      }
-      public Object caseExceptionType(ExceptionType object)
-      {
-        return createExceptionTypeAdapter();
-      }
-      public Object caseWSDLMessage(WSDLMessage object)
-      {
-        return createWSDLMessageAdapter();
-      }
-      public Object caseConstructorParameterOrder(ConstructorParameterOrder object)
-      {
-        return createConstructorParameterOrderAdapter();
-      }
-      public Object caseJavaVariableName(JavaVariableName object)
-      {
-        return createJavaVariableNameAdapter();
-      }
-      public Object caseXMLElementName(XMLElementName object)
-      {
-        return createXMLElementNameAdapter();
-      }
-      public Object caseElementName(ElementName object)
-      {
-        return createElementNameAdapter();
-      }
-      public Object caseWSDLServiceName(WSDLServiceName object)
-      {
-        return createWSDLServiceNameAdapter();
-      }
-      public Object casePortMapping(PortMapping object)
-      {
-        return createPortMappingAdapter();
-      }
-      public Object caseJavaPortName(JavaPortName object)
-      {
-        return createJavaPortNameAdapter();
-      }
-      public Object caseWSDLPortType(WSDLPortType object)
-      {
-        return createWSDLPortTypeAdapter();
-      }
-      public Object caseWSDLBinding(WSDLBinding object)
-      {
-        return createWSDLBindingAdapter();
-      }
-      public Object caseServiceEndpointMethodMapping(ServiceEndpointMethodMapping object)
-      {
-        return createServiceEndpointMethodMappingAdapter();
-      }
-      public Object caseJavaMethodName(JavaMethodName object)
-      {
-        return createJavaMethodNameAdapter();
-      }
-      public Object caseWSDLOperation(WSDLOperation object)
-      {
-        return createWSDLOperationAdapter();
-      }
-      public Object caseMethodParamPartsMapping(MethodParamPartsMapping object)
-      {
-        return createMethodParamPartsMappingAdapter();
-      }
-      public Object caseWSDLReturnValueMapping(WSDLReturnValueMapping object)
-      {
-        return createWSDLReturnValueMappingAdapter();
-      }
-      public Object caseParamPosition(ParamPosition object)
-      {
-        return createParamPositionAdapter();
-      }
-      public Object caseParamType(ParamType object)
-      {
-        return createParamTypeAdapter();
-      }
-      public Object caseWSDLMessageMapping(WSDLMessageMapping object)
-      {
-        return createWSDLMessageMappingAdapter();
-      }
-      public Object caseWSDLMessagePartName(WSDLMessagePartName object)
-      {
-        return createWSDLMessagePartNameAdapter();
-      }
-      public Object caseParameterMode(ParameterMode object)
-      {
-        return createParameterModeAdapter();
-      }
-      public Object caseMethodReturnValue(MethodReturnValue object)
-      {
-        return createMethodReturnValueAdapter();
-      }
-      public Object caseInterfaceMapping(InterfaceMapping object)
-      {
-        return createInterfaceMappingAdapter();
-      }
-      public Object caseQName(QName object)
-      {
-        return createQNameAdapter();
-      }
-      public Object defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
-
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  public Adapter createAdapter(Notifier target)
-  {
-    return (Adapter)modelSwitch.doSwitch((EObject)target);
-  }
-
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping <em>Java WSDL Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping
-   * @generated
-   */
-  public Adapter createJavaWSDLMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping <em>Package Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping
-   * @generated
-   */
-  public Adapter createPackageMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping <em>Java XML Type Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping
-   * @generated
-   */
-  public Adapter createJavaXMLTypeMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping <em>Exception Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping
-   * @generated
-   */
-  public Adapter createExceptionMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping <em>Service Interface Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping
-   * @generated
-   */
-  public Adapter createServiceInterfaceMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping <em>Service Endpoint Interface Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping
-   * @generated
-   */
-  public Adapter createServiceEndpointInterfaceMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType <em>Package Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType
-   * @generated
-   */
-  public Adapter createPackageTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType <em>Class Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType
-   * @generated
-   */
-  public Adapter createClassTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.RootTypeQname <em>Root Type Qname</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.RootTypeQname
-   * @generated
-   */
-  public Adapter createRootTypeQnameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope <em>Qname Scope</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.internal.webservice.jaxrpcmap.QnameScope
-   * @generated
-   */
-  public Adapter createQnameScopeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping <em>Variable Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping
-   * @generated
-   */
-  public Adapter createVariableMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType <em>Exception Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType
-   * @generated
-   */
-  public Adapter createExceptionTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessage <em>WSDL Message</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessage
-   * @generated
-   */
-  public Adapter createWSDLMessageAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder <em>Constructor Parameter Order</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder
-   * @generated
-   */
-  public Adapter createConstructorParameterOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName <em>Java Variable Name</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName
-   * @generated
-   */
-  public Adapter createJavaVariableNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName <em>XML Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName
-   * @generated
-   */
-  public Adapter createXMLElementNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName <em>Element Name</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName
-   * @generated
-   */
-  public Adapter createElementNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLServiceName <em>WSDL Service Name</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLServiceName
-   * @generated
-   */
-  public Adapter createWSDLServiceNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping <em>Port Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping
-   * @generated
-   */
-  public Adapter createPortMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName <em>Java Port Name</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName
-   * @generated
-   */
-  public Adapter createJavaPortNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLPortType <em>WSDL Port Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLPortType
-   * @generated
-   */
-  public Adapter createWSDLPortTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLBinding <em>WSDL Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLBinding
-   * @generated
-   */
-  public Adapter createWSDLBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping <em>Service Endpoint Method Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping
-   * @generated
-   */
-  public Adapter createServiceEndpointMethodMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName <em>Java Method Name</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName
-   * @generated
-   */
-  public Adapter createJavaMethodNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation <em>WSDL Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation
-   * @generated
-   */
-  public Adapter createWSDLOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping <em>Method Param Parts Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping
-   * @generated
-   */
-  public Adapter createMethodParamPartsMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping <em>WSDL Return Value Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping
-   * @generated
-   */
-  public Adapter createWSDLReturnValueMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition <em>Param Position</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.internal.webservice.jaxrpcmap.ParamPosition
-   * @generated
-   */
-  public Adapter createParamPositionAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType <em>Param Type</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType
-   * @generated
-   */
-  public Adapter createParamTypeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping <em>WSDL Message Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping
-   * @generated
-   */
-  public Adapter createWSDLMessageMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName <em>WSDL Message Part Name</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName
-   * @generated
-   */
-  public Adapter createWSDLMessagePartNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode <em>Parameter Mode</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.internal.webservice.jaxrpcmap.ParameterMode
-   * @generated
-   */
-  public Adapter createParameterModeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue <em>Method Return Value</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue
-   * @generated
-   */
-  public Adapter createMethodReturnValueAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.InterfaceMapping <em>Interface Mapping</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.InterfaceMapping
-   * @generated
-   */
-  public Adapter createInterfaceMappingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.jst.j2ee.internal.common.QName <em>QName</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.jst.j2ee.internal.common.QName
-   * @generated
-   */
-  public Adapter createQNameAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
-
-} //JaxrpcmapAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/util/JaxrpcmapSwitch.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/util/JaxrpcmapSwitch.java
deleted file mode 100644
index 291fbe5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/internal/jaxrpcmap/util/JaxrpcmapSwitch.java
+++ /dev/null
@@ -1,932 +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.webservice.internal.jaxrpcmap.util;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ClassType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaMethodName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaPortName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaVariableName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodReturnValue;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamPosition;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParamType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ParameterMode;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.QnameScope;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.XMLElementName;
-
-
-
-/**
- * <!-- 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.internal.webservice.jaxrpcmap.JaxrpcmapPackage
- * @generated
- */
-public class JaxrpcmapSwitch
-{
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static JaxrpcmapPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JaxrpcmapSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = JaxrpcmapPackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  public Object doSwitch(EObject theEObject)
-  {
-    EClass theEClass = theEObject.eClass();
-    if (theEClass.eContainer() == modelPackage)
-    {
-      switch (theEClass.getClassifierID())
-      {
-        case JaxrpcmapPackage.JAVA_WSDL_MAPPING:
-        {
-          JavaWSDLMapping javaWSDLMapping = (JavaWSDLMapping)theEObject;
-          Object result = caseJavaWSDLMapping(javaWSDLMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.PACKAGE_MAPPING:
-        {
-          PackageMapping packageMapping = (PackageMapping)theEObject;
-          Object result = casePackageMapping(packageMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING:
-        {
-          JavaXMLTypeMapping javaXMLTypeMapping = (JavaXMLTypeMapping)theEObject;
-          Object result = caseJavaXMLTypeMapping(javaXMLTypeMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.EXCEPTION_MAPPING:
-        {
-          ExceptionMapping exceptionMapping = (ExceptionMapping)theEObject;
-          Object result = caseExceptionMapping(exceptionMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING:
-        {
-          ServiceInterfaceMapping serviceInterfaceMapping = (ServiceInterfaceMapping)theEObject;
-          Object result = caseServiceInterfaceMapping(serviceInterfaceMapping);
-          if (result == null) result = caseInterfaceMapping(serviceInterfaceMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING:
-        {
-          ServiceEndpointInterfaceMapping serviceEndpointInterfaceMapping = (ServiceEndpointInterfaceMapping)theEObject;
-          Object result = caseServiceEndpointInterfaceMapping(serviceEndpointInterfaceMapping);
-          if (result == null) result = caseInterfaceMapping(serviceEndpointInterfaceMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.PACKAGE_TYPE:
-        {
-          PackageType packageType = (PackageType)theEObject;
-          Object result = casePackageType(packageType);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.CLASS_TYPE:
-        {
-          ClassType classType = (ClassType)theEObject;
-          Object result = caseClassType(classType);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.ROOT_TYPE_QNAME:
-        {
-          RootTypeQname rootTypeQname = (RootTypeQname)theEObject;
-          Object result = caseRootTypeQname(rootTypeQname);
-          if (result == null) result = caseQName(rootTypeQname);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.QNAME_SCOPE:
-        {
-          QnameScope qnameScope = (QnameScope)theEObject;
-          Object result = caseQnameScope(qnameScope);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.VARIABLE_MAPPING:
-        {
-          VariableMapping variableMapping = (VariableMapping)theEObject;
-          Object result = caseVariableMapping(variableMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.EXCEPTION_TYPE:
-        {
-          ExceptionType exceptionType = (ExceptionType)theEObject;
-          Object result = caseExceptionType(exceptionType);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_MESSAGE:
-        {
-          WSDLMessage wsdlMessage = (WSDLMessage)theEObject;
-          Object result = caseWSDLMessage(wsdlMessage);
-          if (result == null) result = caseQName(wsdlMessage);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER:
-        {
-          ConstructorParameterOrder constructorParameterOrder = (ConstructorParameterOrder)theEObject;
-          Object result = caseConstructorParameterOrder(constructorParameterOrder);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.JAVA_VARIABLE_NAME:
-        {
-          JavaVariableName javaVariableName = (JavaVariableName)theEObject;
-          Object result = caseJavaVariableName(javaVariableName);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.XML_ELEMENT_NAME:
-        {
-          XMLElementName xmlElementName = (XMLElementName)theEObject;
-          Object result = caseXMLElementName(xmlElementName);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.ELEMENT_NAME:
-        {
-          ElementName elementName = (ElementName)theEObject;
-          Object result = caseElementName(elementName);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_SERVICE_NAME:
-        {
-          WSDLServiceName wsdlServiceName = (WSDLServiceName)theEObject;
-          Object result = caseWSDLServiceName(wsdlServiceName);
-          if (result == null) result = caseQName(wsdlServiceName);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.PORT_MAPPING:
-        {
-          PortMapping portMapping = (PortMapping)theEObject;
-          Object result = casePortMapping(portMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.JAVA_PORT_NAME:
-        {
-          JavaPortName javaPortName = (JavaPortName)theEObject;
-          Object result = caseJavaPortName(javaPortName);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_PORT_TYPE:
-        {
-          WSDLPortType wsdlPortType = (WSDLPortType)theEObject;
-          Object result = caseWSDLPortType(wsdlPortType);
-          if (result == null) result = caseQName(wsdlPortType);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_BINDING:
-        {
-          WSDLBinding wsdlBinding = (WSDLBinding)theEObject;
-          Object result = caseWSDLBinding(wsdlBinding);
-          if (result == null) result = caseQName(wsdlBinding);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING:
-        {
-          ServiceEndpointMethodMapping serviceEndpointMethodMapping = (ServiceEndpointMethodMapping)theEObject;
-          Object result = caseServiceEndpointMethodMapping(serviceEndpointMethodMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.JAVA_METHOD_NAME:
-        {
-          JavaMethodName javaMethodName = (JavaMethodName)theEObject;
-          Object result = caseJavaMethodName(javaMethodName);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_OPERATION:
-        {
-          WSDLOperation wsdlOperation = (WSDLOperation)theEObject;
-          Object result = caseWSDLOperation(wsdlOperation);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING:
-        {
-          MethodParamPartsMapping methodParamPartsMapping = (MethodParamPartsMapping)theEObject;
-          Object result = caseMethodParamPartsMapping(methodParamPartsMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING:
-        {
-          WSDLReturnValueMapping wsdlReturnValueMapping = (WSDLReturnValueMapping)theEObject;
-          Object result = caseWSDLReturnValueMapping(wsdlReturnValueMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.PARAM_POSITION:
-        {
-          ParamPosition paramPosition = (ParamPosition)theEObject;
-          Object result = caseParamPosition(paramPosition);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.PARAM_TYPE:
-        {
-          ParamType paramType = (ParamType)theEObject;
-          Object result = caseParamType(paramType);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING:
-        {
-          WSDLMessageMapping wsdlMessageMapping = (WSDLMessageMapping)theEObject;
-          Object result = caseWSDLMessageMapping(wsdlMessageMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME:
-        {
-          WSDLMessagePartName wsdlMessagePartName = (WSDLMessagePartName)theEObject;
-          Object result = caseWSDLMessagePartName(wsdlMessagePartName);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.PARAMETER_MODE:
-        {
-          ParameterMode parameterMode = (ParameterMode)theEObject;
-          Object result = caseParameterMode(parameterMode);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.METHOD_RETURN_VALUE:
-        {
-          MethodReturnValue methodReturnValue = (MethodReturnValue)theEObject;
-          Object result = caseMethodReturnValue(methodReturnValue);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        case JaxrpcmapPackage.INTERFACE_MAPPING:
-        {
-          InterfaceMapping interfaceMapping = (InterfaceMapping)theEObject;
-          Object result = caseInterfaceMapping(interfaceMapping);
-          if (result == null) result = defaultCase(theEObject);
-          return result;
-        }
-        default: return defaultCase(theEObject);
-      }
-    }
-    return defaultCase(theEObject);
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Java WSDL Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Java WSDL Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseJavaWSDLMapping(JavaWSDLMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Package Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Package Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePackageMapping(PackageMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Java XML Type Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Java XML Type Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseJavaXMLTypeMapping(JavaXMLTypeMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Exception Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Exception Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseExceptionMapping(ExceptionMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Service Interface Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Service Interface Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseServiceInterfaceMapping(ServiceInterfaceMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Service Endpoint Interface Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Service Endpoint Interface Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseServiceEndpointInterfaceMapping(ServiceEndpointInterfaceMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Package 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>Package Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePackageType(PackageType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Class 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>Class Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseClassType(ClassType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Root Type Qname</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Root Type Qname</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseRootTypeQname(RootTypeQname object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Qname Scope</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Qname Scope</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseQnameScope(QnameScope object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Variable Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Variable Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseVariableMapping(VariableMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Exception 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>Exception Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseExceptionType(ExceptionType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Message</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Message</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLMessage(WSDLMessage object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Constructor Parameter Order</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Constructor Parameter Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseConstructorParameterOrder(ConstructorParameterOrder object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Java Variable Name</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Java Variable Name</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseJavaVariableName(JavaVariableName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>XML Element Name</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>XML Element Name</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseXMLElementName(XMLElementName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Element Name</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Element Name</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseElementName(ElementName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Service Name</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Service Name</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLServiceName(WSDLServiceName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Port Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Port Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object casePortMapping(PortMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Java Port Name</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Java Port Name</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseJavaPortName(JavaPortName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Port Type</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Port Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLPortType(WSDLPortType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Binding</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Binding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLBinding(WSDLBinding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Service Endpoint Method Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Service Endpoint Method Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseServiceEndpointMethodMapping(ServiceEndpointMethodMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Java Method Name</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Java Method Name</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseJavaMethodName(JavaMethodName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Operation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLOperation(WSDLOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Method Param Parts Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Method Param Parts Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseMethodParamPartsMapping(MethodParamPartsMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Return Value Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Return Value Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLReturnValueMapping(WSDLReturnValueMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Param Position</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Param Position</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseParamPosition(ParamPosition object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Param 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>Param Type</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseParamType(ParamType object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Message Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Message Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLMessageMapping(WSDLMessageMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>WSDL Message Part Name</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>WSDL Message Part Name</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLMessagePartName(WSDLMessagePartName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Parameter Mode</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>Parameter Mode</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseParameterMode(ParameterMode object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Method Return Value</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Method Return Value</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseMethodReturnValue(MethodReturnValue object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Interface Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Interface Mapping</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseInterfaceMapping(InterfaceMapping object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>QName</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>QName</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseQName(QName object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public Object defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //JaxrpcmapSwitch
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ClassType.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ClassType.java
deleted file mode 100644
index c2878fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ClassType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Class Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getClassType <em>Class Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getClassType()
- * @model 
- * @generated
- */
-public interface ClassType extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getClassType_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Class Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Class Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Class Type</em>' attribute.
-   * @see #setClassType(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getClassType_ClassType()
-   * @model 
-   * @generated
-   */
-  String getClassType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ClassType#getClassType <em>Class Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Class Type</em>' attribute.
-   * @see #getClassType()
-   * @generated
-   */
-  void setClassType(String value);
-
-} // ClassType
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ConstructorParameterOrder.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ConstructorParameterOrder.java
deleted file mode 100644
index da4a9d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ConstructorParameterOrder.java
+++ /dev/null
@@ -1,76 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constructor Parameter Order</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder#getElementNames <em>Element Names</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getConstructorParameterOrder()
- * @model 
- * @generated
- */
-public interface ConstructorParameterOrder extends EObject{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getConstructorParameterOrder_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ConstructorParameterOrder#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Element Names</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Element Names</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Element Names</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getConstructorParameterOrder_ElementNames()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName" containment="true" required="true"
-   * @generated
-   */
-  EList getElementNames();
-
-} // ConstructorParameterOrder
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ElementName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ElementName.java
deleted file mode 100644
index 86b846f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ElementName.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getElementName()
- * @model 
- * @generated
- */
-public interface ElementName extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getElementName_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Text</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Text</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Text</em>' attribute.
-   * @see #setText(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getElementName_Text()
-   * @model 
-   * @generated
-   */
-  String getText();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ElementName#getText <em>Text</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Text</em>' attribute.
-   * @see #getText()
-   * @generated
-   */
-  void setText(String value);
-
-} // ElementName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionMapping.java
deleted file mode 100644
index 4965b67..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionMapping.java
+++ /dev/null
@@ -1,166 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exception Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getExceptionType <em>Exception Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage <em>Wsdl Message</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder <em>Constructor Parameter Order</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping()
- * @model 
- * @generated
- */
-public interface ExceptionMapping extends EObject{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Exception Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exception Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Exception Type</em>' attribute.
-   * @see #setExceptionType(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_ExceptionType()
-   * @model 
-   * @generated
-   */
-  String getExceptionType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getExceptionType <em>Exception Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Exception Type</em>' attribute.
-   * @see #getExceptionType()
-   * @generated
-   */
-  void setExceptionType(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #setWsdlMessagePartName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_WsdlMessagePartName()
-   * @model 
-   * @generated
-   */
-  String getWsdlMessagePartName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #getWsdlMessagePartName()
-   * @generated
-   */
-  void setWsdlMessagePartName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message</em>' containment reference.
-   * @see #setWsdlMessage(WSDLMessage)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_WsdlMessage()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  WSDLMessage getWsdlMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getWsdlMessage <em>Wsdl Message</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message</em>' containment reference.
-   * @see #getWsdlMessage()
-   * @generated
-   */
-  void setWsdlMessage(WSDLMessage value);
-
-  /**
-   * Returns the value of the '<em><b>Constructor Parameter Order</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Constructor Parameter Order</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Constructor Parameter Order</em>' containment reference.
-   * @see #setConstructorParameterOrder(ConstructorParameterOrder)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionMapping_ConstructorParameterOrder()
-   * @model containment="true"
-   * @generated
-   */
-  ConstructorParameterOrder getConstructorParameterOrder();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping#getConstructorParameterOrder <em>Constructor Parameter Order</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Constructor Parameter Order</em>' containment reference.
-   * @see #getConstructorParameterOrder()
-   * @generated
-   */
-  void setConstructorParameterOrder(ConstructorParameterOrder value);
-
-} // ExceptionMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionType.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionType.java
deleted file mode 100644
index 6fb2fc0..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ExceptionType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exception Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionType()
- * @model 
- * @generated
- */
-public interface ExceptionType extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionType_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>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.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getExceptionType_Name()
-   * @model 
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionType#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);
-
-} // ExceptionType
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/InterfaceMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/InterfaceMapping.java
deleted file mode 100644
index d53bacf..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/InterfaceMapping.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getInterfaceMapping()
- * @model 
- * @generated
- */
-public interface InterfaceMapping extends EObject {
- // InterfaceMapping
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaMethodName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaMethodName.java
deleted file mode 100644
index 3a290bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaMethodName.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Method Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getJavaMethodName <em>Java Method Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaMethodName()
- * @model 
- * @generated
- */
-public interface JavaMethodName extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaMethodName_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Java Method Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Method Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Method Name</em>' attribute.
-   * @see #setJavaMethodName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaMethodName_JavaMethodName()
-   * @model 
-   * @generated
-   */
-  String getJavaMethodName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaMethodName#getJavaMethodName <em>Java Method Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Java Method Name</em>' attribute.
-   * @see #getJavaMethodName()
-   * @generated
-   */
-  void setJavaMethodName(String value);
-
-} // JavaMethodName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaPortName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaPortName.java
deleted file mode 100644
index 1279b6a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaPortName.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Port Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getJavaPortName <em>Java Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaPortName()
- * @model 
- * @generated
- */
-public interface JavaPortName extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaPortName_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Java Port Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Port Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Port Name</em>' attribute.
-   * @see #setJavaPortName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaPortName_JavaPortName()
-   * @model 
-   * @generated
-   */
-  String getJavaPortName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaPortName#getJavaPortName <em>Java Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Java Port Name</em>' attribute.
-   * @see #getJavaPortName()
-   * @generated
-   */
-  void setJavaPortName(String value);
-
-} // JavaPortName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaVariableName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaVariableName.java
deleted file mode 100644
index 20598ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaVariableName.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Variable Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getJavaVariableName <em>Java Variable Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaVariableName()
- * @model 
- * @generated
- */
-public interface JavaVariableName extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaVariableName_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Java Variable Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Variable Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Variable Name</em>' attribute.
-   * @see #setJavaVariableName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaVariableName_JavaVariableName()
-   * @model 
-   * @generated
-   */
-  String getJavaVariableName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaVariableName#getJavaVariableName <em>Java Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Java Variable Name</em>' attribute.
-   * @see #getJavaVariableName()
-   * @generated
-   */
-  void setJavaVariableName(String value);
-
-} // JavaVariableName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaWSDLMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaWSDLMapping.java
deleted file mode 100644
index 27ea2b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaWSDLMapping.java
+++ /dev/null
@@ -1,127 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java WSDL Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getPackageMappings <em>Package Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getJavaXMLTypeMappings <em>Java XML Type Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getExceptionMappings <em>Exception Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getInterfaceMappings <em>Interface Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping()
- * @model 
- * @generated
- */
-public interface JavaWSDLMapping extends EObject{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaWSDLMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Package Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Package Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Package Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_PackageMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping" containment="true" required="true"
-   * @generated
-   */
-  EList getPackageMappings();
-
-  /**
-   * Returns the value of the '<em><b>Java XML Type Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java XML Type Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java XML Type Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_JavaXMLTypeMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping" containment="true"
-   * @generated
-   */
-  EList getJavaXMLTypeMappings();
-
-  /**
-   * Returns the value of the '<em><b>Exception Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exception Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Exception Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_ExceptionMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ExceptionMapping" containment="true"
-   * @generated
-   */
-  EList getExceptionMappings();
-
-  /**
-   * Returns the value of the '<em><b>Interface Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.InterfaceMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Interface Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Interface Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaWSDLMapping_InterfaceMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.InterfaceMapping" containment="true"
-   * @generated
-   */
-  EList getInterfaceMappings();
-
-} // JavaWSDLMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaXMLTypeMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaXMLTypeMapping.java
deleted file mode 100644
index 946a712..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JavaXMLTypeMapping.java
+++ /dev/null
@@ -1,184 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java XML Type Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType <em>Class Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope <em>Qname Scope</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname <em>Anonymous Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname <em>Root Type Qname</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getVariableMappings <em>Variable Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping()
- * @model 
- * @generated
- */
-public interface JavaXMLTypeMapping extends EObject{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Class Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Class Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Class Type</em>' attribute.
-   * @see #setClassType(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_ClassType()
-   * @model 
-   * @generated
-   */
-  String getClassType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getClassType <em>Class Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Class Type</em>' attribute.
-   * @see #getClassType()
-   * @generated
-   */
-  void setClassType(String value);
-
-  /**
-   * Returns the value of the '<em><b>Qname Scope</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Qname Scope</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Qname Scope</em>' attribute.
-   * @see #setQnameScope(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_QnameScope()
-   * @model 
-   * @generated
-   */
-  String getQnameScope();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getQnameScope <em>Qname Scope</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Qname Scope</em>' attribute.
-   * @see #getQnameScope()
-   * @generated
-   */
-  void setQnameScope(String value);
-
-  /**
-   * Returns the value of the '<em><b>Anonymous Type Qname</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Anonymous Type Qname</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Anonymous Type Qname</em>' attribute.
-   * @see #setAnonymousTypeQname(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_AnonymousTypeQname()
-   * @model 
-   * @generated
-   */
-  String getAnonymousTypeQname();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getAnonymousTypeQname <em>Anonymous Type Qname</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Anonymous Type Qname</em>' attribute.
-   * @see #getAnonymousTypeQname()
-   * @generated
-   */
-  void setAnonymousTypeQname(String value);
-
-  /**
-   * Returns the value of the '<em><b>Root Type Qname</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Root Type Qname</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Root Type Qname</em>' containment reference.
-   * @see #setRootTypeQname(RootTypeQname)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_RootTypeQname()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  RootTypeQname getRootTypeQname();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JavaXMLTypeMapping#getRootTypeQname <em>Root Type Qname</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Root Type Qname</em>' containment reference.
-   * @see #getRootTypeQname()
-   * @generated
-   */
-  void setRootTypeQname(RootTypeQname value);
-
-  /**
-   * Returns the value of the '<em><b>Variable Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Variable Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Variable Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getJavaXMLTypeMapping_VariableMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping" containment="true"
-   * @generated
-   */
-  EList getVariableMappings();
-
-} // JavaXMLTypeMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapFactory.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapFactory.java
deleted file mode 100644
index c104b02..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapFactory.java
+++ /dev/null
@@ -1,348 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.JaxrpcmapPackage;
-
-/**
- * <!-- 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.internal.webservice.jaxrpcmap.JaxrpcmapPackage
- * @generated
- */
-public interface JaxrpcmapFactory extends EFactory{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  JaxrpcmapFactory eINSTANCE = new org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.impl.JaxrpcmapFactoryImpl();
-
-  /**
-   * Returns a new object of class '<em>Java WSDL Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Java WSDL Mapping</em>'.
-   * @generated
-   */
-  JavaWSDLMapping createJavaWSDLMapping();
-
-  /**
-   * Returns a new object of class '<em>Package Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Package Mapping</em>'.
-   * @generated
-   */
-  PackageMapping createPackageMapping();
-
-  /**
-   * Returns a new object of class '<em>Java XML Type Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Java XML Type Mapping</em>'.
-   * @generated
-   */
-  JavaXMLTypeMapping createJavaXMLTypeMapping();
-
-  /**
-   * Returns a new object of class '<em>Exception Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Exception Mapping</em>'.
-   * @generated
-   */
-  ExceptionMapping createExceptionMapping();
-
-  /**
-   * Returns a new object of class '<em>Service Interface Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Service Interface Mapping</em>'.
-   * @generated
-   */
-  ServiceInterfaceMapping createServiceInterfaceMapping();
-
-  /**
-   * Returns a new object of class '<em>Service Endpoint Interface Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Service Endpoint Interface Mapping</em>'.
-   * @generated
-   */
-  ServiceEndpointInterfaceMapping createServiceEndpointInterfaceMapping();
-
-  /**
-   * Returns a new object of class '<em>Package Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Package Type</em>'.
-   * @generated
-   */
-  PackageType createPackageType();
-
-  /**
-   * Returns a new object of class '<em>Class Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Class Type</em>'.
-   * @generated
-   */
-  ClassType createClassType();
-
-  /**
-   * Returns a new object of class '<em>Root Type Qname</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Root Type Qname</em>'.
-   * @generated
-   */
-  RootTypeQname createRootTypeQname();
-
-  /**
-   * Returns a new object of class '<em>Qname Scope</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Qname Scope</em>'.
-   * @generated
-   */
-  QnameScope createQnameScope();
-
-  /**
-   * Returns a new object of class '<em>Variable Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Variable Mapping</em>'.
-   * @generated
-   */
-  VariableMapping createVariableMapping();
-
-  /**
-   * Returns a new object of class '<em>Exception Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Exception Type</em>'.
-   * @generated
-   */
-  ExceptionType createExceptionType();
-
-  /**
-   * Returns a new object of class '<em>WSDL Message</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Message</em>'.
-   * @generated
-   */
-  WSDLMessage createWSDLMessage();
-
-  /**
-   * Returns a new object of class '<em>Constructor Parameter Order</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Constructor Parameter Order</em>'.
-   * @generated
-   */
-  ConstructorParameterOrder createConstructorParameterOrder();
-
-  /**
-   * Returns a new object of class '<em>Java Variable Name</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Java Variable Name</em>'.
-   * @generated
-   */
-  JavaVariableName createJavaVariableName();
-
-  /**
-   * Returns a new object of class '<em>XML Element Name</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>XML Element Name</em>'.
-   * @generated
-   */
-  XMLElementName createXMLElementName();
-
-  /**
-   * Returns a new object of class '<em>Element Name</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Element Name</em>'.
-   * @generated
-   */
-  ElementName createElementName();
-
-  /**
-   * Returns a new object of class '<em>WSDL Service Name</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Service Name</em>'.
-   * @generated
-   */
-  WSDLServiceName createWSDLServiceName();
-
-  /**
-   * Returns a new object of class '<em>Port Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Port Mapping</em>'.
-   * @generated
-   */
-  PortMapping createPortMapping();
-
-  /**
-   * Returns a new object of class '<em>Java Port Name</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Java Port Name</em>'.
-   * @generated
-   */
-  JavaPortName createJavaPortName();
-
-  /**
-   * Returns a new object of class '<em>WSDL Port Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Port Type</em>'.
-   * @generated
-   */
-  WSDLPortType createWSDLPortType();
-
-  /**
-   * Returns a new object of class '<em>WSDL Binding</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Binding</em>'.
-   * @generated
-   */
-  WSDLBinding createWSDLBinding();
-
-  /**
-   * Returns a new object of class '<em>Service Endpoint Method Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Service Endpoint Method Mapping</em>'.
-   * @generated
-   */
-  ServiceEndpointMethodMapping createServiceEndpointMethodMapping();
-
-  /**
-   * Returns a new object of class '<em>Java Method Name</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Java Method Name</em>'.
-   * @generated
-   */
-  JavaMethodName createJavaMethodName();
-
-  /**
-   * Returns a new object of class '<em>WSDL Operation</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Operation</em>'.
-   * @generated
-   */
-  WSDLOperation createWSDLOperation();
-
-  /**
-   * Returns a new object of class '<em>Method Param Parts Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Method Param Parts Mapping</em>'.
-   * @generated
-   */
-  MethodParamPartsMapping createMethodParamPartsMapping();
-
-  /**
-   * Returns a new object of class '<em>WSDL Return Value Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Return Value Mapping</em>'.
-   * @generated
-   */
-  WSDLReturnValueMapping createWSDLReturnValueMapping();
-
-  /**
-   * Returns a new object of class '<em>Param Position</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Param Position</em>'.
-   * @generated
-   */
-  ParamPosition createParamPosition();
-
-  /**
-   * Returns a new object of class '<em>Param Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Param Type</em>'.
-   * @generated
-   */
-  ParamType createParamType();
-
-  /**
-   * Returns a new object of class '<em>WSDL Message Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Message Mapping</em>'.
-   * @generated
-   */
-  WSDLMessageMapping createWSDLMessageMapping();
-
-  /**
-   * Returns a new object of class '<em>WSDL Message Part Name</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>WSDL Message Part Name</em>'.
-   * @generated
-   */
-  WSDLMessagePartName createWSDLMessagePartName();
-
-  /**
-   * Returns a new object of class '<em>Parameter Mode</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Parameter Mode</em>'.
-   * @generated
-   */
-  ParameterMode createParameterMode();
-
-  /**
-   * Returns a new object of class '<em>Method Return Value</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Method Return Value</em>'.
-   * @generated
-   */
-  MethodReturnValue createMethodReturnValue();
-
-  /**
-   * Returns a new object of class '<em>Interface Mapping</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Interface Mapping</em>'.
-   * @generated
-   */
-  InterfaceMapping createInterfaceMapping();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  JaxrpcmapPackage getJaxrpcmapPackage();
-
-} //JaxrpcmapFactory
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResource.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResource.java
deleted file mode 100644
index 4b55750..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResource.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-
-public interface JaxrpcmapResource extends XMLResource
-{
-  public static final int JAXRPC_MAP_TYPE = 8;
-
-  JavaWSDLMapping getJavaWSDLMapping();
-  public boolean isJaxrpcmap1_0();
-  public boolean isJaxrpcmap1_1();
-  
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResourceFactory.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResourceFactory.java
deleted file mode 100644
index 85bdced..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/JaxrpcmapResourceFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.internal.jaxrpcmap.impl.JaxrpcmapResourceImpl;
-import org.eclipse.wst.common.internal.emf.resource.Renderer;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceFactory;
-
-
-public class JaxrpcmapResourceFactory extends TranslatorResourceFactory
-{
-  /**
-  * JaxrpcmapResourceFactory constructor comment.
-  */
-  public JaxrpcmapResourceFactory(RendererFactory aRendererFactory) 
-  {
-	  super(aRendererFactory);
-  }
-
-	/* (non-Javadoc)
-	 * @see com.ibm.etools.emf2xml.impl.TranslatorResourceFactory#createResource(org.eclipse.emf.common.util.URI, com.ibm.etools.emf2xml.Renderer)
-	 */
-	protected TranslatorResource createResource(URI uri, Renderer aRenderer) {
-		return new JaxrpcmapResourceImpl(uri, aRenderer);
-	}
-
-  /**
-   * Register myself with the Resource.Factory.Registry
-   */
-  public static void registerWith(RendererFactory aRendererFactory) {
-    //Do nothing since the jaxrpc mapping file has no standard name.
-  	//J2EEResourceFactoryRegistry.INSTANCE.registerLastFileSegment(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME, new WsddResourceFactory(aRendererFactory));
-  }
-	
-	/**
-	 * register using the default renderer factory.
-	 * @see #registerWith(RendererFactory)
-	 */
-	public static void register() {
-	    //Do nothing since the jaxrpc mapping file has no standard name.
-		//registerWith(EMF2DOMRendererFactory.INSTANCE);
-	}
-
-  /**
-   * Method registerDtds.
-  */
-  public static void registerDtds() 
-  {
-  	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.JAXRPCMAP_SYSTEMID, "j2ee_jaxrpc_mapping_1_0.dtd");//$NON-NLS-1$
-	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.JAXRPCMAP_SCHEMA_LOC, "j2ee_jaxrpc_mapping_1_1.xsd"); //$NON-NLS-1$  	
-	J2EEXmlDtDEntityResolver.registerDtD(WebServiceConstants.JAXRPCMAP_SCHEMA_LOC_SUN, "j2ee_jaxrpc_mapping_1_1.xsd"); //$NON-NLS-1$  			
-  }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodParamPartsMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodParamPartsMapping.java
deleted file mode 100644
index 520b36d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodParamPartsMapping.java
+++ /dev/null
@@ -1,139 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Param Parts Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition <em>Param Position</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType <em>Param Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping()
- * @model 
- * @generated
- */
-public interface MethodParamPartsMapping extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Param Position</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Position</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Param Position</em>' attribute.
-   * @see #setParamPosition(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_ParamPosition()
-   * @model 
-   * @generated
-   */
-  String getParamPosition();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamPosition <em>Param Position</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Param Position</em>' attribute.
-   * @see #getParamPosition()
-   * @generated
-   */
-  void setParamPosition(String value);
-
-  /**
-   * Returns the value of the '<em><b>Param Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Param Type</em>' attribute.
-   * @see #setParamType(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_ParamType()
-   * @model 
-   * @generated
-   */
-  String getParamType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getParamType <em>Param Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Param Type</em>' attribute.
-   * @see #getParamType()
-   * @generated
-   */
-  void setParamType(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message Mapping</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Mapping</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message Mapping</em>' containment reference.
-   * @see #setWsdlMessageMapping(WSDLMessageMapping)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodParamPartsMapping_WsdlMessageMapping()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  WSDLMessageMapping getWsdlMessageMapping();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping#getWsdlMessageMapping <em>Wsdl Message Mapping</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message Mapping</em>' containment reference.
-   * @see #getWsdlMessageMapping()
-   * @generated
-   */
-  void setWsdlMessageMapping(WSDLMessageMapping value);
-
-} // MethodParamPartsMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodReturnValue.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodReturnValue.java
deleted file mode 100644
index 4ec1771..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/MethodReturnValue.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Return Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getMethodReturnValue <em>Method Return Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodReturnValue()
- * @model 
- * @generated
- */
-public interface MethodReturnValue extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodReturnValue_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Method Return Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Method Return Value</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Method Return Value</em>' attribute.
-   * @see #setMethodReturnValue(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getMethodReturnValue_MethodReturnValue()
-   * @model 
-   * @generated
-   */
-  String getMethodReturnValue();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodReturnValue#getMethodReturnValue <em>Method Return Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Method Return Value</em>' attribute.
-   * @see #getMethodReturnValue()
-   * @generated
-   */
-  void setMethodReturnValue(String value);
-
-} // MethodReturnValue
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageMapping.java
deleted file mode 100644
index 0103766..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageMapping.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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Package Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getPackageType <em>Package Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getNamespaceURI <em>Namespace URI</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping()
- * @model 
- * @generated
- */
-public interface PackageMapping extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Package Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Package Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Package Type</em>' attribute.
-   * @see #setPackageType(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping_PackageType()
-   * @model 
-   * @generated
-   */
-  String getPackageType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getPackageType <em>Package Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Package Type</em>' attribute.
-   * @see #getPackageType()
-   * @generated
-   */
-  void setPackageType(String value);
-
-  /**
-   * Returns the value of the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Namespace URI</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Namespace URI</em>' attribute.
-   * @see #setNamespaceURI(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageMapping_NamespaceURI()
-   * @model 
-   * @generated
-   */
-  String getNamespaceURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageMapping#getNamespaceURI <em>Namespace URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Namespace URI</em>' attribute.
-   * @see #getNamespaceURI()
-   * @generated
-   */
-  void setNamespaceURI(String value);
-
-} // PackageMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageType.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageType.java
deleted file mode 100644
index 1e4261f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PackageType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Package Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getPackageType <em>Package Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageType()
- * @model 
- * @generated
- */
-public interface PackageType extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageType_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Package Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Package Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Package Type</em>' attribute.
-   * @see #setPackageType(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPackageType_PackageType()
-   * @model 
-   * @generated
-   */
-  String getPackageType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PackageType#getPackageType <em>Package Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Package Type</em>' attribute.
-   * @see #getPackageType()
-   * @generated
-   */
-  void setPackageType(String value);
-
-} // PackageType
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParamPosition.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParamPosition.java
deleted file mode 100644
index 1be3562..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParamPosition.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Param Position</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getParamPosition <em>Param Position</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParamPosition()
- * @model 
- * @generated
- */
-public interface ParamPosition extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParamPosition_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Param Position</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Position</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Param Position</em>' attribute.
-   * @see #setParamPosition(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParamPosition_ParamPosition()
-   * @model 
-   * @generated
-   */
-  String getParamPosition();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamPosition#getParamPosition <em>Param Position</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Param Position</em>' attribute.
-   * @see #getParamPosition()
-   * @generated
-   */
-  void setParamPosition(String value);
-
-} // ParamPosition
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParamType.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParamType.java
deleted file mode 100644
index b5c84b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParamType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Param Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getParamType <em>Param Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParamType()
- * @model 
- * @generated
- */
-public interface ParamType extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParamType_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Param Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Param Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Param Type</em>' attribute.
-   * @see #setParamType(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParamType_ParamType()
-   * @model 
-   * @generated
-   */
-  String getParamType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParamType#getParamType <em>Param Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Param Type</em>' attribute.
-   * @see #getParamType()
-   * @generated
-   */
-  void setParamType(String value);
-
-} // ParamType
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParameterMode.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParameterMode.java
deleted file mode 100644
index abe1d2a..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ParameterMode.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter Mode</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getParameterMode <em>Parameter Mode</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParameterMode()
- * @model 
- * @generated
- */
-public interface ParameterMode extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParameterMode_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Parameter Mode</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Parameter Mode</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Parameter Mode</em>' attribute.
-   * @see #setParameterMode(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getParameterMode_ParameterMode()
-   * @model 
-   * @generated
-   */
-  String getParameterMode();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ParameterMode#getParameterMode <em>Parameter Mode</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parameter Mode</em>' attribute.
-   * @see #getParameterMode()
-   * @generated
-   */
-  void setParameterMode(String value);
-
-} // ParameterMode
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PortMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PortMapping.java
deleted file mode 100644
index 13d3833..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/PortMapping.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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Port Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getPortName <em>Port Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getJavaPortName <em>Java Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping()
- * @model 
- * @generated
- */
-public interface PortMapping extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Port Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Port Name</em>' attribute.
-   * @see #setPortName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping_PortName()
-   * @model 
-   * @generated
-   */
-  String getPortName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getPortName <em>Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Port Name</em>' attribute.
-   * @see #getPortName()
-   * @generated
-   */
-  void setPortName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Java Port Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Port Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Port Name</em>' attribute.
-   * @see #setJavaPortName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getPortMapping_JavaPortName()
-   * @model 
-   * @generated
-   */
-  String getJavaPortName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping#getJavaPortName <em>Java Port Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Java Port Name</em>' attribute.
-   * @see #getJavaPortName()
-   * @generated
-   */
-  void setJavaPortName(String value);
-
-} // PortMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/QnameScope.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/QnameScope.java
deleted file mode 100644
index 5699f72..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/QnameScope.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Qname Scope</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getQnameScope <em>Qname Scope</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getQnameScope()
- * @model 
- * @generated
- */
-public interface QnameScope extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getQnameScope_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Qname Scope</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Qname Scope</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Qname Scope</em>' attribute.
-   * @see #setQnameScope(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getQnameScope_QnameScope()
-   * @model 
-   * @generated
-   */
-  String getQnameScope();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.QnameScope#getQnameScope <em>Qname Scope</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Qname Scope</em>' attribute.
-   * @see #getQnameScope()
-   * @generated
-   */
-  void setQnameScope(String value);
-
-} // QnameScope
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/RootTypeQname.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/RootTypeQname.java
deleted file mode 100644
index c3fc087..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/RootTypeQname.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Root Type Qname</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getRootTypeQname()
- * @model 
- * @generated
- */
-public interface RootTypeQname extends QName {
-// RootTypeQname
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointInterfaceMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointInterfaceMapping.java
deleted file mode 100644
index 5ac3a6f..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointInterfaceMapping.java
+++ /dev/null
@@ -1,156 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Endpoint Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface <em>Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType <em>Wsdl Port Type</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding <em>Wsdl Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointMethodMappings <em>Service Endpoint Method Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping()
- * @model 
- * @generated
- */
-public interface ServiceEndpointInterfaceMapping extends InterfaceMapping{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Service Endpoint Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Endpoint Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Service Endpoint Interface</em>' attribute.
-   * @see #setServiceEndpointInterface(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_ServiceEndpointInterface()
-   * @model 
-   * @generated
-   */
-  String getServiceEndpointInterface();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getServiceEndpointInterface <em>Service Endpoint Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Service Endpoint Interface</em>' attribute.
-   * @see #getServiceEndpointInterface()
-   * @generated
-   */
-  void setServiceEndpointInterface(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Port Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Port Type</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Port Type</em>' containment reference.
-   * @see #setWsdlPortType(WSDLPortType)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_WsdlPortType()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  WSDLPortType getWsdlPortType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlPortType <em>Wsdl Port Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Port Type</em>' containment reference.
-   * @see #getWsdlPortType()
-   * @generated
-   */
-  void setWsdlPortType(WSDLPortType value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Binding</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Binding</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Binding</em>' containment reference.
-   * @see #setWsdlBinding(WSDLBinding)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_WsdlBinding()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  WSDLBinding getWsdlBinding();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping#getWsdlBinding <em>Wsdl Binding</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Binding</em>' containment reference.
-   * @see #getWsdlBinding()
-   * @generated
-   */
-  void setWsdlBinding(WSDLBinding value);
-
-  /**
-   * Returns the value of the '<em><b>Service Endpoint Method Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Endpoint Method Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Service Endpoint Method Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping" containment="true"
-   * @generated
-   */
-  EList getServiceEndpointMethodMappings();
-
-} // ServiceEndpointInterfaceMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointMethodMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointMethodMapping.java
deleted file mode 100644
index 41368a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceEndpointMethodMapping.java
+++ /dev/null
@@ -1,211 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Endpoint Method Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName <em>Java Method Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation <em>Wsdl Operation</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getMethodParamPartsMappings <em>Method Param Parts Mappings</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping()
- * @model 
- * @generated
- */
-public interface ServiceEndpointMethodMapping extends EObject{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Java Method Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Method Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Method Name</em>' attribute.
-   * @see #setJavaMethodName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_JavaMethodName()
-   * @model 
-   * @generated
-   */
-  String getJavaMethodName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getJavaMethodName <em>Java Method Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Java Method Name</em>' attribute.
-   * @see #getJavaMethodName()
-   * @generated
-   */
-  void setJavaMethodName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Operation</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Operation</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Operation</em>' attribute.
-   * @see #setWsdlOperation(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_WsdlOperation()
-   * @model 
-   * @generated
-   */
-  String getWsdlOperation();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlOperation <em>Wsdl Operation</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Operation</em>' attribute.
-   * @see #getWsdlOperation()
-   * @generated
-   */
-  void setWsdlOperation(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wrapped Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wrapped Element</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wrapped Element</em>' attribute.
-   * @see #isSetWrappedElement()
-   * @see #unsetWrappedElement()
-   * @see #setWrappedElement(boolean)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_WrappedElement()
-   * @model unsettable="true"
-   * @generated
-   */
-  boolean isWrappedElement();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wrapped Element</em>' attribute.
-   * @see #isSetWrappedElement()
-   * @see #unsetWrappedElement()
-   * @see #isWrappedElement()
-   * @generated
-   */
-  void setWrappedElement(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetWrappedElement()
-   * @see #isWrappedElement()
-   * @see #setWrappedElement(boolean)
-   * @generated
-   */
-  void unsetWrappedElement();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#isWrappedElement <em>Wrapped Element</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Wrapped Element</em>' attribute is set.
-   * @see #unsetWrappedElement()
-   * @see #isWrappedElement()
-   * @see #setWrappedElement(boolean)
-   * @generated
-   */
-  boolean isSetWrappedElement();
-
-  /**
-   * Returns the value of the '<em><b>Method Param Parts Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Method Param Parts Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Method Param Parts Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_MethodParamPartsMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.MethodParamPartsMapping" containment="true"
-   * @generated
-   */
-  EList getMethodParamPartsMappings();
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Return Value Mapping</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Return Value Mapping</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Return Value Mapping</em>' containment reference.
-   * @see #setWsdlReturnValueMapping(WSDLReturnValueMapping)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceEndpointMethodMapping_WsdlReturnValueMapping()
-   * @model containment="true"
-   * @generated
-   */
-  WSDLReturnValueMapping getWsdlReturnValueMapping();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping#getWsdlReturnValueMapping <em>Wsdl Return Value Mapping</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Return Value Mapping</em>' containment reference.
-   * @see #getWsdlReturnValueMapping()
-   * @generated
-   */
-  void setWsdlReturnValueMapping(WSDLReturnValueMapping value);
-
-} // ServiceEndpointMethodMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceInterfaceMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceInterfaceMapping.java
deleted file mode 100644
index 88d5d42..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/ServiceInterfaceMapping.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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service Interface Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface <em>Service Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName <em>Wsdl Service Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getPortMappings <em>Port Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping()
- * @model 
- * @generated
- */
-public interface ServiceInterfaceMapping extends InterfaceMapping{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Service Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Service Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Service Interface</em>' attribute.
-   * @see #setServiceInterface(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_ServiceInterface()
-   * @model 
-   * @generated
-   */
-  String getServiceInterface();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getServiceInterface <em>Service Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Service Interface</em>' attribute.
-   * @see #getServiceInterface()
-   * @generated
-   */
-  void setServiceInterface(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Service Name</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Service Name</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Service Name</em>' containment reference.
-   * @see #setWsdlServiceName(WSDLServiceName)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_WsdlServiceName()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  WSDLServiceName getWsdlServiceName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.ServiceInterfaceMapping#getWsdlServiceName <em>Wsdl Service Name</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Service Name</em>' containment reference.
-   * @see #getWsdlServiceName()
-   * @generated
-   */
-  void setWsdlServiceName(WSDLServiceName value);
-
-  /**
-   * Returns the value of the '<em><b>Port Mappings</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Port Mappings</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Port Mappings</em>' containment reference list.
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getServiceInterfaceMapping_PortMappings()
-   * @model type="org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.PortMapping" containment="true"
-   * @generated
-   */
-  EList getPortMappings();
-
-} // ServiceInterfaceMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/VariableMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/VariableMapping.java
deleted file mode 100644
index 2b58401..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/VariableMapping.java
+++ /dev/null
@@ -1,247 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variable Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getJavaVariableName <em>Java Variable Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlElementName <em>Xml Element Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName <em>Xml Attribute Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping()
- * @model 
- * @generated
- */
-public interface VariableMapping extends EObject{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Java Variable Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Variable Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Variable Name</em>' attribute.
-   * @see #setJavaVariableName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_JavaVariableName()
-   * @model 
-   * @generated
-   */
-  String getJavaVariableName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getJavaVariableName <em>Java Variable Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Java Variable Name</em>' attribute.
-   * @see #getJavaVariableName()
-   * @generated
-   */
-  void setJavaVariableName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Xml Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Element Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xml Element Name</em>' attribute.
-   * @see #setXmlElementName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_XmlElementName()
-   * @model 
-   * @generated
-   */
-  String getXmlElementName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlElementName <em>Xml Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Xml Element Name</em>' attribute.
-   * @see #getXmlElementName()
-   * @generated
-   */
-  void setXmlElementName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Data Member</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Data Member</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Data Member</em>' attribute.
-   * @see #isSetDataMember()
-   * @see #unsetDataMember()
-   * @see #setDataMember(boolean)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_DataMember()
-   * @model unsettable="true"
-   * @generated
-   */
-  boolean isDataMember();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Data Member</em>' attribute.
-   * @see #isSetDataMember()
-   * @see #unsetDataMember()
-   * @see #isDataMember()
-   * @generated
-   */
-  void setDataMember(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetDataMember()
-   * @see #isDataMember()
-   * @see #setDataMember(boolean)
-   * @generated
-   */
-  void unsetDataMember();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isDataMember <em>Data Member</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Data Member</em>' attribute is set.
-   * @see #unsetDataMember()
-   * @see #isDataMember()
-   * @see #setDataMember(boolean)
-   * @generated
-   */
-  boolean isSetDataMember();
-
-  /**
-   * Returns the value of the '<em><b>Xml Attribute Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Attribute Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xml Attribute Name</em>' attribute.
-   * @see #setXmlAttributeName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_XmlAttributeName()
-   * @model 
-   * @generated
-   */
-  String getXmlAttributeName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#getXmlAttributeName <em>Xml Attribute Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Xml Attribute Name</em>' attribute.
-   * @see #getXmlAttributeName()
-   * @generated
-   */
-  void setXmlAttributeName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Xml Wildcard</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Wildcard</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xml Wildcard</em>' attribute.
-   * @see #isSetXmlWildcard()
-   * @see #unsetXmlWildcard()
-   * @see #setXmlWildcard(boolean)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getVariableMapping_XmlWildcard()
-   * @model unsettable="true"
-   * @generated
-   */
-  boolean isXmlWildcard();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Xml Wildcard</em>' attribute.
-   * @see #isSetXmlWildcard()
-   * @see #unsetXmlWildcard()
-   * @see #isXmlWildcard()
-   * @generated
-   */
-  void setXmlWildcard(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetXmlWildcard()
-   * @see #isXmlWildcard()
-   * @see #setXmlWildcard(boolean)
-   * @generated
-   */
-  void unsetXmlWildcard();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.VariableMapping#isXmlWildcard <em>Xml Wildcard</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Xml Wildcard</em>' attribute is set.
-   * @see #unsetXmlWildcard()
-   * @see #isXmlWildcard()
-   * @see #setXmlWildcard(boolean)
-   * @generated
-   */
-  boolean isSetXmlWildcard();
-
-} // VariableMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLBinding.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLBinding.java
deleted file mode 100644
index 32cceb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLBinding.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Binding</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLBinding()
- * @model 
- * @generated
- */
-public interface WSDLBinding extends QName {
-// WSDLBinding
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessage.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessage.java
deleted file mode 100644
index 63bebe5..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Message</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessage()
- * @model 
- * @generated
- */
-public interface WSDLMessage extends QName {
-// WSDLMessage
-}
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessageMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessageMapping.java
deleted file mode 100644
index 25eea20..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessageMapping.java
+++ /dev/null
@@ -1,193 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Message Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode <em>Parameter Mode</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping()
- * @model 
- * @generated
- */
-public interface WSDLMessageMapping extends EObject{
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #setWsdlMessagePartName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_WsdlMessagePartName()
-   * @model 
-   * @generated
-   */
-  String getWsdlMessagePartName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #getWsdlMessagePartName()
-   * @generated
-   */
-  void setWsdlMessagePartName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Parameter Mode</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Parameter Mode</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Parameter Mode</em>' attribute.
-   * @see #setParameterMode(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_ParameterMode()
-   * @model 
-   * @generated
-   */
-  String getParameterMode();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getParameterMode <em>Parameter Mode</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parameter Mode</em>' attribute.
-   * @see #getParameterMode()
-   * @generated
-   */
-  void setParameterMode(String value);
-
-  /**
-   * Returns the value of the '<em><b>Soap Header</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Header</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Soap Header</em>' attribute.
-   * @see #isSetSoapHeader()
-   * @see #unsetSoapHeader()
-   * @see #setSoapHeader(boolean)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_SoapHeader()
-   * @model unsettable="true"
-   * @generated
-   */
-  boolean isSoapHeader();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Soap Header</em>' attribute.
-   * @see #isSetSoapHeader()
-   * @see #unsetSoapHeader()
-   * @see #isSoapHeader()
-   * @generated
-   */
-  void setSoapHeader(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetSoapHeader()
-   * @see #isSoapHeader()
-   * @see #setSoapHeader(boolean)
-   * @generated
-   */
-  void unsetSoapHeader();
-
-  /**
-   * Returns whether the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#isSoapHeader <em>Soap Header</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Soap Header</em>' attribute is set.
-   * @see #unsetSoapHeader()
-   * @see #isSoapHeader()
-   * @see #setSoapHeader(boolean)
-   * @generated
-   */
-  boolean isSetSoapHeader();
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message</em>' containment reference.
-   * @see #setWsdlMessage(WSDLMessage)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessageMapping_WsdlMessage()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  WSDLMessage getWsdlMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessageMapping#getWsdlMessage <em>Wsdl Message</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message</em>' containment reference.
-   * @see #getWsdlMessage()
-   * @generated
-   */
-  void setWsdlMessage(WSDLMessage value);
-
-} // WSDLMessageMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessagePartName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessagePartName.java
deleted file mode 100644
index 13a5da4..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLMessagePartName.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Message Part Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessagePartName()
- * @model 
- * @generated
- */
-public interface WSDLMessagePartName extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessagePartName_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #setWsdlMessagePartName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLMessagePartName_WsdlMessagePartName()
-   * @model 
-   * @generated
-   */
-  String getWsdlMessagePartName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLMessagePartName#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #getWsdlMessagePartName()
-   * @generated
-   */
-  void setWsdlMessagePartName(String value);
-
-} // WSDLMessagePartName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLOperation.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLOperation.java
deleted file mode 100644
index 7f0454b..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLOperation.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation <em>Wsdl Operation</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLOperation()
- * @model 
- * @generated
- */
-public interface WSDLOperation extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLOperation_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Operation</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Operation</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Operation</em>' attribute.
-   * @see #setWsdlOperation(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLOperation_WsdlOperation()
-   * @model 
-   * @generated
-   */
-  String getWsdlOperation();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLOperation#getWsdlOperation <em>Wsdl Operation</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Operation</em>' attribute.
-   * @see #getWsdlOperation()
-   * @generated
-   */
-  void setWsdlOperation(String value);
-
-} // WSDLOperation
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLPortType.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLPortType.java
deleted file mode 100644
index 7180338..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLPortType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Port Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLPortType()
- * @model 
- * @generated
- */
-public interface WSDLPortType extends QName {
-//	 WSDLPortType
-} 
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLReturnValueMapping.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLReturnValueMapping.java
deleted file mode 100644
index be3add9..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLReturnValueMapping.java
+++ /dev/null
@@ -1,139 +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.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Return Value Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue <em>Method Return Value</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage <em>Wsdl Message</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping()
- * @model 
- * @generated
- */
-public interface WSDLReturnValueMapping extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Method Return Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Method Return Value</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Method Return Value</em>' attribute.
-   * @see #setMethodReturnValue(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_MethodReturnValue()
-   * @model 
-   * @generated
-   */
-  String getMethodReturnValue();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getMethodReturnValue <em>Method Return Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Method Return Value</em>' attribute.
-   * @see #getMethodReturnValue()
-   * @generated
-   */
-  void setMethodReturnValue(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message Part Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message Part Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #setWsdlMessagePartName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_WsdlMessagePartName()
-   * @model 
-   * @generated
-   */
-  String getWsdlMessagePartName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessagePartName <em>Wsdl Message Part Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message Part Name</em>' attribute.
-   * @see #getWsdlMessagePartName()
-   * @generated
-   */
-  void setWsdlMessagePartName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Wsdl Message</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Wsdl Message</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Wsdl Message</em>' containment reference.
-   * @see #setWsdlMessage(WSDLMessage)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLReturnValueMapping_WsdlMessage()
-   * @model containment="true" required="true"
-   * @generated
-   */
-  WSDLMessage getWsdlMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.WSDLReturnValueMapping#getWsdlMessage <em>Wsdl Message</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Wsdl Message</em>' containment reference.
-   * @see #getWsdlMessage()
-   * @generated
-   */
-  void setWsdlMessage(WSDLMessage value);
-
-} // WSDLReturnValueMapping
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLServiceName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLServiceName.java
deleted file mode 100644
index 9626ec3..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/WSDLServiceName.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>WSDL Service Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getWSDLServiceName()
- * @model 
- * @generated
- */
-public interface WSDLServiceName extends QName {
-	//Default
-} // WSDLServiceName
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/XMLElementName.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/XMLElementName.java
deleted file mode 100644
index 391867d..0000000
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/XMLElementName.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.webservice.jaxrpcmap;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XML Element Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getXmlElementName <em>Xml Element Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getXMLElementName()
- * @model 
- * @generated
- */
-public interface XMLElementName extends EObject {
-  /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Id</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Id</em>' attribute.
-   * @see #setId(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getXMLElementName_Id()
-   * @model 
-   * @generated
-   */
-  String getId();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getId <em>Id</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Id</em>' attribute.
-   * @see #getId()
-   * @generated
-   */
-  void setId(String value);
-
-  /**
-   * Returns the value of the '<em><b>Xml Element Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Element Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xml Element Name</em>' attribute.
-   * @see #setXmlElementName(String)
-   * @see org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.JaxrpcmapPackage#getXMLElementName_XmlElementName()
-   * @model 
-   * @generated
-   */
-  String getXmlElementName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.jst.j2ee.internal.webservice.jaxrpcmap.XMLElementName#getXmlElementName <em>Xml Element Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Xml Element Name</em>' attribute.
-   * @see #getXmlElementName()
-   * @generated
-   */
-  void setXmlElementName(String value);
-
-} // XMLElementName
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath b/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
deleted file mode 100644
index 22b2a43..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="property_files/"/>
-	<classpathentry kind="src" path="webservices_ui/"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
deleted file mode 100644
index 246526f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-servletui.jar
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project b/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
deleted file mode 100644
index ed8635f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.j2ee.webservices.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.ibm.etools.ctc.javaprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
deleted file mode 100644
index 2decf70..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.webserviceui.jar = property_files/,\
-                          webservices_ui/
-output.webserviceui.jar = bin/
-bin.includes = plugin.xml,\
-               webserviceui.jar,\
-               icons/
-src.includes = plugin.xml
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
deleted file mode 100644
index 0335910..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin 
-   id="org.eclipse.jst.j2ee.webservices.ui"
-   name="WTP Webservice UI Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   description="This plugin contains the UI to create and display web service artifacts."
-   class="org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin">
-   <runtime>
-      <library name="webserviceui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.jst.j2ee.ui"/>
-      <import plugin="org.eclipse.wst.common.frameworks.ui"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.jst.j2ee"/>
-      <import plugin="org.eclipse.emf.edit"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.jst.j2ee.core"/>
-      <import plugin="org.eclipse.jst.j2ee.web"/>
-      <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.wst.common.emf"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.wst.common.navigator.workbench"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.jst.j2ee.webservice"/>
-      <import plugin="org.eclipse.wst.wsdl"/>
-      <import plugin="org.eclipse.wst.internet.webbrowser"/>
-      <import plugin="org.eclipse.jst.common.navigator.java"/>
-      <import plugin="org.eclipse.wst.common.navigator.views"/>
-   </requires>
-   
-   <extension
-         point="org.eclipse.wst.common.navigator.views.navigatorContent">
-      <navigatorContent
-            name="Web Services"
-            priority="low"
-            icon="icons/webgroup_obj.gif"
-            contentProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorContentProvider"
-            labelProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorLabelProvider"
-            openListener="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorGroupOpenListener"
-            id="org.eclipse.wst.common.frameworks.internal.navigator.webservice"
-            >
-         <enables>
-            <or>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup">
-               </objectClass>
-               <objectClass
-                     name="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription">
-               </objectClass>
-               <objectClass
-               		name="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType">
-               </objectClass>
-               <objectClass
-                     name="org.eclipse.wst.wsdl.util.WSDLResourceImpl">
-               </objectClass>
-            </or>
-         </enables>
-         <emfEnablement>
-         	<package uri="wsdd.xmi" />                 	
-         	<package uri="webservice_client.xmi" />           	         	
-         	<package uri="wscommon.xmi" />
-         	<package uri="http://www.ibm.com/wsdl/2003/WSDL"/>
-         </emfEnablement>
-      </navigatorContent>
-   </extension>
-
-   
-   <!-- J2EE View Web Services contribution -->
-   
-   <extension
-         point="org.eclipse.wst.common.navigator.views.navigatorViewer">
-      <navigatorViewer
-            rootContentExtensionId="org.eclipse.wst.common.frameworks.internal.navigator.webservice"
-            viewerId="org.eclipse.wst.navigator.ui.WTPCommonNavigator">
-      </navigatorViewer>
-   </extension>
-   
-   <extension
-         point="org.eclipse.wst.common.navigator.views.navigatorViewer">
-      <navigatorViewer
-            rootContentExtensionId="org.eclipse.wst.common.frameworks.internal.navigator.webservice"
-            viewerId="org.eclipse.wst.navigator.ui.WTPWorkingSetCommonNavigator">
-      </navigatorViewer>
-   </extension>
-	
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
deleted file mode 100644
index b803c30..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-NEW_BUTTON_LABEL=New...
-NEW_HANDLER_WIZARD_WINDOW_TITLE=New Handler
-NEW_HANDLER_WIZARD_PAGE_TITLE=Web Service Handler
-NEW_HANDLER_WIZARD_PAGE_DESC=Create a new web service handler.
-HANDLER_DISPLAY_NAME_LABEL=Dispaly name:
-HANDLER_DESCRIPTION_LABEL=Description:
-HANDLER_NAME_LABEL=Handler name:
-HANDLER_CLASS_NAME_LABEL=Handler class:
-HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE=Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE=Enter Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_DESC=Creare a new handler initialization parameter.
-HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE=Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE=Enter Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC=Create a new SOAP header.
-HANDLER_NAMESPACE_URL_LABEL=Namespace URL:
-HANDLER_LOCAL_PART_LABEL=Local part:
-PortComponentRefLabelProvider_UI_1=Service Endpoint Interface:
-PortComponentRefLabelProvider_UI_2=Port Component Link:
-WebServiceNavigatorGroupType_UI_0=Services
-WebServiceNavigatorGroupType_UI_1=Clients
-WebServiceNavigatorGroupType_UI_2=Handlers
-WebServiceFilesContribution_UI_0=Files
-WebServiceGroupContentExtension_UI_1=Web Browser
-WebServiceNavigatorGroup_UI_0=Web Services
-Server_Invalid_For_Exisitng_EAR_UI_=Selected target server "{0}" is invalid for the existing EAR project "{1}"
-ServiceReferenceSelectionWizard_UI_6=Service Reference Selection
-ServiceReferenceSelectionWizard_UI_7=Service Reference Snippet
-ServiceReferenceSelectionPage_UI_0=Select a Service Reference
-ServiceReferenceSelectionPage_UI_1=Service Reference owner:
-ServiceReferenceSelectionPage_UI_2=New Service Reference...
-SERVICE_CLASSES_UI_=Service Classes
-PORT_UI_=Port:
-HANDLER_UI_=Handler:
-WSDL_PORT_UI_=WSDL Port:
-SERVICE_IMPL_UI_=ServiceImpl:
-WSDL_UI_=WSDL:
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
deleted file mode 100644
index a9c74d0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.net.URL;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- */
-public class OpenExternalWSDLAction extends AbstractOpenAction {
-
-	String uri = ""; //$NON-NLS-1$
-
-	/**
-	 * @param text
-	 */
-	public OpenExternalWSDLAction(String text) {
-		super(text);
-		this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(J2EEUIPlugin.PLUGIN_ID, "icons/web_type.gif")); //$NON-NLS-1$
-	}
-
-	public void run() {
-		try {
-			IWorkbenchBrowserSupport browserSupport = WebServiceUIPlugin.getDefault().getWorkbench().getBrowserSupport(); 
-			IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR,"WSDL","",""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			browser.openURL(new URL(uri));
-		} catch (Exception e) {
-			//Ignore
-		}
-	}
-
-	public boolean updateSelection(IStructuredSelection s) {
-		Object obj = s.getFirstElement();
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (serviceHelper.isWSDLResource(obj))
-			uri = ((Resource) obj).getURI().toString();
-		return super.updateSelection(s);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
deleted file mode 100644
index e13fcd1..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.internal.emfworkbench.EMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceAdapterFactory extends EMFAdapterFactory {
-
-	/**
-	 * Default constructor
-	 */
-	public WebServiceAdapterFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		WsddResource res = null;
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (serviceHelper.isService(adaptableObject))
-			res = WebServicesManager.getInstance().getWsddResource((EObject) adaptableObject);
-
-		if (res != null && adapterType == EMFAdapterFactory.IFILE_CLASS)
-			return WorkbenchResourceHelper.getFile(res);
-		else if (res != null && adapterType == EMFAdapterFactory.IRESOURCE_CLASS)
-			return WorkbenchResourceHelper.getFile(res);
-		else if (res != null && adapterType == EMFAdapterFactory.IPROJECT_CLASS)
-			return ProjectUtilities.getProject(res);
-		else
-			return super.getAdapter(adaptableObject, adapterType);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
deleted file mode 100644
index cc6a61c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 23, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceFilesContribution {
-
-	protected WebServiceDescription webService;
-	protected List allFiles = null;
-
-	/**
-	 * Constructor
-	 */
-	public WebServiceFilesContribution(WebServiceDescription webService) {
-		super();
-		this.webService = webService;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return WebServiceUIResourceHandler.getString("WebServiceFilesContribution_UI_0"); //$NON-NLS-1$
-	}
-
-	public String getWSDLFile() {
-		return webService.getWsdlFile();
-	}
-
-	public String getMappingFile() {
-		return webService.getJaxrpcMappingFile();
-	}
-
-	public List getAllFiles() {
-		if (allFiles == null) {
-			allFiles = new ArrayList();
-			allFiles.add(getWSDLFile());
-			allFiles.add(getMappingFile());
-		}
-		return allFiles;
-	}
-
-	/**
-	 * @return Returns the webService.
-	 */
-	public WebServiceDescription getWebService() {
-		return webService;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
deleted file mode 100644
index e206c59..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 20, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.internal.resources.WorkspaceRoot;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroup {
-
-	private String label = WebServiceUIResourceHandler.getString("WebServiceNavigatorGroup_UI_0"); //$NON-NLS-1$
-	private WorkspaceRoot root;
-
-	/**
-	 * Default constructor
-	 */
-	public WebServiceNavigatorGroup(WorkspaceRoot wsRoot) {
-		super();
-		root = wsRoot;
-	}
-
-	/**
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return label;
-	}
-
-	/**
-	 * @return Returns the root.
-	 */
-	public WorkspaceRoot getRoot() {
-		return root;
-	}
-
-	/**
-	 * @param root
-	 *            The root to set.
-	 */
-	public void setRoot(WorkspaceRoot root) {
-		this.root = root;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
deleted file mode 100644
index 19eb6f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroupType implements IActionFilter {
-
-	public static final int SERVICES = 0;
-	public static final int CLIENTS = 2;
-	public static final int HANDLERS = 3;
-
-	public static final String SERVICES_UI = WebServiceUIResourceHandler.getString("WebServiceNavigatorGroupType_UI_0"); //$NON-NLS-1$
-	public static final String CLIENTS_UI = WebServiceUIResourceHandler.getString("WebServiceNavigatorGroupType_UI_1"); //$NON-NLS-1$
-	public static final String HANDLERS_UI = WebServiceUIResourceHandler.getString("WebServiceNavigatorGroupType_UI_2"); //$NON-NLS-1$
-
-	private int TYPE;
-	private EObject wsdlService = null;
-	private ServiceRef serviceRef = null;
-
-	/**
-	 * Create a specific type of web service navigator grouping
-	 */
-	public WebServiceNavigatorGroupType(int groupType) {
-		super();
-		TYPE = groupType;
-	}
-
-	/**
-	 * Create a specific type of web service navigator grouping
-	 */
-	public WebServiceNavigatorGroupType(int groupType, EObject wsdlService) {
-		super();
-		TYPE = groupType;
-		this.wsdlService = wsdlService;
-	}
-
-	/**
-	 * Create a specific type of web service navigator grouping
-	 */
-	public WebServiceNavigatorGroupType(int groupType, ServiceRef serviceRef) {
-		super();
-		TYPE = groupType;
-		this.serviceRef = serviceRef;
-	}
-
-	/**
-	 * @return Returns the TYPE.
-	 */
-	public int getGroupType() {
-		return TYPE;
-	}
-
-	public boolean isServices() {
-		return getGroupType() == SERVICES;
-	}
-
-	public boolean isClients() {
-		return getGroupType() == CLIENTS;
-	}
-
-	public boolean isHandlers() {
-		return getGroupType() == HANDLERS;
-	}
-
-	public EObject getWsdlService() {
-		return wsdlService;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (isServices())
-			return SERVICES_UI;
-		else if (isClients())
-			return CLIENTS_UI;
-		else if (isHandlers())
-			return HANDLERS_UI;
-		else
-			return super.toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String,
-	 *      java.lang.String)
-	 */
-	public boolean testAttribute(Object target, String name, String value) {
-		if (target != null && target instanceof WebServiceNavigatorGroupType && value != null) {
-			WebServiceNavigatorGroupType group = (WebServiceNavigatorGroupType) target;
-			if (group.isClients() && value.equals(CLIENTS_UI))
-				return true;
-			else if (group.isServices() && value.equals(SERVICES_UI))
-				return true;
-			else if (group.isHandlers() && value.equals(HANDLERS_UI))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @return Returns the serviceRef.
-	 */
-	public ServiceRef getServiceRef() {
-		return serviceRef;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
deleted file mode 100644
index 8cc1ca3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 27, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author jialin
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceUIResourceHandler {
-
-	private static ResourceBundle fgResourceBundle;
-
-	/**
-	 * Returns the resource bundle used by all classes in this Project
-	 */
-	public static ResourceBundle getResourceBundle() {
-		try {
-			return ResourceBundle.getBundle("webserviceui");//$NON-NLS-1$
-		} catch (MissingResourceException e) {
-			// does nothing - this method will return null and
-			// getString(String, String) will return the key
-			// it was called with
-		}
-		return null;
-	}
-
-	public static String getString(String key) {
-		if (fgResourceBundle == null) {
-			fgResourceBundle = getResourceBundle();
-		}
-
-		if (fgResourceBundle != null) {
-			try {
-				return fgResourceBundle.getString(key);
-			} catch (MissingResourceException e) {
-				return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-			}
-		}
-		return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	public static void nlsConcatenationFinder() {
-		// used to tag methods which have concatenated strings
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
deleted file mode 100644
index 6908036..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.internal.resources.WorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-import org.eclipse.wst.common.navigator.internal.provisional.views.INavigatorContentProvider;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorContentProvider extends CommonAdapterFactoryContentProvider implements INavigatorContentProvider, EditModelListener {
-
-	private WebServicesManager webServicesManager = null;
-	private boolean activityEnabled = false;
-	private WebServiceNavigatorGroup webServiceNavigatorGroup;
-	private WebServiceNavigatorGroupType SERVICES = null;
-	private WebServiceNavigatorGroupType CLIENTS = null;
-	private HashMap HANDLERS = new HashMap();
-	private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";//$NON-NLS-1$
-	
-	private TreeViewer viewer = null;
-	
-	public WebServicesNavigatorContentProvider() {
-		super(createAdapterFactory());
-		WebServicesManager.getInstance().addListener(this);
-		// create the default synchronizer for any web service editor to use with view due
-		// to the usage of seperate edit models.
-		WebServicesNavigatorSynchronizer.createInstance(createAdapterFactory(), this);
-		
-	}
-	
-	/**
-	 * Configure and return a composite adapter factory for our contents
-	 */
-	public static AdapterFactory createAdapterFactory() {
-		return new DynamicAdapterFactory(VIEWER_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getChildren(java.lang.Object)
-	 */
-	public Object[] getChildren(Object parentElement) {
-//		if (!NavigatorActivityHelper.isActivityEnabled(getContainingExtension())) {
-//			activityEnabled = false;
-//			return super.getChildren(parentElement);
-//		}
-//		activityEnabled = true;
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (parentElement instanceof WorkspaceRoot) {
-			return new Object[]{getWebServicesNavigatorGroup(parentElement)};
-		} else if (parentElement instanceof WebServiceNavigatorGroup) {
-			return new Object[]{getServicesGroup(), getClientsGroup()};
-		} else if (parentElement instanceof WebServiceNavigatorGroupType && ((WebServiceNavigatorGroupType) parentElement).isServices()) {
-			List result = new ArrayList();
-			result.addAll(getWebServicesManager().getInternalWSDLServices());
-			result.addAll(getWebServicesManager().getExternalWSDLServices());
-			return result.toArray();
-		} else if (parentElement instanceof WebServiceNavigatorGroupType && ((WebServiceNavigatorGroupType) parentElement).isClients()) {
-			return getWebServicesManager().getAllWorkspaceServiceRefs().toArray();
-		} else if (serviceHelper.isService(parentElement)) {
-			return getServiceLevelNodes(parentElement).toArray();
-		} else if (parentElement instanceof WebServiceNavigatorGroupType && ((WebServiceNavigatorGroupType) parentElement).isHandlers()) {
-			return getHandlerChildren(parentElement).toArray();
-		} else if (parentElement instanceof ServiceRef) {
-			Collection result = new ArrayList();
-			result.add(getHandlersGroup(parentElement));
-			return result.toArray();
-		} else if (parentElement instanceof Handler) {
-			return new ArrayList().toArray();
-		} else if (serviceHelper.isWSDLResource(parentElement))
-			return new ArrayList().toArray();
-		else
-			return super.getChildren(parentElement);
-	}
-
-	private List getServiceLevelNodes(Object parentElement) {
-		List result = new ArrayList();
-		// add service classes
-		if (getWebServicesManager().isServiceInternal((EObject) parentElement) && getWebServicesManager().getServiceImplBean((EObject) parentElement) != null)
-			result.add(getWebServicesManager().getServiceImplBean((EObject) parentElement));
-		// Add handlers
-		if (getWebServicesManager().isServiceInternal((EObject) parentElement))
-			result.add(getHandlersGroup(parentElement));
-		//add wsdl file
-		Resource wsdl = getWebServicesManager().getWSDLResource((EObject) parentElement);
-		if (wsdl != null)
-			result.add(wsdl);
-		return result;
-	}
-
-	private List getHandlerChildren(Object parentElement) {
-		List result = new ArrayList();
-		WebServiceNavigatorGroupType handlersGroup = (WebServiceNavigatorGroupType) parentElement;
-		// handle web service handlers case
-		if (handlersGroup.getWsdlService() != null) {
-			PortComponent port = WebServicesManager.getInstance().getPortComponent(handlersGroup.getWsdlService());
-			if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty())
-				result.addAll(port.getHandlers());
-		}
-		// handle service ref case
-		else if (handlersGroup.getServiceRef() != null) {
-			result.addAll(handlersGroup.getServiceRef().getHandlers());
-		}
-		return result;
-	}
-
-	/**
-	 * @param parentElement
-	 * @return
-	 */
-	protected WebServiceNavigatorGroup getWebServicesNavigatorGroup(Object parentElement) {
-		if (webServiceNavigatorGroup == null)
-			webServiceNavigatorGroup = new WebServiceNavigatorGroup((WorkspaceRoot) parentElement);
-		return webServiceNavigatorGroup;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getParent(java.lang.Object)
-	 */
-	public Object getParent(Object element) {
-		if (element instanceof WorkspaceRoot)
-			return null;
-		else if (element instanceof WebServiceNavigatorGroup)
-			return ((WebServiceNavigatorGroup) element).getRoot();
-		else
-			return super.getParent(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#hasChildren(java.lang.Object)
-	 */
-	public boolean hasChildren(Object element) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
-		// TODO handle change events
-		if (aViewer !=null && aViewer instanceof TreeViewer)
-			viewer = (TreeViewer)aViewer;
-		super.inputChanged(aViewer,oldInput,newInput);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
-	public void dispose() {
-		super.dispose();
-		WebServicesManager.getInstance().removeListener(this);
-		// dispose current instance of web service editor/explorer synchronizer
-		WebServicesNavigatorSynchronizer.disposeInstance();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
-	 */
-	public void editModelChanged(EditModelEvent anEvent) {
-		//this.getExtensionSite().notifyElementReplaced(this, ((WebServicesNavigatorContentProvider) getContentProvider()).getNavigatorGroup());
-		notifyChanged(new NotificationImpl(anEvent.getEventCode(),getNavigatorGroup(),getNavigatorGroup()));
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	public Object[] getElements(Object inputElement) {
-		return getChildren(inputElement);
-	}
-
-	/**
-	 * @return Returns the navigatorGroup.
-	 */
-	public WebServiceNavigatorGroup getNavigatorGroup() {
-		if (null == webServiceNavigatorGroup) {
-			webServiceNavigatorGroup = new WebServiceNavigatorGroup((WorkspaceRoot) ResourcesPlugin.getWorkspace().getRoot());
-		}
-		return webServiceNavigatorGroup;
-	}
-
-	protected WebServicesManager getWebServicesManager() {
-		if (webServicesManager == null)
-			webServicesManager = WebServicesManager.getInstance();
-		return webServicesManager;
-	}
-
-	/**
-	 * @return Returns the activityEnabled.
-	 */
-	public boolean isActivityEnabled() {
-		return activityEnabled;
-	}
-
-	private WebServiceNavigatorGroupType getServicesGroup() {
-		if (SERVICES == null)
-			SERVICES = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.SERVICES);
-		return SERVICES;
-	}
-
-	private WebServiceNavigatorGroupType getClientsGroup() {
-		if (CLIENTS == null)
-			CLIENTS = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.CLIENTS);
-		return CLIENTS;
-	}
-
-	private WebServiceNavigatorGroupType getHandlersGroup(Object key) {
-		if (key == null)
-			return null;
-		WebServiceNavigatorGroupType handler = null;
-		handler = (WebServiceNavigatorGroupType) HANDLERS.get(key);
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (handler == null) {
-			if (serviceHelper.isService(key))
-				handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (EObject) key);
-			else if (key instanceof ServiceRef)
-				handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (ServiceRef) key);
-			if (handler != null)
-				HANDLERS.put(key, handler);
-		}
-		return handler;
-	}
-	/**
-	 * @return Returns the viewer.
-	 */
-	public TreeViewer getViewer() {
-		return viewer;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
deleted file mode 100644
index 814b543..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Created on Feb 10, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.OpenEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServicesNavigatorGroupOpenListener implements IOpenListener {
-
-	private OpenExternalWSDLAction openExternalWSDLAction = new OpenExternalWSDLAction(WebServiceUIResourceHandler.getString("WebServiceGroupContentExtension_UI_1")); //$NON-NLS-1$
-	private OpenJ2EEResourceAction openAction = new OpenJ2EEResourceAction();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IOpenListener#open(org.eclipse.jface.viewers.OpenEvent)
-	 */
-	public void open(OpenEvent event) {
-		if (event == null)
-			return;
-		StructuredSelection selection = (StructuredSelection)event.getSelection();
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (selection == null || selection.getFirstElement()==null)
-			return;
-		Object selectedObject = selection.getFirstElement();
-		if (selectedObject instanceof ServiceImplBean || serviceHelper==null)
-			return;
-		else if (serviceHelper.isWSDLResource(selectedObject)) {
-			Resource wsdl = (Resource) selectedObject;
-			IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-			if (wsdlFile == null || !wsdlFile.exists()) {
-				openExternalWSDLAction.selectionChanged(selection);
-				openExternalWSDLAction.run();
-				return;
-			}
-		}
-		else {
-			openAction.selectionChanged(selection);
-			openAction.run();
-		}	
-	}
-	//TODO fill open with menu for web services group
-	
-//	return new CommonEditActionGroup(getExtensionSite()) {
-//		public void fillOpenWithMenu(IMenuManager menu) {
-//			if ((getExtensionSite().getSelection().getFirstElement() instanceof BeanLink)) {
-//				openAction.selectionChanged(getExtensionSite().getSelection());
-//				menu.insertAfter(ICommonMenuConstants.COMMON_MENU_TOP, openAction);
-//			} else if ((getExtensionSite().getSelection().getFirstElement() instanceof WSDLResourceImpl)) {
-//				WSDLResourceImpl wsdl = (WSDLResourceImpl) getExtensionSite().getSelection().getFirstElement();
-//				IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
-//				if (wsdlFile == null || !wsdlFile.exists()) {
-//					openExternalWSDLAction.selectionChanged(getExtensionSite().getSelection());
-//					menu.insertAfter(ICommonMenuConstants.COMMON_MENU_TOP, openExternalWSDLAction);
-//				}
-//			}
-//		}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
deleted file mode 100644
index ed5df97..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorLabelProvider extends AdapterFactoryLabelProvider implements ILabelProvider {
-
-	private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";//$NON-NLS-1$
-	
-	public WebServicesNavigatorLabelProvider() {
-		super(createAdapterFactory());
-	}
-	
-	/**
-	 * Configure and return a composite adapter factory for our contents
-	 */
-	public static AdapterFactory createAdapterFactory() {
-		return new DynamicAdapterFactory(VIEWER_ID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (element instanceof WebServiceNavigatorGroup)
-			return J2EEUIPlugin.getDefault().getImage("webServicesFolder_obj"); //$NON-NLS-1$
-		else if (element instanceof String)
-			return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
-		else if (element instanceof WebServiceNavigatorGroupType)
-			return J2EEUIPlugin.getDefault().getImage("folder"); //$NON-NLS-1$
-		else if (serviceHelper.isService(element)) {
-			if (WebServicesManager.getInstance().isServiceInternal((EObject) element))
-				return J2EEUIPlugin.getDefault().getImage("webServiceItemProvider_obj"); //$NON-NLS-1$
-			return J2EEUIPlugin.getDefault().getImage("extwebserviceitemprovider_obj"); //$NON-NLS-1$
-		} else if (serviceHelper.isWSDLResource(element))
-			return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
-		else
-			return super.getImage(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		String space = " "; //$NON-NLS-1$
-		if (element instanceof WebServiceDescription)
-			return getWebServiceDescriptionText((WebServiceDescription) element);
-		else if (element instanceof PortComponent)
-			return WebServiceUIResourceHandler.getString("PORT_UI_") + space + super.getText(element); //$NON-NLS-1$
-		else if (element instanceof Handler)
-			return WebServiceUIResourceHandler.getString("HANDLER_UI_") + space + super.getText(element); //$NON-NLS-1$
-		else if (element instanceof WSDLPort)
-			return WebServiceUIResourceHandler.getString("WSDL_PORT_UI_") + space + super.getText(element); //$NON-NLS-1$
-		else if (element instanceof ServiceImplBean)
-			return WebServiceUIResourceHandler.getString("SERVICE_CLASSES_UI_"); //$NON-NLS-1$
-		else if (element instanceof EJBLink)
-			return WebServiceUIResourceHandler.getString("SERVICE_IMPL_UI_") + space + super.getText(element); //$NON-NLS-1$
-		else if (element instanceof ServletLink)
-			return WebServiceUIResourceHandler.getString("SERVICE_IMPL_UI_") + space + super.getText(element); //$NON-NLS-1$
-		else if (serviceHelper.isService(element))
-			return serviceHelper.getServiceLocalPart(element);
-		else if (serviceHelper.isWSDLResource(element)) {
-			String result = ""; //$NON-NLS-1$
-			IFile file = WorkbenchResourceHelper.getFile((Resource) element);
-			if (file != null && file.exists())
-				result = file.getFullPath().toString();
-			else
-				result = ((Resource) element).getURI().toString();
-			return WebServiceUIResourceHandler.getString("WSDL_UI_") + space + result; //$NON-NLS-1$
-		} else if (element instanceof ServiceRef) {
-			String beanName14 = ""; //$NON-NLS-1$
-			if (WebServicesManager.getInstance().isJ2EE14((ServiceRef) element)) {
-				if (((ServiceRef) element).eContainer() instanceof Session)
-					beanName14 = ((Session) ((ServiceRef) element).eContainer()).getName() + ": "; //$NON-NLS-1$
-			}
-
-			return ProjectUtilities.getProject((ServiceRef) element).getName() + ": " + beanName14 //$NON-NLS-1$
-						+ ((ServiceRef) element).getServiceRefName();
-		} else
-			return super.getText(element);
-	}
-
-	/**
-	 * get text for web service
-	 */
-	private String getWebServiceDescriptionText(WebServiceDescription description) {
-		Resource res = description.eResource();
-		IProject project = null;
-		String projString = ""; //$NON-NLS-1$
-		if (res != null)
-			project = WorkbenchResourceHelper.getProject(res);
-		if (project != null)
-			projString = project.getName() + ": "; //$NON-NLS-1$
-		return projString + super.getText(description);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void addListener(ILabelProviderListener listener) {
-		// TODO add any listeners?
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	public void dispose() {
-		// TODO handle dispose
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
-	 *      java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		// TODO do something smart here?
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	public void removeListener(ILabelProviderListener listener) {
-		// TODO how do we remove listeners?
-
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
deleted file mode 100644
index e99de07..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 10, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.common.navigator.internal.providers.CommonAdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-/**
- * @author jlanuti
- */
-public class WebServicesNavigatorSynchronizer extends CommonAdapterFactoryContentProvider implements Adapter {
-
-
-	private static WebServicesNavigatorSynchronizer INSTANCE = null;
-	protected Notifier target = null;
-	private WebServicesNavigatorContentProvider contentProvider = null;
-
-	/**
-	 * Constructor
-	 */
-	public WebServicesNavigatorSynchronizer(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
-		super(adapterFactory);
-		contentProvider = provider;
-	}
-
-	public static WebServicesNavigatorSynchronizer getInstance() {
-		return INSTANCE;
-	}
-
-	public static WebServicesNavigatorSynchronizer createInstance(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
-		INSTANCE = new WebServicesNavigatorSynchronizer(adapterFactory, provider);
-		return INSTANCE;
-	}
-
-	public static void disposeInstance() {
-		INSTANCE = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.Adapter#getTarget()
-	 */
-	public Notifier getTarget() {
-		return target;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
-	 */
-	public void setTarget(Notifier newTarget) {
-		target = newTarget;
-	}
-
-	public void notifyChanged(final Notification notification) {
-		EObject notifier = (EObject) notification.getNotifier();
-
-		if (notifier instanceof WebServices)
-			return;
-
-		if (notifier instanceof ServiceRef) {
-			contentProvider.inputChanged(contentProvider.getViewer(),notification.getOldValue(),notification.getNewValue());
-			return;
-		}
-
-		while (!(notifier instanceof WebServiceDescription) && notifier != null)
-			notifier = notifier.eContainer();
-
-		if (notifier == null) {
-			//site.notifyElementReplaced(getContainingExtension(), null);
-			return;
-		}
-
-		EObject wsdl = WebServicesManager.getInstance().getWSDLServiceForWebService((WebServiceDescription) notifier);
-		EObject oldWsdl = WebServicesManager.getInstance().getWSDLServiceForWebService((WebServiceDescription) notification.getOldValue());
-		contentProvider.inputChanged(contentProvider.getViewer(), oldWsdl,wsdl);
-
-		super.notifyChanged(notification);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
deleted file mode 100644
index 82d530d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.EMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WsdlResourceAdapterFactory extends EMFAdapterFactory {
-
-	/**
-	 * Default constructor
-	 */
-	public WsdlResourceAdapterFactory() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		Resource res = null;
-		WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
-		if (serviceHelper.isWSDLResource(adaptableObject))
-			res = (Resource) adaptableObject;
-
-		if (res != null && adapterType == EMFAdapterFactory.IFILE_CLASS)
-			return WorkbenchResourceHelper.getFile(res) != null ? WorkbenchResourceHelper.getFile(res) : null;
-		else if (res != null && adapterType == EMFAdapterFactory.IRESOURCE_CLASS)
-			return WorkbenchResourceHelper.getFile(res);
-		else if (res != null && adapterType == EMFAdapterFactory.IPROJECT_CLASS)
-			return ProjectUtilities.getProject(res);
-		else
-			return super.getAdapter(adaptableObject, adapterType);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 4fd51a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Created on Nov 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WebServiceUIPlugin extends AbstractUIPlugin {
-	
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.webservices.ui"; //$NON-NLS-1$
-	
-	//	The shared instance.
-	private static WebServiceUIPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public WebServiceUIPlugin() {
-		super();
-		plugin = this;
-	}
-	
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WebServiceUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/plugins/org.eclipse.wst.web.ui/.classpath b/plugins/org.eclipse.wst.web.ui/.classpath
deleted file mode 100644
index 329c24d..0000000
--- a/plugins/org.eclipse.wst.web.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="static_web_ui"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web.ui/.cvsignore b/plugins/org.eclipse.wst.web.ui/.cvsignore
deleted file mode 100644
index 2521e52..0000000
--- a/plugins/org.eclipse.wst.web.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
diff --git a/plugins/org.eclipse.wst.web.ui/.project b/plugins/org.eclipse.wst.web.ui/.project
deleted file mode 100644
index 3858f90..0000000
--- a/plugins/org.eclipse.wst.web.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.web.ui/build.properties b/plugins/org.eclipse.wst.web.ui/build.properties
deleted file mode 100644
index fd77904..0000000
--- a/plugins/org.eclipse.wst.web.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.ui.jar = static_web_ui/
-output.ui.jar = bin/
-bin.includes = plugin.xml,\
-               ui.jar,\
-               icons/,\
-               plugin.properties
-src.includes = plugin.xml,\
-               plugin.properties,\
-               icons/
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 57c68b3..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.properties b/plugins/org.eclipse.wst.web.ui/plugin.properties
deleted file mode 100644
index cf476f3..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
-
-
-
-StaticWebProject.name=Simple Web Project
-StaticWebProject.description=Create a Web project for static content (HTML files) only
-
-StaticWebSettings=Simple Web
-WebProjectFeatures.name=Web Project Features
-web.category_ui_=Web
-StaticWebModule.name=Simple Web Module
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.xml b/plugins/org.eclipse.wst.web.ui/plugin.xml
deleted file mode 100644
index 433bd5e..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.web.ui"
-   name="Simple Web UI Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   description="This plugin contains the UI to create a simple non j2ee web project."
-   class="org.eclipse.wst.web.ui.internal.WSTWebUIPlugin">
-
-   <runtime>
-      <library name="ui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.wst.common.frameworks.ui"/>
-      <import plugin="org.eclipse.wst.web"/>
-   </requires>
-  <!-- static web project wizard -->
-   <extension
-         point="org.eclipse.wst.common.frameworks.ui.extendableWizard">
-      <extendableWizard
-            id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebModuleCreationWizard">
-      </extendableWizard>
-   </extension>
-   <extension
-       point="org.eclipse.ui.newWizards">
-      <category
-            name="%web.category_ui_"
-            id="org.eclipse.wst.web.ui">
-      </category>
-      <wizard
-            name="%StaticWebProject.name"
-            icon="icons/full/ctool16/newwebprj_wiz.gif"
-            category="org.eclipse.wst.web.ui"
-            class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebModuleCreationWizard"
-            project="true"
-            id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebModuleCreation">
-         <description>
-            %StaticWebProject.description
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension>
-   <!-- add in the features page 
-   	<extension
-   		id="corg.eclipse.wst.web.ui.internal.wizards.WebProjectFeaturesWizardPage"
-        name="%WebProjectFeatures.name"
-        point="org.eclipse.wst.common.frameworks.ui.wizardPageGroup">
-      	<wizardPageGroup
-        	pageGroupID="org.eclipse.wst.web.ui.internal.wizards.WebProjectFeaturesWizardPage"
-            wizardID="com.ibm.etools.webtools.StaticWebProjectCreation">
-        	<factory
-            	className="org.eclipse.wst.web.ui.internal.wizards.WebProjectFeaturesWizardPageFactory">
-         	</factory>
-      	</wizardPageGroup>
-   	</extension>
-   -->
-   <extension
-         point="org.eclipse.ui.propertyPages">
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            name="%StaticWebSettings"
-            class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebSettingsPropertiesPage"
-            id="StaticWebSettingsPropertiesPage">
-         <filter
-               name="nature"
-               value="org.eclipse.wst.web.StaticWebNature">
-         </filter>
-      </page>
-      
- <!--     <page
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            name="%WebProjectFeatures.name"
-            class="com.ibm.itp.wt.ui.WebFeaturesPropertiesPage"
-            id="WebFeaturesPropertiesPage">
-         <filter
-               name="nature"
-               value="org.eclipse.wst.web.StaticWebNature">
-         </filter>
-      </page> -->
-   </extension>
-   
-   <!-- the following 2 are needed to add an image for SWPs into the "Add/Remove Project" dialog -->
-	<extension point="org.eclipse.wst.server.core.moduleTypes">
-		<moduleType
-			id="web.static"
-			name="%StaticWebModule.name"/>
-	</extension>
-	<extension point="org.eclipse.wst.server.ui.serverImages">
-		<image
-			id="com.ibm.wtp.web.static"
-			typeIds="web.static"
-			icon="icons/full/obj16/web_application.gif"/>
-	</extension>
-	
-	<!-- Static Web project creation operation is now extendable -->
-	<extension point="org.eclipse.wst.common.frameworks.ExtendableOperation"
-			   id="extendableOperation">
-		<extendableOperation
-			class="org.eclipse.wst.staticwebproject.internal.operations.SimpleWebModuleCreationOperation"
-			id="org.eclipse.wst.staticwebproject.internal.operations.SimpleWebModuleCreationOperation">
-		</extendableOperation>
-	</extension>
-	
-	<!-- this extension is needed to migrate the 5.1.2 StaticWebNature ID to the new 6.0 ID -->
-	<extension
-		id="NatureMappings"
-		name="Static Nature Mappings"
-		point="org.eclipse.wst.common.migration.natureMapping">
-		<natureMapping>
-			<mapping
-				position="first"
-				name="Nature Mapping"
-				newValue="org.eclipse.wst.web.StaticWebNature">
-				<alias
-					value="com.ibm.etools.j2ee.StaticWebNature">
-				</alias>
-			</mapping>
-		</natureMapping>
-	</extension>
-	<!-- ====================================================== -->
-<!-- Extension point: org.eclipse.ui.projectNatureImages    -->
-<!-- Purpose: Attach icon overlays for J2EE project natures -->
-<!-- ====================================================== -->
-   <extension
-         point="org.eclipse.ui.ide.projectNatureImages">
-      <image
-            icon="icons/full/ovr16/web_module_ovr.gif"
-            natureId="org.eclipse.wst.web.StaticWebNature"
-            id="org.eclipse.ui.simpleWebProjectNatureImage">
-      </image>
-   </extension>
-</plugin>
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
deleted file mode 100644
index 84b5514..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.ui.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
-	public interface Keys {
-		final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-	}
-	public interface Values {
-		final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
-	}
-	public interface Defaults {
-		final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
-	}
-	private Plugin owner = null;
-	private Preferences preferences = null;
-	private boolean persistOnChange = false;
-
-	public WSTWebPreferences(Plugin owner) {
-		this.owner = owner;
-	}
-	protected void initializeDefaultPreferences() {
-		getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
-	}
-
-	public String getStaticWebContentFolderName() {
-		return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
-	}
-
-	public void setStaticWebContentFolderName(String value) {
-		getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
-		firePreferenceChanged();
-	}
-
-	public void firePreferenceChanged() {
-		if (isPersistOnChange())
-			persist();
-	}
-
-	public void persist() {
-		getOwner().savePluginPreferences();
-	}
-
-	/**
-	 * @return Returns the persistOnChange.
-	 */
-	public boolean isPersistOnChange() {
-		return this.persistOnChange;
-	}
-
-	/**
-	 * @param persistOnChange
-	 *            The persistOnChange to set.
-	 */
-	public void setPersistOnChange(boolean persistOnChange) {
-		this.persistOnChange = persistOnChange;
-	}
-
-	private Preferences getPreferences() {
-		if (this.preferences == null)
-			this.preferences = getOwner().getPluginPreferences();
-		return this.preferences;
-	}
-
-	/**
-	 * @return Returns the owner.
-	 */
-	private Plugin getOwner() {
-		return this.owner;
-	}
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
deleted file mode 100644
index c814ed7..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebUIPlugin extends AbstractUIPlugin {
-	// The shared instance.
-	private static WSTWebUIPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public WSTWebUIPlugin() {
-		super();
-		plugin = this;
-	}
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WSTWebUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java
deleted file mode 100644
index 5b2fca5..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleContextRootComposite.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import java.util.Vector;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.WebPropertiesUtil;
-
-public class SimpleContextRootComposite extends Composite {
-	protected Text contextRootField;
-	private String errorMessage = null;
-
-	// listeners interested in the event when the context root
-	// value is modified.
-	private java.util.List modifyListeners;
-
-	protected Listener contextRootModifyListener = new Listener() {
-		public void handleEvent(Event e) {
-			if (contextRootField != null)
-				contextRootModified();
-		}
-	};
-
-	public SimpleContextRootComposite(Composite parent) {
-		super(parent, SWT.NONE);
-		createControls();
-		modifyListeners = new Vector(1);
-	}
-
-	protected void createControls() {
-		// container specification group
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		setLayout(layout);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		data.horizontalSpan = 2;
-		setLayoutData(data);
-
-		// New Context Root Label
-		Label contextRootLabel = new Label(this, SWT.CHECK);
-		contextRootLabel.setText(ResourceHandler.getString("StaticContextRootComposite.Context_Root_Label")); //$NON-NLS-1$
-
-		// New Context Root Entryfield
-		contextRootField = new Text(this, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
-		data.grabExcessHorizontalSpace = true;
-		contextRootField.setLayoutData(data);
-
-		contextRootField.addListener(SWT.Modify, contextRootModifyListener);
-
-	}
-
-	public String getContextRoot() {
-		return contextRootField.getText();
-	}
-
-	public void setEnabled(boolean enabled) {
-		if (contextRootField != null)
-			contextRootField.setEnabled(enabled);
-	}
-
-	protected void contextRootModified() {
-		errorMessage = WebPropertiesUtil.validateContextRoot(getContextRoot());
-		// notify listeners
-		Event e = new Event();
-		e.type = SWT.Modify;
-		e.widget = contextRootField;
-		for (int i = 0; i < modifyListeners.size(); i++) {
-			((Listener) modifyListeners.get(i)).handleEvent(e);
-		}
-	}
-
-	public void setContextRoot(String cr) {
-		contextRootField.setText(cr);
-	}
-
-	/**
-	 * There is a default context root validation listener provided by the
-	 * composite, adding external listeners will replace the default listener.
-	 */
-	public void addModifyListener(Listener l) {
-		modifyListeners.add(l);
-	}
-
-	public void removeModifyListener(Listener l) {
-		modifyListeners.remove(l);
-	}
-
-	/**
-	 * validate the context root value and return the error message
-	 */
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-
-	public boolean setFocus() {
-		return contextRootField.setFocus();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java
deleted file mode 100644
index 67feaca..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.dialogs.WorkbenchWizardElement;
-import org.eclipse.ui.wizards.IWizardDescriptor;
-import org.eclipse.ui.wizards.IWizardRegistry;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-import org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModel;
-import org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationOperation;
-
-public class SimpleWebModuleCreationWizard extends WTPWizard implements IExecutableExtension, INewWizard {
-
-	public SimpleWebModuleCreationWizard(SimpleWebModuleCreationDataModel model) {
-		super(model);
-	}
-
-	public SimpleWebModuleCreationWizard() {
-		super();
-	}
-
-	public String getWizardID() {
-		return "org.eclipse.wst.web.ui.internal.wizards.SimpleWebModuleCreation"; //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	public void doAddPages() {
-		addPage(new SimpleWebModuleWizardBasePage((SimpleWebModuleCreationDataModel) model, "page1")); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizard#createDefaultModel()
-	 */
-	protected WTPOperationDataModel createDefaultModel() {
-		return new SimpleWebModuleCreationDataModel();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizard#createOperation()
-	 */
-	protected WTPOperation createBaseOperation() {
-		return new SimpleWebModuleCreationOperation((SimpleWebModuleCreationDataModel) model);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
-	 *      java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
-		// Do nothing
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
-	 *      org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		setWindowTitle(ResourceHandler.getString("StaticWebProjectCreationWizard.Wizard_Title")); //$NON-NLS-1$
-
-		setDefaultPageImageDescriptor(WSTWebPlugin.getDefault().getImageDescriptor("newwprj_wiz")); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizard#postPerformFinish()
-	 */
-	protected void postPerformFinish() throws InvocationTargetException {
-		IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();		
-		
-		IWizardDescriptor descriptor = newWizardRegistry.findWizard(getWizardID());
-
-		if(descriptor instanceof WorkbenchWizardElement)
-			BasicNewProjectResourceWizard.updatePerspective(((WorkbenchWizardElement)descriptor).getConfigurationElement());
-		IWorkbenchWindow window = WSTWebPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-		IProject project = ((SimpleWebModuleCreationDataModel) model).getTargetProject();
-		BasicNewResourceWizard.selectAndReveal(project, window);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java
deleted file mode 100644
index daec90b..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel;
-import org.eclipse.wst.common.frameworks.internal.ui.NewProjectGroup;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-import org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModel;
-
-class SimpleWebModuleWizardBasePage extends WTPWizardPage {
-	protected NewProjectGroup projectNameGroup;
-
-	/**
-	 * WebProjectWizardBasePage constructor comment.
-	 * 
-	 * @param pageName
-	 *            java.lang.String
-	 */
-	public SimpleWebModuleWizardBasePage(SimpleWebModuleCreationDataModel dataModel, String pageName) {
-		super(dataModel, pageName);
-		setDescription(ResourceHandler.getString("StaticWebProjectWizardBasePage.Page_Description")); //$NON-NLS-1$
-		setTitle(ResourceHandler.getString("StaticWebProjectWizardBasePage.Page_Title")); //$NON-NLS-1$
-		ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(WSTWebPlugin.PLUGIN_ID, "icons/full/wizban/newwprj_wiz.gif"); //$NON-NLS-1$
-		setImageDescriptor(desc);
-		setPageComplete(false);
-	}
-
-	protected void setSize(Composite composite) {
-		if (composite != null) {
-			Point minSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-			composite.setSize(minSize);
-			// set scrollbar composite's min size so page is expandable but has
-			// scrollbars when needed
-			if (composite.getParent() instanceof ScrolledComposite) {
-				ScrolledComposite sc1 = (ScrolledComposite) composite.getParent();
-				sc1.setMinSize(minSize);
-				sc1.setExpandHorizontal(true);
-				sc1.setExpandVertical(true);
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
-	 */
-	protected String[] getValidationPropertyNames() {
-		return new String[]{ProjectCreationDataModel.PROJECT_NAME, ProjectCreationDataModel.PROJECT_LOCATION};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Composite createTopLevelComposite(Composite parent) {
-		Composite top = new Composite(parent, SWT.NONE);
-		top.setLayout(new GridLayout());
-		top.setData(new GridData(GridData.FILL_BOTH));
-		Composite composite = new Composite(top, SWT.NONE);
-		GridLayout layout = new GridLayout(3, false);
-		composite.setLayout(layout);
-		createProjectNameGroup(composite);
-		Composite detail = new Composite(top, SWT.NONE);
-		detail.setLayout(new GridLayout());
-		detail.setData(new GridData(GridData.FILL_BOTH));
-
-		WorkbenchHelp.setHelp(top, "com.ibm.etools.webtools.wizards.basic.webw1450"); //$NON-NLS-1$
-		return top;
-	}
-
-	private final void createProjectNameGroup(Composite parent) {
-		projectNameGroup = new NewProjectGroup(parent, SWT.NULL, (ProjectCreationDataModel) model);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebSettingsPropertiesPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebSettingsPropertiesPage.java
deleted file mode 100644
index 4ba6410..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebSettingsPropertiesPage.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.SimpleWebNatureRuntimeUtilities;
-import org.eclipse.wst.web.internal.WebPropertiesUtil;
-import org.eclipse.wst.web.internal.operation.IStaticWebNature;
-
-public class SimpleWebSettingsPropertiesPage extends PropertyPage {
-
-	private Text contextRootField = null;
-	private Text fWebContentNameField = null;
-	private SimpleContextRootComposite staticContextRoot = null;
-	private String oldContextRoot = null;
-	private String fOldWebContentName = null;
-	private IProject fProject = null;
-
-	public SimpleWebSettingsPropertiesPage() {
-		super();
-	}
-
-	/**
-	 * Creates and returns the SWT control for the customized body of this
-	 * preference page under the given parent composite.
-	 * <p>
-	 * This framework method must be implemented by concrete subclasses.
-	 * </p>
-	 * 
-	 * @param parent
-	 *            the parent composite
-	 * @return the new control
-	 */
-	protected Control createContents(Composite parent) {
-		Control retVal = null;
-
-		fProject = getWebProject();
-		if (fProject != null) {
-			IStaticWebNature webNature = SimpleWebNatureRuntimeUtilities.getRuntime(fProject);
-
-			if (webNature != null) {
-				updateFields(webNature);
-
-				// container specification group
-				Composite containerGroup = new Composite(parent, SWT.NONE);
-				GridLayout layout = new GridLayout();
-				layout.numColumns = 2;
-				containerGroup.setLayout(layout);
-				containerGroup.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL));
-
-				Listener listener = new Listener() {
-					public void handleEvent(Event e) {
-						validateFields();
-					}
-				};
-
-				createStaticControls(containerGroup, listener);
-
-				retVal = containerGroup;
-
-			} else {
-				Label closedProjectLabel = new Label(parent, SWT.NONE);
-				closedProjectLabel.setText(ResourceHandler.getString("StaticWebSettingsPropertiesPage.Not_available_for_closed_projects")); //$NON-NLS-1$
-				retVal = closedProjectLabel;
-			}
-		}
-		return retVal;
-	}
-
-	/**
-	 * The <code>PreferencePage</code> implementation of this
-	 * <code>IDialogPage</code> method creates a description label and button
-	 * bar for the page. It calls <code>createContents</code> to create the
-	 * custom contents of the page. If the Web Project is closed, we need to
-	 * avoid creating the buttons and the contents.
-	 */
-	public void createControl(Composite parent) {
-		fProject = getWebProject();
-		if (fProject != null && fProject.isOpen()) {
-			super.createControl(parent);
-		} else {
-			Label closedProjectLabel = new Label(parent, SWT.NONE);
-			closedProjectLabel.setText(ResourceHandler.getString("StaticWebSettingsPropertiesPage.Not_available_for_closed_projects")); //$NON-NLS-1$
-			setControl(closedProjectLabel);
-		}
-	}
-
-	protected void createStaticControls(Composite parent, Listener listener) {
-		WorkbenchHelp.setHelp(parent, "com.ibm.etools.webtools.webp1100"); //$NON-NLS-1$
-
-		IStaticWebNature webNature = SimpleWebNatureRuntimeUtilities.getRuntime(fProject);
-
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
-		data.heightHint = 15;
-
-		staticContextRoot = new SimpleContextRootComposite(parent);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		data.horizontalSpan = 2;
-		staticContextRoot.setLayoutData(data);
-		staticContextRoot.setContextRoot(webNature.getContextRoot());
-		staticContextRoot.addModifyListener(listener);
-
-		// Create Web content folder name label
-		Label webContentNameLabel = new Label(parent, SWT.CHECK);
-		webContentNameLabel.setText(ResourceHandler.getString("StaticWebSettingsPropertiesPage.Web_Content_Label")); //$NON-NLS-1$
-
-		// Create Web content folder name field
-		fWebContentNameField = new Text(parent, SWT.BORDER);
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-		fWebContentNameField.setLayoutData(data);
-		fWebContentNameField.setText(fOldWebContentName);
-		fWebContentNameField.addListener(SWT.Modify, listener);
-	}
-
-	public String getStaticContextRoot() {
-		return (staticContextRoot != null) ? staticContextRoot.getContextRoot() : null;
-	}
-
-	public String getWebContentName() {
-		return (fWebContentNameField != null) ? fWebContentNameField.getText() : null;
-	}
-
-	protected void validateFields() {
-		String msg = WebPropertiesUtil.validateContextRoot(getStaticContextRoot());
-		/*
-		 * if( msg == null ) msg = WebPropertiesUtil.validateWebContentName(
-		 * getWebContentName(), fProject, null);
-		 */
-		if (msg != null) {
-			setValid(false);
-			setErrorMessage(msg);
-		} else {
-			setValid(true);
-			setErrorMessage(null);
-		}
-	}
-
-	/**
-	 * Returns the highlighted item in the workbench.
-	 */
-	private IProject getWebProject() {
-		Object element = getElement();
-
-		if (element instanceof IProject) {
-			return (IProject) element;
-		}
-
-		return null;
-	}
-
-	private boolean hasStaticContextRootChanged() {
-		if (oldContextRoot == null)
-			return true;
-		return !oldContextRoot.equals(getStaticContextRoot());
-	}
-
-	private boolean hasWebContentNameChanged() {
-		if (fOldWebContentName == null)
-			return true;
-		return !fOldWebContentName.equals(getWebContentName());
-	}
-
-	/**
-	 * Performs special processing when this page's Defaults button has been
-	 * pressed.
-	 * <p>
-	 * This is a framework hook method for sublcasses to do special things when
-	 * the Defaults button has been pressed. Subclasses may override, but should
-	 * call <code>super.performDefaults</code>.
-	 * </p>
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-
-		if (contextRootField != null)
-			contextRootField.setText(oldContextRoot);
-
-		if (fWebContentNameField != null)
-			fWebContentNameField.setText(fOldWebContentName);
-
-		if (staticContextRoot != null)
-			staticContextRoot.setContextRoot(oldContextRoot);
-	}
-
-	public boolean performOk() {
-		boolean retVal = true;
-
-		try {
-			if (hasUpdatedStaticInformation()) {
-				IStaticWebNature nature = SimpleWebNatureRuntimeUtilities.getRuntime(fProject);
-
-				if (!oldContextRoot.equals(getStaticContextRoot()))
-					nature.setContextRoot(staticContextRoot.getContextRoot());
-
-				if (!fOldWebContentName.equals(getWebContentName())) {
-					moveWebContentFolder(fProject, getWebContentName(), new NullProgressMonitor());
-					nature.setModuleServerRootName(getWebContentName());
-				}
-			}
-		} catch (CoreException e) {
-			// TODO prolly want to do something better here
-		}
-
-		return retVal;
-	}
-
-	/**
-	 * Moves the web content folder to the name indicated only if that path
-	 * doesn't already exist in the project.
-	 * 
-	 * @param project
-	 *            The web project to be updated.
-	 * @param webContentName
-	 *            The new web content name
-	 * @param progressMonitor
-	 *            Indicates progress
-	 * @throws CoreException
-	 *             The exception that occured during move operation
-	 */
-	public static void moveWebContentFolder(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
-		IStaticWebNature webNature = SimpleWebNatureRuntimeUtilities.getRuntime(project);
-		IPath newPath = new Path(webContentName);
-		if (!project.exists(newPath)) {
-			IContainer webContentRoot = webNature.getModuleServerRoot();
-			webContentRoot.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
-		}
-	}
-
-	// the old values need to be updated after apply has been hit, not just
-	// when the page is first created
-	private void updateFields(IStaticWebNature nature) {
-
-		// IBaseWebNature nature =
-		// WebNatureRuntimeUtilities.getRuntime(fProject);
-		oldContextRoot = nature.getContextRoot();
-		fOldWebContentName = nature.getModuleServerRootName();
-	}
-
-	protected boolean hasUpdatedStaticInformation() {
-		return hasStaticContextRootChanged() || hasWebContentNameChanged();
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/.classpath b/plugins/org.eclipse.wst.web/.classpath
deleted file mode 100644
index 778788b..0000000
--- a/plugins/org.eclipse.wst.web/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="static_web_project"/>
-	<classpathentry kind="src" path="property_files"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web/.cvsignore b/plugins/org.eclipse.wst.web/.cvsignore
deleted file mode 100644
index 21c0734..0000000
--- a/plugins/org.eclipse.wst.web/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
diff --git a/plugins/org.eclipse.wst.web/.project b/plugins/org.eclipse.wst.web/.project
deleted file mode 100644
index fb86548..0000000
--- a/plugins/org.eclipse.wst.web/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.web/build.properties b/plugins/org.eclipse.wst.web/build.properties
deleted file mode 100644
index 92e2e5c..0000000
--- a/plugins/org.eclipse.wst.web/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               runtime/staticweb.jar,\
-               icons/
-jars.compile.order = runtime/staticweb.jar
-source.runtime/staticweb.jar = static_web_project/,\
-                               property_files/
-output.runtime/staticweb.jar = bin/
-src.includes = property_files/,\
-               plugin.xml,\
-               plugin.properties
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/component.xml b/plugins/org.eclipse.wst.web/component.xml
deleted file mode 100644
index 89207cb..0000000
--- a/plugins/org.eclipse.wst.web/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component  xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.web"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.web" fragment="false"/><plugin id="org.eclipse.wst.web.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 57c68b3..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/plugin.properties b/plugins/org.eclipse.wst.web/plugin.properties
deleted file mode 100644
index c6a4955..0000000
--- a/plugins/org.eclipse.wst.web/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
diff --git a/plugins/org.eclipse.wst.web/plugin.xml b/plugins/org.eclipse.wst.web/plugin.xml
deleted file mode 100644
index 5f0fa06..0000000
--- a/plugins/org.eclipse.wst.web/plugin.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.wst.web"
-   name="Simple Web Plug-in"
-   version="1.0.0"
-   provider-name="Eclipse.org"
-   description="This plugin contains the basic support, data model and operations to create a simple non j2ee web project."
-   class="org.eclipse.wst.web.internal.WSTWebPlugin">
-
-   <runtime>
-      <library name="runtime/staticweb.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.emf.common"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
-      <import plugin="org.eclipse.wst.common.frameworks.ui"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.wst.validation"/>
-      <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
-      <import plugin="org.eclipse.wst.server.core"/>
-      <import plugin="org.eclipse.jem.workbench"/>
-   </requires>
-   
-   <extension
-         id="StaticWebNature"
-         name="Static Web Properties"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-               class="org.eclipse.wst.web.internal.operation.StaticWebNatureRuntime">
-         </run>
-      </runtime>
-  </extension>
-   <!--  <extension
-         point="org.eclipse.wst.server.core.moduleFactories">
-      <moduleFactory
-            projects="true"
-            class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableFactory"
-            id="org.eclipse.jst.j2ee.internal.web.deployables.static">
-         <moduleType
-               versions="1.0"
-               types="web.static">
-         </moduleType>
-      </moduleFactory> -->
-    
-    <extension
-         point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-       <moduleArtifactAdapter
-            id="org.eclipse.jst.web.server.webstatic1"
-            class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
-         <enablement>
-           <with variable="selection">
-             <adapt type="org.eclipse.core.resources.IProject"/>
-           </with>
-         </enablement>
-       </moduleArtifactAdapter>    
-   </extension>
-   <extension point="org.eclipse.core.runtime.adapters">
-         <factory
-             class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter"
-             adaptableType="org.eclipse.core.resources.IProject">
-            <adapter type="org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact"/>
-        </factory>    
-   </extension> 
-   
-     <extension
-         point="org.eclipse.wst.server.core.moduleFactories">
-      <moduleFactory
-            projects="true"
-            class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableFactory"
-            id="org.eclipse.jst.j2ee.internal.web.deployables.static">
-         <moduleType
-               versions="1.2, 1.3, 1.4"
-               types="web.static">
-         </moduleType>
-      </moduleFactory>
-   </extension>
-</plugin>
diff --git a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties b/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
deleted file mode 100644
index e08efa2..0000000
--- a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-StaticWebProjectCreationWizard.Wizard_Title=New Simple Web Project
-StaticWebProjectWizardBasePage.Page_Description=Create a Web project for simple content (HTML files) only.
-StaticWebSettingsPropertiesPage.Web_Content_Label=Web content folder name:
-StaticContextRootComposite.Context_Root_Label=Context root
-StaticWebProjectWizardBasePage.Page_Title=Simple Web Project
-StaticWebSettingsPropertiesPage.Not_available_for_closed_projects=Web settings are not available for a closed project.
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
deleted file mode 100644
index f2afbb8..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-
-public interface ISimpleWebModuleConstants
-{
-	public static final String PLUG_IN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
-	public static final String STATIC_PROJECT_TYPE = "STATIC"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebNatureConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebNatureConstants.java
deleted file mode 100644
index 85035d4..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebNatureConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-public interface ISimpleWebNatureConstants {
-	java.lang.String STATIC_CONTEXT_ROOT = "/"; //$NON-NLS-1$
-	String STATIC_NATURE_ID = "org.eclipse.wst.web" + ".StaticWebNature"; //$NON-NLS-1$ //$NON-NLS-2$
-	int STATIC_WEB_PROJECT = 0;
-	
-	String CSS_DIRECTORY = "theme"; //$NON-NLS-1$
-	String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
-	String LIBRARY_DIRECTORY = "lib"; //$NON-NLS-1$
-	String WEB_MODULE_DIRECTORY_V4 = "webApplication";//$NON-NLS-1$
-	String WEBSETTINGS_FILE_NAME = ".j2ee"; //$NON-NLS-1$
-	String WEB_MODULE_DIRECTORY_ = "Web Content";//$NON-NLS-1$
-	IPath WEB_MODULE_PATH_V4 = new Path(WEB_MODULE_DIRECTORY_V4);
-	IPath WEB_MODULE_PATH_ = new Path(WEB_MODULE_DIRECTORY_);
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IStaticWebNatureConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IStaticWebNatureConstants.java
deleted file mode 100644
index 506ddd8..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IStaticWebNatureConstants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-public interface IStaticWebNatureConstants {
-	java.lang.String STATIC_CONTEXT_ROOT = "/"; //$NON-NLS-1$
-	String STATIC_NATURE_ID = "org.eclipse.jst.j2ee.web" + ".StaticWebNature"; //$NON-NLS-1$ //$NON-NLS-2$
-	int STATIC_WEB_PROJECT = 0;
-	
-	String CSS_DIRECTORY = "theme"; //$NON-NLS-1$
-	String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
-	String LIBRARY_DIRECTORY = "lib"; //$NON-NLS-1$
-	String WEB_MODULE_DIRECTORY_V4 = "webApplication";//$NON-NLS-1$
-	String WEBSETTINGS_FILE_NAME = ".websettings"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IStaticWebProjectConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IStaticWebProjectConstants.java
deleted file mode 100644
index ad1ffe9..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IStaticWebProjectConstants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-
-public interface IStaticWebProjectConstants
-{
-	public static final String PLUG_IN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
-	public static final String STATIC_PROJECT_TYPE = "STATIC"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
deleted file mode 100644
index 0f4e7aa..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal;
-
-public interface IWSTWebPreferences {
-	String PREF_STATICWEBCONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
deleted file mode 100644
index 4390981..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class ResourceHandler
-{
-	private static final String BUNDLE_NAME = "staticwebproject";//$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private ResourceHandler() {
-		//Default constructor
-	}
-
-	public static String getString(String key)
-	{
-		// TODO Auto-generated method stub
-		try
-		{
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch( MissingResourceException e )
-		{
-			return '!' + key + '!';
-		}
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/SimpleWebNatureRuntimeUtilities.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/SimpleWebNatureRuntimeUtilities.java
deleted file mode 100644
index 5b5f40e..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/SimpleWebNatureRuntimeUtilities.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.web.internal.operation.IStaticWebNature;
-import org.eclipse.wst.web.internal.operation.StaticWebNatureRuntime;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-public class SimpleWebNatureRuntimeUtilities {
-	/**
-	 * WebNatureRuntimeHelper constructor comment.
-	 */
-	public SimpleWebNatureRuntimeUtilities() {
-		super();
-	}
-
-	/**
-	 * Adds a nauture to a project
-	 */
-	protected static void addNatureToProject(IProject proj, String natureId) throws CoreException {
-		ProjectUtilities.addNatureToProject(proj, natureId);
-	}
-
-	/**
-	 * Creation date: (10/22/2001 2:17:25 PM)
-	 * 
-	 * @return org.eclipse.jst.j2ee.internal.internal.internal.web.operations.IBaseWebNature
-	 */
-	public static IStaticWebNature getRuntime(IProject project) {
-		if (project == null)
-			return null;
-		try {
-			IStaticWebNature nature = null;
-			if (project.hasNature(ISimpleWebNatureConstants.STATIC_NATURE_ID))
-				nature = (IStaticWebNature) project.getNature(ISimpleWebNatureConstants.STATIC_NATURE_ID);
-			return nature;
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Return the J2EE Web Nature for the given project. If the the project does not have a J2EE Web
-	 * Nature, then return null.
-	 * 
-	 * @param project
-	 *            The project to get the nature from
-	 * @return IJ2EEWebNature The J2EE Web Nature
-	 */
-	public static StaticWebNatureRuntime getStaticRuntime(IProject project) {
-		IStaticWebNature nature = getRuntime(project);
-		if (nature != null) {
-			if (nature.isStatic())
-				return (StaticWebNatureRuntime) nature;
-		}
-		return null;
-	}
-
-	/**
-	 * Return whether or not the project has a runtime created on it.
-	 * 
-	 * @return boolean
-	 * @param project
-	 *            com.ibm.itp.core.api.resources.IProject
-	 */
-	public static boolean hasStaticRuntime(IProject project) {
-		if (project == null || !project.exists()) {
-			return false;
-		}
-		try {
-			return project.hasNature(ISimpleWebNatureConstants.STATIC_NATURE_ID);
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	public static String getDefaultStaticWebContentName() {
-		return WSTWebPlugin.getDefault().getWSTWebPreferences().getStaticWebContentFolderName();
-	}
-
-	public static String getContextRootFromWebProject(IProject project) {
-
-		// get uri from web app display name, and get context root from web nature
-		IStaticWebNature nature = SimpleWebNatureRuntimeUtilities.getRuntime(project);
-		String contextRoot = ""; //$NON-NLS-1$
-		contextRoot = nature.getContextRoot();
-
-		//	WebEditModel webEditModel = null;
-		//	try {
-		//		webEditModel = (nature.isStatic())
-		//						? null
-		//						:
-		// ((J2EEWebNatureRuntime)nature).getWebAppEditModelForRead(WebNatureRuntimeUtilities.this);
-		//		contextRoot = nature.getContextRoot();
-		//	} catch (Exception e) {
-		//		e.printStackTrace();
-		//	}
-		//	finally {
-		//		if (webEditModel != null)
-		//			webEditModel.releaseAccess(WebNatureRuntimeUtilities.this);
-		//	}
-		return contextRoot;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
deleted file mode 100644
index df141bd..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebPlugin extends AbstractUIPlugin
-{
-	//The shared instance.
-	private static WSTWebPlugin plugin;
-
-	private WSTWebPreferences preferences;
-	
-	public static final String PLUGIN_ID = "com.ibm.etools.webtools.staticwebproject"; //$NON-NLS-1$
-	public static final String VALIDATION_BUILDER_ID = ValidationPlugin.VALIDATION_BUILDER_ID; // plugin
-	
-	public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
-				"icons/full/ctool16", //$NON-NLS-1$
-				"icons/full/wizban", //$NON-NLS-1$
-				"icons", //$NON-NLS-1$
-				""}; //$NON-NLS-1$
-	/**
-	 * The constructor.
-	 */
-	public WSTWebPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static WSTWebPlugin getDefault()
-	{
-		return plugin;
-	}
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public ImageDescriptor getImageDescriptor(String key) {
-		ImageDescriptor imageDescriptor = null;
-		URL gifImageURL = getImageURL(key, getBundle());
-		if (gifImageURL != null)
-			imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
-		return imageDescriptor;
-	}
-	/**
-	 * This gets a .gif from the icons folder.
-	 */
-	public static URL getImageURL(String key, Bundle bundle) {
-		String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
-		IPath path = null;
-		for (int i = 0; i < ICON_DIRS.length; i++) {
-			path = new Path(ICON_DIRS[i]).append(gif);
-			if (bundle.getEntry(path.toString()) == null)
-				continue;
-			try {
-				return new URL(bundle.getEntry("/"), path.toString());
-			} catch (MalformedURLException exception) {
-				org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning("Load_Image_Error_"); //$NON-NLS-1$
-				exception.printStackTrace();
-				continue;
-			}
-		}
-		return null;
-	}
-
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	protected void initializeDefaultPluginPreferences() {
-		getWSTWebPreferences().initializeDefaultPreferences();
-	}
-	/**
-	 * @return Returns the preferences.
-	 */
-	public WSTWebPreferences getWSTWebPreferences() {
-		if (this.preferences == null)
-			this.preferences = new WSTWebPreferences(this);
-		return this.preferences;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
deleted file mode 100644
index fd5256a..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
-	public interface Keys {
-		final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-	}
-	public interface Values {
-		final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
-	}
-	public interface Defaults {
-		final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
-	}
-	private Plugin owner = null;
-	private Preferences preferences = null;
-	private boolean persistOnChange = false;
-	
-	public WSTWebPreferences(Plugin owner) {
-		this.owner = owner;
-	}
-	protected void initializeDefaultPreferences() {
-		getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
-	}
-	
-	public String getStaticWebContentFolderName() {
-		return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
-	}
-	
-	public void setStaticWebContentFolderName(String value) {
-		getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
-		firePreferenceChanged();
-	}
-	
-	public void firePreferenceChanged() {
-		if (isPersistOnChange())
-			persist();
-	}
-
-	public void persist() {
-		getOwner().savePluginPreferences();
-	}
-
-	/**
-	 * @return Returns the persistOnChange.
-	 */
-	public boolean isPersistOnChange() {
-		return this.persistOnChange;
-	}
-
-	/**
-	 * @param persistOnChange
-	 *            The persistOnChange to set.
-	 */
-	public void setPersistOnChange(boolean persistOnChange) {
-		this.persistOnChange = persistOnChange;
-	}
-
-	private Preferences getPreferences() {
-		if (this.preferences == null)
-			this.preferences = getOwner().getPluginPreferences();
-		return this.preferences;
-	}
-
-	/**
-	 * @return Returns the owner.
-	 */
-	private Plugin getOwner() {
-		return this.owner;
-	}
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
deleted file mode 100644
index 7a3cc43..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal;
-
-import java.util.StringTokenizer;
-
-public class WebPropertiesUtil {
-	private static final char[] BAD_CHARS = {'/', '\\', ':'};
-	/**
-	 * @param project
-	 *            org.eclipse.core.resources.IProject
-	 */
-	/**
-	 * Returns a error message that states whether a context root is valid or not returns null if
-	 * context root is fine
-	 * 
-	 * @return java.lang.String
-	 * @param contextRoot
-	 *            java.lang.String
-	 */
-	public static String validateContextRoot(String contextRoot) {
-
-		if (contextRoot == null)
-			return null;
-
-		String errorMessage = null;
-
-		String name = contextRoot;
-		if (name.equals("") || name == null) { //$NON-NLS-1$
-			//  this was added because the error message shouldnt be shown initially. It should be
-			// shown only if context root field is edited to
-			errorMessage = ResourceHandler.getString("StaticWebProjectWizardBasePage.Page_Title"); //$NON-NLS-1$
-			
-			//errorMessage = ProjectSupportResourceHandler.getString("Context_Root_cannot_be_empty_2"); //$NON-NLS-1$
-			return errorMessage;
-		}
-
-		/*******************************************************************************************
-		 * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
-		 * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
-		 * errorMessage;
-		 *  }
-		 ******************************************************************************************/
-
-		if (name.trim().equals(name)) {
-			StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
-			outer : while (stok.hasMoreTokens()) {
-				String token = stok.nextToken();
-				for (int i = 0; i < token.length(); i++) {
-					if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
-						if (Character.isWhitespace(token.charAt(i))) {
-							//Removed because context roots can contain white space
-							//errorMessage =
-							//	ResourceHandler.getString("_Context_root_cannot_conta_UI_");//$NON-NLS-1$
-							// = " Context root cannot contain whitespaces."
-						} else {
-							errorMessage = ResourceHandler.getString("StaticWebProjectWizardBasePage.Page_Title"); //$NON-NLS-1$
-							
-							//errorMessage = ProjectSupportResourceHandler.getString("The_character_is_invalid_in_a_context_root", new Object[]{(new Character(token.charAt(i))).toString()}); //$NON-NLS-1$
-							break outer;
-						}
-					}
-				}
-			}
-		} // en/ end of if(name.trim
-		else
-			errorMessage = ResourceHandler.getString("StaticWebProjectWizardBasePage.Page_Title"); //$NON-NLS-1$
-			//errorMessage = ProjectSupportResourceHandler.getString("Names_cannot_begin_or_end_with_whitespace_5"); //$NON-NLS-1$
-
-		return errorMessage;
-	}
-
-
-	/**
-	 * Return true if the string contains any of the characters in the array.
-	 */
-	private static boolean contains(String str, char[] chars) {
-		for (int i = 0; i < chars.length; i++) {
-			if (str.indexOf(chars[i]) != -1)
-				return true;
-		}
-		return false;
-	}
-
-
-	public static String validateFolderName(String folderName) {
-		if (folderName.length() == 0)
-			return ResourceHandler.getString("StaticWebProjectWizardBasePage.Page_Title"); //$NON-NLS-1$
-			
-			//return ProjectSupportResourceHandler.getString("Folder_name_cannot_be_empty_2"); //$NON-NLS-1$
-
-		if (contains(folderName, BAD_CHARS))
-			return ResourceHandler.getString("StaticWebProjectWizardBasePage.Page_Title"); //$NON-NLS-1$
-			
-			//return ProjectSupportResourceHandler.getString("Folder_name_is_not_valid", new Object[]{folderName}); //$NON-NLS-1$
-
-		return null;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
deleted file mode 100644
index 49ee452..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.eclipse.wst.web.internal.deployables;
-
-
-public interface IStaticWebModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
deleted file mode 100644
index d319eb5..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.util.IStaticWeb;
-import org.eclipse.wst.server.core.util.ProjectModule;
-import org.eclipse.wst.web.internal.ISimpleWebNatureConstants;
-import org.eclipse.wst.web.internal.SimpleWebNatureRuntimeUtilities;
-import org.eclipse.wst.web.internal.operation.IStaticWebNature;
-
-public class StaticWebDeployable extends ProjectModule implements IStaticWeb {
-
-	public StaticWebDeployable(IProject project) {
-		super(project);
-		setWebNature(getStaticWebNature());
-	}
-
-	/**
-	 * TODO Changed setModule to setProject to react to changes in IStaticWebNature. Verify if this change is correct.
-	 * @param staticWebNature
-	 */
-	private void setWebNature(IStaticWebNature nature) {
-		nature.setProject(getProject());
-	}
-
-	public String getFactoryId() {
-		return "org.eclipse.jst.j2ee.internal.internal.internal.web.deployables.static"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns true if this deployable currently exists, and false if it has been deleted or moved
-	 * and is no longer represented by this deployable.
-	 * 
-	 * @return boolean
-	 */
-	public boolean exists() {
-		if (getProject() == null || !getProject().exists())
-			return false;
-		try {
-			return (this.project.hasNature(ISimpleWebNatureConstants.STATIC_NATURE_ID));
-		} catch (Exception e) {
-			//e.printStackTrace();
-		}
-		return false;
-	}
-
-	protected IStaticWebNature getStaticWebNature() {
-		return SimpleWebNatureRuntimeUtilities.getStaticRuntime(this.project);
-	}
-
-	public String getContextRoot() {
-		IStaticWebNature nature = getStaticWebNature();
-		if (nature != null)
-			return nature.getContextRoot();
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.ibm.wtp.server.core.util.ProjectModule#getRootFolder()
-	 */
-	public IPath getRootFolder() {
-		// TODO Auto-generated method stub
-		return getStaticWebNature().getRootPublishableFolder().getProjectRelativePath();
-	}
-
-	public String getType() {
-		return "web.static"; //$NON-NLS-1$
-	}
-
-	public String getVersion() {
-		return "1.0"; //$NON-NLS-1$
-	}
-
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.server.core.IModule#validate(org.eclipse.core.runtime.IProgressMonitor)
-     */
-    public IStatus validate(IProgressMonitor monitor) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.server.core.IModule#getModuleType()
-     */
-    public IModuleType getModuleType() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.server.core.IModule#getChildModules(org.eclipse.core.runtime.IProgressMonitor)
-     */
-    public IModule[] getChildModules(IProgressMonitor monitor) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-     */
-    public Object getAdapter(Class adapter) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
deleted file mode 100644
index 5c21484..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-import org.eclipse.wst.web.internal.ISimpleWebNatureConstants;
-import org.eclipse.wst.web.internal.operation.IBaseWebNature;
-
-public class StaticWebDeployableFactory extends ProjectModuleFactoryDelegate {
-	private static final String ID = "org.eclipse.jst.j2ee.internal.web.deployables.static"; //$NON-NLS-1$
-	protected ArrayList moduleDelegates = new ArrayList();
-
-	/*
-	 * @see DeployableProjectFactoryDelegate#getFactoryID()
-	 */
-	public String getFactoryId() {
-		return ID;
-	}
-
-	/**
-	 * Returns true if the project represents a deployable project of this type.
-	 * 
-	 * @param project
-	 *            org.eclipse.core.resources.IProject
-	 * @return boolean
-	 */
-	protected boolean isValidModule(IProject project) {
-		return false;
-	}
-
-	/**
-	 * Creates the deployable project for the given project.
-	 * 
-	 * @param project
-	 *            org.eclipse.core.resources.IProject
-	 * @return com.ibm.etools.server.core.model.IDeployableProject
-	 */
-	protected IModule createModule(IProject project) {
-		try {
-			IModule deployable = null;
-			StaticWebDeployable projectModule = null;
-			IBaseWebNature nature = (IBaseWebNature) project.getNature(ISimpleWebNatureConstants.STATIC_NATURE_ID);
-			deployable = nature.getModule();
-			if (deployable == null) {
-				projectModule = new StaticWebDeployable(nature.getProject());
-				deployable = createModule(projectModule.getId(), projectModule.getName(), projectModule.getType(), projectModule.getVersion(), projectModule.getProject());
-				nature.setModule(deployable);
-				projectModule.initialize(deployable);
-				//deployable = projectModule.getModule();
-			}
-			moduleDelegates.add(projectModule);
-			return deployable;
-		} catch (Exception e) {
-			//Ignore
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModuleDelegate(org.eclipse.wst.server.core.IModule)
-	 */
-	public ModuleDelegate getModuleDelegate(IModule module) {
-		for (Iterator iter = moduleDelegates.iterator(); iter.hasNext();) {
-			ModuleDelegate element = (ModuleDelegate) iter.next();
-			if (module == element.getModule())
-				return element;
-		}
-		return null;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModules()
-	 */
-	public IModule[] getModules() {
-		if (projects == null || projects.isEmpty())
-			cacheModules();
-		int i = 0;
-		Iterator modules = projects.values().iterator();
-		IModule[] modulesArray = new IModule[projects.values().size()];
-		while (modules.hasNext()) {
-			IModule element = (IModule) modules.next();
-			modulesArray[i++] = element;
-
-		}
-		return modulesArray;
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate#createModules(org.eclipse.core.resources.IProject)
-	 */
-	protected IModule[] createModules(IProject project) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
deleted file mode 100644
index e514f80f..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.wst.web.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class StaticWebDeployableObjectAdapter extends ModuleArtifactAdapterDelegate implements IAdapterFactory
-
-{
-
-	public StaticWebDeployableObjectAdapter() {
-		super();
-	}
-
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		return null;
-	}
-
-	public Class[] getAdapterList() {
-		return new Class[]{IStaticWebModuleArtifact.class};
-	}
-
-	public IModuleArtifact getModuleArtifact(Object obj) {
-		return StaticWebDeployableObjectAdapterUtil.getModuleObject(obj);
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
deleted file mode 100644
index 852b617..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.web.internal.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-//import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-//import org.eclipse.jst.j2ee.internal.web.operations.WebNatureRuntimeUtilities;
-
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.WebResource;
-import org.eclipse.wst.web.internal.operation.IBaseWebNature;
-import org.eclipse.wst.web.internal.operation.StaticWebNatureRuntime;
-
-public class StaticWebDeployableObjectAdapterUtil {
-
-	private final static String[] extensionsToExclude = new String[]{"sql", "xmi"}; //$NON-NLS-1$ //$NON-NLS-2$
-	static String J2EE_NATURE_ID = "org.eclipse.jst.j2ee.web.WebNature"; //$NON-NLS-1$
-	static String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
-	public static IBaseWebNature getRuntime(IProject project) {
-		if (project == null)
-			return null;
-		try {
-			IBaseWebNature nature;
-			if (project.hasNature(J2EE_NATURE_ID))
-				nature = (IBaseWebNature) project.getNature(J2EE_NATURE_ID);
-			else
-				nature = (IBaseWebNature) project.getNature("org.eclipse.wst.web.StaticWebNature");
-			return nature;
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-	public static IModuleArtifact getModuleObject(Object obj) {
-		IResource resource = null;
-		if (obj instanceof IResource)
-			resource = (IResource) obj;
-		else if (obj instanceof IAdaptable)
-			resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
-		if (resource == null)
-			return null;
-
-		// find deployable
-    	IBaseWebNature webNature = getRuntime(resource.getProject());
-		if (webNature == null || !(webNature instanceof StaticWebNatureRuntime))
-			return null;
-
-		if (resource instanceof IProject)
-			return new WebResource(getModule(webNature), new Path("")); //$NON-NLS-1$
-
-		// determine path
-		IPath rootPath = webNature.getRootPublishableFolder().getProjectRelativePath();
-		IPath resourcePath = resource.getProjectRelativePath();
-
-		// Check to make sure the resource is under the webApplication directory
-		if (resourcePath.matchingFirstSegments(rootPath) != rootPath.segmentCount())
-			return null;
-
-		// Do not allow resource under the web-inf directory
-		resourcePath = resourcePath.removeFirstSegments(rootPath.segmentCount());
-		if (resourcePath.segmentCount() > 1 && resourcePath.segment(0).equals(INFO_DIRECTORY))
-			return null;
-
-		if (shouldExclude(resource))
-			return null;
-
-		// return Web resource type
-		return new WebResource(getModule(webNature), resourcePath);
-
-	}
-
-	/**
-	 * Method shouldExclude.
-	 * 
-	 * @param resource
-	 * @return boolean
-	 */
-	private static boolean shouldExclude(IResource resource) {
-		String fileExt = resource.getFileExtension();
-
-		// Exclude files of certain extensions
-		for (int i = 0; i < extensionsToExclude.length; i++) {
-			String extension = extensionsToExclude[i];
-			if (extension.equalsIgnoreCase(fileExt))
-				return true;
-		}
-		return false;
-	}
-
-	protected static IModule getModule(IBaseWebNature nature) {
-		IModule deployable = nature.getModule();
-		if (deployable != null)
-			return deployable;
-
-		IProject project = nature.getProject();
-		Iterator iterator =  Arrays.asList(ServerUtil.getModules("web.static")).iterator(); //$NON-NLS-1$ //$NON-NLS-2$
-		while (iterator.hasNext()) {
-			deployable = (IModule) iterator.next();
-			if (deployable instanceof IModule) {
-				if (((IModule) deployable).getProject().equals(project))
-					return deployable;
-			}
-		}
-		return null;
-	}
-
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IBaseWebNature.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IBaseWebNature.java
deleted file mode 100644
index 9679a2e..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IBaseWebNature.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Created on Dec 2, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.server.core.IModule;
-
-/**
- * @author dfholt
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface IBaseWebNature extends IProjectNature {
-	/**
-	 * Insert the method's description here. Creation date: (10/31/2001 2:27:17 PM)
-	 * 
-	 * @param path
-	 * @param s
-	 *            java.lang.String
-	 */
-	void createFile(IPath path, String s) throws org.eclipse.core.runtime.CoreException;
-
-	/**
-	 * Insert the method's description here. Creation date: (10/16/2001 1:42:50 PM)
-	 * 
-	 * @return java.lang.String
-	 */
-	String getContextRoot();
-
-
-	/**
-	 * This is a proxy method to enable invoking getModuleServerRoot() through the IBaseWebNature
-	 * interface. The method can't be defined directly on the interface since it's implemented by
-	 * AbstractJavaMOFNatureRuntime
-	 * 
-	 * Creation date: (10/23/2001 2:24:52 PM)
-	 * 
-	 * @return org.eclipse.core.resources.IContainer
-	 */
-	IContainer getRootPublishableFolder();
-
-	/**
-	 * @return String
-	 */
-	String getModuleServerRootName();
-
-	void setModuleServerRootName(String name) throws CoreException;
-
-	/**
-	 * @return IContainer
-	 */
-	IContainer getModuleServerRoot();
-
-	/**
-	 * @return org.eclipse.core.runtime.IPath
-	 */
-	IPath getWebSettingsPath();
-
-	/**
-	 * Creation date: (10/30/2001 5:30:42 PM)
-	 * 
-	 * @return boolean
-	 * @deprecated
-	 */
-	int getWebNatureType();
-
-	/**
-	 * Insert the method's description here. Creation date: (10/30/2001 5:30:10 PM)
-	 * 
-	 * @param type
-	 *            boolean
-	 * @deprecated
-	 */
-	void setWebNatureType(int type) throws CoreException;
-
-	/**
-	 * Return true if J2EE nature.
-	 * 
-	 * @return boolean
-	 */
-	boolean isJ2EE();
-
-	/**
-	 * Return true if Static nature.
-	 * 
-	 * @return boolean
-	 */
-	boolean isStatic();
-
-	/**
-	 * Return the deployable object for use by the server tooling
-	 */
-	IModule getModule();
-	/**
-	 * Insert the method's description here. Creation date: (10/23/2001 5:50:15 PM)
-	 * 
-	 * @return org.eclipse.core.runtime.IPath
-	 */
-	IPath getWebModulePath();
-	/**
-	 * @return org.eclipse.core.runtime.IPath
-	 */
-	IPath getBasicWebModulePath();
-	/**
-	 * Set the deployable object for use by the server tooling
-	 */
-	void setModule(IModule module);
-
-	void setContextRoot(String contextRoot) throws CoreException;
-
-	void setFeatureIds(String[] featureIds) throws CoreException;
-
-	String[] getFeatureIds();
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java
deleted file mode 100644
index 2d3d1bc..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/ILibModule.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.core.resources.IProject;
-
-public interface ILibModule {
-	String getJarName();
-
-	String getProjectName();
-
-	String getURI();
-
-	IProject getProject();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IStaticWebNature.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IStaticWebNature.java
deleted file mode 100644
index 76e7eca..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IStaticWebNature.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-
-
-/**
- * The IWebNature defines the web related behaviour of a project.
- */
-public interface IStaticWebNature extends IBaseWebNature {
-	//Default
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java
deleted file mode 100644
index 4719804..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/LibModule.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.web.internal.ISimpleWebNatureConstants;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-
-public class LibModule implements ILibModule {
-	protected static final IPath LIB_PATH = new Path(ISimpleWebNatureConstants.INFO_DIRECTORY).append(ISimpleWebNatureConstants.LIBRARY_DIRECTORY);
-
-	private String jarName;
-	private String projectName;
-
-	public LibModule(String jarName, String projectName) {
-		this.jarName = jarName;
-		this.projectName = projectName;
-	}
-
-	/*
-	 * @see ILibModule#getJarName()
-	 */
-	public String getJarName() {
-		return jarName;
-	}
-
-	/*
-	 * @see ILibModule#getProjectName()
-	 */
-	public String getProjectName() {
-		return projectName;
-	}
-
-	/*
-	 * @see ILibModule#getProject()
-	 */
-	public IProject getProject() {
-		return (IProject) WSTWebPlugin.getWorkspace().getRoot().findMember(projectName);
-	}
-
-	/**
-	 * @see ILibModule#getURI()
-	 */
-	public String getURI() {
-		return IPath.SEPARATOR + LIB_PATH.append(getJarName()).toString();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object obj) {
-		if (obj == null || !(obj instanceof ILibModule)) {
-			return false;
-		}
-		ILibModule module = (ILibModule) obj;
-		return getJarName().equals(module.getJarName()) && getProjectName().equals(module.getProjectName()) && getURI().equals(module.getURI()) && getProject().equals(module.getProject());
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModel.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModel.java
deleted file mode 100644
index e9ca279..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModel.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
-import org.eclipse.wst.web.internal.ISimpleWebNatureConstants;
-
-public class SimpleWebModuleCreationDataModel extends ProjectCreationDataModel
-{
-	/*
-	 * required (automatically set) for the Features page to determine which
-	 * features to provide. Type "int" set to
-	 * IWebNatureConstants.STATIC_WEB_PROJECT
-	 */
-	public SimpleWebModuleCreationDataModel createStaticWebProjectCreationDataModel(
-			String projectName)
-	{
-		SimpleWebModuleCreationDataModel model = (SimpleWebModuleCreationDataModel) super
-				.createProjectCreationDataModel(projectName);
-		model.addStaticWebNature();
-		//setIntProperty(WebProjectFeaturesDataModel.WEB_PROJECT_TYPE, IWebNatureConstants.STATIC_WEB_PROJECT);
-
-		return model;
-	}
-
-	public SimpleWebModuleCreationDataModel()
-	{
-		super();
-		addStaticWebNature();
-		//setIntProperty(WebProjectFeaturesDataModel.WEB_PROJECT_TYPE,IWebNatureConstants.STATIC_WEB_PROJECT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.operation.ProjectCreationDataModel#initValidBaseProperties()
-	 */
-	protected void initValidBaseProperties()
-	{
-		super.initValidBaseProperties();
-		//addValidBaseProperty(WebProjectFeaturesDataModel.WEB_PROJECT_TYPE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.operation.ProjectCreationDataModel#getDefaultOperation()
-	 */
-	public WTPOperation getDefaultOperation()
-	{
-		return new SimpleWebModuleCreationOperation(this);
-	}
-
-	protected final void addStaticWebNature()
-	{
-		String[] natures = (String[]) getProperty(PROJECT_NATURES);
-		String[] newNatures;
-
-		if( natures == null )
-		{
-			newNatures = new String[1];
-			newNatures[0] = ISimpleWebNatureConstants.STATIC_NATURE_ID;
-		}
-		else
-		{
-			newNatures = new String[natures.length + 1];
-			System.arraycopy(natures, 0, newNatures, 0, natures.length);
-			newNatures[natures.length] = ISimpleWebNatureConstants.STATIC_NATURE_ID;
-		}
-
-		setProperty(PROJECT_NATURES, newNatures);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.operation.ProjectCreationDataModel#doValidateProperty(java.lang.String)
-	 */
-	protected IStatus doValidateProperty(String propertyName)
-	{
-		/*if( propertyName.equals(WebProjectFeaturesDataModel.WEB_PROJECT_TYPE) )
-		{
-			return OK_STATUS;
-		}*/
-		return super.doValidateProperty(propertyName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jem.util.operation.WTPOperationDataModel#getTargetProject()
-	 */
-	public IProject getTargetProject()
-	{
-		return ProjectCreationDataModel.getProjectHandleFromProjectName(getStringProperty(PROJECT_NAME));
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationOperation.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationOperation.java
deleted file mode 100644
index c71ec5f..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationOperation.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal.operation;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationOperation;
-import org.eclipse.wst.web.internal.ISimpleWebNatureConstants;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class SimpleWebModuleCreationOperation extends ProjectCreationOperation
-{
-	/**
-	 * @param dataModel
-	 */
-	public SimpleWebModuleCreationOperation(ProjectCreationDataModel dataModel)
-	{
-		super(dataModel);
-	}
-
-	protected void execute(IProgressMonitor monitor) throws CoreException,
-			InvocationTargetException, InterruptedException
-	{
-		super.execute(monitor);
-
-		SimpleWebModuleCreationDataModel dataModel = (SimpleWebModuleCreationDataModel) operationDataModel;
-		IProject project = dataModel.getProject();
-
-		IFolder webContentFolder = project
-				.getFolder(getWebContentFolderPreference());
-
-		if( !webContentFolder.exists() )
-				webContentFolder.create(true, true, null);
-
-		IFolder cssFolder = project.getFolder(webContentFolder
-				.getProjectRelativePath().append(
-						ISimpleWebNatureConstants.CSS_DIRECTORY));
-
-		if( !cssFolder.exists() ) cssFolder.create(true, true, null);
-
-		//createWebSettings(project);
-
-		if( monitor.isCanceled() ) throw new OperationCanceledException();
-	}
-
-	//To do: WebSettings do not exist now
-//	private void createWebSettings(IProject project) throws CoreException
-//	{
-//		WebSettings webSettings = new WebSettings(project);
-//		webSettings.setContextRoot(project.getName());
-//		webSettings.setWebContentName(getWebContentFolderPreference());
-//		//		webSettings
-//		//				.setProjectType(IStaticWebProjectConstants.STATIC_PROJECT_TYPE);
-//
-//		webSettings.write();
-//	}
-
-	private String getWebContentFolderPreference()
-	{
-		//TODO implement
-		String webContentFolder = WSTWebPlugin.getDefault().getWSTWebPreferences().getStaticWebContentFolderName();
-		return webContentFolder;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebNatureRuntime.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebNatureRuntime.java
deleted file mode 100644
index db3bb51..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/StaticWebNatureRuntime.java
+++ /dev/null
@@ -1,652 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-/*
- * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved. US
- * Government Users Restricted Rights - Use, duplication or disclosure restricted by GSA ADP
- * Schedule Contract with IBM Corp.
- */
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.web.internal.ISimpleWebNatureConstants;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/*
- * Licensed Materials - Property of IBM, WebSphere Studio Workbench (c) Copyright IBM Corp 2000
- */
-public class StaticWebNatureRuntime implements IStaticWebNature {
-	static protected String PROJECTTYPE_STATIC_VALUE = "STATIC"; //$NON-NLS-1$
-	static protected String PROJECTTYPE_J2EE_VALUE = "J2EE"; //$NON-NLS-1$
-
-	// Version number may not change with every release,
-	// only when changes necessitate a new version number
-	public static int CURRENT_VERSION = 500;
-
-	public static int instanceCount = 1;
-	public int instanceStamp = 0;
-	protected String contextRoot = null;
-	protected String[] featureIds = null;
-	protected int fVersion = -1;
-
-	//protected WebSettings fWebSettings;
-
-
-	protected IModule module;
-	protected IProject project;
-
-//	private static final String LINKS_BUILDER_ID = "com.ibm.etools.webtools.additions.linksbuilder"; //$NON-NLS-1$
-
-	/**
-	 * WebNatureRuntime constructor comment.
-	 */
-	public StaticWebNatureRuntime() {
-		super();
-		instanceStamp = instanceCount;
-		instanceCount++;
-
-		class WebSettingsModifier implements IResourceChangeListener, IResourceDeltaVisitor {
-
-			public void resourceChanged(IResourceChangeEvent event) {
-				if (event.getSource() instanceof IWorkspace) {
-					IResourceDelta delta = event.getDelta();
-					switch (event.getType()) {
-						case IResourceChangeEvent.PRE_BUILD :
-							if (delta != null) {
-								try {
-									delta.accept(this);
-								} catch (CoreException e) {
-									//Ignore
-								}
-							}
-							break;
-					}
-				}
-			}
-
-			public boolean visit(IResourceDelta delta) throws CoreException {
-				if (delta != null) {
-					// get target IResource
-					final IResource resource = delta.getResource();
-					if (resource != null) {
-						if (resource.getType() == IResource.FILE) {
-							// If the websettings file is being modified, reset all the cached
-							// values
-							// in the nature
-							IFile file = (IFile) resource;
-							if ((file.getName().equals(ISimpleWebNatureConstants.WEBSETTINGS_FILE_NAME)) && (resource.getProject().getName().equals(getProject().getName()))) {
-								resetWebSettings();
-							}
-						}
-					}
-					return true;
-				}
-				return false;
-			}
-
-		}
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		workspace.addResourceChangeListener(new WebSettingsModifier(), IResourceChangeEvent.PRE_BUILD);
-
-	}
-
-	/*
-	 * Do nothing with a cvs ignore file for web projects, till a better solution is found from OTI
-	 */
-
-	public void addCVSIgnoreFile() {
-		//Do nothing
-	}
-
-	/**
-	 * Adds a builder to the build spec for the given project.
-	 */
-	protected void addToFrontOfBuildSpec(String builderID) throws CoreException {
-		IProjectDescription description = getProject().getDescription();
-		ICommand[] commands = description.getBuildSpec();
-		boolean found = false;
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals(builderID)) {
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			ICommand command = description.newCommand();
-			command.setBuilderName(builderID);
-			ICommand[] newCommands = new ICommand[commands.length + 1];
-			System.arraycopy(commands, 0, newCommands, 1, commands.length);
-			newCommands[0] = command;
-			IProjectDescription desc = getProject().getDescription();
-			desc.setBuildSpec(newCommands);
-			getProject().setDescription(desc, null);
-		}
-	}
-
-	/**
-	 * Create a default file for the user given the name (directory relative to the project) and the
-	 * default contents for the file.
-	 * 
-	 * @param newFilePath -
-	 *            IPath
-	 * @param newFileContents -
-	 *            String
-	 */
-	public void createFile(IPath newFilePath, String newFileContents) throws CoreException {
-
-		IPath projectPath = project.getFullPath();
-		IWorkspace workspace = WSTWebPlugin.getWorkspace();
-
-		createFolder(newFilePath.removeLastSegments(1).toString());
-
-		IFile outputFile = workspace.getRoot().getFile(projectPath.append(newFilePath));
-		outputFile.refreshLocal(IResource.DEPTH_INFINITE, null);
-
-		InputStream inputStream = new ByteArrayInputStream(newFileContents.getBytes());
-		if (!(outputFile.exists()))
-			outputFile.create(inputStream, true, null);
-	}
-
-	/**
-	 * Create the folders for the project we have just created.
-	 * 
-	 * @exception com.ibm.itp.core.api.resources.CoreException
-	 *                The exception description.
-	 */
-	protected void createFolders() throws CoreException {
-		// Create the WEB_MODULE directory
-		createFolder(getBasicWebModulePath());
-	}
-
-	/**
-	 * Create a new nature runtime from the project info
-	 */
-	//	public static StaticWebNatureRuntime createRuntime(WebProjectInfo info) throws CoreException
-	// {
-	//		IProject project = info.getProject();
-	//		if (!hasRuntime(project)) {
-	//			addNatureToProject(project, ISimpleWebNatureConstants.STATIC_NATURE_ID);
-	//			StaticWebNatureRuntime runtime
-	// =(StaticWebNatureRuntime)WebNatureRuntimeUtilities.getRuntime(project);
-	//			runtime.initializeFromInfo(info);
-	//			return runtime;
-	//		}
-	//		return getRuntime(project);
-	//	}
-	/**
-	 * Removes this nature from the project.
-	 * 
-	 * @see IProjectNature#deconfigure
-	 */
-	public void deconfigure() throws CoreException {
-		//		super.deconfigure();
-		//		removeFromBuildSpec(J2EEPlugin.LINKS_BUILDER_ID);
-	}
-
-	/*
-	 * Returns the context root that the server is configured with (also called the web app path).
-	 * This is the path that the war is placed on within the deployed server. This path must be
-	 * included as the first segment of a doc relative path specification within an html file.
-	 */
-	public String getContextRoot() {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-		if (contextRoot == null) {
-//			WebSettings settings = getWebSettings();
-//			contextRoot = settings.getContextRoot();
-//			if (contextRoot == null)
-//				contextRoot = getProject().getName();
-		}	
-		return contextRoot;
-	}
-
-//	protected WebSettings getWebSettings() {
-//		if (fWebSettings == null) {
-//			fWebSettings = new WebSettings(getProject());
-//		}
-//		return fWebSettings;
-//	}
-
-	/*
-	 * Returns the root that the server runs off of. For projects created in v4, this is
-	 * webApplication. For projects created in v5.0, this is Web Content. For projects created in
-	 * v5.0.1 and later, this is configurable per project by the user.
-	 */
-	public IContainer getModuleServerRoot() {
-		return getProject().getFolder(getModuleServerRootName());
-	}
-
-
-	/*
-	 * Returns the name of the module server root directory. For projects created in v4, this is
-	 * webApplication. For projects created in v5.0, this is Web Content. For projects created in
-	 * v5.0.1 and later, this is configurable per project by the user.
-	 */
-	public String getModuleServerRootName() {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		String name = getWebSettings().getWebContentName();
-//		if (name != null)
-//			return name;
-
-		int version = getVersion();
-		// If created in V5 or beyond
-		if (version != -1 && version >= 500)
-			return ISimpleWebNatureConstants.WEB_MODULE_DIRECTORY_;
-
-		return ISimpleWebNatureConstants.WEB_MODULE_DIRECTORY_V4;
-	}
-
-
-	public void setModuleServerRootName(String name) throws CoreException {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		getWebSettings().setWebContentName(name);
-//		getWebSettings().write();
-	}
-
-	/**
-	 * Return the root location for loading mof resources; defaults to the source folder, subclasses
-	 * may override
-	 */
-	public IContainer getEMFRoot() {
-		return getModuleServerRoot();
-	}
-
-	/**
-	 * Return the nature's ID.
-	 */
-	public String getNatureID() {
-		return ISimpleWebNatureConstants.STATIC_NATURE_ID;
-	}
-
-	/**
-	 * Return the ID of the plugin that this nature is contained within.
-	 */
-	protected String getPluginID() {
-		return WSTWebPlugin.PLUGIN_ID;	
-		}
-	/**
-	 * Insert the method's description here. Creation date: (10/30/2001 11:12:41 PM)
-	 * 
-	 * @return org.eclipse.core.resources.IContainer
-	 */
-	public IContainer getRootPublishableFolder() {
-		return getModuleServerRoot();
-	}
-
-	/**
-	 * Get a WebNatureRuntime that corresponds to the supplied project.
-	 * 
-	 * @return com.ibm.itp.wt.IWebNature
-	 * @param project
-	 *            com.ibm.itp.core.api.resources.IProject
-	 */
-	public static StaticWebNatureRuntime getRuntime(IProject project) {
-		try {
-			StaticWebNatureRuntime a = (StaticWebNatureRuntime) project.getNature(ISimpleWebNatureConstants.STATIC_NATURE_ID);
-			return a;
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-
-	public IPath getBasicWebModulePath() {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		WebSettings webSettings = getWebSettings();
-//		String name = webSettings.getWebContentName();
-		String name = null;
-		if (name == null) {
-			int version = getVersion();
-			// If created in V5 or beyond
-			if (version != -1 && version >= 500)
-				return ISimpleWebNatureConstants.WEB_MODULE_PATH_;
-
-			return ISimpleWebNatureConstants.WEB_MODULE_PATH_V4;
-		}
-		return new Path(name);
-	}
-
-
-	public IPath getWebModulePath() {
-		return getProjectPath().append(getBasicWebModulePath());
-	}
-
-
-	/**
-	 * Insert the method's description here. Creation date: (10/30/2001 5:25:06 PM)
-	 * 
-	 * @return boolean
-	 * @deprecated
-	 */
-	public int getWebNatureType() {
-
-		return ISimpleWebNatureConstants.STATIC_WEB_PROJECT;
-	}
-
-
-	/*
-	 * Return the current version number.
-	 */
-	public static int getCurrentVersion() {
-		return CURRENT_VERSION;
-	}
-
-
-	/*
-	 * Return the version number stored in the web settings file. The version number is used to
-	 * determine when the web project was created (i.e., under what product version). The current
-	 * version number does not necessarily change with each product version -- it's only changed
-	 * when it becomes necessary to distinguish a new version from a prior version.
-	 */
-	public int getVersion() {
-
-		if (fVersion == -1) {
-			try {
-//				To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead				
-//				String versionString = getWebSettings().getVersion();
-				String versionString = null;
-				if (versionString != null)
-					fVersion = Integer.parseInt(versionString);
-			} catch (NumberFormatException e) {
-				//Ignore
-			}
-		}
-		return fVersion;
-	}
-
-
-	public IPath getWebSettingsPath() {
-		return getProjectPath().append(ISimpleWebNatureConstants.WEBSETTINGS_FILE_NAME);
-	}
-
-	/**
-	 * Return whether or not the project has a runtime created on it.
-	 * 
-	 * @return boolean
-	 * @param project
-	 *            com.ibm.itp.core.api.resources.IProject
-	 */
-	public static boolean hasRuntime(IProject project) {
-		try {
-			return project.hasNature(ISimpleWebNatureConstants.STATIC_NATURE_ID);
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (10/31/2001 5:32:12 PM)
-	 * 
-	 * @param info
-	 *            com.ibm.iwt.webproject.WebProjectInfo
-	 * @exception org.eclipse.core.runtime.CoreException
-	 *                The exception description.
-	 */
-/*	public void initializeFromInfo(WebProjectInfo info) throws org.eclipse.core.runtime.CoreException {
-		int natureType = info.getWebProjectType();
-
-		WebSettings webSettings = getWebSettings();
-		webSettings.setProjectType(convertNatureTypeToString(natureType));
-		webSettings.setWebContentName(info.getWebContentName());
-		webSettings.write();
-
-		createFolders();
-		//		super.initializeFromInfo(info);
-	}*/
-
-	/**
-	 * Insert the method's description here. Creation date: (11/1/2001 2:25:22 PM)
-	 * 
-	 * @param builderID
-	 *            java.lang.String
-	 * @exception org.eclipse.core.runtime.CoreException
-	 *                The exception description.
-	 */
-	protected void removeFromBuildSpec(String builderID) throws org.eclipse.core.runtime.CoreException {
-		IProjectDescription description = getProject().getDescription();
-		ICommand[] commands = description.getBuildSpec();
-		boolean found = false;
-		for (int i = 0; i < commands.length; ++i) {
-			if (commands[i].getBuilderName().equals(builderID)) {
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			ICommand command = description.newCommand();
-			command.setBuilderName(builderID);
-			ICommand[] newCommands = new ICommand[commands.length + 1];
-			System.arraycopy(commands, 0, newCommands, 1, commands.length);
-			newCommands[0] = command;
-			IProjectDescription desc = getProject().getDescription();
-			desc.setBuildSpec(newCommands);
-			getProject().setDescription(desc, null);
-		}
-
-	}
-
-	protected void resetWebSettings() {
-//		fWebSettings = null;
-		contextRoot = null;
-
-	}
-
-
-	public void contributeToNature(EMFWorkbenchContext aNature) {
-		//		if (emfNature == aNature) return;
-		//		super.contributeToNature(aNature);
-		//		WorkbenchURIConverter converter = (WorkbenchURIConverter)
-		// aNature.getContext().getURIConverter();
-		//		converter.addInputContainer(getProject());
-	}
-
-	protected String convertNatureTypeToString(int type) {
-		if (type == ISimpleWebNatureConstants.STATIC_WEB_PROJECT)
-			return PROJECTTYPE_STATIC_VALUE;
-
-		return PROJECTTYPE_J2EE_VALUE;
-	}
-
-	/**
-	 * Set the web nature's type to either Static (ISimpleWebNatureConstants.STATIC_WEB_NATURE) or J2EE
-	 * (ISimpleWebNatureConstants.J2EE_WEB_NATURE)
-	 * 
-	 * @param newIsStaticWebProject
-	 *            boolean
-	 * @deprecated
-	 */
-	public void setWebNatureType(int natureType) throws CoreException {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		getWebSettings().setProjectType(convertNatureTypeToString(natureType));
-//		getWebSettings().write();
-
-	}
-
-
-	public String[] getFeatureIds() {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		WebSettings settings = getWebSettings();
-//		featureIds = settings.getFeatureIds();
-		if (featureIds == null)
-			featureIds = new String[0];
-
-		return featureIds;
-	}
-
-	public void setFeatureIds(String[] featureIds) throws CoreException {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		WebSettings webSettings = getWebSettings();
-//		webSettings.setFeatureIds(featureIds);
-//		webSettings.write();
-	}
-
-	/**
-	 * Configures the project with this nature.
-	 * 
-	 * @see IProjectNature#configure()
-	 */
-	public void primConfigure() throws CoreException {
-		//		super.primConfigure();
-
-		// this order is depended upon (see RATLC00855322)
-		addToFrontOfBuildSpec(WSTWebPlugin.VALIDATION_BUILDER_ID);
-//		addToFrontOfBuildSpec(LINKS_BUILDER_ID);
-	}
-
-	public void setContextRoot(String newContextRoot) throws CoreException {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		getWebSettings().setContextRoot(newContextRoot);
-//		getWebSettings().write();
-		contextRoot = newContextRoot;
-	}
-
-	public void removeFeatureId(String featureId) throws CoreException {
-//		To do : Needs rework  for flexibile project ModuleCore.getFirstArtifactEditForRead		
-//		WebSettings webSettings = getWebSettings();
-//		webSettings.removeFeatureId(featureId);
-//		webSettings.write();
-	}
-
-
-	/**
-	 * Configures the project with this nature. This is called by <code>IProject.addNature</code>
-	 * and should not be called directly by clients. The nature extension id is added to the list of
-	 * natures on the project by <code>IProject.addNature</code>, and need not be added here.
-	 * 
-	 * All subtypes must call super.
-	 * 
-	 * @exception CoreException
-	 *                if this method fails.
-	 */
-	public void configure() throws org.eclipse.core.runtime.CoreException {
-		primConfigure();
-
-	}
-
-	/**
-	 * Gets the deployable.
-	 * 
-	 * @return Returns a IDeployable
-	 */
-	public IModule getModule() {
-		return module;
-	}
-
-	/**
-	 * Sets the deployable.
-	 * 
-	 * @param deployable
-	 *            The deployable to set
-	 */
-	public void setModule(IModule module) {
-		this.module = module;
-	}
-
-	/**
-	 * Returns the project to which this project nature applies.
-	 * 
-	 * @return the project handle
-	 */
-	public org.eclipse.core.resources.IProject getProject() {
-		return project;
-	}
-
-	/**
-	 * Sets the project to which this nature applies. Used when instantiating this project nature
-	 * runtime. This is called by <code>IProject.addNature</code> and should not be called
-	 * directly by clients.
-	 * 
-	 * @param project
-	 *            the project to which this nature applies
-	 */
-	public void setProject(org.eclipse.core.resources.IProject newProject) {
-		project = newProject;
-		//need to be called here since getNature and createNature will not call it
-		try {
-			configure();
-		} catch (CoreException e) {
-			//Ignore
-		}
-	}
-
-	/**
-	 * Create a folder relative to the project based on aProjectRelativePathString.
-	 * 
-	 * @exception com.ibm.itp.core.api.resources.CoreException
-	 *                The exception description.
-	 */
-	public IFolder createFolder(String aProjectRelativePathString) throws CoreException {
-		if (aProjectRelativePathString != null && aProjectRelativePathString.length() > 0)
-			return createFolder(new Path(aProjectRelativePathString));
-		return null;
-	}
-
-	/**
-	 * Create a folder relative to the project based on aProjectRelativePathString.
-	 * 
-	 * @exception com.ibm.itp.core.api.resources.CoreException
-	 *                The exception description.
-	 */
-	public IFolder createFolder(IPath aProjectRelativePath) throws CoreException {
-		if (aProjectRelativePath != null && !aProjectRelativePath.isEmpty()) {
-			IFolder folder = getWorkspace().getRoot().getFolder(getProjectPath().append(aProjectRelativePath));
-			if (!folder.exists())
-				folder.create(true, true, null);
-			return folder;
-		}
-		return null;
-	}
-
-	/**
-	 * Adds a nauture to a project
-	 */
-	protected static void addNatureToProject(IProject proj, String natureId) throws CoreException {
-		ProjectUtilities.addNatureToProject(proj, natureId);
-	}
-
-	/**
-	 * Return the full path of the project.
-	 */
-	protected IPath getProjectPath() {
-		return getProject().getFullPath();
-	}
-
-	public IWorkspace getWorkspace() {
-		return getProject().getWorkspace();
-	}
-
-
-	/**
-	 * @see IBaseWebNature#isJ2EE()
-	 */
-	public boolean isJ2EE() {
-		return false;
-	}
-
-	/**
-	 * @see IBaseWebNature#isStatic()
-	 */
-	public boolean isStatic() {
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebSettings.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebSettings.java
deleted file mode 100644
index 071d9e9..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebSettings.java
+++ /dev/null
@@ -1,609 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.web.internal.ISimpleWebNatureConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-public class WebSettings{
-	protected IFile fSettingsFile;
-	protected IProject fProject;
-	protected Document fDomDocument;
-	// Version number may not change with every release,
-	// only when changes necessitate a new version number
-	public static String CURRENT_VERSION = "600"; //$NON-NLS-1$
-	public static String VERSION_V4 = "400"; //$NON-NLS-1$
-	public static final String ELEMENT_WORKSPACE_VERSION = "version"; //$NON-NLS-1$
-	
-
-	static final String ELEMENT_WEBSETTINGS = "j2eesettings"; //$NON-NLS-1$
-	static final String ELEMENT_PROJECTTYPE = "project-type"; //$NON-NLS-1$
-	static final String ELEMENT_CONTEXTROOT = "context-root"; //$NON-NLS-1$
-	static final String ELEMENT_WEBCONTENT = "webcontent"; //$NON-NLS-1$
-	static final String ELEMENT_JSPLEVEL = "jsp-level"; //$NON-NLS-1$
-	static final String ELEMENT_LIBMODULES = "lib-modules"; //$NON-NLS-1$
-	static final String ELEMENT_LIBMODULE = "lib-module"; //$NON-NLS-1$
-	static final String ELEMENT_LIBMODULE_JAR = "jar"; //$NON-NLS-1$
-	static final String ELEMENT_LIBMODULE_PROJECT = "project"; //$NON-NLS-1$
-	static final String ELEMENT_FEATURES = "features"; //$NON-NLS-1$
-	static final String ELEMENT_FEATURE = "feature"; //$NON-NLS-1$
-	static final String ELEMENT_FEATUREID = "feature-id"; //$NON-NLS-1$
-
-	static final ILibModule[] EMPTY_LIBMODULES = new ILibModule[0];
-	static final String[] EMPTY_FEATURES = new String[0];
-	static boolean validWebSettings = true;
-
-	public WebSettings(IProject project) {
-		fProject = project;
-		//this.nature = nature;
-		if (getDOMDocument() == null) {
-			try {
-				createNewDocument();
-			} catch (CoreException e) {
-				//Ignore
-			} catch (IOException e) {
-				//Ignore
-			}
-		}
-	}
-
-	public WebSettings(IProject project, IFile webSettings) {
-		fProject = project;
-		//this.nature = nature;
-		if (getDOMDocument(webSettings) == null) {
-			validWebSettings = false;
-		}
-	}
-
-	protected IFile getSettingsFile() {
-		if (fSettingsFile == null) {
-			fSettingsFile = fProject.getFile(ISimpleWebNatureConstants.WEBSETTINGS_FILE_NAME);
-		}
-		return fSettingsFile;
-	}
-
-	public String getContextRoot() {
-		return getValue(ELEMENT_CONTEXTROOT);
-	}
-
-	public String getJSPLevel() {
-		return getValue(ELEMENT_JSPLEVEL);
-	}
-
-	public String getWebContentName() {
-		return getValue(ELEMENT_WEBCONTENT);
-	}
-
-	public ILibModule[] getLibModules() {
-		Element root = getRootElement();
-		if (root == null)
-			return EMPTY_LIBMODULES;
-
-		Element libModuleNode = findChildNode(root, ELEMENT_LIBMODULES);
-		if (libModuleNode == null)
-			return EMPTY_LIBMODULES;
-
-		NodeList children = libModuleNode.getChildNodes();
-		ArrayList results = new ArrayList();
-		for (int i = 0; i < children.getLength(); i++) {
-			Node node = children.item(i);
-			ILibModule libModule = getLibModule(node);
-			if (libModule != null) {
-				results.add(libModule);
-			}
-		}
-
-		return (ILibModule[]) results.toArray(new ILibModule[results.size()]);
-	}
-
-	protected ILibModule getLibModule(Node node) {
-		if (!node.getNodeName().equalsIgnoreCase(ELEMENT_LIBMODULE))
-			return null;
-		String jarName = getNodeValue((Element) node, ELEMENT_LIBMODULE_JAR);
-		String projectName = getNodeValue((Element) node, ELEMENT_LIBMODULE_PROJECT);
-
-		ILibModule libModule = new LibModule(jarName, projectName);
-		return libModule;
-	}
-
-	public String[] getFeatureIds() {
-		Element root = getRootElement();
-		if (root == null)
-			return EMPTY_FEATURES;
-
-		Element featuresNode = findChildNode(root, ELEMENT_FEATURES);
-		if (featuresNode == null)
-			return EMPTY_FEATURES;
-
-		NodeList children = featuresNode.getChildNodes();
-		ArrayList results = new ArrayList();
-		for (int i = 0; i < children.getLength(); i++) {
-			Node node = children.item(i);
-			String featureId = getFeatureId(node);
-			if (featureId != null) {
-				results.add(featureId);
-			}
-		}
-
-		return (String[]) results.toArray(new String[results.size()]);
-	}
-
-	protected String getFeatureId(Node node) {
-		if (!node.getNodeName().equalsIgnoreCase(ELEMENT_FEATURE))
-			return null;
-		String id = getNodeValue((Element) node, ELEMENT_FEATUREID);
-
-		return id;
-	}
-
-	public String getProjectType() {
-		return getValue(ELEMENT_PROJECTTYPE);
-	}
-
-	public String getCurrentVersion() {
-		// The following change is needed when the websettings file is
-		// deleted from a version 4 workspace Checking for webapplication
-		// folder - Otherwise, new projects will not work.
-		IContainer webmoduleFolder = fProject.getFolder(ISimpleWebNatureConstants.WEB_MODULE_DIRECTORY_V4);
-		IFolder webinfFolder = ((IFolder) webmoduleFolder).getFolder(ISimpleWebNatureConstants.INFO_DIRECTORY);
-		if (webinfFolder.exists()) {
-			return VERSION_V4;
-		}
-
-		return CURRENT_VERSION;
-	}
-
-	protected String getValue(String settingName) {
-		Element root = getRootElement();
-		if (root == null)
-			return null;
-		return getNodeValue(root, settingName);
-	}
-
-	protected void createNewDocument() throws CoreException, IOException {
-		StringWriter writer = new StringWriter();
-		writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
-		writer.write("\n"); //$NON-NLS-1$
-		writer.write("<j2eesettings version=\""); //$NON-NLS-1$
-		writer.write(getCurrentVersion());
-		writer.write("\">");//$NON-NLS-1$
-		writer.write("\n"); //$NON-NLS-1$
-		writer.write("</j2eesettings>"); //$NON-NLS-1$
-		writer.write("\n"); //$NON-NLS-1$
-
-		InputStream sourceStream = new ByteArrayInputStream(writer.toString().getBytes("UTF8")); //$NON-NLS-1$
-		IFile webSettingsFile = getSettingsFile();
-		if (webSettingsFile.exists())
-			webSettingsFile.setContents(sourceStream, true, true, null);
-		else
-			webSettingsFile.create(sourceStream, true, null);
-		read();
-	}
-
-	public void setContextRoot(String contextRoot) {
-		setValue(ELEMENT_CONTEXTROOT, contextRoot);
-	}
-
-	public void setJSPLevel(String jspLevel) {
-		setValue(ELEMENT_JSPLEVEL, jspLevel);
-	}
-
-	public void setWebContentName(String name) {
-		String defaultName = getWebContentName();
-		if (defaultName == null || defaultName.length() == 0 || !name.equals(defaultName))
-			setValue(ELEMENT_WEBCONTENT, name);
-	}
-
-	public void setProjectType(String projectType) {
-		setValue(ELEMENT_PROJECTTYPE, projectType);
-	}
-
-	public void setLibModules(ILibModule[] libModules) {
-		Document doc = getOrCreateDocument();
-		Node libModulesNode = findOrCreateChildNode(doc.getDocumentElement(), ELEMENT_LIBMODULES);
-		Node firstChild = null;
-
-		// Remove all of the children.
-		while ((firstChild = libModulesNode.getFirstChild()) != null)
-			libModulesNode.removeChild(firstChild);
-
-		// Add new children.
-		for (int i = 0; i < libModules.length; i++) {
-			ILibModule iLibModule = libModules[i];
-			if (iLibModule != null)
-				addLibModule(libModulesNode, iLibModule);
-		}
-	}
-
-	protected void addLibModule(Node libModulesNode, ILibModule libModule) {
-		Document doc = getDOMDocument();
-		Element libModuleNode = doc.createElement(ELEMENT_LIBMODULE);
-		libModulesNode.appendChild(libModuleNode);
-		setValue(libModuleNode, ELEMENT_LIBMODULE_JAR, libModule.getJarName());
-		setValue(libModuleNode, ELEMENT_LIBMODULE_PROJECT, libModule.getProjectName());
-	}
-
-	public void setFeatureIds(String[] featureIds) {
-		Document doc = getOrCreateDocument();
-		Node featuresNode = findOrCreateChildNode(doc.getDocumentElement(), ELEMENT_FEATURES);
-
-		// Add new children.
-		for (int i = 0; i < featureIds.length; i++) {
-			String sFeatureId = featureIds[i];
-			if (sFeatureId != null)
-				addFeatureId(featuresNode, sFeatureId);
-		}
-	}
-
-	protected void addFeatureId(Node featuresNode, String featureId) {
-		Document doc = getDOMDocument();
-		Element featureNode = doc.createElement(ELEMENT_FEATURE);
-		featuresNode.appendChild(featureNode);
-		setValue(featureNode, ELEMENT_FEATUREID, featureId);
-	}
-
-	public boolean isValidWebSettings() {
-		return validWebSettings;
-	}
-
-	public void removeFeatureId(String removeId) {
-		Element root = getRootElement();
-		if (root != null) {
-			Element featuresNode = findChildNode(root, ELEMENT_FEATURES);
-			if (featuresNode != null) {
-				NodeList children = featuresNode.getChildNodes();
-				ArrayList results = new ArrayList();
-				for (int i = 0; i < children.getLength(); i++) {
-					Node node = children.item(i);
-					String featureId = getFeatureId(node);
-					if (featureId != null) {
-						// determine if in the list to remove
-						if (!(featureId.equals(removeId)))
-							results.add(featureId);
-					}
-				}
-				// Remove all of the children.
-				Node firstChild = null;
-				while ((firstChild = featuresNode.getFirstChild()) != null)
-					featuresNode.removeChild(firstChild);
-				if (results.size() > 0) {
-					String[] updateFeatureIds = (String[]) results.toArray(new String[results.size()]);
-					// Add new children.
-					for (int i = 0; i < results.size(); i++) {
-						String sFeatureId = updateFeatureIds[i];
-						if (sFeatureId != null)
-							addFeatureId(featuresNode, sFeatureId);
-					}
-				}
-			}
-		}
-	}
-
-	public String getRootNodeName() {
-		return ELEMENT_WEBSETTINGS;
-	}
-	protected Node findOrCreateChildNode(Element root, String nodeName) {
-		Node node = findChildNode(root, nodeName);
-		if (node == null) {
-			// If the element does not exist yet, create one.
-			node = getDOMDocument().createElement(nodeName);
-			root.appendChild(node);
-		}
-		return node;
-	}
-	protected Element findChildNode(Element parent, String nodeName) {
-		NodeList list = parent.getChildNodes();
-		int length = list.getLength();
-		for (int i = 0; i < length; ++i) {
-			Node curNode = list.item(i);
-			if (curNode.getNodeType() == Node.ELEMENT_NODE) {
-				Element curElement = (Element) curNode;
-				if (curElement.getNodeName().equalsIgnoreCase(nodeName))
-					return curElement;
-			}
-		}
-		return null;
-	}
-	protected Element getRootElement() {
-		Document doc = getDOMDocument();
-		if (doc == null)
-			return null;
-
-		Element root = doc.getDocumentElement();
-		if (root == null)
-			return null;
-		if (!root.getNodeName().equalsIgnoreCase(getRootNodeName()))
-			return null;
-		return root;
-	}
-	
-	protected Document getOrCreateDocument() {
-		Document doc = getDOMDocument();
-		if (doc == null) {
-			try {
-				createNewDocument();
-				doc = getDOMDocument();
-			} catch (CoreException e) {
-				//Ignore
-			} catch (IOException e) {
-				//Ignore
-			}
-		}
-		return doc;
-	}
-	public static String getWebContentDirectory(InputStream inputStream) {
-		InputStreamReader fileStream = null;
-		try {
-			fileStream = new InputStreamReader(inputStream, "utf-8"); //$NON-NLS-1$
-			DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			Document fDomDocument = parser.parse(new InputSource(fileStream));
-			Element root = fDomDocument.getDocumentElement();
-			if (root.getNodeName().equalsIgnoreCase(ELEMENT_WEBSETTINGS)) {
-				NodeList list = root.getChildNodes();
-				for (int i = 0, length = list.getLength(); i < length; i++) {
-					Node node = list.item(i);
-					if (node.getNodeName().equals(ELEMENT_WEBCONTENT)) {
-						NodeList childNodes = node.getChildNodes();
-						for (int j = 0, childLength = childNodes.getLength(); j < childLength; j++) {
-							Node curNode = childNodes.item(j);
-							if (curNode.getNodeType() == Node.TEXT_NODE) {
-								return curNode.getNodeValue();
-							}
-						}
-						return null;
-					}
-				}
-			}
-		} catch (UnsupportedEncodingException e) {
-			//Ignore
-		} catch (ParserConfigurationException e) {
-			//Ignore
-		} catch (FactoryConfigurationError e) {
-			//Ignore
-		} catch (SAXException e) {
-			//Ignore
-		} catch (IOException e) {
-			//Ignore
-		} catch (Exception e) {
-			//Ignore
-		} finally {
-			if (fileStream != null)
-				try {
-					fileStream.close();
-				} catch (IOException e1) {
-					//Ignore
-				}
-		}
-		return null;
-	}
-	protected Document getDOMDocument() {
-		if (fDomDocument == null) {
-			try {
-				read();
-			} catch (IOException e) {
-				//Ignore
-			}
-		}
-		return fDomDocument;
-	}
-
-	// Version of getDomDocument for use by import
-	protected Document getDOMDocument(IFile webSettings) {
-		if (fDomDocument == null) {
-			try {
-				read(webSettings);
-			} catch (IOException e) {
-				//Ignore
-			}
-		}
-		return fDomDocument;
-	}
-	protected void read() throws IOException {
-		// This following was changed for Defect 212723 The Util StringReader
-		// was changed to the InputStreamReader MAY
-		IFile settingsFile = getSettingsFile();
-		InputStream inputStream = null;
-		InputStreamReader fileStream = null;
-		if (settingsFile.exists()) {
-			try {
-				ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-				try {
-					Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
-					// JZ: fix to defect 240171
-					inputStream = settingsFile.getContents(true);
-					fileStream = new InputStreamReader(inputStream, "utf-8"); //$NON-NLS-1$
-
-					DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-					fDomDocument = parser.parse(new InputSource(fileStream));
-				} finally {
-					Thread.currentThread().setContextClassLoader(prevClassLoader);
-				}
-	/*		} catch (JavaModelException e) {
-				throw new IOException("file.badFormat"); //$NON-NLS-1$	
-*/			} catch (CoreException e) {
-				throw new IOException("file.badFormat"); //$NON-NLS-1$			
-			} catch (SAXException e) {
-				throw new IOException("file.badFormat"); //$NON-NLS-1$
-			} catch (ParserConfigurationException e) {
-				throw new IOException("file.badFormat"); //$NON-NLS-1$
-			} finally {
-				if (fileStream != null)
-					fileStream.close();
-			}
-		}
-	}
-
-
-	// Version of read for use by import
-	protected void read(IFile settings) throws IOException {
-		// This following was changed for Defect 212723 The Util StringReader
-		// was changed to the InputStreamReader MAY
-		IFile settingsFile = settings;
-
-		InputStream inputStream = null;
-		InputStreamReader fileStream = null;
-		if (settingsFile != null) {
-			try {
-				ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-				try {
-					Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-					inputStream = settingsFile.getContents();
-					fileStream = new InputStreamReader(inputStream, "utf-8"); //$NON-NLS-1$
-
-					DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-					fDomDocument = parser.parse(new InputSource(fileStream));
-				} finally {
-					Thread.currentThread().setContextClassLoader(prevClassLoader);
-				}
-
-			} catch (SAXException e) {
-				throw new IOException("file.badFormat"); //$NON-NLS-1$
-			} catch (ParserConfigurationException e) {
-				throw new IOException("file.badFormat"); //$NON-NLS-1$
-			} catch (CoreException ce) {
-				ce.printStackTrace();
-			} finally {
-				if (fileStream != null)
-					fileStream.close();
-			}
-		}
-	}
-	protected void setValue(String nodeName, String value) {
-		Document doc = getOrCreateDocument();
-		setValue(doc.getDocumentElement(), nodeName, value);
-	}
-	protected void setValue(Element root, String nodeName, String value) {
-		Node node = findOrCreateChildNode(root, nodeName);
-
-		NodeList childNodes = node.getChildNodes();
-
-		if (childNodes.getLength() == 0) {
-			Text newText = getDOMDocument().createTextNode(value);
-			node.appendChild(newText);
-			root.appendChild(node);
-		} else {
-			for (int i = 0; i < childNodes.getLength(); i++) {
-				Node curNode = childNodes.item(i);
-				if (curNode.getNodeType() == Node.TEXT_NODE)
-					curNode.setNodeValue(value);
-			}
-		}
-	}
-
-	protected String getNodeValue(Element parent, String nodeName) {
-		if (parent != null) {
-			Element node = findChildNode(parent, nodeName);
-			if (node != null)
-				return getChildText(node);
-		}
-		return null;
-	}
-
-	protected String getChildText(Element node) {
-		NodeList list = node.getChildNodes();
-		int length = list.getLength();
-		for (int i = 0; i < length; ++i) {
-			Node curNode = list.item(i);
-			if (curNode.getNodeType() == Node.TEXT_NODE) {
-				return curNode.getNodeValue();
-			}
-		}
-		return null;
-	}
-	public void setVersion(String version) {
-		Document doc = getDOMDocument();
-		if (doc == null)
-			return;
-
-		Element root = doc.getDocumentElement();
-		if (root == null)
-			return;
-
-		if (!root.getNodeName().equalsIgnoreCase(getRootNodeName()))
-			return;
-
-		root.setAttribute(ELEMENT_WORKSPACE_VERSION, version); //$NON-NLS-1$
-	}
-	public void write() throws CoreException {
-		if (fDomDocument == null)
-			return;
-
-		ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-
-		try {
-			TransformerFactory factory = TransformerFactory.newInstance();
-			Transformer transformer = factory.newTransformer();
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-			transformer.transform(new DOMSource(fDomDocument.getDocumentElement()), new StreamResult(outStream));
-		} catch (TransformerConfigurationException e) {
-			Logger.getLogger().logError(e);
-		} catch (TransformerFactoryConfigurationError e) {
-			Logger.getLogger().logError(e);
-		} catch (TransformerException e) {
-			Logger.getLogger().logError(e);
-		}
-
-		InputStream sourceStream = new ByteArrayInputStream(outStream.toByteArray());
-
-		IFile settingsFile = getSettingsFile();
-		if (settingsFile.exists())
-			settingsFile.setContents(sourceStream, true, true, null);
-		else
-			settingsFile.create(sourceStream, true, null);
-	}
-	public String getVersion() {
-		Document doc = getDOMDocument();
-		if (doc == null)
-			return null;
-
-		Element root = doc.getDocumentElement();
-		if (root == null)
-			return null;
-		if (!root.getNodeName().equalsIgnoreCase(getRootNodeName()))
-			return null;
-
-		return root.getAttribute(ELEMENT_WORKSPACE_VERSION); //$NON-NLS-1$
-	}
-}
\ No newline at end of file